From f3ebd00be9a8cc20fef779a6b41b97b2fb550801 Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Thu, 5 Nov 2026 01:41:56 +0000 Subject: [PATCH 001/110] 8396520: SA: Align continuation entry size when computing frame pointers Reviewed-by: cjplummer, ysuenaga --- .../hotspot/runtime/ContinuationEntry.java | 2 +- .../sa/TestContinuationEntry.java | 104 ++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/serviceability/sa/TestContinuationEntry.java diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ContinuationEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ContinuationEntry.java index 7d8a2ba5993f..07577717663c 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ContinuationEntry.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ContinuationEntry.java @@ -45,7 +45,7 @@ public abstract class ContinuationEntry extends VMObject { private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { Type type = db.lookupType("ContinuationEntry"); - size = type.getSize(); + size = VM.getVM().alignUp(type.getSize(), 2 * VM.getVM().getAddressSize()); parentField = type.getAddressField("_parent"); returnPC = type.getAddressField("_return_pc").getValue(); } diff --git a/test/hotspot/jtreg/serviceability/sa/TestContinuationEntry.java b/test/hotspot/jtreg/serviceability/sa/TestContinuationEntry.java new file mode 100644 index 000000000000..2b0730bfc7c6 --- /dev/null +++ b/test/hotspot/jtreg/serviceability/sa/TestContinuationEntry.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2026, Alibaba Group Holding Limited. All Rights Reserved. + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @summary Verify that SA continuation entry frame pointers account for native size alignment + * @requires vm.hasSA + * @requires vm.gc != "Z" + * @requires (os.arch == "amd64") | (os.arch == "x86_64") | (os.arch == "aarch64") | (os.arch == "riscv64") + * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")) + * @library /test/lib + * @modules jdk.hotspot.agent/sun.jvm.hotspot + * jdk.hotspot.agent/sun.jvm.hotspot.debugger + * jdk.hotspot.agent/sun.jvm.hotspot.runtime + * jdk.hotspot.agent/sun.jvm.hotspot.types + * @run driver TestContinuationEntry + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SA.SATestUtils; +import jdk.test.lib.apps.LingeredApp; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +import sun.jvm.hotspot.HotSpotAgent; +import sun.jvm.hotspot.debugger.Address; +import sun.jvm.hotspot.runtime.ContinuationEntry; +import sun.jvm.hotspot.runtime.VM; + +public class TestContinuationEntry { + private static void checkEntry(int pid) { + HotSpotAgent agent = new HotSpotAgent(); + agent.attach(pid); + try { + long rawSize = agent.getTypeDataBase().lookupType("ContinuationEntry").getSize(); + long wordSize = VM.getVM().getAddressSize(); + long alignment = 2 * wordSize; + long alignedSize = ((rawSize + alignment - 1) / alignment) * alignment; + String cpu = agent.getDebugger().getCPU(); + // RISC-V's entry FP is above the saved caller FP and return address (two words). + // See ContinuationEntry::entry_fp() in continuationEntry_riscv.inline.hpp and + // RISCV64ContinuationEntry.getEntryFP() in SA. + long expectedOffset = alignedSize + (cpu.equals("riscv64") ? 2 * wordSize : 0); + + // SP and FP accessors only do address arithmetic; they do not dereference this synthetic entry. + Address base = agent.getDebugger().newAddress(0x10000); + ContinuationEntry entry = ContinuationEntry.create(base); + Asserts.assertEquals(base, entry.getEntrySP(), "Continuation entry SP"); + long actualOffset = entry.getEntryFP().minus(entry.getEntrySP()); + System.out.printf("cpu=%s rawSize=%d wordSize=%d expectedOffset=%d actualOffset=%d%n", + cpu, rawSize, wordSize, expectedOffset, actualOffset); + Asserts.assertEquals(expectedOffset, actualOffset, "Continuation entry FP offset"); + } finally { + agent.detach(); + } + } + + public static void main(String[] args) throws Exception { + if (args.length != 0) { + checkEntry(Integer.parseInt(args[0])); + return; + } + + SATestUtils.skipIfCannotAttach(); + LingeredApp app = null; + try { + app = LingeredApp.startApp(); + ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder( + "--add-modules=jdk.hotspot.agent", + "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED", + "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.debugger=ALL-UNNAMED", + "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.runtime=ALL-UNNAMED", + "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.types=ALL-UNNAMED", + TestContinuationEntry.class.getName(), Long.toString(app.getPid())); + SATestUtils.addPrivilegesIfNeeded(pb); + OutputAnalyzer output = ProcessTools.executeProcess(pb); + System.out.println(output.getOutput()); + output.shouldHaveExitValue(0); + } finally { + LingeredApp.stopApp(app); + } + } +} From 4f116f94478d2ea4ab298acf95280f8341ab96ba Mon Sep 17 00:00:00 2001 From: Timofei Pushkin Date: Thu, 5 Nov 2026 05:58:34 +0000 Subject: [PATCH 002/110] 8396046: Leaks after failing to attach a JVM TI agent Reviewed-by: dholmes, sspitsyn --- src/hotspot/share/prims/jvmtiAgent.cpp | 7 + src/hotspot/share/prims/jvmtiAgent.hpp | 5 +- .../native/libinstrument/InvocationAdapter.c | 501 +++++++++--------- .../share/native/libinstrument/JPLISAgent.c | 114 ++-- .../share/native/libinstrument/JPLISAgent.h | 8 +- 5 files changed, 332 insertions(+), 303 deletions(-) diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp index 82c43f64e98d..cdc0097c2d02 100644 --- a/src/hotspot/share/prims/jvmtiAgent.cpp +++ b/src/hotspot/share/prims/jvmtiAgent.cpp @@ -82,6 +82,13 @@ JvmtiAgent::JvmtiAgent(const char* name, const char* options, bool is_absolute_p _dynamic(dynamic), _xrun(false) {} +JvmtiAgent::~JvmtiAgent() { + os::free(const_cast(_name)); + os::free(const_cast(_options)); + // lib handle is managed at the load site (on error, either unloaded or the process is shut down) + os::free(const_cast(_os_lib_path)); +} + JvmtiAgent* JvmtiAgent::next() const { return AtomicAccess::load_acquire(&_next); } diff --git a/src/hotspot/share/prims/jvmtiAgent.hpp b/src/hotspot/share/prims/jvmtiAgent.hpp index f3873ff95590..d7f645a7ce45 100644 --- a/src/hotspot/share/prims/jvmtiAgent.hpp +++ b/src/hotspot/share/prims/jvmtiAgent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ #define SHARE_PRIMS_JVMTIAGENT_HPP #include "memory/allocation.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/ticks.hpp" class JvmtiEnv; @@ -57,6 +58,8 @@ class JvmtiAgent : public CHeapObj { public: JvmtiAgent(const char* name, const char* options, bool is_absolute_path, bool dynamic = false); + ~JvmtiAgent(); + NONCOPYABLE(JvmtiAgent); const char* name() const NOT_JVMTI_RETURN_(nullptr); const char* options() const; bool is_absolute_path() const NOT_JVMTI_RETURN_(false); diff --git a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c index 0a1214567663..69d5c0b18bdb 100644 --- a/src/java.instrument/share/native/libinstrument/InvocationAdapter.c +++ b/src/java.instrument/share/native/libinstrument/InvocationAdapter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -144,11 +144,16 @@ convertCapabilityAttributes(const jarAttribute* attributes, JPLISAgent* agent) { */ JNIEXPORT jint JNICALL DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) { - JPLISInitializationError initerror = JPLIS_INIT_ERROR_NONE; - jint result = JNI_OK; - JPLISAgent * agent = NULL; - char * jarfile = NULL; - char * options = NULL; + JPLISInitializationError initerror = JPLIS_INIT_ERROR_NONE; + jint result = JNI_OK; + JPLISAgent * agent = NULL; + char * jarfile = NULL; + char * options = NULL; + jarAttribute * attributes = NULL; + char * premainClass = NULL; + char * premainClassJNI = NULL; + char * bootClassPath = NULL; + int oldLen, newLen; /* * Parse [=options] into jarfile and options @@ -158,130 +163,122 @@ DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) { return JNI_ERR; } - initerror = createNewJPLISAgent(vm, &agent, jarfile, JNI_FALSE); - if ( initerror == JPLIS_INIT_ERROR_NONE ) { - int oldLen, newLen; - jarAttribute* attributes; - char * premainClass; - char * bootClassPath; - - /* - * Agent_OnLoad is specified to provide the agent options - * argument tail in modified UTF8. However for 1.5.0 this is - * actually in the platform encoding - see 5049313. - * - * Open zip/jar file and parse archive. If can't be opened or - * not a zip file return error. Also if Premain-Class attribute - * isn't present we return an error. - */ - attributes = readAttributes(jarfile); - if (attributes == NULL) { - fprintf(stderr, "Error opening zip file or JAR manifest missing : %s\n", jarfile); - free(jarfile); - if (options != NULL) free(options); - return JNI_ERR; - } - - premainClass = getAttribute(attributes, "Premain-Class"); - if (premainClass == NULL) { - fprintf(stderr, "Failed to find Premain-Class manifest attribute in %s\n", - jarfile); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return JNI_ERR; - } - - /* - * The value of the Premain-Class attribute becomes the agent - * class name. The manifest is in UTF8 so need to convert to - * modified UTF8 (see JNI spec). - */ - oldLen = (int)strlen(premainClass); - newLen = modifiedUtf8LengthOfUtf8(premainClass, oldLen); - /* - * According to JVMS class name is represented as CONSTANT_Utf8_info, - * so its length is u2 (i.e. must be <= 0xFFFF). - * Negative oldLen or newLen means we got signed integer overflow - * (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative). - */ - if (oldLen < 0 || newLen < 0 || newLen > 0xFFFF) { - fprintf(stderr, "-javaagent: Premain-Class value is too big\n"); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return JNI_ERR; - } - if (newLen == oldLen) { - premainClass = strdup(premainClass); - } else { - char* str = (char*)malloc( newLen+1 ); - if (str != NULL) { - convertUtf8ToModifiedUtf8(premainClass, oldLen, str, newLen); - } - premainClass = str; - } - if (premainClass == NULL) { - fprintf(stderr, "-javaagent: memory allocation failed\n"); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return JNI_ERR; - } + /* + * Agent_OnLoad is specified to provide the agent options + * argument tail in modified UTF8. However for 1.5.0 this is + * actually in the platform encoding - see 5049313. + * + * Open zip/jar file and parse archive. If can't be opened or + * not a zip file return error. Also if Premain-Class attribute + * isn't present we return an error. + */ + attributes = readAttributes(jarfile); + if (attributes == NULL) { + fprintf(stderr, "Error opening zip file or JAR manifest missing : %s\n", jarfile); + result = JNI_ERR; + goto releaseAndReturn; + } - /* - * If the Boot-Class-Path attribute is specified then we process - * each relative URL and add it to the bootclasspath. - */ - bootClassPath = getAttribute(attributes, "Boot-Class-Path"); - if (bootClassPath != NULL) { - appendBootClassPath(agent, jarfile, bootClassPath); + premainClass = getAttribute(attributes, "Premain-Class"); + if (premainClass == NULL) { + fprintf(stderr, "Failed to find Premain-Class manifest attribute in %s\n", + jarfile); + result = JNI_ERR; + goto releaseAndReturn; + } + /* + * The value of the Premain-Class attribute becomes the agent + * class name. The manifest is in UTF8 so need to convert to + * modified UTF8 (see JNI spec). + */ + oldLen = (int)strlen(premainClass); + newLen = modifiedUtf8LengthOfUtf8(premainClass, oldLen); + /* + * According to JVMS class name is represented as CONSTANT_Utf8_info, + * so its length is u2 (i.e. must be <= 0xFFFF). + * Negative oldLen or newLen means we got signed integer overflow + * (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative). + */ + if (oldLen < 0 || newLen < 0 || newLen > 0xFFFF) { + fprintf(stderr, "-javaagent: Premain-Class value is too big\n"); + result = JNI_ERR; + goto releaseAndReturn; + } + if (newLen == oldLen) { + premainClassJNI = strdup(premainClass); + } else { + char* str = (char*)malloc( newLen+1 ); + if (str != NULL) { + convertUtf8ToModifiedUtf8(premainClass, oldLen, str, newLen); } + premainClassJNI = str; + } + if (premainClassJNI == NULL) { + fprintf(stderr, "-javaagent: memory allocation failed\n"); + result = JNI_ERR; + goto releaseAndReturn; + } - /* - * Convert JAR attributes into agent capabilities - */ - convertCapabilityAttributes(attributes, agent); + /* + * Create JPLISAgent with JVMTI environment + */ + initerror = createNewJPLISAgent(vm, &agent, jarfile, JNI_FALSE); + if (initerror != JPLIS_INIT_ERROR_NONE) { + result = JNI_ERR; + goto releaseAndReturn; + } - /* - * Track (record) the agent class name and options data - */ - initerror = recordCommandLineData(agent, premainClass, options); + /* + * Track (record) the agent class name and options data + */ + initerror = recordCommandLineData(agent, premainClassJNI, options); + if (initerror != JPLIS_INIT_ERROR_NONE) { + result = JNI_ERR; + goto releaseAndReturn; + } - /* - * Clean-up - */ - freeAttributes(attributes); - free(premainClass); + /* + * If the Boot-Class-Path attribute is specified then we process + * each relative URL and add it to the bootclasspath. + */ + bootClassPath = getAttribute(attributes, "Boot-Class-Path"); + if (bootClassPath != NULL) { + appendBootClassPath(agent, jarfile, bootClassPath); } - if (initerror != JPLIS_INIT_ERROR_NONE) { - free(jarfile); + /* + * Convert JAR attributes into agent capabilities + */ + convertCapabilityAttributes(attributes, agent); + + /* + * Clean-up + */ +releaseAndReturn: + if (result != JNI_OK) { + destroyJPLISAgent(agent); } - if (options != NULL) free(options); + free(premainClassJNI); + freeAttributes(attributes); + free(options); + free(jarfile); switch (initerror) { case JPLIS_INIT_ERROR_NONE: - result = JNI_OK; break; case JPLIS_INIT_ERROR_CANNOT_CREATE_NATIVE_AGENT: - result = JNI_ERR; fprintf(stderr, "java.lang.instrument/-javaagent: cannot create native agent.\n"); break; case JPLIS_INIT_ERROR_FAILURE: - result = JNI_ERR; fprintf(stderr, "java.lang.instrument/-javaagent: initialization of native agent failed.\n"); break; case JPLIS_INIT_ERROR_ALLOCATION_FAILURE: - result = JNI_ERR; fprintf(stderr, "java.lang.instrument/-javaagent: allocation failure.\n"); break; case JPLIS_INIT_ERROR_AGENT_CLASS_NOT_SPECIFIED: - result = JNI_ERR; fprintf(stderr, "-javaagent: agent class not specified.\n"); break; default: - result = JNI_ERR; fprintf(stderr, "java.lang.instrument/-javaagent: unknown error\n"); break; } @@ -304,12 +301,17 @@ DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) { */ JNIEXPORT jint JNICALL DEF_Agent_OnAttach(JavaVM* vm, char *args, void * reserved) { - JPLISInitializationError initerror = JPLIS_INIT_ERROR_NONE; - jint result = JNI_OK; - JPLISAgent * agent = NULL; - JNIEnv * jni_env = NULL; - char * jarfile = NULL; - char * options = NULL; + jint result = JNI_OK; + JPLISAgent * agent = NULL; + JNIEnv * jni_env = NULL; + char * jarfile = NULL; + char * options = NULL; + jarAttribute * attributes = NULL; + char * agentClass = NULL; + char * agentClassJNI = NULL; + char * bootClassPath = NULL; + int oldLen, newLen; + jboolean print_warning; /* * Need JNIEnv - guaranteed to be called from thread that is already @@ -325,142 +327,130 @@ DEF_Agent_OnAttach(JavaVM* vm, char *args, void * reserved) { return JNI_ENOMEM; } - jboolean print_warning = JVM_PrintWarningAtDynamicAgentLoad(); - initerror = createNewJPLISAgent(vm, &agent, jarfile, print_warning); - if ( initerror == JPLIS_INIT_ERROR_NONE ) { - int oldLen, newLen; - jarAttribute* attributes; - char * agentClass; - char * bootClassPath; - jboolean success; - - /* - * Open the JAR file and parse the manifest - */ - attributes = readAttributes( jarfile ); - if (attributes == NULL) { - fprintf(stderr, "Error opening zip file or JAR manifest missing: %s\n", jarfile); - free(jarfile); - if (options != NULL) free(options); - return AGENT_ERROR_BADJAR; - } - - agentClass = getAttribute(attributes, "Agent-Class"); - if (agentClass == NULL) { - fprintf(stderr, "Failed to find Agent-Class manifest attribute from %s\n", - jarfile); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return AGENT_ERROR_BADJAR; - } - - /* - * Add the jarfile to the system class path - */ - if (appendClassPath(agent, jarfile)) { - fprintf(stderr, "Unable to add %s to system class path " - "- not supported by system class loader or configuration error!\n", - jarfile); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return AGENT_ERROR_NOTONCP; - } + /* + * Open the JAR file and parse the manifest + */ + attributes = readAttributes( jarfile ); + if (attributes == NULL) { + fprintf(stderr, "Error opening zip file or JAR manifest missing: %s\n", jarfile); + result = AGENT_ERROR_BADJAR; + goto releaseAndReturn; + } - /* - * The value of the Agent-Class attribute becomes the agent - * class name. The manifest is in UTF8 so need to convert to - * modified UTF8 (see JNI spec). - */ - oldLen = (int)strlen(agentClass); - newLen = modifiedUtf8LengthOfUtf8(agentClass, oldLen); - /* - * According to JVMS class name is represented as CONSTANT_Utf8_info, - * so its length is u2 (i.e. must be <= 0xFFFF). - * Negative oldLen or newLen means we got signed integer overflow - * (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative). - */ - if (oldLen < 0 || newLen < 0 || newLen > 0xFFFF) { - fprintf(stderr, "Agent-Class value is too big\n"); - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return AGENT_ERROR_BADJAR; - } - if (newLen == oldLen) { - agentClass = strdup(agentClass); - } else { - char* str = (char*)malloc( newLen+1 ); - if (str != NULL) { - convertUtf8ToModifiedUtf8(agentClass, oldLen, str, newLen); - } - agentClass = str; - } - if (agentClass == NULL) { - free(jarfile); - if (options != NULL) free(options); - freeAttributes(attributes); - return JNI_ENOMEM; + agentClass = getAttribute(attributes, "Agent-Class"); + if (agentClass == NULL) { + fprintf(stderr, "Failed to find Agent-Class manifest attribute from %s\n", + jarfile); + result = AGENT_ERROR_BADJAR; + goto releaseAndReturn; + } + /* + * The value of the Agent-Class attribute becomes the agent + * class name. The manifest is in UTF8 so need to convert to + * modified UTF8 (see JNI spec). + */ + oldLen = (int)strlen(agentClass); + newLen = modifiedUtf8LengthOfUtf8(agentClass, oldLen); + /* + * According to JVMS class name is represented as CONSTANT_Utf8_info, + * so its length is u2 (i.e. must be <= 0xFFFF). + * Negative oldLen or newLen means we got signed integer overflow + * (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative). + */ + if (oldLen < 0 || newLen < 0 || newLen > 0xFFFF) { + fprintf(stderr, "Agent-Class value is too big\n"); + result = AGENT_ERROR_BADJAR; + goto releaseAndReturn; + } + if (newLen == oldLen) { + agentClassJNI = strdup(agentClass); + } else { + char* str = (char*)malloc( newLen+1 ); + if (str != NULL) { + convertUtf8ToModifiedUtf8(agentClass, oldLen, str, newLen); } + agentClassJNI = str; + } + if (agentClassJNI == NULL) { + result = JNI_ENOMEM; + goto releaseAndReturn; + } - /* - * If the Boot-Class-Path attribute is specified then we process - * each URL - in the live phase only JAR files will be added. - */ - bootClassPath = getAttribute(attributes, "Boot-Class-Path"); - if (bootClassPath != NULL) { - appendBootClassPath(agent, jarfile, bootClassPath); - } + /* + * Create JPLISAgent with JVMTI environment + */ + print_warning = JVM_PrintWarningAtDynamicAgentLoad(); + if (createNewJPLISAgent(vm, &agent, jarfile, print_warning) != JPLIS_INIT_ERROR_NONE) { + result = JNI_ERR; + goto releaseAndReturn; + } - /* - * Convert JAR attributes into agent capabilities - */ - convertCapabilityAttributes(attributes, agent); + /* + * Add the jarfile to the system class path + */ + if (appendClassPath(agent, jarfile)) { + fprintf(stderr, "Unable to add %s to system class path " + "- not supported by system class loader or configuration error!\n", + jarfile); + result = AGENT_ERROR_NOTONCP; + goto releaseAndReturn; + } - /* - * Create the java.lang.instrument.Instrumentation instance - */ - success = createInstrumentationImpl(jni_env, agent); - jplis_assert_msg(success, "createInstrumentationImpl failed"); + /* + * If the Boot-Class-Path attribute is specified then we process + * each URL - in the live phase only JAR files will be added. + */ + bootClassPath = getAttribute(attributes, "Boot-Class-Path"); + if (bootClassPath != NULL) { + appendBootClassPath(agent, jarfile, bootClassPath); + } - /* - * Setup ClassFileLoadHook handler. - */ - if (success) { - success = setLivePhaseEventHandlers(agent); - jplis_assert_msg(success, "setLivePhaseEventHandlers failed"); - } + /* + * Convert JAR attributes into agent capabilities + */ + convertCapabilityAttributes(attributes, agent); - /* - * Start the agent - */ - if (success) { - success = startJavaAgent(agent, - jni_env, - agentClass, - options, - agent->mAgentmainCaller); - jplis_assert_msg(success, "startJavaAgent failed"); - } + /* + * Create the java.lang.instrument.Instrumentation instance + */ + if (!createInstrumentationImpl(jni_env, agent)) { + result = AGENT_ERROR_STARTFAIL; + goto releaseAndReturn; + } - if (!success) { - fprintf(stderr, "Agent failed to start!\n"); - result = AGENT_ERROR_STARTFAIL; - } + /* + * Setup ClassFileLoadHook handler. + */ + if (!setLivePhaseEventHandlers(agent)) { + result = AGENT_ERROR_STARTFAIL; + goto releaseAndReturn; + } - /* - * Clean-up - */ - free(agentClass); - freeAttributes(attributes); + /* + * Start the agent + */ + if (!startJavaAgent(agent, jni_env, agentClassJNI, options, agent->mAgentmainCaller)) { + result = AGENT_ERROR_STARTFAIL; + /* Java code may retain a link to the native agent, even if an exception was thrown */ + goto releaseAndReturnAfterStartJavaAgent; } - if (initerror != JPLIS_INIT_ERROR_NONE || result != JNI_OK) { - free(jarfile); + /* + * Clean-up + */ +releaseAndReturn: + if (result != JNI_OK) { + destroyJPLISAgent(agent); } - if (options != NULL) free(options); +releaseAndReturnAfterStartJavaAgent: + free(agentClassJNI); + freeAttributes(attributes); + free(options); + free(jarfile); + if (result == AGENT_ERROR_STARTFAIL) { + fprintf(stderr, "Agent failed to start!\n"); + } return result; } @@ -479,10 +469,11 @@ DEF_Agent_OnUnload(JavaVM *vm) { */ jint loadAgent(JNIEnv* env, jstring path) { JavaVM* vm; - JPLISAgent* agent; + JPLISAgent* agent = NULL; const char* jarfile = NULL; jarAttribute* attributes = NULL; - char* agentClass = NULL; + char* agentClass; + char* agentClassJNI = NULL; char* bootClassPath; int oldLen, newLen; jint result = JNI_ERR; @@ -497,12 +488,6 @@ jint loadAgent(JNIEnv* env, jstring path) { return JNI_ERR; } - // create JPLISAgent with JVMTI environment - if (createNewJPLISAgent(vm, &agent, jarfile, JNI_FALSE) != JPLIS_INIT_ERROR_NONE) { - (*env)->ReleaseStringUTFChars(env, path, jarfile); - return JNI_ERR; - } - // read the attributes in the main section of JAR manifest attributes = readAttributes(jarfile); if (attributes == NULL) { @@ -514,7 +499,6 @@ jint loadAgent(JNIEnv* env, jstring path) { if (agentClass == NULL) { goto releaseAndReturn; } - // The value of Launcher-Agent-Class is in UTF-8, convert it to modified UTF-8 oldLen = (int) strlen(agentClass); newLen = modifiedUtf8LengthOfUtf8(agentClass, oldLen); @@ -528,20 +512,25 @@ jint loadAgent(JNIEnv* env, jstring path) { goto releaseAndReturn; } if (newLen == oldLen) { - agentClass = strdup(agentClass); + agentClassJNI = strdup(agentClass); } else { char* str = (char*) malloc(newLen + 1); if (str != NULL) { convertUtf8ToModifiedUtf8(agentClass, oldLen, str, newLen); } - agentClass = str; + agentClassJNI = str; } - if (agentClass == NULL) { + if (agentClassJNI == NULL) { jthrowable oome = createThrowable(env, "java/lang/OutOfMemoryError", NULL); if (oome != NULL) (*env)->Throw(env, oome); goto releaseAndReturn; } + // create JPLISAgent with JVMTI environment + if (createNewJPLISAgent(vm, &agent, jarfile, JNI_FALSE) != JPLIS_INIT_ERROR_NONE) { + goto releaseAndReturn; + } + // Boot-Class-Path bootClassPath = getAttribute(attributes, "Boot-Class-Path"); if (bootClassPath != NULL) { @@ -562,23 +551,22 @@ jint loadAgent(JNIEnv* env, jstring path) { } // invoke the agentmain method - if (!startJavaAgent(agent, env, agentClass, "", agent->mAgentmainCaller)) { - goto releaseAndReturn; + if (!startJavaAgent(agent, env, agentClassJNI, "", agent->mAgentmainCaller)) { + // Java code may retain a link to the native agent, even if an exception was thrown + goto releaseAndReturnAfterStartJavaAgent; } // initialization complete result = JNI_OK; releaseAndReturn: - if (agentClass != NULL) { - free(agentClass); - } - if (attributes != NULL) { - freeAttributes(attributes); - } - if (result != JNI_OK && jarfile != NULL) { - (*env)->ReleaseStringUTFChars(env, path, jarfile); + if (result != JNI_OK) { + destroyJPLISAgent(agent); } +releaseAndReturnAfterStartJavaAgent: + free(agentClassJNI); + freeAttributes(attributes); + (*env)->ReleaseStringUTFChars(env, path, jarfile); return result; } @@ -615,7 +603,6 @@ eventHandlerVMInit( jvmtiEnv * jvmtienv, "the system class loader does not define the " "appendToClassPathForInstrumentation method or the method failed\n", agent->mJarfile); - free((void *)agent->mJarfile); abortJVM(jnienv, JPLIS_ERRORMESSAGE_CANNOTSTART ", appending to system class path failed"); } diff --git a/src/java.instrument/share/native/libinstrument/JPLISAgent.c b/src/java.instrument/share/native/libinstrument/JPLISAgent.c index a48defd471d0..ac6d45ae7eb1 100644 --- a/src/java.instrument/share/native/libinstrument/JPLISAgent.c +++ b/src/java.instrument/share/native/libinstrument/JPLISAgent.c @@ -66,12 +66,6 @@ initializeJPLISAgent( JPLISAgent * agent, jvmtiEnv * jvmtienv, const char * jarfile, jboolean printWarning); -/* De-allocates a JPLIS agent data structure. Only used in partial-failure cases at startup; - * in normal usage the JPLIS agent lives forever - */ -void -deallocateJPLISAgent( jvmtiEnv * jvmtienv, - JPLISAgent * agent); /* Does one-time work to interrogate the JVM about capabilities and cache the answers. */ void @@ -205,42 +199,30 @@ getJPLISEnvironment(jvmtiEnv * jvmtienv) { */ JPLISInitializationError createNewJPLISAgent(JavaVM * vm, JPLISAgent **agent_ptr, const char * jarfile, jboolean printWarning) { - JPLISInitializationError initerror = JPLIS_INIT_ERROR_NONE; jvmtiEnv * jvmtienv = NULL; - jint jnierror = JNI_OK; *agent_ptr = NULL; - jnierror = (*vm)->GetEnv( vm, - (void **) &jvmtienv, - JVMTI_VERSION_1_1); - if ( jnierror != JNI_OK ) { - initerror = JPLIS_INIT_ERROR_CANNOT_CREATE_NATIVE_AGENT; - } else { - JPLISAgent * agent = allocateJPLISAgent(jvmtienv); - if ( agent == NULL ) { - initerror = JPLIS_INIT_ERROR_ALLOCATION_FAILURE; - } else { - initerror = initializeJPLISAgent( agent, - vm, - jvmtienv, - jarfile, - printWarning); - if ( initerror == JPLIS_INIT_ERROR_NONE ) { - *agent_ptr = agent; - } else { - deallocateJPLISAgent(jvmtienv, agent); - } - } - /* don't leak envs */ - if ( initerror != JPLIS_INIT_ERROR_NONE ) { - jvmtiError jvmtierror = (*jvmtienv)->DisposeEnvironment(jvmtienv); - /* can be called from any phase */ - jplis_assert(jvmtierror == JVMTI_ERROR_NONE); - } + if ((*vm)->GetEnv(vm, (void **) &jvmtienv, JVMTI_VERSION_1_1) != JNI_OK) { + return JPLIS_INIT_ERROR_CANNOT_CREATE_NATIVE_AGENT; } - return initerror; + JPLISAgent * agent = allocateJPLISAgent(jvmtienv); + if (agent == NULL) { + jvmtiError jvmtierror = (*jvmtienv)->DisposeEnvironment(jvmtienv); + /* can be called from any phase */ + jplis_assert(jvmtierror == JVMTI_ERROR_NONE); + return JPLIS_INIT_ERROR_ALLOCATION_FAILURE; + } + + JPLISInitializationError initerror = initializeJPLISAgent(agent, vm, jvmtienv, jarfile, printWarning); + if (initerror != JPLIS_INIT_ERROR_NONE) { + destroyJPLISAgent(agent); + return initerror; + } + + *agent_ptr = agent; + return JPLIS_INIT_ERROR_NONE; } /* @@ -260,6 +242,7 @@ initializeJPLISAgent( JPLISAgent * agent, jboolean printWarning) { jvmtiError jvmtierror = JVMTI_ERROR_NONE; jvmtiPhase phase; + size_t size; agent->mJVM = vm; agent->mNormalEnvironment.mJVMTIEnv = jvmtienv; @@ -278,9 +261,16 @@ initializeJPLISAgent( JPLISAgent * agent, agent->mNativeMethodPrefixAdded = JNI_FALSE; agent->mAgentClassName = NULL; agent->mOptionsString = NULL; - agent->mJarfile = jarfile; + agent->mJarfile = NULL; /* set below */ agent->mPrintWarning = printWarning; + size = strlen(jarfile) + 1; + agent->mJarfile = allocate(jvmtienv, size); + if (agent->mJarfile == NULL) { + return JPLIS_INIT_ERROR_ALLOCATION_FAILURE; + } + memcpy((char *) agent->mJarfile, jarfile, size); + /* make sure we can recover either handle in either direction. * the agent has a ref to the jvmti; make it mutual */ @@ -332,9 +322,42 @@ initializeJPLISAgent( JPLISAgent * agent, return (jvmtierror == JVMTI_ERROR_NONE)? JPLIS_INIT_ERROR_NONE : JPLIS_INIT_ERROR_FAILURE; } + void -deallocateJPLISAgent(jvmtiEnv * jvmtienv, JPLISAgent * agent) { +destroyJPLISAgent(JPLISAgent * agent) { + jvmtiEnv * jvmtienv; + jvmtiError jvmtierror; + + if (agent == NULL) { + return; + } + + jvmtienv = jvmti(agent); + + deallocate(jvmtienv, (void*)agent->mJarfile); + + deallocateCommandLineData(agent); + + if (agent->mInstrumentationImpl != NULL) { + JavaVM * vm = agent->mJVM; + JNIEnv * jnienv; + jint result = (*vm)->GetEnv(vm, (void**)&jnienv, JNI_VERSION_1_2); + jplis_assert(result == JNI_OK); + (*jnienv)->DeleteGlobalRef(jnienv, agent->mInstrumentationImpl); + } + + if (agent->mRetransformEnvironment.mJVMTIEnv != NULL) { + jvmtiEnv * retransformerEnv = agent->mRetransformEnvironment.mJVMTIEnv; + jvmtierror = (*retransformerEnv)->DisposeEnvironment(retransformerEnv); + /* can be called from any phase */ + jplis_assert(jvmtierror == JVMTI_ERROR_NONE); + } + deallocate(jvmtienv, agent); + + jvmtierror = (*jvmtienv)->DisposeEnvironment(jvmtienv); + /* can be called from any phase */ + jplis_assert(jvmtierror == JVMTI_ERROR_NONE); } @@ -570,6 +593,8 @@ createInstrumentationImpl( JNIEnv * jnienv, agent->mPremainCaller = premainCallerMethodID; agent->mAgentmainCaller = agentmainCallerMethodID; agent->mTransform = transformMethodID; + } else { + (*jnienv)->DeleteGlobalRef(jnienv, resultImpl); } return !errorOutstanding; @@ -1045,7 +1070,7 @@ retransformableEnvironment(JPLISAgent * agent) { if (jvmtierror != JVMTI_ERROR_NONE) { /* cannot get the capability, dispose of the retransforming environment */ jvmtierror = (*retransformerEnv)->DisposeEnvironment(retransformerEnv); - jplis_assert(jvmtierror == JVMTI_ERROR_NOT_AVAILABLE); + jplis_assert(jvmtierror == JVMTI_ERROR_NONE); return NULL; } memset(&callbacks, 0, sizeof(callbacks)); @@ -1056,19 +1081,20 @@ retransformableEnvironment(JPLISAgent * agent) { sizeof(callbacks)); jplis_assert(jvmtierror == JVMTI_ERROR_NONE); if (jvmtierror == JVMTI_ERROR_NONE) { - // install the retransforming environment - agent->mRetransformEnvironment.mJVMTIEnv = retransformerEnv; - agent->mRetransformEnvironment.mIsRetransformer = JNI_TRUE; - - // Make it for ClassFileLoadHook handling + // Make the retransforming environment available for ClassFileLoadHook handling jvmtierror = (*retransformerEnv)->SetEnvironmentLocalStorage( retransformerEnv, &(agent->mRetransformEnvironment)); jplis_assert(jvmtierror == JVMTI_ERROR_NONE); if (jvmtierror == JVMTI_ERROR_NONE) { + // install the retransforming environment + agent->mRetransformEnvironment.mJVMTIEnv = retransformerEnv; + agent->mRetransformEnvironment.mIsRetransformer = JNI_TRUE; return retransformerEnv; } } + jvmtierror = (*retransformerEnv)->DisposeEnvironment(retransformerEnv); + jplis_assert(jvmtierror == JVMTI_ERROR_NONE); return NULL; } diff --git a/src/java.instrument/share/native/libinstrument/JPLISAgent.h b/src/java.instrument/share/native/libinstrument/JPLISAgent.h index 3e9642f3de49..ef7c9f75d9c0 100644 --- a/src/java.instrument/share/native/libinstrument/JPLISAgent.h +++ b/src/java.instrument/share/native/libinstrument/JPLISAgent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -154,6 +154,12 @@ getJPLISEnvironment(jvmtiEnv * jvmtienv); extern JPLISInitializationError createNewJPLISAgent(JavaVM * vm, JPLISAgent **agent_ptr, const char * jarfile, jboolean printWarning); +/* Disposes of the JPLIS agent and its environments. + * Only used when agent initialization fails; in normal usage the agent lives forever. + */ +extern void +destroyJPLISAgent(JPLISAgent * agent); + /* Adds can_redefine_classes capability */ extern void addRedefineClassesCapability(JPLISAgent * agent); From 38f7f9e822df220dd496588e6d90db4e0009641d Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Thu, 5 Nov 2026 06:04:31 +0000 Subject: [PATCH 003/110] 8394773: [Valhalla] Missing null assert for unloaded field of scalarized value object Reviewed-by: roland, mhaessig --- src/hotspot/share/opto/doCall.cpp | 13 +---- src/hotspot/share/opto/parse.hpp | 4 ++ src/hotspot/share/opto/parse3.cpp | 15 ++---- src/hotspot/share/opto/parseHelper.cpp | 50 +++++++++++-------- .../TestUnloadedValueTypeField.java | 27 ++++++++++ 5 files changed, 66 insertions(+), 43 deletions(-) diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp index 21eee6e4babe..a0adad57c8eb 100644 --- a/src/hotspot/share/opto/doCall.cpp +++ b/src/hotspot/share/opto/doCall.cpp @@ -867,18 +867,7 @@ void Parse::do_call() { // If the return type of the method is not loaded, assert that the // value we got is a null. Otherwise, we need to recompile. if (!rtype->is_loaded()) { - if (PrintOpto && (Verbose || WizardMode)) { - method()->print_name(); tty->print_cr(" asserting nullness of result at bci: %d", bci()); - cg->method()->print_name(); tty->cr(); - } - if (C->log() != nullptr) { - C->log()->elem("assert_null reason='return' klass='%d'", - C->log()->identify(rtype)); - } - // If there is going to be a trap, put it at the next bytecode: - set_bci(iter().next_bci()); - null_assert(peek()); - set_bci(iter().cur_bci()); // put it back + null_assert_for_unloaded_type(peek(), rtype, "return", true, cg->method()); } BasicType ct = ctype->basic_type(); if (is_reference_type(ct)) { diff --git a/src/hotspot/share/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp index e2160955c175..d8d34b8118ac 100644 --- a/src/hotspot/share/opto/parse.hpp +++ b/src/hotspot/share/opto/parse.hpp @@ -534,6 +534,10 @@ class Parse : public GraphKit { // Helper function to setup Ideal Call nodes void do_call(); + Node* null_assert_for_unloaded_type(Node* value, ciType* unloaded_type, + const char* reason, bool trap_at_next_bci, + ciMethod* callee = nullptr); + // Helper function to uncommon-trap or bailout for non-compilable call-sites bool can_not_compile_call_site(ciMethod *dest_method, ciInstanceKlass *klass); diff --git a/src/hotspot/share/opto/parse3.cpp b/src/hotspot/share/opto/parse3.cpp index e9acd1b46e22..7284be3720fb 100644 --- a/src/hotspot/share/opto/parse3.cpp +++ b/src/hotspot/share/opto/parse3.cpp @@ -140,6 +140,9 @@ void Parse::do_get_xxx(Node* obj, ciField* field) { } pop(); push_node(field->layout_type(), value); + if (is_reference_type(bt) && !field->type()->is_loaded()) { + null_assert_for_unloaded_type(peek(), field->type(), "field", true); + } return; } @@ -224,17 +227,7 @@ void Parse::do_get_xxx(Node* obj, ciField* field) { // not need to mention the class index, since the class will // already have been loaded if we ever see a non-null value.) // uncommon_trap(iter().get_field_signature_index()); - if (PrintOpto && (Verbose || WizardMode)) { - method()->print_name(); tty->print_cr(" asserting nullness of field at bci: %d", bci()); - } - if (C->log() != nullptr) { - C->log()->elem("assert_null reason='field' klass='%d'", - C->log()->identify(field_klass)); - } - // If there is going to be a trap, put it at the next bytecode: - set_bci(iter().next_bci()); - null_assert(peek()); - set_bci(iter().cur_bci()); // put it back + null_assert_for_unloaded_type(peek(), field_klass, "field", true); } } diff --git a/src/hotspot/share/opto/parseHelper.cpp b/src/hotspot/share/opto/parseHelper.cpp index 9543a2a86e6d..ef161d758d1d 100644 --- a/src/hotspot/share/opto/parseHelper.cpp +++ b/src/hotspot/share/opto/parseHelper.cpp @@ -62,6 +62,30 @@ void GraphKit::make_dtrace_method_entry_exit(ciMethod* method, bool is_entry) { thread, method_node); } +Node* Parse::null_assert_for_unloaded_type(Node* value, ciType* unloaded_type, + const char* reason, bool trap_at_next_bci, + ciMethod* callee) { + if (PrintOpto && (Verbose || WizardMode)) { + method()->print_name(); + tty->print_cr(" asserting nullness of %s at bci: %d", reason, bci()); + if (callee != nullptr) { + callee->print_name(); + tty->cr(); + } + } + if (C->log() != nullptr) { + C->log()->elem("assert_null reason='%s' klass='%d'", + reason, C->log()->identify(unloaded_type)); + } + if (trap_at_next_bci) { + set_bci(iter().next_bci()); + } + Node* result = null_assert(value); + if (trap_at_next_bci) { + set_bci(iter().cur_bci()); // put it back + } + return result; +} //============================================================================= //------------------------------do_checkcast----------------------------------- @@ -75,20 +99,10 @@ void Parse::do_checkcast() { // then the checkcast does nothing. const TypeOopPtr *tp = _gvn.type(obj)->isa_oopptr(); if (!will_link || (tp && !tp->is_loaded())) { - if (C->log() != nullptr) { - if (!will_link) { - C->log()->elem("assert_null reason='checkcast' klass='%d'", - C->log()->identify(klass)); - } - if (tp && !tp->is_loaded()) { - // %%% Cannot happen? - ciKlass* klass = tp->unloaded_klass(); - C->log()->elem("assert_null reason='checkcast source' klass='%d'", - C->log()->identify(klass)); - } - } - null_assert(obj); - assert( stopped() || _gvn.type(peek())->higher_equal(TypePtr::NULL_PTR), "what's left behind is null" ); + ciKlass* unloaded_klass = !will_link ? klass : tp->unloaded_klass(); + const char* reason = !will_link ? "checkcast" : "checkcast source"; + null_assert_for_unloaded_type(obj, unloaded_klass, reason, false); + assert(stopped() || _gvn.type(peek())->higher_equal(TypePtr::NULL_PTR), "what's left behind is null"); return; } @@ -115,12 +129,8 @@ void Parse::do_instanceof() { ciKlass* klass = iter().get_klass(will_link); if (!will_link) { - if (C->log() != nullptr) { - C->log()->elem("assert_null reason='instanceof' klass='%d'", - C->log()->identify(klass)); - } - null_assert(peek()); - assert( stopped() || _gvn.type(peek())->higher_equal(TypePtr::NULL_PTR), "what's left behind is null" ); + null_assert_for_unloaded_type(peek(), klass, "instanceof", false); + assert(stopped() || _gvn.type(peek())->higher_equal(TypePtr::NULL_PTR), "what's left behind is null"); if (!stopped()) { // The object is now known to be null. // Shortcut the effect of gen_instanceof and return "false" directly. diff --git a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestUnloadedValueTypeField.java b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestUnloadedValueTypeField.java index d6063dd7591b..8bb95a34a4b0 100644 --- a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestUnloadedValueTypeField.java +++ b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestUnloadedValueTypeField.java @@ -33,6 +33,7 @@ /* * @test + * @bug 8216183 8220269 8254985 8253416 8273594 8293702 8394773 * @key randomness * @summary Test the handling of fields of unloaded value classes. * @library /test/lib / @@ -64,6 +65,7 @@ public static void main(String[] args) { "-XX:+UnlockDiagnosticVMOptions", // Prevent IR Test Framework from loading classes "-DIgnoreCompilerControls=true", + "-XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestUnloadedValueTypeField$MyValue29::*init*", // Some tests trigger frequent re-compilation. Don't mark them as non-compilable. "-XX:PerMethodRecompilationCutoff=-1", "-XX:PerBytecodeRecompilationCutoff=-1") .start(); @@ -1033,4 +1035,29 @@ public void test28_verifier() { // Expected } } + + static class MyObject29 { } + + @LooselyConsistentValue + static value class MyValue29 { + MyObject29 obj = new MyObject29(); + static void load() { } + } + + static { + // Load the value class without loading the type of 'obj' + MyValue29.load(); + } + + // Test field load with an unloaded type from a scalarized value object + @Test + public int test29(boolean b) { + return (b ? new MyValue29().obj : null).hashCode(); + } + + @Run(test = "test29") + @Warmup(0) + public void test29_verifier() { + test29(true); + } } From 270dad8f5d3ce8bba8a77ab79c40f216fbacce81 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Thu, 5 Nov 2026 06:07:51 +0000 Subject: [PATCH 004/110] 8396669: [Valhalla] C2 misses to scalarize value class ConstantDynamic Reviewed-by: qamai, kvn --- src/hotspot/share/opto/parse2.cpp | 6 ++- .../TestValueClassConstantDynamic.java | 47 +++++++++++++++++++ .../TestValueClassConstantDynamicHelper.jasm | 38 +++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamic.java create mode 100644 test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamicHelper.jasm diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp index 9994949240e1..82f902a389ae 100644 --- a/src/hotspot/share/opto/parse2.cpp +++ b/src/hotspot/share/opto/parse2.cpp @@ -3038,7 +3038,11 @@ void Parse::do_one_bytecode() { assert(constant.is_loaded(), "constant is not loaded"); const Type* con_type = Type::make_from_constant(constant); if (con_type != nullptr) { - push_node(con_type->basic_type(), makecon(con_type)); + Node* con = makecon(con_type); + if (con_type->is_valueklassptr()) { + con = ValueTypeNode::make_from_oop(this, con, con_type->value_klass()); + } + push_node(con_type->basic_type(), con); } break; } diff --git a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamic.java b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamic.java new file mode 100644 index 000000000000..0929f89fd436 --- /dev/null +++ b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamic.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.valhalla.valuetypes; + +import jdk.test.lib.Asserts; + +/* + * @test + * @bug 8396669 + * @summary Test that a value class ConstantDynamic is scalarized. + * @requires vm.compiler2.enabled + * @library /test/lib + * @enablePreview + * @compile TestValueClassConstantDynamicHelper.jasm + * @run main ${test.main.class} + * @run main/othervm -XX:-TieredCompilation -Xbatch + * -XX:CompileCommand=compileonly,*::test + * ${test.main.class} + */ +public class TestValueClassConstantDynamic { + public static void main(String[] args) { + for (int i = 0; i < 20_000; i++) { + Asserts.assertEQ(TestValueClassConstantDynamicHelper.test((i & 1) == 0), 42); + } + } +} diff --git a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamicHelper.jasm b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamicHelper.jasm new file mode 100644 index 000000000000..95e7f6efcc9f --- /dev/null +++ b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestValueClassConstantDynamicHelper.jasm @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler/valhalla/valuetypes; + +public class TestValueClassConstantDynamicHelper version 66:0 { + public static Method test:"(Z)Ljava/lang/Integer;" stack 2 locals 1 { + ldc Dynamic REF_invokeStatic:java/lang/invoke/ConstantBootstraps.explicitCast: + "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object;": + value:"Ljava/lang/Integer;" int 42; + iload_0; + ifeq L1; + nop; + L1: stack_frame_type stack1; + stack_map class java/lang/Integer; + areturn; + } +} From e237801a8ac5415582401b97eb590a85d83f6af4 Mon Sep 17 00:00:00 2001 From: Jayathirth D V Date: Thu, 5 Nov 2026 06:16:54 +0000 Subject: [PATCH 005/110] 8395856: Update HarfBuzz to 15.0.0 Reviewed-by: azvegint, prr --- src/java.desktop/share/legal/harfbuzz.md | 13 +- .../native/libharfbuzz/OT/Color/CBDT/CBDT.hh | 242 +- .../native/libharfbuzz/OT/Color/COLR/COLR.hh | 851 +- .../OT/Color/COLR/colrv1-closure.hh | 5 +- .../native/libharfbuzz/OT/Color/CPAL/CPAL.hh | 39 +- .../native/libharfbuzz/OT/Color/sbix/sbix.hh | 14 +- .../native/libharfbuzz/OT/Color/svg/svg.hh | 2 +- .../libharfbuzz/OT/Layout/Common/Coverage.hh | 133 +- .../OT/Layout/Common/CoverageFormat1.hh | 4 +- .../OT/Layout/Common/CoverageFormat2.hh | 39 +- .../OT/Layout/Common/RangeRecord.hh | 14 +- .../native/libharfbuzz/OT/Layout/GDEF/GDEF.hh | 629 +- .../libharfbuzz/OT/Layout/GPOS/Anchor.hh | 18 +- .../OT/Layout/GPOS/AnchorFormat3.hh | 4 +- .../OT/Layout/GPOS/AnchorMatrix.hh | 86 +- .../libharfbuzz/OT/Layout/GPOS/Common.hh | 8 +- .../libharfbuzz/OT/Layout/GPOS/CursivePos.hh | 10 +- .../OT/Layout/GPOS/CursivePosFormat1.hh | 308 +- .../native/libharfbuzz/OT/Layout/GPOS/GPOS.hh | 29 +- .../OT/Layout/GPOS/LigatureArray.hh | 64 +- .../libharfbuzz/OT/Layout/GPOS/MarkArray.hh | 189 +- .../libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh | 4 +- .../OT/Layout/GPOS/MarkBasePosFormat1.hh | 74 +- .../libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh | 4 +- .../OT/Layout/GPOS/MarkLigPosFormat1.hh | 68 +- .../libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh | 4 +- .../OT/Layout/GPOS/MarkMarkPosFormat1.hh | 77 +- .../libharfbuzz/OT/Layout/GPOS/MarkRecord.hh | 15 +- .../libharfbuzz/OT/Layout/GPOS/PairPos.hh | 8 +- .../OT/Layout/GPOS/PairPosFormat1.hh | 62 +- .../OT/Layout/GPOS/PairPosFormat2.hh | 245 +- .../libharfbuzz/OT/Layout/GPOS/PairSet.hh | 91 +- .../OT/Layout/GPOS/PairValueRecord.hh | 40 +- .../OT/Layout/GPOS/PosLookupSubTable.hh | 18 +- .../libharfbuzz/OT/Layout/GPOS/SinglePos.hh | 56 +- .../OT/Layout/GPOS/SinglePosFormat1.hh | 23 +- .../OT/Layout/GPOS/SinglePosFormat2.hh | 55 +- .../libharfbuzz/OT/Layout/GPOS/ValueFormat.hh | 62 +- .../OT/Layout/GSUB/AlternateSet.hh | 9 +- .../OT/Layout/GSUB/AlternateSubst.hh | 15 +- .../OT/Layout/GSUB/AlternateSubstFormat1.hh | 24 +- .../native/libharfbuzz/OT/Layout/GSUB/GSUB.hh | 1 + .../libharfbuzz/OT/Layout/GSUB/Ligature.hh | 34 + .../libharfbuzz/OT/Layout/GSUB/LigatureSet.hh | 18 +- .../OT/Layout/GSUB/LigatureSubst.hh | 18 +- .../OT/Layout/GSUB/LigatureSubstFormat1.hh | 33 +- .../OT/Layout/GSUB/MultipleSubst.hh | 6 +- .../OT/Layout/GSUB/MultipleSubstFormat1.hh | 19 +- .../OT/Layout/GSUB/ReverseChainSingleSubst.hh | 12 +- .../GSUB/ReverseChainSingleSubstFormat1.hh | 118 +- .../libharfbuzz/OT/Layout/GSUB/Sequence.hh | 7 + .../libharfbuzz/OT/Layout/GSUB/SingleSubst.hh | 16 +- .../OT/Layout/GSUB/SingleSubstFormat1.hh | 160 +- .../OT/Layout/GSUB/SingleSubstFormat2.hh | 33 +- .../libharfbuzz/OT/Layout/GSUB/SubstLookup.hh | 28 +- .../OT/Layout/GSUB/SubstLookupSubTable.hh | 16 +- .../native/libharfbuzz/OT/Var/VARC/VARC.cc | 384 +- .../native/libharfbuzz/OT/Var/VARC/VARC.hh | 61 +- .../libharfbuzz/OT/glyf/CompositeGlyph.hh | 52 +- .../share/native/libharfbuzz/OT/glyf/Glyph.hh | 119 +- .../native/libharfbuzz/OT/glyf/SimpleGlyph.hh | 15 +- .../native/libharfbuzz/OT/glyf/SubsetGlyph.hh | 89 +- .../libharfbuzz/OT/glyf/composite-iter.hh | 9 +- .../libharfbuzz/OT/glyf/glyf-helpers.hh | 7 +- .../share/native/libharfbuzz/OT/glyf/glyf.hh | 195 +- .../share/native/libharfbuzz/OT/glyf/loca.hh | 1 + .../libharfbuzz/OT/glyf/path-builder.hh | 11 +- .../libharfbuzz/graph/classdef-graph.hh | 238 +- .../libharfbuzz/graph/coverage-graph.hh | 136 +- .../share/native/libharfbuzz/graph/graph.hh | 1239 ++- .../libharfbuzz/graph/gsubgpos-context.cc | 39 +- .../libharfbuzz/graph/gsubgpos-context.hh | 12 +- .../libharfbuzz/graph/gsubgpos-graph.hh | 258 +- .../libharfbuzz/graph/markbasepos-graph.hh | 341 +- .../native/libharfbuzz/graph/pairpos-graph.hh | 297 +- .../native/libharfbuzz/graph/serialize.hh | 74 +- .../native/libharfbuzz/graph/split-helpers.hh | 26 +- .../libharfbuzz/hb-aat-layout-bsln-table.hh | 8 +- .../libharfbuzz/hb-aat-layout-common.hh | 62 +- .../libharfbuzz/hb-aat-layout-feat-table.hh | 4 +- .../libharfbuzz/hb-aat-layout-kerx-table.hh | 49 +- .../libharfbuzz/hb-aat-layout-morx-table.hh | 63 +- .../libharfbuzz/hb-aat-layout-trak-table.hh | 4 +- .../share/native/libharfbuzz/hb-aat-layout.cc | 2 +- .../share/native/libharfbuzz/hb-algs.hh | 367 +- .../share/native/libharfbuzz/hb-array.hh | 18 +- .../share/native/libharfbuzz/hb-atomic.hh | 121 +- .../share/native/libharfbuzz/hb-bit-page.hh | 12 +- .../libharfbuzz/hb-bit-set-invertible.hh | 159 +- .../share/native/libharfbuzz/hb-bit-set.hh | 266 +- .../share/native/libharfbuzz/hb-blob.cc | 2 +- .../native/libharfbuzz/hb-buffer-serialize.cc | 34 +- .../native/libharfbuzz/hb-buffer-verify.cc | 17 +- .../share/native/libharfbuzz/hb-buffer.cc | 66 +- .../share/native/libharfbuzz/hb-buffer.hh | 5 - .../share/native/libharfbuzz/hb-cache.hh | 13 +- .../libharfbuzz/hb-cff-interp-common.hh | 40 +- .../libharfbuzz/hb-cff-interp-cs-common.hh | 51 +- .../native/libharfbuzz/hb-cff2-interp-cs.hh | 32 +- .../share/native/libharfbuzz/hb-common.cc | 10 +- .../share/native/libharfbuzz/hb-common.h | 19 + .../share/native/libharfbuzz/hb-config.hh | 14 +- .../share/native/libharfbuzz/hb-debug.hh | 4 + .../native/libharfbuzz/hb-depend-data.hh | 668 ++ .../share/native/libharfbuzz/hb-deprecated.h | 5 + .../share/native/libharfbuzz/hb-draw.cc | 92 +- .../share/native/libharfbuzz/hb-draw.h | 113 + .../share/native/libharfbuzz/hb-draw.hh | 29 +- .../native/libharfbuzz/hb-face-builder.cc | 13 +- .../share/native/libharfbuzz/hb-face.cc | 2 +- .../share/native/libharfbuzz/hb-face.h | 2 +- .../share/native/libharfbuzz/hb-font.cc | 55 +- .../share/native/libharfbuzz/hb-font.h | 4 - .../share/native/libharfbuzz/hb-font.hh | 62 +- .../share/native/libharfbuzz/hb-ft.cc | 224 +- .../share/native/libharfbuzz/hb-iter.hh | 17 +- .../share/native/libharfbuzz/hb-kern.hh | 17 +- .../share/native/libharfbuzz/hb-limits.hh | 105 +- .../share/native/libharfbuzz/hb-machinery.hh | 43 +- .../share/native/libharfbuzz/hb-map.hh | 42 +- .../native/libharfbuzz/hb-number-parser.hh | 292 +- .../share/native/libharfbuzz/hb-number.cc | 132 +- .../share/native/libharfbuzz/hb-open-file.hh | 56 +- .../share/native/libharfbuzz/hb-open-type.hh | 71 +- .../native/libharfbuzz/hb-ot-cff-common.hh | 22 +- .../native/libharfbuzz/hb-ot-cff1-table.cc | 75 +- .../native/libharfbuzz/hb-ot-cff1-table.hh | 45 +- .../native/libharfbuzz/hb-ot-cff2-table.cc | 35 +- .../native/libharfbuzz/hb-ot-cff2-table.hh | 38 +- .../native/libharfbuzz/hb-ot-cmap-table.hh | 378 +- .../{OT/Layout/types.hh => hb-ot-dual.hh} | 87 +- .../libharfbuzz/hb-ot-face-table-list.hh | 44 +- .../share/native/libharfbuzz/hb-ot-face.hh | 3 - .../share/native/libharfbuzz/hb-ot-fetch.h | 101 + .../share/native/libharfbuzz/hb-ot-font.cc | 23 +- .../native/libharfbuzz/hb-ot-hdmx-table.hh | 4 +- .../native/libharfbuzz/hb-ot-head-table.hh | 2 + .../native/libharfbuzz/hb-ot-hhea-table.hh | 37 +- .../native/libharfbuzz/hb-ot-hmtx-table.hh | 153 +- .../native/libharfbuzz/hb-ot-kern-table.hh | 28 +- .../libharfbuzz/hb-ot-layout-base-table.hh | 120 +- .../native/libharfbuzz/hb-ot-layout-common.hh | 1873 +++- .../libharfbuzz/hb-ot-layout-gsub-table.hh | 111 +- .../libharfbuzz/hb-ot-layout-gsubgpos.hh | 2482 ++++- .../libharfbuzz/hb-ot-layout-jstf-table.hh | 131 +- .../share/native/libharfbuzz/hb-ot-layout.cc | 111 +- .../share/native/libharfbuzz/hb-ot-layout.hh | 21 +- .../share/native/libharfbuzz/hb-ot-map.cc | 36 +- .../share/native/libharfbuzz/hb-ot-map.hh | 2 +- .../native/libharfbuzz/hb-ot-math-table.hh | 196 +- .../share/native/libharfbuzz/hb-ot-math.cc | 6 +- .../native/libharfbuzz/hb-ot-maxp-table.hh | 71 +- .../native/libharfbuzz/hb-ot-meta-table.hh | 2 +- .../share/native/libharfbuzz/hb-ot-meta.cc | 2 +- .../share/native/libharfbuzz/hb-ot-metrics.cc | 75 +- .../native/libharfbuzz/hb-ot-os2-table.hh | 10 +- .../native/libharfbuzz/hb-ot-post-table.hh | 9 +- .../libharfbuzz/hb-ot-shape-fallback.cc | 86 +- .../share/native/libharfbuzz/hb-ot-shape.cc | 43 +- .../share/native/libharfbuzz/hb-ot-shape.hh | 59 +- .../hb-ot-shaper-arabic-fallback.hh | 8 +- .../hb-ot-shaper-arabic-joining-list.hh | 8 +- .../libharfbuzz/hb-ot-shaper-arabic-pua.hh | 44 +- .../libharfbuzz/hb-ot-shaper-arabic-table.hh | 29 +- .../native/libharfbuzz/hb-ot-shaper-arabic.cc | 30 +- .../native/libharfbuzz/hb-ot-shaper-hangul.cc | 24 +- .../libharfbuzz/hb-ot-shaper-indic-table.cc | 84 +- .../libharfbuzz/hb-ot-shaper-use-table.hh | 244 +- .../hb-ot-shaper-vowel-constraints.cc | 4 +- .../share/native/libharfbuzz/hb-ot-shaper.hh | 5 + .../native/libharfbuzz/hb-ot-stat-table.hh | 3 +- .../native/libharfbuzz/hb-ot-tag-table.hh | 29 +- .../share/native/libharfbuzz/hb-ot-tag.cc | 14 +- .../libharfbuzz/hb-ot-var-avar-table.hh | 733 +- .../native/libharfbuzz/hb-ot-var-common.hh | 456 +- .../libharfbuzz/hb-ot-var-cvar-table.hh | 13 +- .../libharfbuzz/hb-ot-var-fvar-table.hh | 38 +- .../libharfbuzz/hb-ot-var-gvar-table.hh | 161 +- .../libharfbuzz/hb-ot-var-hvar-table.hh | 40 +- .../share/native/libharfbuzz/hb-ot-var.cc | 6 +- .../native/libharfbuzz/hb-ot-vorg-table.hh | 87 +- .../share/native/libharfbuzz/hb-ot.h | 1 + .../share/native/libharfbuzz/hb-outline.cc | 11 + .../share/native/libharfbuzz/hb-outline.hh | 1 + .../native/libharfbuzz/hb-paint-extents.cc | 133 +- .../native/libharfbuzz/hb-paint-extents.hh | 22 + .../share/native/libharfbuzz/hb-paint.cc | 171 +- .../share/native/libharfbuzz/hb-paint.h | 162 + .../share/native/libharfbuzz/hb-paint.hh | 35 +- .../share/native/libharfbuzz/hb-repacker.hh | 214 +- .../share/native/libharfbuzz/hb-script-list.h | 11 +- .../share/native/libharfbuzz/hb-serialize.hh | 12 +- .../share/native/libharfbuzz/hb-set.cc | 18 + .../share/native/libharfbuzz/hb-set.h | 4 + .../share/native/libharfbuzz/hb-set.hh | 11 +- .../share/native/libharfbuzz/hb-shape-plan.cc | 21 +- .../share/native/libharfbuzz/hb-shape-plan.hh | 15 +- .../share/native/libharfbuzz/hb-shape.cc | 7 +- .../share/native/libharfbuzz/hb-static.cc | 31 +- .../libharfbuzz/hb-subset-cff-common.cc | 9 +- .../libharfbuzz/hb-subset-cff-common.hh | 150 +- .../native/libharfbuzz/hb-subset-cff1.cc | 36 +- .../native/libharfbuzz/hb-subset-cff2.cc | 920 +- .../native/libharfbuzz/hb-subset-depend.h | 133 + .../native/libharfbuzz/hb-subset-input.cc | 381 +- .../libharfbuzz/hb-subset-instancer-solver.cc | 98 +- .../libharfbuzz/hb-subset-instancer-solver.hh | 24 +- .../libharfbuzz/hb-subset-plan-member-list.hh | 34 +- .../native/libharfbuzz/hb-subset-plan.cc | 131 +- .../native/libharfbuzz/hb-subset-plan.hh | 21 +- .../native/libharfbuzz/hb-subset-serialize.h | 5 + .../share/native/libharfbuzz/hb-subset.cc | 69 +- .../share/native/libharfbuzz/hb-subset.h | 19 +- .../share/native/libharfbuzz/hb-ucd-table.hh | 9047 +++++++++-------- .../libharfbuzz/hb-unicode-emoji-table.hh | 10 +- .../share/native/libharfbuzz/hb-unicode.hh | 2 +- .../share/native/libharfbuzz/hb-vector.hh | 58 +- .../share/native/libharfbuzz/hb-version.h | 6 +- .../share/native/libharfbuzz/hb.hh | 25 +- 219 files changed, 22158 insertions(+), 9744 deletions(-) create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-depend-data.hh rename src/java.desktop/share/native/libharfbuzz/{OT/Layout/types.hh => hb-ot-dual.hh} (51%) create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-ot-fetch.h create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-subset-depend.h diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md index 448de3faee1a..e0df8484f402 100644 --- a/src/java.desktop/share/legal/harfbuzz.md +++ b/src/java.desktop/share/legal/harfbuzz.md @@ -1,4 +1,4 @@ -## Harfbuzz v14.2.0 +## Harfbuzz v15.0.0 ### Harfbuzz License @@ -9,16 +9,16 @@ For parts of HarfBuzz that are licensed under different licenses see individual files names COPYING in subdirectories where applicable. Copyright © 2010-2024 Google, Inc. -Copyright © 2018-2020 Ebrahim Byagowi +Copyright © 2018-2026 Ebrahim Byagowi Copyright © 2004-2013 Red Hat, Inc. Copyright © 2019 Facebook, Inc. Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com) Copyright © 2007 Chris Wilson -Copyright © 2018-2019 Adobe Inc. +Copyright © 2018-2024 Adobe Inc. Copyright © 2006-2025 Behdad Esfahbod Copyright © 1998-2004 David Turner and Werner Lemberg Copyright © 2009 Keith Stribley -Copyright © 2018 Khaled Hosny +Copyright © 2018-2026 Khaled Hosny Copyright © 2016 Elie Roux Copyright © 2016 Igalia S.L. Copyright © 2015 Mozilla Foundation. @@ -75,10 +75,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. The below applies to the following file(s): libharfbuzz/hb-unicode-emoji-table.hh -© 2025 Unicode®, Inc. +© 2026 Unicode®, Inc. -Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. -in the U.S. and other countries. +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. For terms of use and license, see https://www.unicode.org/terms_of_use.html diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh index b8f6fa4054b6..8e395bb7020e 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh @@ -44,6 +44,67 @@ namespace OT { +/* Tracks image data blocks emitted into the subset CBDT table so that + * identical subtables (for example the same bitmaps used by several strikes) + * can share a single copy. */ +struct cbdt_dedup_context_t +{ + struct entry_t + { + unsigned int base; /* Offset of the data in cbdt_prime. */ + unsigned int lstart; /* Start index in lengths. */ + unsigned int lcount; /* Number of length entries. */ + }; + + static uint64_t hash (unsigned int image_format, + const hb_vector_t &data, + const hb_vector_t &lengths) + { + uint32_t h = hb_hash (hb_bytes_t (data.arrayZ, data.length)); + h = h * 31 + hb_hash (hb_bytes_t ((const char *) lengths.arrayZ, + lengths.length * sizeof (unsigned int))); + return ((uint64_t) image_format << 32) | h; + } + + bool find (uint64_t key, + const hb_vector_t &data, + const hb_vector_t &lengths, + const hb_vector_t &cbdt_prime, + unsigned int *base /* OUT */) const + { + unsigned int *idx_p = nullptr; + if (!map.has (key, &idx_p)) return false; + const entry_t &e = entries[*idx_p]; + /* The data and the per-glyph lengths must both match, otherwise the + * glyph extents implied by the offset array would differ. */ + if (e.lcount != lengths.length) return false; + if (unlikely (e.base + data.length > (unsigned int) cbdt_prime.length)) return false; + if (hb_memcmp (cbdt_prime.arrayZ + e.base, data.arrayZ, data.length)) return false; + if (hb_memcmp (this->lengths.arrayZ + e.lstart, + lengths.arrayZ, lengths.length * sizeof (unsigned int))) + return false; + *base = e.base; + return true; + } + + bool add (uint64_t key, + unsigned int base, + const hb_vector_t &lengths) + { + if (unlikely (entries.in_error () || this->lengths.in_error () || map.in_error ())) + return false; + entry_t e = {base, this->lengths.length, lengths.length}; + if (unlikely (!entries.push_or_fail (e))) return false; + for (unsigned int length : lengths) + if (unlikely (!this->lengths.push_or_fail (length))) return false; + return map.set (key, entries.length - 1); + } + + hb_hashmap_t map; + hb_vector_t entries; + hb_vector_t lengths; /* Concatenated per-entry lengths. */ +}; + struct cblc_bitmap_size_subset_context_t { const char *cbdt; @@ -59,6 +120,7 @@ struct cblc_bitmap_size_subset_context_t */ hb_codepoint_t start_glyph; /* OUT */ hb_codepoint_t end_glyph; /* OUT */ + cbdt_dedup_context_t *dedup; /* Shared across strikes; may be null. */ }; static inline bool @@ -207,26 +269,26 @@ struct IndexSubtable hb_barrier (); switch (u.header.indexFormat) { - case 1: return_trace (u.format1.sanitize (c, glyph_count)); - case 3: return_trace (u.format3.sanitize (c, glyph_count)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c, glyph_count)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c, glyph_count)); default:return_trace (true); } } bool finish_subtable (hb_serialize_context_t *c, - unsigned int cbdt_prime_len, + unsigned int end_offset, unsigned int num_glyphs, unsigned int *size /* OUT (accumulated) */) { TRACE_SERIALIZE (this); - unsigned int local_offset = cbdt_prime_len - u.header.imageDataOffset; switch (u.header.indexFormat) { - case 1: return_trace (u.format1.add_offset (c, local_offset, size)); + case 1: hb_barrier (); return_trace (u.format1.add_offset (c, end_offset, size)); case 3: { - if (!u.format3.add_offset (c, local_offset, size)) + hb_barrier (); + if (!u.format3.add_offset (c, end_offset, size)) return_trace (false); if (!(num_glyphs & 0x01)) // Pad to 32-bit alignment if needed. return_trace (u.format3.add_offset (c, 0, size)); @@ -239,63 +301,6 @@ struct IndexSubtable } } - bool - fill_missing_glyphs (hb_serialize_context_t *c, - unsigned int cbdt_prime_len, - unsigned int num_missing, - unsigned int *size /* OUT (accumulated) */, - unsigned int *num_glyphs /* OUT (accumulated) */) - { - TRACE_SERIALIZE (this); - - unsigned int local_offset = cbdt_prime_len - u.header.imageDataOffset; - switch (u.header.indexFormat) - { - case 1: { - for (unsigned int i = 0; i < num_missing; i++) - { - if (unlikely (!u.format1.add_offset (c, local_offset, size))) - return_trace (false); - *num_glyphs += 1; - } - return_trace (true); - } - case 3: { - for (unsigned int i = 0; i < num_missing; i++) - { - if (unlikely (!u.format3.add_offset (c, local_offset, size))) - return_trace (false); - *num_glyphs += 1; - } - return_trace (true); - } - // TODO: implement 2, 4, 5. - case 2: // Add empty space in cbdt_prime?. - case 4: case 5: // No-op as sparse is supported. - default: return_trace (false); - } - } - - bool - copy_glyph_at_idx (hb_serialize_context_t *c, unsigned int idx, - const char *cbdt, unsigned int cbdt_length, - hb_vector_t *cbdt_prime /* INOUT */, - IndexSubtable *subtable_prime /* INOUT */, - unsigned int *size /* OUT (accumulated) */) const - { - TRACE_SERIALIZE (this); - - unsigned int offset, length, format; - if (unlikely (!get_image_data (idx, &offset, &length, &format))) return_trace (false); - if (unlikely (offset > cbdt_length || cbdt_length - offset < length)) return_trace (false); - - auto *header_prime = subtable_prime->get_header (); - unsigned int new_local_offset = cbdt_prime->length - (unsigned int) header_prime->imageDataOffset; - if (unlikely (!_copy_data_to_cbdt (cbdt_prime, cbdt + offset, length))) return_trace (false); - - return_trace (subtable_prime->add_offset (c, new_local_offset, size)); - } - bool add_offset (hb_serialize_context_t *c, unsigned int local_offset, unsigned int *size /* OUT (accumulated) */) @@ -303,8 +308,8 @@ struct IndexSubtable TRACE_SERIALIZE (this); switch (u.header.indexFormat) { - case 1: return_trace (u.format1.add_offset (c, local_offset, size)); - case 3: return_trace (u.format3.add_offset (c, local_offset, size)); + case 1: hb_barrier (); return_trace (u.format1.add_offset (c, local_offset, size)); + case 3: hb_barrier (); return_trace (u.format3.add_offset (c, local_offset, size)); // TODO: Implement tables 2, 4, 5 case 2: // Should be a no-op. case 4: case 5: // Handle sparse cases. @@ -329,8 +334,8 @@ struct IndexSubtable *format = u.header.imageFormat; switch (u.header.indexFormat) { - case 1: return u.format1.get_image_data (idx, offset, length); - case 3: return u.format3.get_image_data (idx, offset, length); + case 1: hb_barrier (); return u.format1.get_image_data (idx, offset, length); + case 3: hb_barrier (); return u.format3.get_image_data (idx, offset, length); default: return false; } } @@ -403,12 +408,13 @@ struct IndexSubtableRecord auto *old_subtable = get_subtable (base); auto *old_header = old_subtable->get_header (); + unsigned int image_format = old_header->imageFormat; - subtable->populate_header (old_header->indexFormat, - old_header->imageFormat, - bitmap_size_context->cbdt_prime->length, - &bitmap_size_context->size); - + /* Collect this subtable's image data and the length of each glyph's block + * (zero for glyphs without data). This allows an earlier identical + * subtable to share the same data. */ + hb_vector_t data; + hb_vector_t lengths; unsigned int num_glyphs = 0; bool early_exit = false; for (unsigned int i = *start; i < lookup->length; i++) @@ -424,12 +430,9 @@ struct IndexSubtableRecord break; } unsigned int num_missing = record->add_glyph_for_subset (new_gid); - if (unlikely (!subtable->fill_missing_glyphs (c->serializer, - bitmap_size_context->cbdt_prime->length, - num_missing, - &bitmap_size_context->size, - &num_glyphs))) - return_trace (false); + for (unsigned int j = 0; j < num_missing; j++) + if (unlikely (!c->serializer->check_success (lengths.push_or_fail (0)))) + return_trace (false); hb_codepoint_t old_gid = 0; c->plan->old_gid_for_new_gid (new_gid, &old_gid); @@ -437,20 +440,65 @@ struct IndexSubtableRecord return_trace (false); unsigned int old_idx = (unsigned int) old_gid - next_record->firstGlyphIndex; - if (unlikely (!next_subtable->copy_glyph_at_idx (c->serializer, - old_idx, - bitmap_size_context->cbdt, - bitmap_size_context->cbdt_length, - bitmap_size_context->cbdt_prime, - subtable, - &bitmap_size_context->size))) + unsigned int offset, length, format; + if (unlikely (!next_subtable->get_image_data (old_idx, &offset, &length, &format))) + return_trace (false); + if (unlikely (offset > bitmap_size_context->cbdt_length || + bitmap_size_context->cbdt_length - offset < length)) + return_trace (false); + if (unlikely (!c->serializer->check_success ( + _copy_data_to_cbdt (&data, + bitmap_size_context->cbdt + offset, + length)))) return_trace (false); - num_glyphs += 1; + if (unlikely (!c->serializer->check_success (lengths.push_or_fail (length)))) + return_trace (false); + num_glyphs += 1 + num_missing; } if (!early_exit) *start = lookup->length; + + /* Find or append the data block for this subtable. */ + unsigned int image_data_offset; + cbdt_dedup_context_t *dedup = bitmap_size_context->dedup; + bool shared = false; + uint64_t key = 0; + if (dedup && data.length) + { + key = cbdt_dedup_context_t::hash (image_format, data, lengths); + shared = dedup->find (key, data, lengths, + *bitmap_size_context->cbdt_prime, + &image_data_offset); + } + if (!shared) + { + image_data_offset = bitmap_size_context->cbdt_prime->length; + if (unlikely (!c->serializer->check_success ( + _copy_data_to_cbdt (bitmap_size_context->cbdt_prime, + data.arrayZ, data.length)))) + return_trace (false); + if (dedup && data.length) + /* The bitmap data is already copied; caching is best-effort. */ + (void) dedup->add (key, image_data_offset, lengths); + } + + subtable->populate_header (old_header->indexFormat, + image_format, + image_data_offset, + &bitmap_size_context->size); + + /* Glyphs without data use the offset of the following block's start, + * which yields a zero length span, matching the old behavior. */ + unsigned int cumulative = 0; + for (unsigned int length : lengths) + { + if (unlikely (!subtable->add_offset (c->serializer, cumulative, + &bitmap_size_context->size))) + return_trace (false); + cumulative += length; + } if (unlikely (!subtable->finish_subtable (c->serializer, - bitmap_size_context->cbdt_prime->length, + cumulative, num_glyphs, &bitmap_size_context->size))) return_trace (false); @@ -653,7 +701,8 @@ struct BitmapSizeTable bool subset (hb_subset_context_t *c, const void *base, const char *cbdt, unsigned int cbdt_length, - hb_vector_t *cbdt_prime /* INOUT */) const + hb_vector_t *cbdt_prime /* INOUT */, + cbdt_dedup_context_t *dedup /* INOUT */) const { TRACE_SUBSET (this); auto *out_table = c->serializer->embed (this); @@ -667,6 +716,7 @@ struct BitmapSizeTable bitmap_size_context.num_tables = numberOfIndexSubtables; bitmap_size_context.start_glyph = 1; bitmap_size_context.end_glyph = 0; + bitmap_size_context.dedup = dedup; if (!out_table->indexSubtableArrayOffset.serialize_subset (c, indexSubtableArrayOffset, @@ -764,7 +814,8 @@ struct CBLC bool subset_size_table (hb_subset_context_t *c, const BitmapSizeTable& table, const char *cbdt /* IN */, unsigned int cbdt_length, - CBLC *cblc_prime /* INOUT */, hb_vector_t *cbdt_prime /* INOUT */) const + CBLC *cblc_prime /* INOUT */, hb_vector_t *cbdt_prime /* INOUT */, + cbdt_dedup_context_t *dedup /* INOUT */) const { TRACE_SUBSET (this); cblc_prime->sizeTables.len++; @@ -772,7 +823,7 @@ struct CBLC auto snap = c->serializer->snapshot (); auto cbdt_prime_len = cbdt_prime->length; - if (!table.subset (c, this, cbdt, cbdt_length, cbdt_prime)) + if (!table.subset (c, this, cbdt, cbdt_length, cbdt_prime, dedup)) { cblc_prime->sizeTables.len--; c->serializer->revert (snap); @@ -882,10 +933,10 @@ struct CBDT { float x_scale = upem / (float) strike.ppemX; float y_scale = upem / (float) strike.ppemY; - extents->x_bearing = roundf (extents->x_bearing * x_scale); - extents->y_bearing = roundf (extents->y_bearing * y_scale); - extents->width = roundf (extents->width * x_scale); - extents->height = roundf (extents->height * y_scale); + extents->x_bearing = hb_clamp_to (roundf (extents->x_bearing * x_scale)); + extents->y_bearing = hb_clamp_to (roundf (extents->y_bearing * y_scale)); + extents->width = hb_clamp_to (roundf (extents->width * x_scale)); + extents->height = hb_clamp_to (roundf (extents->height * y_scale)); } return true; @@ -1015,8 +1066,9 @@ CBLC::subset (hb_subset_context_t *c) const } _copy_data_to_cbdt (&cbdt_prime, cbdt, CBDT::min_size); + cbdt_dedup_context_t dedup; for (const BitmapSizeTable& table : + sizeTables.iter ()) - subset_size_table (c, table, (const char *) cbdt, cbdt_length, cblc_prime, &cbdt_prime); + subset_size_table (c, table, (const char *) cbdt, cbdt_length, cblc_prime, &cbdt_prime, &dedup); hb_blob_destroy (cbdt_blob); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh index 37bb8a8f9458..b62d63a478f6 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh @@ -35,7 +35,9 @@ #include "../../../hb-paint.hh" #include "../../../hb-paint-bounded.hh" #include "../../../hb-paint-extents.hh" +#include "../../../hb-depend-data.hh" +#include "../../../hb-ot-dual.hh" #include "../CPAL/CPAL.hh" /* @@ -119,6 +121,14 @@ public: hb_font_destroy (font); } + static unsigned + color_alpha (hb_color_t color, float alpha) + { + /* Font-supplied alpha is F2DOT14 plus variation deltas, so it can be + * negative or greater than one; converting that to unsigned is UB. */ + return roundf (hb_color_get_alpha (color) * hb_clamp (alpha, 0.f, 1.f)); + } + hb_color_t get_color (unsigned int color_index, float alpha, hb_bool_t *is_foreground) { hb_color_t color = foreground; @@ -136,7 +146,7 @@ public: return HB_COLOR (hb_color_get_blue (color), hb_color_get_green (color), hb_color_get_red (color), - hb_color_get_alpha (color) * alpha); + color_alpha (color, alpha)); } inline void recurse (const Paint &paint); @@ -219,6 +229,58 @@ struct hb_colrv1_closure_context_t : {} }; + +struct hb_colrv1_depend_context_t : + hb_dispatch_context_t +{ + template + return_t dispatch (const T &obj) + { + if (unlikely (nesting_level_left == 0)) + return hb_empty_t (); + + if (paint_visited (&obj)) + return hb_empty_t (); + + nesting_level_left--; + obj.dependv1 (this); + nesting_level_left++; + return hb_empty_t (); + } + static return_t default_return_value () { return hb_empty_t (); } + + bool paint_visited (const void *paint) + { + hb_codepoint_t delta = (hb_codepoint_t) ((uintptr_t) paint - (uintptr_t) colr); + if (visited_paint.in_error() || visited_paint.has (delta)) + return true; + + visited_paint.add (delta); + if (unlikely (visited_paint.in_error ())) + depend_data->fail (); + return false; + } + + const COLR* get_colr_table () const + { return colr; } + + public: + const COLR *colr; + hb_depend_data_builder_t *depend_data; + hb_set_t visited_paint; + unsigned nesting_level_left; + hb_codepoint_t source_gid; + + hb_colrv1_depend_context_t (const COLR *colr_, + hb_depend_data_builder_t *depend_data_, + unsigned nesting_level_left_ = HB_MAX_NESTING_LEVEL) : + colr (colr_), + depend_data (depend_data_), + nesting_level_left (nesting_level_left_), + source_gid (0) + {} +}; + struct LayerRecord { operator hb_ot_color_layer_t () const { return {glyphId, colorIdx}; } @@ -274,12 +336,17 @@ struct Variable { static constexpr bool is_variable = true; + const T& get_value () const { return value; } + Variable* copy (hb_serialize_context_t *c) const { TRACE_SERIALIZE (this); return_trace (c->embed (this)); } + void dependv1 (hb_colrv1_depend_context_t* c) const + { value.dependv1 (c); } + void closurev1 (hb_colrv1_closure_context_t* c) const { c->num_var_idxes = 0; @@ -329,6 +396,12 @@ struct Variable value.get_color_stop (c, stop, varIdxBase, instancer); } + void get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + value.get_solid_color (c, varIdxBase, is_foreground, color); + } + hb_paint_extend_t get_extend () const { return value.get_extend (); @@ -347,6 +420,8 @@ struct NoVariable { static constexpr bool is_variable = false; + const T& get_value () const { return value; } + static constexpr uint32_t varIdxBase = VarIdx::NO_VARIATION; NoVariable* copy (hb_serialize_context_t *c) const @@ -355,6 +430,9 @@ struct NoVariable return_trace (c->embed (this)); } + void dependv1 (hb_colrv1_depend_context_t* c) const + { value.dependv1 (c); } + void closurev1 (hb_colrv1_closure_context_t* c) const { value.closurev1 (c); } @@ -384,6 +462,12 @@ struct NoVariable value.get_color_stop (c, stop, VarIdx::NO_VARIATION, instancer); } + void get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + value.get_solid_color (c, VarIdx::NO_VARIATION, is_foreground, color); + } + hb_paint_extend_t get_extend () const { return value.get_extend (); @@ -396,8 +480,18 @@ struct NoVariable // Color structures +template +static void +set_fixed_clamped (HBFixed &out, float value) +{ + // Variation deltas are unbounded; clamp before the implicit integer cast. + out.set_int (hb_clamp_to (roundf ((value / HBFixed::mult)))); +} + struct ColorStop { + void dependv1 (hb_colrv1_depend_context_t * c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { c->add_palette_index (paletteIndex); @@ -414,8 +508,12 @@ struct ColorStop if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->stopOffset.set_float (stopOffset.to_float(instancer (varIdxBase, 0))); - out->alpha.set_float (alpha.to_float (instancer (varIdxBase, 1))); + set_fixed_clamped (out->stopOffset, stopOffset.to_float(instancer (varIdxBase, 0))); + float a = alpha.to_float (instancer (varIdxBase, 1)); + /* Partial instances must keep the unclamped base: retained axes can + * bring the alpha back into range. Clamp before narrowing a full + * instance so overflow cannot wrap an opaque alpha to transparent. */ + set_fixed_clamped (out->alpha, c->plan->all_axes_pinned ? hb_clamp (a, 0.f, 1.f) : a); } return_trace (c->serializer->check_assign (out->paletteIndex, c->plan->colr_palettes.get (paletteIndex), @@ -460,6 +558,8 @@ struct Extend : HBUINT8 template class Var> struct ColorLine { + void dependv1 (hb_colrv1_depend_context_t * c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { for (const auto &stop : stops.iter ()) @@ -555,44 +655,6 @@ struct ColorLine // or all of the specified modes. struct CompositeMode : HBUINT8 { - enum { - // Porter-Duff modes - // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators - COMPOSITE_CLEAR = 0, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_clear - COMPOSITE_SRC = 1, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_src - COMPOSITE_DEST = 2, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dst - COMPOSITE_SRC_OVER = 3, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcover - COMPOSITE_DEST_OVER = 4, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstover - COMPOSITE_SRC_IN = 5, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcin - COMPOSITE_DEST_IN = 6, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstin - COMPOSITE_SRC_OUT = 7, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcout - COMPOSITE_DEST_OUT = 8, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstout - COMPOSITE_SRC_ATOP = 9, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcatop - COMPOSITE_DEST_ATOP = 10, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstatop - COMPOSITE_XOR = 11, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_xor - COMPOSITE_PLUS = 12, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_plus - - // Blend modes - // https://www.w3.org/TR/compositing-1/#blending - COMPOSITE_SCREEN = 13, // https://www.w3.org/TR/compositing-1/#blendingscreen - COMPOSITE_OVERLAY = 14, // https://www.w3.org/TR/compositing-1/#blendingoverlay - COMPOSITE_DARKEN = 15, // https://www.w3.org/TR/compositing-1/#blendingdarken - COMPOSITE_LIGHTEN = 16, // https://www.w3.org/TR/compositing-1/#blendinglighten - COMPOSITE_COLOR_DODGE = 17, // https://www.w3.org/TR/compositing-1/#blendingcolordodge - COMPOSITE_COLOR_BURN = 18, // https://www.w3.org/TR/compositing-1/#blendingcolorburn - COMPOSITE_HARD_LIGHT = 19, // https://www.w3.org/TR/compositing-1/#blendinghardlight - COMPOSITE_SOFT_LIGHT = 20, // https://www.w3.org/TR/compositing-1/#blendingsoftlight - COMPOSITE_DIFFERENCE = 21, // https://www.w3.org/TR/compositing-1/#blendingdifference - COMPOSITE_EXCLUSION = 22, // https://www.w3.org/TR/compositing-1/#blendingexclusion - COMPOSITE_MULTIPLY = 23, // https://www.w3.org/TR/compositing-1/#blendingmultiply - - // Modes that, uniquely, do not operate on components - // https://www.w3.org/TR/compositing-1/#blendingnonseparable - COMPOSITE_HSL_HUE = 24, // https://www.w3.org/TR/compositing-1/#blendinghue - COMPOSITE_HSL_SATURATION = 25, // https://www.w3.org/TR/compositing-1/#blendingsaturation - COMPOSITE_HSL_COLOR = 26, // https://www.w3.org/TR/compositing-1/#blendingcolor - COMPOSITE_HSL_LUMINOSITY = 27, // https://www.w3.org/TR/compositing-1/#blendingluminosity - }; public: DEFINE_SIZE_STATIC (1); }; @@ -605,6 +667,8 @@ struct Affine2x3 return_trace (c->check_struct (this)); } + void dependv1 (hb_colrv1_depend_context_t* c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { c->num_var_idxes = 6; } @@ -617,12 +681,17 @@ struct Affine2x3 if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->xx.set_float (xx.to_float(instancer (varIdxBase, 0))); - out->yx.set_float (yx.to_float(instancer (varIdxBase, 1))); - out->xy.set_float (xy.to_float(instancer (varIdxBase, 2))); - out->yy.set_float (yy.to_float(instancer (varIdxBase, 3))); - out->dx.set_float (dx.to_float(instancer (varIdxBase, 4))); - out->dy.set_float (dy.to_float(instancer (varIdxBase, 5))); + auto fold = [&] (F16DOT16 &target, F16DOT16 source, unsigned offset) { + // Keep the stored integer precise while applying the float delta. + target.set_int (hb_clamp_to (roundf ((double) source.to_int () + + (double) instancer (varIdxBase, offset)))); + }; + fold (out->xx, xx, 0); + fold (out->yx, yx, 1); + fold (out->xy, xy, 2); + fold (out->yy, yy, 3); + fold (out->dx, dx, 4); + fold (out->dy, dy, 5); } return_trace (true); } @@ -651,7 +720,8 @@ struct Affine2x3 struct PaintColrLayers { - void closurev1 (hb_colrv1_closure_context_t* c) const; + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; + HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, const ItemVarStoreInstancer &instancer HB_UNUSED) const @@ -682,6 +752,7 @@ struct PaintColrLayers struct PaintSolid { + void dependv1 (hb_colrv1_depend_context_t* c) const {} void closurev1 (hb_colrv1_closure_context_t* c) const { c->add_palette_index (paletteIndex); @@ -697,7 +768,10 @@ struct PaintSolid if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) - out->alpha.set_float (alpha.to_float (instancer (varIdxBase, 0))); + { + float a = alpha.to_float (instancer (varIdxBase, 0)); + set_fixed_clamped (out->alpha, c->plan->all_axes_pinned ? hb_clamp (a, 0.f, 1.f) : a); + } if (format == 3 && c->plan->all_axes_pinned) out->format = 2; @@ -712,15 +786,21 @@ struct PaintSolid return_trace (c->check_struct (this)); } + void get_solid_color (hb_paint_context_t *c, uint32_t varIdxBase, + hb_bool_t *is_foreground, hb_color_t *color) const + { + *color = c->get_color (paletteIndex, + alpha.to_float (c->instancer (varIdxBase, 0)), + is_foreground); + } + void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const { TRACE_PAINT (this); hb_bool_t is_foreground; hb_color_t color; - color = c->get_color (paletteIndex, - alpha.to_float (c->instancer (varIdxBase, 0)), - &is_foreground); + get_solid_color (c, varIdxBase, &is_foreground, &color); c->funcs->color (c->data, is_foreground, color); } @@ -734,6 +814,8 @@ struct PaintSolid template class Var> struct PaintLinearGradient { + void dependv1 (hb_colrv1_depend_context_t* c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { (this+colorLine).closurev1 (c); @@ -750,12 +832,12 @@ struct PaintLinearGradient if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->x0 = x0 + (int) roundf (instancer (varIdxBase, 0)); - out->y0 = y0 + (int) roundf (instancer (varIdxBase, 1)); - out->x1 = x1 + (int) roundf (instancer (varIdxBase, 2)); - out->y1 = y1 + (int) roundf (instancer (varIdxBase, 3)); - out->x2 = x2 + (int) roundf (instancer (varIdxBase, 4)); - out->y2 = y2 + (int) roundf (instancer (varIdxBase, 5)); + out->x0 = hb_clamp_to ((double) x0 + (double) roundf (instancer (varIdxBase, 0))); + out->y0 = hb_clamp_to ((double) y0 + (double) roundf (instancer (varIdxBase, 1))); + out->x1 = hb_clamp_to ((double) x1 + (double) roundf (instancer (varIdxBase, 2))); + out->y1 = hb_clamp_to ((double) y1 + (double) roundf (instancer (varIdxBase, 3))); + out->x2 = hb_clamp_to ((double) x2 + (double) roundf (instancer (varIdxBase, 4))); + out->y2 = hb_clamp_to ((double) y2 + (double) roundf (instancer (varIdxBase, 5))); } if (format == 5 && c->plan->all_axes_pinned) @@ -804,28 +886,189 @@ struct PaintLinearGradient template class Var> struct PaintRadialGradient { + bool constant_after_pinning (hb_subset_context_t *c, + const ItemVarStoreInstancer &instancer) const + { + if (c->plan->has_avar2) return false; + const auto ®ions = instancer.varStore->get_region_list (); + for (unsigned i = 0; i < regions.regionCount; i++) + { + hb_hashmap_t axes; + if (!regions.get_var_region (i, c->plan->axes_old_index_tag_map, axes)) + { + c->serializer->err (HB_SERIALIZE_ERROR_OUT_OF_ROOM); + return false; + } + for (auto axis : axes) + { + Triple *limit; + if (!c->plan->user_axes_location.has (axis.first, &limit) || + limit->minimum != limit->maximum) + return false; + } + } + return true; + } + + void dependv1 (hb_colrv1_depend_context_t* c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { (this+colorLine).closurev1 (c); c->num_var_idxes = 6; } + bool subset_nonnegative (hb_subset_context_t *c, + const ItemVarStoreInstancer &instancer, + uint32_t varIdxBase) const + { + double source[6] = { + x0 + (double) roundf (instancer (varIdxBase, 0)), + y0 + (double) roundf (instancer (varIdxBase, 1)), + radius0 + (double) roundf (instancer (varIdxBase, 2)), + x1 + (double) roundf (instancer (varIdxBase, 3)), + y1 + (double) roundf (instancer (varIdxBase, 4)), + radius1 + (double) roundf (instancer (varIdxBase, 5)) + }; + auto transparent = [&] { + auto *out = c->serializer->allocate_size (5); + if (!out) return false; + out->format = 2; out->paletteIndex = 0xFFFF; out->alpha.set_float (0); + return true; + }; + const auto &line = this+colorLine; + if (source[2] == source[5] || !line.stops.len) return transparent (); + struct stop_t { double offset, alpha; unsigned palette, order; }; + hb_vector_t stops; + if (!stops.alloc (line.stops.len)) return false; + unsigned order = 0; + for (const auto &entry : line.stops.iter ()) + { + const auto &stop = entry.get_value (); + stops.push (stop_t {(double) roundf (stop.stopOffset.to_float (instancer (entry.varIdxBase, 0)) * 16384.f) / 16384., + (double) hb_clamp (stop.alpha.to_float (instancer (entry.varIdxBase, 1)), 0.f, 1.f), + stop.paletteIndex, order++}); + } + if (stops.in_error ()) return false; + stops.qsort ([] (const stop_t &a, const stop_t &b) { + return a.offset < b.offset ? -1 : a.offset > b.offset ? 1 : + a.order < b.order ? -1 : a.order > b.order ? 1 : 0; + }); + double dr = source[5] - source[2]; + // Fractional shifts must preserve both integer circles and F2Dot14 stops. + unsigned lattice = 16384; + for (unsigned j = 0; j < 3; j++) + { + double remainder = fmod (fabs (source[j + 3] - source[j]), 16384.); + if (!(remainder >= 0 && remainder < 16384)) + { + c->serializer->err (HB_SERIALIZE_ERROR_INT_OVERFLOW); + return false; + } + unsigned right = (unsigned) remainder; + while (right) { unsigned r = lattice % right; lattice = right; right = r; } + } + for (unsigned shift = 0; shift < 16; shift++) + { + double b = 1u << shift; + double coarse = dr > 0 ? ceil (-source[2] / dr) : floor (source[2] / -dr) - b; + double fine = dr > 0 ? ceil (-source[2] / dr * lattice) / lattice : + floor (source[2] / -dr * lattice) / lattice - b; + double candidates[] = {coarse, fine}; + for (double a : candidates) + { + // omega = a + b*q. Positive b preserves the largest valid root. + double geometry[6]; + bool fits = true; + for (unsigned j = 0; j < 3; j++) + { + double difference = source[j + 3] - source[j]; + geometry[j] = source[j] + a * difference; + geometry[j + 3] = source[j] + (a + b) * difference; + double low = j == 2 ? 0 : -32768, high = j == 2 ? 65535 : 32767; + fits &= geometry[j] >= low && geometry[j] <= high && + geometry[j + 3] >= low && geometry[j + 3] <= high; + } + if (!fits) continue; + unsigned first = 0, count = stops.length; + double min = (stops[0].offset - a) / b, max = (stops.tail ().offset - a) / b; + double bias = 0; + bool constant = false; + if (line.extend == Extend::EXTEND_PAD) + { + double tip = -geometry[2] / (b * dr); + if ((dr > 0 && max <= tip) || (dr < 0 && min > tip)) + { + first = dr > 0 ? stops.length - 1 : 0; + count = 1; constant = true; + } + } + else + { + double period = max - min; + if (line.extend == Extend::EXTEND_REFLECT) period *= 2; + if (period <= 0) return transparent (); + double n = ceil ((-2 - min) / period); + if (n > floor ((32767. / 16384. - max) / period)) continue; + bias = n * period; + } + for (unsigned j = 0; j < count; j++) + { + double bits = constant ? 0 : ((stops[first + j].offset - a) / b + bias) * 16384; + fits &= bits >= -32768 && bits <= 32767 && bits == round (bits); + } + if (!fits) continue; + auto *out = c->serializer->allocate_size> (16); + if (!out) return false; + out->format = 6; + out->x0 = (int) geometry[0]; out->y0 = (int) geometry[1]; out->radius0 = (unsigned) geometry[2]; + out->x1 = (int) geometry[3]; out->y1 = (int) geometry[4]; out->radius1 = (unsigned) geometry[5]; + c->serializer->push (); + auto *out_line = c->serializer->allocate_size> (3 + count * ColorStop::static_size); + if (!out_line) { c->serializer->pop_discard (); return false; } + out_line->extend = line.extend; + out_line->stops.len = count; + for (unsigned j = 0; j < count; j++) + { + const auto &stop = stops[first + j]; + auto &out_stop = out_line->stops[j].value; + out_stop.stopOffset.set_float ((float) (constant ? 0 : (stop.offset - a) / b + bias)); + out_stop.alpha.set_float ((float) stop.alpha); + if (!c->serializer->check_assign (out_stop.paletteIndex, c->plan->colr_palettes.get (stop.palette), + HB_SERIALIZE_ERROR_INT_OVERFLOW)) + { c->serializer->pop_discard (); return false; } + } + c->serializer->add_link (out->colorLine, c->serializer->pop_pack ()); + return !c->serializer->in_error (); + } + } + // Reject an unrepresentable static result instead of changing its colors. + c->serializer->err (HB_SERIALIZE_ERROR_INT_OVERFLOW); + return false; + } + bool subset (hb_subset_context_t *c, const ItemVarStoreInstancer &instancer, uint32_t varIdxBase) const { TRACE_SUBSET (this); + if (instancer && !c->plan->pinned_at_default && + (c->plan->all_axes_pinned || constant_after_pinning (c, instancer)) && + varIdxBase != VarIdx::NO_VARIATION && + (radius0 + (double) roundf (instancer (varIdxBase, 2)) < 0 || + radius1 + (double) roundf (instancer (varIdxBase, 5)) < 0)) + return_trace (subset_nonnegative (c, instancer, varIdxBase)); auto *out = c->serializer->embed (this); if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->x0 = x0 + (int) roundf (instancer (varIdxBase, 0)); - out->y0 = y0 + (int) roundf (instancer (varIdxBase, 1)); - out->radius0 = radius0 + (unsigned) roundf (instancer (varIdxBase, 2)); - out->x1 = x1 + (int) roundf (instancer (varIdxBase, 3)); - out->y1 = y1 + (int) roundf (instancer (varIdxBase, 4)); - out->radius1 = radius1 + (unsigned) roundf (instancer (varIdxBase, 5)); + out->x0 = hb_clamp_to ((double) x0 + (double) roundf (instancer (varIdxBase, 0))); + out->y0 = hb_clamp_to ((double) y0 + (double) roundf (instancer (varIdxBase, 1))); + out->radius0 = hb_clamp_to ((double) radius0 + (double) roundf (instancer (varIdxBase, 2))); + out->x1 = hb_clamp_to ((double) x1 + (double) roundf (instancer (varIdxBase, 3))); + out->y1 = hb_clamp_to ((double) y1 + (double) roundf (instancer (varIdxBase, 4))); + out->radius1 = hb_clamp_to ((double) radius1 + (double) roundf (instancer (varIdxBase, 5))); } if (format == 7 && c->plan->all_axes_pinned) @@ -874,6 +1117,8 @@ struct PaintRadialGradient template class Var> struct PaintSweepGradient { + void dependv1 (hb_colrv1_depend_context_t* c) const {} + void closurev1 (hb_colrv1_closure_context_t* c) const { (this+colorLine).closurev1 (c); @@ -890,10 +1135,10 @@ struct PaintSweepGradient if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->centerX = centerX + (int) roundf (instancer (varIdxBase, 0)); - out->centerY = centerY + (int) roundf (instancer (varIdxBase, 1)); - out->startAngle.set_float (startAngle.to_float (instancer (varIdxBase, 2))); - out->endAngle.set_float (endAngle.to_float (instancer (varIdxBase, 3))); + out->centerX = hb_clamp_to ((double) centerX + (double) roundf (instancer (varIdxBase, 0))); + out->centerY = hb_clamp_to ((double) centerY + (double) roundf (instancer (varIdxBase, 1))); + set_fixed_clamped (out->startAngle, startAngle.to_float (instancer (varIdxBase, 2))); + set_fixed_clamped (out->endAngle, endAngle.to_float (instancer (varIdxBase, 3))); } if (format == 9 && c->plan->all_axes_pinned) @@ -936,9 +1181,13 @@ struct PaintSweepGradient }; // Paint a non-COLR glyph, filled as indicated by paint. +template struct PaintGlyph { - void closurev1 (hb_colrv1_closure_context_t* c) const; + using HBGlyphID = typename Types::HBGlyphID; + + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; + HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, const ItemVarStoreInstancer &instancer) const @@ -960,28 +1209,19 @@ struct PaintGlyph return_trace (c->check_struct (this) && paint.sanitize (c, this)); } - void paint_glyph (hb_paint_context_t *c) const - { - TRACE_PAINT (this); - c->funcs->push_inverse_font_transform (c->data, c->font); - c->funcs->push_clip_glyph (c->data, gid, c->font); - c->funcs->push_font_transform (c->data, c->font); - c->recurse (this+paint); - c->funcs->pop_transform (c->data); - c->funcs->pop_clip (c->data); - c->funcs->pop_transform (c->data); - } + inline void paint_glyph (hb_paint_context_t *c) const; - HBUINT8 format; /* format = 10 */ + HBUINT8 format; /* format = 10 or 33 */ Offset24To paint; /* Offset (from beginning of PaintGlyph table) to Paint subtable. */ - HBUINT16 gid; + HBGlyphID gid; public: - DEFINE_SIZE_STATIC (6); + DEFINE_SIZE_STATIC (4 + HBGlyphID::static_size); }; struct PaintColrGlyph { - void closurev1 (hb_colrv1_closure_context_t* c) const; + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; + HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, const ItemVarStoreInstancer &instancer HB_UNUSED) const @@ -1011,6 +1251,7 @@ struct PaintColrGlyph template class Var> struct PaintTransform { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1050,6 +1291,7 @@ struct PaintTransform struct PaintTranslate { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1062,8 +1304,8 @@ struct PaintTranslate if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->dx = dx + (int) roundf (instancer (varIdxBase, 0)); - out->dy = dy + (int) roundf (instancer (varIdxBase, 1)); + out->dx = hb_clamp_to ((double) dx + (double) roundf (instancer (varIdxBase, 0))); + out->dy = hb_clamp_to ((double) dy + (double) roundf (instancer (varIdxBase, 1))); } if (format == 15 && c->plan->all_axes_pinned) @@ -1097,8 +1339,73 @@ struct PaintTranslate DEFINE_SIZE_STATIC (4 + 2 * FWORD::static_size); }; +template +static bool serialize_scale_transform (hb_subset_context_t *c, + float sx, float sy, float dx, float dy, + const Source &source) +{ + auto *out = c->serializer->allocate_size> (7); + if (unlikely (!out)) return false; + out->format = 12; + + c->serializer->push (); + auto *transform = c->serializer->allocate_size (Affine2x3::static_size); + if (unlikely (!transform)) + { + c->serializer->pop_discard (); + return false; + } + set_fixed_clamped (transform->xx, sx); + transform->yx.set_float (0); + transform->xy.set_float (0); + set_fixed_clamped (transform->yy, sy); + set_fixed_clamped (transform->dx, dx); + set_fixed_clamped (transform->dy, dy); + c->serializer->add_link (out->transform, c->serializer->pop_pack ()); + + c->serializer->push (); + bool ret = source (); + if (ret) + c->serializer->add_link (out->src, c->serializer->pop_pack ()); + else + c->serializer->pop_discard (); + return ret; +} + +template +static bool subset_scale_as_transform (hb_subset_context_t *c, + const Base *base, + const Offset24To &src, + const ItemVarStoreInstancer &instancer, + float sx, float sy, + float cx = 0, float cy = 0) +{ + if (src.is_null ()) return false; + auto source = [&] { return c->dispatch (base+src, instancer); }; + float dx = cx * (1 - sx), dy = cy * (1 - sy); + if (dx >= -32768 && dx < 32768 && dy >= -32768 && dy < 32768) + return serialize_scale_transform (c, sx, sy, dx, dy, source); + + // Preserve the center as separate translations when the combined matrix + // exceeds Fixed. Splitting also makes the inverse of -32768 representable. + auto inner = [&] { + return serialize_scale_transform (c, 1, 1, -cx / 2, -cy / 2, source); + }; + auto inverse = [&] { + return serialize_scale_transform (c, 1, 1, -cx / 2, -cy / 2, inner); + }; + auto scale = [&] { + return serialize_scale_transform (c, sx, sy, 0, 0, inverse); + }; + auto outer = [&] { + return serialize_scale_transform (c, 1, 1, cx / 2, cy / 2, scale); + }; + return serialize_scale_transform (c, 1, 1, cx / 2, cy / 2, outer); +} + struct PaintScale { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1106,13 +1413,21 @@ struct PaintScale uint32_t varIdxBase) const { TRACE_SUBSET (this); + if (c->plan->all_axes_pinned && instancer && + !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) + { + float sx = roundf (scaleX.to_float (instancer (varIdxBase, 0)) * 16384) / 16384; + float sy = roundf (scaleY.to_float (instancer (varIdxBase, 1)) * 16384) / 16384; + if (sx < -2 || sx >= 2 || sy < -2 || sy >= 2) + return_trace (subset_scale_as_transform (c, this, src, instancer, sx, sy)); + } auto *out = c->serializer->embed (this); if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->scaleX.set_float (scaleX.to_float (instancer (varIdxBase, 0))); - out->scaleY.set_float (scaleY.to_float (instancer (varIdxBase, 1))); + set_fixed_clamped (out->scaleX, scaleX.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->scaleY, scaleY.to_float (instancer (varIdxBase, 1))); } if (format == 17 && c->plan->all_axes_pinned) @@ -1148,6 +1463,7 @@ struct PaintScale struct PaintScaleAroundCenter { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1155,15 +1471,26 @@ struct PaintScaleAroundCenter uint32_t varIdxBase) const { TRACE_SUBSET (this); + if (c->plan->all_axes_pinned && instancer && + !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) + { + float sx = roundf (scaleX.to_float (instancer (varIdxBase, 0)) * 16384) / 16384; + float sy = roundf (scaleY.to_float (instancer (varIdxBase, 1)) * 16384) / 16384; + if (sx < -2 || sx >= 2 || sy < -2 || sy >= 2) + return_trace (subset_scale_as_transform ( + c, this, src, instancer, sx, sy, + centerX + roundf (instancer (varIdxBase, 2)), + centerY + roundf (instancer (varIdxBase, 3)))); + } auto *out = c->serializer->embed (this); if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->scaleX.set_float (scaleX.to_float (instancer (varIdxBase, 0))); - out->scaleY.set_float (scaleY.to_float (instancer (varIdxBase, 1))); - out->centerX = centerX + (int) roundf (instancer (varIdxBase, 2)); - out->centerY = centerY + (int) roundf (instancer (varIdxBase, 3)); + set_fixed_clamped (out->scaleX, scaleX.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->scaleY, scaleY.to_float (instancer (varIdxBase, 1))); + out->centerX = hb_clamp_to ((double) centerX + (double) roundf (instancer (varIdxBase, 2))); + out->centerY = hb_clamp_to ((double) centerY + (double) roundf (instancer (varIdxBase, 3))); } if (format == 19 && c->plan->all_axes_pinned) @@ -1203,6 +1530,7 @@ struct PaintScaleAroundCenter struct PaintScaleUniform { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1210,11 +1538,18 @@ struct PaintScaleUniform uint32_t varIdxBase) const { TRACE_SUBSET (this); + if (c->plan->all_axes_pinned && instancer && + !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) + { + float s = roundf (scale.to_float (instancer (varIdxBase, 0)) * 16384) / 16384; + if (s < -2 || s >= 2) + return_trace (subset_scale_as_transform (c, this, src, instancer, s, s)); + } auto *out = c->serializer->embed (this); if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) - out->scale.set_float (scale.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->scale, scale.to_float (instancer (varIdxBase, 0))); if (format == 21 && c->plan->all_axes_pinned) out->format = 20; @@ -1247,6 +1582,7 @@ struct PaintScaleUniform struct PaintScaleUniformAroundCenter { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1254,14 +1590,24 @@ struct PaintScaleUniformAroundCenter uint32_t varIdxBase) const { TRACE_SUBSET (this); + if (c->plan->all_axes_pinned && instancer && + !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) + { + float s = roundf (scale.to_float (instancer (varIdxBase, 0)) * 16384) / 16384; + if (s < -2 || s >= 2) + return_trace (subset_scale_as_transform ( + c, this, src, instancer, s, s, + centerX + roundf (instancer (varIdxBase, 1)), + centerY + roundf (instancer (varIdxBase, 2)))); + } auto *out = c->serializer->embed (this); if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->scale.set_float (scale.to_float (instancer (varIdxBase, 0))); - out->centerX = centerX + (int) roundf (instancer (varIdxBase, 1)); - out->centerY = centerY + (int) roundf (instancer (varIdxBase, 2)); + set_fixed_clamped (out->scale, scale.to_float (instancer (varIdxBase, 0))); + out->centerX = hb_clamp_to ((double) centerX + (double) roundf (instancer (varIdxBase, 1))); + out->centerY = hb_clamp_to ((double) centerY + (double) roundf (instancer (varIdxBase, 2))); } if (format == 23 && c->plan->all_axes_pinned) @@ -1299,6 +1645,7 @@ struct PaintScaleUniformAroundCenter struct PaintRotate { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1310,7 +1657,7 @@ struct PaintRotate if (unlikely (!out)) return_trace (false); if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) - out->angle.set_float (angle.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->angle, angle.to_float (instancer (varIdxBase, 0))); if (format == 25 && c->plan->all_axes_pinned) out->format = 24; @@ -1343,6 +1690,7 @@ struct PaintRotate struct PaintRotateAroundCenter { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1355,9 +1703,9 @@ struct PaintRotateAroundCenter if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->angle.set_float (angle.to_float (instancer (varIdxBase, 0))); - out->centerX = centerX + (int) roundf (instancer (varIdxBase, 1)); - out->centerY = centerY + (int) roundf (instancer (varIdxBase, 2)); + set_fixed_clamped (out->angle, angle.to_float (instancer (varIdxBase, 0))); + out->centerX = hb_clamp_to ((double) centerX + (double) roundf (instancer (varIdxBase, 1))); + out->centerY = hb_clamp_to ((double) centerY + (double) roundf (instancer (varIdxBase, 2))); } if (format ==27 && c->plan->all_axes_pinned) @@ -1395,6 +1743,7 @@ struct PaintRotateAroundCenter struct PaintSkew { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1407,8 +1756,8 @@ struct PaintSkew if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->xSkewAngle.set_float (xSkewAngle.to_float (instancer (varIdxBase, 0))); - out->ySkewAngle.set_float (ySkewAngle.to_float (instancer (varIdxBase, 1))); + set_fixed_clamped (out->xSkewAngle, xSkewAngle.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->ySkewAngle, ySkewAngle.to_float (instancer (varIdxBase, 1))); } if (format == 29 && c->plan->all_axes_pinned) @@ -1444,6 +1793,7 @@ struct PaintSkew struct PaintSkewAroundCenter { + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, @@ -1456,10 +1806,10 @@ struct PaintSkewAroundCenter if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->xSkewAngle.set_float (xSkewAngle.to_float (instancer (varIdxBase, 0))); - out->ySkewAngle.set_float (ySkewAngle.to_float (instancer (varIdxBase, 1))); - out->centerX = centerX + (int) roundf (instancer (varIdxBase, 2)); - out->centerY = centerY + (int) roundf (instancer (varIdxBase, 3)); + set_fixed_clamped (out->xSkewAngle, xSkewAngle.to_float (instancer (varIdxBase, 0))); + set_fixed_clamped (out->ySkewAngle, ySkewAngle.to_float (instancer (varIdxBase, 1))); + out->centerX = hb_clamp_to ((double) centerX + (double) roundf (instancer (varIdxBase, 2))); + out->centerY = hb_clamp_to ((double) centerY + (double) roundf (instancer (varIdxBase, 3))); } if (format == 31 && c->plan->all_axes_pinned) @@ -1499,7 +1849,8 @@ struct PaintSkewAroundCenter struct PaintComposite { - void closurev1 (hb_colrv1_closure_context_t* c) const; + HB_INTERNAL void dependv1 (hb_colrv1_depend_context_t* c) const; + HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const; bool subset (hb_subset_context_t *c, const ItemVarStoreInstancer &instancer) const @@ -1526,11 +1877,49 @@ struct PaintComposite void paint_glyph (hb_paint_context_t *c) const { TRACE_PAINT (this); + hb_paint_composite_mode_t composite_mode; + switch ((unsigned int) mode) + { + case HB_PAINT_COMPOSITE_MODE_CLEAR: + case HB_PAINT_COMPOSITE_MODE_SRC: + case HB_PAINT_COMPOSITE_MODE_DEST: + case HB_PAINT_COMPOSITE_MODE_SRC_OVER: + case HB_PAINT_COMPOSITE_MODE_DEST_OVER: + case HB_PAINT_COMPOSITE_MODE_SRC_IN: + case HB_PAINT_COMPOSITE_MODE_DEST_IN: + case HB_PAINT_COMPOSITE_MODE_SRC_OUT: + case HB_PAINT_COMPOSITE_MODE_DEST_OUT: + case HB_PAINT_COMPOSITE_MODE_SRC_ATOP: + case HB_PAINT_COMPOSITE_MODE_DEST_ATOP: + case HB_PAINT_COMPOSITE_MODE_XOR: + case HB_PAINT_COMPOSITE_MODE_PLUS: + case HB_PAINT_COMPOSITE_MODE_SCREEN: + case HB_PAINT_COMPOSITE_MODE_OVERLAY: + case HB_PAINT_COMPOSITE_MODE_DARKEN: + case HB_PAINT_COMPOSITE_MODE_LIGHTEN: + case HB_PAINT_COMPOSITE_MODE_COLOR_DODGE: + case HB_PAINT_COMPOSITE_MODE_COLOR_BURN: + case HB_PAINT_COMPOSITE_MODE_HARD_LIGHT: + case HB_PAINT_COMPOSITE_MODE_SOFT_LIGHT: + case HB_PAINT_COMPOSITE_MODE_DIFFERENCE: + case HB_PAINT_COMPOSITE_MODE_EXCLUSION: + case HB_PAINT_COMPOSITE_MODE_MULTIPLY: + case HB_PAINT_COMPOSITE_MODE_HSL_HUE: + case HB_PAINT_COMPOSITE_MODE_HSL_SATURATION: + case HB_PAINT_COMPOSITE_MODE_HSL_COLOR: + case HB_PAINT_COMPOSITE_MODE_HSL_LUMINOSITY: + composite_mode = (hb_paint_composite_mode_t) (unsigned int) mode; + break; + default: + composite_mode = HB_PAINT_COMPOSITE_MODE_CLEAR; + break; + } + c->funcs->push_group_for (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER); c->recurse (this+backdrop); - c->funcs->push_group_for (c->data, (hb_paint_composite_mode_t) (int) mode); + c->funcs->push_group_for (c->data, composite_mode); c->recurse (this+src); - c->funcs->pop_group (c->data, (hb_paint_composite_mode_t) (int) mode); + c->funcs->pop_group (c->data, composite_mode); c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER); } @@ -1573,10 +1962,10 @@ struct ClipBoxFormat1 if (instancer && !c->plan->pinned_at_default && varIdxBase != VarIdx::NO_VARIATION) { - out->xMin = xMin + (int) roundf (instancer (varIdxBase, 0)); - out->yMin = yMin + (int) roundf (instancer (varIdxBase, 1)); - out->xMax = xMax + (int) roundf (instancer (varIdxBase, 2)); - out->yMax = yMax + (int) roundf (instancer (varIdxBase, 3)); + out->xMin = hb_clamp_to ((double) xMin + (double) floorf (instancer (varIdxBase, 0))); + out->yMin = hb_clamp_to ((double) yMin + (double) floorf (instancer (varIdxBase, 1))); + out->xMax = hb_clamp_to ((double) xMax + (double) ceilf (instancer (varIdxBase, 2))); + out->yMax = hb_clamp_to ((double) yMax + (double) ceilf (instancer (varIdxBase, 3))); } if (format == 2 && c->plan->all_axes_pinned) @@ -1602,10 +1991,10 @@ struct ClipBoxFormat2 : Variable value.get_clip_box(clip_box, instancer); if (instancer) { - clip_box.xMin += roundf (instancer (varIdxBase, 0)); - clip_box.yMin += roundf (instancer (varIdxBase, 1)); - clip_box.xMax += roundf (instancer (varIdxBase, 2)); - clip_box.yMax += roundf (instancer (varIdxBase, 3)); + clip_box.xMin = hb_saturate_add (clip_box.xMin, hb_clamp_to (floorf (instancer (varIdxBase, 0)))); + clip_box.yMin = hb_saturate_add (clip_box.yMin, hb_clamp_to (floorf (instancer (varIdxBase, 1)))); + clip_box.xMax = hb_saturate_add (clip_box.xMax, hb_clamp_to (ceilf (instancer (varIdxBase, 2)))); + clip_box.yMax = hb_saturate_add (clip_box.yMax, hb_clamp_to (ceilf (instancer (varIdxBase, 3)))); } } @@ -1620,8 +2009,8 @@ struct ClipBox { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION)); - case 2: return_trace (u.format2.subset (c, instancer)); + case 1: hb_barrier (); return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION)); + case 2: hb_barrier (); return_trace (u.format2.subset (c, instancer)); default:return_trace (c->default_return_value ()); } } @@ -1629,7 +2018,7 @@ struct ClipBox void closurev1 (hb_colrv1_closure_context_t* c) const { switch (u.format.v) { - case 2: u.format2.closurev1 (c); return; + case 2: hb_barrier (); u.format2.closurev1 (c); return; default:return; } } @@ -1640,8 +2029,8 @@ struct ClipBox if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } @@ -1652,9 +2041,11 @@ struct ClipBox ClipBoxData clip_box; switch (u.format.v) { case 1: + hb_barrier (); u.format1.get_clip_box (clip_box, instancer); break; case 2: + hb_barrier (); u.format2.get_clip_box (clip_box, instancer); break; default: @@ -1663,8 +2054,8 @@ struct ClipBox extents->x_bearing = clip_box.xMin; extents->y_bearing = clip_box.yMax; - extents->width = clip_box.xMax - clip_box.xMin; - extents->height = clip_box.yMin - clip_box.yMax; + extents->width = hb_saturate_sub (clip_box.xMax, clip_box.xMin); + extents->height = hb_saturate_sub (clip_box.yMin, clip_box.yMax); return true; } @@ -1850,42 +2241,55 @@ struct Paint if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.paintformat1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.paintformat2, std::forward (ds)...)); - case 3: return_trace (c->dispatch (u.paintformat3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.paintformat4, std::forward (ds)...)); - case 5: return_trace (c->dispatch (u.paintformat5, std::forward (ds)...)); - case 6: return_trace (c->dispatch (u.paintformat6, std::forward (ds)...)); - case 7: return_trace (c->dispatch (u.paintformat7, std::forward (ds)...)); - case 8: return_trace (c->dispatch (u.paintformat8, std::forward (ds)...)); - case 9: return_trace (c->dispatch (u.paintformat9, std::forward (ds)...)); - case 10: return_trace (c->dispatch (u.paintformat10, std::forward (ds)...)); - case 11: return_trace (c->dispatch (u.paintformat11, std::forward (ds)...)); - case 12: return_trace (c->dispatch (u.paintformat12, std::forward (ds)...)); - case 13: return_trace (c->dispatch (u.paintformat13, std::forward (ds)...)); - case 14: return_trace (c->dispatch (u.paintformat14, std::forward (ds)...)); - case 15: return_trace (c->dispatch (u.paintformat15, std::forward (ds)...)); - case 16: return_trace (c->dispatch (u.paintformat16, std::forward (ds)...)); - case 17: return_trace (c->dispatch (u.paintformat17, std::forward (ds)...)); - case 18: return_trace (c->dispatch (u.paintformat18, std::forward (ds)...)); - case 19: return_trace (c->dispatch (u.paintformat19, std::forward (ds)...)); - case 20: return_trace (c->dispatch (u.paintformat20, std::forward (ds)...)); - case 21: return_trace (c->dispatch (u.paintformat21, std::forward (ds)...)); - case 22: return_trace (c->dispatch (u.paintformat22, std::forward (ds)...)); - case 23: return_trace (c->dispatch (u.paintformat23, std::forward (ds)...)); - case 24: return_trace (c->dispatch (u.paintformat24, std::forward (ds)...)); - case 25: return_trace (c->dispatch (u.paintformat25, std::forward (ds)...)); - case 26: return_trace (c->dispatch (u.paintformat26, std::forward (ds)...)); - case 27: return_trace (c->dispatch (u.paintformat27, std::forward (ds)...)); - case 28: return_trace (c->dispatch (u.paintformat28, std::forward (ds)...)); - case 29: return_trace (c->dispatch (u.paintformat29, std::forward (ds)...)); - case 30: return_trace (c->dispatch (u.paintformat30, std::forward (ds)...)); - case 31: return_trace (c->dispatch (u.paintformat31, std::forward (ds)...)); - case 32: return_trace (c->dispatch (u.paintformat32, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.paintformat1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.paintformat2, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.paintformat3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.paintformat4, std::forward (ds)...)); + case 5: hb_barrier (); return_trace (c->dispatch (u.paintformat5, std::forward (ds)...)); + case 6: hb_barrier (); return_trace (c->dispatch (u.paintformat6, std::forward (ds)...)); + case 7: hb_barrier (); return_trace (c->dispatch (u.paintformat7, std::forward (ds)...)); + case 8: hb_barrier (); return_trace (c->dispatch (u.paintformat8, std::forward (ds)...)); + case 9: hb_barrier (); return_trace (c->dispatch (u.paintformat9, std::forward (ds)...)); + case 10: hb_barrier (); return_trace (c->dispatch (u.paintformat10, std::forward (ds)...)); + case 11: hb_barrier (); return_trace (c->dispatch (u.paintformat11, std::forward (ds)...)); + case 12: hb_barrier (); return_trace (c->dispatch (u.paintformat12, std::forward (ds)...)); + case 13: hb_barrier (); return_trace (c->dispatch (u.paintformat13, std::forward (ds)...)); + case 14: hb_barrier (); return_trace (c->dispatch (u.paintformat14, std::forward (ds)...)); + case 15: hb_barrier (); return_trace (c->dispatch (u.paintformat15, std::forward (ds)...)); + case 16: hb_barrier (); return_trace (c->dispatch (u.paintformat16, std::forward (ds)...)); + case 17: hb_barrier (); return_trace (c->dispatch (u.paintformat17, std::forward (ds)...)); + case 18: hb_barrier (); return_trace (c->dispatch (u.paintformat18, std::forward (ds)...)); + case 19: hb_barrier (); return_trace (c->dispatch (u.paintformat19, std::forward (ds)...)); + case 20: hb_barrier (); return_trace (c->dispatch (u.paintformat20, std::forward (ds)...)); + case 21: hb_barrier (); return_trace (c->dispatch (u.paintformat21, std::forward (ds)...)); + case 22: hb_barrier (); return_trace (c->dispatch (u.paintformat22, std::forward (ds)...)); + case 23: hb_barrier (); return_trace (c->dispatch (u.paintformat23, std::forward (ds)...)); + case 24: hb_barrier (); return_trace (c->dispatch (u.paintformat24, std::forward (ds)...)); + case 25: hb_barrier (); return_trace (c->dispatch (u.paintformat25, std::forward (ds)...)); + case 26: hb_barrier (); return_trace (c->dispatch (u.paintformat26, std::forward (ds)...)); + case 27: hb_barrier (); return_trace (c->dispatch (u.paintformat27, std::forward (ds)...)); + case 28: hb_barrier (); return_trace (c->dispatch (u.paintformat28, std::forward (ds)...)); + case 29: hb_barrier (); return_trace (c->dispatch (u.paintformat29, std::forward (ds)...)); + case 30: hb_barrier (); return_trace (c->dispatch (u.paintformat30, std::forward (ds)...)); + case 31: hb_barrier (); return_trace (c->dispatch (u.paintformat31, std::forward (ds)...)); + case 32: hb_barrier (); return_trace (c->dispatch (u.paintformat32, std::forward (ds)...)); +#ifndef HB_NO_BEYOND_64K + case 33: hb_barrier (); return_trace (c->dispatch (u.paintformat33, std::forward (ds)...)); +#endif default:return_trace (c->default_return_value ()); } } + bool get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + switch (u.format.v) { + case 2: hb_barrier (); u.paintformat2.get_solid_color (c, is_foreground, color); return true; + case 3: hb_barrier (); u.paintformat3.get_solid_color (c, is_foreground, color); return true; + default: return false; + } + } + protected: union { struct { HBUINT8 v; } format; @@ -1898,7 +2302,7 @@ struct Paint Variable> paintformat7; NoVariable> paintformat8; Variable> paintformat9; - PaintGlyph paintformat10; + PaintGlyph paintformat10; PaintColrGlyph paintformat11; PaintTransform paintformat12; PaintTransform paintformat13; @@ -1921,6 +2325,9 @@ struct Paint NoVariable paintformat30; Variable paintformat31; PaintComposite paintformat32; +#ifndef HB_NO_BEYOND_64K + PaintGlyph paintformat33; +#endif } u; public: DEFINE_SIZE_MIN (2); @@ -2115,7 +2522,7 @@ struct COLR hb_array_t all_layers = (this+layersZ).as_array (numLayers); hb_array_t glyph_layers = all_layers.sub_array (record.firstLayerIdx, record.numLayers); - if (count) + if (count && layers) { + glyph_layers.sub_array (start_offset, count) | hb_sink (hb_array (layers, *count)) @@ -2178,6 +2585,12 @@ struct COLR bool is_valid () { return colr.get_blob ()->length; } + void depend (hb_depend_data_builder_t *depend_data) const + { + if (!has_data ()) return; + colr->depend (depend_data); + } + void closure_glyphs (hb_codepoint_t glyph, hb_set_t *related_ids /* OUT */) const { colr->closure_glyphs (glyph, related_ids); } @@ -2239,6 +2652,35 @@ struct COLR mutable hb_atomic_t cached_scratch; }; + void depend (hb_depend_data_builder_t *depend_data) const + { + // v0 + hb_array_t baseGlyphs = (this+baseGlyphsZ).as_array (numBaseGlyphs); + for (const BaseGlyphRecord &record : baseGlyphs) + { + auto glyph_layers = (this+layersZ).as_array (numLayers).sub_array (record.firstLayerIdx, + record.numLayers); + for (const LayerRecord layer : glyph_layers) + depend_data->add_depend(record.glyphId, HB_OT_TAG_COLR, layer.glyphId); + } + + if (!has_v1_data()) + return; + + // v1 + hb_colrv1_depend_context_t c (this, depend_data); + const BaseGlyphList &baseglyph_paintrecords = this+baseGlyphList; + + for (const BaseGlyphPaintRecord &baseglyph_paintrecord: baseglyph_paintrecords.iter ()) + { + c.source_gid = baseglyph_paintrecord.glyphId; + c.visited_paint.clear (); + + const Paint &paint = &baseglyph_paintrecords+baseglyph_paintrecord.paint; + paint.dispatch (&c); + } + } + void closure_glyphs (hb_codepoint_t glyph, hb_set_t *related_ids /* OUT */) const { @@ -2405,10 +2847,11 @@ struct COLR const BaseGlyphPaintRecord* get_base_glyph_paintrecord (hb_codepoint_t gid) const { - const BaseGlyphPaintRecord* record = &(this+baseGlyphList).bsearch ((unsigned) gid); - if ((record && (hb_codepoint_t) record->glyphId != gid)) - record = nullptr; - return record; + const BaseGlyphList &list = this+baseGlyphList; + unsigned int i; + if (!list.bfind ((unsigned) gid, &i)) + return nullptr; + return &list[i]; } bool downgrade_to_V0 (const hb_set_t &glyphset) const @@ -2473,9 +2916,17 @@ struct COLR } else { + /* avar2 partial instancing: cull unreachable regions. */ + hb_set_t dead_regions; + if (c->plan->has_avar2) + var_store.collect_dead_regions (c->plan->axes_old_index_tag_map, + c->plan->avar2_reachable_ranges, + dead_regions); + if (unlikely (!out->varStore.serialize_serialize (c->serializer, &var_store, - c->plan->colrv1_varstore_inner_maps.as_array ()))) + c->plan->colrv1_varstore_inner_maps.as_array (), + dead_regions.get_population () ? &dead_regions : nullptr))) return_trace (false); } @@ -2580,8 +3031,8 @@ struct COLR * after instancing */ if (!subset_varstore (c, colr_prime)) return_trace (false); - ItemVarStoreInstancer instancer (get_var_store_ptr (), - get_delta_set_index_map_ptr (), + ItemVarStoreInstancer instancer (c->plan->normalized_coords ? get_var_store_ptr () : nullptr, + c->plan->normalized_coords ? get_delta_set_index_map_ptr () : nullptr, c->plan->normalized_coords.as_array ()); if (!colr_prime->baseGlyphList.serialize_subset (c, baseGlyphList, this, instancer)) @@ -2637,12 +3088,7 @@ struct COLR extents->height = 0; } else - { - extents->x_bearing = e.xmin; - extents->y_bearing = e.ymax; - extents->width = e.xmax - e.xmin; - extents->height = e.ymin - e.ymax; - } + *extents = e.to_glyph_extents (); return ret; } @@ -2700,19 +3146,10 @@ struct COLR // COLRv1 glyph bool is_bounded = true; + hb_glyph_extents_t extents = {}; if (clip) { - hb_glyph_extents_t extents; - if (get_clip (glyph, &extents, instancer)) - { - font->scale_glyph_extents (&extents); - c.funcs->push_clip_rectangle (c.data, - extents.x_bearing, - extents.y_bearing + extents.height, - extents.x_bearing + extents.width, - extents.y_bearing); - } - else + if (!get_clip (glyph, &extents, instancer)) { clip = false; is_bounded = false; @@ -2735,14 +3172,21 @@ struct COLR c.funcs->push_font_transform (c.data, font); + if (clip) + c.funcs->push_clip_rectangle (c.data, + (float) extents.x_bearing, + (float) extents.y_bearing + extents.height, + (float) extents.x_bearing + extents.width, + (float) extents.y_bearing); + if (is_bounded) c.recurse (*paint); - c.funcs->pop_transform (c.data); - if (clip) c.funcs->pop_clip (c.data); + c.funcs->pop_transform (c.data); + return true; } } @@ -2756,9 +3200,7 @@ struct COLR { hb_bool_t is_foreground; hb_color_t color = c.get_color (r.colorIdx, 1., &is_foreground); - c.funcs->push_clip_glyph (c.data, r.glyphId, c.font); - c.funcs->color (c.data, is_foreground, color); - c.funcs->pop_clip (c.data); + c.funcs->fill_glyph (c.data, r.glyphId, c.font, is_foreground, color); } return true; @@ -2800,6 +3242,33 @@ hb_paint_context_t::recurse (const Paint &paint) depth_left++; } +template +void PaintGlyph::paint_glyph (hb_paint_context_t *c) const +{ + TRACE_PAINT (this); + + hb_bool_t is_foreground; + hb_color_t color; + /* Optimize cases that can use a simple fill-glyph operation. */ + if (likely (c->depth_left > 0 && c->edge_count > 0) && + (this+paint).get_solid_color (c, &is_foreground, &color)) + { + c->edge_count--; + c->funcs->push_inverse_font_transform (c->data, c->font); + c->funcs->fill_glyph (c->data, gid, c->font, is_foreground, color); + c->funcs->pop_transform (c->data); + return; + } + + c->funcs->push_inverse_font_transform (c->data, c->font); + c->funcs->push_clip_glyph (c->data, gid, c->font); + c->funcs->push_font_transform (c->data, c->font); + c->recurse (this+paint); + c->funcs->pop_transform (c->data); + c->funcs->pop_clip (c->data); + c->funcs->pop_transform (c->data); +} + void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const { TRACE_PAINT (this); @@ -2839,10 +3308,10 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const if (has_clip_box) c->funcs->push_clip_rectangle (c->data, - extents.x_bearing, - extents.y_bearing + extents.height, - extents.x_bearing + extents.width, - extents.y_bearing); + (float) extents.x_bearing, + (float) extents.y_bearing + extents.height, + (float) extents.x_bearing + extents.width, + (float) extents.y_bearing); if (paint) c->recurse (*paint); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh index 9ed0aa5632ae..f94ce070cf00 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh @@ -42,12 +42,13 @@ HB_INTERNAL void PaintColrLayers::closurev1 (hb_colrv1_closure_context_t* c) con const LayerList &paint_offset_lists = c->get_colr_table ()->get_layerList (); for (unsigned i = firstLayerIndex; i < firstLayerIndex + numLayers; i++) { - const Paint &paint = std::addressof (paint_offset_lists) + paint_offset_lists[i]; + const Paint &paint = paint_offset_lists.get_paint (i); paint.dispatch (c); } } -HB_INTERNAL void PaintGlyph::closurev1 (hb_colrv1_closure_context_t* c) const +template +HB_INTERNAL void PaintGlyph::closurev1 (hb_colrv1_closure_context_t* c) const { c->add_glyph (gid); (this+paint).dispatch (c); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh index f79e236bce91..b0c91ab3f3ab 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh @@ -209,7 +209,7 @@ struct CPAL hb_array_t all_colors ((this+colorRecordsZ).arrayZ, numColorRecords); hb_array_t palette_colors = all_colors.sub_array (start_index, numColors); - if (color_count) + if (color_count && colors) { + palette_colors.sub_array (start_offset, color_count) | hb_sink (hb_array (colors, *color_count)) @@ -300,25 +300,50 @@ struct CPAL hb_vector_t first_color_index_for_layer; hb_map_t first_color_to_layer_index; + /* Two palettes that retain exactly the same color records can share the + * same block of color records. This commonly happens after subsetting + * when the colors that distinguished the palettes are dropped. Map from + * a layer's retained colors to its index to find equal layers without + * scanning all of them. The keys point into layer_retained_colors, + * which keeps them alive. */ + hb_hashmap_t, unsigned> retained_colors_to_layer_index; + hb_vector_t> layer_retained_colors; + + const hb_array_t all_color_records = (this+colorRecordsZ).as_array (numColorRecords); const hb_array_t colorRecordIndices = colorRecordIndicesZ.as_array (numPalettes); for (const auto first_color_record_idx : colorRecordIndices) { if (first_color_to_layer_index.has (first_color_record_idx)) continue; - first_color_index_for_layer.push (first_color_record_idx); - if (unlikely (!c->serializer->propagate_error (first_color_index_for_layer))) return_trace (false); - first_color_to_layer_index.set (first_color_record_idx, - first_color_index_for_layer.length - 1); + hb_vector_t retained_colors; + if (unlikely (!retained_colors.alloc (retained_color_indices.get_population ()))) return_trace (false); + for (hb_codepoint_t color_index : retained_color_indices) + retained_colors.push (all_color_records[first_color_record_idx + color_index]); + + unsigned layer_index = first_color_index_for_layer.length; + unsigned *candidate_layer_index = nullptr; + if (retained_colors_to_layer_index.has (retained_colors.as_array (), &candidate_layer_index)) + layer_index = *candidate_layer_index; + else + { + first_color_index_for_layer.push (first_color_record_idx); + if (unlikely (!c->serializer->propagate_error (first_color_index_for_layer))) return_trace (false); + + if (unlikely (!layer_retained_colors.push_or_fail (std::move (retained_colors)))) return_trace (false); + if (unlikely (!retained_colors_to_layer_index.set (layer_retained_colors.tail ().as_array (), layer_index))) + return_trace (false); + } + first_color_to_layer_index.set (first_color_record_idx, layer_index); + if (unlikely (!c->serializer->propagate_error (first_color_to_layer_index))) return_trace (false); } out->numColorRecords = first_color_index_for_layer.length * retained_color_indices.get_population (); - const hb_array_t color_records = (this+colorRecordsZ).as_array (numColorRecords); if (!out->serialize (c->serializer, colorRecordIndices, - color_records, + all_color_records, first_color_index_for_layer, first_color_to_layer_index, retained_color_indices)) diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh index f6e6c5e3a9d8..0eefe9cada96 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh @@ -337,18 +337,18 @@ struct sbix } extents->x_bearing = x_offset; - extents->y_bearing = png.IHDR.height + y_offset; - extents->width = png.IHDR.width; - extents->height = -1 * png.IHDR.height; + extents->y_bearing = hb_clamp_to ((int64_t) (unsigned int) png.IHDR.height + y_offset); + extents->width = (hb_position_t) (unsigned int) png.IHDR.width; + extents->height = -(hb_position_t) (unsigned int) png.IHDR.height; /* Convert to font units. */ if (strike_ppem && scale) { float scale = font->face->get_upem () / (float) strike_ppem; - extents->x_bearing = roundf (extents->x_bearing * scale); - extents->y_bearing = roundf (extents->y_bearing * scale); - extents->width = roundf (extents->width * scale); - extents->height = roundf (extents->height * scale); + extents->x_bearing = hb_clamp_to (roundf (extents->x_bearing * scale)); + extents->y_bearing = hb_clamp_to (roundf (extents->y_bearing * scale)); + extents->width = hb_clamp_to (roundf (extents->width * scale)); + extents->height = hb_clamp_to (roundf (extents->height * scale)); } if (scale) diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh index a0fd2c88d0a4..6be0bc85706d 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh @@ -499,7 +499,7 @@ parse_cache_entries_linear (const char *svg, while (p + name_len < gt) { unsigned char c = (unsigned char) name[name_len]; - if (!(isalnum (c) || c == '_' || c == '-' || c == ':')) + if (!(ISALNUM (c) || c == '_' || c == '-' || c == ':')) break; name_len++; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh index 286788563733..80be33390994 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh @@ -29,7 +29,7 @@ #ifndef OT_LAYOUT_COMMON_COVERAGE_HH #define OT_LAYOUT_COMMON_COVERAGE_HH -#include "../types.hh" +#include "../../../hb-ot-dual.hh" #include "CoverageFormat1.hh" #include "CoverageFormat2.hh" @@ -67,11 +67,11 @@ struct Coverage hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.sanitize (c)); - case 4: return_trace (u.format4.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); + case 4: hb_barrier (); return_trace (u.format4.sanitize (c)); #endif default:return_trace (true); } @@ -87,11 +87,11 @@ struct Coverage unsigned int get_coverage (hb_codepoint_t glyph_id) const { switch (u.format.v) { - case 1: return u.format1.get_coverage (glyph_id); - case 2: return u.format2.get_coverage (glyph_id); + case 1: hb_barrier (); return u.format1.get_coverage (glyph_id); + case 2: hb_barrier (); return u.format2.get_coverage (glyph_id); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_coverage (glyph_id); - case 4: return u.format4.get_coverage (glyph_id); + case 3: hb_barrier (); return u.format3.get_coverage (glyph_id); + case 4: hb_barrier (); return u.format4.get_coverage (glyph_id); #endif default:return NOT_COVERED; } @@ -104,9 +104,9 @@ struct Coverage coverage = get_coverage (glyph_id); if (cache) { if (coverage == NOT_COVERED) - cache->set_unchecked (glyph_id, cache->MAX_VALUE); + cache->set (glyph_id, cache->MAX_VALUE); else if (likely (coverage < cache->MAX_VALUE)) - cache->set_unchecked (glyph_id, coverage); + cache->set (glyph_id, coverage); } return coverage; } @@ -119,9 +119,9 @@ struct Coverage coverage = get_coverage (glyph_id); if (cache) { if (coverage == NOT_COVERED) - cache->set_unchecked (glyph_id, cache->MAX_VALUE); + cache->set (glyph_id, cache->MAX_VALUE); else - cache->set_unchecked (glyph_id, 0); + cache->set (glyph_id, 0); } return coverage; } @@ -129,11 +129,11 @@ struct Coverage unsigned get_population () const { switch (u.format.v) { - case 1: return u.format1.get_population (); - case 2: return u.format2.get_population (); + case 1: hb_barrier (); return u.format1.get_population (); + case 2: hb_barrier (); return u.format2.get_population (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_population (); - case 4: return u.format4.get_population (); + case 3: hb_barrier (); return u.format3.get_population (); + case 4: hb_barrier (); return u.format4.get_population (); #endif default:return NOT_COVERED; } @@ -146,12 +146,12 @@ struct Coverage TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); - unsigned count = hb_len (glyphs); + unsigned count = hb_len (+ glyphs); unsigned num_ranges = 0; hb_codepoint_t last = (hb_codepoint_t) -2; hb_codepoint_t max = 0; bool unsorted = false; - for (auto g: glyphs) + for (auto g: + glyphs) { if (last != (hb_codepoint_t) -2 && g < last) unsorted = true; @@ -176,11 +176,11 @@ struct Coverage switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, glyphs)); - case 2: return_trace (u.format2.serialize (c, glyphs)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, glyphs)); + case 2: hb_barrier (); return_trace (u.format2.serialize (c, glyphs)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.serialize (c, glyphs)); - case 4: return_trace (u.format4.serialize (c, glyphs)); + case 3: hb_barrier (); return_trace (u.format3.serialize (c, glyphs)); + case 4: hb_barrier (); return_trace (u.format4.serialize (c, glyphs)); #endif default:return_trace (false); } @@ -189,10 +189,13 @@ struct Coverage bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); + const hb_subset_plan_t *plan = c->plan; auto it = + iter () - | hb_take (c->plan->source->get_num_glyphs ()) - | hb_map_retains_sorting (c->plan->glyph_map_gsub) + | hb_take (plan->source->get_num_glyphs ()) + | hb_map_retains_sorting ([plan] (hb_codepoint_t g) { + return plan->map_gsub_glyph (g); + }) | hb_filter ([] (hb_codepoint_t glyph) { return glyph != HB_MAP_VALUE_INVALID; }) ; @@ -207,11 +210,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersects (glyphs); - case 2: return u.format2.intersects (glyphs); + case 1: hb_barrier (); return u.format1.intersects (glyphs); + case 2: hb_barrier (); return u.format2.intersects (glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersects (glyphs); - case 4: return u.format4.intersects (glyphs); + case 3: hb_barrier (); return u.format3.intersects (glyphs); + case 4: hb_barrier (); return u.format4.intersects (glyphs); #endif default:return false; } @@ -220,11 +223,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersects_coverage (glyphs, index); - case 2: return u.format2.intersects_coverage (glyphs, index); + case 1: hb_barrier (); return u.format1.intersects_coverage (glyphs, index); + case 2: hb_barrier (); return u.format2.intersects_coverage (glyphs, index); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersects_coverage (glyphs, index); - case 4: return u.format4.intersects_coverage (glyphs, index); + case 3: hb_barrier (); return u.format3.intersects_coverage (glyphs, index); + case 4: hb_barrier (); return u.format4.intersects_coverage (glyphs, index); #endif default:return false; } @@ -250,11 +253,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.collect_coverage (glyphs); - case 2: return u.format2.collect_coverage (glyphs); + case 1: hb_barrier (); return u.format1.collect_coverage (glyphs); + case 2: hb_barrier (); return u.format2.collect_coverage (glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.collect_coverage (glyphs); - case 4: return u.format4.collect_coverage (glyphs); + case 3: hb_barrier (); return u.format3.collect_coverage (glyphs); + case 4: hb_barrier (); return u.format4.collect_coverage (glyphs); #endif default:return false; } @@ -266,11 +269,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersect_set (glyphs, intersect_glyphs); - case 2: return u.format2.intersect_set (glyphs, intersect_glyphs); + case 1: hb_barrier (); return u.format1.intersect_set (glyphs, intersect_glyphs); + case 2: hb_barrier (); return u.format2.intersect_set (glyphs, intersect_glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersect_set (glyphs, intersect_glyphs); - case 4: return u.format4.intersect_set (glyphs, intersect_glyphs); + case 3: hb_barrier (); return u.format3.intersect_set (glyphs, intersect_glyphs); + case 4: hb_barrier (); return u.format4.intersect_set (glyphs, intersect_glyphs); #endif default:return ; } @@ -285,11 +288,11 @@ struct Coverage format = c_.u.format.v; switch (format) { - case 1: u.format1.init (c_.u.format1); return; - case 2: u.format2.init (c_.u.format2); return; + case 1: hb_barrier (); u.format1.init (c_.u.format1); return; + case 2: hb_barrier (); u.format2.init (c_.u.format2); return; #ifndef HB_NO_BEYOND_64K - case 3: u.format3.init (c_.u.format3); return; - case 4: u.format4.init (c_.u.format4); return; + case 3: hb_barrier (); u.format3.init (c_.u.format3); return; + case 4: hb_barrier (); u.format4.init (c_.u.format4); return; #endif default: return; } @@ -298,11 +301,11 @@ struct Coverage { switch (format) { - case 1: return u.format1.__more__ (); - case 2: return u.format2.__more__ (); + case 1: hb_barrier (); return u.format1.__more__ (); + case 2: hb_barrier (); return u.format2.__more__ (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.__more__ (); - case 4: return u.format4.__more__ (); + case 3: hb_barrier (); return u.format3.__more__ (); + case 4: hb_barrier (); return u.format4.__more__ (); #endif default:return false; } @@ -311,11 +314,11 @@ struct Coverage { switch (format) { - case 1: u.format1.__next__ (); break; - case 2: u.format2.__next__ (); break; + case 1: hb_barrier (); u.format1.__next__ (); break; + case 2: hb_barrier (); u.format2.__next__ (); break; #ifndef HB_NO_BEYOND_64K - case 3: u.format3.__next__ (); break; - case 4: u.format4.__next__ (); break; + case 3: hb_barrier (); u.format3.__next__ (); break; + case 4: hb_barrier (); u.format4.__next__ (); break; #endif default: break; } @@ -327,11 +330,11 @@ struct Coverage { switch (format) { - case 1: return u.format1.get_glyph (); - case 2: return u.format2.get_glyph (); + case 1: hb_barrier (); return u.format1.get_glyph (); + case 2: hb_barrier (); return u.format2.get_glyph (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_glyph (); - case 4: return u.format4.get_glyph (); + case 3: hb_barrier (); return u.format3.get_glyph (); + case 4: hb_barrier (); return u.format4.get_glyph (); #endif default:return 0; } @@ -341,11 +344,11 @@ struct Coverage if (unlikely (format != o.format)) return true; switch (format) { - case 1: return u.format1 != o.u.format1; - case 2: return u.format2 != o.u.format2; + case 1: hb_barrier (); return u.format1 != o.u.format1; + case 2: hb_barrier (); return u.format2 != o.u.format2; #ifndef HB_NO_BEYOND_64K - case 3: return u.format3 != o.u.format3; - case 4: return u.format4 != o.u.format4; + case 3: hb_barrier (); return u.format3 != o.u.format3; + case 4: hb_barrier (); return u.format4 != o.u.format4; #endif default:return false; } @@ -356,11 +359,11 @@ struct Coverage it.format = format; switch (format) { - case 1: it.u.format1 = u.format1.__end__ (); break; - case 2: it.u.format2 = u.format2.__end__ (); break; + case 1: hb_barrier (); it.u.format1 = u.format1.__end__ (); break; + case 2: hb_barrier (); it.u.format2 = u.format2.__end__ (); break; #ifndef HB_NO_BEYOND_64K - case 3: it.u.format3 = u.format3.__end__ (); break; - case 4: it.u.format4 = u.format4.__end__ (); break; + case 3: hb_barrier (); it.u.format3 = u.format3.__end__ (); break; + case 4: hb_barrier (); it.u.format4 = u.format4.__end__ (); break; #endif default: break; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh index 122326e3024b..addce14ce7ad 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh @@ -43,10 +43,10 @@ struct CoverageFormat1_3 public: HBUINT16 coverageFormat; /* Format identifier--format = 1 */ - SortedArray16Of + typename Types::template SortedArrayOf glyphArray; /* Array of GlyphIDs--in numerical order */ - DEFINE_SIZE_ARRAY (4, glyphArray); + DEFINE_SIZE_ARRAY (2 + Types::HBUINT::static_size, glyphArray); private: bool sanitize (hb_sanitize_context_t *c) const diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh index 8287c8d4d4d4..51360f855750 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh @@ -39,15 +39,16 @@ template struct CoverageFormat2_4 { friend struct Coverage; + using CoverageRangeRecord = RangeRecord; public: HBUINT16 coverageFormat; /* Format identifier--format = 2 */ - SortedArray16Of> + typename Types::template SortedArrayOf rangeRecord; /* Array of glyph ranges--ordered by * Start GlyphID. rangeCount entries * long */ public: - DEFINE_SIZE_ARRAY (4, rangeRecord); + DEFINE_SIZE_ARRAY (2 + Types::HBUINT::static_size, rangeRecord); private: @@ -59,7 +60,7 @@ struct CoverageFormat2_4 unsigned int get_coverage (hb_codepoint_t glyph_id) const { - const RangeRecord &range = rangeRecord.bsearch (glyph_id); + const CoverageRangeRecord &range = rangeRecord.bsearch (glyph_id); return likely (range.first <= range.last) ? (unsigned int) range.value + (glyph_id - range.first) : NOT_COVERED; @@ -113,7 +114,7 @@ struct CoverageFormat2_4 } if (unlikely (unsorted)) - rangeRecord.as_array ().qsort (RangeRecord::cmp_range); + rangeRecord.as_array ().qsort (CoverageRangeRecord::cmp_range); return_trace (true); } @@ -129,7 +130,7 @@ struct CoverageFormat2_4 } return hb_any (+ hb_iter (rangeRecord) - | hb_map ([glyphs] (const RangeRecord &range) { return range.intersects (*glyphs); })); + | hb_map ([glyphs] (const CoverageRangeRecord &range) { return range.intersects (*glyphs); })); } bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const { @@ -139,6 +140,19 @@ struct CoverageFormat2_4 return false; } + static void add_intersected_bits (hb_set_t &set, hb_codepoint_t base, uint64_t bits) + { set.add_bits (base, bits); } + + template + static void add_intersected_bits (IterableOut&& out, hb_codepoint_t base, uint64_t bits) + { + while (bits) + { + out << base + hb_ctz (bits); + bits &= bits - 1; + } + } + template void intersect_set (const hb_set_t &glyphs, IterableOut&& intersect_glyphs) const @@ -151,9 +165,18 @@ struct CoverageFormat2_4 if (unlikely (range.first < last)) break; last = range.last; - for (hb_codepoint_t g = range.first - 1; - glyphs.next (&g) && g <= last;) - intersect_glyphs << g; + hb_codepoint_t cursor = range.first & ~hb_bit_page_t::ELT_MASK; + cursor = cursor ? cursor - 1 : HB_SET_VALUE_INVALID; + uint64_t bits; + while (glyphs.next_bits (&cursor, &bits) && cursor <= last) + { + if (range.first > cursor) + bits &= UINT64_MAX << (range.first - cursor); + unsigned int end = last - cursor; + if (end < hb_bit_page_t::ELT_BITS - 1) + bits &= (uint64_t (1) << (end + 1)) - 1; + add_intersected_bits (intersect_glyphs, cursor, bits); + } } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/RangeRecord.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/RangeRecord.hh index 85aacace9a76..ad9a637d6a08 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/RangeRecord.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/RangeRecord.hh @@ -33,14 +33,14 @@ namespace OT { namespace Layout { namespace Common { -template +template struct RangeRecord { typename Types::HBGlyphID first; /* First GlyphID in the range */ typename Types::HBGlyphID last; /* Last GlyphID in the range */ - HBUINT16 value; /* Value */ + Value value; /* Value */ - DEFINE_SIZE_STATIC (2 + 2 * Types::size); + DEFINE_SIZE_STATIC (2 * Types::size + Value::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -86,10 +86,10 @@ struct RangeRecord // but that only works when there is only a single namespace level. // The macro should probably be fixed so it can work in this situation. extern HB_INTERNAL const unsigned char _hb_Null_OT_RangeRecord[9]; -template -struct Null> { - static OT::Layout::Common::RangeRecord const & get_null () { - return *reinterpret_cast *> (_hb_Null_OT_RangeRecord); +template +struct Null> { + static OT::Layout::Common::RangeRecord const & get_null () { + return *reinterpret_cast *> (_hb_Null_OT_RangeRecord); } }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh index 23412914feb5..c6dbceef8bbe 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh @@ -53,6 +53,9 @@ struct AttachPoint : Array16Of } }; +/* AttachList is referenced by both GDEF attachListOffset and + * attachListOffset2. The v1.4 top-level offset widens, but the + * AttachList table itself keeps Offset16 internals. */ struct AttachList { unsigned int get_attach_points (hb_codepoint_t glyph_id, @@ -70,7 +73,7 @@ struct AttachList const AttachPoint &points = this+attachPoint[index]; - if (point_count) + if (point_count && point_array) { + points.as_array ().sub_array (start_offset, point_count) | hb_sink (hb_array (point_array, *point_count)) @@ -192,8 +195,8 @@ struct CaretValueFormat3 const ItemVariationStore &var_store) const { return HB_DIRECTION_IS_HORIZONTAL (direction) ? - font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font, var_store) : - font->em_scale_y (coordinate) + (this+deviceTable).get_y_delta (font, var_store); + hb_saturate_add (font->em_scale_x (coordinate), (this+deviceTable).get_x_delta (font, var_store)) : + hb_saturate_add (font->em_scale_y (coordinate), (this+deviceTable).get_y_delta (font, var_store)); } bool subset (hb_subset_context_t *c) const @@ -253,9 +256,9 @@ struct CaretValue const ItemVariationStore &var_store) const { switch (u.format.v) { - case 1: return u.format1.get_caret_value (font, direction); - case 2: return u.format2.get_caret_value (font, direction, glyph_id); - case 3: return u.format3.get_caret_value (font, direction, var_store); + case 1: hb_barrier (); return u.format1.get_caret_value (font, direction); + case 2: hb_barrier (); return u.format2.get_caret_value (font, direction, glyph_id); + case 3: hb_barrier (); return u.format3.get_caret_value (font, direction, var_store); default:return 0; } } @@ -266,9 +269,9 @@ struct CaretValue if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } @@ -280,6 +283,7 @@ struct CaretValue case 2: return; case 3: + hb_barrier (); u.format3.collect_variation_indices (c); return; default: return; @@ -292,9 +296,9 @@ struct CaretValue if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); - case 3: return_trace (u.format3.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); default:return_trace (true); } } @@ -320,7 +324,7 @@ struct LigGlyph unsigned *caret_count /* IN/OUT */, hb_position_t *caret_array /* OUT */) const { - if (caret_count) + if (caret_count && caret_array) { + carets.as_array ().sub_array (start_offset, caret_count) | hb_map (hb_add (this)) @@ -366,6 +370,9 @@ struct LigGlyph DEFINE_SIZE_ARRAY (2, carets); }; +/* LigCaretList2 widens the LigCaretList coverage, count, and LigGlyph + * offsets. The LigGlyph table itself keeps Offset16 caretValueOffsets. */ +template struct LigCaretList { unsigned int get_lig_carets (hb_font_t *font, @@ -425,16 +432,21 @@ struct LigCaretList } protected: - Offset16To + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of LigCaretList table */ - Array16OfOffset16To + typename Types::template ArrayOf> ligGlyph; /* Array of LigGlyph tables * in Coverage Index order */ public: - DEFINE_SIZE_ARRAY (4, ligGlyph); + DEFINE_SIZE_ARRAY (Types::LOffset::static_size + Types::HBUINT::static_size, ligGlyph); }; +#ifndef HB_NO_BEYOND_64K +static_assert (LigCaretList::min_size == + Offset32::static_size + HBUINT24::static_size, ""); +#endif + struct MarkGlyphSetsFormat1 { @@ -520,7 +532,7 @@ struct MarkGlyphSets bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const { switch (u.format.v) { - case 1: return u.format1.covers (set_index, glyph_id); + case 1: hb_barrier (); return u.format1.covers (set_index, glyph_id); default:return false; } } @@ -529,7 +541,7 @@ struct MarkGlyphSets void collect_coverage (hb_vector_t &sets) const { switch (u.format.v) { - case 1: u.format1.collect_coverage (sets); return; + case 1: hb_barrier (); u.format1.collect_coverage (sets); return; default:return; } } @@ -538,7 +550,7 @@ struct MarkGlyphSets hb_set_t& used_mark_sets /* OUT */) const { switch (u.format.v) { - case 1: u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return; + case 1: hb_barrier (); u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return; default:return; } } @@ -547,7 +559,7 @@ struct MarkGlyphSets { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (u.format1.subset (c)); + case 1: hb_barrier (); return_trace (u.format1.subset (c)); default:return_trace (false); } } @@ -558,7 +570,7 @@ struct MarkGlyphSets if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); default:return_trace (true); } } @@ -579,86 +591,73 @@ struct MarkGlyphSets */ -template -struct GDEFVersion1_2 +struct GDEF { - friend struct GDEF; + static constexpr hb_tag_t tableTag = HB_OT_TAG_GDEF; - protected: - FixedVersion<>version; /* Version of the GDEF table--currently - * 0x00010003u */ - typename Types::template OffsetTo - glyphClassDef; /* Offset to class definition table - * for glyph type--from beginning of - * GDEF header (may be Null) */ - typename Types::template OffsetTo - attachList; /* Offset to list of glyphs with - * attachment points--from beginning - * of GDEF header (may be Null) */ - typename Types::template OffsetTo - ligCaretList; /* Offset to list of positioning points - * for ligature carets--from beginning - * of GDEF header (may be Null) */ - typename Types::template OffsetTo - markAttachClassDef; /* Offset to class definition table for - * mark attachment type--from beginning - * of GDEF header (may be Null) */ - typename Types::template OffsetTo - markGlyphSetsDef; /* Offset to the table of mark set - * definitions--from beginning of GDEF - * header (may be NULL). Introduced - * in version 0x00010002. */ - Offset32To - varStore; /* Offset to the table of Item Variation - * Store--from beginning of GDEF - * header (may be NULL). Introduced - * in version 0x00010003. */ - public: - DEFINE_SIZE_MIN (4 + 4 * Types::size); + enum GlyphClasses { + UnclassifiedGlyph = 0, + BaseGlyph = 1, + LigatureGlyph = 2, + MarkGlyph = 3, + ComponentGlyph = 4 + }; size_t get_size () const { + if (version.major != 1) return version.static_size; + return min_size + (version.to_int () >= 0x00010002u ? markGlyphSetsDef.static_size : 0) + - (version.to_int () >= 0x00010003u ? varStore.static_size : 0); + (version.to_int () >= 0x00010003u ? varStore.static_size : 0) + +#ifndef HB_NO_BEYOND_64K + (version.to_int () >= 0x00010004u ? 5 * Offset32::static_size : 0) +#else + 0 +#endif + ; } bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (version.sanitize (c) && - glyphClassDef.sanitize (c, this) && - attachList.sanitize (c, this) && - ligCaretList.sanitize (c, this) && - markAttachClassDef.sanitize (c, this) && - hb_barrier () && - ((version.to_int () < 0x00010002u && hb_barrier ()) || markGlyphSetsDef.sanitize (c, this)) && - ((version.to_int () < 0x00010003u && hb_barrier ()) || varStore.sanitize (c, this))); - } + if (unlikely (!version.sanitize (c) || + version.major != 1 || + !c->check_range (this, get_size ()))) + return_trace (false); + hb_barrier (); - static void remap_varidx_after_instantiation (const hb_map_t& varidx_map, - hb_hashmap_t>& layout_variation_idx_delta_map /* IN/OUT */) - { - /* varidx_map is empty which means varstore is empty after instantiation, - * no variations, map all varidx to HB_OT_LAYOUT_NO_VARIATIONS_INDEX. - * varidx_map doesn't have original varidx, indicating delta row is all - * zeros, map varidx to HB_OT_LAYOUT_NO_VARIATIONS_INDEX */ - for (auto _ : layout_variation_idx_delta_map.iter_ref ()) + bool glyph_class_def_ok = glyphClassDef.sanitize (c, this); + bool attach_list_ok = attachList.sanitize (c, this); + bool lig_caret_list_ok = ligCaretList.sanitize (c, this); + bool mark_attach_class_def_ok = markAttachClassDef.sanitize (c, this); + bool mark_glyph_sets_def_ok = version.to_int () < 0x00010002u || + markGlyphSetsDef.sanitize (c, this); + +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010004u) { - /* old_varidx->(varidx, delta) mapping generated for subsetting, then this - * varidx is used as key of varidx_map during instantiation */ - uint32_t varidx = _.second.first; - uint32_t *new_varidx; - if (varidx_map.has (varidx, &new_varidx)) - _.second.first = *new_varidx; - else - _.second.first = HB_OT_LAYOUT_NO_VARIATIONS_INDEX; + if (glyphClassDef2) glyph_class_def_ok = glyphClassDef2.sanitize (c, this); + if (attachList2) attach_list_ok = attachList2.sanitize (c, this); + if (ligCaretList2) lig_caret_list_ok = ligCaretList2.sanitize (c, this); + if (markAttachClassDef2) mark_attach_class_def_ok = markAttachClassDef2.sanitize (c, this); + if (markGlyphSetsDef2) mark_glyph_sets_def_ok = markGlyphSetsDef2.sanitize (c, this); } +#endif + + return_trace (glyph_class_def_ok && + attach_list_ok && + lig_caret_list_ok && + mark_attach_class_def_ok && + mark_glyph_sets_def_ok && + (version.to_int () < 0x00010003u || varStore.sanitize (c, this))); } bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); + if (version.major != 1) return_trace (false); + auto *out = c->serializer->start_embed (*this); if (unlikely (!c->serializer->extend_min (out))) return_trace (false); @@ -667,15 +666,29 @@ struct GDEFVersion1_2 // the end of the GDEF table. // See: https://github.com/harfbuzz/harfbuzz/issues/4636 auto snapshot_version0 = c->serializer->snapshot (); - if (unlikely (version.to_int () >= 0x00010002u && hb_barrier () && !c->serializer->embed (markGlyphSetsDef))) + if (unlikely (version.to_int () >= 0x00010002u && hb_barrier () && + !c->serializer->embed (markGlyphSetsDef))) + return_trace (false); + + auto snapshot_version2 = c->serializer->snapshot (); + if (unlikely (version.to_int () >= 0x00010003u && hb_barrier () && + !c->serializer->embed (varStore))) return_trace (false); + bool use_v14 = false; +#ifndef HB_NO_BEYOND_64K + use_v14 = version.to_int () >= 0x00010004u && + (glyphClassDef2 || attachList2 || ligCaretList2 || + markAttachClassDef2 || markGlyphSetsDef2); + if (unlikely (version.to_int () >= 0x00010004u && hb_barrier () && + !c->serializer->extend_size (out, get_size ()))) + return_trace (false); +#endif + bool subset_varstore = false; unsigned varstore_index = (unsigned) -1; - auto snapshot_version2 = c->serializer->snapshot (); if (version.to_int () >= 0x00010003u && hb_barrier ()) { - if (unlikely (!c->serializer->embed (varStore))) return_trace (false); if (c->plan->all_axes_pinned) out->varStore = 0; else if (c->plan->normalized_coords) @@ -683,22 +696,26 @@ struct GDEFVersion1_2 if (varStore) { item_variations_t item_vars; - if (item_vars.instantiate (this+varStore, c->plan, true, true, - c->plan->gdef_varstore_inner_maps.as_array ())) { - subset_varstore = out->varStore.serialize_serialize (c->serializer, - item_vars.has_long_word (), - c->plan->axis_tags, - item_vars.get_region_list (), - item_vars.get_vardata_encodings ()); - varstore_index = c->serializer->last_added_child_index(); - } + if (unlikely (!c->serializer->check_success ( + item_vars.instantiate (this+varStore, c->plan, true, true, + c->plan->gdef_varstore_inner_maps.as_array (), true)))) + return_trace (false); + subset_varstore = out->varStore.serialize_serialize (c->serializer, + item_vars.has_long_word (), + c->plan->axis_tags, + item_vars.get_region_list (), + item_vars.get_vardata_encodings ()); + varstore_index = c->serializer->last_added_child_index(); remap_varidx_after_instantiation (item_vars.get_varidx_map (), c->plan->layout_variation_idx_delta_map); + remap_varidx_after_instantiation (item_vars.get_varidx_map (), + c->plan->layout_condition_idx_value_map); } } else { - subset_varstore = out->varStore.serialize_subset (c, varStore, this, c->plan->gdef_varstore_inner_maps.as_array ()); + subset_varstore = out->varStore.serialize_subset (c, varStore, this, + c->plan->gdef_varstore_inner_maps.as_array ()); varstore_index = c->serializer->last_added_child_index(); } } @@ -706,20 +723,39 @@ struct GDEFVersion1_2 out->version.major = version.major; out->version.minor = version.minor; - if (!subset_varstore && version.to_int () >= 0x00010002u) { + if (!subset_varstore && version.to_int () >= 0x00010002u && !use_v14) { c->serializer->revert (snapshot_version2); } + if (!subset_varstore) + out->varStore = 0; + else + c->plan->has_gdef_varstore = true; bool subset_markglyphsetsdef = false; if (version.to_int () >= 0x00010002u && hb_barrier ()) { - subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this); +#ifndef HB_NO_BEYOND_64K + if (use_v14 && markGlyphSetsDef2) + { + out->markGlyphSetsDef = 0; + subset_markglyphsetsdef = serialize_subset_offset (c, out->markGlyphSetsDef2, + markGlyphSetsDef2, this); + } + else +#endif + { +#ifndef HB_NO_BEYOND_64K + if (use_v14) out->markGlyphSetsDef2 = 0; +#endif + subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this); + } } - if (subset_varstore) + if (use_v14) { + out->version.minor = 4; + } else if (subset_varstore) { out->version.minor = 3; - c->plan->has_gdef_varstore = true; } else if (subset_markglyphsetsdef) { out->version.minor = 2; } else { @@ -727,193 +763,160 @@ struct GDEFVersion1_2 c->serializer->revert (snapshot_version0); } - bool subset_glyphclassdef = out->glyphClassDef.serialize_subset (c, glyphClassDef, this, nullptr, false, true); - bool subset_attachlist = out->attachList.serialize_subset (c, attachList, this); - bool subset_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true); - bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this); + bool subset_glyphclassdef = false; + bool subset_attachlist = false; + bool subset_markattachclassdef = false; + bool subset_ligcaretlist = false; - if (subset_varstore && varstore_index != (unsigned) -1) { - c->serializer->repack_last(varstore_index); +#ifndef HB_NO_BEYOND_64K + if (use_v14 && glyphClassDef2) + { + out->glyphClassDef = 0; + subset_glyphclassdef = serialize_subset_offset (c, out->glyphClassDef2, + glyphClassDef2, this, nullptr, false, true); + } + else +#endif + { +#ifndef HB_NO_BEYOND_64K + if (use_v14) out->glyphClassDef2 = 0; +#endif + subset_glyphclassdef = out->glyphClassDef.serialize_subset (c, glyphClassDef, this, nullptr, false, true); } - return_trace (subset_glyphclassdef || subset_attachlist || - subset_ligcaretlist || subset_markattachclassdef || - (out->version.to_int () >= 0x00010002u && subset_markglyphsetsdef) || - (out->version.to_int () >= 0x00010003u && subset_varstore)); - } -}; - -struct GDEF -{ - static constexpr hb_tag_t tableTag = HB_OT_TAG_GDEF; - - enum GlyphClasses { - UnclassifiedGlyph = 0, - BaseGlyph = 1, - LigatureGlyph = 2, - MarkGlyph = 3, - ComponentGlyph = 4 - }; - - size_t get_size () const - { - switch (u.version.major) { - case 1: return u.version1.get_size (); #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.get_size (); + if (use_v14 && attachList2) + { + out->attachList = 0; + subset_attachlist = serialize_subset_offset (c, out->attachList2, attachList2, this); + } + else #endif - default: return u.version.static_size; + { +#ifndef HB_NO_BEYOND_64K + if (use_v14) out->attachList2 = 0; +#endif + subset_attachlist = out->attachList.serialize_subset (c, attachList, this); } - } - bool sanitize (hb_sanitize_context_t *c) const - { - TRACE_SANITIZE (this); - if (unlikely (!u.version.sanitize (c))) return_trace (false); - hb_barrier (); - switch (u.version.major) { - case 1: return_trace (u.version1.sanitize (c)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (u.version2.sanitize (c)); + if (use_v14 && markAttachClassDef2) + { + out->markAttachClassDef = 0; + subset_markattachclassdef = serialize_subset_offset (c, out->markAttachClassDef2, + markAttachClassDef2, this, nullptr, false, true); + } + else +#endif + { +#ifndef HB_NO_BEYOND_64K + if (use_v14) out->markAttachClassDef2 = 0; #endif - default: return_trace (true); + subset_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, + this, nullptr, false, true); } - } - bool subset (hb_subset_context_t *c) const - { - switch (u.version.major) { - case 1: return u.version1.subset (c); #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.subset (c); + if (use_v14 && ligCaretList2) + { + out->ligCaretList = 0; + subset_ligcaretlist = serialize_subset_offset (c, out->ligCaretList2, ligCaretList2, this); + } + else +#endif + { +#ifndef HB_NO_BEYOND_64K + if (use_v14) out->ligCaretList2 = 0; #endif - default: return false; + subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this); } + + if (subset_varstore && varstore_index != (unsigned) -1) { + c->serializer->repack_last(varstore_index); + } + + return_trace (subset_glyphclassdef || subset_attachlist || + subset_ligcaretlist || subset_markattachclassdef || + (out->version.to_int () >= 0x00010002u && subset_markglyphsetsdef) || + (out->version.to_int () >= 0x00010003u && subset_varstore)); } bool has_glyph_classes () const { - switch (u.version.major) { - case 1: return u.version1.glyphClassDef != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.glyphClassDef != 0; + if (version.to_int () >= 0x00010004u && glyphClassDef2) return true; #endif - default: return false; - } + return glyphClassDef != 0; } const ClassDef &get_glyph_class_def () const { - switch (u.version.major) { - case 1: return this+u.version1.glyphClassDef; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.glyphClassDef; + if (version.to_int () >= 0x00010004u && glyphClassDef2) return this+glyphClassDef2; #endif - default: return Null(ClassDef); - } + return this+glyphClassDef; } bool has_attach_list () const { - switch (u.version.major) { - case 1: return u.version1.attachList != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.attachList != 0; + if (version.to_int () >= 0x00010004u && attachList2) return true; #endif - default: return false; - } + return attachList != 0; } const AttachList &get_attach_list () const { - switch (u.version.major) { - case 1: return this+u.version1.attachList; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.attachList; + if (version.to_int () >= 0x00010004u && attachList2) return this+attachList2; #endif - default: return Null(AttachList); - } + return this+attachList; } bool has_lig_carets () const { - switch (u.version.major) { - case 1: return u.version1.ligCaretList != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.ligCaretList != 0; + if (version.to_int () >= 0x00010004u && ligCaretList2) return true; #endif - default: return false; - } - } - const LigCaretList &get_lig_caret_list () const - { - switch (u.version.major) { - case 1: return this+u.version1.ligCaretList; -#ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.ligCaretList; -#endif - default: return Null(LigCaretList); - } + return ligCaretList != 0; } bool has_mark_attachment_types () const { - switch (u.version.major) { - case 1: return u.version1.markAttachClassDef != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.markAttachClassDef != 0; + if (version.to_int () >= 0x00010004u && markAttachClassDef2) return true; #endif - default: return false; - } + return markAttachClassDef != 0; } const ClassDef &get_mark_attach_class_def () const { - switch (u.version.major) { - case 1: return this+u.version1.markAttachClassDef; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.markAttachClassDef; + if (version.to_int () >= 0x00010004u && markAttachClassDef2) return this+markAttachClassDef2; #endif - default: return Null(ClassDef); - } + return this+markAttachClassDef; } bool has_mark_glyph_sets () const { - switch (u.version.major) { - case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () && u.version1.markGlyphSetsDef != 0; + if (version.to_int () < 0x00010002u) return false; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.markGlyphSetsDef != 0; + if (version.to_int () >= 0x00010004u && markGlyphSetsDef2) return true; #endif - default: return false; - } + return markGlyphSetsDef != 0; } const MarkGlyphSets &get_mark_glyph_sets () const { - switch (u.version.major) { - case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets); + if (version.to_int () < 0x00010002u) return Null(MarkGlyphSets); #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.markGlyphSetsDef; + if (version.to_int () >= 0x00010004u && markGlyphSetsDef2) return this+markGlyphSetsDef2; #endif - default: return Null(MarkGlyphSets); - } + return this+markGlyphSetsDef; } bool has_var_store () const { - switch (u.version.major) { - case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () && u.version1.varStore != 0; -#ifndef HB_NO_BEYOND_64K - case 2: return u.version2.varStore != 0; -#endif - default: return false; - } + return version.to_int () >= 0x00010003u && hb_barrier () && varStore != 0; } const ItemVariationStore &get_var_store () const { - switch (u.version.major) { - case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () ? this+u.version1.varStore : Null(ItemVariationStore); -#ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.varStore; -#endif - default: return Null(ItemVariationStore); - } + return version.to_int () >= 0x00010003u && hb_barrier () ? this+varStore : Null(ItemVariationStore); } - bool has_data () const { return u.version.to_int (); } + bool has_data () const { return version.to_int (); } unsigned int get_glyph_class (hb_codepoint_t glyph) const { return get_glyph_class_def ().get_class (glyph); } void get_glyphs_in_class (unsigned int klass, hb_set_t *glyphs) const @@ -934,9 +937,15 @@ struct GDEF unsigned int start_offset, unsigned int *caret_count /* IN/OUT */, hb_position_t *caret_array /* OUT */) const - { return get_lig_caret_list ().get_lig_carets (font, - direction, glyph_id, get_var_store(), - start_offset, caret_count, caret_array); } + { +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010004u && ligCaretList2) + return (this+ligCaretList2).get_lig_carets (font, direction, glyph_id, get_var_store (), + start_offset, caret_count, caret_array); +#endif + return (this+ligCaretList).get_lig_carets (font, direction, glyph_id, get_var_store (), + start_offset, caret_count, caret_array); + } bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const { return get_mark_glyph_sets ().covers (set_index, glyph_id); } @@ -977,7 +986,39 @@ struct GDEF } #ifndef HB_NO_GDEF_CACHE - table->get_mark_glyph_sets ().collect_coverage (mark_glyph_sets); + /* Flatten each mark set whose glyphs span fewer than PAGE_BITS + * gids into a single bit-page biased at its first glyph, for + * O(1) exact answers. Wider sets, or on allocation failure, + * fall back to the table. */ + { + hb_vector_t sets; + table->get_mark_glyph_sets ().collect_coverage (sets); + if (!sets.in_error () && + mark_glyph_set_bitmaps.resize (sets.length)) + for (unsigned i = 0; i < sets.length; i++) + { + auto &bitmap = mark_glyph_set_bitmaps.arrayZ[i]; + bitmap.bias = HB_SET_VALUE_INVALID; + const auto &set = sets.arrayZ[i]; + if (unlikely (set.in_error ())) continue; + hb_codepoint_t min_gid = HB_SET_VALUE_INVALID; + hb_codepoint_t max_gid = HB_SET_VALUE_INVALID; + hb_set_next (&set, &min_gid); + hb_set_previous (&set, &max_gid); + if (max_gid == HB_SET_VALUE_INVALID) + continue; + if (max_gid - min_gid >= hb_bit_page_t::PAGE_BITS) + { + /* Too wide for one page; a digest pre-filter instead. */ + for (hb_codepoint_t gid : set) + bitmap.u.digest.add (gid); + continue; + } + bitmap.bias = min_gid; + for (hb_codepoint_t gid : set) + bitmap.u.page.add (gid - min_gid); + } + } #endif } ~accelerator_t () { table.destroy (); } @@ -1005,20 +1046,37 @@ struct GDEF HB_ALWAYS_INLINE bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const { - return #ifndef HB_NO_GDEF_CACHE - // We can access arrayZ directly because of sanitize_lookup_props() guarantee. - mark_glyph_sets.arrayZ[set_index].may_have (glyph_id) && + // We can access arrayZ directly because of sanitize_lookup_props() guarantee. + const auto &bitmap = mark_glyph_set_bitmaps.arrayZ[set_index]; + if (likely (bitmap.bias != HB_SET_VALUE_INVALID)) + { + hb_codepoint_t biased = glyph_id - bitmap.bias; + return biased < hb_bit_page_t::PAGE_BITS && + bitmap.u.page.get (biased); + } + return mark_set_covers_slow (set_index, glyph_id); +#else + return table->mark_set_covers (set_index, glyph_id); #endif - table->mark_set_covers (set_index, glyph_id) - ; } +#ifndef HB_NO_GDEF_CACHE + HB_NEVER_INLINE + bool mark_set_covers_slow (unsigned int set_index, hb_codepoint_t glyph_id) const + { + const auto &bitmap = mark_glyph_set_bitmaps.arrayZ[set_index]; + if (!bitmap.u.digest.may_have (glyph_id)) + return false; + return table->mark_set_covers (set_index, glyph_id); + } +#endif + unsigned sanitize_lookup_props (unsigned lookup_props) const { #ifndef HB_NO_GDEF_CACHE if (lookup_props & LookupFlag::UseMarkFilteringSet && - (lookup_props >> 16) >= mark_glyph_sets.length) + (lookup_props >> 16) >= mark_glyph_set_bitmaps.length) { // Invalid mark filtering set index; unset the flag. lookup_props &= ~LookupFlag::UseMarkFilteringSet; @@ -1029,25 +1087,128 @@ struct GDEF hb_blob_ptr_t table; #ifndef HB_NO_GDEF_CACHE - hb_vector_t mark_glyph_sets; + struct mark_glyph_set_bitmap_t + { + /* Gid of the first bit (not page-aligned) for an exact one-page + * set, or HB_SET_VALUE_INVALID; then digest is a pre-filter for + * the table. The all-zeros state is valid for both members. */ + hb_codepoint_t bias = HB_SET_VALUE_INVALID; + union u_t { + u_t () : page () {} + hb_bit_page_t page; + hb_set_digest_t digest; + } u; + }; + + hb_vector_t mark_glyph_set_bitmaps; mutable hb_cache_t<21, 3> glyph_props_cache; static_assert (sizeof (glyph_props_cache) == 512, ""); #endif }; void collect_variation_indices (hb_collect_variation_indices_context_t *c) const - { get_lig_caret_list ().collect_variation_indices (c); } + { +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010004u && ligCaretList2) + { + (this+ligCaretList2).collect_variation_indices (c); + return; + } +#endif + (this+ligCaretList).collect_variation_indices (c); + } protected: - union { - FixedVersion<> version; /* Version identifier */ - GDEFVersion1_2 version1; + template + static void remap_varidx_after_instantiation (const hb_map_t& varidx_map, + hb_hashmap_t>& layout_variation_idx_delta_map /* IN/OUT */) + { + /* varidx_map is empty which means varstore is empty after instantiation, + * no variations, map all varidx to HB_OT_LAYOUT_NO_VARIATIONS_INDEX. + * varidx_map doesn't have original varidx, indicating delta row is all + * zeros, map varidx to HB_OT_LAYOUT_NO_VARIATIONS_INDEX */ + for (auto _ : layout_variation_idx_delta_map.iter_ref ()) + { + /* old_varidx->(varidx, delta) mapping generated for subsetting, then this + * varidx is used as key of varidx_map during instantiation */ + uint32_t varidx = _.second.first; + uint32_t *new_varidx; + if (varidx_map.has (varidx, &new_varidx)) + _.second.first = *new_varidx; + else + _.second.first = HB_OT_LAYOUT_NO_VARIATIONS_INDEX; + } + } + + template + static bool serialize_subset_offset (hb_subset_context_t *c, + OffsetOut& out, + const OffsetIn& in, + const Base *base, + Ts&&... ds) + { + out = 0; + if (in.is_null ()) return false; + + auto *s = c->serializer; + s->push (); + bool ret = c->dispatch (base+in, std::forward (ds)...); + if (ret) s->add_link (out, s->pop_pack ()); + else s->pop_discard (); + return ret; + } + + FixedVersion<>version; /* Version of the GDEF table--currently + * 0x00010004u */ + Offset16To + glyphClassDef; /* Offset to class definition table + * for glyph type--from beginning of + * GDEF header (may be Null) */ + Offset16To + attachList; /* Offset to list of glyphs with + * attachment points--from beginning + * of GDEF header (may be Null) */ + Offset16To> + ligCaretList; /* Offset to list of positioning points + * for ligature carets--from beginning + * of GDEF header (may be Null) */ + Offset16To + markAttachClassDef; /* Offset to class definition table for + * mark attachment type--from beginning + * of GDEF header (may be Null) */ + Offset16To + markGlyphSetsDef; /* Offset to the table of mark set + * definitions--from beginning of GDEF + * header (may be NULL). Introduced + * in version 0x00010002. */ + Offset32To + varStore; /* Offset to the table of Item Variation + * Store--from beginning of GDEF + * header (may be NULL). Introduced + * in version 0x00010003. */ #ifndef HB_NO_BEYOND_64K - GDEFVersion1_2 version2; + Offset32To + glyphClassDef2; /* 32-bit offset to class definition + * table for glyph type. Introduced + * in version 0x00010004. */ + Offset32To + attachList2; /* 32-bit offset to list of glyphs + * with attachment points. Introduced + * in version 0x00010004. */ + Offset32To> + ligCaretList2; /* 32-bit offset to LigCaretList2. + * Introduced in version 0x00010004. */ + Offset32To + markAttachClassDef2; /* 32-bit offset to class definition + * table for mark attachment type. + * Introduced in version 0x00010004. */ + Offset32To + markGlyphSetsDef2; /* 32-bit offset to the table of mark + * set definitions. Introduced in + * version 0x00010004. */ #endif - } u; public: - DEFINE_SIZE_MIN (4); + DEFINE_SIZE_MIN (12); }; struct GDEF_accelerator_t : GDEF::accelerator_t { diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh index 1938803fa7c4..48c509c25d2a 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh @@ -27,9 +27,9 @@ struct Anchor if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); - case 3: return_trace (u.format3.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); default:return_trace (true); } } @@ -39,9 +39,9 @@ struct Anchor { *x = *y = 0; switch (u.format.v) { - case 1: u.format1.get_anchor (c, glyph_id, x, y); return; - case 2: u.format2.get_anchor (c, glyph_id, x, y); return; - case 3: u.format3.get_anchor (c, glyph_id, x, y); return; + case 1: hb_barrier (); u.format1.get_anchor (c, glyph_id, x, y); return; + case 2: hb_barrier (); u.format2.get_anchor (c, glyph_id, x, y); return; + case 3: hb_barrier (); u.format3.get_anchor (c, glyph_id, x, y); return; default: return; } } @@ -50,8 +50,9 @@ struct Anchor { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); + case 1: hb_barrier (); return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); case 2: + hb_barrier (); if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING) { // AnchorFormat 2 just containins extra hinting information, so @@ -59,7 +60,7 @@ struct Anchor return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); } return_trace (bool (reinterpret_cast (u.format2.copy (c->serializer)))); - case 3: return_trace (u.format3.subset (c)); + case 3: hb_barrier (); return_trace (u.format3.subset (c)); default:return_trace (false); } } @@ -70,6 +71,7 @@ struct Anchor case 1: case 2: return; case 3: + hb_barrier (); u.format3.collect_variation_indices (c); return; default: return; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh index c49705bea0eb..1bf4b92b0379 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh @@ -40,12 +40,12 @@ struct AnchorFormat3 if ((font->x_ppem || font->has_nonzero_coords) && xDeviceTable.sanitize (&c->sanitizer, this)) { hb_barrier (); - *x += (this+xDeviceTable).get_x_delta (font, c->var_store, c->var_store_cache); + *x += (this+xDeviceTable).get_x_delta_f (font, c->var_store, c->var_store_cache); } if ((font->y_ppem || font->has_nonzero_coords) && yDeviceTable.sanitize (&c->sanitizer, this)) { hb_barrier (); - *y += (this+yDeviceTable).get_y_delta (font, c->var_store, c->var_store_cache); + *y += (this+yDeviceTable).get_y_delta_f (font, c->var_store, c->var_store_cache); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh index 128ced6c176d..6ef66701c254 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh @@ -5,14 +5,87 @@ namespace OT { namespace Layout { namespace GPOS_impl { +HB_INTERNAL inline +void collect_ligature_anchor_indexes (unsigned rows, + unsigned class_count, + const hb_map_t &klass_mapping, + hb_sorted_vector_t &indexes) +{ + for (unsigned row = 0; row < rows; row++) + for (unsigned col = 0; col < class_count; col++) + if (klass_mapping.has (col)) + indexes.push (row * class_count + col); +} + +HB_INTERNAL inline +void collect_anchor_variation_indices (hb_collect_variation_indices_context_t *c, + const void *base, + glyph_data_t offsets, + hb_array_t indexes) +{ + for (unsigned i : indexes) + { + unsigned offset = offsets[i]; + if (offset) + StructAtOffset (base, offset).collect_variation_indices (c); + } +} + +HB_INTERNAL inline +void collect_anchor_indexes (const Coverage &coverage, + unsigned rows, + unsigned class_count, + const hb_set_t &glyphset, + const hb_map_t &klass_mapping, + hb_sorted_vector_t &indexes) +{ + for (const auto _ : hb_zip (coverage, hb_range (rows))) + if (glyphset.has (_.first)) + for (unsigned col = 0; col < class_count; col++) + if (klass_mapping.has (col)) + indexes.push (_.second * class_count + col); +} + +HB_INTERNAL inline +void collect_subset_anchor_indexes (const Coverage &coverage, + unsigned rows, + unsigned class_count, + glyph_data_t offsets, + const hb_set_t &glyphset, + const hb_map_t &glyph_map, + const hb_map_t &klass_mapping, + hb_sorted_vector_t &new_coverage, + hb_sorted_vector_t &indexes) +{ + for (const auto _ : hb_zip (coverage, hb_range (rows))) + { + if (!glyphset.has (_.first)) continue; + unsigned row = _.second; + bool non_empty = false; + for (unsigned col = 0; col < class_count; col++) + if (klass_mapping.has (col) && offsets[row * class_count + col]) + { + non_empty = true; + break; + } + if (!non_empty) continue; + + new_coverage.push (glyph_map.get (_.first)); + for (unsigned col = 0; col < class_count; col++) + if (klass_mapping.has (col)) + indexes.push (row * class_count + col); + } +} + +template struct AnchorMatrix { - HBUINT16 rows; /* Number of rows */ - UnsizedArrayOf> + RowCount rows; /* Number of rows */ + UnsizedArrayOf> matrixZ; /* Matrix of offsets to Anchor tables-- * from beginning of AnchorMatrix table */ public: - DEFINE_SIZE_ARRAY (2, matrixZ); + DEFINE_SIZE_ARRAY (sizeof (RowCount), matrixZ); bool sanitize (hb_sanitize_context_t *c, unsigned int cols) const { @@ -45,13 +118,10 @@ struct AnchorMatrix return this+offset; } - template void collect_variation_indices (hb_collect_variation_indices_context_t *c, - Iterator index_iter) const + hb_array_t indexes) const { - for (unsigned i : index_iter) - (this+matrixZ[i]).collect_variation_indices (c); + collect_anchor_variation_indices (c, this, matrixZ.arrayZ, indexes); } template +struct ValueBase; +struct ValueFormat; + +template static void SinglePos_serialize (hb_serialize_context_t *c, - const SrcLookup *src, + const ValueBase *src, + ValueFormat src_format, Iterator it, const hb_hashmap_t> *layout_variation_idx_delta_map, unsigned new_format); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh index 38a29dd9ed50..062095581051 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh @@ -12,7 +12,10 @@ struct CursivePos protected: union { struct { HBUINT16 v; } format; /* Format identifier */ - CursivePosFormat1 format1; + CursivePosFormat1_2 format1; +#ifndef HB_NO_BEYOND_64K + CursivePosFormat1_2 format2; +#endif } u; public: @@ -22,7 +25,10 @@ struct CursivePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); +#ifndef HB_NO_BEYOND_64K + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); +#endif default:return_trace (c->default_return_value ()); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh index c96f66da9b3f..184dc3a70c54 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh @@ -2,30 +2,35 @@ #define OT_LAYOUT_GPOS_CURSIVEPOSFORMAT1_HH #include "Anchor.hh" +#include "../../../hb-limits.hh" namespace OT { namespace Layout { namespace GPOS_impl { +template +struct CursivePosFormat1_2; + +template struct EntryExitRecord { - friend struct CursivePosFormat1; + template friend struct CursivePosFormat1_2; - bool sanitize (hb_sanitize_context_t *c, const struct CursivePosFormat1 *base) const + bool sanitize (hb_sanitize_context_t *c, const struct CursivePosFormat1_2 *base) const { TRACE_SANITIZE (this); return_trace (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base)); } void collect_variation_indices (hb_collect_variation_indices_context_t *c, - const struct CursivePosFormat1 *src_base) const + const struct CursivePosFormat1_2 *src_base) const { (src_base+entryAnchor).collect_variation_indices (c); (src_base+exitAnchor).collect_variation_indices (c); } bool subset (hb_subset_context_t *c, - const struct CursivePosFormat1 *src_base) const + const struct CursivePosFormat1_2 *src_base) const { TRACE_SERIALIZE (this); auto *out = c->serializer->embed (this); @@ -38,16 +43,16 @@ struct EntryExitRecord } protected: - Offset16To + typename Types::template OffsetTo> entryAnchor; /* Offset to EntryAnchor table--from * beginning of CursivePos * subtable--may be NULL */ - Offset16To + typename Types::template OffsetTo> exitAnchor; /* Offset to ExitAnchor table--from * beginning of CursivePos * subtable--may be NULL */ public: - DEFINE_SIZE_STATIC (4); + DEFINE_SIZE_STATIC (2 * Types::size); }; static inline void @@ -55,8 +60,12 @@ reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int len, unsigned int i, hb_direction_t direction, - unsigned int new_parent) + unsigned int new_parent, + unsigned nesting_level = 0) { + if (nesting_level > HB_MAX_NESTING_LEVEL) + return; + int chain = pos[i].attach_chain(), type = pos[i].attach_type(); if (likely (!chain || 0 == (type & ATTACH_TYPE_CURSIVE))) return; @@ -79,30 +88,155 @@ reverse_cursive_minor_offset (hb_glyph_position_t *pos, if (unlikely (reversed_chain != -chain)) return; - reverse_cursive_minor_offset (pos, len, j, direction, new_parent); + reverse_cursive_minor_offset (pos, len, j, direction, new_parent, nesting_level + 1); if (HB_DIRECTION_IS_HORIZONTAL (direction)) - pos[j].y_offset = -pos[i].y_offset; + pos[j].y_offset = hb_saturate_neg (pos[i].y_offset); else - pos[j].x_offset = -pos[i].x_offset; + pos[j].x_offset = hb_saturate_neg (pos[i].x_offset); pos[j].attach_chain() = reversed_chain; pos[j].attach_type() = type; } -struct CursivePosFormat1 +static inline bool +apply_cursive_attachment (hb_ot_apply_context_t *c, + const Anchor &exit_anchor, + const Anchor &entry_anchor, + unsigned i) { + hb_buffer_t *buffer = c->buffer; + unsigned int j = buffer->idx; + + if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) + { + c->buffer->message (c->font, + "cursive attaching glyph at %u to glyph at %u", + i, j); + } + + buffer->unsafe_to_break (i, j + 1); + float entry_x, entry_y, exit_x, exit_y; + exit_anchor.get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y); + entry_anchor.get_anchor (c, buffer->info[j].codepoint, &entry_x, &entry_y); + + hb_glyph_position_t *pos = buffer->pos; + + hb_position_t d; + /* Main-direction adjustment */ + switch (c->direction) { + case HB_DIRECTION_LTR: + pos[i].x_advance = hb_saturate_add ((hb_position_t) roundf (exit_x), pos[i].x_offset); + + d = hb_saturate_add ((hb_position_t) roundf (entry_x), pos[j].x_offset); + pos[j].x_advance = hb_saturate_sub (pos[j].x_advance, d); + pos[j].x_offset = hb_saturate_sub (pos[j].x_offset, d); + break; + case HB_DIRECTION_RTL: + d = hb_saturate_add ((hb_position_t) roundf (exit_x), pos[i].x_offset); + pos[i].x_advance = hb_saturate_sub (pos[i].x_advance, d); + pos[i].x_offset = hb_saturate_sub (pos[i].x_offset, d); + + pos[j].x_advance = hb_saturate_add ((hb_position_t) roundf (entry_x), pos[j].x_offset); + break; + case HB_DIRECTION_TTB: + pos[i].y_advance = hb_saturate_add ((hb_position_t) roundf (exit_y), pos[i].y_offset); + + d = hb_saturate_add ((hb_position_t) roundf (entry_y), pos[j].y_offset); + pos[j].y_advance = hb_saturate_sub (pos[j].y_advance, d); + pos[j].y_offset = hb_saturate_sub (pos[j].y_offset, d); + break; + case HB_DIRECTION_BTT: + d = hb_saturate_add ((hb_position_t) roundf (exit_y), pos[i].y_offset); + pos[i].y_advance = hb_saturate_sub (pos[i].y_advance, d); + pos[i].y_offset = hb_saturate_sub (pos[i].y_offset, d); + + pos[j].y_advance = (hb_position_t) roundf (entry_y); + break; + case HB_DIRECTION_INVALID: + default: + break; + } + + /* Cross-direction adjustment */ + + /* We attach child to parent (think graph theory and rooted trees whereas + * the root stays on baseline and each node aligns itself against its + * parent. + * + * Optimize things for the case of RightToLeft, as that's most common in + * Arabic. */ + unsigned int child = i; + unsigned int parent = j; + hb_position_t x_offset = (hb_position_t) roundf (entry_x - exit_x); + hb_position_t y_offset = (hb_position_t) roundf (entry_y - exit_y); + if (!(c->lookup_props & LookupFlag::RightToLeft)) + { + unsigned int k = child; + child = parent; + parent = k; + x_offset = -x_offset; + y_offset = -y_offset; + } + + /* If child was already connected to someone else, walk through its old + * chain and reverse the link direction, such that the whole tree of its + * previous connection now attaches to new parent. Watch out for case + * where new parent is on the path from old chain... + */ + reverse_cursive_minor_offset (pos, buffer->len, child, c->direction, parent); + + pos[child].attach_chain() = (int) parent - (int) child; + if (pos[child].attach_chain() != (int) parent - (int) child) + { + pos[child].attach_chain() = 0; + goto overflow; + } + pos[child].attach_type() = ATTACH_TYPE_CURSIVE; + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) + pos[child].y_offset = y_offset; + else + pos[child].x_offset = x_offset; + + /* If parent was attached to child, separate them. + * https://github.com/harfbuzz/harfbuzz/issues/2469 + */ + if (unlikely (pos[parent].attach_chain() == -pos[child].attach_chain())) + { + pos[parent].attach_chain() = 0; + if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) + pos[parent].y_offset = 0; + else + pos[parent].x_offset = 0; + } + + if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) + { + c->buffer->message (c->font, + "cursive attached glyph at %u to glyph at %u", + i, j); + } + +overflow: + buffer->idx++; + return true; +} + +template +struct CursivePosFormat1_2 +{ + protected: HBUINT16 format; /* Format identifier--format = 1 */ - Offset16To - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - Array16Of + typename Types::template LOffsetTo + coverage; /* Offset to Coverage table--from beginning of subtable */ + typename Types::template ArrayOf> entryExitRecord; /* Array of EntryExit records--in * Coverage Index order */ public: - DEFINE_SIZE_ARRAY (6, entryExitRecord); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, entryExitRecord); bool sanitize (hb_sanitize_context_t *c) const { @@ -126,13 +260,16 @@ struct CursivePosFormat1 + hb_zip (this+coverage, entryExitRecord) | hb_filter (c->glyph_set, hb_first) | hb_map (hb_second) - | hb_apply ([&] (const EntryExitRecord& record) { record.collect_variation_indices (c, this); }) + | hb_apply ([&] (const EntryExitRecord& record) { record.collect_variation_indices (c, this); }) ; } void collect_glyphs (hb_collect_glyphs_context_t *c) const { if (unlikely (!(this+coverage).collect_coverage (c->input))) return; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { (this+coverage).collect_coverage (digest); } + const Coverage &get_coverage () const { return this+coverage; } bool apply (hb_ot_apply_context_t *c) const @@ -140,7 +277,7 @@ struct CursivePosFormat1 TRACE_APPLY (this); hb_buffer_t *buffer = c->buffer; - const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage (buffer->cur().codepoint)]; + const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage (buffer->cur().codepoint)]; if (!this_record.entryAnchor || unlikely (!this_record.entryAnchor.sanitize (&c->sanitizer, this))) return_trace (false); hb_barrier (); @@ -154,7 +291,7 @@ struct CursivePosFormat1 return_trace (false); } - const EntryExitRecord &prev_record = entryExitRecord[(this+coverage).get_coverage (buffer->info[skippy_iter.idx].codepoint)]; + const EntryExitRecord &prev_record = entryExitRecord[(this+coverage).get_coverage (buffer->info[skippy_iter.idx].codepoint)]; if (!prev_record.exitAnchor || unlikely (!prev_record.exitAnchor.sanitize (&c->sanitizer, this))) { @@ -163,136 +300,24 @@ struct CursivePosFormat1 } hb_barrier (); - unsigned int i = skippy_iter.idx; - unsigned int j = buffer->idx; - - if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) - { - c->buffer->message (c->font, - "cursive attaching glyph at %u to glyph at %u", - i, j); - } - - buffer->unsafe_to_break (i, j + 1); - float entry_x, entry_y, exit_x, exit_y; - (this+prev_record.exitAnchor).get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y); - (this+this_record.entryAnchor).get_anchor (c, buffer->info[j].codepoint, &entry_x, &entry_y); - - hb_glyph_position_t *pos = buffer->pos; - - hb_position_t d; - /* Main-direction adjustment */ - switch (c->direction) { - case HB_DIRECTION_LTR: - pos[i].x_advance = roundf (exit_x) + pos[i].x_offset; - - d = roundf (entry_x) + pos[j].x_offset; - pos[j].x_advance -= d; - pos[j].x_offset -= d; - break; - case HB_DIRECTION_RTL: - d = roundf (exit_x) + pos[i].x_offset; - pos[i].x_advance -= d; - pos[i].x_offset -= d; - - pos[j].x_advance = roundf (entry_x) + pos[j].x_offset; - break; - case HB_DIRECTION_TTB: - pos[i].y_advance = roundf (exit_y) + pos[i].y_offset; - - d = roundf (entry_y) + pos[j].y_offset; - pos[j].y_advance -= d; - pos[j].y_offset -= d; - break; - case HB_DIRECTION_BTT: - d = roundf (exit_y) + pos[i].y_offset; - pos[i].y_advance -= d; - pos[i].y_offset -= d; - - pos[j].y_advance = roundf (entry_y); - break; - case HB_DIRECTION_INVALID: - default: - break; - } - - /* Cross-direction adjustment */ - - /* We attach child to parent (think graph theory and rooted trees whereas - * the root stays on baseline and each node aligns itself against its - * parent. - * - * Optimize things for the case of RightToLeft, as that's most common in - * Arabic. */ - unsigned int child = i; - unsigned int parent = j; - hb_position_t x_offset = roundf (entry_x - exit_x); - hb_position_t y_offset = roundf (entry_y - exit_y); - if (!(c->lookup_props & LookupFlag::RightToLeft)) - { - unsigned int k = child; - child = parent; - parent = k; - x_offset = -x_offset; - y_offset = -y_offset; - } - - /* If child was already connected to someone else, walk through its old - * chain and reverse the link direction, such that the whole tree of its - * previous connection now attaches to new parent. Watch out for case - * where new parent is on the path from old chain... - */ - reverse_cursive_minor_offset (pos, buffer->len, child, c->direction, parent); - - pos[child].attach_chain() = (int) parent - (int) child; - if (pos[child].attach_chain() != (int) parent - (int) child) - { - pos[child].attach_chain() = 0; - goto overflow; - } - pos[child].attach_type() = ATTACH_TYPE_CURSIVE; - buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; - if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) - pos[child].y_offset = y_offset; - else - pos[child].x_offset = x_offset; - - /* If parent was attached to child, separate them. - * https://github.com/harfbuzz/harfbuzz/issues/2469 - */ - if (unlikely (pos[parent].attach_chain() == -pos[child].attach_chain())) - { - pos[parent].attach_chain() = 0; - if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) - pos[parent].y_offset = 0; - else - pos[parent].x_offset = 0; - } - - if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) - { - c->buffer->message (c->font, - "cursive attached glyph at %u to glyph at %u", - i, j); - } - - overflow: - buffer->idx++; - return_trace (true); + return_trace (apply_cursive_attachment (c, + this+prev_record.exitAnchor, + this+this_record.entryAnchor, + skippy_iter.idx)); } template void serialize (hb_subset_context_t *c, Iterator it, - const struct CursivePosFormat1 *src_base) + const struct CursivePosFormat1_2 *src_base) { if (unlikely (!c->serializer->extend_min ((*this)))) return; - this->format = 1; + this->format = src_base->format; this->entryExitRecord.len = it.len (); - for (const EntryExitRecord& entry_record : + it - | hb_map (hb_second)) + for (const EntryExitRecord& entry_record : + it + | hb_map (hb_second)) entry_record.subset (c, src_base); auto glyphs = @@ -314,7 +339,8 @@ struct CursivePosFormat1 auto it = + hb_zip (this+coverage, entryExitRecord) | hb_filter (glyphset, hb_first) - | hb_map_retains_sorting ([&] (hb_pair_t p) -> hb_pair_t + | hb_map_retains_sorting ([&] (hb_pair_t&> p) + -> hb_pair_t&> { return hb_pair (glyph_map[p.first], p.second);}) ; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh index b80f606f7b56..8748250b9463 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh @@ -101,14 +101,16 @@ propagate_attachment_offsets (hb_glyph_position_t *pos, if (type & GPOS_impl::ATTACH_TYPE_CURSIVE) { if (HB_DIRECTION_IS_HORIZONTAL (direction)) - pos[i].y_offset += pos[j].y_offset; + pos[i].y_offset = hb_saturate_add (pos[i].y_offset, pos[j].y_offset); else - pos[i].x_offset += pos[j].x_offset; + pos[i].x_offset = hb_saturate_add (pos[i].x_offset, pos[j].x_offset); } else /*if (type & GPOS_impl::ATTACH_TYPE_MARK)*/ { - pos[i].x_offset += pos[j].x_offset; - pos[i].y_offset += pos[j].y_offset; + if (HB_DIRECTION_IS_HORIZONTAL (direction)) + pos[i].x_offset = hb_saturate_add (pos[i].x_offset, pos[j].x_offset); + else + pos[i].y_offset = hb_saturate_add (pos[i].y_offset, pos[j].y_offset); // i is the position of the mark; j is the base. if (j < i) @@ -117,13 +119,13 @@ propagate_attachment_offsets (hb_glyph_position_t *pos, * And currently the only way in OpenType. */ if (HB_DIRECTION_IS_FORWARD (direction)) for (unsigned int k = j; k < i; k++) { - pos[i].x_offset -= pos[k].x_advance; - pos[i].y_offset -= pos[k].y_advance; + pos[i].x_offset = hb_saturate_sub (pos[i].x_offset, pos[k].x_advance); + pos[i].y_offset = hb_saturate_sub (pos[i].y_offset, pos[k].y_advance); } else for (unsigned int k = j + 1; k < i + 1; k++) { - pos[i].x_offset += pos[k].x_advance; - pos[i].y_offset += pos[k].y_advance; + pos[i].x_offset = hb_saturate_add (pos[i].x_offset, pos[k].x_advance); + pos[i].y_offset = hb_saturate_add (pos[i].y_offset, pos[k].y_advance); } } else // j > i @@ -132,13 +134,13 @@ propagate_attachment_offsets (hb_glyph_position_t *pos, * to a base after it in the logical order. */ if (HB_DIRECTION_IS_FORWARD (direction)) for (unsigned int k = i; k < j; k++) { - pos[i].x_offset += pos[k].x_advance; - pos[i].y_offset += pos[k].y_advance; + pos[i].x_offset = hb_saturate_add (pos[i].x_offset, pos[k].x_advance); + pos[i].y_offset = hb_saturate_add (pos[i].y_offset, pos[k].y_advance); } else for (unsigned int k = i + 1; k < j + 1; k++) { - pos[i].x_offset -= pos[k].x_advance; - pos[i].y_offset -= pos[k].y_advance; + pos[i].x_offset = hb_saturate_sub (pos[i].x_offset, pos[k].x_advance); + pos[i].y_offset = hb_saturate_sub (pos[i].y_offset, pos[k].y_advance); } } } @@ -191,7 +193,8 @@ GPOS::position_finish_offsets (hb_font_t *font, hb_buffer_t *buffer) * as it gets weird otherwise. */ for (unsigned i = 0; i < len; i++) if (unlikely (pos[i].y_offset)) - pos[i].x_offset += roundf (font->slant_xy * pos[i].y_offset); + pos[i].x_offset = hb_clamp_to ((double) pos[i].x_offset + + (double) roundf (font->slant_xy * pos[i].y_offset)); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh index 113b693dc3ee..a04267aee8aa 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh @@ -5,15 +5,69 @@ namespace OT { namespace Layout { namespace GPOS_impl { +HB_INTERNAL inline +void collect_ligature_variation_indices (hb_collect_variation_indices_context_t *c, + const Coverage &coverage, + const void *base, + glyph_data_t offsets, + unsigned count, + unsigned class_count, + const hb_map_t &klass_mapping) +{ + for (const auto _ : hb_zip (coverage, hb_range (count))) + { + if (!c->glyph_set->has (_.first)) continue; + hb_barrier (); + unsigned offset = offsets[_.second]; + if (!offset) continue; + + const void *matrix = &StructAtOffset (base, offset); + /* LigatureAttach always has a 16-bit component count; its anchor + * offsets have the same width as the LigatureArray offsets. */ + unsigned rows = *static_cast (matrix); + glyph_data_t anchors = offsets; + anchors.data = (const char *) matrix + HBUINT16::static_size; + + hb_sorted_vector_t indexes; + collect_ligature_anchor_indexes (rows, class_count, klass_mapping, indexes); + collect_anchor_variation_indices (c, matrix, anchors, indexes.iter ()); + } +} -typedef AnchorMatrix LigatureAttach; /* component-major-- - * in order of writing direction--, - * mark-minor-- - * ordered by class--zero-based. */ /* Array of LigatureAttach tables ordered by LigatureCoverage Index */ -struct LigatureArray : List16OfOffset16To +template +struct LigatureArray : + Types::template ArrayOf>> { + typedef AnchorMatrix LigatureAttach; + typedef typename Types::template OffsetTo LigatureAttachOffset; + typedef typename Types::template ArrayOf Super; + + const LigatureAttach& operator [] (int i_) const + { + unsigned int i = (unsigned int) i_; + if (unlikely (i >= this->len)) return Null (LigatureAttach); + hb_barrier (); + return this+this->arrayZ[i]; + } + + template + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const + { + TRACE_SANITIZE (this); + return_trace (Super::sanitize (c, this, std::forward (ds)...)); + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const Coverage &coverage, + unsigned class_count, + const hb_map_t &klass_mapping) const + { + collect_ligature_variation_indices (c, coverage, this, this->arrayZ, + this->len, class_count, klass_mapping); + } + template bool subset (hb_subset_context_t *c, diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh index bddc5e7fe9ef..512ce3954dc1 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh @@ -8,22 +8,128 @@ namespace OT { namespace Layout { namespace GPOS_impl { -struct MarkArray : Array16Of /* Array of MarkRecords--in Coverage order */ +static inline hb_position_t +resolve_cross_offset (const hb_glyph_position_t *pos, + unsigned int len, + unsigned int glyph_pos, + hb_direction_t direction) { + bool horizontal = HB_DIRECTION_IS_HORIZONTAL (direction); + hb_position_t offset = horizontal ? pos[glyph_pos].y_offset : pos[glyph_pos].x_offset; + while (pos[glyph_pos].attach_type() & ATTACH_TYPE_CURSIVE) + { + int chain = pos[glyph_pos].attach_chain(); + if (!chain) + break; + unsigned int parent = (int) glyph_pos + chain; + if (unlikely (parent >= len)) + break; + glyph_pos = parent; + offset = hb_saturate_add (offset, + horizontal ? pos[glyph_pos].y_offset : pos[glyph_pos].x_offset); + } + return offset; +} + +static inline bool +apply_mark_attachment (hb_ot_apply_context_t *c, + const Anchor &mark_anchor, + const Anchor &glyph_anchor, + unsigned glyph_pos) +{ + hb_buffer_t *buffer = c->buffer; + float mark_x, mark_y, base_x, base_y; + + buffer->unsafe_to_break (glyph_pos, buffer->idx + 1); + mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y); + glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y); + + if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) + { + c->buffer->message (c->font, + "attaching mark glyph at %u to glyph at %u", + c->buffer->idx, glyph_pos); + } + + hb_position_t base_offset = resolve_cross_offset (buffer->pos, buffer->len, glyph_pos, + buffer->props.direction); + + hb_glyph_position_t &mark = buffer->cur_pos(); + mark.attach_chain() = (int) glyph_pos - (int) buffer->idx; + if (mark.attach_chain() != (int) glyph_pos - (int) buffer->idx) + { + mark.attach_chain() = 0; + goto overflow; + } + mark.attach_type() = ATTACH_TYPE_MARK; + mark.x_offset = roundf (base_x - mark_x); + mark.y_offset = roundf (base_y - mark_y); + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + mark.y_offset = hb_saturate_add (mark.y_offset, base_offset); + else + mark.x_offset = hb_saturate_add (mark.x_offset, base_offset); + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; + + if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) + { + c->buffer->message (c->font, + "attached mark glyph at %u to glyph at %u", + c->buffer->idx, glyph_pos); + } + +overflow: + buffer->idx++; + return true; +} + +HB_INTERNAL inline +void collect_mark_variation_indices (hb_collect_variation_indices_context_t *c, + const Coverage &coverage, + const void *base, + glyph_data_t anchors, + unsigned count, + unsigned record_size) +{ + for (const auto _ : hb_zip (coverage, hb_range (count))) + { + if (!c->glyph_set->has (_.first)) continue; + glyph_data_t anchor = anchors; + anchor.data = (const char *) anchors.data + _.second * record_size; + unsigned offset = anchor[0]; + if (offset) + StructAtOffset (base, offset).collect_variation_indices (c); + } +} + +template +struct MarkArray : Types::template ArrayOf> + /* Array of MarkRecords--in Coverage order */ +{ + typedef typename Types::template ArrayOf> Super; + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (Array16Of::sanitize (c, this)); + return_trace (Super::sanitize (c, this)); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const Coverage &coverage) const + { + if (!this->len) return; + collect_mark_variation_indices (c, coverage, this, + &this->arrayZ[0].markAnchor, + this->len, MarkRecord::static_size); + } + + template bool apply (hb_ot_apply_context_t *c, unsigned int mark_index, unsigned int glyph_index, - const AnchorMatrix &anchors, unsigned int class_count, + const AnchorMatrixType &anchors, unsigned int class_count, unsigned int glyph_pos) const { TRACE_APPLY (this); - hb_buffer_t *buffer = c->buffer; - const MarkRecord &record = Array16Of::operator[](mark_index); + const MarkRecord &record = Super::operator[](mark_index); unsigned int mark_class = record.klass; const Anchor& mark_anchor = this + record.markAnchor; @@ -33,41 +139,7 @@ struct MarkArray : Array16Of /* Array of MarkRecords--in Cove * return false such that the subsequent subtables have a chance at it. */ if (unlikely (!found)) return_trace (false); - float mark_x, mark_y, base_x, base_y; - - buffer->unsafe_to_break (glyph_pos, buffer->idx + 1); - mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y); - glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y); - - if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) - { - c->buffer->message (c->font, - "attaching mark glyph at %u to glyph at %u", - c->buffer->idx, glyph_pos); - } - - hb_glyph_position_t &o = buffer->cur_pos(); - o.attach_chain() = (int) glyph_pos - (int) buffer->idx; - if (o.attach_chain() != (int) glyph_pos - (int) buffer->idx) - { - o.attach_chain() = 0; - goto overflow; - } - o.attach_type() = ATTACH_TYPE_MARK; - o.x_offset = roundf (base_x - mark_x); - o.y_offset = roundf (base_y - mark_y); - buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; - - if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ()) - { - c->buffer->message (c->font, - "attached mark glyph at %u to glyph at %u", - c->buffer->idx, glyph_pos); - } - - overflow: - buffer->idx++; - return_trace (true); + return_trace (apply_mark_attachment (c, mark_anchor, glyph_anchor, glyph_pos)); } template /* Array of MarkRecords--in Cove }; HB_INTERNAL inline -void Markclass_closure_and_remap_indexes (const Coverage &mark_coverage, - const MarkArray &mark_array, - const hb_set_t &glyphset, - hb_map_t* klass_mapping /* INOUT */) +void Markclass_closure_and_remap_indexes (const Coverage &mark_coverage, + const void *mark_records, + unsigned count, + unsigned record_size, + const hb_set_t &glyphset, + hb_map_t *klass_mapping) { hb_set_t orig_classes; - - + hb_zip (mark_coverage, mark_array) - | hb_filter (glyphset, hb_first) - | hb_map (hb_second) - | hb_map (&MarkRecord::get_class) - | hb_sink (orig_classes) - ; + for (const auto _ : hb_zip (mark_coverage, hb_range (count))) + if (glyphset.has (_.first)) + { + const auto *klass = reinterpret_cast + ((const char *) mark_records + _.second * record_size); + orig_classes.add (*klass); + } unsigned idx = 0; for (auto klass : orig_classes.iter ()) @@ -127,6 +201,19 @@ void Markclass_closure_and_remap_indexes (const Coverage &mark_coverage, } } +template +HB_INTERNAL inline +void Markclass_closure_and_remap_indexes (const Coverage &mark_coverage, + const MarkArray &mark_array, + const hb_set_t &glyphset, + hb_map_t* klass_mapping /* INOUT */) +{ + Markclass_closure_and_remap_indexes (mark_coverage, + mark_array.arrayZ, mark_array.len, + MarkRecord::static_size, + glyphset, klass_mapping); +} + } } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh index 65f343bda8b9..f86a52912956 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh @@ -25,9 +25,9 @@ struct MarkBasePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh index ad071f327ea6..c23f388526fc 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh @@ -7,32 +7,27 @@ namespace OT { namespace Layout { namespace GPOS_impl { -typedef AnchorMatrix BaseArray; /* base-major-- - * in order of BaseCoverage Index--, - * mark-minor-- - * ordered by class--zero-based. */ - template struct MarkBasePosFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo markCoverage; /* Offset to MarkCoverage table--from * beginning of MarkBasePos subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo baseCoverage; /* Offset to BaseCoverage table--from * beginning of MarkBasePos subtable */ HBUINT16 classCount; /* Number of classes defined for marks */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> markArray; /* Offset to MarkArray table--from * beginning of MarkBasePos subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> baseArray; /* Offset to BaseArray table--from * beginning of MarkBasePos subtable */ public: - DEFINE_SIZE_STATIC (4 + 4 * Types::size); + DEFINE_SIZE_STATIC (4 + 4 * Types::LOffset::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -54,31 +49,15 @@ struct MarkBasePosFormat1_2 void collect_variation_indices (hb_collect_variation_indices_context_t *c) const { - + hb_zip (this+markCoverage, this+markArray) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - | hb_apply ([&] (const MarkRecord& record) { record.collect_variation_indices (c, &(this+markArray)); }) - ; + (this+markArray).collect_variation_indices (c, this+markCoverage); hb_map_t klass_mapping; Markclass_closure_and_remap_indexes (this+markCoverage, this+markArray, *c->glyph_set, &klass_mapping); - unsigned basecount = (this+baseArray).rows; - auto base_iter = - + hb_zip (this+baseCoverage, hb_range (basecount)) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - ; - hb_sorted_vector_t base_indexes; - for (const unsigned row : base_iter) - { - + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) - | hb_sink (base_indexes) - ; - } + collect_anchor_indexes (this+baseCoverage, (this+baseArray).rows, + classCount, *c->glyph_set, klass_mapping, + base_indexes); (this+baseArray).collect_variation_indices (c, base_indexes.iter ()); } @@ -88,6 +67,9 @@ struct MarkBasePosFormat1_2 if (unlikely (!(this+baseCoverage).collect_coverage (c->input))) return; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { (this+baseCoverage).collect_coverage (digest); } + const Coverage &get_coverage () const { return this+markCoverage; } static inline bool accept (hb_buffer_t *buffer, unsigned idx) @@ -202,35 +184,13 @@ struct MarkBasePosFormat1_2 &klass_mapping))) return_trace (false); - unsigned basecount = (this+baseArray).rows; - auto base_iter = - + hb_zip (this+baseCoverage, hb_range (basecount)) - | hb_filter (glyphset, hb_first) - ; - new_coverage.reset (); hb_sorted_vector_t base_indexes; - auto &base_array = (this+baseArray); - for (const auto _ : + base_iter) - { - unsigned row = _.second; - bool non_empty = + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return !base_array.offset_is_null (row, col, (unsigned) classCount); }) - | hb_any - ; - - if (!non_empty) continue; - - hb_codepoint_t new_g = glyph_map.get ( _.first); - new_coverage.push (new_g); - - + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) - | hb_sink (base_indexes) - ; - } + const auto &base_array = this+baseArray; + collect_subset_anchor_indexes (this+baseCoverage, base_array.rows, + classCount, base_array.matrixZ.arrayZ, + glyphset, glyph_map, klass_mapping, + new_coverage, base_indexes); if (!new_coverage) return_trace (false); if (!out->baseCoverage.serialize_serialize (c->serializer, new_coverage.iter ())) diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh index ee237eb479fb..c860dc0a79c3 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh @@ -25,9 +25,9 @@ struct MarkLigPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh index 509a26c2485e..a38b4929f356 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh @@ -13,22 +13,22 @@ struct MarkLigPosFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo markCoverage; /* Offset to Mark Coverage table--from * beginning of MarkLigPos subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo ligatureCoverage; /* Offset to Ligature Coverage * table--from beginning of MarkLigPos * subtable */ HBUINT16 classCount; /* Number of defined mark classes */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> markArray; /* Offset to MarkArray table--from * beginning of MarkLigPos subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> ligatureArray; /* Offset to LigatureArray table--from * beginning of MarkLigPos subtable */ public: - DEFINE_SIZE_STATIC (4 + 4 * Types::size); + DEFINE_SIZE_STATIC (4 + 4 * Types::LOffset::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -50,38 +50,13 @@ struct MarkLigPosFormat1_2 void collect_variation_indices (hb_collect_variation_indices_context_t *c) const { - + hb_zip (this+markCoverage, this+markArray) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - | hb_apply ([&] (const MarkRecord& record) { record.collect_variation_indices (c, &(this+markArray)); }) - ; + (this+markArray).collect_variation_indices (c, this+markCoverage); hb_map_t klass_mapping; Markclass_closure_and_remap_indexes (this+markCoverage, this+markArray, *c->glyph_set, &klass_mapping); - unsigned ligcount = (this+ligatureArray).len; - auto lig_iter = - + hb_zip (this+ligatureCoverage, hb_range (ligcount)) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - ; - - const LigatureArray& lig_array = this+ligatureArray; - for (const unsigned i : lig_iter) - { - hb_sorted_vector_t lig_indexes; - unsigned row_count = lig_array[i].rows; - for (unsigned row : + hb_range (row_count)) - { - + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) - | hb_sink (lig_indexes) - ; - } - - lig_array[i].collect_variation_indices (c, lig_indexes.iter ()); - } + (this+ligatureArray).collect_variation_indices (c, this+ligatureCoverage, + classCount, klass_mapping); } void collect_glyphs (hb_collect_glyphs_context_t *c) const @@ -90,8 +65,22 @@ struct MarkLigPosFormat1_2 if (unlikely (!(this+ligatureCoverage).collect_coverage (c->input))) return; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { (this+ligatureCoverage).collect_coverage (digest); } + const Coverage &get_coverage () const { return this+markCoverage; } + static inline bool accept (hb_buffer_t *buffer, unsigned idx) + { + /* We only want to attach to the first of a MultipleSubst sequence, + * which might have been ligated into a preceding ligature, and in that + * case the mark should attach to that ligature. + * https://github.com/harfbuzz/harfbuzz/issues/4969 + * Reject others... */ + return !_hb_glyph_info_multiplied (&buffer->info[idx]) || + 0 == _hb_glyph_info_get_lig_comp (&buffer->info[idx]); + } + bool apply (hb_ot_apply_context_t *c) const { TRACE_APPLY (this); @@ -114,6 +103,13 @@ struct MarkLigPosFormat1_2 { auto match = skippy_iter.match (buffer->info[j - 1]); if (match == skippy_iter.MATCH) + { + // https://github.com/harfbuzz/harfbuzz/issues/4124 + if (!accept (buffer, j - 1) && + NOT_COVERED == (this+ligatureCoverage).get_coverage (buffer->info[j - 1].codepoint)) + match = skippy_iter.SKIP; + } + if (match == skippy_iter.MATCH) { c->last_base = (signed) j - 1; break; @@ -138,8 +134,8 @@ struct MarkLigPosFormat1_2 return_trace (false); } - const LigatureArray& lig_array = this+ligatureArray; - const LigatureAttach& lig_attach = lig_array[lig_index]; + const LigatureArray& lig_array = this+ligatureArray; + const AnchorMatrix& lig_attach = lig_array[lig_index]; /* Find component to attach to */ unsigned int comp_count = lig_attach.rows; @@ -182,7 +178,7 @@ struct MarkLigPosFormat1_2 out->classCount = klass_mapping.get_population (); auto mark_iter = - + hb_zip (this+markCoverage, this+markArray) + + hb_zip (this+markCoverage, hb_range ((unsigned) (this+markArray).len)) | hb_filter (glyphset, hb_first) ; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh index c06f013cdce1..08e9c930d065 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh @@ -25,9 +25,9 @@ struct MarkMarkPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh index c93dbbb3f060..158f74a7409e 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh @@ -7,33 +7,28 @@ namespace OT { namespace Layout { namespace GPOS_impl { -typedef AnchorMatrix Mark2Array; /* mark2-major-- - * in order of Mark2Coverage Index--, - * mark1-minor-- - * ordered by class--zero-based. */ - template struct MarkMarkPosFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo mark1Coverage; /* Offset to Combining Mark1 Coverage * table--from beginning of MarkMarkPos * subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo mark2Coverage; /* Offset to Combining Mark2 Coverage * table--from beginning of MarkMarkPos * subtable */ HBUINT16 classCount; /* Number of defined mark classes */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> mark1Array; /* Offset to Mark1Array table--from * beginning of MarkMarkPos subtable */ - typename Types::template OffsetTo + typename Types::template LOffsetTo> mark2Array; /* Offset to Mark2Array table--from * beginning of MarkMarkPos subtable */ public: - DEFINE_SIZE_STATIC (4 + 4 * Types::size); + DEFINE_SIZE_STATIC (4 + 4 * Types::LOffset::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -56,31 +51,15 @@ struct MarkMarkPosFormat1_2 void collect_variation_indices (hb_collect_variation_indices_context_t *c) const { - + hb_zip (this+mark1Coverage, this+mark1Array) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - | hb_apply ([&] (const MarkRecord& record) { record.collect_variation_indices (c, &(this+mark1Array)); }) - ; + (this+mark1Array).collect_variation_indices (c, this+mark1Coverage); hb_map_t klass_mapping; Markclass_closure_and_remap_indexes (this+mark1Coverage, this+mark1Array, *c->glyph_set, &klass_mapping); - unsigned mark2_count = (this+mark2Array).rows; - auto mark2_iter = - + hb_zip (this+mark2Coverage, hb_range (mark2_count)) - | hb_filter (c->glyph_set, hb_first) - | hb_map (hb_second) - ; - hb_sorted_vector_t mark2_indexes; - for (const unsigned row : mark2_iter) - { - + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) - | hb_sink (mark2_indexes) - ; - } + collect_anchor_indexes (this+mark2Coverage, (this+mark2Array).rows, + classCount, *c->glyph_set, klass_mapping, + mark2_indexes); (this+mark2Array).collect_variation_indices (c, mark2_indexes.iter ()); } @@ -90,6 +69,9 @@ struct MarkMarkPosFormat1_2 if (unlikely (!(this+mark2Coverage).collect_coverage (c->input))) return; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { (this+mark2Coverage).collect_coverage (digest); } + const Coverage &get_coverage () const { return this+mark1Coverage; } bool apply (hb_ot_apply_context_t *c) const @@ -189,43 +171,20 @@ struct MarkMarkPosFormat1_2 &klass_mapping))) return_trace (false); - unsigned mark2count = (this+mark2Array).rows; - auto mark2_iter = - + hb_zip (this+mark2Coverage, hb_range (mark2count)) - | hb_filter (glyphset, hb_first) - ; - new_coverage.reset (); hb_sorted_vector_t mark2_indexes; - auto &mark2_array = (this+mark2Array); - for (const auto _ : + mark2_iter) - { - unsigned row = _.second; - - bool non_empty = + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return !mark2_array.offset_is_null (row, col, (unsigned) classCount); }) - | hb_any - ; - - if (!non_empty) continue; - - hb_codepoint_t new_g = glyph_map.get ( _.first); - new_coverage.push (new_g); - - + hb_range ((unsigned) classCount) - | hb_filter (klass_mapping) - | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) - | hb_sink (mark2_indexes) - ; - } + const auto &mark2_array = this+mark2Array; + collect_subset_anchor_indexes (this+mark2Coverage, mark2_array.rows, + classCount, mark2_array.matrixZ.arrayZ, + glyphset, glyph_map, klass_mapping, + new_coverage, mark2_indexes); if (!new_coverage) return_trace (false); if (!out->mark2Coverage.serialize_serialize (c->serializer, new_coverage.iter ())) return_trace (false); return_trace (out->mark2Array.serialize_subset (c, mark2Array, this, - mark2_iter.len (), + new_coverage.length, mark2_indexes.iter ())); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkRecord.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkRecord.hh index 123002526751..0703bad44c79 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkRecord.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkRecord.hh @@ -5,27 +5,30 @@ namespace OT { namespace Layout { namespace GPOS_impl { +template struct MarkArray; + +template struct MarkRecord { - friend struct MarkArray; + friend struct MarkArray; public: HBUINT16 klass; /* Class defined for this mark */ - Offset16To + typename Types::template OffsetTo> markAnchor; /* Offset to Anchor table--from * beginning of MarkArray table */ public: - DEFINE_SIZE_STATIC (4); + DEFINE_SIZE_STATIC (2 + Types::size); unsigned get_class () const { return (unsigned) klass; } - bool sanitize (hb_sanitize_context_t *c, const void *base) const + bool sanitize (hb_sanitize_context_t *c, const MarkArray *base) const { TRACE_SANITIZE (this); return_trace (c->check_struct (this) && markAnchor.sanitize (c, base)); } bool subset (hb_subset_context_t *c, - const void *src_base, + const MarkArray *src_base, const hb_map_t *klass_mapping) const { TRACE_SUBSET (this); @@ -37,7 +40,7 @@ struct MarkRecord } void collect_variation_indices (hb_collect_variation_indices_context_t *c, - const void *src_base) const + const MarkArray *src_base) const { (src_base+markAnchor).collect_variation_indices (c); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh index bf7fff7face1..df0ca6ad08d7 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh @@ -28,11 +28,11 @@ struct PairPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh index 1c067bde86fb..c2649d6927b8 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh @@ -16,7 +16,7 @@ struct PairPosFormat1_3 protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of subtable */ ValueFormat valueFormat[2]; /* [0] Defines the types of data in @@ -25,11 +25,11 @@ struct PairPosFormat1_3 /* [1] Defines the types of data in * ValueRecord2--for the second glyph * in the pair--may be zero (0) */ - Array16Of> - pairSet; /* Array of PairSet tables - * ordered by Coverage Index */ + typename Types::template ArrayOf> + pairSet; /* Array of PairSet tables ordered by + * Coverage Index */ public: - DEFINE_SIZE_ARRAY (8 + Types::size, pairSet); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + 2 * ValueFormat::static_size + Types::HBUINT::static_size, pairSet); bool sanitize (hb_sanitize_context_t *c) const { @@ -56,7 +56,7 @@ struct PairPosFormat1_3 if (pairSet.len > glyphs->get_population () * hb_bit_storage ((unsigned) pairSet.len)) { - for (hb_codepoint_t g : glyphs->iter()) + for (hb_codepoint_t g : glyphs->iter ()) { unsigned i = cov.get_coverage (g); if ((this+pairSet[i]).intersects (glyphs, valueFormat)) @@ -101,18 +101,35 @@ struct PairPosFormat1_3 (this+pairSet[i]).collect_glyphs (c, valueFormat); } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + unsigned count = pairSet.len; + for (unsigned i = 0; i < count; i++) + (this+pairSet[i]).collect_second_glyphs (digest, valueFormat); + } + const Coverage &get_coverage () const { return this+coverage; } struct external_cache_t { hb_ot_layout_mapping_cache_t coverage; + hb_set_digest_t pair_sets[HB_VAR_ARRAY]; }; void *external_cache_create () const { - external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t)); + unsigned count = pairSet.len; + unsigned size = sizeof (external_cache_t) - + HB_VAR_ARRAY * sizeof (hb_set_digest_t) + + count * sizeof (hb_set_digest_t); + external_cache_t *cache = (external_cache_t *) hb_malloc (size); if (likely (cache)) { cache->coverage.clear (); + for (unsigned i = 0; i < count; i++) + { + cache->pair_sets[i].init (); + (this+pairSet[i]).collect_second_glyphs (&cache->pair_sets[i], valueFormat); + } } return cache; } @@ -140,6 +157,16 @@ struct PairPosFormat1_3 return_trace (false); } +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + if (cache && + index < pairSet.len && + !cache->pair_sets[index].may_have (buffer->info[skippy_iter.idx].codepoint)) + { + buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1); + return_trace (false); + } +#endif + return_trace ((this+pairSet[index]).apply (c, valueFormat, skippy_iter.idx)); } @@ -214,8 +241,6 @@ struct PairPosFormat1_3 bool strip_hints, bool strip_empty, const hb_hashmap_t> *varidx_delta_map = nullptr) const { - unsigned record_size = PairSet::get_size (valueFormat); - unsigned format1 = 0; unsigned format2 = 0; for (const auto & _ : @@ -225,20 +250,13 @@ struct PairPosFormat1_3 ) { const PairSet& set = (this + _); - const PairValueRecord *record = &set.firstPairValueRecord; - - unsigned count = set.len; - for (unsigned i = 0; i < count; i++) - { - if (record->intersects (glyphset)) - { - format1 = format1 | valueFormat[0].get_effective_format (record->get_values_1 (), strip_hints, strip_empty, &set, varidx_delta_map); - format2 = format2 | valueFormat[1].get_effective_format (record->get_values_2 (valueFormat[0]), strip_hints, strip_empty, &set, varidx_delta_map); - } - record = &StructAtOffset (record, record_size); - } + auto formats = set.get_values_view (valueFormat).compute_effective_value_formats ( + glyphset, valueFormat, strip_hints, strip_empty, varidx_delta_map); + format1 |= formats.first; + format2 |= formats.second; - if (format1 == valueFormat[0] && format2 == valueFormat[1]) + if (!varidx_delta_map && + format1 == valueFormat[0] && format2 == valueFormat[1]) break; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh index ce731450f419..a99858d545fb 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh @@ -7,12 +7,137 @@ namespace OT { namespace Layout { namespace GPOS_impl { +HB_INTERNAL inline +void collect_pair_variation_indices (hb_collect_variation_indices_context_t *c, + const ValueBase *base, + const Coverage &coverage, + const ClassDef &class_def1, + const ClassDef &class_def2, + const ValueFormat &valueFormat1, + const ValueFormat &valueFormat2, + unsigned class1_count, + unsigned class2_count, + const ValueRecord &values) +{ + if (!coverage.intersects (c->glyph_set) || + !class_def2.intersects (c->glyph_set)) return; + if ((!valueFormat1.has_device ()) && (!valueFormat2.has_device ())) return; + + hb_set_t klass1_glyphs, klass2_glyphs; + if (!class_def1.collect_coverage (&klass1_glyphs)) return; + if (!class_def2.collect_coverage (&klass2_glyphs)) return; + + hb_set_t class1_set, class2_set; + for (const unsigned cp : + c->glyph_set->iter () | hb_filter (coverage)) + { + if (!klass1_glyphs.has (cp)) class1_set.add (0); + else + { + unsigned klass1 = class_def1.get (cp); + class1_set.add (klass1); + } + } + + class2_set.add (0); + for (const unsigned cp : + c->glyph_set->iter () | hb_filter (klass2_glyphs)) + { + unsigned klass2 = class_def2.get (cp); + class2_set.add (klass2); + } + + if (class1_set.is_empty () + || class2_set.is_empty () + || (class2_set.get_population() == 1 && class2_set.has(0))) + return; + + unsigned len1 = valueFormat1.get_len (); + unsigned len2 = valueFormat2.get_len (); + const hb_array_t values_array = values.as_array ((unsigned)class1_count * (unsigned) class2_count * (len1 + len2)); + for (const unsigned class1_idx : class1_set.iter ()) + { + for (const unsigned class2_idx : class2_set.iter ()) + { + unsigned start_offset = (class1_idx * (unsigned) class2_count + class2_idx) * (len1 + len2); + if (valueFormat1.has_device ()) + valueFormat1.collect_variation_indices (c, base, values_array.sub_array (start_offset, len1)); + + if (valueFormat2.has_device ()) + valueFormat2.collect_variation_indices (c, base, values_array.sub_array (start_offset+len1, len2)); + } + } +} + +/* Keep class-matrix traversal independent of the source table width. */ +struct pair_pos_class_values_t +{ + const ValueBase *base; + const ValueRecord &values; + const ValueFormat &valueFormat1; + const ValueFormat &valueFormat2; + unsigned class1_count; + unsigned class2_count; + + hb_pair_t compute_effective_value_formats (const hb_map_t &klass1_map, + const hb_map_t &klass2_map, + bool strip_hints, bool strip_empty, + const hb_hashmap_t> *varidx_delta_map = nullptr) const + { + unsigned len1 = valueFormat1.get_len (); + unsigned len2 = valueFormat2.get_len (); + unsigned record_size = len1 + len2; + + unsigned format1 = 0; + unsigned format2 = 0; + + for (unsigned class1_idx : + hb_range (class1_count) | hb_filter (klass1_map)) + { + for (unsigned class2_idx : + hb_range (class2_count) | hb_filter (klass2_map)) + { + unsigned idx = (class1_idx * class2_count + class2_idx) * record_size; + format1 = format1 | valueFormat1.get_effective_format (&values[idx], strip_hints, strip_empty, base, varidx_delta_map); + format2 = format2 | valueFormat2.get_effective_format (&values[idx + len1], strip_hints, strip_empty, base, varidx_delta_map); + } + + if (!varidx_delta_map && + format1 == valueFormat1 && format2 == valueFormat2) + break; + } + + return hb_pair (format1, format2); + } + + bool serialize (hb_subset_context_t *c, + const hb_map_t &klass1_map, + const hb_map_t &klass2_map, + ValueFormat newFormat1, + ValueFormat newFormat2) const + { + unsigned len1 = valueFormat1.get_len (); + unsigned len2 = valueFormat2.get_len (); + unsigned total_len = len1 + len2; + hb_vector_t class2_idxs (+ hb_range (class2_count) | hb_filter (klass2_map)); + if (unlikely (!c->serializer->propagate_error (class2_idxs))) + return false; + for (unsigned class1_idx : + hb_range (class1_count) | hb_filter (klass1_map)) + { + for (unsigned class2_idx : class2_idxs) + { + unsigned idx = (class1_idx * class2_count + class2_idx) * total_len; + valueFormat1.copy_values (c->serializer, newFormat1, base, &values[idx], &c->plan->layout_variation_idx_delta_map); + valueFormat2.copy_values (c->serializer, newFormat2, base, &values[idx + len1], &c->plan->layout_variation_idx_delta_map); + } + } + + return true; + } +}; + template struct PairPosFormat2_4 : ValueBase { protected: HBUINT16 format; /* Format identifier--format = 2 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of subtable */ ValueFormat valueFormat1; /* ValueRecord definition--for the @@ -21,11 +146,11 @@ struct PairPosFormat2_4 : ValueBase ValueFormat valueFormat2; /* ValueRecord definition--for the * second glyph of the pair--may be * zero (0) */ - typename Types::template OffsetTo + typename Types::template LOffsetTo classDef1; /* Offset to ClassDef table--from * beginning of PairPos subtable--for * the first glyph of the pair */ - typename Types::template OffsetTo + typename Types::template LOffsetTo classDef2; /* Offset to ClassDef table--from * beginning of PairPos subtable--for * the second glyph of the pair */ @@ -37,7 +162,7 @@ struct PairPosFormat2_4 : ValueBase * class1-major, class2-minor, * Each entry has value1 and value2 */ public: - DEFINE_SIZE_ARRAY (10 + 3 * Types::size, values); + DEFINE_SIZE_ARRAY (10 + 3 * Types::LOffset::static_size, values); bool sanitize (hb_sanitize_context_t *c) const { @@ -68,51 +193,10 @@ struct PairPosFormat2_4 : ValueBase void closure_lookups (hb_closure_lookups_context_t *c) const {} void collect_variation_indices (hb_collect_variation_indices_context_t *c) const { - if (!intersects (c->glyph_set)) return; - if ((!valueFormat1.has_device ()) && (!valueFormat2.has_device ())) return; - - hb_set_t klass1_glyphs, klass2_glyphs; - if (!(this+classDef1).collect_coverage (&klass1_glyphs)) return; - if (!(this+classDef2).collect_coverage (&klass2_glyphs)) return; - - hb_set_t class1_set, class2_set; - for (const unsigned cp : + c->glyph_set->iter () | hb_filter (this + coverage)) - { - if (!klass1_glyphs.has (cp)) class1_set.add (0); - else - { - unsigned klass1 = (this+classDef1).get (cp); - class1_set.add (klass1); - } - } - - class2_set.add (0); - for (const unsigned cp : + c->glyph_set->iter () | hb_filter (klass2_glyphs)) - { - unsigned klass2 = (this+classDef2).get (cp); - class2_set.add (klass2); - } - - if (class1_set.is_empty () - || class2_set.is_empty () - || (class2_set.get_population() == 1 && class2_set.has(0))) - return; - - unsigned len1 = valueFormat1.get_len (); - unsigned len2 = valueFormat2.get_len (); - const hb_array_t values_array = values.as_array ((unsigned)class1Count * (unsigned) class2Count * (len1 + len2)); - for (const unsigned class1_idx : class1_set.iter ()) - { - for (const unsigned class2_idx : class2_set.iter ()) - { - unsigned start_offset = (class1_idx * (unsigned) class2Count + class2_idx) * (len1 + len2); - if (valueFormat1.has_device ()) - valueFormat1.collect_variation_indices (c, this, values_array.sub_array (start_offset, len1)); - - if (valueFormat2.has_device ()) - valueFormat2.collect_variation_indices (c, this, values_array.sub_array (start_offset+len1, len2)); - } - } + collect_pair_variation_indices (c, this, this+coverage, + this+classDef1, this+classDef2, + valueFormat1, valueFormat2, + class1Count, class2Count, values); } void collect_glyphs (hb_collect_glyphs_context_t *c) const @@ -228,15 +312,15 @@ struct PairPosFormat2_4 : ValueBase if (!backward) { - dst1[i] += kern1; - dst2[i] += kern2; - dst2[i + 2] += kern2; + dst1[i] = hb_saturate_add (dst1[i], kern1); + dst2[i] = hb_saturate_add (dst2[i], kern2); + dst2[i + 2] = hb_saturate_add (dst2[i + 2], kern2); } else { - dst1[i] += kern1; - dst1[i + 2] += src[i + 2] - kern2; - dst2[i] += kern2; + dst1[i] = hb_saturate_add (dst1[i], kern1); + dst1[i + 2] = hb_clamp_to ((int64_t) dst1[i + 2] + src[i + 2] - kern2); + dst2[i] = hb_saturate_add (dst2[i], kern2); } applied_first = applied_second = kern != 0; @@ -307,8 +391,8 @@ struct PairPosFormat2_4 : ValueBase out->classDef2.serialize_subset (c, classDef2, this, &klass2_map, true, false); out->class2Count = klass2_map.get_population (); - unsigned len1 = valueFormat1.get_len (); - unsigned len2 = valueFormat2.get_len (); + pair_pos_class_values_t class_values {this, values, valueFormat1, valueFormat2, + class1Count, class2Count}; hb_pair_t newFormats = hb_pair (valueFormat1, valueFormat2); @@ -316,7 +400,7 @@ struct PairPosFormat2_4 : ValueBase { /* in case of full instancing, all var device flags will be dropped so no * need to strip hints here */ - newFormats = compute_effective_value_formats (klass1_map, klass2_map, false, false, &c->plan->layout_variation_idx_delta_map); + newFormats = class_values.compute_effective_value_formats (klass1_map, klass2_map, false, false, &c->plan->layout_variation_idx_delta_map); } /* do not strip hints for VF */ else if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING) @@ -330,56 +414,19 @@ struct PairPosFormat2_4 : ValueBase * subsetting*/ if (has_fvar && !c->plan->has_gdef_varstore) strip = true; - newFormats = compute_effective_value_formats (klass1_map, klass2_map, strip, true); + newFormats = class_values.compute_effective_value_formats (klass1_map, klass2_map, strip, true); } out->valueFormat1 = newFormats.first; out->valueFormat2 = newFormats.second; - unsigned total_len = len1 + len2; - hb_vector_t class2_idxs (+ hb_range ((unsigned) class2Count) | hb_filter (klass2_map)); - for (unsigned class1_idx : + hb_range ((unsigned) class1Count) | hb_filter (klass1_map)) - { - for (unsigned class2_idx : class2_idxs) - { - unsigned idx = (class1_idx * (unsigned) class2Count + class2_idx) * total_len; - valueFormat1.copy_values (c->serializer, out->valueFormat1, this, &values[idx], &c->plan->layout_variation_idx_delta_map); - valueFormat2.copy_values (c->serializer, out->valueFormat2, this, &values[idx + len1], &c->plan->layout_variation_idx_delta_map); - } - } + if (!class_values.serialize (c, klass1_map, klass2_map, + out->valueFormat1, out->valueFormat2)) + return_trace (false); bool ret = out->coverage.serialize_subset(c, coverage, this); return_trace (out->class1Count && out->class2Count && ret); } - - - hb_pair_t compute_effective_value_formats (const hb_map_t& klass1_map, - const hb_map_t& klass2_map, - bool strip_hints, bool strip_empty, - const hb_hashmap_t> *varidx_delta_map = nullptr) const - { - unsigned len1 = valueFormat1.get_len (); - unsigned len2 = valueFormat2.get_len (); - unsigned record_size = len1 + len2; - - unsigned format1 = 0; - unsigned format2 = 0; - - for (unsigned class1_idx : + hb_range ((unsigned) class1Count) | hb_filter (klass1_map)) - { - for (unsigned class2_idx : + hb_range ((unsigned) class2Count) | hb_filter (klass2_map)) - { - unsigned idx = (class1_idx * (unsigned) class2Count + class2_idx) * record_size; - format1 = format1 | valueFormat1.get_effective_format (&values[idx], strip_hints, strip_empty, this, varidx_delta_map); - format2 = format2 | valueFormat2.get_effective_format (&values[idx + len1], strip_hints, strip_empty, this, varidx_delta_map); - } - - if (format1 == valueFormat1 && format2 == valueFormat2) - break; - } - - return hb_pair (format1, format2); - } }; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh index d8428a125622..d8c84a301507 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh @@ -8,6 +8,60 @@ namespace Layout { namespace GPOS_impl { +/* Pair records vary in glyph width; their value traversal need not. */ +struct pair_set_values_t +{ + const ValueBase *base; + glyph_data_t glyphs; + const Value *values; + unsigned count; + unsigned record_size; + + unsigned get_glyph (unsigned i) const + { + glyph_data_t glyph = glyphs; + glyph.data = (const char *) glyph.data + i * record_size; + return glyph[0]; + } + + const Value *get_values (unsigned i) const + { return reinterpret_cast ((const char *) values + i * record_size); } + + hb_pair_t + compute_effective_value_formats (const hb_set_t &glyphset, + const ValueFormat valueFormats[2], + bool strip_hints, bool strip_empty, + const hb_hashmap_t> *varidx_delta_map) const + { + unsigned len1 = valueFormats[0].get_len (); + unsigned format1 = 0, format2 = 0; + for (unsigned i = 0; i < count; i++) + { + if (!glyphset.has (get_glyph (i))) continue; + const Value *v = get_values (i); + format1 |= valueFormats[0].get_effective_format (v, strip_hints, strip_empty, base, varidx_delta_map); + format2 |= valueFormats[1].get_effective_format (v + len1, strip_hints, strip_empty, base, varidx_delta_map); + } + return hb_pair (format1, format2); + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const ValueFormat valueFormats[2]) const + { + unsigned len1 = valueFormats[0].get_len (); + unsigned len2 = valueFormats[1].get_len (); + for (unsigned i = 0; i < count; i++) + { + if (!c->glyph_set->has (get_glyph (i))) continue; + const hb_array_t v = hb_array (get_values (i), len1 + len2); + if (valueFormats[0].has_device ()) + valueFormats[0].collect_variation_indices (c, base, v.sub_array (0, len1)); + if (valueFormats[1].has_device ()) + valueFormats[1].collect_variation_indices (c, base, v.sub_array (len1, len2)); + } + } +}; + template struct PairSet : ValueBase { @@ -17,12 +71,13 @@ struct PairSet : ValueBase using PairValueRecord = GPOS_impl::PairValueRecord; protected: - HBUINT16 len; /* Number of PairValueRecords */ + typename Types::HBUINT + len; /* Number of PairValueRecords */ PairValueRecord firstPairValueRecord; /* Array of PairValueRecords--ordered * by GlyphID of the second glyph */ public: - DEFINE_SIZE_MIN (2); + DEFINE_SIZE_MIN (Types::HBUINT::static_size); static size_t get_size (unsigned len1, unsigned len2) { @@ -84,20 +139,25 @@ struct PairSet : ValueBase c->input->add_array (&record->secondGlyph, len, record_size); } - void collect_variation_indices (hb_collect_variation_indices_context_t *c, - const ValueFormat *valueFormats) const + template + void collect_second_glyphs (set_t *glyphs, + const ValueFormat *valueFormats) const { unsigned record_size = get_size (valueFormats); - const PairValueRecord *record = &firstPairValueRecord; - unsigned count = len; - for (unsigned i = 0; i < count; i++) - { - if (c->glyph_set->has (record->secondGlyph)) - { record->collect_variation_indices (c, valueFormats, this); } + glyphs->add_array (&record->secondGlyph, len, record_size); + } - record = &StructAtOffset (record, record_size); - } + pair_set_values_t get_values_view (const ValueFormat valueFormats[2]) const + { + return {this, &firstPairValueRecord.secondGlyph, &firstPairValueRecord.values[0], + (unsigned) len, (unsigned) get_size (valueFormats)}; + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const ValueFormat *valueFormats) const + { + get_values_view (valueFormats).collect_variation_indices (c, valueFormats); } bool apply (hb_ot_apply_context_t *c, @@ -112,7 +172,7 @@ struct PairSet : ValueBase const PairValueRecord *record = hb_bsearch (buffer->info[pos].codepoint, &firstPairValueRecord, - len, + (unsigned) len, record_size); if (record) { @@ -143,6 +203,9 @@ struct PairSet : ValueBase if (applied_first || applied_second) buffer->unsafe_to_break (buffer->idx, pos + 1); + else + /* Even a zero-valued pair record is a concat hazard. */ + buffer->unsafe_to_concat (buffer->idx, pos + 1); if (len2) { @@ -177,7 +240,7 @@ struct PairSet : ValueBase unsigned len2 = valueFormats[1].get_len (); unsigned record_size = get_size (len1, len2); - typename PairValueRecord::context_t context = + pair_value_record_context_t context = { this, valueFormats, diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh index fe9595f1266c..1fb3dc46953d 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh @@ -8,6 +8,24 @@ namespace Layout { namespace GPOS_impl { +struct pair_value_record_context_t +{ + const ValueBase *base; + const ValueFormat *valueFormats; + const ValueFormat *newFormats; + unsigned len1; /* valueFormats[0].get_len() */ + const hb_map_t *glyph_map; + const hb_hashmap_t> *layout_variation_idx_delta_map; + + void copy_values (hb_serialize_context_t *s, const Value *values) const + { + valueFormats[0].copy_values (s, newFormats[0], base, values, + layout_variation_idx_delta_map); + valueFormats[1].copy_values (s, newFormats[1], base, values + len1, + layout_variation_idx_delta_map); + } +}; + template struct PairValueRecord { @@ -27,18 +45,8 @@ struct PairValueRecord int cmp (hb_codepoint_t k) const { return secondGlyph.cmp (k); } - struct context_t - { - const ValueBase *base; - const ValueFormat *valueFormats; - const ValueFormat *newFormats; - unsigned len1; /* valueFormats[0].get_len() */ - const hb_map_t *glyph_map; - const hb_hashmap_t> *layout_variation_idx_delta_map; - }; - bool subset (hb_subset_context_t *c, - context_t *closure) const + pair_value_record_context_t *closure) const { TRACE_SERIALIZE (this); auto *s = c->serializer; @@ -47,15 +55,7 @@ struct PairValueRecord out->secondGlyph = (*closure->glyph_map)[secondGlyph]; - closure->valueFormats[0].copy_values (s, - closure->newFormats[0], - closure->base, &values[0], - closure->layout_variation_idx_delta_map); - closure->valueFormats[1].copy_values (s, - closure->newFormats[1], - closure->base, - &values[closure->len1], - closure->layout_variation_idx_delta_map); + closure->copy_values (s, values); return_trace (true); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PosLookupSubTable.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PosLookupSubTable.hh index c19fbc323ff8..4238f98f4e18 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PosLookupSubTable.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PosLookupSubTable.hh @@ -37,15 +37,15 @@ struct PosLookupSubTable { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { - case Single: return_trace (u.single.dispatch (c, std::forward (ds)...)); - case Pair: return_trace (u.pair.dispatch (c, std::forward (ds)...)); - case Cursive: return_trace (u.cursive.dispatch (c, std::forward (ds)...)); - case MarkBase: return_trace (u.markBase.dispatch (c, std::forward (ds)...)); - case MarkLig: return_trace (u.markLig.dispatch (c, std::forward (ds)...)); - case MarkMark: return_trace (u.markMark.dispatch (c, std::forward (ds)...)); - case Context: return_trace (u.context.dispatch (c, std::forward (ds)...)); - case ChainContext: return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); - case Extension: return_trace (u.extension.dispatch (c, std::forward (ds)...)); + case Single: hb_barrier (); return_trace (u.single.dispatch (c, std::forward (ds)...)); + case Pair: hb_barrier (); return_trace (u.pair.dispatch (c, std::forward (ds)...)); + case Cursive: hb_barrier (); return_trace (u.cursive.dispatch (c, std::forward (ds)...)); + case MarkBase: hb_barrier (); return_trace (u.markBase.dispatch (c, std::forward (ds)...)); + case MarkLig: hb_barrier (); return_trace (u.markLig.dispatch (c, std::forward (ds)...)); + case MarkMark: hb_barrier (); return_trace (u.markMark.dispatch (c, std::forward (ds)...)); + case Context: hb_barrier (); return_trace (u.context.dispatch (c, std::forward (ds)...)); + case ChainContext: hb_barrier (); return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); + case Extension: hb_barrier (); return_trace (u.extension.dispatch (c, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh index 30fc1aacda8b..f49518ece8ac 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh @@ -13,8 +13,12 @@ struct SinglePos protected: union { struct { HBUINT16 v; } format; /* Format identifier */ - SinglePosFormat1 format1; - SinglePosFormat2 format2; + SinglePosFormat1_3 format1; + SinglePosFormat2_4 format2; +#ifndef HB_NO_BEYOND_64K + SinglePosFormat1_3 format3; + SinglePosFormat2_4 format4; +#endif } u; public: @@ -33,10 +37,10 @@ struct SinglePos } template void serialize (hb_serialize_context_t *c, - const SrcLookup* src, + const ValueBase* src, + ValueFormat src_format, Iterator glyph_val_iter_pairs, const hb_hashmap_t> *layout_variation_idx_delta_map, unsigned newFormat) @@ -49,20 +53,41 @@ struct SinglePos if (glyph_val_iter_pairs) format = get_format (glyph_val_iter_pairs); +#ifndef HB_NO_BEYOND_64K + if (+ glyph_val_iter_pairs + | hb_map_retains_sorting (hb_first) + | hb_filter ([] (hb_codepoint_t gid) { return gid > 0xFFFFu; })) + format += 2; +#endif + u.format.v = format; switch (u.format.v) { - case 1: u.format1.serialize (c, - src, + case 1: hb_barrier (); u.format1.serialize (c, + src, src_format, + glyph_val_iter_pairs, + new_format, + layout_variation_idx_delta_map); + return; + case 2: hb_barrier (); u.format2.serialize (c, + src, src_format, + glyph_val_iter_pairs, + new_format, + layout_variation_idx_delta_map); + return; +#ifndef HB_NO_BEYOND_64K + case 3: u.format3.serialize (c, + src, src_format, glyph_val_iter_pairs, new_format, layout_variation_idx_delta_map); return; - case 2: u.format2.serialize (c, - src, + case 4: u.format4.serialize (c, + src, src_format, glyph_val_iter_pairs, new_format, layout_variation_idx_delta_map); return; +#endif default:return; } } @@ -73,22 +98,27 @@ struct SinglePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); +#ifndef HB_NO_BEYOND_64K + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); +#endif default:return_trace (c->default_return_value ()); } } }; -template +template static void SinglePos_serialize (hb_serialize_context_t *c, - const SrcLookup *src, + const ValueBase *src, + ValueFormat src_format, Iterator it, const hb_hashmap_t> *layout_variation_idx_delta_map, unsigned new_format) -{ c->start_embed ()->serialize (c, src, it, layout_variation_idx_delta_map, new_format); } +{ c->start_embed ()->serialize (c, src, src_format, it, layout_variation_idx_delta_map, new_format); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh index b33e761bac21..6625e8b3de43 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh @@ -8,11 +8,12 @@ namespace OT { namespace Layout { namespace GPOS_impl { -struct SinglePosFormat1 : ValueBase +template +struct SinglePosFormat1_3 : ValueBase { protected: HBUINT16 format; /* Format identifier--format = 1 */ - Offset16To + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of subtable */ ValueFormat valueFormat; /* Defines the types of data in the @@ -21,7 +22,7 @@ struct SinglePosFormat1 : ValueBase * value(s)--applied to all glyphs in * the Coverage table */ public: - DEFINE_SIZE_ARRAY (6, values); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + ValueFormat::static_size, values); bool sanitize (hb_sanitize_context_t *c) const { @@ -99,20 +100,16 @@ struct SinglePosFormat1 : ValueBase unsigned int index = (this+coverage).get_coverage (gid); if (likely (index == NOT_COVERED)) return false; - /* This is ugly... */ - hb_buffer_t buffer {}; - buffer.props.direction = direction; - OT::hb_ot_apply_context_t c (1, font, &buffer, table_blob); - - valueFormat.apply_value (&c, this, values, pos); + valueFormat.position_single (font, table_blob, direction, this, + values, pos); return true; } template void serialize (hb_serialize_context_t *c, - const SrcLookup *src, + const ValueBase *src, + ValueFormat src_format, Iterator it, ValueFormat newFormat, const hb_hashmap_t> *layout_variation_idx_delta_map) @@ -124,7 +121,7 @@ struct SinglePosFormat1 : ValueBase for (const hb_array_t& _ : + it | hb_map (hb_second)) { - src->get_value_format ().copy_values (c, newFormat, src, &_, layout_variation_idx_delta_map); + src_format.copy_values (c, newFormat, src, &_, layout_variation_idx_delta_map); // Only serialize the first entry in the iterator, the rest are assumed to // be the same. break; @@ -178,7 +175,7 @@ struct SinglePosFormat1 : ValueBase ; bool ret = bool (it); - SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, new_format); + SinglePos_serialize (c->serializer, this, valueFormat, it, &c->plan->layout_variation_idx_delta_map, new_format); return_trace (ret); } }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh index 686126c9f5ee..9aecdb2d7f40 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh @@ -7,20 +7,38 @@ namespace OT { namespace Layout { namespace GPOS_impl { -struct SinglePosFormat2 : ValueBase +/* Keep the iterator type independent of the source table width so + * the output serializers can share their instantiations. */ +struct single_pos_value_mapper_t +{ + const hb_map_t &glyph_map; + const hb_array_t &values; + const unsigned &sub_length; + + hb_pair_t> + operator () (const hb_pair_t &_) const + { + return hb_pair (glyph_map[_.first], + values.sub_array (_.second * sub_length, sub_length)); + } +}; + +template +struct SinglePosFormat2_4 : ValueBase { protected: HBUINT16 format; /* Format identifier--format = 2 */ - Offset16To + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of subtable */ ValueFormat valueFormat; /* Defines the types of data in the * ValueRecord */ - HBUINT16 valueCount; /* Number of ValueRecords */ + typename Types::HBUINT + valueCount; /* Number of ValueRecords */ ValueRecord values; /* Array of ValueRecords--positioning * values applied to glyphs */ public: - DEFINE_SIZE_ARRAY (8, values); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + ValueFormat::static_size + Types::HBUINT::static_size, values); bool sanitize (hb_sanitize_context_t *c) const { @@ -103,23 +121,17 @@ struct SinglePosFormat2 : ValueBase if (likely (index == NOT_COVERED)) return false; if (unlikely (index >= valueCount)) return false; - /* This is ugly... */ - hb_buffer_t buffer {}; - buffer.props.direction = direction; - OT::hb_ot_apply_context_t c (1, font, &buffer, table_blob); - - valueFormat.apply_value (&c, this, - &values[index * valueFormat.get_len ()], - pos); + valueFormat.position_single (font, table_blob, direction, this, + &values[index * valueFormat.get_len ()], pos); return true; } template void serialize (hb_serialize_context_t *c, - const SrcLookup *src, + const ValueBase *src, + ValueFormat src_format, Iterator it, ValueFormat newFormat, const hb_hashmap_t> *layout_variation_idx_delta_map) @@ -132,7 +144,7 @@ struct SinglePosFormat2 : ValueBase + it | hb_map (hb_second) | hb_apply ([&] (hb_array_t _) - { src->get_value_format ().copy_values (c, newFormat, src, &_, layout_variation_idx_delta_map); }) + { src_format.copy_values (c, newFormat, src, &_, layout_variation_idx_delta_map); }) ; auto glyphs = @@ -181,17 +193,14 @@ struct SinglePosFormat2 : ValueBase const hb_map_t &glyph_map = *c->plan->glyph_map; unsigned sub_length = valueFormat.get_len (); - auto values_array = values.as_array (valueCount * sub_length); + auto values_array = values.as_array ((unsigned) valueCount * sub_length); auto it = + hb_zip (this+coverage, hb_range ((unsigned) valueCount)) | hb_filter (glyphset, hb_first) - | hb_map_retains_sorting ([&] (const hb_pair_t& _) - { - return hb_pair (glyph_map[_.first], - values_array.sub_array (_.second * sub_length, - sub_length)); - }) + | hb_map_retains_sorting (single_pos_value_mapper_t {glyph_map, + values_array, + sub_length}) ; unsigned new_format = compute_effective_format (c->plan->source, it, @@ -200,7 +209,7 @@ struct SinglePosFormat2 : ValueBase c->plan->has_gdef_varstore, &c->plan->layout_variation_idx_delta_map); bool ret = bool (it); - SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, new_format); + SinglePos_serialize (c->serializer, this, valueFormat, it, &c->plan->layout_variation_idx_delta_map, new_format); return_trace (ret); } }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh index 613de17bf6a9..7591221185a4 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh @@ -102,15 +102,19 @@ struct ValueFormat : HBUINT16 #endif ; - if (format & xPlacement) glyph_pos.x_offset += font->em_scale_x (get_short (values++, &ret)); - if (format & yPlacement) glyph_pos.y_offset += font->em_scale_y (get_short (values++, &ret)); + if (format & xPlacement) + glyph_pos.x_offset = hb_saturate_add (glyph_pos.x_offset, font->em_scale_x (get_short (values++, &ret))); + if (format & yPlacement) + glyph_pos.y_offset = hb_saturate_add (glyph_pos.y_offset, font->em_scale_y (get_short (values++, &ret))); if (format & xAdvance) { - if (likely (horizontal)) glyph_pos.x_advance += font->em_scale_x (get_short (values, &ret)); + if (likely (horizontal)) + glyph_pos.x_advance = hb_saturate_add (glyph_pos.x_advance, font->em_scale_x (get_short (values, &ret))); values++; } /* y_advance values grow downward but font-space grows upward, hence negation */ if (format & yAdvance) { - if (unlikely (!horizontal)) glyph_pos.y_advance -= font->em_scale_y (get_short (values, &ret)); + if (unlikely (!horizontal)) + glyph_pos.y_advance = hb_saturate_sub (glyph_pos.y_advance, font->em_scale_y (get_short (values, &ret))); values++; } @@ -127,28 +131,47 @@ struct ValueFormat : HBUINT16 /* pixel -> fractional pixel */ if (format & xPlaDevice) { - if (use_x_device) glyph_pos.x_offset += get_device (values, &ret, base, c->sanitizer).get_x_delta (font, store, cache); + if (use_x_device) + glyph_pos.x_offset = hb_saturate_add (glyph_pos.x_offset, get_device (values, &ret, base, c->sanitizer).get_x_delta (font, store, cache)); values++; } if (format & yPlaDevice) { - if (use_y_device) glyph_pos.y_offset += get_device (values, &ret, base, c->sanitizer).get_y_delta (font, store, cache); + if (use_y_device) + glyph_pos.y_offset = hb_saturate_add (glyph_pos.y_offset, get_device (values, &ret, base, c->sanitizer).get_y_delta (font, store, cache)); values++; } if (format & xAdvDevice) { - if (horizontal && use_x_device) glyph_pos.x_advance += get_device (values, &ret, base, c->sanitizer).get_x_delta (font, store, cache); + if (horizontal && use_x_device) + glyph_pos.x_advance = hb_saturate_add (glyph_pos.x_advance, get_device (values, &ret, base, c->sanitizer).get_x_delta (font, store, cache)); values++; } if (format & yAdvDevice) { /* y_advance values grow downward but font-space grows upward, hence negation */ - if (!horizontal && use_y_device) glyph_pos.y_advance -= get_device (values, &ret, base, c->sanitizer).get_y_delta (font, store, cache); + if (!horizontal && use_y_device) + glyph_pos.y_advance = hb_saturate_sub (glyph_pos.y_advance, get_device (values, &ret, base, c->sanitizer).get_y_delta (font, store, cache)); values++; } return ret; } + void position_single (hb_font_t *font, + hb_blob_t *table_blob, + hb_direction_t direction, + const ValueBase *base, + const Value *values, + hb_glyph_position_t &pos) const + { + /* This is ugly... */ + hb_buffer_t buffer {}; + buffer.props.direction = direction; + hb_ot_apply_context_t c (1, font, &buffer, table_blob); + + apply_value (&c, base, values, pos); + } + unsigned int get_effective_format (const Value *values, bool strip_hints, bool strip_empty, const ValueBase *base, const hb_hashmap_t> *varidx_delta_map) const { @@ -199,10 +222,14 @@ struct ValueFormat : HBUINT16 if (!format) return; HBINT16 *x_placement = nullptr, *y_placement = nullptr, *x_adv = nullptr, *y_adv = nullptr; - if (format & xPlacement) x_placement = copy_value (c, new_format, xPlacement, *values++); - if (format & yPlacement) y_placement = copy_value (c, new_format, yPlacement, *values++); - if (format & xAdvance) x_adv = copy_value (c, new_format, xAdvance, *values++); - if (format & yAdvance) y_adv = copy_value (c, new_format, yAdvance, *values++); + if ((format | new_format) & xPlacement) + x_placement = copy_value (c, new_format, xPlacement, format & xPlacement ? *values++ : Null (Value)); + if ((format | new_format) & yPlacement) + y_placement = copy_value (c, new_format, yPlacement, format & yPlacement ? *values++ : Null (Value)); + if ((format | new_format) & xAdvance) + x_adv = copy_value (c, new_format, xAdvance, format & xAdvance ? *values++ : Null (Value)); + if ((format | new_format) & yAdvance) + y_adv = copy_value (c, new_format, yAdvance, format & yAdvance ? *values++ : Null (Value)); if (!has_device ()) return; @@ -431,9 +458,14 @@ struct ValueFormat : HBUINT16 { unsigned varidx = (base + get_device (value)).get_variation_index (); hb_pair_t *varidx_delta; - if (varidx_delta_map->has (varidx, &varidx_delta) && - varidx_delta->first != HB_OT_LAYOUT_NO_VARIATIONS_INDEX) - return; + if (varidx_delta_map->has (varidx, &varidx_delta)) + { + /* A device-only value needs a base field for its instanced delta. */ + if (varidx_delta->second) + *format |= flag >> 4; + if (varidx_delta->first != HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + return; + } } *format = *format & ~flag; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh index f13c5e7e2513..be9bab6c1b20 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh @@ -29,6 +29,13 @@ struct AlternateSet void closure (hb_closure_context_t *c) const { c->output->add_array (alternates.arrayZ, alternates.len); } + void depend (hb_depend_context_t *c, hb_codepoint_t source) const + { + + hb_iter (alternates) + | hb_apply ([&] (const hb_codepoint_t &target) { c->depend_data->add_gsub_lookup (source, c->lookup_index, target); }) + ; + } + void collect_glyphs (hb_collect_glyphs_context_t *c) const { c->output->add_array (alternates.arrayZ, alternates.len); } @@ -82,7 +89,7 @@ struct AlternateSet unsigned *alternate_count /* IN/OUT. May be NULL. */, hb_codepoint_t *alternate_glyphs /* OUT. May be NULL. */) const { - if (alternates.len && alternate_count) + if (alternates.len && alternate_count && alternate_glyphs) { + alternates.as_array ().sub_array (start_offset, alternate_count) | hb_sink (hb_array (alternate_glyphs, *alternate_count)) diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh index a43c75c8f4e6..6a86981699ef 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh @@ -26,27 +26,28 @@ struct AlternateSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } } - /* TODO This function is unused and not updated to 24bit GIDs. Should be done by using - * iterators. While at it perhaps using iterator of arrays of hb_codepoint_t instead. */ + /* TODO This function is unused and should be done using iterators. While + * at it perhaps using iterator of arrays of hb_codepoint_t instead. */ + template bool serialize (hb_serialize_context_t *c, - hb_sorted_array_t glyphs, + hb_sorted_array_t glyphs, hb_array_t alternate_len_list, - hb_array_t alternate_glyphs_list) + hb_array_t alternate_glyphs_list) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (u.format.v))) return_trace (false); unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list)); default:return_trace (false); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh index 7a3a2511b7f1..e13fd11337b1 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh @@ -13,14 +13,14 @@ struct AlternateSubstFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of Substitution table */ - Array16Of>> + typename Types::template ArrayOf>> alternateSet; /* Array of AlternateSet tables * ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (2 + 2 * Types::size, alternateSet); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, alternateSet); bool sanitize (hb_sanitize_context_t *c) const { @@ -34,6 +34,19 @@ struct AlternateSubstFormat1_2 bool may_have_non_1to1 () const { return false; } + void depend (hb_depend_context_t *c) const + { + // Filter by parent_active_glyphs like closure does + + hb_zip (this+coverage, alternateSet) + | hb_filter (c->parent_active_glyphs (), hb_first) + | hb_apply ([&] (const hb_pair_t>&> &_) + { + const AlternateSet& as = this+_.second; + as.depend (c, _.first); + }) + ; + } + void closure (hb_closure_context_t *c) const { + hb_zip (this+coverage, alternateSet) @@ -92,10 +105,11 @@ struct AlternateSubstFormat1_2 return_trace ((this+alternateSet[index]).apply (c)); } + template bool serialize (hb_serialize_context_t *c, - hb_sorted_array_t glyphs, + hb_sorted_array_t glyphs, hb_array_t alternate_len_list, - hb_array_t alternate_glyphs_list) + hb_array_t alternate_glyphs_list) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/GSUB.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/GSUB.hh index 900cf603e45a..3d221b828ef4 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/GSUB.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/GSUB.hh @@ -53,6 +53,7 @@ struct GSUB : GSUBGPOS struct GSUB_accelerator_t : Layout::GSUB::accelerator_t { GSUB_accelerator_t (hb_face_t *face) : Layout::GSUB::accelerator_t (face) {} + HB_INTERNAL void depend (hb_depend_data_builder_t *builder, hb_face_t *face) const; }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh index 7bc98d31f329..91c8072d5262 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh @@ -38,6 +38,40 @@ struct Ligature c->output->add (ligGlyph); } + void depend (hb_depend_context_t *c, hb_codepoint_t first) const + { + // Build the complete ligature set upfront before adding any edges + hb_set_t complete_ligset; + complete_ligset.add (first); + + hb_iter (component) | hb_sink (complete_ligset); + if (unlikely (complete_ligset.in_error ())) + { + c->depend_data->fail (); + return; + } + + bool ligset_created; + hb_codepoint_t ligset_idx = c->depend_data->find_or_create_set (complete_ligset, + &ligset_created); + if (unlikely (ligset_idx == HB_CODEPOINT_INVALID)) + return; + + // Track whether any edge using this ligset_idx was actually added + bool any_added = false; + + // Now add one edge for each glyph in the complete, immutable set + + hb_iter (complete_ligset) + | hb_apply ([&] (hb_codepoint_t gid) { + if (c->depend_data->add_gsub_lookup (gid, c->lookup_index, ligGlyph, ligset_idx)) + any_added = true; + }) + ; + + // If no edges were added, a newly allocated set is unused - free it for reuse + if (!any_added && ligset_created) + c->depend_data->discard_set (ligset_idx); + } + void collect_glyphs (hb_collect_glyphs_context_t *c) const { c->input->add_array (component.arrayZ, component.get_length ()); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh index 81c5c2bcfe46..d07246cd080c 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh @@ -12,7 +12,7 @@ template struct LigatureSet { public: - Array16OfOffset16To> + Array16Of>> ligature; /* Array LigatureSet tables * ordered by preference */ @@ -54,6 +54,14 @@ struct LigatureSet ; } + void depend (hb_depend_context_t *c, hb_codepoint_t first) const + { + + hb_iter (ligature) + | hb_map (hb_add (this)) + | hb_apply ([&] (const Ligature &_) { _.depend (c, first); }) + ; + } + void collect_glyphs (hb_collect_glyphs_context_t *c) const { + hb_iter (ligature) @@ -128,7 +136,10 @@ struct LigatureSet goto slow; if (seconds && !seconds->may_have (second)) + { + c->buffer->unsafe_to_concat (c->buffer->idx, unsafe_to); return_trace (false); + } bool unsafe_to_concat = false; for (unsigned int i = 0; i < num_ligs; i++) { @@ -152,10 +163,11 @@ struct LigatureSet return_trace (false); } + template bool serialize (hb_serialize_context_t *c, - hb_array_t ligatures, + hb_array_t ligatures, hb_array_t component_count_list, - hb_array_t &component_list /* Starting from second for each ligature */) + hb_array_t &component_list /* Starting from second for each ligature */) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh index 22ce9b79d7f1..8d744096d1e0 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh @@ -26,30 +26,30 @@ struct LigatureSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } } - /* TODO This function is only used by small GIDs, and not updated to 24bit GIDs. Should - * be done by using iterators. While at it perhaps using iterator of arrays of hb_codepoint_t - * instead. */ + /* TODO This function should be done using iterators. While at it perhaps + * using iterator of arrays of hb_codepoint_t instead. */ + template bool serialize (hb_serialize_context_t *c, - hb_sorted_array_t first_glyphs, + hb_sorted_array_t first_glyphs, hb_array_t ligature_per_first_glyph_count_list, - hb_array_t ligatures_list, + hb_array_t ligatures_list, hb_array_t component_count_list, - hb_array_t component_list /* Starting from second for each ligature */) + hb_array_t component_list /* Starting from second for each ligature */) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (u.format.v))) return_trace (false); unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, + case 1: hb_barrier (); return_trace (u.format1.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, ligatures_list, diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh index 909ddca220f1..7295bffd9fe6 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh @@ -13,14 +13,14 @@ struct LigatureSubstFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of Substitution table */ - Array16Of>> + typename Types::template ArrayOf>> ligatureSet; /* Array LigatureSet tables * ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (4 + Types::size, ligatureSet); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, ligatureSet); bool sanitize (hb_sanitize_context_t *c) const { @@ -43,6 +43,18 @@ struct LigatureSubstFormat1_2 bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + + hb_zip (this+coverage, ligatureSet) + | hb_filter (c->parent_active_glyphs (), hb_first) + | hb_apply ([&] (const hb_pair_t>&> &_) + { + const LigatureSet& ls = this+_.second; + ls.depend (c, _.first); + }) + ; + } + void closure (hb_closure_context_t *c) const { + hb_zip (this+coverage, ligatureSet) @@ -67,6 +79,14 @@ struct LigatureSubstFormat1_2 ; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + + hb_iter (ligatureSet) + | hb_map (hb_add (this)) + | hb_apply ([digest] (const LigatureSet &_) { _.collect_seconds (*digest); }) + ; + } + const Coverage &get_coverage () const { return this+coverage; } bool would_apply (hb_would_apply_context_t *c) const @@ -118,12 +138,13 @@ struct LigatureSubstFormat1_2 return_trace (lig_set.apply (c, seconds)); } + template bool serialize (hb_serialize_context_t *c, - hb_sorted_array_t first_glyphs, + hb_sorted_array_t first_glyphs, hb_array_t ligature_per_first_glyph_count_list, - hb_array_t ligatures_list, + hb_array_t ligatures_list, hb_array_t component_count_list, - hb_array_t component_list /* Starting from second for each ligature */) + hb_array_t component_list /* Starting from second for each ligature */) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh index 8fb663825b54..d528f23d60b9 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh @@ -27,9 +27,9 @@ struct MultipleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -45,7 +45,7 @@ struct MultipleSubst unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, it)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, it)); default:return_trace (false); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh index aec8d0f2c07f..8db7b95e3053 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh @@ -13,14 +13,14 @@ struct MultipleSubstFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of Substitution table */ - Array16Of>> + typename Types::template ArrayOf>> sequence; /* Array of Sequence tables * ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (4 + Types::size, sequence); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, sequence); bool sanitize (hb_sanitize_context_t *c) const { @@ -44,6 +44,19 @@ struct MultipleSubstFormat1_2 ; } + void depend (hb_depend_context_t *c) const + { + // Filter by parent_active_glyphs like closure does + + hb_zip (this+coverage, sequence) + | hb_filter (c->parent_active_glyphs (), hb_first) + | hb_apply ([&] (const hb_pair_t>&> &_) + { + const Sequence& s = this+_.second; + s.depend (c, _.first); + }) + ; + } + void closure_lookups (hb_closure_lookups_context_t *c) const {} void collect_glyphs (hb_collect_glyphs_context_t *c) const diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh index e33148d770b5..7ec5ba8bc371 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh @@ -13,7 +13,12 @@ struct ReverseChainSingleSubst protected: union { struct { HBUINT16 v; } format; /* Format identifier */ - ReverseChainSingleSubstFormat1 format1; + ReverseChainSingleSubstFormat1_2 + format1; +#ifndef HB_NO_BEYOND_64K + ReverseChainSingleSubstFormat1_2 + format2; +#endif } u; public: @@ -23,7 +28,10 @@ struct ReverseChainSingleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); +#ifndef HB_NO_BEYOND_64K + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); +#endif default:return_trace (c->default_return_value ()); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh index 400a9e737911..0947b67c6db9 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh @@ -7,26 +7,29 @@ namespace OT { namespace Layout { namespace GSUB_impl { -struct ReverseChainSingleSubstFormat1 +template +struct ReverseChainSingleSubstFormat1_2 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - Offset16To + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of table */ - Array16OfOffset16To + Array16Of> backtrack; /* Array of coverage tables * in backtracking sequence, in glyph * sequence order */ - Array16OfOffset16To + /* Format 2 widens the backtrack and lookahead coverage offsets but + * keeps their counts 16-bit. */ + Array16Of> lookaheadX; /* Array of coverage tables * in lookahead sequence, in glyph * sequence order */ - Array16Of + typename Types::template ArrayOf substituteX; /* Array of substitute * GlyphIDs--ordered by Coverage Index */ public: - DEFINE_SIZE_MIN (10); + DEFINE_SIZE_MIN (6 + Types::LOffset::static_size + Types::HBUINT::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -67,6 +70,76 @@ struct ReverseChainSingleSubstFormat1 bool may_have_non_1to1 () const { return false; } + void depend (hb_depend_context_t *c) const { + // Filter by intersects and parent_active_glyphs like closure does + if (!intersects (c->glyphs)) return; + + const auto &lookahead = StructAfter (backtrack); + const auto &substitute = StructAfter (lookahead); + + /* Build context set from backtrack and lookahead coverages. + * ReverseChainSingleSubst has contextual requirements - the substitution + * only fires when backtrack and lookahead glyphs are present. */ + hb_set_t context_glyphs; + + /* Add glyphs from backtrack coverages */ + unsigned int count = backtrack.len; + for (unsigned int i = 0; i < count; i++) + { + hb_set_t back_glyphs; + (this+backtrack[i]).intersect_set (*c->glyphs, back_glyphs); + if (back_glyphs.get_population () == 1) + context_glyphs.add (back_glyphs.get_min ()); + else if (back_glyphs.get_population () > 1) + { + hb_codepoint_t set_idx = c->depend_data->find_or_create_context_set (back_glyphs); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return; + context_glyphs.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); + } + } + + /* Add glyphs from lookahead coverages */ + count = lookahead.len; + for (unsigned int i = 0; i < count; i++) + { + hb_set_t look_glyphs; + (this+lookahead[i]).intersect_set (*c->glyphs, look_glyphs); + if (look_glyphs.get_population () == 1) + context_glyphs.add (look_glyphs.get_min ()); + else if (look_glyphs.get_population () > 1) + { + hb_codepoint_t set_idx = c->depend_data->find_or_create_context_set (look_glyphs); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return; + context_glyphs.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); + } + } + + /* Allocate context set and save/restore around edge creation */ + if (unlikely (context_glyphs.in_error ())) + { + c->depend_data->fail (); + return; + } + hb_codepoint_t context_set_idx = context_glyphs.is_empty () + ? HB_CODEPOINT_INVALID + : c->depend_data->find_or_create_context_set (context_glyphs); + if (unlikely (!context_glyphs.is_empty () && + context_set_idx == HB_CODEPOINT_INVALID)) + return; + + hb_codepoint_t saved_context = c->depend_data->current_context_set_index; + c->depend_data->current_context_set_index = context_set_idx; + + + hb_zip (this+coverage, substitute) + | hb_filter (c->parent_active_glyphs (), hb_first) + | hb_apply ([&] (const hb_codepoint_pair_t &_) { c->depend_data->add_gsub_lookup (_.first, c->lookup_index, _.second); }) + ; + + c->depend_data->current_context_set_index = saved_context; + } + void closure (hb_closure_context_t *c) const { if (!intersects (c->glyphs)) return; @@ -124,11 +197,11 @@ struct ReverseChainSingleSubstFormat1 unsigned int start_index = 0, end_index = 0; if (match_backtrack (c, - backtrack.len, (HBUINT16 *) backtrack.arrayZ, + backtrack.len, backtrack.arrayZ, match_coverage, this, &start_index) && match_lookahead (c, - lookahead.len, (HBUINT16 *) lookahead.arrayZ, + lookahead.len, lookahead.arrayZ, match_coverage, this, c->buffer->idx + 1, &end_index)) { @@ -167,10 +240,8 @@ struct ReverseChainSingleSubstFormat1 bool serialize_coverage_offset_array (hb_subset_context_t *c, Iterator it) const { TRACE_SERIALIZE (this); - auto *out = c->serializer->start_embed> (); - - if (unlikely (!c->serializer->allocate_size (HBUINT16::static_size))) - return_trace (false); + auto *out = c->serializer->start_embed>> (); + if (unlikely (!out->serialize (c->serializer, 0u))) return_trace (false); for (auto& offset : it) { auto *o = out->serialize_append (c->serializer); @@ -197,9 +268,9 @@ struct ReverseChainSingleSubstFormat1 if (unlikely (!c->serializer->embed (this->coverage))) return_trace (false); if (!serialize_coverage_offset_array (c, backtrack_iter)) return_trace (false); - if (!serialize_coverage_offset_array (c, lookahead_iter)) return_trace (false); + if (!serialize_lookahead_coverage_offset_array (c, lookahead_iter)) return_trace (false); - auto *substitute_out = c->serializer->start_embed> (); + auto *substitute_out = c->serializer->start_embed> (); auto substitutes = + coverage_subst_iter | hb_map (hb_second) @@ -230,12 +301,29 @@ struct ReverseChainSingleSubstFormat1 + hb_zip (this+coverage, substitute) | hb_filter (glyphset, hb_first) | hb_filter (glyphset, hb_second) - | hb_map_retains_sorting ([&] (hb_pair_t p) -> hb_codepoint_pair_t + | hb_map_retains_sorting ([&] (hb_pair_t p) -> hb_codepoint_pair_t { return hb_pair (glyph_map[p.first], glyph_map[p.second]); }) ; return_trace (bool (it) && serialize (c, it, backtrack.iter (), lookahead.iter ())); } + + template + bool serialize_lookahead_coverage_offset_array (hb_subset_context_t *c, Iterator it) const + { + TRACE_SERIALIZE (this); + auto *out = c->serializer->start_embed>> (); + if (unlikely (!out->serialize (c->serializer, 0u))) return_trace (false); + + for (auto& offset : it) { + auto *o = out->serialize_append (c->serializer); + if (unlikely (!o) || !o->serialize_subset (c, offset, this)) + return_trace (false); + } + + return_trace (true); + } }; } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh index b3295bee16dd..5d502ea99de2 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh @@ -28,6 +28,13 @@ struct Sequence void closure (hb_closure_context_t *c) const { c->output->add_array (substitute.arrayZ, substitute.len); } + void depend (hb_depend_context_t *c, hb_codepoint_t source) const + { + + hb_iter (substitute) + | hb_apply ([&] (const hb_codepoint_t &target) { c->depend_data->add_gsub_lookup (source, c->lookup_index, target); }) + ; + } + void collect_glyphs (hb_collect_glyphs_context_t *c) const { c->output->add_array (substitute.arrayZ, substitute.len); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh index 323eb4d0f901..21c6ce98a0f3 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh @@ -30,11 +30,11 @@ struct SingleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -73,17 +73,17 @@ struct SingleSubst u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, + case 1: hb_barrier (); return_trace (u.format1.serialize (c, + glyphs | hb_map_retains_sorting (hb_first), delta)); - case 2: return_trace (u.format2.serialize (c, glyphs)); + case 2: hb_barrier (); return_trace (u.format2.serialize (c, glyphs)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.serialize (c, + case 3: hb_barrier (); return_trace (u.format3.serialize (c, + glyphs | hb_map_retains_sorting (hb_first), delta)); - case 4: return_trace (u.format4.serialize (c, glyphs)); + case 4: hb_barrier (); return_trace (u.format4.serialize (c, glyphs)); #endif default:return_trace (false); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh index 5ee2c1d1f46d..c1dc1e6cdc86 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh @@ -7,12 +7,101 @@ namespace OT { namespace Layout { namespace GSUB_impl { +static inline bool +subset_single_subst (hb_subset_context_t *c, + const Coverage &coverage, + hb_codepoint_t d, + hb_codepoint_t mask) +{ + const hb_set_t &glyphset = *c->plan->glyphset_gsub (); + const hb_map_t &glyph_map = *c->plan->glyph_map; + + hb_set_t intersection; + coverage.intersect_set (glyphset, intersection); + + auto it = + + hb_iter (intersection) + | hb_map_retains_sorting ([d, mask] (hb_codepoint_t g) { + return hb_codepoint_pair_t (g, + (g + d) & mask); }) + | hb_filter (glyphset, hb_second) + | hb_map_retains_sorting ([&] (hb_codepoint_pair_t p) -> hb_codepoint_pair_t + { return hb_pair (glyph_map[p.first], glyph_map[p.second]); }) + ; + + bool ret = bool (it); + SingleSubst_serialize (c->serializer, it); + return ret; +} + +HB_INTERNAL inline +void single_subst_depend (hb_depend_context_t *c, + const Coverage &coverage, + hb_codepoint_t d, hb_codepoint_t mask) +{ + unsigned num_glyphs = c->face->get_num_glyphs (); + + // Filter coverage by active glyphs (like closure does) + hb_set_t intersection; + coverage.intersect_set (c->parent_active_glyphs (), intersection); + + + hb_iter (intersection) + | hb_map ([&] (hb_codepoint_t _) { return hb_codepoint_pair_t (_, (_ + d) & mask); }) + | hb_filter ([num_glyphs] (const hb_codepoint_pair_t &_) { return _.second < num_glyphs; }) + | hb_apply ([&] (const hb_codepoint_pair_t &_) { c->depend_data->add_gsub_lookup(_.first, c->lookup_index, _.second); }) + ; +} + +HB_INTERNAL inline +void single_subst_closure (hb_closure_context_t *c, + const Coverage &coverage, + hb_codepoint_t d, hb_codepoint_t mask) +{ + /* Help fuzzer avoid this function as much. */ + unsigned pop = coverage.get_population (); + if (pop >= mask) + return; + + hb_set_t intersection; + coverage.intersect_set (c->parent_active_glyphs (), intersection); + + /* In degenerate fuzzer-found fonts, but not real fonts, + * this table can keep adding new glyphs in each round of closure. + * Refuse to close-over, if it maps glyph range to overlapping range. */ + hb_codepoint_t min_before = intersection.get_min (); + hb_codepoint_t max_before = intersection.get_max (); + hb_codepoint_t min_after = (min_before + d) & mask; + hb_codepoint_t max_after = (max_before + d) & mask; + if (intersection.get_population () == max_before - min_before + 1 && + ((min_before <= min_after && min_after <= max_before) || + (min_before <= max_after && max_after <= max_before))) + return; + + + hb_iter (intersection) + | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; }) + | hb_sink (c->output) + ; +} + +HB_INTERNAL inline +void single_subst_collect_glyphs (hb_collect_glyphs_context_t *c, + const Coverage &coverage, + hb_codepoint_t d, hb_codepoint_t mask) +{ + if (unlikely (!coverage.collect_coverage (c->input))) return; + + + hb_iter (coverage) + | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; }) + | hb_sink (c->output) + ; +} + template struct SingleSubstFormat1_3 { protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of Substitution table */ typename Types::HBUINT @@ -20,7 +109,7 @@ struct SingleSubstFormat1_3 * substitute GlyphID, modulo 0x10000 */ public: - DEFINE_SIZE_STATIC (2 + 2 * Types::size); + DEFINE_SIZE_STATIC (2 + Types::LOffset::static_size + Types::HBUINT::static_size); bool sanitize (hb_sanitize_context_t *c) const { @@ -45,49 +134,21 @@ struct SingleSubstFormat1_3 bool may_have_non_1to1 () const { return false; } - void closure (hb_closure_context_t *c) const + void depend (hb_depend_context_t *c) const { - hb_codepoint_t d = deltaGlyphID; - hb_codepoint_t mask = get_mask (); - - /* Help fuzzer avoid this function as much. */ - unsigned pop = (this+coverage).get_population (); - if (pop >= mask) - return; - - hb_set_t intersection; - (this+coverage).intersect_set (c->parent_active_glyphs (), intersection); - - /* In degenerate fuzzer-found fonts, but not real fonts, - * this table can keep adding new glyphs in each round of closure. - * Refuse to close-over, if it maps glyph range to overlapping range. */ - hb_codepoint_t min_before = intersection.get_min (); - hb_codepoint_t max_before = intersection.get_max (); - hb_codepoint_t min_after = (min_before + d) & mask; - hb_codepoint_t max_after = (max_before + d) & mask; - if (intersection.get_population () == max_before - min_before + 1 && - ((min_before <= min_after && min_after <= max_before) || - (min_before <= max_after && max_after <= max_before))) - return; + single_subst_depend (c, this+coverage, deltaGlyphID, get_mask ()); + } - + hb_iter (intersection) - | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; }) - | hb_sink (c->output) - ; + void closure (hb_closure_context_t *c) const + { + single_subst_closure (c, this+coverage, deltaGlyphID, get_mask ()); } void closure_lookups (hb_closure_lookups_context_t *c) const {} void collect_glyphs (hb_collect_glyphs_context_t *c) const { - if (unlikely (!(this+coverage).collect_coverage (c->input))) return; - hb_codepoint_t d = deltaGlyphID; - hb_codepoint_t mask = get_mask (); - - + hb_iter (this+coverage) - | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; }) - | hb_sink (c->output) - ; + single_subst_collect_glyphs (c, this+coverage, deltaGlyphID, get_mask ()); } const Coverage &get_coverage () const { return this+coverage; } @@ -109,7 +170,7 @@ struct SingleSubstFormat1_3 return 0; } - if (alternate_count && *alternate_count) + if (alternate_count && *alternate_count && alternate_glyphs) { hb_codepoint_t d = deltaGlyphID; hb_codepoint_t mask = get_mask (); @@ -186,28 +247,7 @@ struct SingleSubstFormat1_3 bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - const hb_set_t &glyphset = *c->plan->glyphset_gsub (); - const hb_map_t &glyph_map = *c->plan->glyph_map; - - hb_codepoint_t d = deltaGlyphID; - hb_codepoint_t mask = get_mask (); - - hb_set_t intersection; - (this+coverage).intersect_set (glyphset, intersection); - - auto it = - + hb_iter (intersection) - | hb_map_retains_sorting ([d, mask] (hb_codepoint_t g) { - return hb_codepoint_pair_t (g, - (g + d) & mask); }) - | hb_filter (glyphset, hb_second) - | hb_map_retains_sorting ([&] (hb_codepoint_pair_t p) -> hb_codepoint_pair_t - { return hb_pair (glyph_map[p.first], glyph_map[p.second]); }) - ; - - bool ret = bool (it); - SingleSubst_serialize (c->serializer, it); - return_trace (ret); + return_trace (subset_single_subst (c, this+coverage, deltaGlyphID, get_mask ())); } }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh index 0d51d130fee4..b1ba5ad7a638 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh @@ -12,15 +12,15 @@ struct SingleSubstFormat2_4 { protected: HBUINT16 format; /* Format identifier--format = 2 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of Substitution table */ - Array16Of + typename Types::template ArrayOf substitute; /* Array of substitute * GlyphIDs--ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (4 + Types::size, substitute); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, substitute); bool sanitize (hb_sanitize_context_t *c) const { @@ -34,6 +34,31 @@ struct SingleSubstFormat2_4 bool may_have_non_1to1 () const { return false; } + void depend (hb_depend_context_t *c) const + { + auto &cov = this+coverage; + auto &glyph_set = c->parent_active_glyphs (); + + // Filter by active glyphs like closure does + if (substitute.len > glyph_set.get_population () * 4) + { + for (auto g : glyph_set) + { + unsigned i = cov.get_coverage (g); + if (i == NOT_COVERED || i >= substitute.len) + continue; + c->depend_data->add_gsub_lookup (g, c->lookup_index, substitute.arrayZ[i]); + } + + return; + } + + + hb_zip (cov, substitute) + | hb_filter (glyph_set, hb_first) + | hb_apply ([&] (const hb_codepoint_pair_t &_) { c->depend_data->add_gsub_lookup (_.first, c->lookup_index, _.second); }) + ; + } + void closure (hb_closure_context_t *c) const { auto &cov = this+coverage; @@ -89,7 +114,7 @@ struct SingleSubstFormat2_4 return 0; } - if (alternate_count && *alternate_count) + if (alternate_count && *alternate_count && alternate_glyphs) { glyph_id = substitute[index]; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookup.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookup.hh index 5796cc3be578..8f536ab21fe2 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookup.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookup.hh @@ -24,7 +24,7 @@ struct SubstLookup : Lookup bool is_reverse () const { unsigned int type = get_type (); - if (unlikely (type == SubTable::Extension)) + if (unlikely (type == SubTable::Extension) && hb_barrier ()) return get_subtable (0).u.extension.is_reverse (); return lookup_type_is_reverse (type); } @@ -61,6 +61,12 @@ struct SubstLookup : Lookup return ret; } + void depend (hb_depend_context_t *c) const + { + c->set_recurse_func (dispatch_depend_recurse_func); + dispatch (c); + } + hb_closure_lookups_context_t::return_t closure_lookups (hb_closure_lookups_context_t *c, unsigned this_index) const { if (c->is_lookup_visited (this_index)) @@ -137,11 +143,12 @@ struct SubstLookup : Lookup return_trace (false); } + template bool serialize_alternate (hb_serialize_context_t *c, uint32_t lookup_props, - hb_sorted_array_t glyphs, + hb_sorted_array_t glyphs, hb_array_t alternate_len_list, - hb_array_t alternate_glyphs_list) + hb_array_t alternate_glyphs_list) { TRACE_SERIALIZE (this); if (unlikely (!Lookup::serialize (c, SubTable::Alternate, lookup_props, 1))) return_trace (false); @@ -159,13 +166,14 @@ struct SubstLookup : Lookup return_trace (false); } + template bool serialize_ligature (hb_serialize_context_t *c, uint32_t lookup_props, - hb_sorted_array_t first_glyphs, + hb_sorted_array_t first_glyphs, hb_array_t ligature_per_first_glyph_count_list, - hb_array_t ligatures_list, + hb_array_t ligatures_list, hb_array_t component_count_list, - hb_array_t component_list /* Starting from second for each ligature */) + hb_array_t component_list /* Starting from second for each ligature */) { TRACE_SERIALIZE (this); if (unlikely (!Lookup::serialize (c, SubTable::Ligature, lookup_props, 1))) return_trace (false); @@ -189,6 +197,7 @@ struct SubstLookup : Lookup static inline typename hb_closure_context_t::return_t closure_glyphs_recurse_func (hb_closure_context_t *c, unsigned lookup_index, hb_set_t *covered_seq_indices, unsigned seq_index, unsigned end_index); + static inline hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned lookup_index, hb_set_t *covered_seq_indices, unsigned seq_index, unsigned end_index) { if (!c->should_visit_lookup (lookup_index)) @@ -204,6 +213,13 @@ struct SubstLookup : Lookup return ret; } + static inline hb_depend_context_t::return_t depend_glyphs_recurse_func (hb_depend_context_t *c, unsigned lookup_index, hb_bit_page_t *covered_seq_indices, unsigned seq_index, unsigned end_index); + + static inline hb_depend_context_t::return_t dispatch_depend_recurse_func (hb_depend_context_t *c, unsigned lookup_index, hb_bit_page_t *covered_seq_indices, unsigned seq_index, unsigned end_index) + { + return depend_glyphs_recurse_func (c, lookup_index, covered_seq_indices, seq_index, end_index); + } + template typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { return Lookup::dispatch (c, std::forward (ds)...); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookupSubTable.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookupSubTable.hh index a525fba03997..c36f0d7bf15c 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookupSubTable.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SubstLookupSubTable.hh @@ -50,14 +50,14 @@ struct SubstLookupSubTable { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { - case Single: return_trace (u.single.dispatch (c, std::forward (ds)...)); - case Multiple: return_trace (u.multiple.dispatch (c, std::forward (ds)...)); - case Alternate: return_trace (u.alternate.dispatch (c, std::forward (ds)...)); - case Ligature: return_trace (u.ligature.dispatch (c, std::forward (ds)...)); - case Context: return_trace (u.context.dispatch (c, std::forward (ds)...)); - case ChainContext: return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); - case Extension: return_trace (u.extension.dispatch (c, std::forward (ds)...)); - case ReverseChainSingle: return_trace (u.reverseChainContextSingle.dispatch (c, std::forward (ds)...)); + case Single: hb_barrier (); return_trace (u.single.dispatch (c, std::forward (ds)...)); + case Multiple: hb_barrier (); return_trace (u.multiple.dispatch (c, std::forward (ds)...)); + case Alternate: hb_barrier (); return_trace (u.alternate.dispatch (c, std::forward (ds)...)); + case Ligature: hb_barrier (); return_trace (u.ligature.dispatch (c, std::forward (ds)...)); + case Context: hb_barrier (); return_trace (u.context.dispatch (c, std::forward (ds)...)); + case ChainContext: hb_barrier (); return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); + case Extension: hb_barrier (); return_trace (u.extension.dispatch (c, std::forward (ds)...)); + case ReverseChainSingle: hb_barrier (); return_trace (u.reverseChainContextSingle.dispatch (c, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc index 792a7553d8f9..da10b45a7aea 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc +++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc @@ -1,8 +1,13 @@ +#ifndef HB_OT_VAR_VARC_CC +#define HB_OT_VAR_VARC_CC +#ifdef HB_OT_VAR_VARC_CC /* Pacify -Wunused-macros. */ + #include "VARC.hh" #ifndef HB_NO_VAR_COMPOSITES #include "../../../hb-draw.hh" +#include "../../../hb-depend-data.hh" #include "../../../hb-ot-layout-common.hh" #include "../../../hb-ot-layout-gdef-table.hh" @@ -10,6 +15,200 @@ namespace OT { //namespace Var { +#define VARC_PROCESS_TRANSFORM_COMPONENTS \ + HB_STMT_START { \ + PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_X, translateX); \ + PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_Y, translateY); \ + PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_ROTATION, rotation); \ + PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_X, scaleX); \ + PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_Y, scaleY); \ + PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_X, skewX); \ + PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_Y, skewY); \ + PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_X, tCenterX); \ + PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_Y, tCenterY); \ + } HB_STMT_END + +bool +VarComponent::decompile_record (const VARC &varc, + hb_ubytes_t total_record, + hb_vector_t *axis_indices, + hb_vector_t *axis_values, + record_t *decoded, + int64_t *budget) +{ + const unsigned char *start = total_record.arrayZ; + const unsigned char *record = start; + const unsigned char *end = start + total_record.length; + + if (axis_indices) axis_indices->clear (); + if (axis_values) axis_values->clear (); + +#define READ_UINT32VAR(name) \ + HB_STMT_START { \ + if (unlikely (unsigned (end - record) < HBUINT32VAR::min_size)) return false; \ + hb_barrier (); \ + auto &varint = * (const HBUINT32VAR *) record; \ + unsigned size = varint.get_size (); \ + if (unlikely (unsigned (end - record) < size)) return false; \ + name = (uint32_t) varint; \ + record += size; \ + } HB_STMT_END +#define READ_UINT32VAR_FIELD(name, field) \ + HB_STMT_START { \ + decoded->field##_offset = record - start; \ + READ_UINT32VAR (name); \ + decoded->field##_size = record - start - decoded->field##_offset; \ + } HB_STMT_END + + READ_UINT32VAR (decoded->flags); + + decoded->gid_offset = record - start; + if (decoded->flags & (unsigned) flags_t::GID_IS_24BIT) + { + decoded->gid_size = HBGlyphID24::static_size; + if (unlikely (unsigned (end - record) < HBGlyphID24::static_size)) return false; + hb_barrier (); + decoded->gid = * (const HBGlyphID24 *) record; + record += HBGlyphID24::static_size; + } + else + { + decoded->gid_size = HBGlyphID16::static_size; + if (unlikely (unsigned (end - record) < HBGlyphID16::static_size)) return false; + hb_barrier (); + decoded->gid = * (const HBGlyphID16 *) record; + record += HBGlyphID16::static_size; + } + + if (decoded->flags & (unsigned) flags_t::HAVE_CONDITION) + READ_UINT32VAR_FIELD (decoded->condition_index, condition); + + if (decoded->flags & (unsigned) flags_t::HAVE_AXES) + { + READ_UINT32VAR_FIELD (decoded->axis_indices_index, axis_indices); + unsigned axis_count; + if (axis_indices) + { + axis_indices->extend ((&varc+varc.axisIndicesList)[decoded->axis_indices_index]); + if (unlikely (axis_indices->in_error ())) return false; + axis_count = axis_indices->length; + } + else + axis_count = hb_len ((&varc+varc.axisIndicesList)[decoded->axis_indices_index]); + if (unlikely (budget && axis_count && + !hb_budget_spend (*budget, HB_BUDGET_1, axis_count))) + return false; + if (axis_values) + { + if (unlikely (!axis_values->resize (axis_count))) return false; + const HBUINT8 *p = (const HBUINT8 *) record; + if (unlikely (!TupleValues::decompile (p, *axis_values, + (const HBUINT8 *) end))) + return false; + record = (const unsigned char *) p; + } + else if (unlikely (!TupleValues::skip (record, end, axis_count))) + return false; + } + + decoded->axis_values_var_idx = VarIdx::NO_VARIATION; + if (decoded->flags & (unsigned) flags_t::AXIS_VALUES_HAVE_VARIATION) + READ_UINT32VAR_FIELD (decoded->axis_values_var_idx, axis_values_var); + + decoded->transform_var_idx = VarIdx::NO_VARIATION; + if (decoded->flags & (unsigned) flags_t::TRANSFORM_HAS_VARIATION) + READ_UINT32VAR_FIELD (decoded->transform_var_idx, transform_var); + +#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \ + if (decoded->flags & (unsigned) flags_t::flag) \ + { \ + static_assert (type::static_size == HBINT16::static_size, ""); \ + if (unlikely (unsigned (end - record) < HBINT16::static_size)) return false; \ + hb_barrier (); \ + decoded->transform.name = * (const HBINT16 *) record; \ + record += HBINT16::static_size; \ + } + VARC_PROCESS_TRANSFORM_COMPONENTS; +#undef PROCESS_TRANSFORM_COMPONENT + + unsigned reserved = decoded->flags & (unsigned) flags_t::RESERVED_MASK; + while (reserved) + { + uint32_t discard HB_UNUSED; + READ_UINT32VAR (discard); + reserved &= reserved - 1; + } + + decoded->size = record - start; +#undef READ_UINT32VAR_FIELD +#undef READ_UINT32VAR + return true; +} + +bool +VARC::closure_glyphs (hb_set_t *glyphset) const +{ + if (unlikely (glyphset->in_error ())) + return false; + + hb_set_t pending = *glyphset; + if (unlikely (pending.in_error ())) + return false; + + while (pending) + { + hb_codepoint_t gid = pending.get_min (); + pending.del (gid); + + unsigned index = (this+coverage).get_coverage (gid); + if (index == NOT_COVERED) continue; + + hb_ubytes_t record = (this+glyphRecords)[index]; + while (record) + { + VarComponent::record_t component; + if (unlikely (!VarComponent::decompile_record (*this, record, + nullptr, nullptr, &component))) + return false; + if (!glyphset->has (component.gid)) + { + glyphset->add (component.gid); + if (unlikely (glyphset->in_error ())) + return false; + pending.add (component.gid); + if (unlikely (pending.in_error ())) + return false; + } + record = record.sub_array (component.size); + } + } + return true; +} + +void +VARC::depend (hb_depend_data_builder_t *depend_data) const +{ + const CFF2Index &records = this+glyphRecords; + for (auto _ : + hb_zip (this+coverage, + hb_range ((unsigned) records.count))) + { + hb_codepoint_t gid = _.first; + hb_ubytes_t record = records[_.second]; + while (record) + { + VarComponent::record_t component; + if (unlikely (!VarComponent::decompile_record (*this, record, + nullptr, nullptr, &component))) + { + depend_data->fail (); + return; + } + depend_data->add_depend (gid, tableTag, component.gid); + record = record.sub_array (component.size); + } + } +} + #ifndef HB_NO_DRAW @@ -19,6 +218,7 @@ struct hb_transforming_pen_context_t hb_draw_funcs_t *dfuncs; void *data; hb_draw_state_t *st; + int64_t *budget_remaining; }; static void @@ -94,6 +294,12 @@ hb_transforming_pen_close_path (hb_draw_funcs_t *dfuncs HB_UNUSED, c->dfuncs->close_path (c->data, *c->st); } +static int64_t * +hb_transforming_pen_get_budget_remaining (hb_draw_funcs_t *, void *draw_data, void *) +{ + return ((hb_transforming_pen_context_t *) draw_data)->budget_remaining; +} + static inline void free_static_transforming_pen_funcs (); static struct hb_transforming_pen_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t @@ -107,6 +313,7 @@ static struct hb_transforming_pen_funcs_lazy_loader_t : hb_draw_funcs_lazy_loade hb_draw_funcs_set_quadratic_to_func (funcs, hb_transforming_pen_quadratic_to, nullptr, nullptr); hb_draw_funcs_set_cubic_to_func (funcs, hb_transforming_pen_cubic_to, nullptr, nullptr); hb_draw_funcs_set_close_path_func (funcs, hb_transforming_pen_close_path, nullptr, nullptr); + hb_draw_funcs_set_get_budget_remaining_func (funcs, hb_transforming_pen_get_budget_remaining, nullptr, nullptr); hb_draw_funcs_make_immutable (funcs); @@ -136,81 +343,45 @@ VarComponent::get_path_at (const hb_varc_context_t &c, hb_ubytes_t total_record, hb_scalar_cache_t *cache) const { - const unsigned char *end = total_record.arrayZ + total_record.length; - const unsigned char *record = total_record.arrayZ; + if (unlikely (!hb_budget_spend (c.budget, HB_BUDGET_4))) + return hb_ubytes_t (); + const unsigned char *end = total_record.arrayZ + total_record.length; auto &VARC = *c.font->face->table.VARC->table; auto &varStore = &VARC+VARC.varStore; -#define READ_UINT32VAR(name) \ - HB_STMT_START { \ - if (unlikely (unsigned (end - record) < HBUINT32VAR::min_size)) return hb_ubytes_t (); \ - hb_barrier (); \ - auto &varint = * (const HBUINT32VAR *) record; \ - unsigned size = varint.get_size (); \ - if (unlikely (unsigned (end - record) < size)) return hb_ubytes_t (); \ - name = (uint32_t) varint; \ - record += size; \ - } HB_STMT_END - - uint32_t flags; - READ_UINT32VAR (flags); + auto &axisIndices = c.scratch.axisIndices; + auto &axisValues = c.scratch.axisValues; + record_t component; + if (unlikely (!decompile_record (VARC, total_record, + &axisIndices, &axisValues, &component, + &c.budget))) + return hb_ubytes_t (); - // gid - - hb_codepoint_t gid = 0; - if (flags & (unsigned) flags_t::GID_IS_24BIT) - { - if (unlikely (unsigned (end - record) < HBGlyphID24::static_size)) - return hb_ubytes_t (); - hb_barrier (); - gid = * (const HBGlyphID24 *) record; - record += HBGlyphID24::static_size; - } - else - { - if (unlikely (unsigned (end - record) < HBGlyphID16::static_size)) - return hb_ubytes_t (); - hb_barrier (); - gid = * (const HBGlyphID16 *) record; - record += HBGlyphID16::static_size; - } + uint32_t flags = component.flags; + hb_codepoint_t gid = component.gid; + const unsigned char *record = total_record.arrayZ + component.size; // Condition bool show = true; if (flags & (unsigned) flags_t::HAVE_CONDITION) { - unsigned conditionIndex; - READ_UINT32VAR (conditionIndex); - const auto &condition = (&VARC+VARC.conditionList)[conditionIndex]; + const auto &condition = (&VARC+VARC.conditionList)[component.condition_index]; auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache); show = condition.evaluate (coords.arrayZ, coords.length, &instancer); } // Axis values - auto &axisIndices = c.scratch.axisIndices; - axisIndices.clear (); - auto &axisValues = c.scratch.axisValues; - axisValues.clear (); - if (flags & (unsigned) flags_t::HAVE_AXES) - { - unsigned axisIndicesIndex; - READ_UINT32VAR (axisIndicesIndex); - axisIndices.extend ((&VARC+VARC.axisIndicesList)[axisIndicesIndex]); - axisValues.resize (axisIndices.length); - const HBUINT8 *p = (const HBUINT8 *) record; - TupleValues::decompile (p, axisValues, (const HBUINT8 *) end); - record = (const unsigned char *) p; - } - // Apply variations if any - if (flags & (unsigned) flags_t::AXIS_VALUES_HAVE_VARIATION) + if ((flags & (unsigned) flags_t::AXIS_VALUES_HAVE_VARIATION) && + show && !axisValues.in_error ()) { - uint32_t axisValuesVarIdx; - READ_UINT32VAR (axisValuesVarIdx); - if (show && coords && !axisValues.in_error ()) - varStore.get_delta (axisValuesVarIdx, coords, axisValues.as_array (), cache); + if (unlikely (!hb_budget_spend (c.budget, axisValues.length, + coords.length))) + return hb_ubytes_t (); + varStore.get_delta (component.axis_values_var_idx, coords, + axisValues.as_array (), cache); } auto component_coords = coords; @@ -220,77 +391,41 @@ VarComponent::get_path_at (const hb_varc_context_t &c, coords.length > HB_VAR_COMPOSITE_MAX_AXES) component_coords = hb_array (c.font->coords, c.font->num_coords); - // Transform - - uint32_t transformVarIdx = VarIdx::NO_VARIATION; - if (flags & (unsigned) flags_t::TRANSFORM_HAS_VARIATION) - READ_UINT32VAR (transformVarIdx); - -#define PROCESS_TRANSFORM_COMPONENTS \ - HB_STMT_START { \ - PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_X, translateX); \ - PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TRANSLATE_Y, translateY); \ - PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_ROTATION, rotation); \ - PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_X, scaleX); \ - PROCESS_TRANSFORM_COMPONENT (10, F6DOT10, HAVE_SCALE_Y, scaleY); \ - PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_X, skewX); \ - PROCESS_TRANSFORM_COMPONENT (12, F4DOT12, HAVE_SKEW_Y, skewY); \ - PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_X, tCenterX); \ - PROCESS_TRANSFORM_COMPONENT ( 0, FWORD, HAVE_TCENTER_Y, tCenterY); \ - } HB_STMT_END - - hb_transform_decomposed_t<> transform; - - // Read transform components -#define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \ - if (flags & (unsigned) flags_t::flag) \ - { \ - static_assert (type::static_size == HBINT16::static_size, ""); \ - if (unlikely (unsigned (end - record) < HBINT16::static_size)) \ - return hb_ubytes_t (); \ - hb_barrier (); \ - transform.name = * (const HBINT16 *) record; \ - record += HBINT16::static_size; \ - } - PROCESS_TRANSFORM_COMPONENTS; -#undef PROCESS_TRANSFORM_COMPONENT - - // Read reserved records - unsigned i = flags & (unsigned) flags_t::RESERVED_MASK; - while (i) - { - HB_UNUSED uint32_t discard; - READ_UINT32VAR (discard); - i &= i - 1; - } - - /* Parsing is over now. */ + uint32_t transformVarIdx = component.transform_var_idx; + hb_transform_decomposed_t<> transform = component.transform; if (show) { // Only use coord_setter if there's actually any axis overrides. + if (unlikely (axisIndices && + !hb_budget_spend (c.budget, HB_BUDGET_1, + component_coords.length))) + return hb_ubytes_t (); coord_setter_t coord_setter (axisIndices ? component_coords : hb_array ()); for (unsigned i = 0; i < axisIndices.length; i++) - coord_setter[axisIndices[i]] = roundf (axisValues[i]); + coord_setter[axisIndices[i]] = hb_clamp_to (round (axisValues[i])); if (axisIndices) component_coords = coord_setter.get_coords (); // Apply transform variations if any - if (transformVarIdx != VarIdx::NO_VARIATION && coords) + if (transformVarIdx != VarIdx::NO_VARIATION) { - float transformValues[9]; + double transformValues[9]; unsigned numTransformValues = 0; #define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \ if (flags & (unsigned) flags_t::flag) \ - transformValues[numTransformValues++] = transform.name; - PROCESS_TRANSFORM_COMPONENTS; + transformValues[numTransformValues++] = (double) transform.name; + VARC_PROCESS_TRANSFORM_COMPONENTS; #undef PROCESS_TRANSFORM_COMPONENT + if (unlikely (!hb_budget_spend (c.budget, numTransformValues, + coords.length))) + return hb_ubytes_t (); varStore.get_delta (transformVarIdx, coords, hb_array (transformValues, numTransformValues), cache); numTransformValues = 0; #define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \ if (flags & (unsigned) flags_t::flag) \ - transform.name = transformValues[numTransformValues++]; - PROCESS_TRANSFORM_COMPONENTS; + transform.name = (float) transformValues[numTransformValues++]; + VARC_PROCESS_TRANSFORM_COMPONENTS; #undef PROCESS_TRANSFORM_COMPONENT } @@ -298,7 +433,7 @@ VarComponent::get_path_at (const hb_varc_context_t &c, #define PROCESS_TRANSFORM_COMPONENT(shift, type, flag, name) \ if (shift && (flags & (unsigned) flags_t::flag)) \ transform.name *= 1.f / (1 << shift); - PROCESS_TRANSFORM_COMPONENTS; + VARC_PROCESS_TRANSFORM_COMPONENTS; #undef PROCESS_TRANSFORM_COMPONENT if (!(flags & (unsigned) flags_t::HAVE_SCALE_Y)) @@ -321,9 +456,6 @@ VarComponent::get_path_at (const hb_varc_context_t &c, c.depth_left++; } -#undef PROCESS_TRANSFORM_COMPONENTS -#undef READ_UINT32VAR - return hb_ubytes_t (record, end - record); } @@ -343,6 +475,10 @@ VARC::get_path_at (const hb_varc_context_t &c, { if (c.draw_session) { + /* Out of budget: draw nothing, but signal success so remaining + * leaves are skipped instead of falling back per-glyph. */ + if (unlikely (!hb_budget_spend (c.budget, HB_BUDGET_1))) return true; + hb_transform_t<> leaf_transform = transform; leaf_transform.x0 *= c.font->x_multf; leaf_transform.y0 *= c.font->y_multf; @@ -352,24 +488,27 @@ VARC::get_path_at (const hb_varc_context_t &c, hb_transforming_pen_context_t context {leaf_transform, c.draw_session->funcs, c.draw_session->draw_data, - &c.draw_session->st}; + &c.draw_session->st, + &c.budget}; hb_draw_session_t transformer_session {transformer_funcs, &context}; hb_draw_session_t &shape_draw_session = leaf_transform.is_identity () ? *c.draw_session : transformer_session; - if (c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch)) return true; + if (c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch, nullptr, &shape_draw_session.get_budget ())) return true; #ifndef HB_NO_CFF - if (c.font->face->table.cff2->get_path_at (c.font, glyph, shape_draw_session, coords)) return true; - if (c.font->face->table.cff1->get_path (c.font, glyph, shape_draw_session)) return true; // Doesn't have variations + if (c.font->face->table.cff2->get_path_at (c.font, glyph, shape_draw_session, coords, &shape_draw_session.get_budget ())) return true; + if (c.font->face->table.cff1->get_path (c.font, glyph, shape_draw_session, &shape_draw_session.get_budget ())) return true; // Doesn't have variations #endif return false; } else if (c.extents) { + if (unlikely (!hb_budget_spend (c.budget, HB_BUDGET_1))) return true; + hb_glyph_extents_t glyph_extents; - if (!c.font->face->table.glyf->get_extents_at (c.font, glyph, &glyph_extents, coords)) + if (!c.font->face->table.glyf->get_extents_at (c.font, glyph, &glyph_extents, coords, &c.budget)) #ifndef HB_NO_CFF - if (!c.font->face->table.cff2->get_extents_at (c.font, glyph, &glyph_extents, coords)) - if (!c.font->face->table.cff1->get_extents (c.font, glyph, &glyph_extents)) // Doesn't have variations + if (!c.font->face->table.cff2->get_extents_at (c.font, glyph, &glyph_extents, coords, &c.budget)) + if (!c.font->face->table.cff1->get_extents (c.font, glyph, &glyph_extents, &c.budget)) // Doesn't have variations #endif return false; @@ -415,7 +554,12 @@ VARC::get_path_at (const hb_varc_context_t &c, #endif +#undef VARC_PROCESS_TRANSFORM_COMPONENTS + //} // namespace Var } // namespace OT #endif + +#endif /* HB_OT_VAR_VARC_CC (pacify clang) */ +#endif /* HB_OT_VAR_VARC_CC */ diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh index 6b40f044556b..ad8cf473ef3f 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh @@ -10,6 +10,8 @@ #include "coord-setter.hh" +struct hb_depend_data_builder_t; + namespace OT { //namespace Var { @@ -24,7 +26,7 @@ namespace OT { struct hb_varc_scratch_t { hb_vector_t axisIndices; - hb_vector_t axisValues; + hb_vector_t axisValues; hb_glyf_scratch_t glyf_scratch; }; @@ -36,9 +38,14 @@ struct hb_varc_context_t mutable hb_decycler_t decycler; mutable signed edges_left; mutable signed depth_left; + /* Renderer-owned live budget, shared by VARC record processing and + * every leaf loaded from glyf/CFF/CFF2. */ + int64_t &budget; hb_varc_scratch_t &scratch; }; +struct VARC; + struct VarComponent { enum class flags_t : uint32_t @@ -61,6 +68,28 @@ struct VarComponent RESERVED_MASK = ~((1u << 15) - 1), }; + struct record_t + { + uint32_t flags; + hb_codepoint_t gid; + unsigned gid_offset; + unsigned gid_size; + unsigned condition_index; + unsigned condition_offset; + unsigned condition_size; + unsigned axis_indices_index; + unsigned axis_indices_offset; + unsigned axis_indices_size; + uint32_t axis_values_var_idx; + unsigned axis_values_var_offset; + unsigned axis_values_var_size; + uint32_t transform_var_idx; + unsigned transform_var_offset; + unsigned transform_var_size; + hb_transform_decomposed_t<> transform; + unsigned size; + }; + HB_INTERNAL hb_ubytes_t get_path_at (const hb_varc_context_t &c, hb_codepoint_t parent_gid, @@ -68,6 +97,13 @@ struct VarComponent hb_transform_t<> transform, hb_ubytes_t record, hb_scalar_cache_t *cache = nullptr) const; + + HB_INTERNAL static bool decompile_record (const VARC &varc, + hb_ubytes_t record, + hb_vector_t *axis_indices, + hb_vector_t *axis_values, + record_t *decoded /* OUT */, + int64_t *budget = nullptr); }; struct VarCompositeGlyph @@ -108,18 +144,24 @@ struct VARC hb_codepoint_t parent_gid = HB_CODEPOINT_INVALID, hb_scalar_cache_t *parent_cache = nullptr) const; + HB_INTERNAL bool closure_glyphs (hb_set_t *glyphset) const; + HB_INTERNAL void depend (hb_depend_data_builder_t *depend_data) const; + HB_INTERNAL bool subset (hb_subset_context_t *c) const; + bool get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session, hb_varc_scratch_t &scratch) const { + int64_t &budget = draw_session.get_budget (); hb_varc_context_t c {font, &draw_session, nullptr, hb_decycler_t {}, HB_MAX_GRAPH_EDGE_COUNT, HB_MAX_NESTING_LEVEL, + budget, scratch}; return get_path_at (c, gid, @@ -132,12 +174,14 @@ struct VARC hb_extents_t<> *extents, hb_varc_scratch_t &scratch) const { + int64_t budget = HB_BUDGET_GLYPH; hb_varc_context_t c {font, nullptr, extents, hb_decycler_t {}, HB_MAX_GRAPH_EDGE_COUNT, HB_MAX_NESTING_LEVEL, + budget, scratch}; return get_path_at (c, gid, @@ -177,6 +221,8 @@ struct VARC table.destroy (); } + bool has_data () const { return table->has_data (); } + bool get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const { @@ -189,6 +235,19 @@ struct VARC return ret; } + bool closure_glyphs (hb_set_t *glyphset) const + { + if (table->has_data ()) + return table->closure_glyphs (glyphset); + return true; + } + + void depend (hb_depend_data_builder_t *depend_data) const + { + if (table->has_data ()) + table->depend (depend_data); + } + bool get_extents (hb_font_t *font, hb_codepoint_t gid, diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh index 7243e180101d..89dbc35a4985 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh @@ -33,12 +33,12 @@ struct CompositeGlyphRecord }; public: - size_t get_size () const + size_t get_size (bool extended) const { unsigned int size = min_size; /* glyphIndex is 24bit instead of 16bit */ #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) size += HBGlyphID24::static_size - HBGlyphID16::static_size; + if (extended && (flags & GID_IS_24BIT)) size += HBGlyphID24::static_size - HBGlyphID16::static_size; #endif /* arg1 and 2 are int16 */ if (flags & ARG_1_AND_2_ARE_WORDS) size += 4; @@ -66,11 +66,11 @@ struct CompositeGlyphRecord bool has_more () const { return flags & MORE_COMPONENTS; } bool is_use_my_metrics () const { return flags & USE_MY_METRICS; } bool is_anchored () const { return !(flags & ARGS_ARE_XY_VALUES); } - void get_anchor_points (unsigned int &point1, unsigned int &point2) const + void get_anchor_points (unsigned int &point1, unsigned int &point2, bool extended) const { const auto *p = &StructAfter (flags); #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) + if (extended && (flags & GID_IS_24BIT)) p += HBGlyphID24::static_size; else #endif @@ -138,28 +138,29 @@ struct CompositeGlyphRecord } } - bool get_points (contour_point_vector_t &points) const + bool get_points (contour_point_vector_t &points, bool extended) const { float matrix[4]; contour_point_t trans; - get_transformation (matrix, trans); + get_transformation (matrix, trans, extended); if (unlikely (!points.alloc (points.length + 1 + 4))) return false; // For phantom points points.push (trans); return true; } unsigned compile_with_point (const contour_point_t &point, - char *out) const + char *out, + bool extended) const { const HBINT8 *p = &StructAfter (flags); #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) + if (extended && (flags & GID_IS_24BIT)) p += HBGlyphID24::static_size; else #endif p += HBGlyphID16::static_size; - unsigned len = get_size (); + unsigned len = get_size (extended); unsigned len_before_val = (const char *)p - (const char *)this; if (flags & ARG_1_AND_2_ARE_WORDS) { @@ -213,14 +214,14 @@ struct CompositeGlyphRecord { return (flags & (SCALED_COMPONENT_OFFSET | UNSCALED_COMPONENT_OFFSET)) == SCALED_COMPONENT_OFFSET; } public: - bool get_transformation (float (&matrix)[4], contour_point_t &trans) const + bool get_transformation (float (&matrix)[4], contour_point_t &trans, bool extended) const { matrix[0] = matrix[3] = 1.f; matrix[1] = matrix[2] = 0.f; const auto *p = &StructAfter (flags); #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) + if (extended && (flags & GID_IS_24BIT)) p += HBGlyphID24::static_size; else #endif @@ -268,19 +269,19 @@ struct CompositeGlyphRecord return tx || ty; } - hb_codepoint_t get_gid () const + hb_codepoint_t get_gid (bool extended) const { #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) + if (extended && (flags & GID_IS_24BIT)) return StructAfter (flags); else #endif return StructAfter (flags); } - void set_gid (hb_codepoint_t gid) + void set_gid (hb_codepoint_t gid, bool extended) { #ifndef HB_NO_BEYOND_64K - if (flags & GID_IS_24BIT) + if (extended && (flags & GID_IS_24BIT)) StructAfter (flags) = gid; else #endif @@ -291,19 +292,19 @@ struct CompositeGlyphRecord #ifndef HB_NO_BEYOND_64K void lower_gid_24_to_16 () { - hb_codepoint_t gid = get_gid (); + hb_codepoint_t gid = get_gid (true); if (!(flags & GID_IS_24BIT) || gid > 0xFFFFu) return; /* Lower the flag and move the rest of the struct down. */ - unsigned size = get_size (); + unsigned size = get_size (true); char *end = (char *) this + size; char *p = &StructAfter (flags); p += HBGlyphID24::static_size; flags = flags & ~GID_IS_24BIT; - set_gid (gid); + set_gid (gid, true); memmove (p - HBGlyphID24::static_size + HBGlyphID16::static_size, p, end - p); } @@ -322,11 +323,12 @@ struct CompositeGlyph { const GlyphHeader &header; hb_bytes_t bytes; - CompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) : - header (header_), bytes (bytes_) {} + bool extended; + CompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_, bool extended_) : + header (header_), bytes (bytes_), extended (extended_) {} composite_iter_t iter () const - { return composite_iter_t (bytes, &StructAfter (header)); } + { return composite_iter_t (bytes, &StructAfter (header), extended); } unsigned int instructions_length (hb_bytes_t bytes) const { @@ -338,7 +340,7 @@ struct CompositeGlyph if (unlikely (!last)) return 0; if (last->has_instructions ()) - start = (char *) last - &bytes + last->get_size (); + start = (char *) last - &bytes + last->get_size (extended); if (unlikely (start > end)) return 0; return end - start; } @@ -386,7 +388,7 @@ struct CompositeGlyph if (unlikely (!o)) return false; const CompositeGlyphRecord *c = reinterpret_cast (source_bytes.arrayZ + GlyphHeader::static_size); - auto it = composite_iter_t (hb_bytes_t ((const char *)c, source_len), c); + auto it = composite_iter_t (hb_bytes_t ((const char *)c, source_len), c, extended); char *p = o; unsigned i = 0, source_comp_len = 0; @@ -398,7 +400,7 @@ struct CompositeGlyph return false; } - unsigned comp_len = component.get_size (); + unsigned comp_len = component.get_size (extended); if (component.is_anchored ()) { hb_memcpy (p, &component, comp_len); @@ -406,7 +408,7 @@ struct CompositeGlyph } else { - unsigned new_len = component.compile_with_point (points_with_deltas[i], p); + unsigned new_len = component.compile_with_point (points_with_deltas[i], p, extended); p += new_len; } i++; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh index 432b4dfe4644..f6c34bb1bfba 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh @@ -37,13 +37,13 @@ struct Glyph composite_iter_t get_composite_iterator () const { if (type != COMPOSITE) return composite_iter_t (); - return CompositeGlyph (*header, bytes).iter (); + return CompositeGlyph (*header, bytes, extended).iter (); } const hb_bytes_t trim_padding () const { switch (type) { - case COMPOSITE: return CompositeGlyph (*header, bytes).trim_padding (); + case COMPOSITE: return CompositeGlyph (*header, bytes, extended).trim_padding (); case SIMPLE: return SimpleGlyph (*header, bytes).trim_padding (); case EMPTY: return bytes; default: return bytes; @@ -53,16 +53,19 @@ struct Glyph void drop_hints () { switch (type) { - case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints (); return; + case COMPOSITE: CompositeGlyph (*header, bytes, extended).drop_hints (); return; case SIMPLE: SimpleGlyph (*header, bytes).drop_hints (); return; - case EMPTY: return; + case EMPTY: + if (bytes.length >= GlyphHeader::static_size) + SimpleGlyph (*header, bytes).drop_hints (); + return; } } void set_overlaps_flag () { switch (type) { - case COMPOSITE: CompositeGlyph (*header, bytes).set_overlaps_flag (); return; + case COMPOSITE: CompositeGlyph (*header, bytes, extended).set_overlaps_flag (); return; case SIMPLE: SimpleGlyph (*header, bytes).set_overlaps_flag (); return; case EMPTY: return; } @@ -71,9 +74,15 @@ struct Glyph void drop_hints_bytes (hb_bytes_t &dest_start, hb_bytes_t &dest_end) const { switch (type) { - case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints_bytes (dest_start); return; + case COMPOSITE: CompositeGlyph (*header, bytes, extended).drop_hints_bytes (dest_start); return; case SIMPLE: SimpleGlyph (*header, bytes).drop_hints_bytes (dest_start, dest_end); return; - case EMPTY: return; + case EMPTY: + dest_start = bytes; + dest_end = hb_bytes_t (); + if (bytes.length >= GlyphHeader::static_size && + SimpleGlyph (*header, bytes).has_instructions_length ()) + SimpleGlyph (*header, bytes).drop_hints_bytes (dest_start, dest_end); + return; } } @@ -85,13 +94,13 @@ struct Glyph { switch (type) { case SIMPLE: - if (unlikely (!SimpleGlyph (*header, bytes).get_contour_points (points))) + if (unlikely (!SimpleGlyph (*header, bytes).get_contour_points (points, extended))) return false; break; case COMPOSITE: { for (auto &item : get_composite_iterator ()) - if (unlikely (!item.get_points (points))) return false; + if (unlikely (!item.get_points (points, extended))) return false; break; } case EMPTY: @@ -269,9 +278,9 @@ struct Glyph switch (type) { case COMPOSITE: - if (!CompositeGlyph (*header, bytes).compile_bytes_with_deltas (dest_start, - points_with_deltas, - dest_end)) + if (!CompositeGlyph (*header, bytes, extended).compile_bytes_with_deltas (dest_start, + points_with_deltas, + dest_end)) return false; break; case SIMPLE: @@ -281,10 +290,25 @@ struct Glyph return false; break; case EMPTY: - /* set empty bytes for empty glyph - * do not use source glyph's pointers */ dest_start = hb_bytes_t (); dest_end = hb_bytes_t (); + /* Zero-contour glyphs may carry instructions for phantom points. + * Copy them into owned memory like the other compiled glyphs. */ + if (!(plan->flags & HB_SUBSET_FLAGS_NO_HINTING) && + bytes.length >= GlyphHeader::static_size && + header->numberOfContours == 0) + { + SimpleGlyph simple (*header, bytes); + unsigned length = simple.instructions_length (); + if (length) + { + length = simple.length (length); + char *p = (char *) hb_malloc (length); + if (unlikely (!p)) return false; + hb_memcpy (p, bytes.arrayZ, length); + dest_start = hb_bytes_t (p, length); + } + } break; } } @@ -314,7 +338,8 @@ struct Glyph hb_array_t coords = hb_array_t (), hb_scalar_cache_t *gvar_cache = nullptr, unsigned int depth = 0, - unsigned *edge_count = nullptr) const + unsigned *edge_count = nullptr, + int64_t *budget = nullptr) const { if (unlikely (depth > HB_MAX_NESTING_LEVEL)) return false; unsigned stack_edge_count = 0; @@ -322,6 +347,10 @@ struct Glyph if (unlikely (*edge_count > HB_MAX_GRAPH_EDGE_COUNT)) return false; (*edge_count)++; + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + if (unlikely (!hb_budget_spend (*budget, HB_BUDGET_16))) return false; + if (head_maxp_info) { head_maxp_info->maxComponentDepth = hb_max (head_maxp_info->maxComponentDepth, depth); @@ -339,13 +368,22 @@ struct Glyph head_maxp_info->maxContours = hb_max (head_maxp_info->maxContours, (unsigned) header->numberOfContours); if (depth > 0 && composite_contours) *composite_contours += (unsigned) header->numberOfContours; - if (unlikely (!SimpleGlyph (*header, bytes).get_contour_points (all_points, phantom_only))) + if (unlikely (!SimpleGlyph (*header, bytes).get_contour_points (all_points, extended, phantom_only, budget))) return false; break; case COMPOSITE: { for (auto &item : get_composite_iterator ()) - if (unlikely (!item.get_points (points))) return false; + { + /* Preparing a component is a traversal step, even if cycle + * detection later skips its child glyph. */ + if (unlikely (!hb_budget_spend (*budget, HB_BUDGET_16) || + !item.get_points (points, extended))) + { + points.resize (old_length); + return false; + } + } break; } case EMPTY: @@ -382,25 +420,13 @@ struct Glyph #ifndef HB_NO_VAR if (hb_any (coords)) { -#ifndef HB_NO_BEYOND_64K - if (glyf_accelerator.GVAR->has_data ()) - { - if (!glyf_accelerator.GVAR->apply_deltas_to_points (gid, - coords, - points.as_array ().sub_array (old_length), - scratch, - gvar_cache, - phantom_only && type == SIMPLE)) - return false; - } - else -#endif if (!glyf_accelerator.gvar->apply_deltas_to_points (gid, coords, points.as_array ().sub_array (old_length), scratch, gvar_cache, - phantom_only && type == SIMPLE)) + phantom_only && type == SIMPLE, + budget)) return false; } #endif @@ -427,7 +453,7 @@ struct Glyph unsigned int comp_index = 0; for (auto &item : get_composite_iterator ()) { - hb_codepoint_t item_gid = item.get_gid (); + hb_codepoint_t item_gid = item.get_gid (extended); if (unlikely (!decycler_node.visit (item_gid))) { @@ -452,7 +478,8 @@ struct Glyph coords, gvar_cache, depth + 1, - edge_count))) + edge_count, + budget))) { points.resize (old_length); return false; @@ -468,11 +495,20 @@ struct Glyph for (unsigned int i = 0; i < PHANTOM_COUNT; i++) phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i]; + /* Each composite level transforms the whole subtree below it; + * charge that work here so deep nesting is bounded by the budget + * rather than by the per-draw point cap alone. */ + if (unlikely (!hb_budget_spend (*budget, HB_BUDGET_1, comp_points.length))) + { + points.resize (old_length); + return false; + } + if (comp_points) // Empty in case of phantom_only { float matrix[4]; contour_point_t default_trans; - item.get_transformation (matrix, default_trans); + item.get_transformation (matrix, default_trans, extended); /* Apply component transformation & translation (with deltas applied) */ item.transform_points (comp_points, matrix, points[old_length + comp_index]); @@ -481,7 +517,7 @@ struct Glyph if (item.is_anchored () && !phantom_only) { unsigned int p1, p2; - item.get_anchor_points (p1, p2); + item.get_anchor_points (p1, p2, extended); if (likely (p1 < all_points.length && p2 < comp_points.length)) { contour_point_t delta; @@ -548,17 +584,21 @@ struct Glyph hb_bytes_t get_bytes () const { return bytes; } glyph_type_t get_type () const { return type; } const GlyphHeader *get_header () const { return header; } + bool is_extended () const { return extended; } Glyph () : bytes (), header (bytes.as ()), gid (-1), - type(EMPTY) + type(EMPTY), + extended (false) {} Glyph (hb_bytes_t bytes_, - hb_codepoint_t gid_ = (unsigned) -1) : bytes (bytes_), - header (bytes.as ()), - gid (gid_) + hb_codepoint_t gid_, + bool extended_) : bytes (bytes_), + header (bytes.as ()), + gid (gid_), + extended (extended_) { int num_contours = header->numberOfContours; if (unlikely (num_contours == 0)) type = EMPTY; @@ -572,6 +612,7 @@ struct Glyph const GlyphHeader *header; hb_codepoint_t gid; glyph_type_t type; + bool extended; }; diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh index d94a2f3ddfe9..cdb3136e0975 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh @@ -125,7 +125,8 @@ struct SimpleGlyph static bool read_flags (const HBUINT8 *&p /* IN/OUT */, hb_array_t points_ /* IN/OUT */, - const HBUINT8 *end) + const HBUINT8 *end, + bool extended) { auto *points = points_.arrayZ; unsigned count = points_.length; @@ -133,6 +134,8 @@ struct SimpleGlyph { if (unlikely (p + 1 > end)) return false; uint8_t flag = *p++; + if (!extended) + flag &= ~FLAG_CUBIC; points[i++].flag = flag; if (flag & FLAG_REPEAT) { @@ -178,7 +181,9 @@ struct SimpleGlyph } bool get_contour_points (contour_point_vector_t &points /* OUT */, - bool phantom_only = false) const + bool extended, + bool phantom_only = false, + int64_t *budget = nullptr) const { const HBUINT16 *endPtsOfContours = &StructAfter (header); int num_contours = header.numberOfContours; @@ -188,6 +193,10 @@ struct SimpleGlyph unsigned int num_points = endPtsOfContours[num_contours - 1] + 1; if (unlikely (num_points < (unsigned) num_contours)) return false; + /* Charge before allocating and reading, so that glyphs that fail + * later (truncated data, composite caps) still pay for this work. */ + if (budget && unlikely (!hb_budget_spend (*budget, HB_BUDGET_1, num_points))) return false; + unsigned old_length = points.length; points.alloc (points.length + num_points + 4); // Allocate for phantom points, to avoid a possible copy if (unlikely (!points.resize_dirty (points.length + num_points))) return false; @@ -208,7 +217,7 @@ struct SimpleGlyph if (unlikely (p >= end)) return false; /* Read x & y coordinates */ - return read_flags (p, points_, end) + return read_flags (p, points_, end, extended) && read_points (p, points_, end, &contour_point_t::x, FLAG_X_SHORT, FLAG_X_SAME) && read_points (p, points_, end, &contour_point_t::y, diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh index 643b0226492e..2f3368f83751 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh @@ -46,63 +46,68 @@ struct SubsetGlyph if (unlikely (!dest_glyph.length)) return_trace (true); + bool extended = source_glyph.is_extended (); + /* update components gids. */ - for (auto &_ : Glyph (dest_glyph).get_composite_iterator ()) + for (auto &_ : Glyph (dest_glyph, old_gid, extended).get_composite_iterator ()) { hb_codepoint_t new_gid; - if (plan->new_gid_for_old_gid (_.get_gid(), &new_gid)) - const_cast (_).set_gid (new_gid); + if (plan->new_gid_for_old_gid (_.get_gid (extended), &new_gid)) + const_cast (_).set_gid (new_gid, extended); } #ifndef HB_NO_BEYOND_64K - auto it = Glyph (dest_glyph).get_composite_iterator (); - if (it) + if (extended) { - /* lower GID24 to GID16 in components if possible. */ - char *p = it ? (char *) &*it : nullptr; - char *q = p; - const char *end = dest_glyph.arrayZ + dest_glyph.length; - while (it) + auto it = Glyph (dest_glyph, old_gid, extended).get_composite_iterator (); + if (it) { - auto &rec = const_cast (*it); - ++it; - - q += rec.get_size (); - - rec.lower_gid_24_to_16 (); - - unsigned size = rec.get_size (); - - memmove (p, &rec, size); - - p += size; + /* lower GID24 to GID16 in components if possible. */ + char *p = it ? (char *) &*it : nullptr; + char *q = p; + const char *end = dest_glyph.arrayZ + dest_glyph.length; + while (it) + { + auto &rec = const_cast (*it); + ++it; + + q += rec.get_size (extended); + + rec.lower_gid_24_to_16 (); + + unsigned size = rec.get_size (extended); + + memmove (p, &rec, size); + + p += size; + } + memmove (p, q, end - q); + p += end - q; + + /* We want to shorten the glyph, but we can't do that without + * updating the length in the loca table, which is already + * written out :-(. So we just fill the rest of the glyph with + * harmless instructions, since that's what they will be + * interpreted as. + * + * Should move the lowering to _populate_subset_glyphs() to + * fix this issue. */ + + hb_memset (p, 0x7A /* TrueType instruction ROFF; harmless */, end - p); + p += end - p; + dest_glyph = hb_bytes_t (dest_glyph.arrayZ, p - (char *) dest_glyph.arrayZ); + + // TODO: Padding; & trim serialized bytes. + // TODO: Update length in loca. Ugh. } - memmove (p, q, end - q); - p += end - q; - - /* We want to shorten the glyph, but we can't do that without - * updating the length in the loca table, which is already - * written out :-(. So we just fill the rest of the glyph with - * harmless instructions, since that's what they will be - * interpreted as. - * - * Should move the lowering to _populate_subset_glyphs() to - * fix this issue. */ - - hb_memset (p, 0x7A /* TrueType instruction ROFF; harmless */, end - p); - p += end - p; - dest_glyph = hb_bytes_t (dest_glyph.arrayZ, p - (char *) dest_glyph.arrayZ); - - // TODO: Padding; & trim serialized bytes. - // TODO: Update length in loca. Ugh. } #endif if (plan->flags & HB_SUBSET_FLAGS_NO_HINTING) - Glyph (dest_glyph).drop_hints (); + Glyph (dest_glyph, old_gid, extended).drop_hints (); if (plan->flags & HB_SUBSET_FLAGS_SET_OVERLAPS_FLAG) - Glyph (dest_glyph).set_overlaps_flag (); + Glyph (dest_glyph, old_gid, extended).set_overlaps_flag (); return_trace (true); } diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/composite-iter.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/composite-iter.hh index 21e6b4ee9622..e6e74630b8da 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/composite-iter.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/composite-iter.hh @@ -14,13 +14,13 @@ struct composite_iter_tmpl : hb_iter_with_fallback_t { typedef const CompositeGlyphRecord *__item_t__; - composite_iter_tmpl (hb_bytes_t glyph_, __item_t__ current_) : - glyph (glyph_), current (nullptr), current_size (0) + composite_iter_tmpl (hb_bytes_t glyph_, __item_t__ current_, bool extended_) : + glyph (glyph_), current (nullptr), current_size (0), extended (extended_) { set_current (current_); } - composite_iter_tmpl () : glyph (hb_bytes_t ()), current (nullptr), current_size (0) {} + composite_iter_tmpl () : glyph (hb_bytes_t ()), current (nullptr), current_size (0), extended (false) {} const CompositeGlyphRecord & __item__ () const { return *current; } bool __more__ () const { return current; } @@ -43,7 +43,7 @@ struct composite_iter_tmpl : hb_iter_with_fallback_tget_size (); + unsigned size = current_->get_size (extended); if (!glyph.check_range (current_, size)) { current = nullptr; @@ -59,6 +59,7 @@ struct composite_iter_tmpl : hb_iter_with_fallback_tplan->num_output_glyphs () + 1; unsigned entry_size = use_short_loca ? 2 : 4; - char *loca_prime_data = (char *) hb_malloc (entry_size * num_offsets); + char *loca_prime_data = (char *) hb_malloc2 (num_offsets, entry_size); if (unlikely (!loca_prime_data)) return false; @@ -112,7 +113,7 @@ _add_loca_and_head (hb_subset_context_t *c, loca_prime_data, hb_free); - bool result = c->plan->add_table (HB_OT_TAG_loca, loca_blob) + bool result = c->plan->add_table (extended ? HB_OT_TAG_LOCA : HB_OT_TAG_loca, loca_blob) && _add_head_and_set_loca_version (c->plan, use_short_loca); hb_blob_destroy (loca_blob); diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh index 9f5f267f96af..0957f30a260b 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh @@ -3,6 +3,7 @@ #include "../../hb-open-type.hh" +#include "../../hb-depend-data.hh" #include "../../hb-ot-head-table.hh" #include "../../hb-ot-hmtx-table.hh" #include "../../hb-ot-var-gvar-table.hh" @@ -24,6 +25,7 @@ namespace OT { * https://docs.microsoft.com/en-us/typography/opentype/spec/glyf */ #define HB_OT_TAG_glyf HB_TAG('g','l','y','f') +#define HB_OT_TAG_GLYF HB_TAG('G','L','Y','F') struct glyf { @@ -37,6 +39,20 @@ struct glyf return head.indexToLocFormat <= 1 && head.glyphDataFormat <= 1; } + static bool has_extended_glyf (hb_face_t *face) + { +#ifndef HB_NO_BEYOND_64K + hb_blob_ptr_t GLYF_table = hb_sanitize_context_t ().reference_table (face, HB_OT_TAG_GLYF); + hb_blob_ptr_t LOCA_table = hb_sanitize_context_t ().reference_table (face, HB_OT_TAG_LOCA); + bool ret = GLYF_table.get_length () && LOCA_table.get_length (); + GLYF_table.destroy (); + LOCA_table.destroy (); + return ret; +#else + return false; +#endif + } + bool sanitize (hb_sanitize_context_t *c HB_UNUSED) const { TRACE_SANITIZE (this); @@ -78,6 +94,12 @@ struct glyf { TRACE_SUBSET (this); + bool extended = has_extended_glyf (c->plan->source); +#ifndef HB_NO_BEYOND_64K + if (extended != (c->table_tag == HB_OT_TAG_GLYF)) + return_trace (false); +#endif + if (!has_valid_glyf_format (c->plan->source)) { // glyf format is unknown don't attempt to subset it. DEBUG_MSG (SUBSET, nullptr, @@ -95,11 +117,17 @@ struct glyf hb_vector_t padded_offsets; if (unlikely (!padded_offsets.alloc_exact (c->plan->new_to_old_gid_list.length))) + { + hb_font_destroy (font); return_trace (false); + } hb_vector_t glyphs; - if (!_populate_subset_glyphs (c->plan, font, glyphs)) + /* SubsetGlyphs borrow bytes from this blob until they are serialized. */ + hb_blob_t *source_glyf = nullptr; + if (!_populate_subset_glyphs (c->plan, font, glyphs, &source_glyf)) { + hb_blob_destroy (source_glyf); hb_font_destroy (font); return_trace (false); } @@ -130,10 +158,12 @@ struct glyf bool result = glyf_prime->serialize (c->serializer, hb_iter (glyphs), use_short_loca, c->plan); if (c->plan->normalized_coords && !c->plan->pinned_at_default) _free_compiled_subset_glyphs (glyphs); + hb_blob_destroy (source_glyf); if (unlikely (!c->serializer->check_success (glyf_impl::_add_loca_and_head (c, padded_offsets.iter (), - use_short_loca)))) + use_short_loca, + extended)))) return_trace (false); return result; @@ -142,7 +172,8 @@ struct glyf bool _populate_subset_glyphs (const hb_subset_plan_t *plan, hb_font_t *font, - hb_vector_t& glyphs /* OUT */) const; + hb_vector_t& glyphs /* OUT */, + hb_blob_t **source_glyf /* OUT */) const; hb_font_t * _create_font_for_instancing (const hb_subset_plan_t *plan) const; @@ -162,19 +193,24 @@ struct glyf * defining it _MIN instead. */ }; +#ifndef HB_NO_BEYOND_64K +struct GLYF : glyf +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_GLYF; +}; +#endif + struct glyf_accelerator_t { glyf_accelerator_t (hb_face_t *face) { + extended = false; short_offset = false; num_glyphs = 0; loca_table = nullptr; glyf_table = nullptr; #ifndef HB_NO_VAR gvar = nullptr; -#ifndef HB_NO_BEYOND_64K - GVAR = nullptr; -#endif #endif hmtx = nullptr; #ifndef HB_NO_VERTICAL @@ -186,13 +222,28 @@ struct glyf_accelerator_t return; short_offset = 0 == head.indexToLocFormat; - loca_table = face->table.loca.get_blob (); // Needs no destruct! - glyf_table = hb_sanitize_context_t ().reference_table (face); -#ifndef HB_NO_VAR - gvar = face->table.gvar; #ifndef HB_NO_BEYOND_64K - GVAR = face->table.GVAR; + hb_blob_ptr_t GLYF_table = hb_sanitize_context_t ().reference_table (face, HB_OT_TAG_GLYF); + hb_blob_ptr_t LOCA_table = hb_sanitize_context_t ().reference_table (face, HB_OT_TAG_LOCA); + extended = GLYF_table.get_length () && LOCA_table.get_length (); + if (extended) + { + glyf_table = std::move (GLYF_table); + loca_table = std::move (LOCA_table); + } + else + { + GLYF_table.destroy (); + LOCA_table.destroy (); + } #endif + if (!extended) + { + glyf_table = hb_sanitize_context_t ().reference_table (face); + loca_table = hb_sanitize_context_t ().reference_table (face); + } +#ifndef HB_NO_VAR + gvar = face->table.gvar; #endif hmtx = face->table.hmtx; #ifndef HB_NO_VERTICAL @@ -212,24 +263,46 @@ struct glyf_accelerator_t } glyf_table.destroy (); + loca_table.destroy (); } bool has_data () const { return num_glyphs; } + bool is_extended () const { return extended; } + + void depend (hb_depend_data_builder_t *builder) const + { + if (!has_data ()) return; + for (hb_codepoint_t gid = 0; gid < get_num_glyphs (); gid++) + { + auto glyph = glyph_for_gid (gid); + for (auto &item : glyph.get_composite_iterator ()) + builder->add_depend (gid, + extended ? HB_OT_TAG_GLYF : HB_OT_TAG_glyf, + item.get_gid (extended)); + } + } protected: template bool get_points (hb_font_t *font, hb_codepoint_t gid, T consumer, hb_array_t coords, hb_glyf_scratch_t &scratch, - hb_scalar_cache_t *gvar_cache = nullptr) const + hb_scalar_cache_t *gvar_cache = nullptr, + int64_t *budget = nullptr) const { if (gid >= num_glyphs) return false; + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + auto &all_points = scratch.all_points; all_points.clear (); bool phantom_only = !consumer.is_consuming_contour_points (); - if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords, gvar_cache))) + if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords, gvar_cache, 0, nullptr, budget))) + return false; + + if (unlikely (!hb_budget_spend (*budget, HB_BUDGET_1, all_points.length))) return false; unsigned count = all_points.length; @@ -281,12 +354,25 @@ struct glyf_accelerator_t unsigned end = i; - // Enough to start from the end. Our path-builder takes care of the rest. - if (likely (end < count)) // Can only fail in case of alloc failure *maybe*. + unsigned limit = end; +#ifndef HB_NO_CUBIC_GLYF + /* Rotating by one control point changes cubic pairing. Preserve + * the original order when the contour starts and ends off-curve + * with cubic controls, including all-off-curve contours. */ + if (likely (end < count) && + (points[start].flag & glyf_impl::SimpleGlyph::FLAG_CUBIC) && + (points[end].flag & (glyf_impl::SimpleGlyph::FLAG_ON_CURVE | + glyf_impl::SimpleGlyph::FLAG_CUBIC)) == + glyf_impl::SimpleGlyph::FLAG_CUBIC) + limit++; + else +#endif + if (likely (end < count)) consumer.consume_point (points[end]); - for (i = start; i < end; i++) + for (i = start; i < limit; i++) consumer.consume_point (points[i]); + i = end; consumer.contour_end (); } @@ -307,7 +393,6 @@ struct glyf_accelerator_t public: -#ifndef HB_NO_VAR struct points_aggregator_t { hb_font_t *font; @@ -340,10 +425,12 @@ struct glyf_accelerator_t return; } { - extents->x_bearing = roundf (min_x); - extents->width = roundf (max_x - extents->x_bearing); - extents->y_bearing = roundf (max_y); - extents->height = roundf (min_y - extents->y_bearing); + double x_bearing = (double) roundf (min_x); + double y_bearing = (double) roundf (max_y); + extents->x_bearing = hb_clamp_to (x_bearing); + extents->width = hb_clamp_to ((double) roundf (max_x) - x_bearing); + extents->y_bearing = hb_clamp_to (y_bearing); + extents->height = hb_clamp_to ((double) roundf (min_y) - y_bearing); if (scaled) font->scale_glyph_extents (extents); @@ -400,6 +487,7 @@ struct glyf_accelerator_t : phantoms[glyf_impl::PHANTOM_RIGHT].x - phantoms[glyf_impl::PHANTOM_LEFT].x; return hb_clamp (roundf (result), 0.f, (float) UINT_MAX / 2); } +#endif float get_v_origin_with_var_unscaled (hb_codepoint_t gid, @@ -423,8 +511,6 @@ struct glyf_accelerator_t return phantoms[glyf_impl::PHANTOM_TOP].y; } -#endif -#endif public: @@ -437,7 +523,8 @@ struct glyf_accelerator_t bool get_extents_at (hb_font_t *font, hb_codepoint_t gid, hb_glyph_extents_t *extents, - hb_array_t coords) const + hb_array_t coords, + int64_t *budget = nullptr) const { if (unlikely (gid >= num_glyphs)) return false; @@ -450,7 +537,9 @@ struct glyf_accelerator_t gid, points_aggregator_t (font, extents, nullptr, true), coords, - *scratch); + *scratch, + nullptr, + budget); release_scratch (scratch); return ret; } @@ -482,12 +571,14 @@ struct glyf_accelerator_t return glyf_impl::Glyph (); glyf_impl::Glyph glyph (hb_bytes_t ((const char *) this->glyf_table + start_offset, - end_offset - start_offset), gid); - return needs_padding_removal ? glyf_impl::Glyph (glyph.trim_padding (), gid) : glyph; + end_offset - start_offset), gid, extended); + return needs_padding_removal ? glyf_impl::Glyph (glyph.trim_padding (), gid, extended) : glyph; } bool - get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session, hb_scalar_cache_t *gvar_cache = nullptr) const + get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session, + hb_scalar_cache_t *gvar_cache = nullptr, + int64_t *budget = nullptr) const { if (!has_data ()) return false; @@ -498,7 +589,8 @@ struct glyf_accelerator_t hb_array (font->coords, font->has_nonzero_coords ? font->num_coords : 0), *scratch, - gvar_cache); + gvar_cache, + budget); release_scratch (scratch); @@ -509,13 +601,16 @@ struct glyf_accelerator_t get_path_at (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session, hb_array_t coords, hb_glyf_scratch_t &scratch, - hb_scalar_cache_t *gvar_cache = nullptr) const + hb_scalar_cache_t *gvar_cache = nullptr, + int64_t *budget = nullptr) const { if (!has_data ()) return false; - return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session), - coords, - scratch, - gvar_cache); + bool ret = get_points (font, gid, glyf_impl::path_builder_t (font, draw_session), + coords, + scratch, + gvar_cache, + budget); + return ret; } @@ -542,11 +637,12 @@ struct glyf_accelerator_t } } + unsigned int get_num_glyphs () const { return num_glyphs; } + hb_blob_t *reference_glyf_table () const + { return hb_blob_reference (glyf_table.get_blob ()); } + #ifndef HB_NO_VAR const gvar_accelerator_t *gvar; -#ifndef HB_NO_BEYOND_64K - const GVAR_accelerator_t *GVAR; -#endif #endif const hmtx_accelerator_t *hmtx; #ifndef HB_NO_VERTICAL @@ -554,6 +650,7 @@ struct glyf_accelerator_t #endif private: + bool extended; bool short_offset; unsigned int num_glyphs; hb_blob_ptr_t loca_table; @@ -565,10 +662,12 @@ struct glyf_accelerator_t inline bool glyf::_populate_subset_glyphs (const hb_subset_plan_t *plan, hb_font_t *font, - hb_vector_t& glyphs /* OUT */) const + hb_vector_t& glyphs /* OUT */, + hb_blob_t **source_glyf /* OUT */) const { OT::glyf_accelerator_t glyf (plan->source); if (!glyphs.alloc_exact (plan->new_to_old_gid_list.length)) return false; + *source_glyf = glyf.reference_glyf_table (); for (const auto &pair : plan->new_to_old_gid_list) { @@ -605,6 +704,13 @@ glyf::_populate_subset_glyphs (const hb_subset_plan_t *plan, } } } + /* All retained glyphs can be empty. Do not write the untouched bounds + * accumulator's inverted sentinels into the instance's head table. */ + if (font && plan->head_maxp_info.xMin > plan->head_maxp_info.xMax) + { + plan->head_maxp_info.xMin = plan->head_maxp_info.xMax = 0; + plan->head_maxp_info.yMin = plan->head_maxp_info.yMax = 0; + } return true; } @@ -614,6 +720,19 @@ glyf::_create_font_for_instancing (const hb_subset_plan_t *plan) const hb_font_t *font = hb_font_create (plan->source); if (unlikely (font == hb_font_get_empty ())) return nullptr; +#ifndef HB_NO_VAR + if (plan->has_avar2) + { + /* Under avar2, instancing applies only to the self-contained pins, + * whose constant final coordinates the plan holds in normalized_coords. + * Setting user-space variations would run the full avar2 mapping and + * bake contributions that remain live in the instance's variations. */ + hb_font_set_var_coords_normalized (font, plan->normalized_coords.arrayZ, + plan->normalized_coords.length); + return font; + } +#endif + hb_vector_t vars; if (unlikely (!vars.alloc (plan->user_axes_location.get_population (), true))) { diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/loca.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/loca.hh index 07966ea5919d..ee20aae52ef6 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/loca.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/loca.hh @@ -13,6 +13,7 @@ namespace OT { * https://docs.microsoft.com/en-us/typography/opentype/spec/loca */ #define HB_OT_TAG_loca HB_TAG('l','o','c','a') +#define HB_OT_TAG_LOCA HB_TAG('L','O','C','A') struct loca { diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh index f5495f923328..3414621fb03f 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh +++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh @@ -166,6 +166,15 @@ struct path_builder_t } else if (first_oncurve) draw_session->line_to (first_oncurve.x, first_oncurve.y); + else if (first_offcurve2) + { + /* A contour with just two cubic controls closes at their midpoint. */ + optional_point_t mid = first_offcurve2.mid (first_offcurve); + draw_session->move_to (mid.x, mid.y); + draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y, + first_offcurve.x, first_offcurve.y, + mid.x, mid.y); + } else if (first_offcurve) { float x = first_offcurve.x, y = first_offcurve.y; @@ -174,7 +183,7 @@ struct path_builder_t } /* Getting ready for the next contour */ - first_oncurve = first_offcurve = last_offcurve = last_offcurve2 = optional_point_t (); + first_oncurve = first_offcurve = first_offcurve2 = last_offcurve = last_offcurve2 = optional_point_t (); draw_session->close_path (); } diff --git a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh index df06e00e725b..19826ce4430a 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh @@ -26,107 +26,120 @@ #include "graph.hh" #include "../hb-ot-layout-common.hh" +#include "graph-result.hh" #ifndef GRAPH_CLASSDEF_GRAPH_HH #define GRAPH_CLASSDEF_GRAPH_HH namespace graph { -struct ClassDefFormat1 : public OT::ClassDefFormat1_3 +template +struct ClassDefFormat1_3 : public OT::ClassDefFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - constexpr unsigned min_size = OT::ClassDefFormat1_3::min_size; - if (vertex_len < min_size) return false; + size_t vertex_len = vertex.table_size(); + constexpr unsigned min_size = OT::ClassDefFormat1_3::min_size; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= min_size + classValue.get_size () - classValue.len.get_size (); + if (unlikely (vertex_len < min_size + this->classValue.get_size () - this->classValue.len.get_size ())) + return Err(SANITIZE_FAILURE); + return Ok(); } }; -struct ClassDefFormat2 : public OT::ClassDefFormat2_4 +template +struct ClassDefFormat2_4 : public OT::ClassDefFormat2_4 { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - constexpr unsigned min_size = OT::ClassDefFormat2_4::min_size; - if (vertex_len < min_size) return false; + size_t vertex_len = vertex.table_size(); + constexpr unsigned min_size = OT::ClassDefFormat2_4::min_size; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= min_size + rangeRecord.get_size () - rangeRecord.len.get_size (); + if (unlikely (vertex_len < min_size + this->rangeRecord.get_size () - this->rangeRecord.len.get_size ())) + return Err(SANITIZE_FAILURE); + return Ok(); } }; struct ClassDef : public OT::ClassDef { template - static bool add_class_def (gsubgpos_graph_context_t& c, - unsigned parent_id, - unsigned link_position, - It glyph_and_class, - unsigned max_size) + static graph_result_t add_class_def (gsubgpos_graph_context_t& c, + unsigned parent_id, + unsigned link_position, + It glyph_and_class, + unsigned max_size) { - unsigned class_def_prime_id = c.graph.new_node (nullptr, nullptr); + TRY_ASSIGN (unsigned class_def_prime_id, c.graph.new_node (nullptr, nullptr)); auto& class_def_prime_vertex = c.graph.vertices_[class_def_prime_id]; - if (!make_class_def (c, glyph_and_class, class_def_prime_id, max_size)) - return false; + TRY (make_class_def (c, glyph_and_class, class_def_prime_id, max_size)); - auto* class_def_link = c.graph.vertices_[parent_id].obj.real_links.push (); - class_def_link->width = SmallTypes::size; - class_def_link->objidx = class_def_prime_id; - class_def_link->position = link_position; - class_def_prime_vertex.add_parent (parent_id, false); + TRY(c.graph.vertices_[parent_id].add_real_link (SmallTypes::size, class_def_prime_id, link_position)); + TRY(class_def_prime_vertex.add_parent (parent_id, false)); - return true; + return Ok(); } template - static bool make_class_def (gsubgpos_graph_context_t& c, - It glyph_and_class, - unsigned dest_obj, - unsigned max_size) + static graph_result_t make_class_def (gsubgpos_graph_context_t& c, + It glyph_and_class, + unsigned dest_obj, + unsigned max_size) { char* buffer = (char*) hb_calloc (1, max_size); + if (unlikely (!buffer)) + return Err(ALLOCATION_FAILURE); + hb_serialize_context_t serializer (buffer, max_size); OT::ClassDef_serialize (&serializer, glyph_and_class); serializer.end_serialize (); - if (serializer.in_error ()) + if (unlikely (serializer.in_error ())) { hb_free (buffer); - return false; + return Err(ALLOCATION_FAILURE); } hb_bytes_t class_def_copy = serializer.copy_bytes (); - if (!class_def_copy.arrayZ) return false; + if (unlikely (!class_def_copy.arrayZ)) + { + hb_free (buffer); + return Err(ALLOCATION_FAILURE); + } + // Give ownership to the context, it will cleanup the buffer. - if (!c.add_buffer ((char *) class_def_copy.arrayZ)) + auto res = c.add_buffer ((char *) class_def_copy.arrayZ); + if (unlikely (!res.is_ok ())) { + hb_free (buffer); hb_free ((char *) class_def_copy.arrayZ); - return false; + return res; } - auto& obj = c.graph.vertices_[dest_obj].obj; - obj.head = (char *) class_def_copy.arrayZ; - obj.tail = obj.head + class_def_copy.length; + + auto& v = c.graph.vertices_[dest_obj]; + char* head = (char *) class_def_copy.arrayZ; + v.set_buffer (head, head + class_def_copy.length); hb_free (buffer); - return true; + return Ok(); } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < OT::ClassDef::min_size) return false; + size_t vertex_len = vertex.table_size(); + if (unlikely (vertex_len < OT::ClassDef::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); switch (u.format.v) { - case 1: return ((ClassDefFormat1*)this)->sanitize (vertex); - case 2: return ((ClassDefFormat2*)this)->sanitize (vertex); + case 1: return ((ClassDefFormat1_3*)this)->sanitize (vertex); + case 2: return ((ClassDefFormat2_4*)this)->sanitize (vertex); #ifndef HB_NO_BEYOND_64K - // Not currently supported - case 3: - case 4: + case 3: return ((ClassDefFormat1_3*)this)->sanitize (vertex); + case 4: return ((ClassDefFormat2_4*)this)->sanitize (vertex); #endif - default: return false; + default: return Err(SANITIZE_FAILURE); } } }; @@ -134,41 +147,34 @@ struct ClassDef : public OT::ClassDef struct class_def_size_estimator_t { - // TODO(garretrieger): update to support beyond64k coverage/classdef tables. - constexpr static unsigned class_def_format1_base_size = 6; - constexpr static unsigned class_def_format2_base_size = 4; - constexpr static unsigned coverage_base_size = 4; - constexpr static unsigned bytes_per_range = 6; - constexpr static unsigned bytes_per_glyph = 2; - template - class_def_size_estimator_t (It glyph_and_class) - : num_ranges_per_class (), glyphs_per_class () + static graph_result_t create (It glyph_and_class) { - reset(); + class_def_size_estimator_t estimator; + estimator.reset(); for (auto p : + glyph_and_class) { unsigned gid = p.first; unsigned klass = p.second; hb_set_t* glyphs; - if (glyphs_per_class.has (klass, &glyphs) && glyphs) { + if (estimator.glyphs_per_class.has (klass, &glyphs) && glyphs) { glyphs->add (gid); continue; } hb_set_t new_glyphs; new_glyphs.add (gid); - glyphs_per_class.set (klass, std::move (new_glyphs)); + estimator.glyphs_per_class.set (klass, std::move (new_glyphs)); } - if (in_error ()) return; + TRY(estimator.to_result ()); - for (unsigned klass : glyphs_per_class.keys ()) + for (unsigned klass : estimator.glyphs_per_class.keys ()) { if (!klass) continue; // class 0 doesn't get encoded. - const hb_set_t& glyphs = glyphs_per_class.get (klass); + const hb_set_t& glyphs = estimator.glyphs_per_class.get (klass); hb_codepoint_t start = HB_SET_VALUE_INVALID; hb_codepoint_t end = HB_SET_VALUE_INVALID; @@ -176,23 +182,26 @@ struct class_def_size_estimator_t while (glyphs.next_range (&start, &end)) count++; - num_ranges_per_class.set (klass, count); + estimator.num_ranges_per_class.set (klass, count); } + + TRY(estimator.to_result ()); + return estimator; } void reset() { - class_def_1_size = class_def_format1_base_size; - class_def_2_size = class_def_format2_base_size; included_glyphs.clear(); + included_class_def_glyphs.clear(); included_classes.clear(); + class_def_range_count = 0; + class_max = 0; + coverage_size_val = compute_coverage_size (); } - // Compute the size of coverage for all glyphs added via 'add_class_def_size'. + // Size of coverage for all glyphs added via 'add_class_def_size'. unsigned coverage_size () const { - unsigned format1_size = coverage_base_size + bytes_per_glyph * included_glyphs.get_population(); - unsigned format2_size = coverage_base_size + bytes_per_range * num_glyph_ranges(); - return hb_min(format1_size, format2_size); + return coverage_size_val; } // Compute the new size of the ClassDef table if all glyphs associated with 'klass' were added. @@ -201,54 +210,105 @@ struct class_def_size_estimator_t if (!included_classes.has(klass)) { hb_set_t* glyphs = nullptr; if (glyphs_per_class.has(klass, &glyphs)) { + unsigned num_glyphs = included_glyphs.get_population(); included_glyphs.union_(*glyphs); + if (klass) + included_class_def_glyphs.union_(*glyphs); + if (num_glyphs != included_glyphs.get_population()) + coverage_size_val = compute_coverage_size (); } - class_def_1_size = class_def_format1_base_size; - if (!included_glyphs.is_empty()) { - unsigned min_glyph = included_glyphs.get_min(); - unsigned max_glyph = included_glyphs.get_max(); - class_def_1_size += bytes_per_glyph * (max_glyph - min_glyph + 1); + if (klass) + { + class_def_range_count += num_ranges_per_class.get (klass); + if (glyphs && klass > class_max) + class_max = klass; } - - class_def_2_size += bytes_per_range * num_ranges_per_class.get (klass); - included_classes.add(klass); } - return hb_min (class_def_1_size, class_def_2_size); + return class_def_size (); } - unsigned num_glyph_ranges() const { + unsigned num_glyph_ranges (const hb_set_t &glyphs) const { hb_codepoint_t start = HB_SET_VALUE_INVALID; hb_codepoint_t end = HB_SET_VALUE_INVALID; unsigned count = 0; - while (included_glyphs.next_range (&start, &end)) { + while (glyphs.next_range (&start, &end)) { count++; } return count; } - bool in_error () + private: + graph_result_t to_result() const { - if (num_ranges_per_class.in_error ()) return true; - if (glyphs_per_class.in_error ()) return true; + TRY (graph_result_t::from (num_ranges_per_class, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (glyphs_per_class, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (included_classes, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (included_glyphs, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (included_class_def_glyphs, ALLOCATION_FAILURE)); for (const hb_set_t& s : glyphs_per_class.values ()) { - if (s.in_error ()) return true; + TRY (graph_result_t::from (s, ALLOCATION_FAILURE)); } - return false; + return Ok(); + } + + class_def_size_estimator_t () + : num_ranges_per_class (), glyphs_per_class () {} + + unsigned compute_coverage_size () const + { + unsigned glyph_size = glyph_id_size (included_glyphs); + unsigned coverage_base_size = OT::HBUINT16::static_size + glyph_size; + unsigned range_size = 3 * glyph_size; + unsigned format1_size = coverage_base_size + glyph_size * included_glyphs.get_population(); + unsigned format2_size = coverage_base_size + range_size * num_glyph_ranges (included_glyphs); + return hb_min(format1_size, format2_size); + } + + unsigned glyph_id_size (const hb_set_t &glyphs) const + { +#ifndef HB_NO_BEYOND_64K + if (!glyphs.is_empty () && glyphs.get_max () > 0xFFFFu) + return OT::Layout::MediumTypes::size; +#endif + return OT::Layout::SmallTypes::size; + } + + unsigned class_def_size () const + { + if (included_class_def_glyphs.is_empty ()) + return OT::HBUINT16::static_size + OT::Layout::SmallTypes::size; + + unsigned best_size = UINT_MAX; + hb_codepoint_t glyph_max = included_class_def_glyphs.get_max (); + unsigned glyph_span = glyph_max - included_class_def_glyphs.get_min () + 1; + + if (glyph_max <= 0xFFFFu && glyph_span <= 0xFFFFu && class_max <= 0xFFFFu) + best_size = hb_min (best_size, 6 + 2 * glyph_span); + if (glyph_max <= 0xFFFFu && class_def_range_count <= 0xFFFFu && class_max <= 0xFFFFu) + best_size = hb_min (best_size, 4 + 6 * class_def_range_count); +#ifndef HB_NO_BEYOND_64K + if (glyph_max <= 0xFFFFFFu && glyph_span <= 0xFFFFFFu && class_max <= 0xFFFFFFu) + best_size = hb_min (best_size, 8 + 3 * glyph_span); + if (glyph_max <= 0xFFFFFFu && class_def_range_count <= 0xFFFFFFu && class_max <= 0xFFFFu) + best_size = hb_min (best_size, 5 + 8 * class_def_range_count); +#endif + return best_size; } - private: hb_hashmap_t num_ranges_per_class; hb_hashmap_t glyphs_per_class; hb_set_t included_classes; hb_set_t included_glyphs; - unsigned class_def_1_size; - unsigned class_def_2_size; + hb_set_t included_class_def_glyphs; + unsigned class_def_range_count; + unsigned class_max; + unsigned coverage_size_val; }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh index 5778ee9e1d35..aad4af707c38 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh @@ -32,42 +32,49 @@ namespace graph { -static bool sanitize ( - const OT::Layout::Common::CoverageFormat1_3* thiz, - graph_t::vertex_t& vertex +template +static graph_result_t sanitize ( + const OT::Layout::Common::CoverageFormat1_3* thiz, + const graph_t::vertex_t& vertex ) { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3::min_size; - if (vertex_len < min_size) return false; + size_t vertex_len = vertex.table_size(); + constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3::min_size; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= min_size + thiz->glyphArray.get_size () - thiz->glyphArray.len.get_size (); + if (unlikely (vertex_len < min_size + thiz->glyphArray.get_size () - thiz->glyphArray.len.get_size ())) + return Err(SANITIZE_FAILURE); + return Ok(); } -static bool sanitize ( - const OT::Layout::Common::CoverageFormat2_4* thiz, - graph_t::vertex_t& vertex +template +static graph_result_t sanitize ( + const OT::Layout::Common::CoverageFormat2_4* thiz, + const graph_t::vertex_t& vertex ) { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4::min_size; - if (vertex_len < min_size) return false; + size_t vertex_len = vertex.table_size(); + constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4::min_size; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= min_size + thiz->rangeRecord.get_size () - thiz->rangeRecord.len.get_size (); + if (unlikely (vertex_len < min_size + thiz->rangeRecord.get_size () - thiz->rangeRecord.len.get_size ())) + return Err(SANITIZE_FAILURE); + return Ok(); } struct Coverage : public OT::Layout::Common::Coverage { - static Coverage* clone_coverage (gsubgpos_graph_context_t& c, - unsigned coverage_id, - unsigned new_parent_id, - unsigned link_position, - unsigned start, unsigned end) + static graph_result_t clone_coverage (gsubgpos_graph_context_t& c, + unsigned coverage_id, + unsigned new_parent_id, + unsigned link_position, + unsigned start, unsigned end) { unsigned coverage_size = c.graph.vertices_[coverage_id].table_size (); auto& coverage_v = c.graph.vertices_[coverage_id]; - Coverage* coverage_table = (Coverage*) coverage_v.obj.head; - if (!coverage_table || !coverage_table->sanitize (coverage_v)) - return nullptr; + const Coverage* coverage_table = (const Coverage*) coverage_v.obj().head; + if (unlikely (!coverage_table)) + return Err(INVALID_ARGUMENT); + TRY (coverage_table->sanitize (coverage_v)); auto new_coverage = + hb_zip (coverage_table->iter (), hb_range ()) @@ -81,35 +88,32 @@ struct Coverage : public OT::Layout::Common::Coverage } template - static Coverage* add_coverage (gsubgpos_graph_context_t& c, - unsigned parent_id, - unsigned link_position, - It glyphs, - unsigned max_size) + static graph_result_t add_coverage (gsubgpos_graph_context_t& c, + unsigned parent_id, + unsigned link_position, + It glyphs, + unsigned max_size) { - unsigned coverage_prime_id = c.graph.new_node (nullptr, nullptr); + TRY_ASSIGN (unsigned coverage_prime_id, c.graph.new_node (nullptr, nullptr)); auto& coverage_prime_vertex = c.graph.vertices_[coverage_prime_id]; - if (!make_coverage (c, glyphs, coverage_prime_id, max_size)) - return nullptr; + TRY (make_coverage (c, glyphs, coverage_prime_id, max_size)); - auto* coverage_link = c.graph.vertices_[parent_id].obj.real_links.push (); - coverage_link->width = SmallTypes::size; - coverage_link->objidx = coverage_prime_id; - coverage_link->position = link_position; - coverage_prime_vertex.add_parent (parent_id, false); + TRY(c.graph.vertices_[parent_id].add_real_link (SmallTypes::size, coverage_prime_id, link_position)); + TRY(coverage_prime_vertex.add_parent (parent_id, false)); - return (Coverage*) coverage_prime_vertex.obj.head; + return Ok(); } // Filter an existing coverage table to glyphs at indices [start, end) and replace it with the filtered version. - static bool filter_coverage (gsubgpos_graph_context_t& c, - unsigned existing_coverage, - unsigned start, unsigned end) { + static graph_result_t filter_coverage (gsubgpos_graph_context_t& c, + unsigned existing_coverage, + unsigned start, unsigned end) { unsigned coverage_size = c.graph.vertices_[existing_coverage].table_size (); auto& coverage_v = c.graph.vertices_[existing_coverage]; - Coverage* coverage_table = (Coverage*) coverage_v.obj.head; - if (!coverage_table || !coverage_table->sanitize (coverage_v)) - return false; + const Coverage* coverage_table = (const Coverage*) coverage_v.obj().head; + if (unlikely (!coverage_table)) + return Err(INVALID_ARGUMENT); + TRY (coverage_table->sanitize (coverage_v)); auto new_coverage = + hb_zip (coverage_table->iter (), hb_range ()) @@ -124,53 +128,61 @@ struct Coverage : public OT::Layout::Common::Coverage // Replace the coverage table at dest obj with one covering 'glyphs'. template - static bool make_coverage (gsubgpos_graph_context_t& c, - It glyphs, - unsigned dest_obj, - unsigned max_size) + static graph_result_t make_coverage (gsubgpos_graph_context_t& c, + It glyphs, + unsigned dest_obj, + unsigned max_size) { char* buffer = (char*) hb_calloc (1, max_size); + if (unlikely (!buffer)) + return Err(ALLOCATION_FAILURE); + hb_serialize_context_t serializer (buffer, max_size); OT::Layout::Common::Coverage_serialize (&serializer, glyphs); serializer.end_serialize (); - if (serializer.in_error ()) + if (unlikely (serializer.in_error ())) { hb_free (buffer); - return false; + return Err(ALLOCATION_FAILURE); } hb_bytes_t coverage_copy = serializer.copy_bytes (); - if (!coverage_copy.arrayZ) return false; + if (unlikely (!coverage_copy.arrayZ)) { + hb_free (buffer); + return Err(ALLOCATION_FAILURE); + } + // Give ownership to the context, it will cleanup the buffer. - if (!c.add_buffer ((char *) coverage_copy.arrayZ)) + auto res = c.add_buffer ((char *) coverage_copy.arrayZ); + if (unlikely (!res.is_ok ())) { + hb_free (buffer); hb_free ((char *) coverage_copy.arrayZ); - return false; + return res; } - auto& obj = c.graph.vertices_[dest_obj].obj; - obj.head = (char *) coverage_copy.arrayZ; - obj.tail = obj.head + coverage_copy.length; + auto& v = c.graph.vertices_[dest_obj]; + char* head = (char *) coverage_copy.arrayZ; + v.set_buffer (head, head + coverage_copy.length); hb_free (buffer); - return true; + return Ok(); } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < OT::Layout::Common::Coverage::min_size) return false; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < OT::Layout::Common::Coverage::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); switch (u.format.v) { case 1: return graph::sanitize ((const OT::Layout::Common::CoverageFormat1_3*) this, vertex); case 2: return graph::sanitize ((const OT::Layout::Common::CoverageFormat2_4*) this, vertex); #ifndef HB_NO_BEYOND_64K - // Not currently supported - case 3: - case 4: + case 3: return graph::sanitize ((const OT::Layout::Common::CoverageFormat1_3*) this, vertex); + case 4: return graph::sanitize ((const OT::Layout::Common::CoverageFormat2_4*) this, vertex); #endif - default: return false; + default: return Err(SANITIZE_FAILURE); } } }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh index 9ca7434ca197..94e74ec52703 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh @@ -27,10 +27,13 @@ #include "../hb-set.hh" #include "../hb-priority-queue.hh" #include "../hb-serialize.hh" +#include "graph-result.hh" #ifndef GRAPH_GRAPH_HH #define GRAPH_GRAPH_HH +#define HB_GRAPH_INVALID ((unsigned) -1) + namespace graph { /** @@ -39,32 +42,119 @@ namespace graph { */ struct graph_t { + // TODO(garretrieger): experiment with using scratch vector for visited sets instead of allocating + // a new hb_set_t each time. + struct vertex_t { - hb_serialize_context_t::object_t obj; + // TODO(garretrieger): have vertex_t gaurantee that head/tail are non null and head < tail + // so downstream users don't need to constantly check that. + + // TODO(garretrieger): have vertex_t gaurantee that all link indexes are valid (ie < vertices_.length) + // so downstream users don't need to constantly check that. + + // TODO(garretrieger): track where the real links are currently sorted, and automatically sort + // prior to accessing iterator for real links. Avoids needing to manually trigger sorting by + // downstream users. + int64_t distance = 0 ; unsigned space = 0 ; unsigned start = 0; unsigned end = 0; unsigned priority = 0; + private: + hb_serialize_context_t::object_t obj_; unsigned incoming_edges_ = 0; - unsigned single_parent = (unsigned) -1; + unsigned single_parent = HB_GRAPH_INVALID; bool has_incoming_virtual_edges_ = false; hb_hashmap_t parents; + hb_set_t virtual_parents; public: + vertex_t () + {} + + explicit vertex_t(const hb_serialize_context_t::object_t& obj) : obj_(obj) + {} + auto parents_iter () const HB_AUTO_RETURN ( hb_concat ( - hb_iter (&single_parent, single_parent != (unsigned) -1), + hb_iter (&single_parent, single_parent != HB_GRAPH_INVALID), parents.keys_ref () ) ) - bool in_error () const + void set_buffer (char* head, char* tail) { + obj_.head = head; + obj_.tail = tail; + } + + void shrink_buffer (size_t count) + { + obj_.tail -= count; + } + + auto all_links_writer () HB_AUTO_RETURN (( obj_.all_links_writer() )); + auto real_links_writer () HB_AUTO_RETURN (( obj_.real_links.writer() )); + auto virtual_links_writer () HB_AUTO_RETURN (( obj_.virtual_links.writer() )); + + void sort_real_links () { + obj_.real_links.qsort (); + } + + graph_result_t add_real_link (unsigned width, unsigned obj_idx, unsigned position) { + auto* link = obj_.real_links.push (); + TRY (graph_result_t::from (obj_.real_links, ALLOCATION_FAILURE)); + link->width = width; + link->objidx = obj_idx; + link->position = position; + return Ok(); + } + + graph_result_t add_virtual_link (unsigned obj_idx) { + auto* link = obj_.virtual_links.push (); + TRY (graph_result_t::from (obj_.virtual_links, ALLOCATION_FAILURE)); + link->objidx = obj_idx; + return Ok(); + } + + graph_result_t add_real_link (const hb_serialize_context_t::object_t::link_t& link) + { + obj_.real_links.push (link); + return graph_result_t::from (obj_.real_links, ALLOCATION_FAILURE); + } + + graph_result_t set_real_links (hb_vector_t&& links) + { + TRY(graph_result_t::from (links, ALLOCATION_FAILURE)); + obj_.real_links = links; + return Ok(); + } + + void clear_real_links () + { + obj_.real_links.reset(); + } + + void clear_virtual_links () + { + obj_.virtual_links.reset(); + } + + graph_result_t add_virtual_link (const hb_serialize_context_t::object_t::link_t& link) + { + obj_.virtual_links.push (link); + return graph_result_t::from (obj_.virtual_links, ALLOCATION_FAILURE); + } + + const hb_serialize_context_t::object_t& obj() const { return obj_; } + + template + T as () const { - return parents.in_error (); + return reinterpret_cast (obj_.head); } bool has_incoming_virtual_edges () const @@ -72,17 +162,17 @@ struct graph_t return has_incoming_virtual_edges_; } - bool link_positions_valid (unsigned num_objects, bool removed_nil) + graph_result_t link_positions_valid (unsigned num_objects, bool removed_nil) { hb_set_t assigned_bytes; - for (const auto& l : obj.real_links) + for (const auto& l : obj_.real_links) { - if (l.objidx >= num_objects - || (removed_nil && !l.objidx)) + if (unlikely (l.objidx >= num_objects + || (removed_nil && !l.objidx))) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Invalid object index."); - return false; + return Err(INVALID_ARGUMENT); } unsigned start = l.position; @@ -92,37 +182,37 @@ struct graph_t { DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Invalid link width."); - return false; + return Err(INVALID_ARGUMENT); } if (unlikely (end >= table_size ())) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Link position is out of bounds."); - return false; + return Err(OUT_OF_BOUNDS); } if (unlikely (assigned_bytes.intersects (start, end))) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Found offsets whose positions overlap."); - return false; + return Err(INVALID_ARGUMENT); } assigned_bytes.add_range (start, end); } - return !assigned_bytes.in_error (); + return graph_result_t::from (assigned_bytes, ALLOCATION_FAILURE); } void normalize () { - obj.real_links.qsort (); - for (auto& l : obj.real_links) + obj_.real_links.qsort (); + for (const auto& l : obj_.real_links) { for (unsigned i = 0; i < l.width; i++) { - obj.head[l.position + i] = 0; + obj_.head[l.position + i] = 0; } } } @@ -156,21 +246,22 @@ struct graph_t return false; } - return links_equal (obj.real_links, other.obj.real_links, graph, other_graph, depth); + return links_equal (obj_.real_links, other.obj_.real_links, graph, other_graph, depth); } hb_bytes_t as_bytes () const { - return hb_bytes_t (obj.head, table_size ()); + return hb_bytes_t (obj_.head, table_size ()); } friend void swap (vertex_t& a, vertex_t& b) { - hb_swap (a.obj, b.obj); + hb_swap (a.obj_, b.obj_); hb_swap (a.distance, b.distance); hb_swap (a.space, b.space); hb_swap (a.single_parent, b.single_parent); hb_swap (a.parents, b.parents); + hb_swap (a.virtual_parents, b.virtual_parents); hb_swap (a.incoming_edges_, b.incoming_edges_); hb_swap (a.has_incoming_virtual_edges_, b.has_incoming_virtual_edges_); hb_swap (a.start, b.start); @@ -178,36 +269,36 @@ struct graph_t hb_swap (a.priority, b.priority); } - hb_hashmap_t + graph_result_t> position_to_index_map () const { hb_hashmap_t result; - result.alloc (obj.real_links.length); - for (const auto& l : obj.real_links) { + result.alloc (obj_.real_links.length); + for (const auto& l : obj_.real_links) { result.set (l.position, l.objidx); } - return result; + return graph_result_t>::from (std::move(result), ALLOCATION_FAILURE); } bool is_shared () const { - return parents.get_population () > 1; + return parents.get_population () > virtual_parents.get_population () + 1; } unsigned incoming_edges () const { if (HB_DEBUG_SUBSET_REPACK) { - assert (incoming_edges_ == (single_parent != (unsigned) -1) + + assert (incoming_edges_ == (single_parent != HB_GRAPH_INVALID) + (parents.values_ref () | hb_reduce (hb_add, 0))); } return incoming_edges_; } unsigned incoming_edges_from_parent (unsigned parent_index) const { - if (single_parent != (unsigned) -1) { + if (single_parent != HB_GRAPH_INVALID) { return single_parent == parent_index ? 1 : 0; } @@ -219,27 +310,30 @@ struct graph_t { incoming_edges_ = 0; has_incoming_virtual_edges_ = false; - single_parent = (unsigned) -1; + single_parent = HB_GRAPH_INVALID; parents.reset (); + virtual_parents.reset (); } - void add_parent (unsigned parent_index, bool is_virtual) + graph_result_t add_parent (unsigned parent_index, bool is_virtual) { - assert (parent_index != (unsigned) -1); + assert (parent_index != HB_GRAPH_INVALID); has_incoming_virtual_edges_ |= is_virtual; + if (is_virtual) + virtual_parents.add (parent_index); if (incoming_edges_ == 0) { single_parent = parent_index; incoming_edges_ = 1; - return; + return to_result(); } - else if (single_parent != (unsigned) -1) + else if (single_parent != HB_GRAPH_INVALID) { assert (incoming_edges_ == 1); if (!parents.set (single_parent, 1)) - return; - single_parent = (unsigned) -1; + return to_result (); + single_parent = HB_GRAPH_INVALID; } unsigned *v; @@ -250,14 +344,17 @@ struct graph_t } else if (parents.set (parent_index, 1)) incoming_edges_++; + + return to_result(); } void remove_parent (unsigned parent_index) { if (parent_index == single_parent) { - single_parent = (unsigned) -1; + single_parent = HB_GRAPH_INVALID; incoming_edges_--; + virtual_parents.reset (); return; } @@ -268,7 +365,10 @@ struct graph_t if (*v > 1) (*v)--; else + { parents.del (parent_index); + virtual_parents.del (parent_index); + } if (incoming_edges_ == 1) { @@ -278,55 +378,41 @@ struct graph_t } } - void remove_real_link (unsigned child_index, const void* offset) + void remove_real_link_unordered (unsigned link_array_index) { + obj_.real_links.remove_unordered (link_array_index); + } + + void remove_real_link_unordered (unsigned child_index, const void* offset) { - unsigned count = obj.real_links.length; + unsigned count = obj_.real_links.length; for (unsigned i = 0; i < count; i++) { - auto& link = obj.real_links.arrayZ[i]; + auto& link = obj_.real_links.arrayZ[i]; if (link.objidx != child_index) continue; - if ((obj.head + link.position) != offset) + if ((obj_.head + link.position) != offset) continue; - obj.real_links.remove_unordered (i); + obj_.real_links.remove_unordered (i); return; } } - bool remap_parents (const hb_vector_t& id_map) - { - if (single_parent != (unsigned) -1) - { - assert (single_parent < id_map.length); - single_parent = id_map[single_parent]; - return true; - } - - hb_hashmap_t new_parents; - new_parents.alloc (parents.get_population ()); - for (auto _ : parents) - { - assert (_.first < id_map.length); - assert (!new_parents.has (id_map[_.first])); - new_parents.set (id_map[_.first], _.second); - } - - if (parents.in_error() || new_parents.in_error ()) - return false; - - parents = std::move (new_parents); - return true; - } - - void remap_parent (unsigned old_index, unsigned new_index) + graph_result_t remap_parent (unsigned old_index, unsigned new_index) { - if (single_parent != (unsigned) -1) + if (single_parent != HB_GRAPH_INVALID) { if (single_parent == old_index) + { single_parent = new_index; - return; + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } + } + return graph_result_t::from(virtual_parents, ALLOCATION_FAILURE); } const unsigned *pv; @@ -343,11 +429,19 @@ struct graph_t parents.reset (); } } + + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } + + return graph_result_t::from(virtual_parents, ALLOCATION_FAILURE); } bool is_leaf () const { - return !obj.real_links.length && !obj.virtual_links.length; + return !obj_.real_links.length && !obj_.virtual_links.length; } bool raise_priority () @@ -372,7 +466,7 @@ struct graph_t } size_t table_size () const { - return obj.tail - obj.head; + return obj_.tail - obj_.head; } int64_t modified_distance (unsigned order) const @@ -382,7 +476,8 @@ struct graph_t // it's parent where possible. int64_t modified_distance = - hb_clamp (distance + distance_modifier (), (int64_t) 0, 0x7FFFFFFFFFF); + hb_clamp (distance + distance_modifier (), (int64_t) 0, + hb_int_max (int64_t) >> 18); if (has_max_priority ()) { modified_distance = 0; } @@ -392,7 +487,7 @@ struct graph_t int64_t distance_modifier () const { if (!priority) return 0; - int64_t table_size = obj.tail - obj.head; + int64_t table_size = obj_.tail - obj_.head; if (priority == 1) return -table_size / 2; @@ -401,6 +496,14 @@ struct graph_t } private: + graph_result_t to_result() const { + if (unlikely ( + parents.in_error() || virtual_parents.in_error() || + obj_.real_links.in_error() || obj_.virtual_links.in_error())) + return Err(ALLOCATION_FAILURE); + return Ok(); + } + bool links_equal (const hb_vector_t& this_links, const hb_vector_t& other_links, const graph_t& graph, @@ -437,19 +540,27 @@ struct graph_t } }; - template + enum vertex_mutability_t + { + Immutable, + Mutable + }; + + template struct vertex_and_table_t { vertex_and_table_t () : index (0), vertex (nullptr), table (nullptr) {} + template + vertex_and_table_t (const vertex_and_table_t& o) + : index (o.index), vertex (o.vertex), table (o.table) + {} + unsigned index; - vertex_t* vertex; - T* table; + typename std::conditional::type vertex; + typename std::conditional::type table; - operator bool () { - return table && vertex; - } }; /* @@ -460,20 +571,29 @@ struct graph_t * serializer */ template - graph_t (const T& objects) - : parents_invalid (true), - distance_invalid (true), - positions_invalid (true), - successful (true), - buffers () + static graph_result_t create (const T& objects) { - num_roots_for_space_.push (1); + if (unlikely (objects.length > HB_REPACKER_MAX_VERTICES)) + { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "constructing graph: num of objects %u exceeds HB_REPACKER_MAX_VERTICES.", + objects.length); + return Err(LIMIT_EXCEEDED); + } + + graph_t g; + g.num_roots_for_space_.push (1); + TRY (graph_result_t::from (g.num_roots_for_space_, ALLOCATION_FAILURE)); + bool removed_nil = false; - vertices_.alloc (objects.length); - ordering_.resize (objects.length); - ordering_scratch_.alloc (objects.length); + const unsigned count = objects.length; + g.vertices_.alloc (count); + g.ordering_.resize (count); + g.ordering_scratch_.alloc (count); + TRY (graph_result_t::from (g.vertices_, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (g.ordering_, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (g.ordering_scratch_, ALLOCATION_FAILURE)); - unsigned count = objects.length; unsigned order = objects.length; unsigned skip = 0; for (unsigned i = 0; i < count; i++) @@ -484,37 +604,57 @@ struct graph_t { removed_nil = true; order--; - ordering_.resize(objects.length - 1); + g.ordering_.resize (count - 1); skip++; continue; } - vertex_t* v = vertices_.push (); - if (check_success (!vertices_.in_error ())) - v->obj = *objects.arrayZ[i]; + hb_serialize_context_t::object_t obj (*objects.arrayZ[i]); + if (unlikely (obj.in_error ())) { + return Err(ALLOCATION_FAILURE); + } + vertex_t* v = g.vertices_.push (std::move (obj)); - check_success (v->link_positions_valid (count, removed_nil)); + TRY (v->link_positions_valid (count, removed_nil)); // To start we set the ordering to match the provided objects // list. Note: objects are provided to us in reverse order (ie. // the last object is the root). unsigned obj_idx = i - skip; - ordering_[--order] = obj_idx; + g.ordering_[--order] = obj_idx; if (!removed_nil) continue; // Fix indices to account for removed nil object. - for (auto& l : v->obj.all_links_writer ()) { + for (auto& l : v->all_links_writer ()) { l.objidx--; } } + + auto r = g.is_fully_connected(); + if (r.is_err() && r.error() == ORPHANED_NODES) { + g.print_orphaned_nodes (); + } + TRY(r); + + return Ok (std::move (g)); } + graph_t (const graph_t&) = delete; + graph_t& operator = (const graph_t&) = delete; + graph_t (graph_t&&) = default; + graph_t& operator = (graph_t&&) = default; + ~graph_t () { for (char* b : buffers) hb_free (b); } +private: + graph_t () = default; + +public: + bool operator== (const graph_t& other) const { return root ().equals (root_idx(), other.root_idx(), other.root (), *this, other, 0); @@ -525,10 +665,10 @@ struct graph_t { const auto& v = vertices_[id]; printf("%u: %u [", id, (unsigned int)v.table_size()); - for (const auto &l : v.obj.real_links) { + for (const auto &l : v.obj().real_links) { printf("%u, ", l.objidx); } - for (const auto &l : v.obj.virtual_links) { + for (const auto &l : v.obj().virtual_links) { printf("v%u, ", l.objidx); } printf("]\n"); @@ -542,14 +682,6 @@ struct graph_t v.normalize (); } - bool in_error () const - { - return !successful || - vertices_.in_error () || - ordering_.in_error() || - num_roots_for_space_.in_error (); - } - const vertex_t& root () const { return vertices_[root_idx ()]; @@ -565,39 +697,38 @@ struct graph_t const hb_serialize_context_t::object_t& object (unsigned i) const { - return vertices_[i].obj; + return vertices_[i].obj(); } - bool add_buffer (char* buffer) + graph_result_t add_buffer (char* buffer) { buffers.push (buffer); - return !buffers.in_error (); + return graph_result_t::from (buffers, ALLOCATION_FAILURE); } /* * Adds a 16 bit link from parent_id to child_id */ template - void add_link (T* offset, - unsigned parent_id, - unsigned child_id) + graph_result_t add_link (T* offset, + unsigned parent_id, + unsigned child_id) { + if (unlikely (parent_id >= vertices_.length || child_id >= vertices_.length)) + return Err(OUT_OF_BOUNDS); auto& v = vertices_[parent_id]; - auto* link = v.obj.real_links.push (); - link->width = 2; - link->objidx = child_id; - link->position = (char*) offset - (char*) v.obj.head; - vertices_[child_id].add_parent (parent_id, false); + TRY(v.add_real_link(2, child_id, (char*) offset - (char*) v.obj().head)); + return vertices_[child_id].add_parent (parent_id, false); } /* * Generates a new topological sorting of graph ordered by the shortest * distance to each node if positions are marked as invalid. */ - void sort_shortest_distance_if_needed () + graph_result_t sort_shortest_distance_if_needed () { - if (!positions_invalid) return; - sort_shortest_distance (); + if (!positions_invalid) return Ok(); + return sort_shortest_distance (); } @@ -605,25 +736,30 @@ struct graph_t * Generates a new topological sorting of graph ordered by the shortest * distance to each node. */ - void sort_shortest_distance () + graph_result_t sort_shortest_distance () { positions_invalid = true; if (vertices_.length <= 1) { // Graph of 1 or less doesn't need sorting. - return; + return Ok(); } - update_distances (); + TRY (update_distances ()); hb_priority_queue_t queue; queue.alloc (vertices_.length); + TRY (graph_result_t::from (queue, ALLOCATION_FAILURE)); + hb_vector_t &new_ordering = ordering_scratch_; - if (unlikely (!check_success (new_ordering.resize (vertices_.length)))) return; + new_ordering.resize (vertices_.length); + TRY (graph_result_t::from (new_ordering, ALLOCATION_FAILURE)); hb_vector_t removed_edges; - if (unlikely (!check_success (removed_edges.resize (vertices_.length)))) return; - update_parents (); + removed_edges.resize (vertices_.length); + TRY (graph_result_t::from (removed_edges, ALLOCATION_FAILURE)); + + TRY (update_parents ()); queue.insert (root ().modified_distance (0), root_idx ()); unsigned order = 1; @@ -632,16 +768,18 @@ struct graph_t { unsigned next_id = queue.pop_minimum().second; - if (unlikely (!check_success(pos < new_ordering.length))) { + if (unlikely (pos >= new_ordering.length)) { // We are out of ids. Which means we've visited a node more than once. // This graph contains a cycle which is not allowed. DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Contains cycle."); - return; + return Err(CYCLE_DETECTED); } new_ordering[pos++] = next_id; const vertex_t& next = vertices_[next_id]; - for (const auto& link : next.obj.all_links ()) { + for (const auto& link : next.obj().all_links ()) { + if (unlikely (link.objidx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); removed_edges[link.objidx]++; const auto& v = vertices_[link.objidx]; if (!(v.incoming_edges () - removed_edges[link.objidx])) @@ -655,14 +793,17 @@ struct graph_t } } - check_success (!queue.in_error ()); - check_success (!new_ordering.in_error ()); + TRY (graph_result_t::from (queue, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (new_ordering, ALLOCATION_FAILURE)); hb_swap (ordering_, new_ordering); - if (!check_success (pos == vertices_.length)) { + if (unlikely (pos != vertices_.length)) { print_orphaned_nodes (); + return Err(ORPHANED_NODES); } + + return Ok(); } /* @@ -670,7 +811,7 @@ struct graph_t * More specifically this looks for the top most 24 bit or 32 bit links in the graph. * Some special casing is done that is specific to the layout of GSUB/GPOS tables. */ - void find_space_roots (hb_set_t& visited, hb_set_t& roots) + graph_result_t find_space_roots (hb_set_t& visited, hb_set_t& roots) { unsigned root_index = root_idx (); for (unsigned i : ordering_) @@ -678,7 +819,7 @@ struct graph_t if (visited.has (i)) continue; // Only real links can form 32 bit spaces - for (auto& l : vertices_[i].obj.real_links) + for (const auto& l : vertices_[i].obj().real_links) { if (l.is_signed || l.width < 3) continue; @@ -688,66 +829,71 @@ struct graph_t // pointer to the lookup list. continue; - if (l.width == 3) + if (l.width >= 3) { - // A 24bit offset forms a root, unless there is 32bit offsets somewhere - // in it's subgraph, then those become the roots instead. This is to make sure - // that extension subtables beneath a 24bit lookup become the spaces instead - // of the offset to the lookup. + // A wide offset forms a root, unless there are 32-bit offsets somewhere + // in its subgraph, then those become the roots instead. This is to make sure + // that extension subtables beneath a 24-bit lookup and lookups beneath a + // 32-bit lookup list become the spaces instead of their enclosing lists. hb_set_t sub_roots; - find_32bit_roots (l.objidx, sub_roots); + TRY (find_32bit_roots (l.objidx, sub_roots)); if (sub_roots) { for (unsigned sub_root_idx : sub_roots) { roots.add (sub_root_idx); - find_subgraph (sub_root_idx, visited); + TRY (find_subgraph (sub_root_idx, visited)); } continue; } } roots.add (l.objidx); - find_subgraph (l.objidx, visited); + TRY (find_subgraph (l.objidx, visited)); } } + + TRY(graph_result_t::from (visited, ALLOCATION_FAILURE)); + TRY(graph_result_t::from (roots, ALLOCATION_FAILURE)); + return Ok(); } template - vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) + graph_result_t> as_table (unsigned parent, const void* offset, Ts... ds) { - return as_table_from_index (index_for_offset (parent, offset), std::forward(ds)...); + TRY_ASSIGN (unsigned idx, index_for_offset (parent, offset)); + return as_table_from_index (idx, std::forward(ds)...); } template - vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) + graph_result_t> as_mutable_table (unsigned parent, const void* offset, Ts... ds) { - return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); + TRY_ASSIGN (auto idx, mutable_index_for_offset (parent, offset)); + return as_table_from_index (idx, std::forward(ds)...); } - template - vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) + template + graph_result_t> as_table_from_index (unsigned index, Ts... ds) { - if (index >= vertices_.length) - return vertex_and_table_t (); + if (unlikely (index >= vertices_.length)) + return Err(OUT_OF_BOUNDS); - vertex_and_table_t r; - r.vertex = &vertices_[index]; - r.table = (T*) r.vertex->obj.head; + vertex_and_table_t r; + r.vertex = (typename std::conditional::type) &vertices_[index]; + r.table = r.vertex->template as::type> (); r.index = index; - if (!r.table) - return vertex_and_table_t (); - - if (!r.table->sanitize (*(r.vertex), std::forward(ds)...)) - return vertex_and_table_t (); + if (unlikely (!r.table)) + return Err(INVALID_ARGUMENT); + TRY(r.table->sanitize (*(r.vertex), std::forward(ds)...)); return r; } // Finds the object id of the object pointed to by the offset at 'offset' // within object[node_idx]. - unsigned index_for_offset (unsigned node_idx, const void* offset) const + graph_result_t index_for_offset (unsigned node_idx, const void* offset) const { + if (unlikely (node_idx >= vertices_.length)) return Err(OUT_OF_BOUNDS); const auto& node = object (node_idx); - if (offset < node.head || offset >= node.tail) return -1; + if (unlikely (offset < node.head || offset >= node.tail)) return Err(OUT_OF_BOUNDS); unsigned count = node.real_links.length; for (unsigned i = 0; i < count; i++) @@ -756,28 +902,31 @@ struct graph_t const auto& link = node.real_links.arrayZ[i]; if (offset != node.head + link.position) continue; - return link.objidx; + return Ok(link.objidx); } - return -1; + return Err(INVALID_ARGUMENT); } // Finds the object id of the object pointed to by the offset at 'offset' // within object[node_idx]. Ensures that the returned object is safe to mutate. // That is, if the original child object is shared by parents other than node_idx // it will be duplicated and the duplicate will be returned instead. - unsigned mutable_index_for_offset (unsigned node_idx, const void* offset) + graph_result_t mutable_index_for_offset (unsigned node_idx, const void* offset) { - unsigned child_idx = index_for_offset (node_idx, offset); + TRY_ASSIGN (unsigned child_idx, index_for_offset (node_idx, offset)); + if (unlikely (child_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + auto& child = vertices_[child_idx]; for (unsigned p : child.parents_iter ()) { if (p != node_idx) { - return duplicate (node_idx, child_idx); + return duplicate (node_idx, child_idx, true); } } - return child_idx; + return Ok(child_idx); } @@ -786,40 +935,55 @@ struct graph_t * Currently, this is implemented specifically tailored to the structure of a GPOS/GSUB * (including with 24bit offsets) table. */ - bool assign_spaces () + graph_result_t assign_spaces () { - update_parents (); + TRY (update_parents ()); + + for (auto& vertex : vertices_.writer ()) + { + vertex.space = 0; + vertex.priority = 0; + } + num_roots_for_space_.resize (1); + TRY (graph_result_t::from (num_roots_for_space_, ALLOCATION_FAILURE)); + num_roots_for_space_[0] = 1; + distance_invalid = true; + positions_invalid = true; hb_set_t visited; hb_set_t roots; - find_space_roots (visited, roots); + TRY (find_space_roots (visited, roots)); // Mark everything not in the subgraphs of the roots as visited. This prevents // subgraphs from being connected via nodes not in those subgraphs. visited.invert (); - if (!roots) return false; + if (!roots) return Ok(false); while (roots) { uint32_t next = HB_SET_VALUE_INVALID; - if (unlikely (!check_success (!roots.in_error ()))) break; + TRY (graph_result_t::from (roots, ALLOCATION_FAILURE)); if (!roots.next (&next)) break; hb_set_t connected_roots; - find_connected_nodes (next, roots, visited, connected_roots); - if (unlikely (!check_success (!connected_roots.in_error ()))) break; + TRY (find_connected_nodes (next, roots, visited, connected_roots)); + TRY (graph_result_t::from (connected_roots, ALLOCATION_FAILURE)); - isolate_subgraph (connected_roots); - if (unlikely (!check_success (!connected_roots.in_error ()))) break; + TRY (isolate_subgraph (connected_roots)); + TRY (graph_result_t::from (connected_roots, ALLOCATION_FAILURE)); unsigned next_space = this->next_space (); - if (next_space >= HB_REPACKER_MAX_SPACES) + if (unlikely (next_space >= HB_REPACKER_MAX_SPACES)) { - check_success (false); - break; + DEBUG_MSG (SUBSET_REPACK, nullptr, + "num of spaces %u exceeds HB_REPACKER_MAX_SPACES.", + next_space); + return Err(LIMIT_EXCEEDED); } num_roots_for_space_.push (0); + TRY(graph_result_t::from (num_roots_for_space_, ALLOCATION_FAILURE)); + for (unsigned root : connected_roots) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Subgraph %u gets space %u", root, next_space); @@ -833,9 +997,7 @@ struct graph_t // into the 32 bit space as needed, instead of using isolation. } - - - return true; + return Ok(true); } /* @@ -845,9 +1007,9 @@ struct graph_t * * Indices stored in roots will be updated if any of the roots are duplicated to new indices. */ - bool isolate_subgraph (hb_set_t& roots) + graph_result_t isolate_subgraph (hb_set_t& roots) { - update_parents (); + TRY(update_parents ()); hb_map_t subgraph; // incoming edges to root_idx should be all 32 bit in length so we don't need to de-dup these @@ -855,11 +1017,15 @@ struct graph_t hb_set_t parents; for (unsigned root_idx : roots) { + if (unlikely (root_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); subgraph.set (root_idx, wide_parents (root_idx, parents)); - find_subgraph (root_idx, subgraph); } - if (subgraph.in_error ()) - return false; + for (unsigned root_idx : roots) + { + TRY (find_subgraph (root_idx, subgraph)); + } + TRY (graph_result_t::from (subgraph, ALLOCATION_FAILURE)); hb_map_t index_map; bool made_changes = false; @@ -873,15 +1039,14 @@ struct graph_t { // Only de-dup objects with incoming links from outside the subgraph. made_changes = true; - duplicate_subgraph (entry.first, index_map); + TRY (duplicate_subgraph (entry.first, index_map)); } } - if (in_error ()) - return false; + TRY (graph_result_t::from (index_map, ALLOCATION_FAILURE)); if (!made_changes) - return false; + return Ok(false); auto new_subgraph = + subgraph.keys () @@ -892,8 +1057,8 @@ struct graph_t }) ; - remap_obj_indices (index_map, new_subgraph); - remap_obj_indices (index_map, parents.iter (), true); + TRY(remap_obj_indices (index_map, new_subgraph)); + TRY(remap_obj_indices (index_map, parents.iter (), true)); // Update roots set with new indices as needed. for (auto next : roots) @@ -906,61 +1071,160 @@ struct graph_t } } - return true; + return Ok(true); } - void find_subgraph (unsigned node_idx, hb_map_t& subgraph) + // BFS graph traversal starting at start_idx. + // + // The visit_edge function will be called once for the root node and then for each traversed edge + // with the following signature: + // + // bool VisitEdgeFunc(unsigned parent, const link_t* link, unsigned child, unsigned depth) + // + // Where a return value of false signals that traversal should not continue into child's outgoing + // edges. parent/child are the vertex indices. depth starts at 0 for the root node. + // link will be null when called for entering the root node at the start of the traversal. + // + // This traversal does not use a visited set internally, it is the responsibility of visit_edge + // to track and filter visited nodes if required for the particular traversal. + template + graph_result_t traverse_directed_bfs (unsigned start_idx, VisitEdgeFunc&& visit_edge) { - for (const auto& link : vertices_[node_idx].obj.all_links ()) + if (unlikely (start_idx >= vertices_.length)) + { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "traverse_directed_bfs: unexpected start_idx out of bounds."); + return Err(OUT_OF_BOUNDS); + } + + // For performance we want to avoid allocating extra memory. So use the ordering_scratch_ + // buffer to implement a queue for BFS. + ordering_scratch_.resize (vertices_.length); + TRY (graph_result_t::from (ordering_scratch_, ALLOCATION_FAILURE)); + + if (!visit_edge (HB_CODEPOINT_INVALID, nullptr, start_idx, 0)) + return Ok(); + + unsigned head = 0; + unsigned tail = 0; + auto& queue = ordering_scratch_; + queue[tail++] = start_idx; + + unsigned depth = 0; + while (head < tail) { - hb_codepoint_t *v; - if (subgraph.has (link.objidx, &v)) + unsigned level_end = tail; + while (head < level_end) { - (*v)++; - continue; + unsigned node_idx = queue[head++]; + const auto& v = vertices_[node_idx]; + + unsigned num_real = v.obj().real_links.length; + unsigned total_links = num_real + v.obj().virtual_links.length; + + for (unsigned i = 0; i < total_links; i++) + { + // vertices_ may have re-alloc'd inside an op() call, so reassign the v ref. + const auto& v = vertices_[node_idx]; + const auto& link = (i < num_real) + ? v.obj().real_links[i] + : v.obj().virtual_links[i - num_real]; + unsigned child_idx = link.objidx; + + if (!visit_edge (node_idx, &link, child_idx, depth + 1)) + continue; + + if (unlikely (tail >= queue.length)) + return Err(CYCLE_DETECTED); + + queue[tail++] = child_idx; + } } - subgraph.set (link.objidx, 1); - find_subgraph (link.objidx, subgraph); + depth++; } + return Ok(); } - void find_subgraph (unsigned node_idx, hb_set_t& subgraph) + graph_result_t find_subgraph (unsigned node_idx, hb_map_t& subgraph) { - if (subgraph.has (node_idx)) return; - subgraph.add (node_idx); - for (const auto& link : vertices_[node_idx].obj.all_links ()) - find_subgraph (link.objidx, subgraph); + return traverse_directed_bfs (node_idx, [&] ( + unsigned parent, + const hb_serialize_context_t::object_t::link_t* link, + unsigned child, + unsigned depth) { + if (depth == 0) return true; + hb_codepoint_t *count; + if (subgraph.has (child, &count)) + { + (*count)++; + return false; + } + subgraph.set (child, 1); + return true; + }); } - size_t find_subgraph_size (unsigned node_idx, hb_set_t& subgraph, unsigned max_depth = -1) + graph_result_t find_subgraph (unsigned node_idx, hb_set_t& subgraph) { - if (subgraph.has (node_idx)) return 0; - subgraph.add (node_idx); - - const auto& o = vertices_[node_idx].obj; - size_t size = o.tail - o.head; - if (max_depth == 0) - return size; + return traverse_directed_bfs (node_idx, [&] ( + unsigned parent, + const hb_serialize_context_t::object_t::link_t* link, + unsigned child, + unsigned depth) { + if (subgraph.has (child)) return false; + subgraph.add (child); + return true; + }); + } - for (const auto& link : o.all_links ()) - size += find_subgraph_size (link.objidx, subgraph, max_depth - 1); - return size; + graph_result_t find_subgraph_size (unsigned node_idx, hb_set_t& subgraph, unsigned max_depth = HB_GRAPH_INVALID) + { + size_t size = 0; + TRY (traverse_directed_bfs (node_idx, [&] ( + unsigned parent, + const hb_serialize_context_t::object_t::link_t* link, + unsigned child, + unsigned depth) { + if (subgraph.has (child)) return false; + subgraph.add (child); + + const auto& o = vertices_[child].obj(); + size += o.tail - o.head; + return depth < max_depth; + })); + return Ok(size); } /* * Finds the topmost children of 32bit offsets in the subgraph starting * at node_idx. Found indices are placed into 'found'. */ - void find_32bit_roots (unsigned node_idx, hb_set_t& found) + graph_result_t find_32bit_roots (unsigned node_idx, hb_set_t& found) { - for (const auto& link : vertices_[node_idx].obj.all_links ()) - { - if (!link.is_signed && link.width == 4) { - found.add (link.objidx); - continue; + // Note: this specifically requires a BFS based traversal to ensure we don't recurse through + // a node that is accessible via both 32bit and non-32 bit links. + hb_set_t visited; + return traverse_directed_bfs (node_idx, [&] ( + unsigned parent, + const hb_serialize_context_t::object_t::link_t* link, + unsigned child, + unsigned _) { + + if (link && found.has(parent)) + // Don't traverse from something that's already marked as a root. + return false; + + if (link && !link->is_signed && link->width == 4) + { + found.add (link->objidx); + visited.add (link->objidx); + return false; } - find_32bit_roots (link.objidx, found); - } + + if (visited.has (child)) return false; + visited.add (child); + return true; + }); } /* @@ -970,32 +1234,35 @@ struct graph_t * Returns the id of the child node that was moved. */ template - unsigned move_child (unsigned old_parent_idx, - const O* old_offset, - unsigned new_parent_idx, - const O* new_offset) + graph_result_t move_child (unsigned old_parent_idx, + const O* old_offset, + unsigned new_parent_idx, + const O* new_offset) { distance_invalid = true; positions_invalid = true; + if (unlikely (old_parent_idx >= vertices_.length || + new_parent_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + auto& old_v = vertices_[old_parent_idx]; auto& new_v = vertices_[new_parent_idx]; - unsigned child_id = index_for_offset (old_parent_idx, - old_offset); + TRY_ASSIGN (unsigned child_id, index_for_offset (old_parent_idx, + old_offset)); + if (unlikely (child_id >= vertices_.length)) + return Err(OUT_OF_BOUNDS); - auto* new_link = new_v.obj.real_links.push (); - new_link->width = O::static_size; - new_link->objidx = child_id; - new_link->position = (const char*) new_offset - (const char*) new_v.obj.head; + TRY(new_v.add_real_link(O::static_size, child_id, (const char*) new_offset - (const char*) new_v.obj().head)); auto& child = vertices_[child_id]; - child.add_parent (new_parent_idx, false); + TRY(child.add_parent (new_parent_idx, false)); - old_v.remove_real_link (child_id, old_offset); + old_v.remove_real_link_unordered (child_id, old_offset); child.remove_parent (old_parent_idx); - return child_id; + return Ok(child_id); } /* @@ -1005,12 +1272,16 @@ struct graph_t * parent starting at new_pos_start. */ template - void move_children (unsigned old_parent_idx, - unsigned old_pos_start, - unsigned old_pos_end, - unsigned new_parent_idx, - unsigned new_pos_start) + graph_result_t move_children (unsigned old_parent_idx, + unsigned old_pos_start, + unsigned old_pos_end, + unsigned new_parent_idx, + unsigned new_pos_start) { + if (unlikely (old_parent_idx >= vertices_.length || + new_parent_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + distance_invalid = true; positions_invalid = true; @@ -1018,28 +1289,29 @@ struct graph_t auto& new_v = vertices_[new_parent_idx]; hb_vector_t old_links; - for (const auto& l : old_v.obj.real_links) + for (const auto& l : old_v.obj().real_links) { if (l.position < old_pos_start || l.position >= old_pos_end) { - old_links.push(l); + old_links.push (l); continue; } unsigned array_pos = l.position - old_pos_start; unsigned child_id = l.objidx; - auto* new_link = new_v.obj.real_links.push (); - new_link->width = O::static_size; - new_link->objidx = child_id; - new_link->position = new_pos_start + array_pos; + if (unlikely (child_id >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + + TRY(new_v.add_real_link(O::static_size, child_id, new_pos_start + array_pos)); auto& child = vertices_[child_id]; - child.add_parent (new_parent_idx, false); + TRY(child.add_parent (new_parent_idx, false)); child.remove_parent (old_parent_idx); } - old_v.obj.real_links = std::move (old_links); + TRY (graph_result_t::from (old_links, ALLOCATION_FAILURE)); + return old_v.set_real_links(std::move (old_links)); } /* @@ -1047,65 +1319,92 @@ struct graph_t * links. index_map is updated with mappings from old id to new id. If a duplication has already * been performed for a given index, then it will be skipped. */ - void duplicate_subgraph (unsigned node_idx, hb_map_t& index_map) + graph_result_t duplicate_subgraph (unsigned node_idx, hb_map_t& index_map) { - if (index_map.has (node_idx)) - return; - - unsigned clone_idx = duplicate (node_idx); - if (!check_success (clone_idx != (unsigned) -1)) - return; + graph_result_t result = Ok(); + TRY (traverse_directed_bfs (node_idx, [&] ( + unsigned parent, + const hb_serialize_context_t::object_t::link_t* link, + unsigned child, + unsigned _) { + if (result.is_err () || index_map.has (child)) return false; + auto r = duplicate (child); + if (unlikely (r.is_err ())) + { + result = Err(r.error ()); + return false; + } + index_map.set (child, *r); + return true; + })); - index_map.set (node_idx, clone_idx); - for (const auto& l : object (node_idx).all_links ()) { - duplicate_subgraph (l.objidx, index_map); - } + return graph_result_t::from(index_map, ALLOCATION_FAILURE); } /* * Creates a copy of node_idx and returns it's new index. */ - unsigned duplicate (unsigned node_idx) + graph_result_t duplicate (unsigned node_idx, bool copy_table = false) { - if (vertices_.length >= HB_REPACKER_MAX_VERTICES) + if (unlikely (node_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + + if (unlikely (vertices_.length >= HB_REPACKER_MAX_VERTICES)) { - check_success (false); - return -1; + DEBUG_MSG (SUBSET_REPACK, nullptr, + "duplicating node: num of vertices %u exceeds HB_REPACKER_MAX_VERTICES.", + vertices_.length); + return Err(LIMIT_EXCEEDED); } positions_invalid = true; distance_invalid = true; auto* clone = vertices_.push (); + TRY (graph_result_t::from (vertices_, ALLOCATION_FAILURE)); + unsigned clone_idx = vertices_.length - 1; - ordering_.push(clone_idx); + ordering_.push (clone_idx); + TRY (graph_result_t::from (ordering_, ALLOCATION_FAILURE)); auto& child = vertices_[node_idx]; - if (vertices_.in_error () || ordering_.in_error()) { - return -1; - } - clone->obj.head = child.obj.head; - clone->obj.tail = child.obj.tail; + unsigned table_size = child.obj().tail - child.obj().head; + if (copy_table && table_size) + { + char* buffer = (char*) hb_malloc (table_size); + if (unlikely (!buffer)) + return Err(ALLOCATION_FAILURE); + auto res = add_buffer (buffer); + if (unlikely (res.is_err ())) + { + hb_free (buffer); + return Err(res.error ()); + } + hb_memcpy (buffer, child.obj().head, table_size); + clone->set_buffer(buffer, buffer + table_size); + } + else + { + clone->set_buffer(child.obj().head, child.obj().tail); + } clone->distance = child.distance; clone->space = child.space; clone->reset_parents (); - for (const auto& l : child.obj.real_links) + for (const auto& l : child.obj().real_links) { - clone->obj.real_links.push (l); - vertices_[l.objidx].add_parent (clone_idx, false); + TRY(clone->add_real_link (l)); + TRY(vertices_[l.objidx].add_parent (clone_idx, false)); } - for (const auto& l : child.obj.virtual_links) + + for (const auto& l : child.obj().virtual_links) { - clone->obj.virtual_links.push (l); - vertices_[l.objidx].add_parent (clone_idx, true); + TRY(clone->add_virtual_link (l)); + TRY(vertices_[l.objidx].add_parent (clone_idx, true)); } - check_success (!clone->obj.real_links.in_error ()); - check_success (!clone->obj.virtual_links.in_error ()); - - return clone_idx; + return Ok(clone_idx); } /* @@ -1116,16 +1415,19 @@ struct graph_t * Returns the index of the newly created duplicate. * * If the child_idx only has incoming edges from parent_idx, - * duplication isn't possible and this will return -1. + * duplication isn't possible and this will return an error. */ - unsigned duplicate (unsigned parent_idx, unsigned child_idx) + graph_result_t duplicate (unsigned parent_idx, unsigned child_idx, bool copy_table = false) { - update_parents (); + if (unlikely (parent_idx >= vertices_.length || child_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + + TRY (update_parents ()); const auto& child = vertices_[child_idx]; - unsigned links_to_child = child.incoming_edges_from_parent(parent_idx); + unsigned links_to_child = child.incoming_edges_from_parent (parent_idx); - if (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges()) + if (unlikely (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges ())) { // Can't duplicate this node, doing so would orphan the original one as all remaining links // to child are from parent. @@ -1136,30 +1438,29 @@ struct graph_t // to by virtual edges). DEBUG_MSG (SUBSET_REPACK, nullptr, " Not duplicating %u => %u", parent_idx, child_idx); - return -1; + return Err(INVALID_ARGUMENT); } DEBUG_MSG (SUBSET_REPACK, nullptr, " Duplicating %u => %u", parent_idx, child_idx); - unsigned clone_idx = duplicate (child_idx); - if (clone_idx == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned clone_idx, duplicate (child_idx, copy_table)); // duplicate shifts the root node idx, so if parent_idx was root update it. if (parent_idx == clone_idx) parent_idx++; auto& parent = vertices_[parent_idx]; unsigned count = 0; - unsigned num_real = parent.obj.real_links.length; - for (auto& l : parent.obj.all_links_writer ()) + unsigned num_real = parent.obj().real_links.length; + for (auto& l : parent.all_links_writer ()) { count++; if (l.objidx != child_idx) continue; - reassign_link (l, parent_idx, clone_idx, count > num_real); + TRY(reassign_link (l, parent_idx, clone_idx, count > num_real)); } - return clone_idx; + return Ok(clone_idx); } /* @@ -1171,25 +1472,29 @@ struct graph_t * * If the child_idx only has incoming edges from parents, * duplication isn't possible or duplication fails and this will - * return -1. + * return an error. */ - unsigned duplicate (const hb_set_t* parents, unsigned child_idx) + graph_result_t duplicate (const hb_set_t* parents, unsigned child_idx) { - if (parents->is_empty()) { - return -1; - } + if (unlikely (!parents || parents->is_empty ())) + return Err(INVALID_ARGUMENT); - update_parents (); + if (unlikely (child_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + + TRY (update_parents ()); const auto& child = vertices_[child_idx]; unsigned links_to_child = 0; - unsigned last_parent = parents->get_max(); - unsigned first_parent = parents->get_min(); + unsigned last_parent = parents->get_max (); + unsigned first_parent = parents->get_min (); for (unsigned parent_idx : *parents) { - links_to_child += child.incoming_edges_from_parent(parent_idx); + if (unlikely (parent_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + links_to_child += child.incoming_edges_from_parent (parent_idx); } - if (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges()) + if (unlikely (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges ())) { // Can't duplicate this node, doing so would orphan the original one as all remaining links // to child are from parent. @@ -1199,62 +1504,61 @@ struct graph_t // with virtual edges may end up orphaned by duplication (ie. where one copy is only pointed // to by virtual edges). DEBUG_MSG (SUBSET_REPACK, nullptr, " Not duplicating %u, ..., %u => %u", first_parent, last_parent, child_idx); - return -1; + return Err(INVALID_ARGUMENT); } DEBUG_MSG (SUBSET_REPACK, nullptr, " Duplicating %u, ..., %u => %u", first_parent, last_parent, child_idx); - unsigned clone_idx = duplicate (child_idx); - if (clone_idx == (unsigned) -1) return false; + TRY_ASSIGN (unsigned clone_idx, duplicate (child_idx)); for (unsigned parent_idx : *parents) { // duplicate shifts the root node idx, so if parent_idx was root update it. if (parent_idx == clone_idx) parent_idx++; auto& parent = vertices_[parent_idx]; unsigned count = 0; - unsigned num_real = parent.obj.real_links.length; - for (auto& l : parent.obj.all_links_writer ()) + unsigned num_real = parent.obj().real_links.length; + for (auto& l : parent.all_links_writer ()) { count++; if (l.objidx != child_idx) continue; - reassign_link (l, parent_idx, clone_idx, count > num_real); + TRY(reassign_link (l, parent_idx, clone_idx, count > num_real)); } } - return clone_idx; + return Ok(clone_idx); } /* * Adds a new node to the graph, not connected to anything. */ - unsigned new_node (char* head, char* tail) + graph_result_t new_node (char* head, char* tail) { - if (vertices_.length >= HB_REPACKER_MAX_VERTICES) + if (unlikely (vertices_.length >= HB_REPACKER_MAX_VERTICES)) { - check_success (false); - return -1; + DEBUG_MSG (SUBSET_REPACK, nullptr, + "creating new node: num of vertices %u exceeds HB_REPACKER_MAX_VERTICES.", + vertices_.length); + return Err(LIMIT_EXCEEDED); } positions_invalid = true; distance_invalid = true; auto* clone = vertices_.push (); - unsigned clone_idx = vertices_.length - 1; - ordering_.push(clone_idx); + TRY (graph_result_t::from (vertices_, ALLOCATION_FAILURE)); - if (vertices_.in_error () || ordering_.in_error()) { - return -1; - } + unsigned clone_idx = vertices_.length - 1; + ordering_.push (clone_idx); + TRY (graph_result_t::from (ordering_, ALLOCATION_FAILURE)); - clone->obj.head = head; - clone->obj.tail = tail; + clone->set_buffer (head, tail); clone->distance = 0; clone->space = 0; - return clone_idx; + return Ok(clone_idx); } /* @@ -1263,59 +1567,61 @@ struct graph_t * Returns the index of the newly created child. * */ - unsigned remap_child (unsigned parent_idx, unsigned old_child_idx) + graph_result_t remap_child (unsigned parent_idx, unsigned old_child_idx) { - unsigned new_child_idx = duplicate (old_child_idx); - if (new_child_idx == (unsigned) -1) return -1; + if (unlikely (parent_idx >= vertices_.length || old_child_idx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + + TRY_ASSIGN (unsigned new_child_idx, duplicate (old_child_idx)); auto& parent = vertices_[parent_idx]; - for (auto& l : parent.obj.real_links) + for (auto& l : parent.real_links_writer ()) { if (l.objidx != old_child_idx) continue; - reassign_link (l, parent_idx, new_child_idx, false); + TRY(reassign_link (l, parent_idx, new_child_idx, false)); } - for (auto& l : parent.obj.virtual_links) + for (auto& l : parent.virtual_links_writer ()) { if (l.objidx != old_child_idx) continue; - reassign_link (l, parent_idx, new_child_idx, true); + TRY(reassign_link (l, parent_idx, new_child_idx, true)); } - return new_child_idx; + return Ok(new_child_idx); } /* * Raises the sorting priority of all children. */ - bool raise_childrens_priority (unsigned parent_idx) + graph_result_t raise_childrens_priority (unsigned parent_idx) { DEBUG_MSG (SUBSET_REPACK, nullptr, " Raising priority of all children of %u", parent_idx); // This operation doesn't change ordering until a sort is run, so no need // to invalidate positions. It does not change graph structure so no need // to update distances or edge counts. - auto& parent = vertices_[parent_idx].obj; + if (unlikely (parent_idx >= vertices_.length)) return Err(OUT_OF_BOUNDS); bool made_change = false; - for (auto& l : parent.all_links_writer ()) + for (auto& l : vertices_[parent_idx].all_links_writer ()) made_change |= vertices_[l.objidx].raise_priority (); - return made_change; + return Ok(made_change); } - bool is_fully_connected () + graph_result_t is_fully_connected () { - update_parents(); + TRY(update_parents()); - if (root().incoming_edges ()) + if (unlikely (root().incoming_edges ())) // Root cannot have parents. - return false; + return Err(ORPHANED_NODES); for (unsigned i = 0; i < root_idx (); i++) { - if (!vertices_[i].incoming_edges ()) - return false; + if (unlikely (!vertices_[i].incoming_edges ())) + return Err(ORPHANED_NODES); } - return true; + return Ok(); } #if 0 @@ -1368,27 +1674,6 @@ struct graph_t } #endif - void print_orphaned_nodes () - { - if (!DEBUG_ENABLED(SUBSET_REPACK)) return; - - DEBUG_MSG (SUBSET_REPACK, nullptr, "Graph is not fully connected."); - - parents_invalid = true; - update_parents(); - - if (root().incoming_edges ()) { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Root node has incoming edges."); - } - - for (unsigned i = 0; i < root_idx (); i++) - { - const auto& v = vertices_[i]; - if (!v.incoming_edges ()) - DEBUG_MSG (SUBSET_REPACK, nullptr, "Node %u is orphaned.", i); - } - } - unsigned num_roots_for_space (unsigned space) const { return num_roots_for_space_[space]; @@ -1399,17 +1684,22 @@ struct graph_t return num_roots_for_space_.length; } - void move_to_new_space (const hb_set_t& indices) + graph_result_t move_to_new_space (const hb_set_t& indices) { - if (num_roots_for_space_.length >= HB_REPACKER_MAX_SPACES) + if (unlikely (num_roots_for_space_.length >= HB_REPACKER_MAX_SPACES)) { - check_success (false); - return; + DEBUG_MSG (SUBSET_REPACK, nullptr, + "move_to_new_space: num of spaces %u exceeds HB_REPACKER_MAX_SPACES.", + num_roots_for_space_.length); + return Err(LIMIT_EXCEEDED); } num_roots_for_space_.push (0); + TRY (graph_result_t::from (num_roots_for_space_, ALLOCATION_FAILURE)); unsigned new_space = num_roots_for_space_.length - 1; for (unsigned index : indices) { + if (unlikely (index >= vertices_.length)) + return Err(OUT_OF_BOUNDS); auto& node = vertices_[index]; num_roots_for_space_[node.space] = num_roots_for_space_[node.space] - 1; num_roots_for_space_[new_space] = num_roots_for_space_[new_space] + 1; @@ -1417,39 +1707,38 @@ struct graph_t distance_invalid = true; positions_invalid = true; } + return Ok(); } unsigned space_for (unsigned index, unsigned* root = nullptr) const { - loop: - assert (index < vertices_.length); - const auto& node = vertices_[index]; - if (node.space) + while (true) { - if (root != nullptr) - *root = index; - return node.space; - } + assert (index < vertices_.length); + const auto& node = vertices_[index]; + if (node.space) + { + if (root != nullptr) + *root = index; + return node.space; + } - if (!node.incoming_edges ()) - { - if (root) - *root = index; - return 0; - } + if (!node.incoming_edges ()) + { + if (root) + *root = index; + return 0; + } - index = *node.parents_iter (); - goto loop; + index = *node.parents_iter (); + } } - void err_other_error () { this->successful = false; } - size_t total_size_in_bytes () const { size_t total_size = 0; unsigned count = vertices_.length; for (unsigned i = 0; i < count; i++) { - const auto& obj = vertices_.arrayZ[i].obj; - size_t size = obj.tail - obj.head; + size_t size = vertices_.arrayZ[i].table_size (); total_size += size; } return total_size; @@ -1458,6 +1747,27 @@ struct graph_t private: + void print_orphaned_nodes () + { + if (!DEBUG_ENABLED(SUBSET_REPACK)) return; + + DEBUG_MSG (SUBSET_REPACK, nullptr, "Graph is not fully connected."); + + parents_invalid = true; + (void) update_parents(); + + if (root().incoming_edges ()) { + DEBUG_MSG (SUBSET_REPACK, nullptr, "Root node has incoming edges."); + } + + for (unsigned i = 0; i < vertices_.length; i++) + { + const auto& v = vertices_[i]; + if (!v.incoming_edges ()) + DEBUG_MSG (SUBSET_REPACK, nullptr, "Node %u is orphaned.", i); + } + } + /* * Returns the numbers of incoming edges that are 24 or 32 bits wide. */ @@ -1467,7 +1777,7 @@ struct graph_t for (unsigned p : vertices_[node_idx].parents_iter ()) { // Only real links can be wide - for (const auto& l : vertices_[p].obj.real_links) + for (const auto& l : vertices_[p].obj().real_links) { if (l.objidx == node_idx && (l.width == 3 || l.width == 4) @@ -1481,16 +1791,13 @@ struct graph_t return count; } - bool check_success (bool success) - { return this->successful && (success || ((void) err_other_error (), false)); } - public: /* * Creates a map from objid to # of incoming edges. */ - void update_parents () + graph_result_t update_parents () { - if (!parents_invalid) return; + if (!parents_invalid) return Ok(); unsigned count = vertices_.length; @@ -1499,19 +1806,21 @@ struct graph_t for (unsigned p = 0; p < count; p++) { - for (auto& l : vertices_.arrayZ[p].obj.real_links) - vertices_[l.objidx].add_parent (p, false); + for (const auto& l : vertices_.arrayZ[p].obj().real_links) + { + if (unlikely (l.objidx >= count)) return Err(INVALID_ARGUMENT); + TRY(vertices_[l.objidx].add_parent (p, false)); + } - for (auto& l : vertices_.arrayZ[p].obj.virtual_links) - vertices_[l.objidx].add_parent (p, true); + for (const auto& l : vertices_.arrayZ[p].obj().virtual_links) + { + if (unlikely (l.objidx >= count)) return Err(INVALID_ARGUMENT); + TRY(vertices_[l.objidx].add_parent (p, true)); + } } - for (unsigned i = 0; i < count; i++) - // parents arrays must be accurate or downstream operations like cycle detection - // and sorting won't work correctly. - check_success (!vertices_.arrayZ[i].in_error ()); - parents_invalid = false; + return Ok(); } /* @@ -1526,7 +1835,7 @@ struct graph_t { auto& v = vertices_[i]; v.start = current_pos; - current_pos += v.obj.tail - v.obj.head; + current_pos += v.obj().tail - v.obj().head; v.end = current_pos; } @@ -1537,9 +1846,9 @@ struct graph_t * Finds the distance to each object in the graph * from the initial node. */ - void update_distances () + graph_result_t update_distances () { - if (!distance_invalid) return; + if (!distance_invalid) return Ok(); // Uses Dijkstra's algorithm to find all of the shortest distances. // https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm @@ -1559,9 +1868,11 @@ struct graph_t hb_priority_queue_t queue; queue.alloc (count); queue.insert (0, root_idx ()); + TRY (graph_result_t::from (queue, ALLOCATION_FAILURE)); hb_vector_t visited; visited.resize (vertices_.length); + TRY (graph_result_t::from (visited, ALLOCATION_FAILURE)); while (!queue.in_error () && !queue.is_empty ()) { @@ -1571,12 +1882,15 @@ struct graph_t int64_t next_distance = next.distance; visited[next_idx] = true; - for (const auto& link : next.obj.all_links ()) + for (const auto& link : next.obj().all_links ()) { + if (unlikely (link.objidx >= vertices_.length)) + return Err(OUT_OF_BOUNDS); + if (visited[link.objidx]) continue; auto& child_v = vertices_.arrayZ[link.objidx]; - const auto& child = child_v.obj; + const auto& child = child_v.obj (); unsigned link_width = link.width ? link.width : 4; // treat virtual offsets as 32 bits wide int64_t child_weight = (child.tail - child.head) + ((int64_t) 1 << (link_width * 8)) * (child_v.space + 1); @@ -1590,14 +1904,15 @@ struct graph_t } } - check_success (!queue.in_error ()); - if (!check_success (queue.is_empty ())) + TRY (graph_result_t::from (queue, ALLOCATION_FAILURE)); + if (unlikely (!queue.is_empty ())) { print_orphaned_nodes (); - return; + return Err(ORPHANED_NODES); } distance_invalid = false; + return Ok(); } private: @@ -1605,7 +1920,7 @@ struct graph_t * Updates a link in the graph to point to a different object. Corrects the * parents vector on the previous and new child nodes. */ - void reassign_link (hb_serialize_context_t::object_t::link_t& link, + graph_result_t reassign_link (hb_serialize_context_t::object_t::link_t& link, unsigned parent_idx, unsigned new_idx, bool is_virtual) @@ -1613,33 +1928,34 @@ struct graph_t unsigned old_idx = link.objidx; link.objidx = new_idx; vertices_[old_idx].remove_parent (parent_idx); - vertices_[new_idx].add_parent (parent_idx, is_virtual); + return vertices_[new_idx].add_parent (parent_idx, is_virtual); } /* * Updates all objidx's in all links using the provided mapping. Corrects incoming edge counts. */ template - void remap_obj_indices (const hb_map_t& id_map, - Iterator subgraph, - bool only_wide = false) + graph_result_t remap_obj_indices (const hb_map_t& id_map, + Iterator subgraph, + bool only_wide = false) { - if (!id_map) return; + if (!id_map) return Ok(); for (unsigned i : subgraph) { - auto& obj = vertices_[i].obj; - unsigned num_real = obj.real_links.length; + auto& vertex = vertices_[i]; + unsigned num_real = vertex.obj().real_links.length; unsigned count = 0; - for (auto& link : obj.all_links_writer ()) + for (auto& link : vertex.all_links_writer ()) { count++; const uint32_t *v; if (!id_map.has (link.objidx, &v)) continue; if (only_wide && (link.is_signed || (link.width != 4 && link.width != 3))) continue; - reassign_link (link, i, *v, count > num_real); + TRY(reassign_link (link, i, *v, count > num_real)); } } + return Ok(); } /* @@ -1649,29 +1965,71 @@ struct graph_t * Connected targets will be added to connected and removed from targets. All visited nodes * will be added to visited. */ - void find_connected_nodes (unsigned start_idx, - hb_set_t& targets, - hb_set_t& visited, - hb_set_t& connected) + graph_result_t find_connected_nodes (unsigned start_idx, + hb_set_t& targets, + hb_set_t& visited, + hb_set_t& connected) { - if (unlikely (!check_success (!visited.in_error ()))) return; - if (visited.has (start_idx)) return; - visited.add (start_idx); - - if (targets.has (start_idx)) + TRY (graph_result_t::from (visited, ALLOCATION_FAILURE)); + if (visited.has (start_idx)) return Ok(); + if (unlikely (start_idx >= vertices_.length)) { - targets.del (start_idx); - connected.add (start_idx); + DEBUG_MSG (SUBSET_REPACK, nullptr, + "find_connected_nodes: unexpected start_idx out of bounds."); + return Err(OUT_OF_BOUNDS); } - const auto& v = vertices_[start_idx]; + // For performance we want to avoid allocating extra memory. So use the ordering_scratch_ + // buffer to implement a stack for DFS. + ordering_scratch_.resize (vertices_.length); + TRY (graph_result_t::from (ordering_scratch_, ALLOCATION_FAILURE)); + + auto& stack = ordering_scratch_; + unsigned stack_len = 0; + + graph_result_t res = Ok(); + auto handle_node = [&] (unsigned node_idx) { + visited.add (node_idx); + if (targets.has (node_idx)) { + targets.del (node_idx); + connected.add (node_idx); + } + + if (unlikely (stack_len >= stack.length)) + { + res = Err(CYCLE_DETECTED); + return false; + } + stack[stack_len++] = node_idx; + return true; + }; + + if (!handle_node (start_idx)) return res; + + while (stack_len > 0) + { + unsigned node_idx = stack[--stack_len]; + const auto& v = vertices_[node_idx]; + + // Graph is treated as undirected so search children and parents of node_idx + for (const auto& l : v.obj().all_links ()) + { + unsigned child_idx = l.objidx; + if (visited.has (child_idx)) continue; + if (!handle_node (child_idx)) return res; + } + + for (unsigned parent_idx : v.parents_iter ()) + { + if (visited.has (parent_idx)) continue; + if (!handle_node (parent_idx)) return res; + } + } - // Graph is treated as undirected so search children and parents of start_idx - for (const auto& l : v.obj.all_links ()) - find_connected_nodes (l.objidx, targets, visited, connected); + TRY (graph_result_t::from (visited, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (connected, ALLOCATION_FAILURE)); - for (unsigned p : v.parents_iter ()) - find_connected_nodes (p, targets, visited, connected); + return Ok(); } public: @@ -1688,10 +2046,9 @@ struct graph_t hb_vector_t ordering_scratch_; private: - bool parents_invalid; - bool distance_invalid; - bool positions_invalid; - bool successful; + bool parents_invalid = true; + bool distance_invalid = true; + bool positions_invalid = true; hb_vector_t num_roots_for_space_; hb_vector_t buffers; }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.cc b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.cc index d66eb49cfd2e..02c5e8742ce6 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.cc +++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.cc @@ -28,34 +28,41 @@ namespace graph { +graph_result_t gsubgpos_graph_context_t::create (hb_tag_t table_tag_, + graph_t& graph_) +{ + gsubgpos_graph_context_t context (table_tag_, graph_); + + if (unlikely (table_tag_ != HB_OT_TAG_GPOS + && table_tag_ != HB_OT_TAG_GSUB)) + return Err(INVALID_ARGUMENT); + + TRY_ASSIGN (const GSTAR* gstar, graph::GSTAR::graph_to_gstar (context.graph)); + TRY(gstar->find_lookups (context.graph, context.lookups)); + TRY_ASSIGN (context.lookup_list_index, gstar->get_lookup_list_index (context.graph)); + + return context; +} + gsubgpos_graph_context_t::gsubgpos_graph_context_t (hb_tag_t table_tag_, graph_t& graph_) : table_tag (table_tag_), graph (graph_), lookup_list_index (0), lookups () -{ - if (table_tag_ != HB_OT_TAG_GPOS - && table_tag_ != HB_OT_TAG_GSUB) - return; - - GSTAR* gstar = graph::GSTAR::graph_to_gstar (graph_); - if (gstar) { - gstar->find_lookups (graph, lookups); - lookup_list_index = gstar->get_lookup_list_index (graph_); - } -} +{} -unsigned gsubgpos_graph_context_t::create_node (unsigned size) +graph_result_t gsubgpos_graph_context_t::create_node (unsigned size) { char* buffer = (char*) hb_calloc (1, size); - if (!buffer) - return -1; + if (unlikely (!buffer)) + return Err(ALLOCATION_FAILURE); - if (!add_buffer (buffer)) { + auto res = add_buffer (buffer); + if (unlikely (!res.is_ok ())) { // Allocation did not get stored for freeing later. hb_free (buffer); - return -1; + return Err(res.error ()); } return graph.new_node (buffer, buffer + size); diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh index 8969d007879c..947669f87006 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh @@ -36,6 +36,9 @@ struct Lookup; struct gsubgpos_graph_context_t { + HB_INTERNAL static graph_result_t create (hb_tag_t table_tag_, + graph_t& graph_); + hb_tag_t table_tag; graph_t& graph; unsigned lookup_list_index; @@ -43,17 +46,18 @@ struct gsubgpos_graph_context_t hb_hashmap_t subtable_to_extension; hb_hashmap_t> split_subtables; - HB_INTERNAL gsubgpos_graph_context_t (hb_tag_t table_tag_, - graph_t& graph_); - HB_INTERNAL unsigned create_node (unsigned size); + HB_INTERNAL graph_result_t create_node (unsigned size); - bool add_buffer (char* buffer) + graph_result_t add_buffer (char* buffer) { return graph.add_buffer (buffer); } private: + HB_INTERNAL gsubgpos_graph_context_t (hb_tag_t table_tag_, + graph_t& graph_); + HB_INTERNAL unsigned num_non_ext_subtables (); }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh index 73f4b15660ff..044ddf3317c4 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh @@ -50,10 +50,12 @@ struct ExtensionFormat1 : public OT::ExtensionFormat1 this->extensionOffset = 0; } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - return vertex_len >= OT::ExtensionFormat1::static_size; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < OT::ExtensionFormat1::static_size)) + return Err(SANITIZE_FAILURE); + return Ok(); } unsigned get_lookup_type () const @@ -61,7 +63,7 @@ struct ExtensionFormat1 : public OT::ExtensionFormat1 return this->extensionLookupType; } - unsigned get_subtable_index (graph_t& graph, unsigned this_index) const + graph_result_t get_subtable_index (graph_t& graph, unsigned this_index) const { return graph.index_for_offset (this_index, &this->extensionOffset); } @@ -74,12 +76,13 @@ struct Lookup : public OT::Lookup return subTable.len; } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < OT::Lookup::min_size) return false; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < OT::Lookup::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= this->get_size (); + if (unlikely (vertex_len < this->get_size ())) return Err(SANITIZE_FAILURE); + return Ok(); } bool is_extension (hb_tag_t table_tag) const @@ -93,15 +96,15 @@ struct Lookup : public OT::Lookup return flag & 0x0010u; } - bool make_extension (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t make_extension (gsubgpos_graph_context_t& c, + unsigned this_index) { unsigned type = lookupType; unsigned ext_type = extension_type (c.table_tag); if (!ext_type || is_extension (c.table_tag)) { // NOOP - return true; + return Ok(); } DEBUG_MSG (SUBSET_REPACK, nullptr, @@ -109,44 +112,55 @@ struct Lookup : public OT::Lookup type, this_index); + hb_set_t seen; + hb_vector_t subtables; for (unsigned i = 0; i < subTable.len; i++) { - unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]); - if (!make_subtable_extension (c, - this_index, - subtable_index)) - return false; + TRY_ASSIGN (unsigned subtable_index, c.graph.index_for_offset (this_index, &subTable[i])); + if (seen.has (subtable_index)) + continue; + seen.add (subtable_index); + subtables.push (subtable_index); } + TRY (graph_result_t::from (seen, ALLOCATION_FAILURE)); + TRY (graph_result_t::from (subtables, ALLOCATION_FAILURE)); + + for (unsigned subtable_index : subtables) + TRY (make_subtable_extension (c, this_index, subtable_index)); lookupType = ext_type; - return true; + return Ok(); } - bool split_subtables_if_needed (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t split_subtables_if_needed (gsubgpos_graph_context_t& c, + unsigned this_index) { unsigned type = lookupType; bool is_ext = is_extension (c.table_tag); if (c.table_tag != HB_OT_TAG_GPOS && c.table_tag != HB_OT_TAG_GSUB) - return true; + return Ok(); if (!is_ext && !is_supported_gpos_type(type, c) && !is_supported_gsub_type(type, c)) - return true; + return Ok(); hb_vector_t>> all_new_subtables; for (unsigned i = 0; i < subTable.len; i++) { - unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]); + // This assumes we are working with something like a GSUB/GPOS table, if + // sanitization fails we ignore and skip splitting for the particular sub table. + auto idx_res = c.graph.index_for_offset (this_index, &subTable[i]); + if (!idx_res.is_ok ()) continue; + unsigned subtable_index = *idx_res; if (is_ext) { unsigned ext_subtable_index = subtable_index; ExtensionFormat1* extension = (ExtensionFormat1*) c.graph.object (ext_subtable_index).head; - if (!extension || !extension->sanitize (c.graph.vertices_[ext_subtable_index])) + if (!extension || !extension->sanitize (c.graph.vertices_[ext_subtable_index]).is_ok ()) continue; - subtable_index = extension->get_subtable_index (c.graph, ext_subtable_index); + TRY_ASSIGN (subtable_index, extension->get_subtable_index (c.graph, ext_subtable_index)); type = extension->get_lookup_type (); if (!is_supported_gpos_type(type, c) && !is_supported_gsub_type(type, c)) continue; @@ -158,6 +172,7 @@ struct Lookup : public OT::Lookup if (split_result->length == 0) continue; all_new_subtables.push (hb_pair(i, *split_result)); + TRY (graph_result_t::from (all_new_subtables, ALLOCATION_FAILURE)); } else { @@ -167,9 +182,15 @@ struct Lookup : public OT::Lookup switch (type) { case 2: - new_sub_tables = split_subtable (c, subtable_index); break; + { + TRY_ASSIGN (new_sub_tables, split_subtable (c, subtable_index)); + break; + } case 4: - new_sub_tables = split_subtable (c, subtable_index); break; + { + TRY_ASSIGN (new_sub_tables, split_subtable (c, subtable_index)); + break; + } default: break; } @@ -177,42 +198,46 @@ struct Lookup : public OT::Lookup switch (type) { case 4: - new_sub_tables = split_subtable (c, subtable_index); break; + { + TRY_ASSIGN (new_sub_tables, split_subtable (c, subtable_index)); + break; + } default: break; } } - if (new_sub_tables.in_error ()) return false; - c.split_subtables.set (subtable_index, new_sub_tables); - if (new_sub_tables) + TRY (graph_result_t::from (c.split_subtables, ALLOCATION_FAILURE)); + if (new_sub_tables) { all_new_subtables.push (hb_pair (i, std::move (new_sub_tables))); + TRY (graph_result_t::from (all_new_subtables, ALLOCATION_FAILURE)); + } } } if (all_new_subtables) { - return add_sub_tables (c, this_index, type, all_new_subtables); + TRY (add_sub_tables (c, this_index, type, all_new_subtables)); } - return true; + return Ok(); } template - hb_vector_t split_subtable (gsubgpos_graph_context_t& c, - unsigned objidx) + graph_result_t> split_subtable (gsubgpos_graph_context_t& c, + unsigned objidx) { T* sub_table = (T*) c.graph.object (objidx).head; - if (!sub_table || !sub_table->sanitize (c.graph.vertices_[objidx])) - return hb_vector_t (); + if (!sub_table || !sub_table->sanitize (c.graph.vertices_[objidx]).is_ok ()) + return Ok(hb_vector_t ()); return sub_table->split_subtables (c, objidx); } - bool add_sub_tables (gsubgpos_graph_context_t& c, - unsigned this_index, - unsigned type, - const hb_vector_t>>& subtable_ids) + graph_result_t add_sub_tables (gsubgpos_graph_context_t& c, + unsigned this_index, + unsigned type, + const hb_vector_t>>& subtable_ids) { bool is_ext = is_extension (c.table_tag); auto* v = &c.graph.vertices_[this_index]; @@ -225,19 +250,19 @@ struct Lookup : public OT::Lookup size_t new_size = v->table_size () + new_subtable_count * OT::Offset16::static_size; char* buffer = (char*) hb_calloc (1, new_size); - if (!buffer) return false; - if (!c.add_buffer (buffer)) + if (unlikely (!buffer)) return Err(ALLOCATION_FAILURE); + auto res = c.add_buffer (buffer); + if (unlikely (!res.is_ok ())) { hb_free (buffer); - return false; + return res; } - hb_memcpy (buffer, v->obj.head, v->table_size()); + hb_memcpy (buffer, v->obj ().head, v->table_size()); if (use_mark_filtering_set ()) - hb_memcpy (buffer + new_size - 2, v->obj.tail - 2, 2); + hb_memcpy (buffer + new_size - 2, v->obj ().tail - 2, 2); - v->obj.head = buffer; - v->obj.tail = buffer + new_size; + v->set_buffer (buffer, buffer + new_size); Lookup* new_lookup = (Lookup*) buffer; @@ -252,29 +277,27 @@ struct Lookup : public OT::Lookup { if (is_ext) { - unsigned ext_id = create_extension_subtable (c, subtable_id, type); - c.graph.vertices_[subtable_id].add_parent (ext_id, false); + TRY_ASSIGN (unsigned ext_id, create_extension_subtable (c, subtable_id, type)); + TRY(c.graph.vertices_[subtable_id].add_parent (ext_id, false)); subtable_id = ext_id; // the reference to v may have changed on adding a node, so reassign it. v = &c.graph.vertices_[this_index]; } - auto* link = v->obj.real_links.push (); - link->width = 2; - link->objidx = subtable_id; - link->position = (char*) &new_lookup->subTable[offset_index++] - - (char*) new_lookup; - c.graph.vertices_[subtable_id].add_parent (this_index, false); + TRY(v->add_real_link(2, subtable_id, + (char*) &new_lookup->subTable[offset_index++] - (char*) new_lookup)); + TRY(c.graph.vertices_[subtable_id].add_parent (this_index, false)); } } // Repacker sort order depends on link order, which we've messed up so resort it. - v->obj.real_links.qsort (); + v->sort_real_links (); // The head location of the lookup has changed, invalidating the lookups map entry // in the context. Update the map. c.lookups.set (this_index, new_lookup); - return true; + TRY (graph_result_t::from (c.lookups, ALLOCATION_FAILURE)); + return Ok(); } void fix_existing_subtable_links (gsubgpos_graph_context_t& c, @@ -290,74 +313,70 @@ struct Lookup : public OT::Lookup unsigned insert_offset = Lookup::min_size + insert_index * OT::Offset16::static_size; shift += p.second.length; - for (auto& l : v.obj.all_links_writer ()) + for (auto& l : v.all_links_writer ()) { if (l.position > insert_offset) l.position += pos_offset; } } } - unsigned create_extension_subtable (gsubgpos_graph_context_t& c, - unsigned subtable_index, - unsigned type) + graph_result_t create_extension_subtable (gsubgpos_graph_context_t& c, + unsigned subtable_index, + unsigned type) { unsigned extension_size = OT::ExtensionFormat1::static_size; - unsigned ext_index = c.create_node (extension_size); - if (ext_index == (unsigned) -1) - return -1; + TRY_ASSIGN (unsigned ext_index, c.create_node (extension_size)); auto& ext_vertex = c.graph.vertices_[ext_index]; ExtensionFormat1* extension = - (ExtensionFormat1*) ext_vertex.obj.head; + ext_vertex.as*> (); extension->reset (type); // Make extension point at the subtable. - auto* l = ext_vertex.obj.real_links.push (); + TRY(ext_vertex.add_real_link (4, subtable_index, 4)); - l->width = 4; - l->objidx = subtable_index; - l->position = 4; - - return ext_index; + return Ok(ext_index); } - bool make_subtable_extension (gsubgpos_graph_context_t& c, - unsigned lookup_index, - unsigned subtable_index) + graph_result_t make_subtable_extension (gsubgpos_graph_context_t& c, + unsigned lookup_index, + unsigned subtable_index) { unsigned type = lookupType; - unsigned ext_index = -1; + unsigned ext_index = HB_GRAPH_INVALID; unsigned* existing_ext_index = nullptr; if (c.subtable_to_extension.has(subtable_index, &existing_ext_index)) { ext_index = *existing_ext_index; } else { - ext_index = create_extension_subtable(c, subtable_index, type); + TRY_ASSIGN (ext_index, create_extension_subtable(c, subtable_index, type)); c.subtable_to_extension.set(subtable_index, ext_index); + TRY (graph_result_t::from (c.subtable_to_extension, ALLOCATION_FAILURE)); } - if (ext_index == (unsigned) -1) - return false; - auto& subtable_vertex = c.graph.vertices_[subtable_index]; auto& lookup_vertex = c.graph.vertices_[lookup_index]; - for (auto& l : lookup_vertex.obj.real_links.writer ()) + unsigned replaced = 0; + for (auto& l : lookup_vertex.real_links_writer ()) { if (l.objidx == subtable_index) { // Change lookup to point at the extension. l.objidx = ext_index; - if (existing_ext_index) - subtable_vertex.remove_parent(lookup_index); + replaced++; } } // Make extension point at the subtable. auto& ext_vertex = c.graph.vertices_[ext_index]; - ext_vertex.add_parent (lookup_index, false); + for (unsigned i = 0; i < replaced; i++) + { + subtable_vertex.remove_parent (lookup_index); + TRY(ext_vertex.add_parent (lookup_index, false)); + } if (!existing_ext_index) - subtable_vertex.remap_parent (lookup_index, ext_index); + TRY(subtable_vertex.add_parent (ext_index, false)); - return true; + return Ok(); } private: @@ -388,24 +407,25 @@ struct Lookup : public OT::Lookup template struct LookupList : public OT::LookupList { - bool sanitize (const graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < OT::LookupList::min_size) return false; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < OT::LookupList::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= OT::LookupList::item_size * this->len; + if (unlikely (vertex_len < OT::LookupList::item_size * this->len)) return Err(SANITIZE_FAILURE); + return Ok(); } }; struct GSTAR : public OT::GSUBGPOS { - static GSTAR* graph_to_gstar (graph_t& graph) + static graph_result_t graph_to_gstar (graph_t& graph) { const auto& r = graph.root (); - GSTAR* gstar = (GSTAR*) r.obj.head; - if (!gstar || !gstar->sanitize (r)) - return nullptr; + const GSTAR* gstar = (GSTAR*) r.obj ().head; + if (unlikely (!gstar)) return Err(INVALID_ARGUMENT); + TRY (gstar->sanitize (r)); hb_barrier (); return gstar; @@ -413,57 +433,55 @@ struct GSTAR : public OT::GSUBGPOS const void* get_lookup_list_field_offset () const { - switch (u.version.major) { - case 1: return u.version1.get_lookup_list_offset (); -#ifndef HB_NO_BEYOND_64K - case 2: return u.version2.get_lookup_list_offset (); -#endif - default: return 0; - } + return OT::GSUBGPOS::get_lookup_list_field_offset (); } - bool sanitize (const graph_t::vertex_t& vertex) + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t len = vertex.obj.tail - vertex.obj.head; - if (len < OT::GSUBGPOS::min_size) return false; + size_t len = vertex.table_size (); + if (unlikely (len < OT::GSUBGPOS::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return len >= get_size (); + if (unlikely (version.major != 1)) return Err(SANITIZE_FAILURE); + if (unlikely (len < get_size ())) return Err(SANITIZE_FAILURE); + return Ok(); } - void find_lookups (graph_t& graph, - hb_hashmap_t& lookups /* OUT */) + graph_result_t find_lookups (graph_t& graph, + hb_hashmap_t& lookups /* OUT */) const { - switch (u.version.major) { - case 1: find_lookups (graph, lookups); break; #ifndef HB_NO_BEYOND_64K - case 2: find_lookups (graph, lookups); break; + if (version.to_int () >= 0x00010002u && lookupList2) + return find_lookups (graph, lookups); #endif - } + TRY(find_lookups (graph, lookups)); + return Ok(); } - unsigned get_lookup_list_index (graph_t& graph) + graph_result_t get_lookup_list_index (graph_t& graph) const { - return graph.index_for_offset (graph.root_idx (), - get_lookup_list_field_offset()); + const void* offset = get_lookup_list_field_offset (); + if (unlikely (!offset)) return Err(INVALID_ARGUMENT); + return graph.index_for_offset (graph.root_idx (), offset); } template - void find_lookups (graph_t& graph, - hb_hashmap_t& lookups /* OUT */) + graph_result_t find_lookups (graph_t& graph, + hb_hashmap_t& lookups /* OUT */) const { - unsigned lookup_list_idx = get_lookup_list_index (graph); + TRY_ASSIGN (unsigned lookup_list_idx, get_lookup_list_index (graph)); const LookupList* lookupList = (const LookupList*) graph.object (lookup_list_idx).head; - if (!lookupList || !lookupList->sanitize (graph.vertices_[lookup_list_idx])) - return; + if (unlikely (!lookupList)) return Err(INVALID_ARGUMENT); + TRY(lookupList->sanitize (graph.vertices_[lookup_list_idx])); for (unsigned i = 0; i < lookupList->len; i++) { - unsigned lookup_idx = graph.index_for_offset (lookup_list_idx, &(lookupList->arrayZ[i])); + TRY_ASSIGN (unsigned lookup_idx, graph.index_for_offset (lookup_list_idx, &(lookupList->arrayZ[i]))); Lookup* lookup = (Lookup*) graph.object (lookup_idx).head; - if (!lookup || !lookup->sanitize (graph.vertices_[lookup_idx])) continue; + if (!lookup || !lookup->sanitize (graph.vertices_[lookup_idx]).is_ok ()) continue; lookups.set (lookup_idx, lookup); } + return Ok(); } }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh index a653f402ab1c..c0e38e009983 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh @@ -34,64 +34,69 @@ namespace graph { -struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix +struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix { - bool sanitize (graph_t::vertex_t& vertex, unsigned class_count) const + graph_result_t sanitize (const graph_t::vertex_t& vertex, unsigned class_count) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < AnchorMatrix::min_size) return false; + size_t vertex_len = vertex.table_size(); + if (unlikely (vertex_len < AnchorMatrix::min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= AnchorMatrix::min_size + - OT::Offset16::static_size * class_count * this->rows; + if (unlikely (vertex_len < AnchorMatrix::min_size + + OT::Offset16::static_size * class_count * this->rows)) + return Err(SANITIZE_FAILURE); + return Ok(); } - bool shrink (gsubgpos_graph_context_t& c, - unsigned this_index, - unsigned old_class_count, - unsigned new_class_count) + graph_result_t shrink (gsubgpos_graph_context_t& c, + unsigned this_index, + unsigned old_class_count, + unsigned new_class_count) { - if (new_class_count >= old_class_count) return false; - auto& o = c.graph.vertices_[this_index].obj; + if (unlikely (new_class_count >= old_class_count)) return Err(INVALID_ARGUMENT); + auto& v = c.graph.vertices_[this_index]; + const auto& o = v.obj (); unsigned base_count = rows; - o.tail = o.head + - AnchorMatrix::min_size + - OT::Offset16::static_size * base_count * new_class_count; + v.set_buffer (o.head, + o.head + + AnchorMatrix::min_size + + OT::Offset16::static_size * base_count * new_class_count); // Reposition links into the new indexing scheme. - for (auto& link : o.real_links.writer ()) + for (auto& link : v.real_links_writer ()) { unsigned index = (link.position - 2) / 2; unsigned base = index / old_class_count; unsigned klass = index % old_class_count; - if (klass >= new_class_count) + if (unlikely (klass >= new_class_count)) // should have already been removed - return false; + return Err(INVALID_ARGUMENT); unsigned new_index = base * new_class_count + klass; link.position = (char*) &(this->matrixZ[new_index]) - (char*) this; } - return true; + return Ok(); } - unsigned clone (gsubgpos_graph_context_t& c, - unsigned this_index, - unsigned start, - unsigned end, - unsigned class_count) + graph_result_t clone (gsubgpos_graph_context_t& c, + unsigned this_index, + unsigned start, + unsigned end, + unsigned class_count) { unsigned base_count = rows; unsigned new_class_count = end - start; unsigned size = AnchorMatrix::min_size + OT::Offset16::static_size * new_class_count * rows; - unsigned prime_id = c.create_node (size); - if (prime_id == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned prime_id, c.create_node (size)); AnchorMatrix* prime = (AnchorMatrix*) c.graph.object (prime_id).head; prime->rows = base_count; - auto& o = c.graph.vertices_[this_index].obj; + auto& v = c.graph.vertices_[this_index]; + const auto& o = v.obj (); + int num_links = o.real_links.length; for (int i = 0; i < num_links; i++) { @@ -106,43 +111,48 @@ struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix unsigned child_idx = link.objidx; - c.graph.add_link (&(prime->matrixZ[new_index]), - prime_id, - child_idx); + TRY (c.graph.add_link (&(prime->matrixZ[new_index]), + prime_id, + child_idx)); auto& child = c.graph.vertices_[child_idx]; child.remove_parent (this_index); - o.real_links.remove_unordered (i); + v.remove_real_link_unordered (i); num_links--; i--; } - return prime_id; + // Restore correct ordering after the above removes, which mess up link ordering. + v.sort_real_links (); + + return Ok(prime_id); } }; -struct MarkArray : public OT::Layout::GPOS_impl::MarkArray +struct MarkArray : public OT::Layout::GPOS_impl::MarkArray { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; + size_t vertex_len = vertex.table_size(); unsigned min_size = MarkArray::min_size; - if (vertex_len < min_size) return false; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= get_size (); + if (unlikely (vertex_len < get_size ())) return Err(SANITIZE_FAILURE); + return Ok(); } - bool shrink (gsubgpos_graph_context_t& c, - const hb_hashmap_t& mark_array_links, - unsigned this_index, - unsigned new_class_count) + graph_result_t shrink (gsubgpos_graph_context_t& c, + const hb_hashmap_t& mark_array_links, + unsigned this_index, + unsigned new_class_count) { - auto& o = c.graph.vertices_[this_index].obj; + auto& v = c.graph.vertices_[this_index]; + const auto& o = v.obj (); for (const auto& link : o.real_links) c.graph.vertices_[link.objidx].remove_parent (this_index); - o.real_links.reset (); + v.clear_real_links (); unsigned new_index = 0; for (const auto& record : this->iter ()) @@ -159,27 +169,27 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray continue; } - c.graph.add_link (&(*this)[new_index].markAnchor, this_index, *objidx); + TRY (c.graph.add_link (&(*this)[new_index].markAnchor, this_index, *objidx)); new_index++; } this->len = new_index; - o.tail = o.head + MarkArray::min_size + - OT::Layout::GPOS_impl::MarkRecord::static_size * new_index; - return true; + v.set_buffer (o.head, o.head + MarkArray::min_size + + OT::Layout::GPOS_impl::MarkRecord::static_size * new_index); + + return Ok(); } - unsigned clone (gsubgpos_graph_context_t& c, - unsigned this_index, - const hb_hashmap_t& pos_to_index, - hb_set_t& marks, - unsigned start_class) + graph_result_t clone (gsubgpos_graph_context_t& c, + unsigned this_index, + const hb_hashmap_t& pos_to_index, + hb_set_t& marks, + unsigned start_class) { unsigned size = MarkArray::min_size + - OT::Layout::GPOS_impl::MarkRecord::static_size * + OT::Layout::GPOS_impl::MarkRecord::static_size * marks.get_population (); - unsigned prime_id = c.create_node (size); - if (prime_id == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned prime_id, c.create_node (size)); MarkArray* prime = (MarkArray*) c.graph.object (prime_id).head; prime->len = marks.get_population (); @@ -191,45 +201,50 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray unsigned offset_pos = (char*) &((*this)[mark].markAnchor) - (char*) this; unsigned* anchor_index; if (pos_to_index.has (offset_pos, &anchor_index)) - c.graph.move_child (this_index, - &((*this)[mark].markAnchor), - prime_id, - &((*prime)[i].markAnchor)); + TRY (c.graph.move_child (this_index, + &((*this)[mark].markAnchor), + prime_id, + &((*prime)[i].markAnchor))); i++; } - return prime_id; + // Restore correct ordering of the vertex links which are disturbed by move_child. + c.graph.vertices_[this_index].sort_real_links (); + + return Ok(prime_id); } }; struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - return vertex_len >= MarkBasePosFormat1::static_size; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < MarkBasePosFormat1::static_size)) + return Err(SANITIZE_FAILURE); + return Ok(); } - hb_vector_t split_subtables (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> split_subtables (gsubgpos_graph_context_t& c, + unsigned this_index) { hb_set_t visited; - const unsigned base_coverage_id = c.graph.index_for_offset (this_index, &baseCoverage); + TRY_ASSIGN (const unsigned base_coverage_id, c.graph.index_for_offset (this_index, &baseCoverage)); + const unsigned base_size = OT::Layout::GPOS_impl::MarkBasePosFormat1_2::min_size + MarkArray::min_size + AnchorMatrix::min_size + c.graph.vertices_[base_coverage_id].table_size (); - hb_vector_t class_to_info = get_class_info (c, this_index); + TRY_ASSIGN (hb_vector_t class_to_info, get_class_info (c, this_index)); unsigned class_count = classCount; - auto base_array = c.graph.as_table (this_index, - &baseArray, - class_count); - if (!base_array) return hb_vector_t (); + TRY_ASSIGN (auto base_array, c.graph.as_table (this_index, + &baseArray, + class_count)); unsigned base_count = base_array.table->rows; unsigned partial_coverage_size = 4; @@ -241,11 +256,11 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2::static_size * info.marks.get_population () + OT::Offset16::static_size * base_count; for (unsigned objidx : info.child_indices) - accumulated_delta += c.graph.find_subgraph_size (objidx, visited); + accumulated_delta += c.graph.find_subgraph_size (objidx, visited).value_or (0); accumulated += accumulated_delta; unsigned total = accumulated + partial_coverage_size; @@ -253,6 +268,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2= (1 << 16)) { split_points.push (klass); + TRY (graph_result_t::from (split_points, ALLOCATION_FAILURE)); accumulated = base_size + accumulated_delta; partial_coverage_size = 4 + OT::HBUINT16::static_size * info.marks.get_population (); visited.clear (); // node sharing isn't allowed between splits. @@ -260,13 +276,15 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (split_context, split_points); @@ -303,30 +321,30 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2classCount; } - unsigned clone_range (unsigned start, unsigned end) + graph_result_t clone_range (unsigned start, unsigned end) { return thiz->clone_range (*this, this->this_index, start, end); } - bool shrink (unsigned count) + graph_result_t shrink (unsigned count) { return thiz->shrink (*this, this->this_index, count); } }; - hb_vector_t get_class_info (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> get_class_info (gsubgpos_graph_context_t& c, + unsigned this_index) { hb_vector_t class_to_info; unsigned class_count = classCount; if (!class_count) return class_to_info; - if (!class_to_info.resize (class_count)) - return hb_vector_t(); + if (unlikely (!class_to_info.resize (class_count))) + return Err(ALLOCATION_FAILURE); + + TRY_ASSIGN (auto mark_array, c.graph.as_table (this_index, &markArray)); - auto mark_array = c.graph.as_table (this_index, &markArray); - if (!mark_array) return hb_vector_t (); unsigned mark_count = mark_array.table->len; for (unsigned mark = 0; mark < mark_count; mark++) { @@ -335,20 +353,21 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2obj.real_links) + for (const auto& link : mark_array.vertex->obj ().real_links) { unsigned mark = (link.position - 2) / - OT::Layout::GPOS_impl::MarkRecord::static_size; + OT::Layout::GPOS_impl::MarkRecord::static_size; unsigned klass = (*mark_array.table)[mark].get_class (); if (klass >= class_count) continue; class_to_info[klass].child_indices.push (link.objidx); } - unsigned base_array_id = - c.graph.index_for_offset (this_index, &baseArray); + TRY_ASSIGN (unsigned base_array_id, + c.graph.index_for_offset (this_index, &baseArray)); + auto& base_array_v = c.graph.vertices_[base_array_id]; - for (const auto& link : base_array_v.obj.real_links) + for (const auto& link : base_array_v.obj ().real_links) { unsigned index = (link.position - 2) / OT::Offset16::static_size; unsigned klass = index % class_count; @@ -358,9 +377,9 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 shrink (split_context_t& sc, + unsigned this_index, + unsigned count) { DEBUG_MSG (SUBSET_REPACK, nullptr, " Shrinking MarkBasePosFormat1 (%u) to [0, %u).", @@ -369,49 +388,48 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2= old_count) - return true; + return Ok(); classCount = count; - auto mark_coverage = sc.c.graph.as_mutable_table (this_index, - &markCoverage); - if (!mark_coverage) return false; + TRY_ASSIGN (auto mark_coverage, sc.c.graph.as_mutable_table (this_index, + &markCoverage)); + hb_set_t marks = sc.marks_for (0, count); auto new_coverage = + hb_enumerate (mark_coverage.table->iter ()) | hb_filter (marks, hb_first) | hb_map_retains_sorting (hb_second) ; - if (!Coverage::make_coverage (sc.c, + new_coverage, + TRY (Coverage::make_coverage (sc.c, + new_coverage, mark_coverage.index, - 4 + 2 * marks.get_population ())) - return false; - - - auto base_array = sc.c.graph.as_mutable_table (this_index, - &baseArray, - old_count); - if (!base_array || !base_array.table->shrink (sc.c, - base_array.index, - old_count, - count)) - return false; - - auto mark_array = sc.c.graph.as_mutable_table (this_index, - &markArray); - if (!mark_array || !mark_array.table->shrink (sc.c, - sc.mark_array_links, - mark_array.index, - count)) - return false; - - return true; + 4 + 2 * marks.get_population ())); + + + TRY_ASSIGN (auto base_array, sc.c.graph.as_mutable_table (this_index, + &baseArray, + old_count)); + + TRY (base_array.table->shrink (sc.c, + base_array.index, + old_count, + count)); + + TRY_ASSIGN (auto mark_array, sc.c.graph.as_mutable_table (this_index, + &markArray)); + + TRY (mark_array.table->shrink (sc.c, + sc.mark_array_links, + mark_array.index, + count)); + + return Ok(); } // Create a new MarkBasePos that has all of the data for classes from [start, end). - unsigned clone_range (split_context_t& sc, - unsigned this_index, - unsigned start, unsigned end) const + graph_result_t clone_range (split_context_t& sc, + unsigned this_index, + unsigned start, unsigned end) const { DEBUG_MSG (SUBSET_REPACK, nullptr, " Cloning MarkBasePosFormat1 (%u) range [%u, %u).", this_index, start, end); @@ -419,92 +437,93 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2::static_size; - unsigned prime_id = sc.c.create_node (prime_size); - if (prime_id == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned prime_id, sc.c.create_node (prime_size)); MarkBasePosFormat1* prime = (MarkBasePosFormat1*) graph.object (prime_id).head; prime->format = this->format; unsigned new_class_count = end - start; prime->classCount = new_class_count; - unsigned base_coverage_id = - graph.index_for_offset (sc.this_index, &baseCoverage); - graph.add_link (&(prime->baseCoverage), prime_id, base_coverage_id); + TRY_ASSIGN (unsigned base_coverage_id, + graph.index_for_offset (sc.this_index, &baseCoverage)); + + TRY (graph.add_link (&(prime->baseCoverage), prime_id, base_coverage_id)); + + TRY_ASSIGN (auto mark_coverage, sc.c.graph.as_table (this_index, + &markCoverage)); - auto mark_coverage = sc.c.graph.as_table (this_index, - &markCoverage); - if (!mark_coverage) return false; hb_set_t marks = sc.marks_for (start, end); auto new_coverage = + hb_enumerate (mark_coverage.table->iter ()) | hb_filter (marks, hb_first) | hb_map_retains_sorting (hb_second) ; - if (!Coverage::add_coverage (sc.c, + TRY (Coverage::add_coverage (sc.c, prime_id, 2, + new_coverage, - marks.get_population () * 2 + 4)) - return -1; - - auto mark_array = - graph.as_table (sc.this_index, &markArray); - if (!mark_array) return -1; - unsigned new_mark_array = - mark_array.table->clone (sc.c, - mark_array.index, - sc.mark_array_links, - marks, - start); - graph.add_link (&(prime->markArray), prime_id, new_mark_array); + marks.get_population () * 2 + 4)); + + TRY_ASSIGN (auto mark_array, + graph.as_mutable_table (sc.this_index, &markArray)); + + TRY_ASSIGN (unsigned new_mark_array, + mark_array.table->clone (sc.c, + mark_array.index, + sc.mark_array_links, + marks, + start)); + TRY (graph.add_link (&(prime->markArray), prime_id, new_mark_array)); unsigned class_count = classCount; - auto base_array = - graph.as_table (sc.this_index, &baseArray, class_count); - if (!base_array) return -1; - unsigned new_base_array = - base_array.table->clone (sc.c, - base_array.index, - start, end, this->classCount); - graph.add_link (&(prime->baseArray), prime_id, new_base_array); - - return prime_id; + TRY_ASSIGN (auto base_array, + graph.as_mutable_table (sc.this_index, &baseArray, class_count)); + + TRY_ASSIGN (unsigned new_base_array, + base_array.table->clone (sc.c, + base_array.index, + start, end, this->classCount)); + TRY (graph.add_link (&(prime->baseArray), prime_id, new_base_array)); + + return Ok(prime_id); } }; struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos { - hb_vector_t split_subtables (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> split_subtables (gsubgpos_graph_context_t& c, + unsigned this_index) { switch (u.format.v) { case 1: + hb_barrier (); return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, this_index); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; - // Don't split 24bit MarkBasePos's. + // 24-bit MarkBasePos already has widened offsets; leave it unsplit. #endif default: - return hb_vector_t (); + return Ok(hb_vector_t ()); } } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < u.format.v.get_size ()) return false; + size_t vertex_len = vertex.table_size (); + if (unlikely (vertex_len < u.format.v.get_size ())) return Err(SANITIZE_FAILURE); hb_barrier (); switch (u.format.v) { case 1: + hb_barrier (); return ((MarkBasePosFormat1*)(&u.format1))->sanitize (vertex); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; #endif default: // We don't handle format 3 and 4 here. - return false; + return Err(SANITIZE_FAILURE); } } }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh index 7c3b048195d8..2c1d76d492c0 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh @@ -37,23 +37,24 @@ namespace graph { struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; + size_t vertex_len = vertex.table_size (); unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3::min_size; - if (vertex_len < min_size) return false; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); - return vertex_len >= - min_size + pairSet.get_size () - pairSet.len.get_size(); + if (unlikely (vertex_len < min_size + pairSet.get_size () - pairSet.len.get_size())) + return Err(SANITIZE_FAILURE); + return Ok(); } - hb_vector_t split_subtables (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> split_subtables (gsubgpos_graph_context_t& c, + unsigned this_index) { hb_set_t visited; - const unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage); + TRY_ASSIGN (const unsigned coverage_id, c.graph.index_for_offset (this_index, &coverage)); const unsigned coverage_size = c.graph.vertices_[coverage_id].table_size (); const unsigned base_size = OT::Layout::GPOS_impl::PairPosFormat1_3::min_size; @@ -62,9 +63,9 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 split_points; for (unsigned i = 0; i < pairSet.len; i++) { - unsigned pair_set_index = pair_set_graph_index (c, this_index, i); + TRY_ASSIGN (unsigned pair_set_index, pair_set_graph_index (c, this_index, i)); unsigned accumulated_delta = - c.graph.find_subgraph_size (pair_set_index, visited) + + c.graph.find_subgraph_size (pair_set_index, visited).value_or (0) + SmallTypes::size; // for PairSet offset. partial_coverage_size += OT::HBUINT16::static_size; @@ -74,6 +75,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3= (1 << 16)) { split_points.push (i); + TRY (graph_result_t::from (split_points, ALLOCATION_FAILURE)); accumulated = base_size + accumulated_delta; partial_coverage_size = 6; visited.clear (); // node sharing isn't allowed between splits. @@ -101,20 +103,20 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3pairSet.len; } - unsigned clone_range (unsigned start, unsigned end) + graph_result_t clone_range (unsigned start, unsigned end) { return thiz->clone_range (this->c, this->this_index, start, end); } - bool shrink (unsigned count) + graph_result_t shrink (unsigned count) { return thiz->shrink (this->c, this->this_index, count); } }; - bool shrink (gsubgpos_graph_context_t& c, - unsigned this_index, - unsigned count) + graph_result_t shrink (gsubgpos_graph_context_t& c, + unsigned this_index, + unsigned count) { DEBUG_MSG (SUBSET_REPACK, nullptr, " Shrinking PairPosFormat1 (%u) to [0, %u).", @@ -122,13 +124,12 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3= old_count) - return true; + return Ok(); pairSet.len = count; - c.graph.vertices_[this_index].obj.tail -= (old_count - count) * SmallTypes::size; + c.graph.vertices_[this_index].shrink_buffer ((old_count - count) * SmallTypes::size); - auto coverage = c.graph.as_mutable_table (this_index, &this->coverage); - if (!coverage) return false; + TRY_ASSIGN (auto coverage, c.graph.as_mutable_table (this_index, &this->coverage)); unsigned coverage_size = coverage.vertex->table_size (); auto new_coverage = @@ -144,9 +145,9 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 clone_range (gsubgpos_graph_context_t& c, + unsigned this_index, + unsigned start, unsigned end) const { DEBUG_MSG (SUBSET_REPACK, nullptr, " Cloning PairPosFormat1 (%u) range [%u, %u).", this_index, start, end); @@ -155,8 +156,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3::min_size + num_pair_sets * SmallTypes::size; - unsigned pair_pos_prime_id = c.create_node (prime_size); - if (pair_pos_prime_id == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned pair_pos_prime_id, c.create_node (prime_size)); PairPosFormat1* pair_pos_prime = (PairPosFormat1*) c.graph.object (pair_pos_prime_id).head; pair_pos_prime->format = this->format; @@ -166,26 +166,28 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 (this_index, - &pairSet[i], - pair_pos_prime_id, - &pair_pos_prime->pairSet[i - start]); + TRY (c.graph.move_child<> (this_index, + &pairSet[i], + pair_pos_prime_id, + &pair_pos_prime->pairSet[i - start])); } - unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage); - if (!Coverage::clone_coverage (c, + // Restore correct ordering of the vertex links which are disturbed by move_child. + c.graph.vertices_[this_index].sort_real_links (); + + TRY_ASSIGN (unsigned coverage_id, c.graph.index_for_offset (this_index, &coverage)); + TRY (Coverage::clone_coverage (c, coverage_id, pair_pos_prime_id, 2, - start, end)) - return -1; + start, end)); - return pair_pos_prime_id; + return Ok(pair_pos_prime_id); } - unsigned pair_set_graph_index (gsubgpos_graph_context_t& c, unsigned this_index, unsigned i) const + graph_result_t pair_set_graph_index (gsubgpos_graph_context_t& c, unsigned this_index, unsigned i) const { return c.graph.index_for_offset (this_index, &pairSet[i]); } @@ -193,32 +195,33 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.table_size (); unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat2_4::min_size; - if (vertex_len < min_size) return false; + if (unlikely (vertex_len < min_size)) return Err(SANITIZE_FAILURE); hb_barrier (); const unsigned class1_count = class1Count; - return vertex_len >= - min_size + class1_count * get_class1_record_size (); + if (unlikely (vertex_len < min_size + class1_count * get_class1_record_size ())) + return Err(SANITIZE_FAILURE); + return Ok(); } - hb_vector_t split_subtables (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> split_subtables (gsubgpos_graph_context_t& c, + unsigned this_index) { const unsigned base_size = OT::Layout::GPOS_impl::PairPosFormat2_4::min_size; - const unsigned class_def_2_size = size_of (c, this_index, &classDef2); - const Coverage* coverage = get_coverage (c, this_index); - const ClassDef* class_def_1 = get_class_def_1 (c, this_index); + TRY_ASSIGN (const unsigned class_def_2_size, size_of (c, this_index, &classDef2)); + TRY_ASSIGN (const Coverage* coverage, get_coverage (c, this_index)); + TRY_ASSIGN (const ClassDef* class_def_1, get_class_def_1 (c, this_index)); auto gid_and_class = + coverage->iter () | hb_map_retains_sorting ([&] (hb_codepoint_t gid) { return hb_codepoint_pair_t (gid, class_def_1->get_class (gid)); }) ; - class_def_size_estimator_t estimator (gid_and_class); + TRY_ASSIGN (class_def_size_estimator_t estimator, class_def_size_estimator_t::create (gid_and_class)); const unsigned class1_count = class1Count; const unsigned class2_count = class2Count; @@ -236,7 +239,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4 split_points; - hb_hashmap_t device_tables = get_all_device_tables (c, this_index); + TRY_ASSIGN (auto device_tables, get_all_device_tables (c, this_index)); hb_vector_t format1_device_table_indices = valueFormat1.get_device_table_indices (); hb_vector_t format2_device_table_indices = valueFormat2.get_device_table_indices (); bool has_device_tables = bool(format1_device_table_indices) || bool(format2_device_table_indices); @@ -276,6 +279,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4= (1 << 16)) { split_points.push (i); + TRY (graph_result_t::from (split_points, ALLOCATION_FAILURE)); // split does not include i, so add the size for i when we reset the size counters. accumulated = base_size + accumulated_delta; @@ -326,12 +330,12 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4class1Count; } - unsigned clone_range (unsigned start, unsigned end) + graph_result_t clone_range (unsigned start, unsigned end) { return thiz->clone_range (*this, start, end); } - bool shrink (unsigned count) + graph_result_t shrink (unsigned count) { return thiz->shrink (*this, count); } @@ -344,8 +348,8 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4 clone_range (split_context_t& split_context, + unsigned start, unsigned end) const { DEBUG_MSG (SUBSET_REPACK, nullptr, " Cloning PairPosFormat2 (%u) range [%u, %u).", split_context.this_index, start, end); @@ -356,8 +360,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4::min_size + num_records * split_context.class1_record_size; - unsigned pair_pos_prime_id = split_context.c.create_node (prime_size); - if (pair_pos_prime_id == (unsigned) -1) return -1; + TRY_ASSIGN (unsigned pair_pos_prime_id, split_context.c.create_node (prime_size)); PairPosFormat2* pair_pos_prime = (PairPosFormat2*) graph.object (pair_pos_prime_id).head; @@ -366,24 +369,24 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4valueFormat2 = this->valueFormat2; pair_pos_prime->class1Count = num_records; pair_pos_prime->class2Count = this->class2Count; - clone_class1_records (split_context, - pair_pos_prime_id, - start, - end); - - unsigned coverage_id = - graph.index_for_offset (split_context.this_index, &coverage); - unsigned class_def_1_id = - graph.index_for_offset (split_context.this_index, &classDef1); + TRY (clone_class1_records (split_context, + pair_pos_prime_id, + start, + end)); + + TRY_ASSIGN (unsigned coverage_id, + graph.index_for_offset (split_context.this_index, &coverage)); + TRY_ASSIGN (unsigned class_def_1_id, + graph.index_for_offset (split_context.this_index, &classDef1)); + auto& coverage_v = graph.vertices_[coverage_id]; auto& class_def_1_v = graph.vertices_[class_def_1_id]; - Coverage* coverage_table = (Coverage*) coverage_v.obj.head; - ClassDef* class_def_1_table = (ClassDef*) class_def_1_v.obj.head; - if (!coverage_table - || !coverage_table->sanitize (coverage_v) - || !class_def_1_table - || !class_def_1_table->sanitize (class_def_1_v)) - return -1; + const Coverage* coverage_table = (const Coverage*) coverage_v.obj().head; + const ClassDef* class_def_1_table = (const ClassDef*) class_def_1_v.obj().head; + if (unlikely (!coverage_table || !class_def_1_table)) + return Err(INVALID_ARGUMENT); + TRY (coverage_table->sanitize (coverage_v)); + TRY (class_def_1_table->sanitize (class_def_1_v)); auto klass_map = + coverage_table->iter () @@ -399,36 +402,32 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4width = SmallTypes::size; - class_def_link->objidx = class_def_2_id; - class_def_link->position = 10; - graph.vertices_[class_def_2_id].add_parent (pair_pos_prime_id, false); - - return pair_pos_prime_id; + TRY_ASSIGN (unsigned class_def_2_id, + graph.index_for_offset (split_context.this_index, &classDef2)); + + TRY(graph.vertices_[pair_pos_prime_id].add_real_link (SmallTypes::size, class_def_2_id, 10)); + TRY(graph.vertices_[class_def_2_id].add_parent (pair_pos_prime_id, false)); + + return Ok(pair_pos_prime_id); } - void clone_class1_records (split_context_t& split_context, - unsigned pair_pos_prime_id, - unsigned start, unsigned end) const + graph_result_t clone_class1_records (split_context_t& split_context, + unsigned pair_pos_prime_id, + unsigned start, unsigned end) const { PairPosFormat2* pair_pos_prime = (PairPosFormat2*) split_context.c.graph.object (pair_pos_prime_id).head; @@ -442,7 +441,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4& device_table_indices, - unsigned old_value_record_index, - unsigned new_value_record_index) const + graph_result_t transfer_device_tables (split_context_t& split_context, + unsigned pair_pos_prime_id, + const hb_vector_t& device_table_indices, + unsigned old_value_record_index, + unsigned new_value_record_index) const { PairPosFormat2* pair_pos_prime = (PairPosFormat2*) split_context.c.graph.object (pair_pos_prime_id).head; @@ -485,16 +485,21 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4values[new_value_record_index + i]); + (OT::Offset16*) &pair_pos_prime->values[new_value_record_index + i])); } + + // Restore correct ordering of the vertex links which are disturbed by move_child. + split_context.c.graph.vertices_[split_context.this_index].sort_real_links (); + + return Ok(); } - bool shrink (split_context_t& split_context, - unsigned count) + graph_result_t shrink (split_context_t& split_context, + unsigned count) { DEBUG_MSG (SUBSET_REPACK, nullptr, " Shrinking PairPosFormat2 (%u) to [0, %u).", @@ -502,20 +507,18 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4= old_count) - return true; + return Ok(); graph_t& graph = split_context.c.graph; class1Count = count; - graph.vertices_[split_context.this_index].obj.tail -= - (old_count - count) * split_context.class1_record_size; + graph.vertices_[split_context.this_index].shrink_buffer( + (old_count - count) * split_context.class1_record_size); - auto coverage = - graph.as_mutable_table (split_context.this_index, &this->coverage); - if (!coverage) return false; + TRY_ASSIGN (auto coverage, + graph.as_mutable_table (split_context.this_index, &this->coverage)); - auto class_def_1 = - graph.as_mutable_table (split_context.this_index, &classDef1); - if (!class_def_1) return false; + TRY_ASSIGN (auto class_def_1, + graph.as_mutable_table (split_context.this_index, &classDef1)); auto klass_map = + coverage.table->iter () @@ -528,13 +531,12 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4table_size ()); } - hb_hashmap_t + graph_result_t> get_all_device_tables (gsubgpos_graph_context_t& c, unsigned this_index) const { @@ -550,27 +552,28 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4 get_coverage (gsubgpos_graph_context_t& c, + unsigned this_index) const { - unsigned coverage_id = c.graph.index_for_offset (this_index, &coverage); + TRY_ASSIGN (unsigned coverage_id, c.graph.index_for_offset (this_index, &coverage)); auto& coverage_v = c.graph.vertices_[coverage_id]; - Coverage* coverage_table = (Coverage*) coverage_v.obj.head; - if (!coverage_table || !coverage_table->sanitize (coverage_v)) - return &Null(Coverage); + const Coverage* coverage_table = (const Coverage*) coverage_v.obj().head; + if (unlikely (!coverage_table)) return Err(INVALID_ARGUMENT); + TRY(coverage_table->sanitize (coverage_v)); + return coverage_table; } - const ClassDef* get_class_def_1 (gsubgpos_graph_context_t& c, - unsigned this_index) const + graph_result_t get_class_def_1 (gsubgpos_graph_context_t& c, + unsigned this_index) const { - unsigned class_def_1_id = c.graph.index_for_offset (this_index, &classDef1); + TRY_ASSIGN (unsigned class_def_1_id, c.graph.index_for_offset (this_index, &classDef1)); auto& class_def_1_v = c.graph.vertices_[class_def_1_id]; - ClassDef* class_def_1_table = (ClassDef*) class_def_1_v.obj.head; - if (!class_def_1_table || !class_def_1_table->sanitize (class_def_1_v)) - return &Null(ClassDef); + const ClassDef* class_def_1_table = (const ClassDef*) class_def_1_v.obj().head; + if (unlikely (!class_def_1_table)) return Err(INVALID_ARGUMENT); + TRY(class_def_1_table->sanitize (class_def_1_v)); return class_def_1_table; } @@ -587,50 +590,54 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4 size_of (gsubgpos_graph_context_t& c, + unsigned this_index, + const void* offset) const { - const unsigned id = c.graph.index_for_offset (this_index, offset); - return c.graph.vertices_[id].table_size (); + TRY_ASSIGN (const unsigned id, c.graph.index_for_offset (this_index, offset)); + return Ok(c.graph.vertices_[id].table_size ()); } }; struct PairPos : public OT::Layout::GPOS_impl::PairPos { - hb_vector_t split_subtables (gsubgpos_graph_context_t& c, - unsigned this_index) + graph_result_t> split_subtables (gsubgpos_graph_context_t& c, + unsigned this_index) { switch (u.format.v) { case 1: + hb_barrier (); return ((PairPosFormat1*)(&u.format1))->split_subtables (c, this_index); case 2: + hb_barrier (); return ((PairPosFormat2*)(&u.format2))->split_subtables (c, this_index); #ifndef HB_NO_BEYOND_64K case 3: HB_FALLTHROUGH; case 4: HB_FALLTHROUGH; - // Don't split 24bit PairPos's. + // 24-bit PairPos formats already have widened offsets; leave them unsplit. #endif default: - return hb_vector_t (); + return Ok(hb_vector_t ()); } } - bool sanitize (graph_t::vertex_t& vertex) const + graph_result_t sanitize (const graph_t::vertex_t& vertex) const { - size_t vertex_len = vertex.obj.tail - vertex.obj.head; - if (vertex_len < u.format.v.get_size ()) return false; + size_t vertex_len = vertex.table_size(); + if (unlikely (vertex_len < u.format.v.get_size ())) return Err(SANITIZE_FAILURE); hb_barrier (); switch (u.format.v) { case 1: + hb_barrier (); return ((PairPosFormat1*)(&u.format1))->sanitize (vertex); case 2: + hb_barrier (); return ((PairPosFormat2*)(&u.format2))->sanitize (vertex); #ifndef HB_NO_BEYOND_64K case 3: HB_FALLTHROUGH; @@ -638,7 +645,7 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos #endif default: // We don't handle format 3 and 4 here. - return false; + return Err(SANITIZE_FAILURE); } } }; diff --git a/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh b/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh index 4f89f1011d80..d33b736adc63 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh @@ -27,6 +27,8 @@ #ifndef GRAPH_SERIALIZE_HH #define GRAPH_SERIALIZE_HH +#include "graph-result.hh" + namespace graph { struct overflow_record_t @@ -104,38 +106,41 @@ bool is_valid_offset (int64_t offset, /* * Will any offsets overflow on graph when it's serialized? */ -inline bool +inline graph_result_t will_overflow (graph_t& graph, hb_vector_t* overflows = nullptr) { if (overflows) overflows->clear (); graph.update_positions (); - hb_hashmap_t record_set; + hb_hashmap_t record_set; const auto& vertices = graph.vertices_; for (unsigned parent_idx : graph.ordering_) { // Don't need to check virtual links for overflow - for (const auto& link : vertices.arrayZ[parent_idx].obj.real_links) + for (const auto& link : vertices.arrayZ[parent_idx].obj ().real_links) { int64_t offset = compute_offset (graph, parent_idx, link); if (likely (is_valid_offset (offset, link))) continue; - if (!overflows) return true; + if (!overflows) return Ok(true); overflow_record_t r; r.parent = parent_idx; r.child = link.objidx; - if (record_set.has(&r)) continue; // don't keep duplicate overflows. + if (record_set.has(r)) continue; // don't keep duplicate overflows. overflows->push (r); - record_set.set(&r, true); + record_set.set (r, true); } } - if (!overflows) return false; - return overflows->length; + TRY (graph_result_t::from (record_set, ALLOCATION_FAILURE)); + if (overflows) + TRY (graph_result_t::from (*overflows, ALLOCATION_FAILURE)); + + return Ok((bool) (overflows && overflows->length)); } inline @@ -144,7 +149,13 @@ void print_overflows (graph_t& graph, { if (!DEBUG_ENABLED(SUBSET_REPACK)) return; - graph.update_parents (); + auto r = graph.update_parents (); + if (r.is_err()) { + DEBUG_MSG (SUBSET_REPACK, nullptr, "Unable to print overflows due to error updating parent links: %s", + to_string(r.error())); + return; + } + int limit = 10; for (const auto& o : overflows) { @@ -157,11 +168,11 @@ void print_overflows (graph_t& graph, "%4u (%4u in, %4u out, space %2u)", o.parent, parent.incoming_edges (), - parent.obj.real_links.length + parent.obj.virtual_links.length, + parent.obj ().real_links.length + parent.obj ().virtual_links.length, graph.space_for (o.parent), o.child, child.incoming_edges (), - child.obj.real_links.length + child.obj.virtual_links.length, + child.obj ().real_links.length + child.obj ().virtual_links.length, graph.space_for (o.child)); } if (overflows.length > 10) { @@ -176,7 +187,12 @@ serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link, const hb_vector_t& id_map, hb_serialize_context_t* c) { - assert(link.position + link.width <= size); + // A link must never write outside the bounds of its parent object. + if (unlikely (link.position + link.width > size)) + { + c->err (HB_SERIALIZE_ERROR_OTHER); + return; + } OT::Offset* offset = reinterpret_cast*> (head + link.position); *offset = 0; @@ -226,16 +242,16 @@ void serialize_link (const hb_serialize_context_t::object_t::link_t& link, /* * serialize graph into the provided serialization buffer. */ -inline hb_blob_t* serialize (const graph_t& graph) +inline graph_result_t serialize (const graph_t& graph) { hb_vector_t buffer; size_t size = graph.total_size_in_bytes (); - if (!size) return hb_blob_get_empty (); + if (!size) return Ok(hb_blob_get_empty ()); - if (!buffer.alloc (size)) { + if (unlikely (!buffer.alloc (size))) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Unable to allocate output buffer."); - return nullptr; + return Err(ALLOCATION_FAILURE); } hb_serialize_context_t c((void *) buffer, size); @@ -247,25 +263,29 @@ inline hb_blob_t* serialize (const graph_t& graph) // Maps from our obj id's to the id's used during this serialization. hb_vector_t id_map; - id_map.resize(graph.ordering_.length); + if (unlikely (!id_map.resize(graph.ordering_.length))) { + DEBUG_MSG (SUBSET_REPACK, nullptr, "Unable to allocate id_map buffer."); + return Err(ALLOCATION_FAILURE); + } + for (int pos = graph.ordering_.length - 1; pos >= 0; pos--) { unsigned i = graph.ordering_[pos]; c.push (); auto& v = vertices[i]; - size_t size = v.obj.tail - v.obj.head; + size_t size = v.table_size (); char* start = c.allocate_size (size); - if (!start) { + if (unlikely (!start)) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Buffer out of space."); - return nullptr; + return Err(ALLOCATION_FAILURE); } - hb_memcpy (start, v.obj.head, size); + hb_memcpy (start, v.obj ().head, size); // Only real links needs to be serialized. - for (const auto& link : v.obj.real_links) + for (const auto& link : v.obj ().real_links) serialize_link (link, start, size, id_map, &c); // All duplications are already encoded in the graph, so don't @@ -274,13 +294,17 @@ inline hb_blob_t* serialize (const graph_t& graph) } c.end_serialize (); - if (c.in_error ()) { + if (unlikely (c.in_error ())) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Error during serialization. Err flag: %d", c.errors); - return nullptr; + if (c.errors & HB_SERIALIZE_ERROR_OFFSET_OVERFLOW) + return Err(OVERFLOW_RESOLUTION_FAILED); + return Err(ALLOCATION_FAILURE); } - return c.copy_blob (); + auto* blob = c.copy_blob (); + if (unlikely (!blob)) return Err(ALLOCATION_FAILURE); + return Ok(blob); } } // namespace graph diff --git a/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh b/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh index f1f86e332db9..b10e9d3a8483 100644 --- a/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh +++ b/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh @@ -27,16 +27,18 @@ #ifndef GRAPH_SPLIT_HELPERS_HH #define GRAPH_SPLIT_HELPERS_HH +#include "graph-result.hh" + namespace graph { template HB_INTERNAL -hb_vector_t actuate_subtable_split (Context& split_context, - const hb_vector_t& split_points) +graph_result_t> actuate_subtable_split (Context& split_context, + const hb_vector_t& split_points) { hb_vector_t new_objects; if (!split_points) - return new_objects; + return Ok(new_objects); for (unsigned i = 0; i < split_points.length; i++) { @@ -44,24 +46,14 @@ hb_vector_t actuate_subtable_split (Context& split_context, unsigned end = (i < split_points.length - 1) ? split_points[i + 1] : split_context.original_count (); - unsigned id = split_context.clone_range (start, end); - - if (id == (unsigned) -1) - { - new_objects.reset (); - new_objects.ensure_error (); - return new_objects; - } + TRY_ASSIGN (unsigned id, split_context.clone_range (start, end)); new_objects.push (id); + TRY (graph_result_t::from (new_objects, ALLOCATION_FAILURE)); } - if (!split_context.shrink (split_points[0])) - { - new_objects.reset (); - new_objects.ensure_error (); - } + TRY (split_context.shrink (split_points[0])); - return new_objects; + return Ok(new_objects); } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh index b14540f3a714..10aafea4bb36 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh @@ -127,10 +127,10 @@ struct bsln switch (format) { - case 0: return_trace (parts.format0.sanitize (c)); - case 1: return_trace (parts.format1.sanitize (c)); - case 2: return_trace (parts.format2.sanitize (c)); - case 3: return_trace (parts.format3.sanitize (c)); + case 0: hb_barrier (); return_trace (parts.format0.sanitize (c)); + case 1: hb_barrier (); return_trace (parts.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (parts.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (parts.format3.sanitize (c)); default:return_trace (true); } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh index 4bb41fd0189b..edb563266f30 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh @@ -49,6 +49,17 @@ struct ankr; using hb_aat_class_cache_t = hb_ot_layout_mapping_cache_t; +/* The state-machine subtables' transition functions are called once per + * transition from the drive loop, but are big enough that the compiler + * declines to inline them, leaving a call in the hottest loop of AAT + * shaping. Forcing them inline is worth 3-10% instructions on + * morx/kerx-heavy fonts, for about 16KB of code. */ +#ifndef HB_OPTIMIZE_SIZE +#define HB_AAT_TRANSITION_INLINE HB_ALWAYS_INLINE +#else +#define HB_AAT_TRANSITION_INLINE +#endif + struct hb_aat_scratch_t { hb_aat_scratch_t () = default; @@ -182,20 +193,26 @@ struct hb_aat_apply_context_t : buffer_glyph_set->add_array (glyphs, count); for (unsigned int i = 0; i < count; i++) { + bool at_end_of_text = buffer->idx == buffer->len; + if (at_end_of_text) + if (unlikely (!buffer->output_glyph (glyphs[i]))) return false; + + hb_glyph_info_t &info = at_end_of_text ? buffer->prev () : buffer->cur (); if (glyphs[i] == DELETED_GLYPH) { buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED; - _hb_glyph_info_set_aat_deleted (&buffer->cur()); + _hb_glyph_info_set_aat_deleted (&info); } else { #ifndef HB_NO_OT_LAYOUT if (has_glyph_classes) - _hb_glyph_info_set_glyph_props (&buffer->cur(), + _hb_glyph_info_set_glyph_props (&info, gdef.get_glyph_props (glyphs[i])); #endif } - if (unlikely (!buffer->output_glyph (glyphs[i]))) return false; + if (!at_end_of_text) + if (unlikely (!buffer->output_glyph (glyphs[i]))) return false; } return true; } @@ -222,12 +239,19 @@ struct hb_aat_apply_context_t : { buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED; _hb_glyph_info_set_aat_deleted (&buffer->cur()); + if (likely (using_buffer_glyph_set)) + buffer_glyph_set->add (DELETED_GLYPH); return buffer->replace_glyph (DELETED_GLYPH); } void replace_glyph_inplace (unsigned i, hb_codepoint_t glyph) { buffer->info[i].codepoint = glyph; + if (glyph == DELETED_GLYPH) + { + buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED; + _hb_glyph_info_set_aat_deleted (&buffer->info[i]); + } if (likely (using_buffer_glyph_set)) buffer_glyph_set->add (glyph); #ifndef HB_NO_OT_LAYOUT @@ -792,7 +816,7 @@ struct Lookup public: DEFINE_SIZE_UNION (2, format.v); }; -DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2); +DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 13); /* * (Extended) State Table @@ -1134,31 +1158,37 @@ struct ObsoleteTypes typedef ClassTable ClassTypeWide; template - static unsigned int offsetToIndex (unsigned int offset, - const void *base, - const T *array) + static int offsetToIndex (int64_t offset, + const void *base, + const T *array) { + int64_t array_offset = (const char *) array - (const char *) base; + int bad_index = INT_MAX / T::static_size; + /* https://github.com/harfbuzz/harfbuzz/issues/3483 */ /* If offset is less than base, return an offset that would * result in an address half a 32bit address-space away, * to make sure sanitize fails even on 32bit builds. */ - if (unlikely (offset < unsigned ((const char *) array - (const char *) base))) - return INT_MAX / T::static_size; + if (unlikely (offset < array_offset)) + return bad_index; /* https://github.com/harfbuzz/harfbuzz/issues/2816 */ - return (offset - unsigned ((const char *) array - (const char *) base)) / T::static_size; + int64_t index = (offset - array_offset) / T::static_size; + if (unlikely (index > bad_index)) + return bad_index; + return index; } template - static unsigned int byteOffsetToIndex (unsigned int offset, - const void *base, - const T *array) + static int byteOffsetToIndex (int64_t offset, + const void *base, + const T *array) { return offsetToIndex (offset, base, array); } template - static unsigned int wordOffsetToIndex (unsigned int offset, - const void *base, - const T *array) + static int wordOffsetToIndex (int64_t offset, + const void *base, + const T *array) { return offsetToIndex (2 * offset, base, array); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh index 7b68a932c3f1..4f7ce989b344 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh @@ -114,7 +114,7 @@ struct FeatureName if (pdefault_index) *pdefault_index = default_index; - if (selectors_count) + if (selectors_count && selectors) { + settings_table.sub_array (start_offset, selectors_count) | hb_map ([=] (const SettingName& setting) { return setting.get_info (default_selector); }) @@ -168,7 +168,7 @@ struct feat unsigned int *count, hb_aat_layout_feature_type_t *features) const { - if (count) + if (count && features) { + namesZ.as_array (featureNameCount).sub_array (start_offset, count) | hb_map (&FeatureName::get_feature_type) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh index 1186cad41f81..a56729f1a08a 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh @@ -258,6 +258,7 @@ struct KerxSubTableFormat1 depth (0), crossStream (table->header.coverage & table->header.CrossStream) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -322,15 +323,15 @@ struct KerxSubTableFormat1 } else if (o.attach_type()) { - o.y_offset += c->font->em_scale_y (v); + o.y_offset = hb_saturate_add (o.y_offset, c->font->em_scale_y (v)); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; } } else if (buffer->info[idx].mask & kern_mask) { auto scaled = c->font->em_scale_x (v); - o.x_advance += scaled; - o.x_offset += scaled; + o.x_advance = hb_saturate_add (o.x_advance, scaled); + o.x_offset = hb_saturate_add (o.x_offset, scaled); } } else @@ -346,14 +347,15 @@ struct KerxSubTableFormat1 } else if (o.attach_type()) { - o.x_offset += c->font->em_scale_x (v); + o.x_offset = hb_saturate_add (o.x_offset, c->font->em_scale_x (v)); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT; } } else if (buffer->info[idx].mask & kern_mask) { - o.y_advance += c->font->em_scale_y (v); - o.y_offset += c->font->em_scale_y (v); + auto scaled = c->font->em_scale_y (v); + o.y_advance = hb_saturate_add (o.y_advance, scaled); + o.y_offset = hb_saturate_add (o.y_offset, scaled); } } } @@ -550,6 +552,7 @@ struct KerxSubTableFormat4 mark_set (false), mark (0) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -583,8 +586,8 @@ struct KerxSubTableFormat4 &currX, &currY)) return; - o.x_offset = markX - currX; - o.y_offset = markY - currY; + o.x_offset = hb_saturate_sub (markX, currX); + o.y_offset = hb_saturate_sub (markY, currY); } break; @@ -605,8 +608,10 @@ struct KerxSubTableFormat4 currAnchorPoint, c->sanitizer.get_num_glyphs ()); - o.x_offset = c->font->em_scale_x (markAnchor.xCoordinate) - c->font->em_scale_x (currAnchor.xCoordinate); - o.y_offset = c->font->em_scale_y (markAnchor.yCoordinate) - c->font->em_scale_y (currAnchor.yCoordinate); + o.x_offset = hb_saturate_sub (c->font->em_scale_x (markAnchor.xCoordinate), + c->font->em_scale_x (currAnchor.xCoordinate)); + o.y_offset = hb_saturate_sub (c->font->em_scale_y (markAnchor.yCoordinate), + c->font->em_scale_y (currAnchor.yCoordinate)); } break; @@ -622,8 +627,8 @@ struct KerxSubTableFormat4 int currX = *data++; int currY = *data++; - o.x_offset = c->font->em_scale_x (markX) - c->font->em_scale_x (currX); - o.y_offset = c->font->em_scale_y (markY) - c->font->em_scale_y (currY); + o.x_offset = hb_saturate_sub (c->font->em_scale_x (markX), c->font->em_scale_x (currX)); + o.y_offset = hb_saturate_sub (c->font->em_scale_y (markY), c->font->em_scale_y (currY)); } break; } @@ -870,11 +875,11 @@ struct KerxSubTable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.format0, std::forward (ds)...)); - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); - case 6: return_trace (c->dispatch (u.format6, std::forward (ds)...)); + case 0: hb_barrier (); return_trace (c->dispatch (u.format0, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 6: hb_barrier (); return_trace (c->dispatch (u.format6, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } @@ -884,11 +889,11 @@ struct KerxSubTable { unsigned int subtable_type = get_type (); switch (subtable_type) { - case 0: u.format0.collect_glyphs (first_set, second_set, num_glyphs); return; - case 1: u.format1.collect_glyphs (first_set, second_set, num_glyphs); return; - case 2: u.format2.collect_glyphs (first_set, second_set, num_glyphs); return; - case 4: u.format4.collect_glyphs (first_set, second_set, num_glyphs); return; - case 6: u.format6.collect_glyphs (first_set, second_set, num_glyphs); return; + case 0: hb_barrier (); u.format0.collect_glyphs (first_set, second_set, num_glyphs); return; + case 1: hb_barrier (); u.format1.collect_glyphs (first_set, second_set, num_glyphs); return; + case 2: hb_barrier (); u.format2.collect_glyphs (first_set, second_set, num_glyphs); return; + case 4: hb_barrier (); u.format4.collect_glyphs (first_set, second_set, num_glyphs); return; + case 6: hb_barrier (); u.format6.collect_glyphs (first_set, second_set, num_glyphs); return; default: return; } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh index fef21450b27d..4eeb86914b17 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh @@ -84,6 +84,7 @@ struct RearrangementSubtable table (table_), start (0), end (0) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -200,10 +201,12 @@ struct ContextualSubtable struct EntryData { - HBUINT16 markIndex; /* Index of the substitution table for the - * marked glyph (use 0xFFFF for none). */ - HBUINT16 currentIndex; /* Index of the substitution table for the - * current glyph (use 0xFFFF for none). */ + typedef typename std::conditional::type OffsetType; + + OffsetType markIndex; /* Index/offset of the substitution table for the + * marked glyph. */ + OffsetType currentIndex; /* Index/offset of the substitution table for the + * current glyph. */ public: DEFINE_SIZE_STATIC (4); }; @@ -222,7 +225,10 @@ struct ContextualSubtable } bool is_actionable (const Entry &entry) const { - return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF; + if (Types::extended) + return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF; + else + return entry.data.markIndex || entry.data.currentIndex; } struct driver_context_t @@ -238,6 +244,7 @@ struct ContextualSubtable mark (0), subs (table+table->substitutionTables) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -260,13 +267,16 @@ struct ContextualSubtable } else { - unsigned int offset = entry.data.markIndex + buffer->info[mark].codepoint; - const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; - replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; - if (!(replacement->sanitize (&c->sanitizer) && - hb_barrier () && - *replacement)) - replacement = nullptr; + if (entry.data.markIndex) + { + int offset = (int) entry.data.markIndex + buffer->info[mark].codepoint; + const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; + replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; + if (!(replacement->sanitize (&c->sanitizer) && + hb_barrier () && + *replacement)) + replacement = nullptr; + } } if (replacement) { @@ -287,13 +297,16 @@ struct ContextualSubtable } else { - unsigned int offset = entry.data.currentIndex + buffer->info[idx].codepoint; - const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; - replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; - if (!(replacement->sanitize (&c->sanitizer) && - hb_barrier () && - *replacement)) - replacement = nullptr; + if (entry.data.currentIndex) + { + int offset = (int) entry.data.currentIndex + buffer->info[idx].codepoint; + const UnsizedArrayOf &subs_old = (const UnsizedArrayOf &) subs; + replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)]; + if (!(replacement->sanitize (&c->sanitizer) && + hb_barrier () && + *replacement)) + replacement = nullptr; + } } if (replacement) { @@ -479,6 +492,7 @@ struct LigatureSubtable ligature (table+table->ligature), match_length (0) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -776,6 +790,7 @@ struct InsertionSubtable mark (0), insertionAction (table+table->insertionAction) {} + HB_AAT_TRANSITION_INLINE void transition (hb_buffer_t *buffer, StateTableDriver *driver, const Entry &entry) @@ -1067,11 +1082,11 @@ struct ChainSubtable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case Rearrangement: return_trace (c->dispatch (u.rearrangement, std::forward (ds)...)); - case Contextual: return_trace (c->dispatch (u.contextual, std::forward (ds)...)); - case Ligature: return_trace (c->dispatch (u.ligature, std::forward (ds)...)); - case Noncontextual: return_trace (c->dispatch (u.noncontextual, std::forward (ds)...)); - case Insertion: return_trace (c->dispatch (u.insertion, std::forward (ds)...)); + case Rearrangement: hb_barrier (); return_trace (c->dispatch (u.rearrangement, std::forward (ds)...)); + case Contextual: hb_barrier (); return_trace (c->dispatch (u.contextual, std::forward (ds)...)); + case Ligature: hb_barrier (); return_trace (c->dispatch (u.ligature, std::forward (ds)...)); + case Noncontextual: hb_barrier (); return_trace (c->dispatch (u.noncontextual, std::forward (ds)...)); + case Insertion: hb_barrier (); return_trace (c->dispatch (u.insertion, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh index 4ee73ecee69f..a28aba0aa73a 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh @@ -230,13 +230,13 @@ struct trak { hb_position_t advance_to_add = get_h_tracking (c->font, track); foreach_grapheme (buffer, start, end) - buffer->pos[start].x_advance += advance_to_add; + buffer->pos[start].x_advance = hb_saturate_add (buffer->pos[start].x_advance, advance_to_add); } else { hb_position_t advance_to_add = get_v_tracking (c->font, track); foreach_grapheme (buffer, start, end) - buffer->pos[start].y_advance += advance_to_add; + buffer->pos[start].y_advance = hb_saturate_add (buffer->pos[start].y_advance, advance_to_add); } return_trace (true); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc index b349c3026b62..1fd24b136025 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc @@ -411,7 +411,7 @@ hb_aat_layout_track (const hb_ot_shape_plan_t *plan, * @start_offset: offset of the first feature type to retrieve * @feature_count: (inout) (optional): Input = the maximum number of feature types to return; * Output = the actual number of feature types returned (may be zero) - * @features: (out caller-allocates) (array length=feature_count): Array of feature types found + * @features: (out caller-allocates) (array length=feature_count) (nullable): Array of feature types found * * Fetches a list of the AAT feature types included in the specified face. * diff --git a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh index 05053b1f8581..71173a317952 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh @@ -39,6 +39,19 @@ #include #include +static HB_ALWAYS_INLINE void * +hb_malloc2 (size_t nmemb, size_t size) +{ + if (size && nmemb > SIZE_MAX / size) return nullptr; + return hb_malloc (nmemb * size); +} +static HB_ALWAYS_INLINE void * +hb_realloc2 (void *ptr, size_t nmemb, size_t size) +{ + if (size && nmemb > SIZE_MAX / size) return nullptr; + return hb_realloc (ptr, nmemb * size); +} + /* * Flags */ @@ -214,10 +227,10 @@ struct HBInt __builtin_bswap32 ((uint32_t) *((const hb_packed_t *) v)) ; #else - return (BE ? (v[0] << 24) : (v[0] )) - + (BE ? (v[1] << 16) : (v[1] << 8)) - + (BE ? (v[2] << 8) : (v[2] << 16)) - + (BE ? (v[3] ) : (v[3] << 24)); + return (BE ? (uint32_t (v[0]) << 24) : (uint32_t (v[0]) )) + + (BE ? (uint32_t (v[1]) << 16) : (uint32_t (v[1]) << 8)) + + (BE ? (uint32_t (v[2]) << 8) : (uint32_t (v[2]) << 16)) + + (BE ? (uint32_t (v[3]) ) : (uint32_t (v[3]) << 24)); #endif } private: uint8_t v[4]; @@ -332,7 +345,7 @@ static inline double _hb_roundf (double x) { return floor (x + .5); } static inline float -_hb_roundf (float x) { return floorf (x + .5f); } +_hb_roundf (float x) { return floor ((double) x + .5); } #define roundf(x) _hb_roundf(x) @@ -877,6 +890,94 @@ struct } HB_FUNCOBJ (hb_clamp); +/* Signed saturating arithmetic. */ +template +static HB_ALWAYS_INLINE T +hb_saturate_add (T a, T b) +{ + static_assert (std::is_integral::value && std::is_signed::value, ""); + +#if hb_has_builtin(__builtin_add_overflow) + T result; + if (likely (!__builtin_add_overflow (a, b, &result))) + return result; +#else + if (b > 0) + { + if (likely (a <= hb_int_max (T) - b)) + return a + b; + } + else if (likely (a >= hb_int_min (T) - b)) + return a + b; +#endif + + return a < 0 ? hb_int_min (T) : hb_int_max (T); +} + +template +static HB_ALWAYS_INLINE T +hb_saturate_sub (T a, T b) +{ + static_assert (std::is_integral::value && std::is_signed::value, ""); + +#if hb_has_builtin(__builtin_sub_overflow) + T result; + if (likely (!__builtin_sub_overflow (a, b, &result))) + return result; +#else + if (b > 0) + { + if (likely (a >= hb_int_min (T) + b)) + return a - b; + } + else if (likely (a <= hb_int_max (T) + b)) + return a - b; +#endif + + return b < 0 ? hb_int_max (T) : hb_int_min (T); +} + +template +static HB_ALWAYS_INLINE T +hb_saturate_neg (T a) +{ + static_assert (std::is_integral::value && std::is_signed::value, ""); + + return hb_saturate_sub ((T) 0, a); +} + +/* Convert a floating-point value to integer type T, saturating to T's + * range instead of relying on the undefined behavior of an out-of-range + * float-to-int conversion. NaN saturates to the minimum of T. */ +template +static HB_ALWAYS_INLINE T +hb_clamp_to (double v) +{ + return (T) hb_clamp (v, + (double) hb_int_min (T), + (double) hb_int_max (T)); +} + +template +static HB_ALWAYS_INLINE T +hb_clamp_to (float v) +{ + /* Widen explicitly: float cannot represent all integer bounds exactly, + * so the clamp itself is done in double. */ + return hb_clamp_to ((double) v); +} + +template +static HB_ALWAYS_INLINE T +hb_clamp_to (int64_t v) +{ + static_assert (std::is_integral::value && std::is_signed::value, ""); + + return (T) hb_clamp (v, + (int64_t) hb_int_min (T), + (int64_t) hb_int_max (T)); +} + /* * Bithacks. */ @@ -1215,6 +1316,62 @@ hb_unsigned_add_overflows (unsigned int a, unsigned int b, unsigned *result = nu return b > (unsigned int) -1 - a; } +/* Saturating arithmetic on size_t. On platforms where size_t is wider than + * unsigned int (i.e. 64-bit), the inputs to get_size()-style computations + * (counts and static_sizes which are at most 32-bit) cannot overflow size_t, + * so these reduce to plain arithmetic. On 32-bit platforms (size_t is + * unsigned int), they saturate to SIZE_MAX so sanitize/serialize callers + * naturally reject the resulting size as out-of-range. */ + +static inline size_t +hb_unsigned_mul_saturate (size_t a, size_t b) +{ + if (sizeof (size_t) > sizeof (unsigned int)) + return a * b; +#if hb_has_builtin(__builtin_mul_overflow) + size_t result; + if (__builtin_mul_overflow (a, b, &result)) + return (size_t) -1; + return result; +#else + if (b > 0 && a > ((size_t) -1) / b) return (size_t) -1; + return a * b; +#endif +} + +static inline size_t +hb_unsigned_add_saturate (size_t a, size_t b) +{ + if (sizeof (size_t) > sizeof (unsigned int)) + return a + b; +#if hb_has_builtin(__builtin_add_overflow) + size_t result; + if (__builtin_add_overflow (a, b, &result)) + return (size_t) -1; + return result; +#else + if (b > ((size_t) -1) - a) return (size_t) -1; + return a + b; +#endif +} + +/* Variadic forms: fold left across all arguments. */ +template +static inline size_t +hb_unsigned_mul_saturate (size_t a, size_t b, size_t c, Ts... rest) +{ return hb_unsigned_mul_saturate (hb_unsigned_mul_saturate (a, b), c, rest...); } + +template +static inline size_t +hb_unsigned_add_saturate (size_t a, size_t b, size_t c, Ts... rest) +{ return hb_unsigned_add_saturate (hb_unsigned_add_saturate (a, b), c, rest...); } + +/* Saturating mul-add: a * b + c. Covers the dominant get_size() pattern + * `count * static_size + min_size`. */ +static inline size_t +hb_unsigned_mul_add_saturate (size_t a, size_t b, size_t c) +{ return hb_unsigned_add_saturate (hb_unsigned_mul_saturate (a, b), c); } + /* * Sort and search. @@ -1305,143 +1462,87 @@ hb_bsearch (const K& key, V* base, } -/* From https://github.com/noporpoise/sort_r - Feb 5, 2019 (c8c65c1e) - Modified to support optional argument using templates */ - -/* Isaac Turner 29 April 2014 Public Domain */ - -/* -hb_qsort function to be exported. -Parameters: - base is the array to be sorted - nel is the number of elements in the array - width is the size in bytes of each element of the array - compar is the comparison function - arg (optional) is a pointer to be passed to the comparison function - -void hb_qsort(void *base, size_t nel, size_t width, - int (*compar)(const void *_a, const void *_b, [void *_arg]), - [void *arg]); -*/ - -#define SORT_R_SWAP(a,b,tmp) ((void) ((tmp) = (a)), (void) ((a) = (b)), (b) = (tmp)) - -/* swap a and b */ -/* a and b must not be equal! */ -static inline void sort_r_swap(char *__restrict a, char *__restrict b, - size_t w) -{ - char tmp, *end = a+w; - for(; a < end; a++, b++) { SORT_R_SWAP(*a, *b, tmp); } -} - -/* swap a, b iff a>b */ -/* a and b must not be equal! */ -/* __restrict is same as restrict but better support on old machines */ -template -static inline int sort_r_cmpswap(char *__restrict a, - char *__restrict b, size_t w, - Compar compar) -{ - if(compar(a, b) > 0) { - sort_r_swap(a, b, w); - return 1; - } - return 0; -} - -/* -Swap consecutive blocks of bytes of size na and nb starting at memory addr ptr, -with the smallest swap so that the blocks are in the opposite order. Blocks may -be internally re-ordered e.g. - 12345ab -> ab34512 - 123abc -> abc123 - 12abcde -> deabc12 -*/ -static inline void sort_r_swap_blocks(char *ptr, size_t na, size_t nb) -{ - if(na > 0 && nb > 0) { - if(na > nb) { sort_r_swap(ptr, ptr+na, nb); } - else { sort_r_swap(ptr, ptr+nb, na); } - } -} - -/* Implement recursive quicksort ourselves */ -/* Note: quicksort is not stable, equivalent values may be swapped */ -template -static inline void sort_r_simple(void *base, size_t nel, size_t w, - Compar compar) +/* Quicksort partitioning loop: median-of-three pivot, two-way + * Hoare partition, tail-call elimination on the larger side. + * Stops partitioning when subranges shrink below the threshold; + * a single insertion-sort pass over the whole array (run by the + * caller) finishes the job. Same structure libstdc++ uses for + * std::sort. + * + * Not stable; equivalent values may be swapped. */ +/* Quicksort partitioning loop: median-of-three pivot, two-way + * Hoare partition, tail-call elimination on the larger side. + * Stops partitioning when subranges shrink below the threshold; + * a single insertion-sort pass over the whole array (run by + * hb_qsort_inline below) finishes the job. Same shape libstdc++ + * uses for std::sort. + * + * Not stable; equivalent values may be swapped. */ +template +static inline void +hb_qsort_loop (T *base, size_t nel, Compar compar) { - char *b = (char *)base, *end = b + nel*w; - - if(nel < 10) { - /* Insertion sort for arbitrarily small inputs */ - char *pi, *pj; - for(pi = b+w; pi < end; pi += w) { - for(pj = pi; pj > b && sort_r_cmpswap(pj-w,pj,w,compar); pj -= w) {} - } - } - else + while (nel > 24) { - /* nel > 9; Quicksort */ + T *last = base + nel - 1; + T *mid = base + nel / 2; - int cmp; - char *pl, *ple, *pr, *pre, *pivot; - char *last = b+w*(nel-1), *tmp; - - char *l[3]; - l[0] = b + w; - l[1] = b+w*(nel/2); - l[2] = last - w; - - if(compar(l[0],l[1]) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } - if(compar(l[1],l[2]) > 0) { - SORT_R_SWAP(l[1], l[2], tmp); - if(compar(l[0],l[1]) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } + /* Median-of-three pivot, parked at last-1. */ + if (compar (*base, *mid) > 0) hb_swap (*base, *mid); + if (compar (*mid, *last) > 0) + { + hb_swap (*mid, *last); + if (compar (*base, *mid) > 0) hb_swap (*base, *mid); } - - if(l[1] != last) { sort_r_swap(l[1], last, w); } - - pivot = last; - ple = pl = b; - pre = pr = last; - - while(pl < pr) { - for(; pl < pr; pl += w) { - cmp = compar(pl, pivot); - if(cmp > 0) { break; } - else if(cmp == 0) { - if(ple < pl) { sort_r_swap(ple, pl, w); } - ple += w; - } - } - if(pl >= pr) { break; } - for(; pl < pr; ) { - pr -= w; - cmp = compar(pr, pivot); - if(cmp == 0) { - pre -= w; - if(pr < pre) { sort_r_swap(pr, pre, w); } - } - else if(cmp < 0) { - if(pl < pr) { sort_r_swap(pl, pr, w); } - pl += w; - break; - } - } + hb_swap (*mid, *(last - 1)); + T &pivot = *(last - 1); + + /* Two-way Hoare partition. Inner loops are unguarded: + * median-of-three left *base <= pivot and *last >= pivot, + * which act as sentinels. */ + T *i = base, *j = last - 1; + while (true) + { + while (compar (*++i, pivot) < 0) {} + while (compar (*--j, pivot) > 0) {} + if (i >= j) break; + hb_swap (*i, *j); } + hb_swap (*i, *(last - 1)); - pl = pr; - - sort_r_swap_blocks(b, ple-b, pl-ple); - sort_r_swap_blocks(pr, pre-pr, end-pre); - - sort_r_simple(b, (pl-ple)/w, w, compar); - sort_r_simple(end-(pre-pr), (pre-pr)/w, w, compar); + /* Recurse on smaller side, loop on larger — bounds stack + * depth at O(log n). */ + size_t left = (size_t) (i - base); + size_t right = nel - left - 1; + if (left < right) + { + hb_qsort_loop (base, left, compar); + base = i + 1; + nel = right; + } + else + { + hb_qsort_loop (i + 1, right, compar); + nel = left; + } } } +template +static inline void +hb_qsort_inline (T *base, size_t nel, Compar compar) +{ + hb_qsort_loop (base, nel, compar); + + /* Single final insertion sort over the whole array. After + * the partitioning loop, every element is within the threshold + * of its sorted position, so this pass is O(n * threshold). */ + T *end = base + nel; + for (T *pi = base + 1; pi < end; pi++) + for (T *pj = pi; pj > base && compar (pj[-1], pj[0]) > 0; pj--) + hb_swap (pj[-1], pj[0]); +} + static inline void hb_qsort (void *base, size_t nel, size_t width, int (*compar)(const void *_a, const void *_b)) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-array.hh index dd3369307ef8..8eadc4ab8c69 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-array.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-array.hh @@ -32,8 +32,6 @@ #include "hb-iter.hh" #include "hb-null.hh" -#include - template struct hb_sorted_array_t; @@ -227,22 +225,14 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_qsort (arrayZ, length, this->get_item_size (), cmp); return hb_sorted_array_t (*this); } - /* std::sort wants a strict-weak `a < b` boolean, but our other - * qsort overload (and most existing call sites) follow the C - * qsort convention of returning negative / zero / positive ints. - * Adapt to either via overload resolution: bool passes through; - * any other arithmetic return type is treated as the int signed - * comparator. */ - template static bool _qsort_lt (T v) { return v < 0; } - static bool _qsort_lt (bool v) { return v; } + /* Comparator follows the C qsort convention: returns + * negative / zero / positive int. */ template hb_sorted_array_t qsort (Compar compar) { if (likely (length)) - std::sort (arrayZ, arrayZ + length, - [&] (const Type &a, const Type &b) - { return _qsort_lt (compar (a, b)); }); + hb_qsort_inline (arrayZ, length, compar); return hb_sorted_array_t (*this); } @@ -251,7 +241,7 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_enable_if (std::is_move_assignable::value)> hb_sorted_array_t _qsort (hb_priority<1>) { - return qsort ([] (const Type &a, const Type &b) { return Type::cmp (&a, &b) < 0; }); + return qsort ([] (const Type &a, const Type &b) { return Type::cmp (&a, &b); }); } hb_sorted_array_t _qsort (hb_priority<0>) { diff --git a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh index f95a30794755..de37c4b423a6 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh @@ -36,60 +36,8 @@ #include "hb-meta.hh" -/* - * Atomic integers and pointers. - */ - -/* We need external help for these */ - -#if defined(hb_atomic_int_impl_add) \ - && defined(hb_atomic_ptr_impl_get) \ - && defined(hb_atomic_ptr_impl_cmpexch) - -/* Defined externally, i.e. in config.h. */ - - -#elif !defined(HB_NO_MT) && defined(__ATOMIC_ACQUIRE) - -/* C++11-style GCC primitives. We prefer these as they don't require linking to libstdc++ / libc++. */ - -#define _hb_memory_barrier() __sync_synchronize () - -#define hb_atomic_int_impl_add(AI, V) __atomic_fetch_add ((AI), (V), __ATOMIC_ACQ_REL) -#define hb_atomic_int_impl_set_relaxed(AI, V) __atomic_store_n ((AI), (V), __ATOMIC_RELAXED) -#define hb_atomic_int_impl_set(AI, V) __atomic_store_n ((AI), (V), __ATOMIC_RELEASE) -#define hb_atomic_int_impl_get_relaxed(AI) __atomic_load_n ((AI), __ATOMIC_RELAXED) -#define hb_atomic_int_impl_get(AI) __atomic_load_n ((AI), __ATOMIC_ACQUIRE) - -#define hb_atomic_ptr_impl_set_relaxed(P, V) __atomic_store_n ((P), (V), __ATOMIC_RELAXED) -#define hb_atomic_ptr_impl_get_relaxed(P) __atomic_load_n ((P), __ATOMIC_RELAXED) -#define hb_atomic_ptr_impl_get(P) __atomic_load_n ((P), __ATOMIC_ACQUIRE) -static inline bool -_hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N) -{ - const void *O = O_; // Need lvalue - return __atomic_compare_exchange_n ((void **) P, (void **) &O, (void *) N, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); -} -#define hb_atomic_ptr_impl_cmpexch(P,O,N) _hb_atomic_ptr_impl_cmplexch ((const void **) (P), (O), (N)) - - -#elif !defined(HB_NO_MT) - -/* C++11 atomics. */ - +#ifndef HB_NO_MT #include - -#define HB_STL_ATOMIC_IMPL - -#define _hb_memory_r_barrier() std::atomic_thread_fence(std::memory_order_acquire) -#define _hb_memory_w_barrier() std::atomic_thread_fence(std::memory_order_release) - -#else /* defined(HB_NO_MT) */ - -#define hb_atomic_int_impl_add(AI, V) ((*(AI) += (V)) - (V)) -#define _hb_memory_barrier() do {} while (0) -#define hb_atomic_ptr_impl_cmpexch(P,O,N) (* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false) - #endif @@ -110,46 +58,15 @@ static inline void _hb_compiler_memory_r_barrier () {} #endif +#ifndef HB_NO_MT -#ifndef _hb_memory_r_barrier -#define _hb_memory_r_barrier() _hb_memory_barrier () -#endif -#ifndef _hb_memory_w_barrier -#define _hb_memory_w_barrier() _hb_memory_barrier () -#endif -#ifndef hb_atomic_int_impl_set_relaxed -#define hb_atomic_int_impl_set_relaxed(AI, V) (*(AI) = (V)) -#endif -#ifndef hb_atomic_int_impl_get_relaxed -#define hb_atomic_int_impl_get_relaxed(AI) (*(AI)) -#endif - -#ifndef hb_atomic_ptr_impl_set_relaxed -#define hb_atomic_ptr_impl_set_relaxed(P, V) (*(P) = (V)) -#endif -#ifndef hb_atomic_ptr_impl_get_relaxed -#define hb_atomic_ptr_impl_get_relaxed(P) (*(P)) -#endif -#ifndef hb_atomic_int_impl_set -template -inline void hb_atomic_int_impl_set (T *AI, T v) { _hb_memory_w_barrier (); *AI = v; } -#endif -#ifndef hb_atomic_int_impl_get -template -inline T hb_atomic_int_impl_get (const T *AI) { T v = *AI; _hb_memory_r_barrier (); return v; } -#endif -#ifndef hb_atomic_ptr_impl_get -inline void *hb_atomic_ptr_impl_get (void ** const P) { void *v = *P; _hb_memory_r_barrier (); return v; } -#endif - -#ifdef HB_STL_ATOMIC_IMPL template struct hb_atomic_t { hb_atomic_t () = default; constexpr hb_atomic_t (T v) : v (v) {} constexpr hb_atomic_t (const hb_atomic_t& o) : v (o.get_relaxed ()) {} - constexpr hb_atomic_t (hb_atomic_t&& o) : v (o.get_relaxed ()) { o.set_relaxed ({}); } + hb_atomic_t (hb_atomic_t&& o) : v (o.get_relaxed ()) { o.set_relaxed ({}); } hb_atomic_t &operator= (const hb_atomic_t& o) { set_relaxed (o.get_relaxed ()); return *this; } hb_atomic_t &operator= (hb_atomic_t&& o){ set_relaxed (o.get_relaxed ()); o.set_relaxed ({}); return *this; } @@ -177,7 +94,7 @@ struct hb_atomic_t b.set_relaxed (v); } - std::atomic v = 0; + std::atomic v {0}; }; template @@ -211,10 +128,10 @@ struct hb_atomic_t b.set_relaxed (p); } - std::atomic v = nullptr; + std::atomic v {nullptr}; }; -#else +#else /* defined(HB_NO_MT) */ template struct hb_atomic_t @@ -225,12 +142,12 @@ struct hb_atomic_t hb_atomic_t& operator = (T v_) { set_relaxed (v_); return *this; } operator T () const { return get_relaxed (); } - void set_relaxed (T v_) { hb_atomic_int_impl_set_relaxed (&v, v_); } - void set_release (T v_) { hb_atomic_int_impl_set (&v, v_); } - T get_relaxed () const { return hb_atomic_int_impl_get_relaxed (&v); } - T get_acquire () const { return hb_atomic_int_impl_get (&v); } - T inc () { return hb_atomic_int_impl_add (&v, 1); } - T dec () { return hb_atomic_int_impl_add (&v, -1); } + void set_relaxed (T v_) { v = v_; } + void set_release (T v_) { v = v_; } + T get_relaxed () const { return v; } + T get_acquire () const { return v; } + T inc () { return v++; } + T dec () { return v--; } int operator ++ (int) { return inc (); } int operator -- (int) { return dec (); } @@ -246,10 +163,15 @@ struct hb_atomic_t hb_atomic_t (const hb_atomic_t &other) = delete; void init (T* v_ = nullptr) { set_relaxed (v_); } - void set_relaxed (T* v_) { hb_atomic_ptr_impl_set_relaxed (&v, v_); } - T *get_relaxed () const { return (T *) hb_atomic_ptr_impl_get_relaxed (&v); } - T *get_acquire () const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); } - bool cmpexch (T *old, T *new_) { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); } + void set_relaxed (T* v_) { v = v_; } + T *get_relaxed () const { return v; } + T *get_acquire () const { return v; } + bool cmpexch (T *old, T *new_) + { + if (v != old) return false; + v = new_; + return true; + } operator bool () const { return get_acquire () != nullptr; } T * operator -> () const { return get_acquire (); } @@ -260,6 +182,7 @@ struct hb_atomic_t #endif + static inline bool hb_barrier () { _hb_compiler_memory_r_barrier (); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh index 902db1955078..216e653a2526 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh @@ -135,7 +135,9 @@ struct hb_bit_page_t } void add (hb_codepoint_t g) { elt (g) |= mask (g); dirty (); } + void add_bits (hb_codepoint_t g, uint64_t bits) { elt (g) |= bits; dirty (); } void del (hb_codepoint_t g) { elt (g) &= ~mask (g); dirty (); } + void del_bits (hb_codepoint_t g, uint64_t bits) { elt (g) &= ~bits; dirty (); } void set (hb_codepoint_t g, bool value) { if (value) add (g); else del (g); } bool get (hb_codepoint_t g) const { return elt (g) & mask (g); } bool may_have (hb_codepoint_t g) const { return get (g); } @@ -150,7 +152,7 @@ struct hb_bit_page_t elt_t *lb = &elt (b); if (la == lb) *la |= (mask (b) << 1) - mask(a); - else + else if (likely (la < lb)) { *la |= ~(mask (a) - 1llu); la++; @@ -159,6 +161,8 @@ struct hb_bit_page_t *lb |= ((mask (b) << 1) - 1llu); } + else + return; dirty (); } void del_range (hb_codepoint_t a, hb_codepoint_t b) @@ -167,7 +171,7 @@ struct hb_bit_page_t elt_t *lb = &elt (b); if (la == lb) *la &= ~((mask (b) << 1llu) - mask(a)); - else + else if (likely (la < lb)) { *la &= mask (a) - 1; la++; @@ -176,6 +180,8 @@ struct hb_bit_page_t *lb &= ~((mask (b) << 1) - 1llu); } + else + return; dirty (); } void set_range (hb_codepoint_t a, hb_codepoint_t b, bool v) @@ -344,7 +350,7 @@ struct hb_bit_page_t for (int i = len () - 1; i >= 0; i--) if (v[i]) return i * ELT_BITS + elt_get_max (v[i]); - return 0; + return INVALID; } /* diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh index 2c97f416fe60..f79d4342653d 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh @@ -101,9 +101,20 @@ struct hb_bit_set_invertible_t } unsigned int get_population () const { return inverted ? INVALID - s.get_population () : s.get_population (); } + bool get_singleton (hb_codepoint_t *codepoint) const + { + if (likely (!inverted)) + return s.get_singleton (codepoint); + if (s.get_population () != INVALID - 1) + return false; + *codepoint = get_min (); + return *codepoint != INVALID; + } void add (hb_codepoint_t g) { unlikely (inverted) ? s.del (g) : s.add (g); } + void add_bits (hb_codepoint_t g, uint64_t bits) + { unlikely (inverted) ? s.del_bits (g, bits) : s.add_bits (g, bits); } bool add_range (hb_codepoint_t a, hb_codepoint_t b) { return unlikely (inverted) ? ((void) s.del_range (a, b), true) : s.add_range (a, b); } @@ -143,6 +154,24 @@ struct hb_bit_set_invertible_t bool may_intersect (const hb_bit_set_invertible_t &other) const { return inverted || other.inverted || s.intersects (other.s); } + bool intersects (const hb_bit_set_invertible_t &other) const + { + if (likely (!inverted)) + return unlikely (other.inverted) ? !s.is_subset (other.s) + : s.intersects (other.s); + if (likely (!other.inverted)) + return !other.s.is_subset (s); + + unsigned population = s.get_population (); + unsigned other_population = other.s.get_population (); + if ((uint64_t) population + other_population < INVALID) + return true; + + return population >= other_population + ? !hb_all (iter (), other.s) + : !hb_all (other.iter (), s); + } + bool intersects (hb_codepoint_t first, hb_codepoint_t last) const { hb_codepoint_t c = first - 1; @@ -162,6 +191,9 @@ struct hb_bit_set_invertible_t return s.is_equal (other.s); else { + if (get_population () != other.get_population ()) + return false; + /* TODO Add iter_ranges() and use here. */ auto it1 = iter (); auto it2 = other.iter (); @@ -187,8 +219,10 @@ struct hb_bit_set_invertible_t protected: template - void process (const Op& op, const hb_bit_set_invertible_t &other) - { s.process (op, other.s); } + void process (const Op& op, + const hb_bit_set_invertible_t &other, + hb_vector_t *workspace = nullptr) + { s.process (op, other.s, workspace); } public: void union_ (const hb_bit_set_invertible_t &other) { @@ -209,21 +243,22 @@ struct hb_bit_set_invertible_t if (likely (s.successful)) inverted = inverted || other.inverted; } - void intersect (const hb_bit_set_invertible_t &other) + void intersect (const hb_bit_set_invertible_t &other, + hb_vector_t *workspace = nullptr) { if (likely (inverted == other.inverted)) { if (unlikely (inverted)) - process (hb_bitwise_or, other); + process (hb_bitwise_or, other, workspace); else - process (hb_bitwise_and, other); /* Main branch. */ + process (hb_bitwise_and, other, workspace); /* Main branch. */ } else { if (unlikely (inverted)) - process (hb_bitwise_lt, other); + process (hb_bitwise_lt, other, workspace); else - process (hb_bitwise_gt, other); + process (hb_bitwise_gt, other, workspace); } if (likely (s.successful)) inverted = inverted && other.inverted; @@ -280,6 +315,47 @@ struct hb_bit_set_invertible_t *codepoint = v + 1; return *codepoint != INVALID; } + bool next_bits (hb_codepoint_t *codepoint, uint64_t *bits) const + { + if (likely (!inverted)) + return s.next_bits (codepoint, bits); + + hb_codepoint_t base; + if (unlikely (*codepoint == INVALID)) + base = 0; + else + { + base = *codepoint & ~hb_bit_page_t::ELT_MASK; + if (unlikely (base >= INVALID - hb_bit_page_t::ELT_BITS + 1)) + goto done; + base += hb_bit_page_t::ELT_BITS; + } + + while (true) + { + hb_codepoint_t cursor = base ? base - hb_bit_page_t::ELT_BITS : INVALID; + uint64_t excluded = 0; + if (!s.next_bits (&cursor, &excluded) || cursor != base) + excluded = 0; + *bits = ~excluded; + bool last = unlikely (base >= INVALID - hb_bit_page_t::ELT_BITS + 1); + if (last) + *bits &= UINT64_MAX >> 1; + if (*bits) + { + *codepoint = base; + return true; + } + if (unlikely (last)) + break; + base += hb_bit_page_t::ELT_BITS; + } + + done: + *codepoint = INVALID; + *bits = 0; + return false; + } bool previous (hb_codepoint_t *codepoint) const { if (likely (!inverted)) @@ -352,27 +428,50 @@ struct hb_bit_set_invertible_t /* * Iterator implementation. + * Mutating the set invalidates its iterators. */ struct iter_t : hb_iter_with_fallback_t { static constexpr bool is_sorted_iterator = true; static constexpr bool has_fast_len = true; iter_t (const hb_bit_set_invertible_t &s_ = Null (hb_bit_set_invertible_t), - bool init = true) : s (&s_), v (INVALID), l(0) + bool init = true) : s (&s_), v (INVALID), remaining (0), + have_len (!init), base (INVALID), bits (0) { if (init) - { - l = s->get_population () + 1; - __next__ (); - } + advance (); } typedef hb_codepoint_t __item_t__; hb_codepoint_t __item__ () const { return v; } bool __more__ () const { return v != INVALID; } - void __next__ () { s->next (&v); if (likely (l)) l--; } - void __prev__ () { s->previous (&v); l++; } - unsigned __len__ () const { return l; } + void __next__ () + { + remaining--; + advance (); + } + void __prev__ () + { + if (s->previous (&v)) + { + sync (); + remaining++; + } + else + { + base = INVALID; + bits = 0; + } + } + unsigned __len__ () const + { + if (unlikely (!have_len)) + { + remaining += s->get_population (); + have_len = true; + } + return remaining; + } iter_t end () const { return iter_t (*s, false); } bool operator != (const iter_t& o) const { return v != o.v; } @@ -380,7 +479,35 @@ struct hb_bit_set_invertible_t protected: const hb_bit_set_invertible_t *s; hb_codepoint_t v; - unsigned l; + mutable unsigned remaining; + mutable bool have_len; + hb_codepoint_t base; + uint64_t bits; + + void advance () + { + if (likely (bits)) + { + v = base + hb_ctz (bits); + bits &= bits - 1; + } + else if (s->next_bits (&base, &bits)) + { + v = base + hb_ctz (bits); + bits &= bits - 1; + } + else + v = INVALID; + } + + void sync () + { + base = v & ~hb_bit_page_t::ELT_MASK; + hb_codepoint_t cursor = base ? base - hb_bit_page_t::ELT_BITS : INVALID; + s->next_bits (&cursor, &bits); + unsigned int bit = v & (hb_bit_page_t::ELT_BITS - 1); + bits = bit == hb_bit_page_t::ELT_BITS - 1 ? 0 : bits >> (bit + 1) << (bit + 1); + } }; iter_t iter () const { return iter_t (*this); } operator iter_t () const { return iter (); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh index 9e29d2af323c..62d1aad9142f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh @@ -31,7 +31,6 @@ #include "hb.hh" #include "hb-bit-page.hh" - struct hb_bit_set_t { hb_bit_set_t () = default; @@ -161,6 +160,14 @@ struct hb_bit_set_t page_t *page = page_for (g, true); if (unlikely (!page)) return; page->add (g); } + void add_bits (hb_codepoint_t g, uint64_t bits) + { + if (unlikely (!successful) || unlikely (!bits)) return; + assert (!(g & (page_t::ELT_BITS - 1))); + dirty (); + page_t *page = page_for (g, true); if (unlikely (!page)) return; + page->add_bits (g, bits); + } bool add_range (hb_codepoint_t a, hb_codepoint_t b) { if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */ @@ -260,7 +267,7 @@ struct hb_bit_set_t last_g = g; if (g != INVALID && (v || page)) /* The v check is to optimize out the page check if v is true. */ - page->add (g); + page->set (g, v); array = &StructAtOffsetUnaligned (array, stride); count--; @@ -291,6 +298,16 @@ struct hb_bit_set_t dirty (); page->del (g); } + void del_bits (hb_codepoint_t g, uint64_t bits) + { + if (unlikely (!successful) || unlikely (!bits)) return; + assert (!(g & (page_t::ELT_BITS - 1))); + page_t *page = page_for (g); + if (!page) + return; + dirty (); + page->del_bits (g, bits); + } private: void del_pages (int ds, int de) @@ -524,7 +541,8 @@ struct hb_bit_set_t void process_ (hb_bit_page_t::vector_t (*op) (const hb_bit_page_t::vector_t &, const hb_bit_page_t::vector_t &), bool passthru_left, bool passthru_right, - const hb_bit_set_t &other) + const hb_bit_set_t &other, + hb_vector_t *workspace = nullptr) { if (unlikely (!successful)) return; @@ -540,8 +558,18 @@ struct hb_bit_set_t // Pre-allocate the workspace that compact() will need so we can bail on allocation failure // before attempting to rewrite the page map. - hb_vector_t compact_workspace; - if (!passthru_left && unlikely (!allocate_compact_workspace (compact_workspace))) return; + hb_vector_t local_workspace; + hb_vector_t &compact_workspace = workspace ? *workspace : local_workspace; + if (!passthru_left) + { + bool allocated = workspace ? compact_workspace.resize (pages.length) + : allocate_compact_workspace (compact_workspace); + if (unlikely (!allocated)) + { + successful = false; + return; + } + } for (; a < na && b < nb; ) { @@ -651,13 +679,17 @@ struct hb_bit_set_t op_ (const hb_bit_page_t::vector_t &a, const hb_bit_page_t::vector_t &b) { return Op{} (a, b); } template - void process (const Op& op, const hb_bit_set_t &other) + void process (const Op& op, + const hb_bit_set_t &other, + hb_vector_t *workspace = nullptr) { - process_ (op_, op (1, 0), op (0, 1), other); + process_ (op_, op (1, 0), op (0, 1), other, workspace); } void union_ (const hb_bit_set_t &other) { process (hb_bitwise_or, other); } - void intersect (const hb_bit_set_t &other) { process (hb_bitwise_and, other); } + void intersect (const hb_bit_set_t &other, + hb_vector_t *workspace = nullptr) + { process (hb_bitwise_and, other, workspace); } void subtract (const hb_bit_set_t &other) { process (hb_bitwise_gt, other); } void symmetric_difference (const hb_bit_set_t &other) { process (hb_bitwise_xor, other); } @@ -708,6 +740,50 @@ struct hb_bit_set_t *codepoint = INVALID; return false; } + bool next_bits (hb_codepoint_t *codepoint, uint64_t *bits) const + { + static_assert (page_t::ELT_BITS == 64, ""); + + unsigned int i = 0; + unsigned int elt = 0; + if (likely (*codepoint != INVALID)) + { + hb_codepoint_t base = *codepoint & ~page_t::ELT_MASK; + if (unlikely (base >= INVALID - page_t::ELT_BITS + 1)) + goto done; + base += page_t::ELT_BITS; + + unsigned int major = get_major (base); + i = last_page_lookup; + if (unlikely (i >= page_map.length || page_map.arrayZ[i].major != major)) + { + page_map.bfind (major, &i, HB_NOT_FOUND_STORE_CLOSEST); + if (i >= page_map.length) + goto done; + } + if (page_map.arrayZ[i].major == major) + elt = page_remainder (base) / page_t::ELT_BITS; + } + + for (; i < page_map.length; i++, elt = 0) + { + const page_map_t &map = page_map.arrayZ[i]; + const page_t &page = pages.arrayZ[map.index]; + for (; elt < page_t::len (); elt++) + if (page.v[elt]) + { + *codepoint = major_start (map.major) + elt * page_t::ELT_BITS; + *bits = page.v[elt]; + last_page_lookup = i; + return true; + } + } + + done: + *codepoint = INVALID; + *bits = 0; + return false; + } bool previous (hb_codepoint_t *codepoint) const { if (unlikely (*codepoint == INVALID)) { @@ -750,13 +826,62 @@ struct hb_bit_set_t return false; } - /* TODO Speed up. */ *last = *first = i; - while (next (&i) && i == *last + 1) - (*last)++; - return true; + const auto* page_map_array = page_map.arrayZ; + const auto* pages_array = pages.arrayZ; + unsigned int major = get_major (*last); + unsigned int p_index = last_page_lookup; + + if (unlikely (p_index >= page_map.length || page_map_array[p_index].major != major)) + { + page_map.bfind (major, &p_index, HB_NOT_FOUND_STORE_CLOSEST); + // The above next() call gaurantees the page we're looking for exists. + assert(p_index < page_map.length && page_map_array[p_index].major == major); + last_page_lookup = p_index; + } + + unsigned int rem = page_remainder (*last); + unsigned int elt = rem / page_t::ELT_BITS; + unsigned int bit = rem & page_t::ELT_MASK; + + const page_t *page = &pages_array[page_map_array[p_index].index]; + unsigned int run = hb_ctz (~(page->v[elt] >> bit)); + *last += run - 1; + if (run < page_t::ELT_BITS - bit) + return true; + + elt++; + + while (true) + { + for (; elt < page_t::len (); elt++) + { + uint64_t w = page->v[elt]; + if (w == (uint64_t) -1) + { + *last += page_t::ELT_BITS; + continue; + } + uint64_t inv = ~w; + *last += hb_ctz (inv); + return true; + } + + p_index++; + + + if (p_index >= page_map.length || page_map_array[p_index].major != major + 1) + return true; + + const auto& entry = page_map_array[p_index]; + major = entry.major; + last_page_lookup = p_index; + page = &pages_array[entry.index]; + elt = 0; + } } + bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const { hb_codepoint_t i; @@ -768,12 +893,62 @@ struct hb_bit_set_t return false; } - /* TODO Speed up. */ *last = *first = i; - while (previous (&i) && i == *first - 1) - (*first)--; - return true; + const auto* page_map_array = page_map.arrayZ; + const auto* pages_array = pages.arrayZ; + unsigned int major = get_major (*first); + unsigned int p_index = last_page_lookup; + + if (unlikely (p_index >= page_map.length || page_map_array[p_index].major != major)) + { + page_map.bfind (major, &p_index, HB_NOT_FOUND_STORE_CLOSEST); + // The above previous() call gaurantees the page we're looking for exists. + assert(p_index < page_map.length && page_map_array[p_index].major == major); + last_page_lookup = p_index; + } + + unsigned int rem = page_remainder (*first); + int elt = rem / page_t::ELT_BITS; + unsigned int bit = rem & page_t::ELT_MASK; + + const page_t *page = &pages_array[page_map_array[p_index].index]; + uint64_t inv = ~(page->v[elt] << (63 - bit)); + unsigned int run = hb_bit_storage (inv) ? (page_t::ELT_BITS - hb_bit_storage (inv)) : page_t::ELT_BITS; + *first -= run - 1; + if (run < bit + 1) + return true; + + elt--; + + while (true) + { + for (; elt >= 0; elt--) + { + uint64_t w = page->v[elt]; + if (w == (uint64_t) -1) + { + *first -= page_t::ELT_BITS; + continue; + } + uint64_t inv = ~w; + unsigned int zeros = hb_bit_storage (inv) ? (page_t::ELT_BITS - hb_bit_storage (inv)) : page_t::ELT_BITS; + *first -= zeros; + return true; + } + + + if (p_index == 0 || page_map_array[p_index - 1].major != major - 1) + return true; + + p_index--; + const auto& entry = page_map_array[p_index]; + + major = entry.major; + last_page_lookup = p_index; + page = &pages_array[entry.index]; + elt = page_t::len () - 1; + } } unsigned int next_many (hb_codepoint_t codepoint, @@ -795,12 +970,15 @@ struct hb_bit_set_t return 0; // codepoint is greater than our max element. } start_page = i; - start_page_value = page_remainder (codepoint + 1); - if (unlikely (start_page_value == 0)) + if (page_map_array[i].major == major) { - // The export-after value was last in the page. Start on next page. - start_page++; - start_page_value = 0; + start_page_value = page_remainder (codepoint + 1); + if (unlikely (start_page_value == 0)) + { + // The export-after value was last in the page. Start on next page. + start_page++; + start_page_value = 0; + } } } @@ -844,12 +1022,15 @@ struct hb_bit_set_t } } start_page = i; - start_page_value = page_remainder (codepoint + 1); - if (unlikely (start_page_value == 0)) + if (page_map_array[i].major == major) { - // The export-after value was last in the page. Start on next page. - start_page++; - start_page_value = 0; + start_page_value = page_remainder (codepoint + 1); + if (unlikely (start_page_value == 0)) + { + // The export-after value was last in the page. Start on next page. + start_page++; + start_page_value = 0; + } } } @@ -883,6 +1064,39 @@ struct hb_bit_set_t population = pop; return pop; } + bool get_singleton (hb_codepoint_t *codepoint) const + { + if (has_population ()) + { + if (population != 1) return false; + *codepoint = get_min (); + return true; + } + + hb_codepoint_t singleton = INVALID; + for (const auto &map : page_map) + { + const auto &page = pages.arrayZ[map.index]; + for (unsigned i = 0; i < page_t::len (); i++) + { + page_t::elt_t bits = page.v[i]; + if (!bits) continue; + if (singleton != INVALID || (bits & (bits - 1))) + return false; + singleton = map.major * page_t::PAGE_BITS + + i * page_t::ELT_BITS + hb_ctz (bits); + } + } + + if (singleton == INVALID) + { + population = 0; + return false; + } + population = 1; + *codepoint = singleton; + return true; + } hb_codepoint_t get_min () const { unsigned count = pages.length; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-blob.cc b/src/java.desktop/share/native/libharfbuzz/hb-blob.cc index e60259f52da1..fcb4e6e1b5f0 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-blob.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-blob.cc @@ -662,7 +662,7 @@ _hb_blob_try_mmap (const char *file_name) if (unlikely (!file)) return nullptr; auto file_guard = hb_make_scope_guard ([&]() { hb_free (file); }); - unsigned int size = strlen (file_name) + 1; + size_t size = strlen (file_name) + 1; wchar_t *wchar_file_name = (wchar_t *) hb_malloc (sizeof (wchar_t) * size); if (unlikely (!wchar_file_name)) return nullptr; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc index b3190ffc8ef4..502bd7326cb1 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc @@ -120,8 +120,8 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, { for (unsigned int i = 0; i < start; i++) { - x += pos[i].x_advance; - y += pos[i].y_advance; + x = hb_saturate_add (x, pos[i].x_advance); + y = hb_saturate_add (y, pos[i].y_advance); } } @@ -164,8 +164,10 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, if (pos && !(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) { + hb_position_t dx = hb_saturate_add (x, pos[i].x_offset); + hb_position_t dy = hb_saturate_add (y, pos[i].y_offset); p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d", - x+pos[i].x_offset, y+pos[i].y_offset)); + dx, dy)); if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d", pos[i].x_advance, pos[i].y_advance)); @@ -206,8 +208,8 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) { - x += pos[i].x_advance; - y += pos[i].y_advance; + x = hb_saturate_add (x, pos[i].x_advance); + y = hb_saturate_add (y, pos[i].y_advance); } } @@ -289,8 +291,8 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, { for (unsigned int i = 0; i < start; i++) { - x += pos[i].x_advance; - y += pos[i].y_advance; + x = hb_saturate_add (x, pos[i].x_advance); + y = hb_saturate_add (y, pos[i].y_advance); } } @@ -321,8 +323,10 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, if (pos && !(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) { - if (x+pos[i].x_offset || y+pos[i].y_offset) - p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", x+pos[i].x_offset, y+pos[i].y_offset)); + hb_position_t dx = hb_saturate_add (x, pos[i].x_offset); + hb_position_t dy = hb_saturate_add (y, pos[i].y_offset); + if (dx || dy) + p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", dx, dy)); if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) { @@ -363,8 +367,8 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, if (pos && (flags & HB_BUFFER_SERIALIZE_FLAG_NO_ADVANCES)) { - x += pos[i].x_advance; - y += pos[i].y_advance; + x = hb_saturate_add (x, pos[i].x_advance); + y = hb_saturate_add (y, pos[i].y_advance); } } @@ -796,19 +800,19 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, return false; } - hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); - if (!font) font = hb_font_get_empty (); switch (format) { case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); return _hb_buffer_deserialize_text_glyphs (buffer, buf, buf_len, end_ptr, font); case HB_BUFFER_SERIALIZE_FORMAT_JSON: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); return _hb_buffer_deserialize_json (buffer, buf, buf_len, end_ptr, font); @@ -867,18 +871,18 @@ hb_buffer_deserialize_unicode (hb_buffer_t *buffer, return false; } - hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); - hb_font_t* font = hb_font_get_empty (); switch (format) { case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); return _hb_buffer_deserialize_text_unicode (buffer, buf, buf_len, end_ptr, font); case HB_BUFFER_SERIALIZE_FORMAT_JSON: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); return _hb_buffer_deserialize_json (buffer, buf, buf_len, end_ptr, font); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc index 647c270c02a4..e09a2c3f0279 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc @@ -147,7 +147,11 @@ buffer_verify_unsafe_to_break (hb_buffer_t *buffer, text_start--; } } - assert (text_start < text_end); + if (unlikely (text_start >= text_end)) + { + buffer_verify_error (buffer, font, BUFFER_VERIFY_ERROR "unsafe-to-break text range is invalid."); + return false; + } if (false) printf("start %u end %u text start %u end %u\n", start, end, text_start, text_end); @@ -163,7 +167,7 @@ buffer_verify_unsafe_to_break (hb_buffer_t *buffer, hb_buffer_append (fragment, text_buffer, text_start, text_end); if (!hb_shape_full (font, fragment, features, num_features, shapers) || - fragment->successful) + !fragment->successful) return true; hb_buffer_append (reconstruction, fragment, 0, -1); @@ -380,11 +384,14 @@ hb_buffer_t::verify (hb_buffer_t *text_buffer, const char * const *shapers) { bool ret = true; - if (!buffer_verify_monotone (this, font)) + bool monotone = buffer_verify_monotone (this, font); + if (!monotone) ret = false; - if (!buffer_verify_unsafe_to_break (this, text_buffer, font, features, num_features, shapers)) + if (monotone && + !buffer_verify_unsafe_to_break (this, text_buffer, font, features, num_features, shapers)) ret = false; - if ((flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) != 0 && + if (monotone && + (flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) != 0 && !buffer_verify_unsafe_to_concat (this, text_buffer, font, features, num_features, shapers)) ret = false; if (!ret) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc index f4eb6040de78..f1088ccaa5b2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc @@ -484,6 +484,13 @@ hb_buffer_t::move_to (unsigned int i) unsigned int count = i - out_len; if (unlikely (!make_room_for (count, count))) return false; + max_ops -= count; + if (unlikely (max_ops < 0)) + { + successful = false; + return false; + } + memmove (out_info + out_len, info + idx, count * sizeof (out_info[0])); idx += count; out_len += count; @@ -504,6 +511,13 @@ hb_buffer_t::move_to (unsigned int i) assert (idx >= count); + max_ops -= count; + if (unlikely (max_ops < 0)) + { + successful = false; + return false; + } + idx -= count; out_len -= count; memmove (info + idx, out_info + out_len, count * sizeof (out_info[0])); @@ -802,8 +816,12 @@ hb_buffer_create_similar (const hb_buffer_t *src) * hb_buffer_reset: * @buffer: An #hb_buffer_t * - * Resets the buffer to its initial status, as if it was just newly created - * with hb_buffer_create(). + * Clears the buffer contents and segment properties, and restores the + * default Unicode functions and buffer settings. + * + * The message callback, its associated data, and any attached user data are + * preserved. To remove the message callback, call + * hb_buffer_set_message_func() with a `NULL` function. * * Since: 0.9.2 **/ @@ -1478,8 +1496,12 @@ hb_buffer_get_random_state (const hb_buffer_t *buffer) * hb_buffer_clear_contents: * @buffer: An #hb_buffer_t * - * Similar to hb_buffer_reset(), but does not clear the Unicode functions and - * the replacement code point. + * Clears the buffer contents and segment properties (direction, script, + * language), and resets the random state to its default value of 1. + * + * Unlike hb_buffer_reset(), this function preserves the Unicode functions, + * flags, cluster level, replacement code point, and invisible and not-found + * glyphs. The message callback and attached user data are also preserved. * * Since: 0.9.11 **/ @@ -2103,18 +2125,18 @@ normalize_glyphs_cluster (hb_buffer_t *buffer, hb_position_t total_x_advance = 0, total_y_advance = 0; for (unsigned int i = start; i < end; i++) { - total_x_advance += pos[i].x_advance; - total_y_advance += pos[i].y_advance; + total_x_advance = hb_saturate_add (total_x_advance, pos[i].x_advance); + total_y_advance = hb_saturate_add (total_y_advance, pos[i].y_advance); } hb_position_t x_advance = 0, y_advance = 0; for (unsigned int i = start; i < end; i++) { - pos[i].x_offset += x_advance; - pos[i].y_offset += y_advance; + pos[i].x_offset = hb_saturate_add (pos[i].x_offset, x_advance); + pos[i].y_offset = hb_saturate_add (pos[i].y_offset, y_advance); - x_advance += pos[i].x_advance; - y_advance += pos[i].y_advance; + x_advance = hb_saturate_add (x_advance, pos[i].x_advance); + y_advance = hb_saturate_add (y_advance, pos[i].y_advance); pos[i].x_advance = 0; pos[i].y_advance = 0; @@ -2129,11 +2151,11 @@ normalize_glyphs_cluster (hb_buffer_t *buffer, hb_stable_sort (buffer->info + start, end - start - 1, compare_info_codepoint, buffer->pos + start); } else { /* Transfer all cluster advance to the first glyph. */ - pos[start].x_advance += total_x_advance; - pos[start].y_advance += total_y_advance; + pos[start].x_advance = hb_saturate_add (pos[start].x_advance, total_x_advance); + pos[start].y_advance = hb_saturate_add (pos[start].y_advance, total_y_advance); for (unsigned int i = start + 1; i < end; i++) { - pos[i].x_offset -= total_x_advance; - pos[i].y_offset -= total_y_advance; + pos[i].x_offset = hb_saturate_sub (pos[i].x_offset, total_x_advance); + pos[i].y_offset = hb_saturate_sub (pos[i].y_offset, total_y_advance); } hb_stable_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1); } @@ -2258,15 +2280,20 @@ hb_buffer_diff (hb_buffer_t *buffer, if (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS) { + auto position_diff = [] (hb_position_t a, hb_position_t b) -> uint64_t + { + int64_t diff = (int64_t) a - b; + return diff < 0 ? -diff : diff; + }; assert (buffer->have_positions); const hb_glyph_position_t *buf_pos = buffer->pos; const hb_glyph_position_t *ref_pos = reference->pos; for (unsigned int i = 0; i < count; i++) { - if ((unsigned int) abs (buf_pos->x_advance - ref_pos->x_advance) > position_fuzz || - (unsigned int) abs (buf_pos->y_advance - ref_pos->y_advance) > position_fuzz || - (unsigned int) abs (buf_pos->x_offset - ref_pos->x_offset) > position_fuzz || - (unsigned int) abs (buf_pos->y_offset - ref_pos->y_offset) > position_fuzz) + if (position_diff (buf_pos->x_advance, ref_pos->x_advance) > position_fuzz || + position_diff (buf_pos->y_advance, ref_pos->y_advance) > position_fuzz || + position_diff (buf_pos->x_offset, ref_pos->x_offset) > position_fuzz || + position_diff (buf_pos->y_offset, ref_pos->y_offset) > position_fuzz) { result |= HB_BUFFER_DIFF_FLAG_POSITION_MISMATCH; break; @@ -2309,6 +2336,9 @@ hb_buffer_t::changed () * @destroy: (nullable): The function to call when @user_data is not needed anymore * * Sets the implementation function for #hb_buffer_message_func_t. + * The callback and its associated data are preserved by hb_buffer_reset() + * and hb_buffer_clear_contents(). The @destroy function is called when the + * callback is replaced or removed, or when @buffer is destroyed. * * Since: 1.1.3 **/ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh index 32eca7021f8f..107ddb1f9026 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh @@ -385,11 +385,6 @@ struct hb_buffer_t } /* Advance idx without copying to output. */ void skip_glyph () { idx++; } - void reset_masks (hb_mask_t mask) - { - for (unsigned int j = 0; j < len; j++) - info[j].mask = mask; - } void add_masks (hb_mask_t mask) { for (unsigned int j = 0; j < len; j++) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh index 3609ccecc711..b7a915591bf1 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh @@ -94,8 +94,11 @@ struct hb_cache_t { unsigned int k = key & ((1u<> value_bits) != (key >> cache_bits)) + constexpr unsigned int empty = (1ULL << (8 * sizeof (item_t))) - 1; + /* Combine overflow, tag mismatch, and empty checks into one branch. */ + if ((key >> key_bits) | + ((v >> value_bits) ^ (key >> cache_bits)) | + ((key_bits + value_bits - cache_bits == 8 * sizeof (item_t)) && (v == empty))) return false; *value = v & ((1u<> key_bits) || (value >> value_bits))) return; /* Overflows */ - set_unchecked (key, value); - } - - HB_HOT - void set_unchecked (unsigned int key, unsigned int value) - { unsigned int k = key & ((1u<>cache_bits)<= INT_MIN && value <= INT_MAX))) + { + *v = 0; + return false; + } + *v = (int) value; + return true; + } + int to_int () const + { + int v; + if (likely (to_int (&v))) return v; + return value < 0 ? INT_MIN : value > 0 ? INT_MAX : 0; + } void set_fixed (int32_t v) { value = v / 65536.0; } - int32_t to_fixed () const { return value * 65536.0; } + int32_t to_fixed () const + { return (int32_t) hb_clamp (value * 65536.0, (double) INT32_MIN, (double) INT32_MAX); } void set_real (double v) { value = v; } double to_real () const { return value; } bool in_int_range () const - { return ((double) (int16_t) to_int () == value); } + { return value >= INT16_MIN && value <= INT16_MAX && (double) (int16_t) value == value; } bool operator > (const number_t &n) const { return value > n.to_real (); } bool operator < (const number_t &n) const { return n > *this; } @@ -446,7 +462,13 @@ struct arg_stack_t : cff_stack_t ARG& pop_num () { return this->pop (); } - int pop_int () { return this->pop ().to_int (); } + int pop_int () + { + int v; + if (unlikely (!this->pop ().to_int (&v))) + S::set_error (); + return v; + } unsigned int pop_uint () { @@ -461,7 +483,7 @@ struct arg_stack_t : cff_stack_t void push_longint_from_substr (byte_str_ref_t& str_ref) { - push_int ((str_ref[0] << 24) | (str_ref[1] << 16) | (str_ref[2] << 8) | (str_ref[3])); + push_int ((int) ((uint32_t (str_ref[0]) << 24) | (str_ref[1] << 16) | (str_ref[2] << 8) | (str_ref[3]))); str_ref.inc (4); } @@ -481,15 +503,15 @@ struct arg_stack_t : cff_stack_t /* an operator prefixed by its operands in a byte string */ struct op_str_t { - /* This used to have a hb_ubytes_t. Using a pointer and length - * in a particular order, saves 8 bytes in this struct and more - * in our parsed_cs_op_t subclass. */ + /* Borrow the encoded bytes. DICT entries with accumulated blends can + * exceed the length of an individual charstring token. */ const unsigned char *ptr = nullptr; op_code_t op = OpCode_Invalid; - uint8_t length = 0; + /* DICT entries can contain many blends before their final operator. */ + unsigned length = 0; }; /* base of OP_SERIALIZER */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh index 2628effa5cc7..a1f705c59b49 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh @@ -121,6 +121,7 @@ struct cs_interp_env_t : interp_env_t hstem_count = 0; vstem_count = 0; hintmask_size = 0; + budget = nullptr; pt.set_int (0, 0); globalSubrs.init (globalSubrs_); localSubrs.init (localSubrs_); @@ -186,6 +187,11 @@ struct cs_interp_env_t : interp_env_t void set_endchar (bool endchar_flag_) { endchar_flag = endchar_flag_; } bool is_endchar () const { return endchar_flag; } + void set_budget (int64_t *budget_) { budget = budget_; } + int64_t *get_budget () const { return budget; } + bool spend_budget (unsigned int cost, unsigned int mult = 1) + { return !budget || hb_budget_spend (*budget, cost, mult); } + const number_t &get_x () const { return pt.x; } const number_t &get_y () const { return pt.y; } const point_t &get_pt () const { return pt; } @@ -201,6 +207,7 @@ struct cs_interp_env_t : interp_env_t unsigned int hstem_count; unsigned int vstem_count; unsigned int hintmask_size; + int64_t *budget; call_stack_t callStack; biased_subrs_t globalSubrs; biased_subrs_t localSubrs; @@ -877,23 +884,43 @@ struct cs_interpreter_t : interpreter_t { cs_interpreter_t (ENV& env_) : interpreter_t (env_) {} - bool interpret (PARAM& param) + bool interpret (PARAM& param, int64_t *budget = nullptr) { SUPER::env.set_endchar (false); - - unsigned max_ops = HB_CFF_MAX_OPS; - for (;;) { - OPSET::process_op (SUPER::env.fetch_op (), SUPER::env, param); - if (unlikely (SUPER::env.in_error () || !--max_ops)) - { - SUPER::env.set_error (); - return false; + SUPER::env.set_budget (budget); + + /* Cap the operator count by the caller's remaining budget so the single + * max_ops counter enforces both the structural limit and the live work + * budget, with no budget check in the hot loop. The consumed operators + * are charged back after the loop, and since the cap never exceeds the + * remaining budget the charstring cannot overshoot it. CFF2 blend + * charges its proportional work separately, in place. */ + int64_t remaining = budget ? *budget : (int64_t) HB_CFF_MAX_OPS; + unsigned max_ops = (unsigned) hb_clamp (remaining, (int64_t) 0, (int64_t) HB_CFF_MAX_OPS); + unsigned start_ops = max_ops; + + bool ret = true; + if (likely (max_ops)) + for (;;) { + OPSET::process_op (SUPER::env.fetch_op (), SUPER::env, param); + if (unlikely (SUPER::env.in_error () || !--max_ops)) + { + SUPER::env.set_error (); + ret = false; + break; + } + if (SUPER::env.is_endchar ()) + break; } - if (SUPER::env.is_endchar ()) - break; + else + { + SUPER::env.set_error (); + ret = false; } - return true; + if (budget) *budget -= (int64_t) (start_ops - max_ops); + + return ret; } private: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh index a4aa005d82c4..c2664de9462c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh @@ -78,7 +78,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t num_coords = num_coords_; varStore = acc.varStore; do_blend = num_coords && varStore->size; - set_ivs (acc.privateDicts[fd].ivs); + orig_ivs = acc.privateDicts[fd].ivs; + set_ivs (orig_ivs); } ~cff2_cs_interp_env_t () @@ -179,6 +180,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t void set_region_count (unsigned int region_count_) { region_count = region_count_; } unsigned int get_ivs () const { return ivs; } void set_ivs (unsigned int ivs_) { ivs = ivs_; } + /* The FD's private-dict ivs, before any vsindex op in the charstring. */ + unsigned int get_orig_ivs () const { return orig_ivs; } bool seen_vsindex () const { return seen_vsindex_; } double blend_deltas (hb_array_t deltas) const @@ -198,12 +201,16 @@ struct cff2_cs_interp_env_t : cs_interp_env_t bool have_coords () const { return num_coords; } + /* Subsetter instancing can defer rounding until absolute points are known. */ + bool round_blends = true; + protected: const int *coords; unsigned int num_coords; const CFF2ItemVariationStore *varStore; unsigned int region_count; unsigned int ivs; + unsigned int orig_ivs; hb_vector_t *scalars = nullptr; hb_atomic_t *> *cached_scalars_vector = nullptr; bool do_blend; @@ -259,7 +266,23 @@ struct cff2_cs_opset_t : cs_opset_t, PAR unsigned n, unsigned i) { if (env.have_coords ()) - arg.set_int (round (arg.to_real () + env.blend_deltas (blends))); + { + double v = arg.to_real () + env.blend_deltas (blends); + arg.set_real (env.round_blends ? round (v) : v); + } + else if (unlikely (arg.blending ())) + { + /* A blend result used as an operand of a later blend: the value is + * default + inner deltas + outer deltas, so accumulate the deltas. */ + hb_vector_t inner = std::move (arg.deltas); + arg.set_blends (n, i, blends); + if (likely (inner.length == arg.deltas.length)) + for (unsigned j = 0; j < inner.length; j++) + arg.deltas.arrayZ[j].set_real (arg.deltas.arrayZ[j].to_real () + + inner.arrayZ[j].to_real ()); + else + env.set_error (); + } else arg.set_blends (n, i, blends); } @@ -288,6 +311,11 @@ struct cff2_cs_opset_t : cs_opset_t, PAR env.set_error (); return; } + if (unlikely (!env.spend_budget (HB_BUDGET_1, total - n))) + { + env.set_error (); + return; + } unsigned int start = count - total; for (unsigned int i = 0; i < n; i++) { diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-common.cc index 9eeae358a755..962d8990d37f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-common.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-common.cc @@ -433,14 +433,8 @@ hb_script_from_iso15924_tag (hb_tag_t tag) /* Be lenient, adjust case (one capital letter followed by three small letters) */ tag = (tag & 0xDFDFDFDFu) | 0x00202020u; - switch (tag) { - - /* These graduated from the 'Q' private-area codes, but - * the old code is still aliased by Unicode, and the Qaai - * one in use by ICU. */ - case HB_TAG('Q','a','a','i'): return HB_SCRIPT_INHERITED; - case HB_TAG('Q','a','a','c'): return HB_SCRIPT_COPTIC; - + switch (tag) + { /* Script variants from https://unicode.org/iso15924/ */ case HB_TAG('A','r','a','n'): return HB_SCRIPT_ARABIC; case HB_TAG('C','y','r','s'): return HB_SCRIPT_CYRILLIC; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.h b/src/java.desktop/share/native/libharfbuzz/hb-common.h index 5a0ef65392d0..a36ad13e25aa 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-common.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-common.h @@ -94,6 +94,25 @@ HB_BEGIN_DECLS **/ typedef int hb_bool_t; +/** + * HB_BUDGET_DEFAULT: + * + * Use the implementation's finite default work budget. + * + * Since: 14.5.0 + **/ +#define HB_BUDGET_DEFAULT ((int64_t) (-0x7FFFFFFFFFFFFFFF - 1)) + +/** + * HB_BUDGET_UNLIMITED: + * + * Use an effectively unlimited work budget. Structural safety limits remain + * active. + * + * Since: 14.5.0 + **/ +#define HB_BUDGET_UNLIMITED ((int64_t) 0x7FFFFFFFFFFFFFFF) + /** * hb_codepoint_t: * diff --git a/src/java.desktop/share/native/libharfbuzz/hb-config.hh b/src/java.desktop/share/native/libharfbuzz/hb-config.hh index 62e0d2022e37..8f81ee8c11c2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-config.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-config.hh @@ -36,8 +36,7 @@ #endif #ifndef HB_EXPERIMENTAL_API -#define HB_NO_BEYOND_64K -#define HB_NO_CUBIC_GLYF +#define HB_NO_SUBSET_DEPEND #endif #ifdef HB_TINY @@ -75,9 +74,11 @@ #define HB_NO_MMAP #define HB_NO_NAME #define HB_NO_OPEN +#define HB_NO_OT_FETCH #define HB_NO_OT_FONT_GLYPH_NAMES #define HB_NO_SETLOCALE #define HB_NO_STYLE +#define HB_NO_SUBSET_DEPEND #define HB_NO_VERTICAL #define HB_NO_VAR @@ -136,7 +137,7 @@ #endif #ifdef HB_NO_DRAW -#define HB_NO_CFF +#define HB_NO_OT_FONT_CFF #define HB_NO_OUTLINE #define HB_NO_PAINT #endif @@ -188,6 +189,13 @@ #define HB_NO_OT_FONT_CMAP_CACHE #endif +#if defined(HAVE_CONFIG_OVERRIDE_LAST_H) || defined(HB_CONFIG_OVERRIDE_LAST_H) +#ifndef HB_CONFIG_OVERRIDE_LAST_H +#define HB_CONFIG_OVERRIDE_LAST_H "config-override-last.h" +#endif +#include HB_CONFIG_OVERRIDE_LAST_H +#endif + #ifdef HB_OPTIMIZE_SIZE #define HB_OPTIMIZE_SIZE_VAL 1 #else diff --git a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh index 87d30d9ded11..563690a3901c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh @@ -356,6 +356,10 @@ struct hb_no_trace_t { #define HB_DEBUG_KBTS (HB_DEBUG+0) #endif +#ifndef HB_DEBUG_DEPEND +#define HB_DEBUG_DEPEND (HB_DEBUG+0) +#endif + /* * With tracing. */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-depend-data.hh b/src/java.desktop/share/native/libharfbuzz/hb-depend-data.hh new file mode 100644 index 000000000000..a83893d26583 --- /dev/null +++ b/src/java.desktop/share/native/libharfbuzz/hb-depend-data.hh @@ -0,0 +1,668 @@ +/* + * Copyright © 2024 Adobe, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Skef Iterum + */ + +#ifndef HB_DEPEND_DATA_HH +#define HB_DEPEND_DATA_HH + +/* This file exists to break include cycles: hb-ot-layout-gsubgpos.hh needs + * hb_depend_data_builder_t for hb_depend_context_t, but hb-depend.hh pulls + * in table headers that include hb-ot-layout-gsubgpos.hh. */ + +#include "hb.hh" + +#include "hb-multimap.hh" + +/* hb_subset_depend_edge_flags_t is defined in hb-depend.h (public header). + * We redeclare it here under the same include-guard so internal code that + * includes hb-depend-data.hh without going through hb-depend.h still gets + * the type. The definitions must stay in sync. */ +#ifndef HB_SUBSET_DEPEND_EDGE_FLAGS_T_DEFINED +#define HB_SUBSET_DEPEND_EDGE_FLAGS_T_DEFINED +typedef enum { + HB_SUBSET_DEPEND_EDGE_FLAG_NONE = 0x00u, + HB_SUBSET_DEPEND_EDGE_FLAG_FROM_CONTEXT_POSITION = 0x01u, + HB_SUBSET_DEPEND_EDGE_FLAG_FROM_NESTED_CONTEXT = 0x02u, +} hb_subset_depend_edge_flags_t; +#endif +/* Apply operator overloads now that hb.hh (and thus hb-algs.hh) is available. */ +HB_MARK_AS_FLAG_T (hb_subset_depend_edge_flags_t); + +/* High bit of a context-set element marks it as an index into the sets array + * rather than a raw glyph ID. */ +#define HB_DEPEND_CONTEXT_SET_FLAG 0x80000000u + +/** + * hb_depend_edge_t: + * + * Internal structure representing a single dependency edge in the graph. + * Records that glyph A depends on glyph B through a specific OpenType + * mechanism (table_tag), with additional metadata: + * + * - table_tag: Source table (GSUB, glyf, CFF, COLR, MATH, VARC) + * - dependent: Target glyph ID + * - layout_tag: Feature tag (for GSUB), else 0 + * - ligature_set: Index into sets array for ligature components, else INVALID + * - context_set: Index into sets array for context requirements, else INVALID + * - flags: Edge flags (FROM_CONTEXT_POSITION, FROM_NESTED_CONTEXT) + */ +struct hb_depend_edge_t { + hb_depend_edge_t() = delete; + hb_depend_edge_t(hb_tag_t table_tag, + hb_codepoint_t dependent, + hb_tag_t layout_tag, + hb_codepoint_t ligature_set, + hb_codepoint_t context_set, + hb_subset_depend_edge_flags_t flags = HB_SUBSET_DEPEND_EDGE_FLAG_NONE) : table_tag(table_tag), + dependent(dependent), layout_tag(layout_tag), + ligature_set(ligature_set), context_set(context_set), + flags(flags) + {} + + bool operator == (const hb_depend_edge_t &o) const + { + /* NOTE: flags intentionally excluded from equality comparison. + * Flags are metadata about how an edge was discovered (e.g., + * FROM_CONTEXT_POSITION, FROM_NESTED_CONTEXT), not part of the + * edge's identity. Multiple discoveries of the same edge via + * different paths should be treated as duplicates. */ + return table_tag == o.table_tag && + dependent == o.dependent && + layout_tag == o.layout_tag && + ligature_set == o.ligature_set && + context_set == o.context_set; + } + + uint32_t hash () const + { + /* FNV-1a hash of all identity fields (excludes flags) */ + uint32_t current = 0x84222325; /* FNV-1a offset basis */ + current = current ^ hb_hash (table_tag); + current = current * 16777619; /* FNV-1a prime */ + current = current ^ hb_hash (dependent); + current = current * 16777619; + current = current ^ hb_hash (layout_tag); + current = current * 16777619; + current = current ^ hb_hash (ligature_set); + current = current * 16777619; + current = current ^ hb_hash (context_set); + current = current * 16777619; + return current; + } + + hb_tag_t table_tag; + hb_codepoint_t dependent; + hb_tag_t layout_tag; + hb_codepoint_t ligature_set; + hb_codepoint_t context_set; + hb_subset_depend_edge_flags_t flags; +}; + +/** + * hb_depend_edge_key_t: + * + * Key structure for edge deduplication. Combines source glyph with edge record. + * Uses the record's equality and hash operators for comparison. + */ +struct hb_depend_edge_key_t { + hb_codepoint_t source; + hb_depend_edge_t record; + + hb_depend_edge_key_t () : source (0), record (0, 0, 0, HB_CODEPOINT_INVALID, HB_CODEPOINT_INVALID, HB_SUBSET_DEPEND_EDGE_FLAG_NONE) {} + + hb_depend_edge_key_t (hb_codepoint_t source, + hb_tag_t table_tag, + hb_tag_t layout_tag, + hb_codepoint_t dependent, + hb_codepoint_t ligature_set, + hb_codepoint_t context_set) + : source (source), + record (table_tag, dependent, layout_tag, ligature_set, context_set, HB_SUBSET_DEPEND_EDGE_FLAG_NONE) {} + + bool operator == (const hb_depend_edge_key_t &o) const + { + return source == o.source && record == o.record; + } + + uint32_t hash () const + { + /* Combine source hash with record hash */ + uint32_t current = 0x84222325; /* FNV-1a offset basis */ + current = current ^ hb_hash (source); + current = current * 16777619; /* FNV-1a prime */ + current = current ^ record.hash (); + current = current * 16777619; + return current; + } +}; + +/** + * hb_depend_glyph_record_t: + * + * Internal structure holding all dependency edges for a single glyph. + */ +struct hb_depend_glyph_record_t { + hb_vector_t dependencies; +}; + +/** + * hb_depend_lookup_revmap_t: + * + * Internal structure tracking which features are associated with a lookup. + * Used during GSUB dependency analysis to record the feature tags that + * activate each lookup. + */ +struct hb_depend_lookup_revmap_t +{ + hb_depend_lookup_revmap_t () = default; + explicit hb_depend_lookup_revmap_t (bool full) : full (full) {} + hb_depend_lookup_revmap_t (const hb_depend_lookup_revmap_t &o) : full(o.full), + fv_indexes(o.fv_indexes) {} + hb_depend_lookup_revmap_t (hb_depend_lookup_revmap_t &&o) : full(o.full), + fv_indexes(std::move(o.fv_indexes)) {} + hb_depend_lookup_revmap_t& operator = (const hb_depend_lookup_revmap_t &o) + { + full = o.full; + fv_indexes = o.fv_indexes; + return *this; + } + + bool full = true; + hb_set_t fv_indexes; +}; + +/** + * hb_depend_data_t: + * + * Persistent dependency graph data, retained for the lifetime of hb_subset_depend_t. + * Contains only what is needed at query time: + * - glyph_dependencies: Per-glyph edge lists + * - sets: Ligature and context sets indexed by set ID + * + * Constructed via hb_depend_data_builder_t; immutable thereafter. + */ +struct hb_depend_data_t +{ + /* Set storage: vector of heap-allocated sets (both ligature and context sets). + * Using unique_ptr follows HarfBuzz pattern and provides stable pointers. */ + hb_vector_t> sets; + + hb_vector_t glyph_dependencies; + + const hb_set_t *get_set_from_index (hb_codepoint_t index) + { + if (index < sets.length) + return sets[index].get (); + return nullptr; + } + + unsigned int get_glyph_entry_count (hb_codepoint_t gid) const + { + if (gid < glyph_dependencies.length) + return glyph_dependencies[gid].dependencies.length; + return 0; + } + + bool get_glyph_entry (hb_codepoint_t gid, unsigned int index, + hb_tag_t *table_tag, hb_codepoint_t *dependent, + hb_tag_t *layout_tag, hb_codepoint_t *ligature_set, + hb_codepoint_t *context_set, uint8_t *flags) + { + if (gid < glyph_dependencies.length && + index < glyph_dependencies[gid].dependencies.length) { + auto &d = glyph_dependencies[gid].dependencies[index]; + *table_tag = d.table_tag; + *dependent = d.dependent; + *layout_tag = d.layout_tag; + *ligature_set = d.ligature_set; + *context_set = d.context_set; + if (flags) *flags = d.flags; + return true; + } + return false; + } + + void print () + { + for (unsigned i = 0; i < glyph_dependencies.length; i++) { + auto &gd = glyph_dependencies[i]; + if (!gd.dependencies.length) + continue; + printf ("GID %u:\n", i); + for (auto &d : gd.dependencies) { + if (d.table_tag == HB_OT_TAG_GSUB) { + printf (" layout %c%c%c%c -> %u", HB_UNTAG(d.layout_tag), d.dependent); + if (d.ligature_set != HB_CODEPOINT_INVALID) + printf (" (ligature)"); + } else { + printf (" %c%c%c%c -> %u", HB_UNTAG(d.table_tag), d.dependent); + } + printf ("\n"); + } + } + } +}; + +/** + * hb_depend_data_builder_t: + * + * Temporary builder for constructing hb_depend_data_t. Holds all state + * needed during graph extraction; goes out of scope (and is freed) when + * construction is complete, leaving only hb_depend_data_t. + * + * Temporary state (freed on destruction): + * - lookup_features: Packed lookup index to feature tag mapping + * - lookup_feature_offsets: Per-lookup offsets into lookup_features + * - edge_slots: Compact edge deduplication table + * - set_to_index: Content-based dependency set deduplication map + * - free_set_list: Indices of freed sets available for reuse + * - current_context_set_index: Context requirements for current rule + * - current_edge_flags: Flags to apply to edges being recorded + */ +struct hb_depend_data_builder_t +{ + hb_depend_data_builder_t (hb_depend_data_t &data_) + : current_context_set_index (HB_CODEPOINT_INVALID), + current_edge_flags (HB_SUBSET_DEPEND_EDGE_FLAG_NONE), + data (data_) {} + + /* Forward to data for use during construction (e.g. from hb_depend_context_t) */ + const hb_set_t *get_set_from_index (hb_codepoint_t index) + { return data.get_set_from_index (index); } + + /* Discard an unused set that was allocated but had no edges added. */ + void discard_set (hb_codepoint_t set_index) + { + if (set_index >= data.sets.length) + { + DEBUG_MSG (SUBSET, nullptr, "Attempting to discard invalid set %u (max is %u)", + set_index, data.sets.length - 1); + return; + } + set_to_index.del (data.sets[set_index].get ()); + data.sets[set_index]->clear (); + check_success (free_set_list.push_or_fail (set_index)); + } + + hb_codepoint_t new_set (const hb_set_t &set) + { + hb_codepoint_t set_index; + + if (free_set_list.length > 0) + { + set_index = free_set_list.pop (); + data.sets[set_index]->set (set); + if (unlikely (data.sets[set_index]->in_error ())) + return fail_invalid (); + } + else + { + set_index = data.sets.length; + hb_set_t *new_set = hb_set_create (); + if (unlikely (!new_set)) + return fail_invalid (); + new_set->set (set); + if (unlikely (new_set->in_error ())) + { + hb_set_destroy (new_set); + return fail_invalid (); + } + if (unlikely (!data.sets.push_or_fail (hb::unique_ptr {new_set}))) + return fail_invalid (); + } + + return set_index; + } + + /* Find an existing dependency set with the same contents, or create one. */ + hb_codepoint_t find_or_create_set (const hb_set_t &set, bool *created = nullptr) + { + hb_codepoint_t *existing_idx = nullptr; + if (set_to_index.has (&set, &existing_idx)) + { + if (created) *created = false; + return *existing_idx; + } + + hb_codepoint_t new_idx = new_set (set); + if (unlikely (new_idx == HB_CODEPOINT_INVALID)) + return HB_CODEPOINT_INVALID; + + if (unlikely (!set_to_index.set (data.sets[new_idx].get (), new_idx))) + return fail_invalid (); + if (created) *created = true; + return new_idx; + } + + hb_codepoint_t find_or_create_context_set (const hb_set_t &set) + { return find_or_create_set (set); } + + /* Build a context set from context information. + * Encodes backtrack and lookahead requirements as a flattened set. + * Returns HB_CODEPOINT_INVALID if no context. + * + * To ensure canonical encoding and avoid redundancy: + * 1. First pass: collect all direct (single-glyph) requirements + * 2. Second pass: create disjunction sets, subtracting direct requirements + * 3. Combine: add direct requirements and filtered disjunction references + */ + hb_codepoint_t build_context_set (const hb_vector_t *backtrack_sets, + const hb_vector_t *lookahead_sets) + { + if ((!backtrack_sets || backtrack_sets->length == 0) && + (!lookahead_sets || lookahead_sets->length == 0)) + return HB_CODEPOINT_INVALID; + + /* First pass: collect all direct (single-glyph) requirements */ + hb_set_t direct_requirements; + + if (backtrack_sets) + { + for (const auto &back_set : *backtrack_sets) + { + if (back_set.get_population () == 1) + direct_requirements.add (back_set.get_min ()); + } + } + + if (lookahead_sets) + { + for (const auto &look_set : *lookahead_sets) + { + if (look_set.get_population () == 1) + direct_requirements.add (look_set.get_min ()); + } + } + + /* Second pass: create disjunction sets, filtering out direct requirements */ + hb_set_t context_elements; + + if (backtrack_sets) + { + for (const auto &back_set : *backtrack_sets) + { + if (back_set.get_population () > 1) + { + hb_set_t filtered_set; + filtered_set.set (back_set); + filtered_set.subtract (direct_requirements); + if (unlikely (filtered_set.in_error ())) + return fail_invalid (); + + if (!filtered_set.is_empty ()) + { + hb_codepoint_t set_idx = find_or_create_context_set (filtered_set); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return HB_CODEPOINT_INVALID; + context_elements.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); + } + } + } + } + + if (lookahead_sets) + { + for (const auto &look_set : *lookahead_sets) + { + if (look_set.get_population () > 1) + { + hb_set_t filtered_set; + filtered_set.set (look_set); + filtered_set.subtract (direct_requirements); + if (unlikely (filtered_set.in_error ())) + return fail_invalid (); + + if (!filtered_set.is_empty ()) + { + hb_codepoint_t set_idx = find_or_create_context_set (filtered_set); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return HB_CODEPOINT_INVALID; + context_elements.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); + } + } + } + } + + context_elements.union_ (direct_requirements); + if (unlikely (direct_requirements.in_error () || + context_elements.in_error ())) + return fail_invalid (); + + if (context_elements.is_empty ()) + return HB_CODEPOINT_INVALID; + + return find_or_create_context_set (context_elements); + } + + static uint64_t encode_edge_ref (hb_codepoint_t source, unsigned int index) + { return (uint64_t (source) + 1) << 32 | index; } + + static void decode_edge_ref (uint64_t ref, + hb_codepoint_t *source, + unsigned int *index) + { + *source = (ref >> 32) - 1; + *index = ref; + } + + uint32_t edge_hash (hb_codepoint_t source, const hb_depend_edge_t &record) const + { + hb_depend_edge_key_t key (source, record.table_tag, record.layout_tag, + record.dependent, record.ligature_set, + record.context_set); + return key.hash (); + } + + bool resize_edge_slots () + { + unsigned int new_size = edge_slots.length ? edge_slots.length * 2 : 8; + if (unlikely (new_size < edge_slots.length)) + return fail (); + + hb_vector_t new_slots; + if (unlikely (!new_slots.resize_exact (new_size))) + return fail (); + + for (uint64_t ref : edge_slots) + { + if (!ref) + continue; + + hb_codepoint_t source; + unsigned int index; + decode_edge_ref (ref, &source, &index); + const hb_depend_edge_t &record = data.glyph_dependencies[source].dependencies[index]; + unsigned int slot = edge_hash (source, record) & (new_size - 1); + unsigned int step = 0; + while (new_slots[slot]) + slot = (slot + ++step) & (new_size - 1); + new_slots[slot] = ref; + } + + edge_slots = std::move (new_slots); + return true; + } + + bool add_edge (hb_codepoint_t source, const hb_depend_edge_t &record) + { + /* Store only a source and per-glyph edge index in each bucket. The edge + * itself already lives in the output vector, where it can be compared to + * resolve hash collisions exactly. Adding one to the encoded source + * reserves zero as the empty-bucket value. */ + if (unlikely (!edge_slots.length || + uint64_t (edge_population) * 3 / 2 >= edge_slots.length - 1)) + if (unlikely (!resize_edge_slots ())) + return false; + + unsigned int slot = edge_hash (source, record) & (edge_slots.length - 1); + unsigned int step = 0; + while (uint64_t ref = edge_slots[slot]) + { + hb_codepoint_t existing_source; + unsigned int existing_index; + decode_edge_ref (ref, &existing_source, &existing_index); + if (existing_source == source && + data.glyph_dependencies[source].dependencies[existing_index] == record) + return false; + slot = (slot + ++step) & (edge_slots.length - 1); + } + + auto &dependencies = data.glyph_dependencies[source].dependencies; + unsigned int index = dependencies.length; + if (unlikely (!dependencies.push_or_fail (record))) + return fail (); + + edge_slots[slot] = encode_edge_ref (source, index); + edge_population++; + return true; + } + + bool add_depend_layout (hb_codepoint_t target, hb_tag_t table_tag, + hb_tag_t layout_tag, + hb_codepoint_t dependent, + hb_codepoint_t lig_set = HB_CODEPOINT_INVALID, + hb_codepoint_t context_set = HB_CODEPOINT_INVALID, + hb_subset_depend_edge_flags_t flags = HB_SUBSET_DEPEND_EDGE_FLAG_NONE) + { + if (target >= data.glyph_dependencies.length) { + DEBUG_MSG (SUBSET, nullptr, "Dependency glyph %u for %c%c%c%c too large", + target, HB_UNTAG(table_tag)); + return false; + } + + return add_edge (target, hb_depend_edge_t (table_tag, dependent, layout_tag, + lig_set, context_set, flags)); + } + + bool add_gsub_lookup (hb_codepoint_t target, hb_codepoint_t lookup_index, + hb_codepoint_t dependent, + hb_codepoint_t lig_set = HB_CODEPOINT_INVALID, + hb_codepoint_t context_set = HB_CODEPOINT_INVALID) + { + if (context_set == HB_CODEPOINT_INVALID) + context_set = current_context_set_index; + hb_subset_depend_edge_flags_t flags = current_edge_flags; + + bool any_added = false; + for (uint64_t entry : get_lookup_features (lookup_index)) { + hb_tag_t t = (hb_tag_t) entry; + if (add_depend_layout (target, HB_OT_TAG_GSUB, t, dependent, lig_set, context_set, flags)) + any_added = true; + } + return any_added; + } + + bool init_lookup_features (unsigned lookup_count) + { + return check_success (lookup_feature_offsets.resize (lookup_count + 1)); + } + + bool add_lookup_feature (hb_codepoint_t lookup_index, hb_tag_t feature_tag) + { + if (feature_tag == HB_SET_VALUE_INVALID) + return true; + + if (unlikely (!lookup_feature_offsets.length || + lookup_index >= lookup_feature_offsets.length - 1)) + return fail (); + + uint64_t entry = ((uint64_t) lookup_index << 32) | feature_tag; + return check_success (lookup_features.push_or_fail (entry)); + } + + bool finish_lookup_features () + { + lookup_features.qsort ([] (uint64_t a, uint64_t b) { + return a < b ? -1 : a > b ? 1 : 0; + }); + + unsigned write = 0; + for (uint64_t entry : lookup_features) + if (!write || entry != lookup_features[write - 1]) + lookup_features[write++] = entry; + lookup_features.shrink (write, false); + + unsigned feature_index = 0; + unsigned lookup_count = lookup_feature_offsets.length - 1; + for (unsigned lookup_index = 0; lookup_index < lookup_count; lookup_index++) + { + lookup_feature_offsets[lookup_index] = feature_index; + while (feature_index < lookup_features.length && + lookup_features[feature_index] >> 32 == lookup_index) + feature_index++; + } + lookup_feature_offsets[lookup_count] = feature_index; + return true; + } + + hb_array_t get_lookup_features (hb_codepoint_t lookup_index) const + { + if (unlikely (!lookup_feature_offsets.length || + lookup_index >= lookup_feature_offsets.length - 1)) + return {}; + + unsigned start = lookup_feature_offsets[lookup_index]; + unsigned end = lookup_feature_offsets[lookup_index + 1]; + return lookup_features.as_array ().sub_array (start, end - start); + } + + void add_depend (hb_codepoint_t target, hb_tag_t table_tag, + hb_codepoint_t dependent, + hb_codepoint_t lig_set = HB_CODEPOINT_INVALID, + hb_codepoint_t context_set = HB_CODEPOINT_INVALID, + hb_subset_depend_edge_flags_t flags = HB_SUBSET_DEPEND_EDGE_FLAG_NONE) + { + add_depend_layout (target, table_tag, HB_CODEPOINT_INVALID, dependent, lig_set, + context_set, flags); + } + + hb_codepoint_t get_nominal_glyph (hb_codepoint_t cp) + { return hb_map_get (&nominal_glyphs, cp); } + + HB_INTERNAL bool compile (hb_face_t *face); + + bool fail () { successful = false; return false; } + hb_codepoint_t fail_invalid () { fail (); return HB_CODEPOINT_INVALID; } + bool check_success (bool s) { successful = (successful && s); return successful; } + + HB_INTERNAL void get_gsub_dependencies (hb_face_t *face); + + bool successful = true; + hb_set_t unicodes; + hb_map_t nominal_glyphs; + hb_vector_t lookup_features; + hb_vector_t lookup_feature_offsets; + hb_vector_t edge_slots; + unsigned int edge_population = 0; + hb_hashmap_t set_to_index; + hb_vector_t free_set_list; + hb_codepoint_t current_context_set_index; + hb_subset_depend_edge_flags_t current_edge_flags; + + hb_depend_data_t &data; +}; + + +#endif /* HB_DEPEND_DATA_HH */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h index a87a53d0e305..794b82a63230 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h @@ -388,6 +388,11 @@ hb_font_get_glyph_shape (hb_font_t *font, */ #define HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION +HB_DEPRECATED_FOR (hb_font_create) +HB_EXTERN void +hb_font_set_face (hb_font_t *font, + hb_face_t *face); + #endif diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc index a9d00f695ce2..5f1b33f9e65e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc @@ -65,12 +65,20 @@ hb_draw_quadratic_to_nil (hb_draw_funcs_t *dfuncs, void *draw_data, float to_x, float to_y, void *user_data HB_UNUSED) { -#define HB_TWO_THIRD 0.66666666666666666666666667f + /* Compute in double precision, so that the result does not depend + * on how the compiler evaluates float expressions. */ +#define HB_TWO_THIRD 0.66666666666666666666666667 + double current_x = (double) st->current_x; + double current_y = (double) st->current_y; + double cx = (double) control_x; + double cy = (double) control_y; + double tx = (double) to_x; + double ty = (double) to_y; dfuncs->emit_cubic_to (draw_data, *st, - st->current_x + (control_x - st->current_x) * HB_TWO_THIRD, - st->current_y + (control_y - st->current_y) * HB_TWO_THIRD, - to_x + (control_x - to_x) * HB_TWO_THIRD, - to_y + (control_y - to_y) * HB_TWO_THIRD, + (float) (current_x + (cx - current_x) * HB_TWO_THIRD), + (float) (current_y + (cy - current_y) * HB_TWO_THIRD), + (float) (tx + (cx - tx) * HB_TWO_THIRD), + (float) (ty + (cy - ty) * HB_TWO_THIRD), to_x, to_y); #undef HB_TWO_THIRD } @@ -88,6 +96,19 @@ hb_draw_close_path_nil (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data HB_UN hb_draw_state_t *st HB_UNUSED, void *user_data HB_UNUSED) {} +static hb_bool_t +hb_draw_set_budget_nil (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data HB_UNUSED, + int64_t budget HB_UNUSED, + void *user_data HB_UNUSED) { return false; } + +static int64_t +hb_draw_get_budget_nil (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data HB_UNUSED, + void *user_data HB_UNUSED) { return HB_BUDGET_DEFAULT; } + +static int64_t * +hb_draw_get_budget_remaining_nil (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data HB_UNUSED, + void *user_data HB_UNUSED) { return nullptr; } + static bool _hb_draw_funcs_set_preamble (hb_draw_funcs_t *dfuncs, @@ -347,6 +368,67 @@ hb_draw_funcs_is_immutable (hb_draw_funcs_t *dfuncs) return hb_object_is_immutable (dfuncs); } +/** + * hb_draw_set_budget: + * @dfuncs: draw functions object + * @draw_data: associated draw data + * @budget: the new work-budget policy + * + * Sets the work-budget policy and recharges the live work budget. Negative + * values other than #HB_BUDGET_DEFAULT are clamped to zero. + * + * Return value: `true` if the draw functions support work budgets + * + * Since: 14.5.0 + **/ +hb_bool_t +hb_draw_set_budget (hb_draw_funcs_t *dfuncs, void *draw_data, int64_t budget) +{ + return dfuncs->set_budget (draw_data, budget); +} + +/** + * hb_draw_get_budget: + * @dfuncs: draw functions object + * @draw_data: associated draw data + * + * Fetches the configured work-budget policy. + * + * Return value: the configured policy, or #HB_BUDGET_DEFAULT if unsupported + * + * Since: 14.5.0 + **/ +int64_t +hb_draw_get_budget (hb_draw_funcs_t *dfuncs, void *draw_data) +{ + return dfuncs->get_budget (draw_data); +} + +/** + * hb_draw_get_budget_remaining: + * @dfuncs: draw functions object + * @draw_data: associated draw data + * + * Fetches the live work budget. A negative value means the budget was + * exhausted. Zero means the preceding work fit exactly, but no positive-cost + * work can start. + * + * Return value: the live work budget; if it is not tracked, the concrete + * configured policy or #HB_BUDGET_UNLIMITED + * + * Since: 14.5.0 + **/ +int64_t +hb_draw_get_budget_remaining (hb_draw_funcs_t *dfuncs, void *draw_data) +{ + int64_t *remaining = dfuncs->get_budget_remaining_ptr (draw_data); + if (remaining) + return *remaining; + + int64_t budget = dfuncs->get_budget (draw_data); + return budget == HB_BUDGET_DEFAULT ? HB_BUDGET_UNLIMITED : budget; +} + /** * hb_draw_move_to: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.h b/src/java.desktop/share/native/libharfbuzz/hb-draw.h index 7c3358beed8f..b4bcaa590466 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-draw.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.h @@ -195,6 +195,61 @@ typedef void (*hb_draw_close_path_func_t) (hb_draw_funcs_t *dfuncs, void *draw_d hb_draw_state_t *st, void *user_data); +/** + * hb_draw_set_budget_func_t: + * @dfuncs: draw functions object + * @draw_data: The data accompanying the draw functions + * @budget: the new work-budget policy + * @user_data: User data pointer passed to hb_draw_funcs_set_set_budget_func() + * + * Sets the work-budget policy and recharges the live work budget. @budget is + * #HB_BUDGET_DEFAULT, #HB_BUDGET_UNLIMITED, or a non-negative concrete value. + * + * Return value: `true` if the budget was set, `false` if unsupported + * + * Since: 14.5.0 + **/ +typedef hb_bool_t (*hb_draw_set_budget_func_t) (hb_draw_funcs_t *dfuncs, + void *draw_data, + int64_t budget, + void *user_data); + +/** + * hb_draw_get_budget_func_t: + * @dfuncs: draw functions object + * @draw_data: The data accompanying the draw functions + * @user_data: User data pointer passed to hb_draw_funcs_set_get_budget_func() + * + * Fetches the configured work-budget policy. + * + * Return value: the configured work-budget policy + * + * Since: 14.5.0 + **/ +typedef int64_t (*hb_draw_get_budget_func_t) (hb_draw_funcs_t *dfuncs, + void *draw_data, + void *user_data); + +/** + * hb_draw_get_budget_remaining_func_t: + * @dfuncs: draw functions object + * @draw_data: The data accompanying the draw functions + * @user_data: User data pointer passed to + * hb_draw_funcs_set_get_budget_remaining_func() + * + * Fetches the address of the live work budget. The returned address must stay + * valid while @draw_data is used with @dfuncs. The live value must be concrete; + * it must not contain #HB_BUDGET_DEFAULT. + * + * Return value: (nullable) (transfer none): the live work budget, or `NULL` if + * live budget accounting is unsupported + * + * Since: 14.5.0 + **/ +typedef int64_t *(*hb_draw_get_budget_remaining_func_t) (hb_draw_funcs_t *dfuncs, + void *draw_data, + void *user_data); + /** * hb_draw_funcs_set_move_to_func: * @dfuncs: draw functions object @@ -275,6 +330,54 @@ hb_draw_funcs_set_close_path_func (hb_draw_funcs_t *dfuncs, hb_draw_close_path_func_t func, void *user_data, hb_destroy_func_t destroy); +/** + * hb_draw_funcs_set_set_budget_func: + * @dfuncs: draw functions object + * @func: (closure user_data) (destroy destroy) (scope notified): budget setter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the budget setter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_draw_funcs_set_set_budget_func (hb_draw_funcs_t *dfuncs, + hb_draw_set_budget_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_draw_funcs_set_get_budget_func: + * @dfuncs: draw functions object + * @func: (closure user_data) (destroy destroy) (scope notified): budget getter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the budget-policy getter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_draw_funcs_set_get_budget_func (hb_draw_funcs_t *dfuncs, + hb_draw_get_budget_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_draw_funcs_set_get_budget_remaining_func: + * @dfuncs: draw functions object + * @func: (closure user_data) (destroy destroy) (scope notified): live-budget getter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the live-budget getter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_draw_funcs_set_get_budget_remaining_func (hb_draw_funcs_t *dfuncs, + hb_draw_get_budget_remaining_func_t func, + void *user_data, hb_destroy_func_t destroy); + HB_EXTERN hb_draw_funcs_t * hb_draw_funcs_create (void); @@ -306,6 +409,16 @@ hb_draw_funcs_make_immutable (hb_draw_funcs_t *dfuncs); HB_EXTERN hb_bool_t hb_draw_funcs_is_immutable (hb_draw_funcs_t *dfuncs); +HB_EXTERN hb_bool_t +hb_draw_set_budget (hb_draw_funcs_t *dfuncs, void *draw_data, + int64_t budget); + +HB_EXTERN int64_t +hb_draw_get_budget (hb_draw_funcs_t *dfuncs, void *draw_data); + +HB_EXTERN int64_t +hb_draw_get_budget_remaining (hb_draw_funcs_t *dfuncs, void *draw_data); + HB_EXTERN void hb_draw_move_to (hb_draw_funcs_t *dfuncs, void *draw_data, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.hh b/src/java.desktop/share/native/libharfbuzz/hb-draw.hh index 224e10939fee..3a4173fce81e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-draw.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.hh @@ -38,6 +38,9 @@ HB_DRAW_FUNC_IMPLEMENT (quadratic_to) \ HB_DRAW_FUNC_IMPLEMENT (cubic_to) \ HB_DRAW_FUNC_IMPLEMENT (close_path) \ + HB_DRAW_FUNC_IMPLEMENT (set_budget) \ + HB_DRAW_FUNC_IMPLEMENT (get_budget) \ + HB_DRAW_FUNC_IMPLEMENT (get_budget_remaining) \ /* ^--- Add new callbacks here */ struct hb_draw_funcs_t @@ -92,6 +95,20 @@ struct hb_draw_funcs_t { func.close_path (this, draw_data, &st, !user_data ? nullptr : user_data->close_path); } + bool set_budget (void *draw_data, int64_t budget) + { + if (budget < 0 && budget != HB_BUDGET_DEFAULT) + budget = 0; + return func.set_budget (this, draw_data, budget, + !user_data ? nullptr : user_data->set_budget); + } + int64_t get_budget (void *draw_data) + { return func.get_budget (this, draw_data, + !user_data ? nullptr : user_data->get_budget); } + int64_t *get_budget_remaining_ptr (void *draw_data) + { return func.get_budget_remaining (this, draw_data, + !user_data ? nullptr : user_data->get_budget_remaining); } + void HB_ALWAYS_INLINE @@ -176,8 +193,12 @@ DECLARE_NULL_INSTANCE (hb_draw_funcs_t); struct hb_draw_session_t { hb_draw_session_t (hb_draw_funcs_t *funcs_, void *draw_data_) - : funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT - {} + : funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT, + local_budget {HB_BUDGET_GLYPH}, budget {funcs->get_budget_remaining_ptr (draw_data)} + { + if (!budget) + budget = &local_budget; + } ~hb_draw_session_t () { close_path (); } @@ -219,10 +240,14 @@ struct hb_draw_session_t funcs->close_path (draw_data, st); } + int64_t &get_budget () { return *budget; } + public: hb_draw_funcs_t *funcs; void *draw_data; hb_draw_state_t st; + int64_t local_budget; + int64_t *budget; }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc index d660063716f8..776e646369f7 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc @@ -181,15 +181,18 @@ _hb_face_builder_get_table_tags (const hb_face_t *face HB_UNUSED, // Not much to do... } sorted_tags.qsort ([] (const hb_tag_t &a, const hb_tag_t &b) { - return a < b; + return (a > b) - (a < b); }); auto array = sorted_tags.as_array ().sub_array (start_offset, table_count); - auto out = hb_array (table_tags, *table_count); + if (table_tags) + { + auto out = hb_array (table_tags, *table_count); - + array.iter () - | hb_sink (out) - ; + + array.iter () + | hb_sink (out) + ; + } return population; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-face.cc index a0f497eea7f4..4adf39d85ead 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-face.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-face.cc @@ -909,7 +909,7 @@ hb_face_set_get_table_tags_func (hb_face_t *face, * @start_offset: The index of first table tag to retrieve * @table_count: (inout): Input = the maximum number of table tags to return; * Output = the actual number of table tags returned (may be zero) - * @table_tags: (out) (array length=table_count): The array of table tags found + * @table_tags: (out) (array length=table_count) (nullable): The array of table tags found * * Fetches a list of all table tags for a face, if possible. The list returned will * begin at the offset provided diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.h b/src/java.desktop/share/native/libharfbuzz/hb-face.h index 2c130f00feec..063ea3e8f91e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-face.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-face.h @@ -169,7 +169,7 @@ hb_face_get_glyph_count (const hb_face_t *face); * @start_offset: The index of first table tag to retrieve * @table_count: (inout): Input = the maximum number of table tags to return; * Output = the actual number of table tags returned (may be zero) - * @table_tags: (out) (array length=table_count): The array of table tags found + * @table_tags: (out) (array length=table_count) (nullable): The array of table tags found * @user_data: User data pointer passed by the caller * * Callback function for hb_face_get_table_tags(). diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-font.cc index c8ddbd007656..f68ef86689ab 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-font.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-font.cc @@ -731,6 +731,31 @@ hb_draw_close_path_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data, adaptor->draw_funcs->emit_close_path (adaptor->draw_data, *st); } +static hb_bool_t +hb_draw_set_budget_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data, + int64_t budget, + void *user_data HB_UNUSED) +{ + hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data; + return adaptor->draw_funcs->set_budget (adaptor->draw_data, budget); +} + +static int64_t +hb_draw_get_budget_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data, + void *user_data HB_UNUSED) +{ + hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data; + return adaptor->draw_funcs->get_budget (adaptor->draw_data); +} + +static int64_t * +hb_draw_get_budget_remaining_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data, + void *user_data HB_UNUSED) +{ + hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data; + return adaptor->draw_funcs->get_budget_remaining_ptr (adaptor->draw_data); +} + static const hb_draw_funcs_t _hb_draw_funcs_default = { HB_OBJECT_HEADER_STATIC, @@ -1670,9 +1695,7 @@ hb_font_t::paint_glyph (hb_codepoint_t glyph, return; /* Fallback for outline glyph. */ - paint_funcs->push_clip_glyph (paint_data, glyph, this); - paint_funcs->color (paint_data, true, foreground); - paint_funcs->pop_clip (paint_data); + paint_funcs->fill_glyph (paint_data, glyph, this, true, foreground); } @@ -2446,6 +2469,7 @@ hb_font_get_parent (hb_font_t *font) return font->parent; } +#ifndef HB_DISABLE_DEPRECATED /** * hb_font_set_face: * @font: #hb_font_t to work upon @@ -2453,7 +2477,13 @@ hb_font_get_parent (hb_font_t *font) * * Sets @face as the font-face value of @font. * + * Font functions and their data may hold pointers into the old face, + * so the font functions of @font are released and replaced with the + * default ones for @face, as hb_font_create() would set up. Other + * font properties, such as scale and variations, are kept. + * * Since: 1.4.3 + * Deprecated: 15.0.0: Use hb_font_create() instead. **/ void hb_font_set_face (hb_font_t *font, @@ -2474,11 +2504,16 @@ hb_font_set_face (hb_font_t *font, font->face = hb_face_reference (face); font->changed (); + /* Release the old font funcs while the old face is still alive. */ + hb_font_set_funcs (font, nullptr, nullptr, nullptr); + hb_font_set_funcs_using (font, nullptr); + hb_face_destroy (old); font->changed (); font->serial_coords = font->serial; } +#endif /** * hb_font_get_face: @@ -2500,9 +2535,9 @@ hb_font_get_face (hb_font_t *font) /** * hb_font_set_funcs: * @font: #hb_font_t to work upon - * @klass: (closure font_data) (destroy destroy) (scope notified): The font-functions structure. + * @klass: The font-functions structure. * @font_data: Data to attach to @font - * @destroy: (nullable): The function to call when @font_data is not needed anymore + * @destroy: (nullable) (scope async) (closure font_data): The function to call when @font_data is not needed anymore * * Replaces the font-functions structure attached to a font, updating * the font's user-data with @font-data and the @destroy callback. @@ -2540,8 +2575,8 @@ hb_font_set_funcs (hb_font_t *font, /** * hb_font_set_funcs_data: * @font: #hb_font_t to work upon - * @font_data: (destroy destroy) (scope notified): Data to attach to @font - * @destroy: (nullable): The function to call when @font_data is not needed anymore + * @font_data: Data to attach to @font + * @destroy: (nullable) (scope async) (closure font_data): The function to call when @font_data is not needed anymore * * Replaces the user data attached to a font, updating the font's * @destroy callback. @@ -3116,10 +3151,10 @@ hb_font_set_variation (hb_font_t *font, return; } - /* Initialize design coords. */ - if (font->design_coords) + /* Initialize design coords. + * The font's coords may belong to another face after hb_font_set_face(). */ + if (font->design_coords && font->num_coords == coords_length) { - assert (coords_length == font->num_coords); for (unsigned int i = 0; i < coords_length; i++) design_coords[i] = font->design_coords[i]; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.h b/src/java.desktop/share/native/libharfbuzz/hb-font.h index 2d06b659278c..c2c5a1d2d3c2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-font.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-font.h @@ -1159,10 +1159,6 @@ hb_font_set_parent (hb_font_t *font, HB_EXTERN hb_font_t * hb_font_get_parent (hb_font_t *font); -HB_EXTERN void -hb_font_set_face (hb_font_t *font, - hb_face_t *face); - HB_EXTERN hb_face_t * hb_font_get_face (hb_font_t *font); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.hh b/src/java.desktop/share/native/libharfbuzz/hb-font.hh index a89b5db8cbcb..dbf2fbd516ce 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-font.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-font.hh @@ -158,12 +158,12 @@ struct hb_font_t /* Convert from font-space to user-space */ int64_t dir_mult (hb_direction_t direction) { return HB_DIRECTION_IS_VERTICAL(direction) ? y_mult : x_mult; } - hb_position_t em_scale_x (int16_t v) { return em_mult (v, x_mult); } - hb_position_t em_scale_y (int16_t v) { return em_mult (v, y_mult); } + hb_position_t em_scale_x (int32_t v) { return em_mult (v, x_mult); } + hb_position_t em_scale_y (int32_t v) { return em_mult (v, y_mult); } hb_position_t em_scalef_x (float v) { return em_multf (v, x_multf); } hb_position_t em_scalef_y (float v) { return em_multf (v, y_multf); } - float em_fscale_x (int16_t v) { return em_fmult (v, x_multf); } - float em_fscale_y (int16_t v) { return em_fmult (v, y_multf); } + float em_fscale_x (int32_t v) { return em_fmult (v, x_multf); } + float em_fscale_y (int32_t v) { return em_fmult (v, y_multf); } float em_fscalef_x (float v) { return em_fmultf (v, x_multf); } float em_fscalef_y (float v) { return em_fmultf (v, y_multf); } hb_position_t em_scale_dir (int16_t v, hb_direction_t direction) @@ -200,15 +200,15 @@ struct hb_font_t void scale_glyph_extents (hb_glyph_extents_t *extents) { - float x1 = em_scale_x (extents->x_bearing); - float y1 = em_scale_y (extents->y_bearing); - float x2 = em_scale_x (extents->x_bearing + extents->width); - float y2 = em_scale_y (extents->y_bearing + extents->height); - - extents->x_bearing = roundf (x1); - extents->y_bearing = roundf (y1); - extents->width = roundf (x2) - extents->x_bearing; - extents->height = roundf (y2) - extents->y_bearing; + float x1 = em_fscale_x (extents->x_bearing); + float y1 = em_fscale_y (extents->y_bearing); + float x2 = x1 + em_fscale_x (extents->width); + float y2 = y1 + em_fscale_y (extents->height); + + extents->x_bearing = floorf (x1); + extents->y_bearing = floorf (y1); + extents->width = ceilf (x2) - extents->x_bearing; + extents->height = ceilf (y2) - extents->y_bearing; } void synthetic_glyph_extents (hb_glyph_extents_t *extents) @@ -216,16 +216,17 @@ struct hb_font_t /* Slant. */ if (slant_xy) { - hb_position_t x1 = extents->x_bearing; - hb_position_t y1 = extents->y_bearing; - hb_position_t x2 = extents->x_bearing + extents->width; - hb_position_t y2 = extents->y_bearing + extents->height; + /* x_bearing/width and y_bearing/height are each clamped to the full + * hb_position_t range independently by the extent producers, so their + * sums and differences can overflow int32. Accumulate in int64. */ + int64_t y1 = extents->y_bearing; + int64_t y2 = (int64_t) extents->y_bearing + extents->height; - x1 += floorf (hb_min (y1 * slant_xy, y2 * slant_xy)); - x2 += ceilf (hb_max (y1 * slant_xy, y2 * slant_xy)); + int64_t x1 = (int64_t) extents->x_bearing + (int64_t) floorf (hb_min (y1 * slant_xy, y2 * slant_xy)); + int64_t x2 = (int64_t) extents->x_bearing + extents->width + (int64_t) ceilf (hb_max (y1 * slant_xy, y2 * slant_xy)); - extents->x_bearing = x1; - extents->width = x2 - extents->x_bearing; + extents->x_bearing = hb_clamp_to (x1); + extents->width = hb_clamp_to (x2 - x1); } /* Embolden. */ @@ -234,15 +235,15 @@ struct hb_font_t /* Y */ int y_shift = y_strength; if (y_scale < 0) y_shift = -y_shift; - extents->y_bearing += y_shift; - extents->height -= y_shift; + extents->y_bearing = hb_clamp_to ((int64_t) extents->y_bearing + y_shift); + extents->height = hb_clamp_to ((int64_t) extents->height - y_shift); /* X */ int x_shift = x_strength; if (x_scale < 0) x_shift = -x_shift; if (embolden_in_place) - extents->x_bearing -= x_shift / 2; - extents->width += x_shift; + extents->x_bearing = hb_clamp_to ((int64_t) extents->x_bearing - x_shift / 2); + extents->width = hb_clamp_to ((int64_t) extents->width + x_shift); } } @@ -710,6 +711,7 @@ struct hb_font_t #ifndef HB_NO_OUTLINE hb_outline_t outline; + outline.budget_remaining = draw_funcs->get_budget_remaining_ptr (draw_data); if (!klass->get.f.draw_glyph_or_fail (this, user_data, glyph, hb_outline_recording_pen_get_funcs (), &outline, @@ -1144,10 +1146,8 @@ struct hb_font_t x_multf = x_scale / upem; y_multf = y_scale / upem; - bool x_neg = x_scale < 0; - x_mult = (x_neg ? -((int64_t) -x_scale << 16) : ((int64_t) x_scale << 16)) / upem; - bool y_neg = y_scale < 0; - y_mult = (y_neg ? -((int64_t) -y_scale << 16) : ((int64_t) y_scale << 16)) / upem; + x_mult = (int64_t) x_scale * 0x10000 / upem; + y_mult = (int64_t) y_scale * 0x10000 / upem; is_synthetic = x_embolden || y_embolden || slant; @@ -1161,13 +1161,13 @@ struct hb_font_t serial++; } - hb_position_t em_mult (int16_t v, int64_t mult) + hb_position_t em_mult (int32_t v, int64_t mult) { return (hb_position_t) ((v * mult + 32768) >> 16); } hb_position_t em_multf (float v, float mult) { return (hb_position_t) roundf (em_fmultf (v, mult)); } float em_fmultf (float v, float mult) { return v * mult; } - float em_fmult (int16_t v, float mult) + float em_fmult (int32_t v, float mult) { return (float) v * mult; } }; DECLARE_NULL_INSTANCE (hb_font_t); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc index f02069f0c0c5..7963e6636cb1 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc @@ -88,12 +88,15 @@ using hb_ft_advance_cache_t = hb_cache_t<16, 24, 8, false>; +static void _hb_ft_face_destroy_static (void *data); + struct hb_ft_font_t { int load_flags; bool symbol; /* Whether selected cmap is symbol cmap. */ bool unref; /* Whether to destroy ft_face when done. */ bool transform; /* Whether to apply FT_Face's transform. */ + bool static_library; /* Whether ft_face uses static_ft_library. */ mutable hb_mutex_t lock; /* Protects members below. */ FT_Face ft_face; @@ -102,7 +105,7 @@ struct hb_ft_font_t }; static hb_ft_font_t * -_hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref) +_hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref, bool static_library) { hb_ft_font_t *ft_font = (hb_ft_font_t *) hb_calloc (1, sizeof (hb_ft_font_t)); if (unlikely (!ft_font)) return nullptr; @@ -111,6 +114,7 @@ _hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref) ft_font->ft_face = ft_face; ft_font->symbol = symbol; ft_font->unref = unref; + ft_font->static_library = static_library; ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; @@ -132,7 +136,24 @@ _hb_ft_font_destroy (void *data) hb_ft_font_t *ft_font = (hb_ft_font_t *) data; if (ft_font->unref) - _hb_ft_face_destroy (ft_font->ft_face); + { + if (ft_font->static_library) + { + /* ft_font->ft_face->generic.data is the blob that hb_ft_font_set_funcs() + * hooked up as this internal FT_Face's finalizer target (_release_blob). + * FT_Done_Face() below runs that finalizer while static_ft_library_mutex + * is held; if dropping its reference were to free the blob right there, + * the blob's attached destroy_ft_library() user-data callback would try + * to re-lock the same non-recursive mutex and self-deadlock. Hold an + * extra reference across the locked call so the blob (and thus that + * callback) can only be freed after the lock is released. */ + hb_blob_t *blob = hb_blob_reference ((hb_blob_t *) ft_font->ft_face->generic.data); + _hb_ft_face_destroy_static (ft_font->ft_face); + hb_blob_destroy (blob); + } + else + _hb_ft_face_destroy (ft_font->ft_face); + } ft_font->lock.fini (); @@ -508,23 +529,24 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data, for (unsigned int i = 0; i < count; i++) { - FT_Fixed v = 0; + hb_position_t advance; hb_codepoint_t glyph = *first_glyph; unsigned int cv; if (ft_font->advance_cache.get (glyph, &cv)) - v = cv; + advance = (hb_position_t) cv; else { + FT_Fixed v = 0; FT_Get_Advance (ft_face, glyph, load_flags, &v); /* Work around bug that FreeType seems to return negative advance * for variable-set fonts if x_scale is negative! */ - v = abs (v); - v = (int) (v * x_mult + (1<<9)) >> 10; - ft_font->advance_cache.set (glyph, v); + double scaled = trunc (fabs ((double) v) * (double) x_mult + (1<<9)) / (1<<10); + advance = hb_clamp_to (floor (scaled)); + ft_font->advance_cache.set (glyph, advance); } - *first_advance = v; + *first_advance = advance; first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); } @@ -562,9 +584,9 @@ hb_ft_get_glyph_v_advance (hb_font_t *font, /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates * have a Y growing upward. Hence the extra negation. */ - v = ((-v + (1<<9)) >> 10); + double advance = floor ((-(double) v + (1<<9)) / (1<<10)); - return (hb_position_t) (y_mult * v); + return hb_clamp_to ((double) y_mult * advance); } #endif @@ -605,11 +627,12 @@ hb_ft_get_glyph_v_origin (hb_font_t *font, /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates * have a Y growing upward. Hence the extra negation. */ - *x = ft_face->glyph->metrics.horiBearingX - ft_face->glyph->metrics.vertBearingX; - *y = ft_face->glyph->metrics.horiBearingY - (-ft_face->glyph->metrics.vertBearingY); - - *x = (hb_position_t) (x_mult * *x); - *y = (hb_position_t) (y_mult * *y); + *x = hb_clamp_to ((double) x_mult * + ((double) ft_face->glyph->metrics.horiBearingX - + ft_face->glyph->metrics.vertBearingX)); + *y = hb_clamp_to ((double) y_mult * + ((double) ft_face->glyph->metrics.horiBearingY + + ft_face->glyph->metrics.vertBearingY)); return true; } @@ -633,7 +656,7 @@ hb_ft_get_glyph_h_kerning (hb_font_t *font, if (FT_Get_Kerning (ft_font->ft_face, left_glyph, right_glyph, mode, &kerningv)) return 0; - return kerningv.x; + return hb_clamp_to ((int64_t) kerningv.x); } #endif @@ -717,10 +740,15 @@ hb_ft_get_glyph_extents (hb_font_t *font, float x2 = x1 + x_mult * ft_face->glyph->metrics.width; float y2 = y1 + y_mult * -ft_face->glyph->metrics.height; - extents->x_bearing = roundf (x1); - extents->y_bearing = roundf (y1); - extents->width = roundf (x2) - extents->x_bearing; - extents->height = roundf (y2) - extents->y_bearing; + double rx1 = (double) roundf (x1); + double ry1 = (double) roundf (y1); + double rx2 = (double) roundf (x2); + double ry2 = (double) roundf (y2); + + extents->x_bearing = hb_clamp_to (rx1); + extents->y_bearing = hb_clamp_to (ry1); + extents->width = hb_clamp_to (rx2 - rx1); + extents->height = hb_clamp_to (ry2 - ry1); return true; } @@ -841,22 +869,24 @@ hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED, if (ft_face->units_per_EM != 0) { - metrics->ascender = FT_MulFix(ft_face->ascender, ft_face->size->metrics.y_scale); - metrics->descender = FT_MulFix(ft_face->descender, ft_face->size->metrics.y_scale); - metrics->line_gap = FT_MulFix( ft_face->height, ft_face->size->metrics.y_scale ) - (metrics->ascender - metrics->descender); + double ascender = FT_MulFix(ft_face->ascender, ft_face->size->metrics.y_scale); + double descender = FT_MulFix(ft_face->descender, ft_face->size->metrics.y_scale); + double height = FT_MulFix( ft_face->height, ft_face->size->metrics.y_scale ); + metrics->ascender = hb_clamp_to ((double) y_mult * ascender); + metrics->descender = hb_clamp_to ((double) y_mult * descender); + metrics->line_gap = hb_clamp_to ((double) y_mult * (height - (ascender - descender))); } else { /* Bitmap-only font, eg. color bitmap font. */ - metrics->ascender = ft_face->size->metrics.ascender; - metrics->descender = ft_face->size->metrics.descender; - metrics->line_gap = ft_face->size->metrics.height - (metrics->ascender - metrics->descender); + double ascender = ft_face->size->metrics.ascender; + double descender = ft_face->size->metrics.descender; + double height = ft_face->size->metrics.height; + metrics->ascender = hb_clamp_to ((double) y_mult * ascender); + metrics->descender = hb_clamp_to ((double) y_mult * descender); + metrics->line_gap = hb_clamp_to ((double) y_mult * (height - (ascender - descender))); } - metrics->ascender = (hb_position_t) (y_mult * metrics->ascender); - metrics->descender = (hb_position_t) (y_mult * metrics->descender); - metrics->line_gap = (hb_position_t) (y_mult * metrics->line_gap); - return true; } @@ -1088,11 +1118,12 @@ _hb_ft_get_font_funcs () } static void -_hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, bool unref) +_hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, bool unref, + bool static_library = false) { bool symbol = ft_face->charmap && ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL; - hb_ft_font_t *ft_font = _hb_ft_font_create (ft_face, symbol, unref); + hb_ft_font_t *ft_font = _hb_ft_font_create (ft_face, symbol, unref, static_library); if (unlikely (!ft_font)) return; hb_font_set_funcs (font, @@ -1152,23 +1183,29 @@ _hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED, if (!table_count) return population; - else - *table_count = 0; if (unlikely (start_offset >= population)) + { + *table_count = 0; return population; + } - unsigned end_offset = hb_min (start_offset + *table_count, (unsigned) population); - if (unlikely (end_offset < start_offset)) + unsigned end_offset = start_offset + *table_count; + if (unlikely (end_offset < start_offset)) /* Overflow. */ + { + *table_count = 0; return population; + } + end_offset = hb_min (end_offset, (unsigned) population); *table_count = end_offset - start_offset; - for (unsigned i = start_offset; i < end_offset; i++) - { - FT_ULong tag = 0, length; - FT_Sfnt_Table_Info (ft_face, i, &tag, &length); - table_tags[i - start_offset] = tag; - } + if (table_tags) + for (unsigned i = start_offset; i < end_offset; i++) + { + FT_ULong tag = 0, length; + FT_Sfnt_Table_Info (ft_face, i, &tag, &length); + table_tags[i - start_offset] = tag; + } return population; } @@ -1176,8 +1213,8 @@ _hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED, /** * hb_ft_face_create: - * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon - * @destroy: (nullable): A callback to call when the face object is not needed anymore + * @ft_face: FT_Face to work upon + * @destroy: (nullable) (scope async): A callback to call when the face object is not needed anymore * * Creates an #hb_face_t face object from the specified FT_Face. * @@ -1300,8 +1337,8 @@ hb_ft_face_create_cached (FT_Face ft_face) /** * hb_ft_font_create: - * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon - * @destroy: (nullable): A callback to call when the font object is not needed anymore + * @ft_face: FT_Face to work upon + * @destroy: (nullable) (scope async): A callback to call when the font object is not needed anymore * * Creates an #hb_font_t font object from the specified FT_Face. * @@ -1486,6 +1523,31 @@ static FT_MemoryRec_ m = }; static inline void free_static_ft_library (); +static inline void free_static_ft_library_mutex (); + +static struct hb_ft_library_mutex_lazy_loader_t : hb_lazy_loader_t +{ + static hb_mutex_t *create () + { + hb_mutex_t *lock = (hb_mutex_t *) hb_calloc (1, sizeof (hb_mutex_t)); + if (unlikely (!lock)) + return nullptr; + + lock = new (lock) hb_mutex_t; + hb_atexit (free_static_ft_library_mutex); + return lock; + } + static void destroy (hb_mutex_t *lock) + { + lock->~hb_mutex_t (); + hb_free (lock); + } + static hb_mutex_t *get_null () + { + return nullptr; + } +} static_ft_library_mutex; static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t, hb_ft_library_lazy_loader_t> @@ -1513,15 +1575,26 @@ static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_tgeneric.data = ft_library; ft_face->generic.finalizer = finalize_ft_library; @@ -1609,7 +1715,7 @@ _destroy_blob (void *p) * Creates an #hb_face_t face object from the specified * font blob and face index. * - * This is similar in functionality to hb_face_create_from_blob_or_fail(), + * This is similar in functionality to hb_face_create_or_fail(), * but uses the FreeType library for loading the font blob. This can * be useful, for example, to load WOFF and WOFF2 font data. * @@ -1634,15 +1740,19 @@ hb_ft_face_create_from_blob_or_fail (hb_blob_t *blob, const char *blob_data = hb_blob_get_data (blob, &blob_size); FT_Face ft_face; - if (unlikely (FT_New_Memory_Face (ft_library, + if (unlikely (new_ft_memory_face (ft_library, (const FT_Byte *) blob_data, blob_size, index, &ft_face))) + { + destroy_ft_library (ft_library); return nullptr; + } - hb_face_t *face = hb_ft_face_create_referenced (ft_face); - FT_Done_Face (ft_face); + FT_Reference_Face (ft_face); + hb_face_t *face = hb_ft_face_create (ft_face, _hb_ft_face_destroy_static); + _hb_ft_face_destroy_static (ft_face); ft_face->generic.data = ft_library; ft_face->generic.finalizer = finalize_ft_library; @@ -1725,13 +1835,14 @@ hb_ft_font_set_funcs (hb_font_t *font) } FT_Face ft_face = nullptr; - if (unlikely (FT_New_Memory_Face (ft_library, + if (unlikely (new_ft_memory_face (ft_library, (const FT_Byte *) blob_data, blob_length, hb_face_get_index (font->face), &ft_face))) { hb_blob_destroy (blob); + destroy_ft_library (ft_library); DEBUG_MSG (FT, font, "FT_New_Memory_Face() failed"); return; } @@ -1747,11 +1858,12 @@ hb_ft_font_set_funcs (hb_font_t *font) if (unlikely (!hb_blob_set_user_data (blob, &ft_library_key, ft_library, destroy_ft_library, true))) { DEBUG_MSG (FT, font, "hb_blob_set_user_data() failed"); - FT_Done_Face (ft_face); + _hb_ft_face_destroy_static (ft_face); + destroy_ft_library (ft_library); return; } - _hb_ft_font_set_funcs (font, ft_face, true); + _hb_ft_font_set_funcs (font, ft_face, true, true); hb_ft_font_set_load_flags (font, load_flags); _hb_ft_hb_font_changed (font, ft_face); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh index 661e6771a4aa..a294cf36fa4b 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh @@ -460,7 +460,22 @@ struct hb_filter_iter_t : __item_t__ __item__ () const { return *it; } bool __more__ () const { return bool (it); } void __next__ () { do ++it; while (it && !hb_has (p.get (), hb_get (f.get (), *it))); } - void __prev__ () { do --it; while (it && !hb_has (p.get (), hb_get (f.get (), *it))); } + void __prev__ () + { + unsigned count = 0; + do + { + Iter old = it; + --it; + if (!(it != old)) + { + it += count; + return; + } + count++; + } + while (!hb_has (p.get (), hb_get (f.get (), *it))); + } hb_filter_iter_t __end__ () const { return hb_filter_iter_t (it._end (), p, f); } bool operator != (const hb_filter_iter_t& o) const { return it != o.it; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-kern.hh b/src/java.desktop/share/native/libharfbuzz/hb-kern.hh index cf08c16689f9..faba71bd76d6 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-kern.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-kern.hh @@ -43,7 +43,6 @@ struct hb_kern_machine_t driver (driver_), crossStream (crossStream_) {} - HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW void kern (hb_font_t *font, hb_buffer_t *buffer, hb_mask_t kern_mask, @@ -72,9 +71,9 @@ struct hb_kern_machine_t skippy_iter.reset_fast (idx); unsigned unsafe_to; - if (!skippy_iter.next (&unsafe_to)) + if (unlikely (!skippy_iter.next (&unsafe_to))) { - idx++; + idx = unsafe_to; continue; } @@ -101,9 +100,9 @@ struct hb_kern_machine_t { hb_position_t kern1 = kern >> 1; hb_position_t kern2 = kern - kern1; - pos[i].x_advance += kern1; - pos[j].x_advance += kern2; - pos[j].x_offset += kern2; + pos[i].x_advance = hb_saturate_add (pos[i].x_advance, kern1); + pos[j].x_advance = hb_saturate_add (pos[j].x_advance, kern2); + pos[j].x_offset = hb_saturate_add (pos[j].x_offset, kern2); } } else @@ -119,9 +118,9 @@ struct hb_kern_machine_t { hb_position_t kern1 = kern >> 1; hb_position_t kern2 = kern - kern1; - pos[i].y_advance += kern1; - pos[j].y_advance += kern2; - pos[j].y_offset += kern2; + pos[i].y_advance = hb_saturate_add (pos[i].y_advance, kern1); + pos[j].y_advance = hb_saturate_add (pos[j].y_advance, kern2); + pos[j].y_offset = hb_saturate_add (pos[j].y_offset, kern2); } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh index 9d6c7ec68221..e724055146c2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh @@ -58,6 +58,10 @@ #define HB_MAX_CONTEXT_LENGTH 64 #endif +#ifndef HB_MAX_SYLLABLE_LENGTH +#define HB_MAX_SYLLABLE_LENGTH 64 +#endif + #ifndef HB_CLOSURE_MAX_STAGES /* * The maximum number of times a lookup can be applied during shaping. @@ -81,7 +85,7 @@ #endif #ifndef HB_MAX_FEATURE_INDICES -#define HB_MAX_FEATURE_INDICES 1500 +#define HB_MAX_FEATURE_INDICES 8000 #endif #ifndef HB_MAX_LOOKUP_VISIT_COUNT @@ -89,7 +93,7 @@ #endif #ifndef HB_MAX_GRAPH_EDGE_COUNT -#define HB_MAX_GRAPH_EDGE_COUNT 2048 +#define HB_MAX_GRAPH_EDGE_COUNT 16384 #endif #ifndef HB_VAR_COMPOSITE_MAX_AXES @@ -116,25 +120,118 @@ #define HB_GPU_DRAW_MAX_CURVES 65536 #endif +/* Total bytes of sub-blobs (gradient color stops, clip outlines) in one + * hb_gpu_paint_t walk; exceeding it makes the paint unsupported. */ +#ifndef HB_GPU_PAINT_MAX_SUB_BYTES +#define HB_GPU_PAINT_MAX_SUB_BYTES ((unsigned) 64 << 20) +#endif + +/* Tiles emitted by one hb_paint_sweep_gradient_tiles() call. Also + * sets the angular resolution (2π over this) below which a repeating + * color line is filled with its average color instead of tiled; + * a repeat/reflect color line whose stops span a tiny angle could + * otherwise emit millions of patches while covering 0..2π. */ +#ifndef HB_PAINT_MAX_SWEEP_TILES +#define HB_PAINT_MAX_SWEEP_TILES 4096 +#endif + #ifndef HB_SVG_MAX_DOCUMENT_SIZE #define HB_SVG_MAX_DOCUMENT_SIZE ((size_t) 16 << 20) #endif +/* Maximum size of one serialized vector document (SVG or PDF) produced by + * the vector backends. Bounds output that is not outline-derived -- most + * of a path, but especially sweep-gradient meshes and embedded bitmaps -- + * which the outline work budget cannot see. vector is one glyph per + * context, so a flat cap suffices. Unsigned (not size_t like the SVG-table + * limit above) to match hb_vector_buf_t's unsigned length arithmetic. */ +#ifndef HB_VECTOR_MAX_DOCUMENT_SIZE +#define HB_VECTOR_MAX_DOCUMENT_SIZE ((unsigned) 16 << 20) +#endif + #ifndef HB_RASTER_MAX_BUFFER_SIZE #define HB_RASTER_MAX_BUFFER_SIZE ((size_t) 1 << 30) #endif +/* Maximum surface dimension (pixels per side) when extents are derived + * from font data (glyph extents or accumulated outline bounds). Bounds + * attacker-controlled allocations; extents set explicitly through + * hb_raster_{draw,paint}_set_extents() are not limited. */ +#ifndef HB_RASTER_MAX_AUTO_DIMENSION +#define HB_RASTER_MAX_AUTO_DIMENSION 4096 +#endif + +/* + * Cumulative work budgets. + * + * The limits above bound work within one subsystem: points per glyf + * glyph, ops per CFF charstring, nodes in a COLR or VARC graph, + * pixels per raster surface. When one subsystem drives another -- + * COLR driving a paint backend, a paint backend or VARC loading + * glyf/CFF outlines -- those limits multiply. Each driving session + * therefore carries one cumulative budget, initialized once per + * top-level entry and only ever decremented, shared by everything + * the session consumes. Once a budget is exhausted, further work + * is skipped best-effort. + */ + +/* Fixed relative weights. Keep the value in the name so charge sites are + * easy to audit; tune the common session cap, not these values. */ +#define HB_BUDGET_1 1u +#define HB_BUDGET_2 2u +#define HB_BUDGET_4 4u +#define HB_BUDGET_8 8u +#define HB_BUDGET_16 16u +#define HB_BUDGET_32 32u +#define HB_BUDGET_64 64u +#define HB_BUDGET_128 128u +#define HB_BUDGET_256 256u +#define HB_BUDGET_512 512u +#define HB_BUDGET_1024 1024u + +/* The common finite default for one top-level glyph rendering session. + * Nested outline and paint work shares the same live counter. */ +#ifndef HB_BUDGET_GLYPH +#define HB_BUDGET_GLYPH ((int64_t) 1 << 24) +#endif + +/* Precharge COST * MULT. Callers bound COST and MULT structurally, and live + * budgets are concrete non-negative values when a session starts. */ +static HB_ALWAYS_INLINE bool +hb_budget_spend (int64_t &budget, unsigned int cost, unsigned int mult = 1) +{ + budget -= (int64_t) cost * mult; + return budget >= 0; +} + +/* The flat pixel-work floor for one raster paint session. Pixel and + * outline work use separate live counters, so keep this independent of + * the common outline budget above. */ +#ifndef HB_BUDGET_RASTER_PIXELS +#define HB_BUDGET_RASTER_PIXELS ((int64_t) 1 << 26) +#endif + +/* Very large raster surfaces still get a few full-surface operations. */ +#ifndef HB_BUDGET_RASTER_PAINT_PASSES +#define HB_BUDGET_RASTER_PAINT_PASSES 4 +#endif + +/* One raster draw session, in accumulated non-horizontal edges. */ +#ifndef HB_RASTER_MAX_DRAW_EDGES +#define HB_RASTER_MAX_DRAW_EDGES ((int64_t) 1 << 20) +#endif + #ifndef HB_REPACKER_MAX_ITERATIONS #define HB_REPACKER_MAX_ITERATIONS 500 #endif #ifndef HB_REPACKER_MAX_VERTICES -#define HB_REPACKER_MAX_VERTICES 100000 +#define HB_REPACKER_MAX_VERTICES 800000 #endif #ifndef HB_REPACKER_MAX_SPACES -#define HB_REPACKER_MAX_SPACES 1024 +#define HB_REPACKER_MAX_SPACES 8000 #endif diff --git a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh index 8685ac29306c..aa575dd08e4c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh @@ -206,15 +206,25 @@ struct hb_lazy_loader_t : hb_data_wrapper_t static void do_destroy (Stored *p) { - if (p && p != const_cast (Funcs::get_null ())) - Funcs::destroy (p); + if (Funcs::tag_null ? !p || is_tagged_null (p) : + !p || p == const_cast (Funcs::get_null ())) + return; + Funcs::destroy (p); } const Returned * operator -> () const { return get (); } template const U & operator * () const { return *get (); } explicit operator bool () const - { return get_stored () != Funcs::get_null (); } + { + Stored *p = get_stored (); + if (Funcs::tag_null) + { + Stored *raw = this->instance.get_relaxed (); + return raw && !is_tagged_null (raw); + } + return p != Funcs::get_null (); + } template operator const C * () const { return get (); } Stored * get_stored () const @@ -228,7 +238,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t p = this->template call_create (); if (unlikely (!p)) - p = const_cast (Funcs::get_null ()); + p = tagged_null (const_cast (Funcs::get_null ())); if (unlikely (!cmpexch (nullptr, p))) { @@ -236,11 +246,11 @@ struct hb_lazy_loader_t : hb_data_wrapper_t goto retry; } } - return p; + return untagged (p); } Stored * get_stored_relaxed () const { - return this->instance.get_relaxed (); + return untagged (this->instance.get_relaxed ()); } bool cmpexch (Stored *current, Stored *value) const @@ -259,6 +269,18 @@ struct hb_lazy_loader_t : hb_data_wrapper_t /* By default null/init/fini the object. */ static const Stored* get_null () { return &Null (Stored); } + + /* When tag_null is set, a failed create () is cached as get_null () with + * its low bit set, and destroy recognizes it by that bit rather than by + * address. Needed when get_null () is a per-library Null object: another + * library sharing the object would not recognize its address. */ + static constexpr bool tag_null = false; + static bool is_tagged_null (Stored *p) + { return Funcs::tag_null && ((uintptr_t) (void *) p & 1); } + static Stored *tagged_null (Stored *p) + { return Funcs::tag_null ? (Stored *) (void *) ((uintptr_t) (void *) p | 1) : p; } + static Stored *untagged (Stored *p) + { return Funcs::tag_null ? (Stored *) (void *) ((uintptr_t) (void *) p & ~(uintptr_t) 1) : p; } static Stored *create (Data *data) { Stored *p = (Stored *) hb_calloc (1, sizeof (Stored)); @@ -291,21 +313,22 @@ struct hb_face_lazy_loader_t : hb_lazy_loader_t, hb_face_t, WheresFace> { + /* get_null () is this library's Null object; see tag_null. */ + static constexpr bool tag_null = true; + // Hack; have them here for API parity with hb_table_lazy_loader_t hb_blob_t *get_blob () { return this->get ()->get_blob (); } }; -template +template struct hb_table_lazy_loader_t : hb_lazy_loader_t, + hb_table_lazy_loader_t, hb_face_t, WheresFace, hb_blob_t> { static hb_blob_t *create (hb_face_t *face) { hb_sanitize_context_t c; - if (core) - c.set_num_glyphs (0); // So we don't recurse ad infinitum, or doesn't need num_glyphs return c.reference_table (face); } static void destroy (hb_blob_t *p) { hb_blob_destroy (p); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh index ae35e715d54e..1d467590233a 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-map.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-map.hh @@ -49,11 +49,16 @@ struct hb_hashmap_t void _copy (const hb_hashmap_t& o) { + if (unlikely (!o.successful)) + { + successful = false; + return; + } if (unlikely (!o.mask)) return; if (hb_is_trivially_copy_assignable (item_t)) { - items = (item_t *) hb_malloc (sizeof (item_t) * (o.mask + 1)); + items = (item_t *) hb_malloc2 ((o.mask + 1), sizeof (item_t)); if (unlikely (!items)) { successful = false; @@ -199,12 +204,20 @@ struct hb_hashmap_t bool alloc (unsigned new_population = 0) { if (unlikely (!successful)) return false; + if (unlikely (population > 0x3FFFFFFFu || new_population > 0x3FFFFFFFu)) + { + // Population sizes >0x3FFFFFFF will result in power + // being larger than 31, which in turn leads to a new size + // that overflows u32. + successful = false; + return false; + } if (new_population != 0 && (new_population + new_population / 2) < mask) return true; unsigned int power = hb_bit_storage (hb_max (hb_max ((unsigned) population, new_population) * 2, 4u)); unsigned int new_size = 1u << power; - item_t *new_items = (item_t *) hb_malloc ((size_t) new_size * sizeof (item_t)); + item_t *new_items = (item_t *) hb_malloc2 ((size_t) new_size, sizeof (item_t)); if (unlikely (!new_items)) { successful = false; @@ -244,11 +257,32 @@ struct hb_hashmap_t return true; } + template + bool in_storage (const T &v) const + { + uintptr_t p = (uintptr_t) std::addressof (v); + return items && + (uintptr_t) items <= p && p < (uintptr_t) (items + size ()); + } + template bool set_with_hash (KK&& key, uint32_t hash, VV&& value, bool overwrite = true) { if (unlikely (!successful)) return false; - if (unlikely ((occupancy + occupancy / 2) >= mask && !alloc ())) return false; + if (unlikely ((occupancy + occupancy / 2) >= mask)) + { + /* key or value may live in our own storage, eg. m.set (k, m.get (j)). + * alloc() frees that storage, so copy them out first. */ + if (unlikely (in_storage (key) || in_storage (value))) + { + K key_copy; + key_copy = std::forward (key); + V value_copy; + value_copy = std::forward (value); + return set_with_hash (std::move (key_copy), hash, std::move (value_copy), overwrite); + } + if (unlikely (!alloc ())) return false; + } hash &= 0x3FFFFFFF; // We only store lower 30bit of hash unsigned int tombstone = (unsigned int) -1; @@ -288,7 +322,7 @@ struct hb_hashmap_t occupancy++; population++; - if (unlikely (length > max_chain_length) && occupancy * 8 > mask) + if (unlikely (length > max_chain_length) && occupancy > mask / 8) alloc (mask - 8); // This ensures we jump to next larger size return true; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh b/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh index 07f3ebe0c7df..8c707e5d0daf 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh @@ -1,7 +1,5 @@ - -#line 1 "hb-number-parser.rl" /* - * Copyright © 2019 Ebrahim Byagowi + * Copyright © 2019-2026 Ebrahim Byagowi * * This is part of HarfBuzz, a text shaping library. * @@ -30,74 +28,13 @@ #include "hb.hh" - -#line 32 "hb-number-parser.hh" -static const unsigned char _double_parser_trans_keys[] = { - 0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u, - 46u, 101u, 0 -}; - -static const char _double_parser_key_spans[] = { - 0, 15, 12, 10, 15, 10, 54, 10, - 56 -}; - -static const unsigned char _double_parser_index_offsets[] = { - 0, 0, 16, 29, 40, 56, 67, 122, - 133 -}; - -static const char _double_parser_indicies[] = { - 0, 1, 2, 3, 1, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 1, 3, 1, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 1, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, - 1, 6, 1, 7, 1, 1, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, - 1, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 1, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 9, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 9, 1, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 1, 3, 1, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 9, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 9, 1, 0 -}; - -static const char _double_parser_trans_targs[] = { - 2, 0, 2, 3, 8, 6, 5, 5, - 7, 4 -}; - -static const char _double_parser_trans_actions[] = { - 0, 0, 1, 0, 2, 3, 0, 4, - 5, 0 -}; - -static const int double_parser_start = 1; -static const int double_parser_first_final = 6; -static const int double_parser_error = 0; - -static const int double_parser_en_main = 1; - - -#line 68 "hb-number-parser.rl" - - -/* Works only for n < 512 */ +// Handles 0..308; anything larger overflows double and returns HUGE_VAL. static inline double _pow10 (unsigned exponent) { + // DBL_MAX is between 10^308 and 10^309 + if (unlikely (exponent > 308)) return HUGE_VAL; + static const double _powers_of_10[] = { 1.0e+256, @@ -117,118 +54,157 @@ _pow10 (unsigned exponent) return result; } -/* a variant of strtod that also gets end of buffer in its second argument */ -static inline double -strtod_rl (const char *p, const char **end_ptr /* IN/OUT */) +struct _hb_fraction { - double value = 0; - double frac = 0; - double frac_count = 0; - unsigned exp = 0; - bool neg = false, exp_neg = false, exp_overflow = false; - const unsigned long long MAX_FRACT = 0xFFFFFFFFFFFFFull; /* 2^52-1 */ - const unsigned MAX_EXP = 0x7FFu; /* 2^11-1 */ + void add (int digit) + { + if (likely (fraction <= MAX_FRACT / 10)) + { + fraction = fraction * 10. + digit; + ++count; + } + else if (drop < 0) drop = digit; + else if (digit != 0) sticky = true; + } + + double get_value () const + { + double result = fraction; + // Round-to-nearest-even using the recorded tail + if (drop > 5 || (drop == 5 && ((((uint64_t) fraction) & 1) || sticky))) + result += 1; + return result / _pow10 (count); + } + bool is_empty () const { return !count; } + +private: + unsigned count = 0; + double fraction = 0; + int drop = -1; // drop is the first digit we couldn't accumulate + bool sticky = false; // sticky is set when any later digit was nonzero. + static constexpr uint64_t MAX_FRACT = 0xFFFFFFFFFFFFFull; /* 2^52-1 */ +}; + +// A variant of strtod that also gets end of buffer in its second argument. +// +// Grammar (with backtracking on partial exponents): +// +// number := sign? mantissa exponent? +// sign := '+' | '-' +// mantissa:= digits ('.' digits?)? +// | '.' digits +// exponent:= ('e'|'E') sign? digits +// +// On success, *end_ptr is set just past the longest well-formed prefix. +// On no match, *end_ptr is left at the original p (matching strtod's +// "no conversion performed" behavior, so the caller's pointer is unchanged). +static inline double +hb_strtod (const char *p, const char **end_ptr /* IN/OUT */) +{ + const char *p_original = p; const char *pe = *end_ptr; + + // Skip leading whitespace while (p < pe && ISSPACE (*p)) p++; - int cs; + // Sign + bool neg = false; + if (p < pe && (*p == '+' || *p == '-')) + { + neg = (*p == '-'); + p++; + } -#line 132 "hb-number-parser.hh" - { - cs = double_parser_start; - } + double value = 0; -#line 135 "hb-number-parser.hh" - { - int _slen; - int _trans; - const unsigned char *_keys; - const char *_inds; - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _keys = _double_parser_trans_keys + (cs<<1); - _inds = _double_parser_indicies + _double_parser_index_offsets[cs]; - - _slen = _double_parser_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && - (*p) <= _keys[1] ? - (*p) - _keys[0] : _slen ]; - - cs = _double_parser_trans_targs[_trans]; - - if ( _double_parser_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _double_parser_trans_actions[_trans] ) { - case 1: -#line 37 "hb-number-parser.rl" - { neg = true; } - break; - case 4: -#line 38 "hb-number-parser.rl" - { exp_neg = true; } - break; - case 2: -#line 40 "hb-number-parser.rl" - { - value = value * 10. + ((*p) - '0'); -} - break; - case 3: -#line 43 "hb-number-parser.rl" - { - if (likely (frac <= MAX_FRACT / 10)) - { - frac = frac * 10. + ((*p) - '0'); - ++frac_count; - } -} - break; - case 5: -#line 50 "hb-number-parser.rl" - { - if (likely (exp * 10 + ((*p) - '0') <= MAX_EXP)) - exp = exp * 10 + ((*p) - '0'); + // Integer and fraction + { + const char *int_start = p; + while (p < pe && '0' <= *p && *p <= '9') + { + value = value * 10. + (*p - '0'); + p++; + } + bool has_int = p > int_start; + + _hb_fraction frac; + if (p < pe && *p == '.') + { + p++; + while (p < pe && '0' <= *p && *p <= '9') + { + frac.add (*p - '0'); + p++; + } + } + + if (!frac.is_empty ()) value += frac.get_value (); + else if (!has_int) + { + // Nothing could be parsed + *end_ptr = p_original; + return .0; + } + } + + // Exponent + unsigned exp = 0; + bool exp_neg = false, exp_overflow = false; + if (p < pe && (*p == 'e' || *p == 'E')) + { + constexpr unsigned MAX_EXP = 0x7FFu; /* 2^11-1 */ + const char *before_exponent = p; + p++; + if (p < pe && (*p == '+' || *p == '-')) + { + exp_neg = (*p == '-'); + p++; + } + + if (p < pe && '0' <= *p && *p <= '9') + do + { + if (likely (exp * 10 + (*p - '0') <= MAX_EXP)) + exp = exp * 10 + (*p - '0'); else exp_overflow = true; -} - break; -#line 187 "hb-number-parser.hh" - } - -_again: - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - _out: {} - } - -#line 113 "hb-number-parser.rl" - - + p++; + } while (p < pe && '0' <= *p && *p <= '9'); + else + p = before_exponent; // rewind + } *end_ptr = p; - if (frac_count) value += frac / _pow10 (frac_count); if (neg) value *= -1.; if (unlikely (exp_overflow)) { if (value == 0) return value; - if (exp_neg) return neg ? -DBL_MIN : DBL_MIN; + if (exp_neg) return neg ? -.0 : .0; else return neg ? -DBL_MAX : DBL_MAX; } if (exp) { - if (exp_neg) value /= _pow10 (exp); - else value *= _pow10 (exp); + if (exp_neg) + { + // 10^308 is the largest finite power of ten, so two reductions of 308 suffice. + if (unlikely (exp > 308)) + { + value /= 1e308; + exp -= 308; + if (unlikely (exp > 308)) + { + value /= 1e308; + exp -= 308; + } + } + value /= _pow10 (exp); + } + else + value *= _pow10 (exp); } return value; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-number.cc b/src/java.desktop/share/native/libharfbuzz/hb-number.cc index f09366760fa6..a9aaa01f0b5f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-number.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-number.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Ebrahim Byagowi + * Copyright © 2019-2026 Ebrahim Byagowi * * This is part of HarfBuzz, a text shaping library. * @@ -31,55 +31,117 @@ #include "hb-number.hh" #include "hb-number-parser.hh" -template +bool +hb_parse_double (const char **pp, const char *end, double *pv, bool whole_buffer) +{ + const char *pend = end; + double value = hb_strtod (*pp, &pend); + if (unlikely (*pp == pend)) return false; + if (unlikely (whole_buffer && end != pend)) return false; + *pv = value; + *pp = pend; + return true; +} + +/* Returns the digit value of c in the given base (2..36), or -1 if c + * isn't a digit in that base. */ +static int +_hb_digit_value (char c, int base) +{ + int d; + if ('0' <= c && c <= '9') d = c - '0'; + else if ('a' <= c && c <= 'z') d = c - 'a' + 10; + else if ('A' <= c && c <= 'Z') d = c - 'A' + 10; + else return -1; + return d < base ? d : -1; +} + +/* Consumes digits in [p, pe) into *value (magnitude). Sets *overflow + * if the value would exceed UINT64_MAX. Sets *any_digits if at least + * one digit was consumed. Returns the position past the last digit. */ +static const char * +_hb_scan_digits (const char *p, const char *pe, int base, + uint64_t *value, bool *overflow, bool *any_digits) +{ + const uint64_t cutoff = UINT64_MAX / (unsigned) base; + const uint64_t cutlim = UINT64_MAX % (unsigned) base; + uint64_t v = 0; + bool ov = false, any = false; + + for (; p < pe; p++) + { + int d = _hb_digit_value (*p, base); + if (d < 0) break; + any = true; + if (v > cutoff || (v == cutoff && (uint64_t) d > cutlim)) + ov = true; + else + v = v * (unsigned) base + (uint64_t) d; + } + + *value = v; + *overflow = ov; + *any_digits = any; + return p; +} + +template static bool _parse_number (const char **pp, const char *end, T *pv, - bool whole_buffer, Func f) + bool whole_buffer, int base, Postprocess post) { - char buf[32]; - unsigned len = hb_min (ARRAY_LENGTH (buf) - 1, (unsigned) (end - *pp)); - strncpy (buf, *pp, len); - buf[len] = '\0'; - - char *p = buf; - char *pend = p; - - errno = 0; - *pv = f (p, &pend); - if (unlikely (errno || p == pend || - /* Check if consumed whole buffer if is requested */ - (whole_buffer && pend - p != end - *pp))) - return false; - - *pp += pend - p; + const char *pend = end; + const char *p = *pp; + bool neg = false, any = false, overflow = false; + + while (p < pend && ISSPACE (*p)) p++; + if (p < pend && (*p == '+' || *p == '-')) { neg = (*p == '-'); p++; } + + /* Skip an optional "0x"/"0X" prefix for base 16, but only when a hex + * digit follows — "0x" alone parses as the digit 0, matching strtoul. */ + if (base == 16 && p + 2 < pend && p[0] == '0' && + (p[1] == 'x' || p[1] == 'X') && _hb_digit_value (p[2], 16) >= 0) + p += 2; + + uint64_t v = 0; + p = _hb_scan_digits (p, pend, base, &v, &overflow, &any); + if (unlikely (!any || overflow)) return false; + + T out; + if (unlikely (!post (v, neg, &out))) return false; + if (unlikely (whole_buffer && p != pend)) return false; + + *pv = out; + *pp = p; return true; } bool hb_parse_int (const char **pp, const char *end, int *pv, bool whole_buffer) { - return _parse_number (pp, end, pv, whole_buffer, - [] (const char *p, char **end) - { return strtol (p, end, 10); }); + return _parse_number (pp, end, pv, whole_buffer, 10, + [] (uint64_t v, bool neg, int *out) { + /* INT_MAX = 2^31-1, INT_MIN magnitude = 2^31 */ + uint64_t limit = neg ? (uint64_t) INT_MAX + 1 : (uint64_t) INT_MAX; + if (unlikely (v > limit)) return false; + *out = (int) (neg ? -(int64_t) v : (int64_t) v); + return true; + }); } bool hb_parse_uint (const char **pp, const char *end, unsigned *pv, bool whole_buffer, int base) { - return _parse_number (pp, end, pv, whole_buffer, - [base] (const char *p, char **end) - { return strtoul (p, end, base); }); -} - -bool -hb_parse_double (const char **pp, const char *end, double *pv, bool whole_buffer) -{ - const char *pend = end; - *pv = strtod_rl (*pp, &pend); - if (unlikely (*pp == pend)) return false; - *pp = pend; - return !whole_buffer || end == pend; + return _parse_number (pp, end, pv, whole_buffer, base, + [] (uint64_t v, bool neg, unsigned *out) { + if (unlikely (v > UINT_MAX)) return false; + /* Negate in unsigned so -1 wraps to UINT_MAX, matching strtoul + * truncated to unsigned. */ + unsigned u = (unsigned) v; + *out = neg ? (unsigned) (0u - u) : u; + return true; + }); } #endif /* HB_NUMBER_CC pacify */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh index 538240b64160..f4b39820a6cc 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh @@ -88,7 +88,7 @@ typedef struct OpenTypeOffsetTable unsigned int *table_count, /* IN/OUT */ hb_tag_t *table_tags /* OUT */) const { - if (table_count) + if (table_count && table_tags) { + tables.as_array ().sub_array (start_offset, table_count) | hb_map (&TableRecord::tag) @@ -220,20 +220,48 @@ struct TTCHeaderVersion1 { friend struct TTCHeader; - unsigned int get_face_count () const { return table.len; } - const OpenTypeFontFace& get_face (unsigned int i) const { return this+table[i]; } + using DirectoryList = Array32Of>; + + unsigned int get_face_count () const { return get_directory_list ().len; } + const OpenTypeFontFace& get_face (unsigned int i) const + { return this+get_directory_list ()[i]; } bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); +#ifndef HB_NO_BEYOND_64K + if (version.minor >= 1) + { + if (unlikely (!table.sanitize_shallow (c))) + return_trace (false); + unsigned extra_size = version.major == 2 ? 12 : 0; + if (unlikely (!c->check_range (&table, table.get_size () + extra_size))) + return_trace (false); + const DirectoryList &table2 = StructAtOffset (&table, + table.get_size () + extra_size); + return_trace (table2.sanitize (c, this)); + } +#endif return_trace (table.sanitize (c, this)); } + private: + const DirectoryList& get_directory_list () const + { +#ifndef HB_NO_BEYOND_64K + if (version.minor >= 1) + { + unsigned extra_size = version.major == 2 ? 12 : 0; + return StructAtOffset (&table, table.get_size () + extra_size); + } +#endif + return table; + } + protected: Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ - FixedVersion<>version; /* Version of the TTC Header (1.0), - * 0x00010000u */ - Array32Of> + FixedVersion<>version; /* Version of the TTC Header. */ + DirectoryList table; /* Array of offsets to the OffsetTable for each font * from the beginning of the file */ public: @@ -474,8 +502,8 @@ struct OpenTypeFontFile case TrueTag: case Typ1Tag: case TrueTypeTag: return 1; - case TTCTag: return u.ttcHeader.get_face_count (); - case DFontTag: return u.rfHeader.get_face_count (); + case TTCTag: hb_barrier (); return u.ttcHeader.get_face_count (); + case DFontTag: hb_barrier (); return u.rfHeader.get_face_count (); default: return 0; } } @@ -490,9 +518,9 @@ struct OpenTypeFontFile case CFFTag: /* All the non-collection tags */ case TrueTag: case Typ1Tag: - case TrueTypeTag: return u.fontFace; - case TTCTag: return u.ttcHeader.get_face (i); - case DFontTag: return u.rfHeader.get_face (i, base_offset); + case TrueTypeTag: hb_barrier (); return u.fontFace; + case TTCTag: hb_barrier (); return u.ttcHeader.get_face (i); + case DFontTag: hb_barrier (); return u.rfHeader.get_face (i, base_offset); default: return Null (OpenTypeFontFace); } } @@ -518,9 +546,9 @@ struct OpenTypeFontFile case CFFTag: /* All the non-collection tags */ case TrueTag: case Typ1Tag: - case TrueTypeTag: return_trace (u.fontFace.sanitize (c)); - case TTCTag: return_trace (u.ttcHeader.sanitize (c)); - case DFontTag: return_trace (u.rfHeader.sanitize (c)); + case TrueTypeTag: hb_barrier (); return_trace (u.fontFace.sanitize (c)); + case TTCTag: hb_barrier (); return_trace (u.ttcHeader.sanitize (c)); + case DFontTag: hb_barrier (); return_trace (u.rfHeader.sanitize (c)); default: return_trace (true); } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh index 29fc201ba041..d750b5c6caf5 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh @@ -197,17 +197,12 @@ struct HBUINT32VAR else if (b0 < 0xF0) return ((b0 & 0x0F) << 24) | (v[1] << 16) | (v[2] << 8) | v[3]; else - return (v[1] << 24) | (v[2] << 16) | (v[3] << 8) | v[4]; + return (uint32_t (v[1]) << 24) | (v[2] << 16) | (v[3] << 8) | v[4]; } - static bool serialize (hb_serialize_context_t *c, uint32_t v) + static unsigned serialize_unsafe (unsigned char *buf, uint32_t v) { unsigned len = get_size (v); - - unsigned char *buf = c->allocate_size (len, false); - if (unlikely (!buf)) - return false; - unsigned char *p = buf + len; for (unsigned i = 0; i < len; i++) { @@ -218,6 +213,17 @@ struct HBUINT32VAR if (len > 1) buf[0] |= ((1 << (len - 1)) - 1) << (9 - len); + return len; + } + + static bool serialize (hb_serialize_context_t *c, uint32_t v) + { + unsigned len = get_size (v); + unsigned char *buf = c->allocate_size (len, false); + if (unlikely (!buf)) + return false; + + serialize_unsafe (buf, v); return true; } @@ -564,7 +570,7 @@ struct UnsizedArrayOf } static size_t get_size (unsigned int len) - { return len * Type::static_size; } + { return hb_unsigned_mul_saturate (len, Type::static_size); } template operator T * () { return arrayZ; } template operator const T * () const { return arrayZ; } @@ -726,7 +732,7 @@ struct ArrayOf } size_t get_size () const - { return len.static_size + len * Type::static_size; } + { return hb_unsigned_mul_add_saturate (len, Type::static_size, len.static_size); } explicit operator bool () const { return len; } @@ -910,7 +916,7 @@ struct HeadlessArrayOf return arrayZ[i-1]; } size_t get_size () const - { return lenP1.static_size + get_length () * Type::static_size; } + { return hb_unsigned_mul_add_saturate (get_length (), Type::static_size, lenP1.static_size); } unsigned get_length () const { return lenP1 ? lenP1 - 1 : 0; } @@ -1004,7 +1010,7 @@ struct ArrayOfM1 return arrayZ[i]; } size_t get_size () const - { return lenM1.static_size + (lenM1 + 1) * Type::static_size; } + { return hb_unsigned_mul_add_saturate (lenM1 + 1, Type::static_size, lenM1.static_size); } template HB_ALWAYS_INLINE @@ -1198,7 +1204,7 @@ struct VarSizedBinSearchArrayOf unsigned int get_length () const { return header.nUnits - last_is_terminator (); } size_t get_size () const - { return header.static_size + header.nUnits * header.unitSize; } + { return hb_unsigned_mul_add_saturate (header.nUnits, header.unitSize, header.static_size); } template HB_ALWAYS_INLINE @@ -1464,7 +1470,8 @@ struct CFFIndex size_t get_size () const { if (count) - return min_size + offSize.static_size + offset_array_size () + (offset_at (count) - 1); + return hb_unsigned_add_saturate (min_size, offSize.static_size, + offset_array_size (), offset_at (count) - 1); return min_size; /* empty CFFIndex contains count only */ } @@ -1813,6 +1820,33 @@ struct TupleValues return true; } + static bool skip (const unsigned char *&p /* IN/OUT */, + const unsigned char *end, + unsigned count) + { + unsigned seen = 0; + while (seen < count) + { + if (unlikely (p >= end)) return false; + unsigned control = *p++; + unsigned run_count = (control & VALUE_RUN_COUNT_MASK) + 1; + if (unlikely (run_count > count - seen)) return false; + + unsigned width = 0; + switch (control & VALUES_SIZE_MASK) + { + case VALUES_ARE_ZEROS: break; + case VALUES_ARE_BYTES: width = HBINT8::static_size; break; + case VALUES_ARE_WORDS: width = HBINT16::static_size; break; + case VALUES_ARE_LONGS: width = HBINT32::static_size; break; + } + if (unlikely (unsigned (end - p) < run_count * width)) return false; + p += run_count * width; + seen += run_count; + } + return true; + } + struct iter_t : hb_iter_with_fallback_t { iter_t (const unsigned char *p_, unsigned len_) @@ -1974,11 +2008,11 @@ struct TupleValues } private: - template - void _add_to (hb_array_t out, float scale = 1.0f) + template + void _add_to (hb_array_t out, T scale = T (1)) { unsigned n = out.length; - float *arrayZ = out.arrayZ; + T *arrayZ = out.arrayZ; for (unsigned i = 0; i < n;) { @@ -2046,7 +2080,8 @@ struct TupleValues } public: - void add_to (hb_array_t out, float scale = 1.0f) + template + void add_to (hb_array_t out, float scale = 1.0f) { #ifndef HB_OPTIMIZE_SIZE // The following branch is supposed to speed things up by avoiding @@ -2056,7 +2091,7 @@ struct TupleValues _add_to (out); else #endif - _add_to (out, scale); + _add_to (out, (T) scale); } }; }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh index 8db85e4f08c9..d595f91e25aa 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh @@ -183,13 +183,15 @@ struct FDArray : CFFIndex /* FDSelect */ struct FDSelect0 { - bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount, + unsigned int glyph_count = HB_CODEPOINT_INVALID) const { TRACE_SANITIZE (this); if (unlikely (!(c->check_struct (this)))) return_trace (false); hb_barrier (); - if (unlikely (!c->check_array (fds, c->get_num_glyphs ()))) + if (unlikely (!c->check_array (fds, glyph_count == HB_CODEPOINT_INVALID ? + c->get_num_glyphs () : glyph_count))) return_trace (false); return_trace (true); @@ -202,7 +204,7 @@ struct FDSelect0 { { return {fds[glyph], glyph + 1}; } size_t get_size (unsigned int num_glyphs) const - { return HBUINT8::static_size * num_glyphs; } + { return hb_unsigned_mul_saturate (HBUINT8::static_size, num_glyphs); } HBUINT8 fds[HB_VAR_ARRAY]; @@ -230,9 +232,10 @@ template struct FDSelect3_4 { size_t get_size () const - { return GID_TYPE::static_size * 2 + ranges.get_size (); } + { return hb_unsigned_add_saturate ((size_t) GID_TYPE::static_size * 2, ranges.get_size ()); } - bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount, + unsigned int min_glyphs = HB_CODEPOINT_INVALID) const { TRACE_SANITIZE (this); if (unlikely (!(c->check_struct (this) && @@ -248,7 +251,10 @@ struct FDSelect3_4 if (unlikely (!(sentinel().sanitize (c) && hb_barrier () && - (sentinel() == c->get_num_glyphs ())))) + sentinel() > ranges[nRanges () - 1].first && + sentinel() <= c->get_num_glyphs () && + sentinel() >= (min_glyphs == HB_CODEPOINT_INVALID ? + c->get_num_glyphs () : min_glyphs)))) return_trace (false); return_trace (true); @@ -308,8 +314,8 @@ struct FDSelect { switch (format) { - case 0: hb_barrier (); return format.static_size + u.format0.get_size (num_glyphs); - case 3: hb_barrier (); return format.static_size + u.format3.get_size (); + case 0: hb_barrier (); return hb_unsigned_add_saturate (format.static_size, u.format0.get_size (num_glyphs)); + case 3: hb_barrier (); return hb_unsigned_add_saturate (format.static_size, u.format3.get_size ()); default:return 0; } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc index d0e078bffdbc..173c0382f68f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc @@ -364,7 +364,7 @@ struct cff1_path_procs_extents_t : path_procs_t { @@ -379,8 +379,8 @@ struct cff1_cs_opset_extents_t : cff1_cs_opset_tis_valid () || (glyph >= cff->num_glyphs))) return false; @@ -402,12 +402,12 @@ bool _get_bounds (const OT::cff1::accelerator_t *cff, hb_codepoint_t glyph, boun env.set_in_seac (in_seac); cff1_cs_interpreter_t interp (env); cff1_extents_param_t param (cff); - if (unlikely (!interp.interpret (param))) return false; + if (unlikely (!interp.interpret (param, budget))) return false; bounds = param.bounds; return true; } -bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const +bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents, int64_t *budget) const { #ifdef HB_NO_OT_FONT_CFF /* XXX Remove check when this code moves to .hh file. */ @@ -416,7 +416,10 @@ bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph bounds_t bounds; - if (!_get_bounds (this, glyph, bounds)) + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + + if (!_get_bounds (this, glyph, bounds, false, budget)) return false; if (bounds.min.x >= bounds.max.x) @@ -426,8 +429,9 @@ bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph } else { - extents->x_bearing = roundf (bounds.min.x.to_real ()); - extents->width = roundf (bounds.max.x.to_real () - extents->x_bearing); + double x_bearing = roundf (bounds.min.x.to_real ()); + extents->x_bearing = hb_clamp_to (x_bearing); + extents->width = hb_clamp_to ((double) roundf (bounds.max.x.to_real ()) - x_bearing); } if (bounds.min.y >= bounds.max.y) { @@ -436,8 +440,9 @@ bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph } else { - extents->y_bearing = roundf (bounds.max.y.to_real ()); - extents->height = roundf (bounds.min.y.to_real () - extents->y_bearing); + double y_bearing = roundf (bounds.max.y.to_real ()); + extents->y_bearing = hb_clamp_to (y_bearing); + extents->height = hb_clamp_to ((double) roundf (bounds.min.y.to_real ()) - y_bearing); } font->scale_glyph_extents (extents); @@ -515,7 +520,8 @@ struct cff1_path_procs_path_t : path_procs_t { @@ -532,14 +538,15 @@ struct cff1_cs_opset_path_t : cff1_cs_opset_tstd_code_to_glyph (env.argStack[n-1].to_int ()); if (unlikely (!(!env.in_seac && base && accent - && _get_path (param.cff, param.font, base, *param.draw_session, true) - && _get_path (param.cff, param.font, accent, *param.draw_session, true, &delta)))) + && _get_path (param.cff, param.font, base, *param.draw_session, true, nullptr, env.get_budget ()) + && _get_path (param.cff, param.font, accent, *param.draw_session, true, &delta, env.get_budget ())))) env.set_error (); } }; bool _get_path (const OT::cff1::accelerator_t *cff, hb_font_t *font, hb_codepoint_t glyph, - hb_draw_session_t &draw_session, bool in_seac, point_t *delta) + hb_draw_session_t &draw_session, bool in_seac, point_t *delta, + int64_t *budget) { if (unlikely (!cff->is_valid () || (glyph >= cff->num_glyphs))) return false; @@ -549,7 +556,7 @@ bool _get_path (const OT::cff1::accelerator_t *cff, hb_font_t *font, hb_codepoin env.set_in_seac (in_seac); cff1_cs_interpreter_t interp (env); cff1_path_param_t param (cff, font, draw_session, delta); - if (unlikely (!interp.interpret (param))) return false; + if (unlikely (!interp.interpret (param, budget))) return false; /* Let's end the path specially since it is called inside seac also */ param.end_path (); @@ -557,14 +564,17 @@ bool _get_path (const OT::cff1::accelerator_t *cff, hb_font_t *font, hb_codepoin return true; } -bool OT::cff1::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const +bool OT::cff1::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, int64_t *budget) const { #ifdef HB_NO_OT_FONT_CFF /* XXX Remove check when this code moves to .hh file. */ return true; #endif - return _get_path (this, font, glyph, draw_session); + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + + return _get_path (this, font, glyph, draw_session, false, nullptr, budget); } struct get_seac_param_t @@ -591,12 +601,41 @@ struct cff1_cs_opset_seac_t : cff1_cs_opset_t= 2 && + OpCode_TwoBytePosInt0 <= str[end - 2] && + str[end - 2] <= OpCode_TwoByteNegInt3) + return true; + if (end >= 3 && str[end - 3] == OpCode_shortint) + return true; + if (end >= 5 && str[end - 5] == OpCode_fixedcs) + return true; + + /* A subroutine can leave the seac operands on the shared stack. */ + return last == OpCode_callsubr || last == OpCode_callgsubr; +} + bool OT::cff1::accelerator_subset_t::get_seac_components (hb_codepoint_t glyph, hb_codepoint_t *base, hb_codepoint_t *accent) const { if (unlikely (!is_valid () || (glyph >= num_glyphs))) return false; unsigned int fd = fdSelect->get_fd (glyph); const hb_ubytes_t str = (*charStrings)[glyph]; + if (unlikely (!_cff1_charstring_may_end_in_seac (str))) return false; cff1_cs_interp_env_t env (str, *this, fd); cff1_cs_interpreter_t interp (env); get_seac_param_t param (this); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh index 92163ac8bd37..3212269be8fc 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh @@ -28,6 +28,7 @@ #define HB_OT_CFF1_TABLE_HH #include "hb-ot-cff-common.hh" +#include "hb-depend-data.hh" #include "hb-subset-cff-common.hh" #include "hb-draw.hh" #include "hb-paint.hh" @@ -236,14 +237,14 @@ struct Encoding size_t get_size () const { - unsigned int size = min_size; + size_t size = min_size; switch (table_format ()) { - case 0: hb_barrier (); size += u.format0.get_size (); break; - case 1: hb_barrier (); size += u.format1.get_size (); break; + case 0: hb_barrier (); size = hb_unsigned_add_saturate (size, u.format0.get_size ()); break; + case 1: hb_barrier (); size = hb_unsigned_add_saturate (size, u.format1.get_size ()); break; } if (has_supplement ()) - size += suppEncData ().get_size (); + size = hb_unsigned_add_saturate (size, suppEncData ().get_size ()); return size; } @@ -326,7 +327,7 @@ struct Charset0 void collect_glyph_to_sid_map (glyph_to_sid_map_t *mapping, unsigned int num_glyphs) const { - mapping->resize_dirty (num_glyphs); + if (!mapping->resize_dirty (num_glyphs)) return; for (hb_codepoint_t gid = 1; gid < num_glyphs; gid++) mapping->arrayZ[gid] = {sids[gid - 1], gid}; } @@ -426,10 +427,12 @@ struct Charset1_2 { void collect_glyph_to_sid_map (glyph_to_sid_map_t *mapping, unsigned int num_glyphs) const { - mapping->resize_dirty (num_glyphs); + if (!mapping->resize_dirty (num_glyphs)) return; + hb_codepoint_t gid = 1; if (gid >= num_glyphs) return; + for (unsigned i = 0;; i++) { hb_codepoint_t sid = ranges[i].first; @@ -567,9 +570,9 @@ struct Charset { switch (format) { - case 0: hb_barrier (); return min_size + u.format0.get_size (num_glyphs); - case 1: hb_barrier (); return min_size + u.format1.get_size (num_glyphs); - case 2: hb_barrier (); return min_size + u.format2.get_size (num_glyphs); + case 0: hb_barrier (); return hb_unsigned_add_saturate (min_size, u.format0.get_size (num_glyphs)); + case 1: hb_barrier (); return hb_unsigned_add_saturate (min_size, u.format1.get_size (num_glyphs)); + case 2: hb_barrier (); return hb_unsigned_add_saturate (min_size, u.format2.get_size (num_glyphs)); default:return 0; } } @@ -770,8 +773,7 @@ struct cff1_top_dict_opset_t : top_dict_opset_t { static void process_op (op_code_t op, cff1_top_dict_interp_env_t& env, cff1_top_dict_values_t& dictval) { - cff1_top_dict_val_t val; - val.last_arg_offset = (env.last_offset-1) - dictval.opStart; /* offset to the last argument */ + cff1_top_dict_val_t val {}; switch (op) { case OpCode_version: @@ -815,6 +817,9 @@ struct cff1_top_dict_opset_t : top_dict_opset_t dictval.nameSIDs[name_dict_values_t::ordering] = env.argStack.pop_uint (); dictval.nameSIDs[name_dict_values_t::registry] = env.argStack.pop_uint (); env.clear_args (); + if (unlikely (env.in_error ())) return; + assert (env.last_offset > dictval.opStart); + val.last_arg_offset = (env.last_offset - 1) - dictval.opStart; /* offset to the last argument */ break; case OpCode_Encoding: @@ -1463,8 +1468,8 @@ struct cff1 return true; } - HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const; - HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const; + HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents, int64_t *budget = nullptr) const; + HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, int64_t *budget = nullptr) const; private: struct gname_t @@ -1533,6 +1538,20 @@ struct cff1_accelerator_t : cff1::accelerator_t { struct cff1_subset_accelerator_t : cff1::accelerator_subset_t { cff1_subset_accelerator_t (hb_face_t *face) : cff1::accelerator_subset_t (face) {} + + void depend (hb_depend_data_builder_t *builder) const + { + if (!is_valid ()) return; + for (hb_codepoint_t gid = 0; gid < num_glyphs; gid++) + { + hb_codepoint_t base_gid, accent_gid; + if (get_seac_components (gid, &base_gid, &accent_gid)) + { + builder->add_depend (gid, HB_TAG('C','F','F',' '), base_gid); + builder->add_depend (gid, HB_TAG('C','F','F',' '), accent_gid); + } + } + } }; } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc index 94d768a03084..0b4dc1694bdf 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc @@ -113,7 +113,8 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font, bool OT::cff2::accelerator_t::get_extents_at (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents, - hb_array_t coords) const + hb_array_t coords, + int64_t *budget) const { #ifdef HB_NO_OT_FONT_CFF /* XXX Remove check when this code moves to .hh file. */ @@ -122,12 +123,15 @@ bool OT::cff2::accelerator_t::get_extents_at (hb_font_t *font, if (unlikely (!is_valid () || (glyph >= num_glyphs))) return false; + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + unsigned int fd = fdSelect->get_fd (glyph); const hb_ubytes_t str = (*charStrings)[glyph]; cff2_cs_interp_env_t env (str, *this, fd, coords.arrayZ, coords.length); cff2_cs_interpreter_t interp (env); cff2_extents_param_t param; - if (unlikely (!interp.interpret (param))) return false; + if (unlikely (!interp.interpret (param, budget))) return false; if (param.min_x >= param.max_x) { @@ -136,8 +140,9 @@ bool OT::cff2::accelerator_t::get_extents_at (hb_font_t *font, } else { - extents->x_bearing = roundf (param.min_x.to_real ()); - extents->width = roundf (param.max_x.to_real () - extents->x_bearing); + double x_bearing = roundf (param.min_x.to_real ()); + extents->x_bearing = hb_clamp_to (x_bearing); + extents->width = hb_clamp_to ((double) roundf (param.max_x.to_real ()) - x_bearing); } if (param.min_y >= param.max_y) { @@ -146,8 +151,9 @@ bool OT::cff2::accelerator_t::get_extents_at (hb_font_t *font, } else { - extents->y_bearing = roundf (param.max_y.to_real ()); - extents->height = roundf (param.min_y.to_real () - extents->y_bearing); + double y_bearing = roundf (param.max_y.to_real ()); + extents->y_bearing = hb_clamp_to (y_bearing); + extents->height = hb_clamp_to ((double) roundf (param.min_y.to_real ()) - y_bearing); } font->scale_glyph_extents (extents); @@ -204,16 +210,22 @@ struct cff2_path_procs_path_t : path_procs_t {}; -bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const +bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, + hb_draw_session_t &draw_session, + int64_t *budget) const { + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + return get_path_at (font, glyph, draw_session, hb_array (font->coords, - font->has_nonzero_coords ? font->num_coords : 0)); + font->has_nonzero_coords ? font->num_coords : 0), + budget); } -bool OT::cff2::accelerator_t::get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t coords) const +bool OT::cff2::accelerator_t::get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t coords, int64_t *budget) const { #ifdef HB_NO_OT_FONT_CFF /* XXX Remove check when this code moves to .hh file. */ @@ -222,12 +234,15 @@ bool OT::cff2::accelerator_t::get_path_at (hb_font_t *font, hb_codepoint_t glyph if (unlikely (!is_valid () || (glyph >= num_glyphs))) return false; + int64_t stack_budget = HB_BUDGET_GLYPH; + if (!budget) budget = &stack_budget; + unsigned int fd = fdSelect->get_fd (glyph); const hb_ubytes_t str = (*charStrings)[glyph]; cff2_cs_interp_env_t env (str, *this, fd, coords.arrayZ, coords.length); cff2_cs_interpreter_t interp (env); cff2_path_param_t param (font, draw_session); - if (unlikely (!interp.interpret (param))) return false; + if (unlikely (!interp.interpret (param, budget))) return false; return true; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh index 84c593362cfd..198c72a7f35f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh @@ -83,7 +83,8 @@ struct CFF2FDSelect } } - bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const + bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount, + unsigned int charstring_count = HB_CODEPOINT_INVALID) const { TRACE_SANITIZE (this); if (unlikely (!c->check_struct (this))) @@ -92,9 +93,9 @@ struct CFF2FDSelect switch (format) { - case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount)); - case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount)); - case 4: hb_barrier (); return_trace (u.format4.sanitize (c, fdcount)); + case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount, charstring_count)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount, charstring_count)); + case 4: hb_barrier (); return_trace (u.format4.sanitize (c, fdcount, charstring_count)); default:return_trace (false); } } @@ -302,6 +303,9 @@ struct cff2_private_dict_opset_t : dict_opset_t env.clear_args (); break; case OpCode_blenddict: + /* Hint values are ignored here. Discard each group so raw operands + * from successive blends cannot overflow the stack. */ + env.clear_args (); break; default: @@ -346,6 +350,12 @@ struct cff2_private_dict_opset_subset_t : dict_opset_t env.clear_args (); break; + case OpCode_vsindexdict: + env.process_vsindex (); + dictval.ivs = env.get_ivs (); + env.clear_args (); + break; + default: SUPER::process_op (op, env); if (!env.argStack.is_empty ()) return; @@ -428,7 +438,6 @@ struct cff2 varStore = &StructAtOffsetOrNull (cff2, topDict.vstoreOffset, sc); charStrings = &StructAtOffsetOrNull (cff2, topDict.charStringsOffset, sc); fdArray = &StructAtOffsetOrNull (cff2, topDict.FDArrayOffset, sc); - fdSelect = &StructAtOffsetOrNull (cff2, topDict.FDSelectOffset, sc, fdArray->count); if (charStrings == &Null (CFF2CharStrings) || globalSubrs == &Null (CFF2Subrs) || @@ -437,6 +446,18 @@ struct cff2 num_glyphs = charStrings->count; if (num_glyphs != sc.get_num_glyphs ()) + { + /* VARC can define glyphs beyond the CFF2 CharStrings INDEX. */ + hb_blob_t *varc = face->reference_table (HB_TAG ('V','A','R','C')); + bool valid_count = num_glyphs < sc.get_num_glyphs () && + hb_blob_get_length (varc); + hb_blob_destroy (varc); + if (!valid_count) goto fail; + } + + fdSelect = &StructAtOffsetOrNull (cff2, topDict.FDSelectOffset, sc, + fdArray->count, num_glyphs); + if (topDict.FDSelectOffset && fdSelect == &Null (CFF2FDSelect)) goto fail; fdCount = fdArray->count; @@ -531,9 +552,10 @@ struct cff2 HB_INTERNAL bool get_extents_at (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents, - hb_array_t coords) const; - HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const; - HB_INTERNAL bool get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t coords) const; + hb_array_t coords, + int64_t *budget = nullptr) const; + HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, int64_t *budget = nullptr) const; + HB_INTERNAL bool get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t coords, int64_t *budget = nullptr) const; }; struct accelerator_subset_t : accelerator_templ_t diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh index a3e75abef1db..233635d8fe05 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh @@ -30,6 +30,7 @@ #include "hb-ot-os2-table.hh" #include "hb-ot-shaper-arabic-pua.hh" #include "hb-open-type.hh" +#include "hb-ot-dual.hh" #include "hb-set.hh" #include "hb-cache.hh" @@ -38,6 +39,7 @@ * https://docs.microsoft.com/en-us/typography/opentype/spec/cmap */ #define HB_OT_TAG_cmap HB_TAG('c','m','a','p') +#define HB_OT_TAG_DMAP HB_TAG('D','M','A','P') namespace OT { @@ -349,7 +351,9 @@ struct CmapSubtableFormat4 } } - // TODO(grieger): handle case where delta is legitimately 0, mark range offset array instead? + // A zero delta is also the marker for ranges that need a + // glyphIdArray; serialize_rangeoffset_glyid() tells the two cases + // apart by re-checking the mapping. if (should_split) { if (start == prev_run_start) range_writer (start, run_start - 1, previous_run_delta); @@ -443,9 +447,29 @@ struct CmapSubtableFormat4 if (unlikely (!c->check_success (idRangeOffset))) return nullptr; if (unlikely ((char *)idRangeOffset - (char *)idDelta != (int) segcount * (int) HBINT16::static_size)) return nullptr; - for (unsigned i : + hb_range (segcount) - | hb_filter ([&] (const unsigned _) { return idDelta[_] == 0; })) + for (unsigned i : hb_range (segcount)) { + /* A non-zero delta is always a real run. A zero delta is + * ambiguous: identity mapping, or the marker for a range that + * needs a glyphIdArray. Only zero deltas need a check. */ + int delta = idDelta[i]; + if (delta) + continue; + bool use_delta = true; + for (hb_codepoint_t cp = startCode[i]; cp <= endCode[i]; cp++) + { + hb_codepoint_t gid = cp_to_gid.get (cp); + if (gid == HB_MAP_VALUE_INVALID) + gid = 0; + if (gid != cp) + { + use_delta = false; + break; + } + } + if (use_delta) + continue; + idRangeOffset[i] = 2 * (c->start_embed () - idRangeOffset - i); for (hb_codepoint_t cp = startCode[i]; cp <= endCode[i]; cp++) { @@ -658,6 +682,7 @@ struct CmapSubtableFormat4 hb_codepoint_t gid = this->glyphIdArray[index]; if (unlikely (!gid)) continue; + gid = (gid + this->idDelta[i]) & 0xFFFFu; unicodes->add (codepoint); mapping->set (codepoint, gid); } @@ -1122,7 +1147,7 @@ struct DefaultUVS : SortedArray32Of count += 1; if (lastCode == HB_SET_VALUE_INVALID) lastCode = curEntry; - else if (lastCode + count != curEntry) + else if (lastCode + count != curEntry || count > 255) { UnicodeValueRange rec; rec.startUnicodeValue = lastCode; @@ -1162,8 +1187,11 @@ struct DefaultUVS : SortedArray32Of DEFINE_SIZE_ARRAY (4, *this); }; +template struct UVSMapping { + using GlyphID = typename Types::HBGlyphID; + int cmp (const hb_codepoint_t &codepoint) const { return unicodeValue.cmp (codepoint); } @@ -1174,23 +1202,27 @@ struct UVSMapping } HBUINT24 unicodeValue; /* Base Unicode value of the UVS */ - HBGlyphID16 glyphID; /* Glyph ID of the UVS */ + GlyphID + glyphID; /* Glyph ID of the UVS. */ public: - DEFINE_SIZE_STATIC (5); + DEFINE_SIZE_STATIC (3 + GlyphID::static_size); }; -struct NonDefaultUVS : SortedArray32Of +template +struct NonDefaultUVS : SortedArray32Of> { + using Mapping = UVSMapping; + void collect_unicodes (hb_set_t *out) const { - for (const auto& a : as_array ()) + for (const auto& a : this->as_array ()) out->add (a.unicodeValue); } void collect_mapping (hb_set_t *unicodes, /* OUT */ hb_map_t *mapping /* OUT */) const { - for (const auto& a : as_array ()) + for (const auto& a : this->as_array ()) { hb_codepoint_t unicode = a.unicodeValue; hb_codepoint_t glyphid = a.glyphID; @@ -1202,9 +1234,9 @@ struct NonDefaultUVS : SortedArray32Of void closure_glyphs (const hb_set_t *unicodes, hb_set_t *glyphset) const { - + as_array () - | hb_filter (unicodes, &UVSMapping::unicodeValue) - | hb_map (&UVSMapping::glyphID) + + this->as_array () + | hb_filter (unicodes, &Mapping::unicodeValue) + | hb_map (&Mapping::glyphID) | hb_sink (glyphset) ; } @@ -1216,8 +1248,8 @@ struct NonDefaultUVS : SortedArray32Of { auto *out = c->start_embed (); auto it = - + as_array () - | hb_filter ([&] (const UVSMapping& _) + + this->as_array () + | hb_filter ([&] (const Mapping& _) { return unicodes->has (_.unicodeValue) || glyphs_requested->has (_.glyphID); }) @@ -1229,12 +1261,12 @@ struct NonDefaultUVS : SortedArray32Of len = it.len (); if (unlikely (!c->copy (len))) return nullptr; - for (const UVSMapping& _ : it) + for (const Mapping& _ : it) { - UVSMapping mapping; + Mapping mapping; mapping.unicodeValue = _.unicodeValue; mapping.glyphID = glyph_map->get (_.glyphID); - c->copy (mapping); + c->copy (mapping); } return out; @@ -1244,6 +1276,7 @@ struct NonDefaultUVS : SortedArray32Of DEFINE_SIZE_ARRAY (4, *this); }; +template struct VariationSelectorRecord { glyph_variant_t get_glyph (hb_codepoint_t codepoint, @@ -1252,7 +1285,7 @@ struct VariationSelectorRecord { if ((base+defaultUVS).bfind (codepoint)) return GLYPH_VARIANT_USE_DEFAULT; - const UVSMapping &nonDefault = (base+nonDefaultUVS).bsearch (codepoint); + const UVSMapping &nonDefault = (base+nonDefaultUVS).bsearch (codepoint); if (nonDefault.glyphID) { *glyph = nonDefault.glyphID; @@ -1342,14 +1375,19 @@ struct VariationSelectorRecord HBUINT24 varSelector; /* Variation selector. */ Offset32To defaultUVS; /* Offset to Default UVS Table. May be 0. */ - Offset32To + Offset32To> nonDefaultUVS; /* Offset to Non-Default UVS Table. May be 0. */ public: DEFINE_SIZE_STATIC (11); }; -struct CmapSubtableFormat14 +template +struct CmapSubtableFormat14_15 { + static constexpr unsigned format_value = Types::size == 2 ? 14 : 15; + using Record = VariationSelectorRecord; + using NonDefault = NonDefaultUVS; + glyph_variant_t get_glyph_variant (hb_codepoint_t codepoint, hb_codepoint_t variation_selector, hb_codepoint_t *glyph) const @@ -1375,9 +1413,9 @@ struct CmapSubtableFormat14 const char* init_tail = c->tail; if (unlikely (!c->extend_min (this))) return; - this->format = 14; + this->format = format_value; - auto src_tbl = reinterpret_cast (base); + auto src_tbl = reinterpret_cast (base); /* * Some versions of OTS require that offsets are in order. Due to the use @@ -1403,7 +1441,7 @@ struct CmapSubtableFormat14 obj_indices.push (result); } - if (c->length () - table_initpos == CmapSubtableFormat14::min_size) + if (c->length () - table_initpos == CmapSubtableFormat14_15::min_size) { c->revert (snap); return; @@ -1416,8 +1454,8 @@ struct CmapSubtableFormat14 c->check_assign (this->length, c->length () - table_initpos + tail_len, HB_SERIALIZE_ERROR_INT_OVERFLOW); c->check_assign (this->record.len, - (c->length () - table_initpos - CmapSubtableFormat14::min_size) / - VariationSelectorRecord::static_size, + (c->length () - table_initpos - CmapSubtableFormat14_15::min_size) / + Record::static_size, HB_SERIALIZE_ERROR_INT_OVERFLOW); /* Correct the incorrect write order by reversing the order of the variation @@ -1453,24 +1491,24 @@ struct CmapSubtableFormat14 hb_set_t *glyphset) const { + hb_iter (record) - | hb_filter (hb_bool, &VariationSelectorRecord::nonDefaultUVS) - | hb_filter (unicodes, &VariationSelectorRecord::varSelector) - | hb_map (&VariationSelectorRecord::nonDefaultUVS) + | hb_filter (hb_bool, &Record::nonDefaultUVS) + | hb_filter (unicodes, &Record::varSelector) + | hb_map (&Record::nonDefaultUVS) | hb_map (hb_add (this)) - | hb_apply ([=] (const NonDefaultUVS& _) { _.closure_glyphs (unicodes, glyphset); }) + | hb_apply ([=] (const NonDefault& _) { _.closure_glyphs (unicodes, glyphset); }) ; } void collect_unicodes (hb_set_t *out) const { - for (const VariationSelectorRecord& _ : record) + for (const Record& _ : record) _.collect_unicodes (out, this); } void collect_mapping (hb_set_t *unicodes, /* OUT */ hb_map_t *mapping /* OUT */) const { - for (const VariationSelectorRecord& _ : record) + for (const Record& _ : record) _.collect_mapping (this, unicodes, mapping); } @@ -1482,9 +1520,9 @@ struct CmapSubtableFormat14 } protected: - HBUINT16 format; /* Format number is set to 14. */ + HBUINT16 format; /* Format number is set to 14 or 15. */ HBUINT32 length; /* Byte length of this subtable. */ - SortedArray32Of + SortedArray32Of record; /* Variation selector records; sorted * in increasing order of `varSelector'. */ public: @@ -1495,6 +1533,66 @@ struct CmapSubtable { /* Note: We intentionally do NOT implement subtable formats 2 and 8. */ + bool is_variation_selector () const + { + switch (u.format.v) { + case 14: +#ifndef HB_NO_BEYOND_64K + case 15: +#endif + return true; + default: + return false; + } + } + + glyph_variant_t get_glyph_variant (hb_codepoint_t codepoint, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + switch (u.format.v) { + case 14: hb_barrier (); return u.format14.get_glyph_variant (codepoint, variation_selector, glyph); +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); return u.format15.get_glyph_variant (codepoint, variation_selector, glyph); +#endif + default: return GLYPH_VARIANT_NOT_FOUND; + } + } + + void collect_variation_selectors (hb_set_t *out) const + { + switch (u.format.v) { + case 14: hb_barrier (); u.format14.collect_variation_selectors (out); return; +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); u.format15.collect_variation_selectors (out); return; +#endif + default: return; + } + } + + void collect_variation_unicodes (hb_codepoint_t variation_selector, + hb_set_t *out) const + { + switch (u.format.v) { + case 14: hb_barrier (); u.format14.collect_variation_unicodes (variation_selector, out); return; +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); u.format15.collect_variation_unicodes (variation_selector, out); return; +#endif + default: return; + } + } + + void closure_glyphs (const hb_set_t *unicodes, hb_set_t *glyphset) const + { + switch (u.format.v) { + case 14: hb_barrier (); u.format14.closure_glyphs (unicodes, glyphset); return; +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); u.format15.closure_glyphs (unicodes, glyphset); return; +#endif + default: return; + } + } + bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph, unsigned int subtable_data_size = 0) const @@ -1579,6 +1677,9 @@ struct CmapSubtable case 4: hb_barrier (); return u.format4.serialize (c, it); case 12: hb_barrier (); return u.format12.serialize (c, it); case 14: hb_barrier (); return u.format14.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base); +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); return u.format15.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base); +#endif default: return; } } @@ -1596,6 +1697,9 @@ struct CmapSubtable case 12: hb_barrier (); return_trace (u.format12.sanitize (c)); case 13: hb_barrier (); return_trace (u.format13.sanitize (c)); case 14: hb_barrier (); return_trace (u.format14.sanitize (c)); +#ifndef HB_NO_BEYOND_64K + case 15: hb_barrier (); return_trace (u.format15.sanitize (c)); +#endif default:return_trace (true); } } @@ -1609,7 +1713,12 @@ struct CmapSubtable CmapSubtableFormat10 format10; CmapSubtableFormat12 format12; CmapSubtableFormat13 format13; - CmapSubtableFormat14 format14; + CmapSubtableFormat14_15 + format14; +#ifndef HB_NO_BEYOND_64K + CmapSubtableFormat14_15 + format15; +#endif } u; public: DEFINE_SIZE_UNION (2, format.v); @@ -1823,6 +1932,9 @@ struct cmap this->version = 0; unsigned format4objidx = 0, format12objidx = 0, format14objidx = 0; +#ifndef HB_NO_BEYOND_64K + unsigned format15objidx = 0; +#endif auto snap = c->snapshot (); SubtableUnicodesCache local_unicodes_cache (base, source_table_length); @@ -1839,7 +1951,11 @@ struct cmap return false; unsigned format = (base+_.subtable).u.format.v; - if (format != 4 && format != 12 && format != 14) continue; + if (format != 4 && format != 12 && format != 14 +#ifndef HB_NO_BEYOND_64K + && format != 15 +#endif + ) continue; const hb_set_t* unicodes_set = unicodes_cache->set_for (&_, local_unicodes_cache); @@ -1871,6 +1987,9 @@ struct cmap c->copy (_, + it | hb_filter (*unicodes_set, hb_first), 12u, base, plan, &format12objidx); } else if (format == 14) c->copy (_, it, 14u, base, plan, &format14objidx); +#ifndef HB_NO_BEYOND_64K + else if (format == 15) c->copy (_, it, 15u, base, plan, &format15objidx); +#endif } unsigned length = c->length (); unsigned available = length > cmap::min_size ? length - cmap::min_size : 0; @@ -1943,12 +2062,15 @@ struct cmap + hb_iter (encodingRecord) | hb_map (&EncodingRecord::subtable) | hb_map (hb_add (this)) - | hb_filter ([&] (const CmapSubtable& _) { return _.u.format.v == 14; }) - | hb_apply ([=] (const CmapSubtable& _) { _.u.format14.closure_glyphs (unicodes, glyphset); }) + | hb_filter (&CmapSubtable::is_variation_selector) + | hb_apply ([=] (const CmapSubtable& _) { _.closure_glyphs (unicodes, glyphset); }) ; } bool subset (hb_subset_context_t *c) const + { return subset (c, false); } + + bool subset (hb_subset_context_t *c, bool is_dmap) const { TRACE_SUBSET (this); @@ -1978,8 +2100,8 @@ struct cmap else if (_.platformID == 3 && _.encodingID == 10) ms_ucs4 = table; } - if (unlikely (!has_format12 && !unicode_bmp && !ms_bmp)) return_trace (false); - if (unlikely (has_format12 && (!unicode_ucs4 && !ms_ucs4))) return_trace (false); + if (unlikely (!is_dmap && !has_format12 && !unicode_bmp && !ms_bmp)) return_trace (false); + if (unlikely (!is_dmap && has_format12 && (!unicode_ucs4 && !ms_ucs4))) return_trace (false); auto it = + c->plan->unicode_to_new_gid_list.iter () @@ -2050,16 +2172,19 @@ struct cmap using cache_t = hb_cache_t<21, 19>; static_assert (sizeof (cache_t) == 1024, ""); - accelerator_t (hb_face_t *face) + accelerator_t (hb_face_t *face, hb_tag_t table_tag = cmap::tableTag) { - this->table = hb_sanitize_context_t ().reference_table (face); + this->table = hb_sanitize_context_t ().reference_table (face, table_tag); + if (!this->table.get_length ()) + return; + bool symbol, mac, macroman; this->subtable = table->find_best_subtable (&symbol, &mac, ¯oman); - this->subtable_uvs = &Null (CmapSubtableFormat14); + this->subtable_uvs = &Null (CmapSubtable); { - const CmapSubtable *st = table->find_subtable (0, 5); - if (st && st->u.format.v == 14) - subtable_uvs = &st->u.format14; + const CmapSubtable *st = table->find_variation_selector_subtable (); + if (st) + subtable_uvs = st; } #ifndef HB_NO_OT_FONT_CMAP_CACHE @@ -2140,6 +2265,7 @@ struct cmap break; case 4: { + hb_barrier (); this->format4_accel.init (&subtable->u.format4, get_subtable_data_size (subtable)); this->get_glyph_data = &this->format4_accel; @@ -2209,9 +2335,7 @@ struct cmap hb_codepoint_t variation_selector, hb_codepoint_t *glyph) const { - switch (this->subtable_uvs->get_glyph_variant (unicode, - variation_selector, - glyph)) + switch (get_glyph_variant (unicode, variation_selector, glyph)) { case GLYPH_VARIANT_NOT_FOUND: return false; case GLYPH_VARIANT_FOUND: return true; @@ -2221,6 +2345,17 @@ struct cmap return get_nominal_glyph (unicode, glyph); } + glyph_variant_t get_glyph_variant (hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + return this->subtable_uvs->get_glyph_variant (unicode, + variation_selector, + glyph); + } + + bool has_data () const { return table.get_length (); } + void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const { subtable->collect_unicodes (out, num_glyphs, get_subtable_data_size (subtable)); } void collect_mapping (hb_set_t *unicodes, hb_map_t *mapping, @@ -2301,7 +2436,7 @@ struct cmap private: hb_nonnull_ptr_t subtable; - hb_nonnull_ptr_t subtable_uvs; + hb_nonnull_ptr_t subtable_uvs; hb_cmap_get_glyph_func_t get_glyph_funcZ = nullptr; const void *get_glyph_data = nullptr; @@ -2332,6 +2467,25 @@ struct cmap return &(this+result.subtable); } + const CmapSubtable *find_variation_selector_subtable () const + { + const CmapSubtable *format14 = nullptr; + for (const EncodingRecord& record : encodingRecord) + { + if (record.platformID != 0 || record.encodingID != 5) + continue; + + const CmapSubtable *subtable = &(this+record.subtable); +#ifndef HB_NO_BEYOND_64K + if (subtable->u.format.v == 15) + return subtable; +#endif + if (subtable->u.format.v == 14) + format14 = subtable; + } + return format14; + } + public: bool sanitize (hb_sanitize_context_t *c) const @@ -2353,7 +2507,7 @@ struct cmap (_.platformID == 0 && _.encodingID == 4) || (_.platformID == 3 && _.encodingID == 1) || (_.platformID == 3 && _.encodingID == 10) || - (cmap + _.subtable).u.format.v == 14; + (cmap + _.subtable).is_variation_selector (); } protected: @@ -2364,8 +2518,128 @@ struct cmap DEFINE_SIZE_ARRAY (4, encodingRecord); }; -struct cmap_accelerator_t : cmap::accelerator_t { - cmap_accelerator_t (hb_face_t *face) : cmap::accelerator_t (face) {} +struct DMAP : cmap +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_DMAP; + + bool subset (hb_subset_context_t *c) const + { return cmap::subset (c, true); } +}; + +struct cmap_accelerator_t +{ + cmap_accelerator_t (hb_face_t *face) : + dmap (face, HB_OT_TAG_DMAP), + base (face) + {} + + bool get_nominal_glyph (hb_codepoint_t unicode, + hb_codepoint_t *glyph) const + { + return dmap.get_nominal_glyph (unicode, glyph) || + base.get_nominal_glyph (unicode, glyph); + } + + unsigned int get_nominal_glyphs (unsigned int count, + const hb_codepoint_t *first_unicode, + unsigned int unicode_stride, + hb_codepoint_t *first_glyph, + unsigned int glyph_stride) const + { + if (likely (!dmap.has_data ())) + return base.get_nominal_glyphs (count, + first_unicode, unicode_stride, + first_glyph, glyph_stride); + + unsigned int done; + for (done = 0; + done < count && get_nominal_glyph (*first_unicode, first_glyph); + done++) + { + first_unicode = &StructAtOffsetUnaligned (first_unicode, unicode_stride); + first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); + } + return done; + } + + bool get_variation_glyph (hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + glyph_variant_t result = dmap.get_glyph_variant (unicode, + variation_selector, + glyph); + if (result == GLYPH_VARIANT_NOT_FOUND) + result = base.get_glyph_variant (unicode, variation_selector, glyph); + + switch (result) + { + case GLYPH_VARIANT_NOT_FOUND: return false; + case GLYPH_VARIANT_FOUND: return true; + case GLYPH_VARIANT_USE_DEFAULT: break; + } + + return get_nominal_glyph (unicode, glyph); + } + + void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const + { + base.collect_unicodes (out, num_glyphs); + dmap.collect_unicodes (out, num_glyphs); + } + + void collect_mapping (hb_set_t *unicodes, hb_map_t *mapping, + unsigned num_glyphs = UINT_MAX) const + { + base.collect_mapping (unicodes, mapping, num_glyphs); + dmap.collect_mapping (unicodes, mapping, num_glyphs); + } + + void collect_variation_selectors (hb_set_t *out) const + { + base.collect_variation_selectors (out); + dmap.collect_variation_selectors (out); + } + + void collect_variation_unicodes (hb_codepoint_t variation_selector, + hb_set_t *out) const + { + base.collect_variation_unicodes (variation_selector, out); + dmap.collect_variation_unicodes (variation_selector, out); + } + + void closure_glyphs (const hb_set_t *unicodes, + hb_set_t *glyphset) const + { + if (likely (!dmap.has_data ())) + { + base.table->closure_glyphs (unicodes, glyphset); + return; + } + + hb_set_t variation_selectors; + collect_variation_selectors (&variation_selectors); + for (hb_codepoint_t variation_selector : variation_selectors) + { + if (!unicodes->has (variation_selector)) + continue; + + hb_set_t variation_unicodes; + collect_variation_unicodes (variation_selector, &variation_unicodes); + for (hb_codepoint_t unicode : variation_unicodes) + { + if (!unicodes->has (unicode)) + continue; + + hb_codepoint_t glyph; + if (get_variation_glyph (unicode, variation_selector, &glyph)) + glyphset->add (glyph); + } + } + } + + cmap::accelerator_t dmap; + cmap::accelerator_t base; }; } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-dual.hh similarity index 51% rename from src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-dual.hh index 5cf9eb368aac..76da5382b131 100644 --- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-dual.hh @@ -26,14 +26,11 @@ * Google Author(s): Behdad Esfahbod, Garret Rieger */ -#ifndef OT_LAYOUT_TYPES_HH -#define OT_LAYOUT_TYPES_HH +#ifndef HB_OT_DUAL_HH +#define HB_OT_DUAL_HH -using hb_ot_layout_mapping_cache_t = hb_cache_t<16, 8, 8>; -static_assert (sizeof (hb_ot_layout_mapping_cache_t) == 512, ""); +#include "hb-open-type.hh" -using hb_ot_layout_binary_cache_t = hb_cache_t<14, 1, 8>; -static_assert (sizeof (hb_ot_layout_binary_cache_t) == 256, ""); namespace OT { namespace Layout { @@ -42,10 +39,14 @@ struct SmallTypes { static constexpr unsigned size = 2; using large_int = uint32_t; using HBUINT = HBUINT16; + using HBLUINT = HBUINT16; using HBGlyphID = HBGlyphID16; using Offset = Offset16; + using LOffset = Offset16; template using OffsetTo = OT::Offset16To; + template + using LOffsetTo = OT::Offset16To; template using ArrayOf = OT::Array16Of; template @@ -56,10 +57,15 @@ struct MediumTypes { static constexpr unsigned size = 3; using large_int = uint64_t; using HBUINT = HBUINT24; + using HBLUINT = HBUINT32; using HBGlyphID = HBGlyphID24; using Offset = Offset24; + /* Long offsets for large tables. */ + using LOffset = Offset32; template using OffsetTo = OT::Offset24To; + template + using LOffsetTo = OT::Offset32To; template using ArrayOf = OT::Array24Of; template @@ -69,4 +75,71 @@ struct MediumTypes { } } -#endif /* OT_LAYOUT_TYPES_HH */ + +template +struct hb_dual_accelerator_t +{ + hb_dual_accelerator_t (hb_face_t *face) : +#ifndef HB_NO_BEYOND_64K + upper (face), +#endif + lower ( +#ifndef HB_NO_BEYOND_64K + upper.has_data () ? hb_face_get_empty () : +#endif + face) + {} + + bool has_data () const + { +#ifndef HB_NO_BEYOND_64K + if (upper.has_data ()) return true; +#endif + return lower.has_data (); + } + + bool has_upper_data () const + { +#ifndef HB_NO_BEYOND_64K + return upper.has_data (); +#else + return false; +#endif + } + +#ifndef HB_NO_BEYOND_64K + Upper upper; +#endif + Lower lower; +}; + +template +struct hb_table_accelerator_t +{ + hb_table_accelerator_t (hb_face_t *face) : + table (hb_sanitize_context_t ().reference_table (face)) + {} + ~hb_table_accelerator_t () { table.destroy (); } + + bool has_data () const { return table->has_data (); } + + hb_blob_ptr_t
table; +}; + +template +struct hb_dual_table_t : hb_dual_accelerator_t, + hb_table_accelerator_t> +{ + hb_dual_table_t (hb_face_t *face) : + hb_dual_accelerator_t, + hb_table_accelerator_t> (face) {} +}; + +#ifndef HB_NO_BEYOND_64K +#define HB_DUAL_GET(accel, expr) ((accel).upper.has_data () ? (accel).upper.expr : (accel).lower.expr) +#else +#define HB_DUAL_GET(accel, expr) ((accel).lower.expr) +#endif + + +#endif /* HB_OT_DUAL_HH */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh index 9047b2880ab1..abd0a2c0cb2e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh @@ -32,11 +32,6 @@ #define HB_OT_FACE_TABLE_LIST_HH #endif /* HB_OT_FACE_TABLE_LIST_HH */ /* Dummy header guards */ -#ifndef HB_OT_CORE_TABLE -#define HB_OT_CORE_TABLE(Namespace, Type) HB_OT_TABLE (Namespace, Type) -#define _HB_OT_CORE_TABLE_UNDEF -#endif - #ifndef HB_OT_ACCELERATOR #define HB_OT_ACCELERATOR(Namespace, Type) HB_OT_TABLE (Namespace, Type) #define _HB_OT_ACCELERATOR_UNDEF @@ -51,14 +46,14 @@ /* OpenType fundamentals. */ -HB_OT_CORE_TABLE (OT, head) -HB_OT_CORE_TABLE (OT, maxp) +HB_OT_TABLE (OT, head) +HB_OT_ACCELERATOR (OT, maxp) #if !defined(HB_NO_FACE_COLLECT_UNICODES) || !defined(HB_NO_OT_FONT) HB_OT_ACCELERATOR (OT, cmap) #endif -HB_OT_CORE_TABLE (OT, hhea) +HB_OT_ACCELERATOR (OT, hhea) HB_OT_ACCELERATOR (OT, hmtx) -HB_OT_CORE_TABLE (OT, OS2) +HB_OT_TABLE (OT, OS2) #if !defined(HB_NO_OT_FONT_GLYPH_NAMES) || !defined(HB_NO_METRICS) || !defined(HB_NO_STYLE) HB_OT_ACCELERATOR (OT, post) #endif @@ -66,7 +61,7 @@ HB_OT_ACCELERATOR (OT, post) HB_OT_ACCELERATOR (OT, name) #endif #ifndef HB_NO_STYLE -HB_OT_CORE_TABLE (OT, STAT) +HB_OT_TABLE (OT, STAT) #endif #ifndef HB_NO_META HB_OT_ACCELERATOR (OT, meta) @@ -74,13 +69,13 @@ HB_OT_ACCELERATOR (OT, meta) /* Vertical layout. */ #ifndef HB_NO_VERTICAL -HB_OT_CORE_TABLE (OT, vhea) +HB_OT_ACCELERATOR (OT, vhea) HB_OT_ACCELERATOR (OT, vmtx) -HB_OT_CORE_TABLE (OT, VORG) +HB_OT_TABLE (OT, VORG) #endif /* TrueType outlines. */ -HB_OT_CORE_TABLE (OT, loca) // Also used to determine number of glyphs +HB_OT_TABLE (OT, loca) HB_OT_ACCELERATOR (OT, glyf) /* CFF outlines. */ @@ -91,14 +86,11 @@ HB_OT_ACCELERATOR (OT, cff2) /* OpenType variations. */ #ifndef HB_NO_VAR -HB_OT_CORE_TABLE (OT, fvar) -HB_OT_CORE_TABLE (OT, avar) -HB_OT_CORE_TABLE (OT, cvar) +HB_OT_TABLE (OT, fvar) +HB_OT_TABLE (OT, avar) +HB_OT_TABLE (OT, cvar) HB_OT_ACCELERATOR (OT, gvar) -#ifndef HB_NO_BEYOND_64K -HB_OT_ACCELERATOR (OT, GVAR) -#endif -HB_OT_CORE_TABLE (OT, MVAR) +HB_OT_TABLE (OT, MVAR) #ifndef HB_NO_VAR_COMPOSITES HB_OT_ACCELERATOR (OT, VARC) #endif @@ -114,12 +106,12 @@ HB_OT_ACCELERATOR (OT, kern) HB_OT_ACCELERATOR (OT, GDEF) HB_OT_ACCELERATOR (OT, GSUB) HB_OT_ACCELERATOR (OT, GPOS) -//HB_OT_CORE_TABLE (OT, JSTF) +//HB_OT_TABLE (OT, JSTF) #endif /* OpenType baseline. */ #ifndef HB_NO_BASE -HB_OT_CORE_TABLE (OT, BASE) +HB_OT_TABLE (OT, BASE) #endif /* AAT shaping. */ @@ -137,7 +129,7 @@ HB_OT_TABLE (AAT, feat) /* OpenType color fonts. */ #ifndef HB_NO_COLOR HB_OT_ACCELERATOR (OT, COLR) -HB_OT_CORE_TABLE (OT, CPAL) +HB_OT_TABLE (OT, CPAL) HB_OT_ACCELERATOR (OT, CBDT) HB_OT_ACCELERATOR (OT, sbix) #ifndef HB_NO_SVG @@ -147,14 +139,10 @@ HB_OT_ACCELERATOR (OT, SVG) /* OpenType math. */ #ifndef HB_NO_MATH -HB_OT_CORE_TABLE (OT, MATH) +HB_OT_TABLE (OT, MATH) #endif #ifdef _HB_OT_ACCELERATOR_UNDEF #undef HB_OT_ACCELERATOR #endif - -#ifdef _HB_OT_CORE_TABLE_UNDEF -#undef HB_OT_CORE_TABLE -#endif diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh index 415dae8e2095..e24d380bca8c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh @@ -63,13 +63,10 @@ struct hb_ot_face_t hb_face_t *face; /* MUST be JUST before the lazy loaders. */ #define HB_OT_TABLE(Namespace, Type) \ hb_table_lazy_loader_t Type; -#define HB_OT_CORE_TABLE(Namespace, Type) \ - hb_table_lazy_loader_t Type; #define HB_OT_ACCELERATOR(Namespace, Type) \ hb_face_lazy_loader_t Type; #include "hb-ot-face-table-list.hh" #undef HB_OT_ACCELERATOR -#undef HB_OT_CORE_TABLE #undef HB_OT_TABLE }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-fetch.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-fetch.h new file mode 100644 index 000000000000..99b10073dec8 --- /dev/null +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-fetch.h @@ -0,0 +1,101 @@ +/* + * Copyright © 2026 Khaled Hosny + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR) +#error "Include instead." +#endif + +#ifndef HB_OT_FETCH_H +#define HB_OT_FETCH_H + +#include "hb.h" + +HB_BEGIN_DECLS + +/** + * hb_ot_bits_tag_t: + * @HB_OT_BITS_TAG_FS_TYPE: `fsType` of the `OS/2` table. + * @HB_OT_BITS_TAG_FS_SELECTION: `fsSelection` of the `OS/2` table. + * @HB_OT_BITS_TAG_MAC_STYLE: `macStyle` of the `head` table. + * @HB_OT_BITS_TAG_IS_FIXED_PITCH: `isFixedPitch` of the `post` table. + * @HB_OT_BITS_TAG_UNICODE_RANGE_1: `ulUnicodeRange1` of the `OS/2` table. + * @HB_OT_BITS_TAG_UNICODE_RANGE_2: `ulUnicodeRange2` of the `OS/2` table. + * @HB_OT_BITS_TAG_UNICODE_RANGE_3: `ulUnicodeRange3` of the `OS/2` table. + * @HB_OT_BITS_TAG_UNICODE_RANGE_4: `ulUnicodeRange4` of the `OS/2` table. + * @HB_OT_BITS_TAG_CODE_PAGE_RANGE_1: `ulCodePageRange1` of the `OS/2` table. + * @HB_OT_BITS_TAG_CODE_PAGE_RANGE_2: `ulCodePageRange2` of the `OS/2` table. + * + * Bit fields that can be fetched with hb_ot_fetch_bits(). + * + * Since: 14.3.0 + **/ +typedef enum { + HB_OT_BITS_TAG_FS_TYPE = HB_TAG ('f','s','t','p'), + HB_OT_BITS_TAG_FS_SELECTION = HB_TAG ('f','s','s','l'), + HB_OT_BITS_TAG_MAC_STYLE = HB_TAG ('m','c','s','t'), + HB_OT_BITS_TAG_IS_FIXED_PITCH = HB_TAG ('f','x','p','t'), + HB_OT_BITS_TAG_UNICODE_RANGE_1 = HB_TAG ('u','r','n','1'), + HB_OT_BITS_TAG_UNICODE_RANGE_2 = HB_TAG ('u','r','n','2'), + HB_OT_BITS_TAG_UNICODE_RANGE_3 = HB_TAG ('u','r','n','3'), + HB_OT_BITS_TAG_UNICODE_RANGE_4 = HB_TAG ('u','r','n','4'), + HB_OT_BITS_TAG_CODE_PAGE_RANGE_1 = HB_TAG ('c','p','r','1'), + HB_OT_BITS_TAG_CODE_PAGE_RANGE_2 = HB_TAG ('c','p','r','2'), + + /*< private >*/ + _HB_OT_BITS_TAG_MAX_VALUE = HB_TAG_MAX_SIGNED /*< skip >*/ +} hb_ot_bits_tag_t; + + +HB_EXTERN uint32_t +hb_ot_fetch_bits (hb_face_t *face, + hb_ot_bits_tag_t tag); + +/** + * hb_ot_number_tag_t: + * @HB_OT_NUMBER_TAG_FONT_X_MIN: `xMin` of the `head` table. + * @HB_OT_NUMBER_TAG_FONT_Y_MIN: `yMin` of the `head` table. + * @HB_OT_NUMBER_TAG_FONT_X_MAX: `xMax` of the `head` table. + * @HB_OT_NUMBER_TAG_FONT_Y_MAX: `yMax` of the `head` table. + * + * Numbers that can be fetched with hb_ot_fetch_number(). + * + * Since: 14.3.0 + **/ +typedef enum { + HB_OT_NUMBER_TAG_FONT_X_MIN = HB_TAG ('x','m','i','n'), + HB_OT_NUMBER_TAG_FONT_Y_MIN = HB_TAG ('y','m','i','n'), + HB_OT_NUMBER_TAG_FONT_X_MAX = HB_TAG ('x','m','a','x'), + HB_OT_NUMBER_TAG_FONT_Y_MAX = HB_TAG ('y','m','a','x'), + + /*< private >*/ + _HB_OT_NUMBER_TAG_MAX_VALUE = HB_TAG_MAX_SIGNED /*< skip >*/ +} hb_ot_number_tag_t; + +HB_EXTERN int32_t +hb_ot_fetch_number (hb_face_t *face, + hb_ot_number_tag_t tag); + +HB_END_DECLS + +#endif /* HB_OT_FETCH_H */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc index 997fbe5be04a..6ecc76deb9dd 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc @@ -289,7 +289,7 @@ struct hb_ot_font_t void check_serial (hb_font_t *font) const { - int font_serial = font->serial_coords.get_acquire (); + int font_serial = font->serial.get_acquire (); if (cached_serial.get_acquire () != font_serial) { /* These caches are dependent on scale and synthetic settings. @@ -644,6 +644,8 @@ hb_ot_get_glyph_v_origins (hb_font_t *font, const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_face_t *ot_face = ot_font->ot_face; + ot_font->check_serial (font); + /* First, set all the x values to half the advance width. */ font->get_glyph_h_advances (count, first_glyph, glyph_stride, @@ -732,9 +734,12 @@ hb_ot_get_glyph_v_origins (hb_font_t *font, ot_font->v_origin.release_origin_cache (origin_cache); return false; } - OT::hb_scalar_cache_t *gvar_cache = font->has_nonzero_coords ? + OT::hb_scalar_cache_t *gvar_cache = nullptr; +#ifndef HB_NO_VAR + gvar_cache = font->has_nonzero_coords ? ot_font->draw.acquire_gvar_cache (*ot_face->gvar) : nullptr; +#endif for (unsigned i = 0; i < count; i++) { @@ -754,8 +759,10 @@ hb_ot_get_glyph_v_origins (hb_font_t *font, first_y = &StructAtOffsetUnaligned (first_y, y_stride); } +#ifndef HB_NO_VAR if (gvar_cache) ot_font->draw.release_gvar_cache (gvar_cache); +#endif glyf.release_scratch (scratch); ot_font->v_origin.release_origin_cache (origin_cache); return true; @@ -780,7 +787,8 @@ hb_ot_get_glyph_v_origins (hb_font_t *font, { hb_glyph_extents_t extents = {0}; if (likely (font->get_glyph_extents (*first_glyph, &extents))) - origin = extents.y_bearing + ((font_advance - -extents.height) >> 1); + origin = hb_clamp_to ((int64_t) extents.y_bearing + + (((int64_t) font_advance + extents.height) >> 1)); else origin = font_extents.ascender; @@ -912,11 +920,14 @@ hb_ot_draw_glyph_or_fail (hb_font_t *font, if (font->face->table.VARC->get_path (font, glyph, draw_session)) return true; #endif // Keep the following in synch with VARC::get_path_at() - if (font->face->table.glyf->get_path (font, glyph, draw_session, gvar_cache)) return true; + if (font->face->table.glyf->get_path (font, glyph, draw_session, gvar_cache, + &draw_session.get_budget ())) return true; #ifndef HB_NO_CFF - if (font->face->table.cff2->get_path (font, glyph, draw_session)) return true; - if (font->face->table.cff1->get_path (font, glyph, draw_session)) return true; + if (font->face->table.cff2->get_path (font, glyph, draw_session, + &draw_session.get_budget ())) return true; + if (font->face->table.cff1->get_path (font, glyph, draw_session, + &draw_session.get_budget ())) return true; #endif return false; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh index 77c2894bbc83..ac6438d04592 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh @@ -42,7 +42,7 @@ namespace OT { struct DeviceRecord { static size_t get_size (unsigned count) - { return hb_ceil_to_4 (min_size + count * HBUINT8::static_size); } + { return hb_ceil_to_4 (hb_unsigned_mul_add_saturate (count, HBUINT8::static_size, min_size)); } template @@ -88,7 +88,7 @@ struct hdmx static constexpr hb_tag_t tableTag = HB_OT_TAG_hdmx; size_t get_size () const - { return min_size + numRecords * sizeDeviceRecord; } + { return hb_unsigned_mul_add_saturate (numRecords, sizeDeviceRecord, min_size); } template diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh index 34535e2286d8..1b70929050c8 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh @@ -99,6 +99,8 @@ struct head bool is_condensed () const { return macStyle & CONDENSED; } bool is_expanded () const { return macStyle & EXPANDED; } + unsigned get_mac_style () const { return macStyle; } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh index 5e3be5be525b..2bdd7ed1a08c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh @@ -28,6 +28,7 @@ #define HB_OT_HHEA_TABLE_HH #include "hb-open-type.hh" +#include "hb-ot-dual.hh" /* * hhea -- Horizontal Header @@ -36,15 +37,22 @@ * https://docs.microsoft.com/en-us/typography/opentype/spec/vhea */ #define HB_OT_TAG_hhea HB_TAG('h','h','e','a') +#define HB_OT_TAG_HHEA HB_TAG('H','H','E','A') #define HB_OT_TAG_vhea HB_TAG('v','h','e','a') +#define HB_OT_TAG_VHEA HB_TAG('V','H','E','A') namespace OT { -template +template struct _hea { + using LongMetricCount = typename Types::HBLUINT; + + static constexpr unsigned long_metric_count_max () + { return LongMetricCount::static_size == 4 ? 0xFFFFFFFFu : 0xFFFFu; } + bool has_data () const { return version.major; } bool sanitize (hb_sanitize_context_t *c) const @@ -85,19 +93,38 @@ struct _hea HBINT16 reserved3; /* Set to 0. */ HBINT16 reserved4; /* Set to 0. */ HBINT16 metricDataFormat;/* 0 for current format. */ - HBUINT16 numberOfLongMetrics; + LongMetricCount + numberOfLongMetrics; /* Number of LongMetric entries in metric * table. */ public: - DEFINE_SIZE_STATIC (36); + DEFINE_SIZE_STATIC (34 + Types::HBLUINT::static_size); }; -struct hhea : _hea { +struct hhea : _hea { static constexpr hb_tag_t tableTag = HB_OT_TAG_hhea; }; -struct vhea : _hea { +struct HHEA : _hea { + static constexpr hb_tag_t tableTag = HB_OT_TAG_HHEA; +}; +struct vhea : _hea { static constexpr hb_tag_t tableTag = HB_OT_TAG_vhea; }; +struct VHEA : _hea { + static constexpr hb_tag_t tableTag = HB_OT_TAG_VHEA; +}; + +struct hhea_accelerator_t : hb_dual_table_t +{ + hhea_accelerator_t (hb_face_t *face) : + hb_dual_table_t (face) {} +}; + +struct vhea_accelerator_t : hb_dual_table_t +{ + vhea_accelerator_t (hb_face_t *face) : + hb_dual_table_t (face) {} +}; } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh index e679e22c7a91..9d2e8b069b45 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh @@ -28,6 +28,7 @@ #define HB_OT_HMTX_TABLE_HH #include "hb-open-type.hh" +#include "hb-ot-dual.hh" #include "hb-ot-maxp-table.hh" #include "hb-ot-hhea-table.hh" #include "hb-ot-os2-table.hh" @@ -42,7 +43,9 @@ * https://docs.microsoft.com/en-us/typography/opentype/spec/vmtx */ #define HB_OT_TAG_hmtx HB_TAG('h','m','t','x') +#define HB_OT_TAG_HMTX HB_TAG('H','M','T','X') #define HB_OT_TAG_vmtx HB_TAG('v','m','t','x') +#define HB_OT_TAG_VMTX HB_TAG('V','M','T','X') namespace OT { @@ -193,11 +196,8 @@ struct hmtxvmtx lm.advance = mtx.first; lm.sb = mtx.second; } - // TODO(beyond-64k): This assumes that maxp.numGlyphs is 0xFFFF. - else if (gid < 0x10000u) - short_metrics[gid] = mtx.second; else - ((UFWORD*) short_metrics)[gid] = mtx.first; + short_metrics[gid] = mtx.second; } } @@ -216,7 +216,7 @@ struct hmtxvmtx // TODO Don't consider retaingid holes here. - num_long_metrics = hb_min (plan->num_output_glyphs (), 0xFFFFu); + num_long_metrics = hb_min (plan->num_output_glyphs (), H::long_metric_count_max ()); unsigned int last_advance = get_new_gid_advance_unscaled (plan, mtx_map, num_long_metrics - 1, _mtx); while (num_long_metrics > 1 && last_advance == get_new_gid_advance_unscaled (plan, mtx_map, num_long_metrics - 2, _mtx)) @@ -264,9 +264,13 @@ struct hmtxvmtx { friend struct hmtxvmtx; - accelerator_t (hb_face_t *face) + accelerator_t (hb_face_t *face) : + accelerator_t (face, T::tableTag, get_num_long_metrics (face)) + {} + + accelerator_t (hb_face_t *face, hb_tag_t tableTag, unsigned num_long_metrics_) { - table = hb_sanitize_context_t ().reference_table (face, T::tableTag); + table = hb_sanitize_context_t ().reference_table (face, tableTag); var_table = hb_sanitize_context_t ().reference_table (face, T::variationsTag); default_advance = T::is_horizontal ? hb_face_get_upem (face) / 2 : hb_face_get_upem (face); @@ -277,15 +281,8 @@ struct hmtxvmtx if (len & 1) len--; - num_long_metrics = T::is_horizontal ? - face->table.hhea->numberOfLongMetrics : -#ifndef HB_NO_VERTICAL - face->table.vhea->numberOfLongMetrics -#else - 0 -#endif - ; - if (unlikely (num_long_metrics * 4 > len)) + num_long_metrics = num_long_metrics_; + if (unlikely (num_long_metrics > len / 4)) num_long_metrics = len / 4; len -= num_long_metrics * 4; @@ -336,33 +333,15 @@ struct hmtxvmtx unsigned int get_advance_without_var_unscaled (hb_codepoint_t glyph) const { - /* OpenType case. */ if (glyph < num_bearings) return table->longMetricZ[hb_min (glyph, (uint32_t) num_long_metrics - 1)].advance; /* If num_advances is zero, it means we don't have the metrics table - * for this direction: return default advance. Otherwise, there's a - * well-defined answer. */ + * for this direction: return default advance. */ if (unlikely (!num_advances)) return default_advance; -#ifdef HB_NO_BEYOND_64K return 0; -#endif - - if (unlikely (glyph >= num_glyphs)) - return 0; - - /* num_bearings <= glyph < num_glyphs; - * num_bearings <= num_advances */ - - if (num_bearings == num_advances) - return get_advance_without_var_unscaled (num_bearings - 1); - - const FWORD *bearings = (const FWORD *) &table->longMetricZ[num_long_metrics]; - const UFWORD *advances = (const UFWORD *) &bearings[num_bearings - num_long_metrics]; - - return advances[hb_min (glyph - num_bearings, num_advances - num_bearings - 1)]; } #ifndef HB_NO_VAR @@ -371,7 +350,7 @@ struct hmtxvmtx hb_scalar_cache_t *store_cache = nullptr) const { unsigned int advance = get_advance_without_var_unscaled (glyph); - return hb_max(0.0f, advance + roundf (var_table->get_advance_delta_unscaled (glyph, + return hb_clamp_to (advance + roundf (var_table->get_advance_delta_unscaled (glyph, font->coords, font->num_coords, store_cache))); } @@ -389,6 +368,15 @@ struct hmtxvmtx public: hb_blob_ptr_t table; hb_blob_ptr_t var_table; + + private: + static unsigned get_num_long_metrics (hb_face_t *face) + { + hb_blob_ptr_t hea = hb_sanitize_context_t ().reference_table (face); + unsigned ret = hea->numberOfLongMetrics; + hea.destroy (); + return ret; + } }; /* get advance: when no variations, call get_advance_without_var_unscaled. @@ -442,18 +430,107 @@ struct hmtx : hmtxvmtx { static constexpr hb_tag_t variationsTag = HB_OT_TAG_HVAR; static constexpr bool is_horizontal = true; }; +struct HMTX : hmtxvmtx { + static constexpr hb_tag_t tableTag = HB_OT_TAG_HMTX; + static constexpr hb_tag_t variationsTag = HB_OT_TAG_HVAR; + static constexpr bool is_horizontal = true; +}; struct vmtx : hmtxvmtx { static constexpr hb_tag_t tableTag = HB_OT_TAG_vmtx; static constexpr hb_tag_t variationsTag = HB_OT_TAG_VVAR; static constexpr bool is_horizontal = false; }; +struct VMTX : hmtxvmtx { + static constexpr hb_tag_t tableTag = HB_OT_TAG_VMTX; + static constexpr hb_tag_t variationsTag = HB_OT_TAG_VVAR; + static constexpr bool is_horizontal = false; +}; + +struct hmtx_accelerator_t : hb_dual_accelerator_t +{ + hmtx_accelerator_t (hb_face_t *face) : + hb_dual_accelerator_t (face) + { + var_table = hb_sanitize_context_t ().reference_table (face); + } + + ~hmtx_accelerator_t () + { + var_table.destroy (); + } + + void get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph, + int *lsb) const + { + HB_DUAL_GET (*this, get_leading_bearing_without_var_unscaled (glyph, lsb)); + } -struct hmtx_accelerator_t : hmtx::accelerator_t { - hmtx_accelerator_t (hb_face_t *face) : hmtx::accelerator_t (face) {} + unsigned int get_advance_without_var_unscaled (hb_codepoint_t glyph) const + { + return HB_DUAL_GET (*this, get_advance_without_var_unscaled (glyph)); + } + +#ifndef HB_NO_VAR + unsigned get_advance_with_var_unscaled (hb_codepoint_t glyph, + hb_font_t *font, + hb_scalar_cache_t *store_cache = nullptr) const + { + unsigned int advance = get_advance_without_var_unscaled (glyph); + return hb_clamp_to (advance + roundf (var_table->get_advance_delta_unscaled (glyph, + font->coords, font->num_coords, + store_cache))); + } +#endif + + hb_blob_ptr_t var_table; }; + +#ifndef HB_NO_VERTICAL +struct vmtx_accelerator_t : hb_dual_accelerator_t +{ + vmtx_accelerator_t (hb_face_t *face) : + hb_dual_accelerator_t (face) + { + var_table = hb_sanitize_context_t ().reference_table (face); + } + + ~vmtx_accelerator_t () + { + var_table.destroy (); + } + + void get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph, + int *lsb) const + { + HB_DUAL_GET (*this, get_leading_bearing_without_var_unscaled (glyph, lsb)); + } + + unsigned int get_advance_without_var_unscaled (hb_codepoint_t glyph) const + { + return HB_DUAL_GET (*this, get_advance_without_var_unscaled (glyph)); + } + +#ifndef HB_NO_VAR + unsigned get_advance_with_var_unscaled (hb_codepoint_t glyph, + hb_font_t *font, + hb_scalar_cache_t *store_cache = nullptr) const + { + unsigned int advance = get_advance_without_var_unscaled (glyph); + return hb_clamp_to (advance + roundf (var_table->get_advance_delta_unscaled (glyph, + font->coords, font->num_coords, + store_cache))); + } +#endif + + hb_blob_ptr_t var_table; +}; +#else struct vmtx_accelerator_t : vmtx::accelerator_t { vmtx_accelerator_t (hb_face_t *face) : vmtx::accelerator_t (face) {} }; +#endif } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh index f83bee29d7ef..331d9a19a0d1 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh @@ -144,13 +144,13 @@ struct KernSubTable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.format0)); + case 0: hb_barrier (); return_trace (c->dispatch (u.format0)); #ifndef HB_NO_AAT_SHAPE - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #endif - case 2: return_trace (c->dispatch (u.format2)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2)); #ifndef HB_NO_AAT_SHAPE - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); #endif default: return_trace (c->default_return_value ()); } @@ -161,10 +161,14 @@ struct KernSubTable { unsigned int subtable_type = get_type (); switch (subtable_type) { - case 0: u.format0.collect_glyphs (left_set, right_set, num_glyphs); return; - case 1: u.format1.collect_glyphs (left_set, right_set, num_glyphs); return; - case 2: u.format2.collect_glyphs (left_set, right_set, num_glyphs); return; - case 3: u.format3.collect_glyphs (left_set, right_set, num_glyphs); return; + case 0: hb_barrier (); u.format0.collect_glyphs (left_set, right_set, num_glyphs); return; +#ifndef HB_NO_AAT_SHAPE + case 1: hb_barrier (); u.format1.collect_glyphs (left_set, right_set, num_glyphs); return; +#endif + case 2: hb_barrier (); u.format2.collect_glyphs (left_set, right_set, num_glyphs); return; +#ifndef HB_NO_AAT_SHAPE + case 3: hb_barrier (); u.format3.collect_glyphs (left_set, right_set, num_glyphs); return; +#endif default: return; } } @@ -184,9 +188,13 @@ struct KernSubTable union { KernSubTableHeader header; AAT::KerxSubTableFormat0 format0; +#ifndef HB_NO_AAT_SHAPE AAT::KerxSubTableFormat1 format1; +#endif AAT::KerxSubTableFormat2 format2; +#ifndef HB_NO_AAT_SHAPE KernSubTableFormat3 format3; +#endif } u; public: DEFINE_SIZE_MIN (KernSubTableHeader::static_size); @@ -352,9 +360,9 @@ struct kern unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.ot, std::forward (ds)...)); + case 0: hb_barrier (); return_trace (c->dispatch (u.ot, std::forward (ds)...)); #ifndef HB_NO_AAT_SHAPE - case 1: return_trace (c->dispatch (u.aat, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.aat, std::forward (ds)...)); #endif default: return_trace (c->default_return_value ()); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh index b9baaca2a238..cb75b4af7fce 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh @@ -65,7 +65,8 @@ struct BaseCoordFormat1 DEFINE_SIZE_STATIC (4); }; -struct BaseCoordFormat2 +template +struct BaseCoordFormat2_4 { hb_position_t get_coord (hb_font_t *font, hb_direction_t direction) const { @@ -79,8 +80,12 @@ struct BaseCoordFormat2 auto *out = c->serializer->embed (*this); if (unlikely (!out)) return_trace (false); + hb_codepoint_t *new_gid; + if (!c->plan->glyph_map->has (referenceGlyph, &new_gid)) + return_trace (false); + return_trace (c->serializer->check_assign (out->referenceGlyph, - c->plan->glyph_map->get (referenceGlyph), + *new_gid, HB_SERIALIZE_ERROR_INT_OVERFLOW)); } @@ -91,13 +96,14 @@ struct BaseCoordFormat2 } protected: - HBUINT16 format; /* Format identifier--format = 2 */ + HBUINT16 format; /* Format identifier--format = 2 or 4 */ FWORD coordinate; /* X or Y value, in design units */ - HBGlyphID16 referenceGlyph; /* Glyph ID of control glyph */ + typename Types::HBGlyphID + referenceGlyph; /* Glyph ID of control glyph */ HBUINT16 coordPoint; /* Index of contour point on the * reference glyph */ public: - DEFINE_SIZE_STATIC (8); + DEFINE_SIZE_STATIC (6 + Types::HBGlyphID::static_size); }; struct BaseCoordFormat3 @@ -109,8 +115,8 @@ struct BaseCoordFormat3 const Device &device = this+deviceTable; return HB_DIRECTION_IS_HORIZONTAL (direction) - ? font->em_scale_y (coordinate) + device.get_y_delta (font, var_store) - : font->em_scale_x (coordinate) + device.get_x_delta (font, var_store); + ? hb_saturate_add (font->em_scale_y (coordinate), device.get_y_delta (font, var_store)) + : hb_saturate_add (font->em_scale_x (coordinate), device.get_x_delta (font, var_store)); } void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const @@ -139,10 +145,12 @@ struct BaseCoordFormat3 return_trace (false); } } - return_trace (out->deviceTable.serialize_copy (c->serializer, deviceTable, - this, 0, - hb_serialize_context_t::Head, - &c->plan->base_variation_idx_map)); + + out->deviceTable.serialize_copy (c->serializer, deviceTable, + this, 0, + hb_serialize_context_t::Head, + &c->plan->base_variation_idx_map); + return_trace (true); } bool sanitize (hb_sanitize_context_t *c) const @@ -175,6 +183,9 @@ struct BaseCoord case 1: hb_barrier (); return u.format1.get_coord (font, direction); case 2: hb_barrier (); return u.format2.get_coord (font, direction); case 3: hb_barrier (); return u.format3.get_coord (font, var_store, direction); +#ifndef HB_NO_BEYOND_64K + case 4: hb_barrier (); return u.format4.get_coord (font, direction); +#endif default:return 0; } } @@ -196,6 +207,9 @@ struct BaseCoord case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); +#ifndef HB_NO_BEYOND_64K + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); +#endif default:return_trace (c->default_return_value ()); } } @@ -209,6 +223,9 @@ struct BaseCoord case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); +#ifndef HB_NO_BEYOND_64K + case 4: hb_barrier (); return_trace (u.format4.sanitize (c)); +#endif default:return_trace (false); } } @@ -217,8 +234,13 @@ struct BaseCoord union { struct { HBUINT16 v; } format; BaseCoordFormat1 format1; - BaseCoordFormat2 format2; + BaseCoordFormat2_4 + format2; BaseCoordFormat3 format3; +#ifndef HB_NO_BEYOND_64K + BaseCoordFormat2_4 + format4; +#endif } u; public: DEFINE_SIZE_UNION (2, format.v); @@ -255,10 +277,10 @@ struct FeatMinMaxRecord TRACE_SUBSET (this); auto *out = c->serializer->embed (*this); if (unlikely (!out)) return_trace (false); - if (!(out->minCoord.serialize_subset (c, minCoord, base))) - return_trace (false); - return_trace (out->maxCoord.serialize_subset (c, maxCoord, base)); + bool ret = out->minCoord.serialize_subset (c, minCoord, base); + ret |= out->maxCoord.serialize_subset (c, maxCoord, base); + return_trace (ret); } bool sanitize (hb_sanitize_context_t *c, const void *base) const @@ -315,9 +337,8 @@ struct MinMax auto *out = c->serializer->start_embed (*this); if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false); - if (!(out->minCoord.serialize_subset (c, minCoord, this)) || - !(out->maxCoord.serialize_subset (c, maxCoord, this))) - return_trace (false); + bool ret = out->minCoord.serialize_subset (c, minCoord, this); + ret |= out->maxCoord.serialize_subset (c, maxCoord, this); unsigned len = 0; for (const FeatMinMaxRecord& _ : featMinMaxRecords) @@ -326,9 +347,13 @@ struct MinMax if (!c->plan->layout_features.has (feature_tag)) continue; - if (!_.subset (c, this)) return false; - len++; + auto snap = c->serializer->snapshot (); + if (!_.subset (c, this)) c->serializer->revert (snap); + else len++; } + + if (len > 0) ret = true; + if (!ret) return_trace (false); return_trace (c->serializer->check_assign (out->featMinMaxRecords.len, len, HB_SERIALIZE_ERROR_INT_OVERFLOW)); } @@ -380,11 +405,15 @@ struct BaseValues if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false); out->defaultIndex = defaultIndex; + bool ret = false; for (const auto& _ : baseCoords) - if (!subset_offset_array (c, out->baseCoords, this) (_)) - return_trace (false); + { + auto *o = out->baseCoords.serialize_append (c->serializer); + if (unlikely (!o)) return_trace (false); + ret |= o->serialize_subset (c, _, this); + } - return_trace (bool (out->baseCoords)); + return_trace (ret); } bool sanitize (hb_sanitize_context_t *c) const @@ -478,16 +507,22 @@ struct BaseScript auto *out = c->serializer->start_embed (*this); if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false); - if (baseValues && !out->baseValues.serialize_subset (c, baseValues, this)) - return_trace (false); - - if (defaultMinMax && !out->defaultMinMax.serialize_subset (c, defaultMinMax, this)) - return_trace (false); + bool ret = out->baseValues.serialize_subset (c, baseValues, this); + ret |= out->defaultMinMax.serialize_subset (c, defaultMinMax, this); + unsigned len = 0; for (const auto& _ : baseLangSysRecords) - if (!_.subset (c, this)) return_trace (false); + { + auto snap = c->serializer->snapshot (); + if (_.subset (c, this)) { + ret = true; + len++; + } + else c->serializer->revert (snap); + } - return_trace (c->serializer->check_assign (out->baseLangSysRecords.len, baseLangSysRecords.len, + if (!ret) return_trace (false); + return_trace (c->serializer->check_assign (out->baseLangSysRecords.len, len, HB_SERIALIZE_ERROR_INT_OVERFLOW)); } @@ -594,9 +629,12 @@ struct BaseScriptList if (!c->plan->layout_scripts.has (script_tag)) continue; - if (!_.subset (c, this)) return false; - len++; + auto snap = c->serializer->snapshot (); + if (!_.subset (c, this)) c->serializer->revert (snap); + else len++; } + + if (!len) return_trace (false); return_trace (c->serializer->check_assign (out->baseScriptRecords.len, len, HB_SERIALIZE_ERROR_INT_OVERFLOW)); } @@ -672,8 +710,9 @@ struct Axis auto *out = c->serializer->embed (*this); if (unlikely (!out)) return_trace (false); - out->baseTagList.serialize_copy (c->serializer, baseTagList, this); - return_trace (out->baseScriptList.serialize_subset (c, baseScriptList, this)); + bool ret = out->baseTagList.serialize_copy (c->serializer, baseTagList, this); + ret |= out->baseScriptList.serialize_subset (c, baseScriptList, this); + return_trace (ret); } bool sanitize (hb_sanitize_context_t *c) const @@ -767,16 +806,13 @@ struct BASE if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false); out->version = version; - if (has_var_store () && !subset_varstore (c, out)) - return_trace (false); - - if (hAxis && !out->hAxis.serialize_subset (c, hAxis, this)) - return_trace (false); + bool ret = false; + if (version.to_int () >= 0x00010001u) ret |= subset_varstore (c, out); - if (vAxis && !out->vAxis.serialize_subset (c, vAxis, this)) - return_trace (false); + ret |= out->hAxis.serialize_subset (c, hAxis, this); + ret |= out->vAxis.serialize_subset (c, vAxis, this); - return_trace (true); + return_trace (ret); } bool get_baseline (hb_font_t *font, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh index cc1bceac4c63..cee80f26cf50 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh @@ -35,9 +35,15 @@ #include "hb-set.hh" #include "hb-bimap.hh" #include "hb-cache.hh" +#include "hb-ot-dual.hh" + +using hb_ot_layout_mapping_cache_t = hb_cache_t<16, 8, 8>; +static_assert (sizeof (hb_ot_layout_mapping_cache_t) == 512, ""); + +using hb_ot_layout_binary_cache_t = hb_cache_t<14, 1, 8>; +static_assert (sizeof (hb_ot_layout_binary_cache_t) == 256, ""); #include "OT/Layout/Common/Coverage.hh" -#include "OT/Layout/types.hh" // TODO(garretrieger): cleanup these after migration. using OT::Layout::Common::Coverage; @@ -59,6 +65,8 @@ static bool ClassDef_remap_and_serialize ( hb_sorted_vector_t &glyph_and_klass, /* IN/OUT */ hb_map_t *klass_map /*IN/OUT*/); +struct ItemVarStoreInstancer; + struct hb_collect_feature_substitutes_with_var_context_t { const hb_map_t *axes_index_tag_map; @@ -74,6 +82,8 @@ struct hb_collect_feature_substitutes_with_var_context_t bool universal; unsigned cur_record_idx; hb_hashmap_t, unsigned> *conditionset_map; + ItemVarStoreInstancer *instancer; + bool all_axes_pinned; }; struct hb_prune_langsys_context_t @@ -143,11 +153,13 @@ struct hb_subset_layout_context_t : const hb_map_t *feature_index_map; const hb_map_t *feature_map_w_duplicates; const hb_hashmap_t *feature_substitutes_map; + const hb_hashmap_t> *lookup_variations; hb_hashmap_t> *feature_record_cond_idx_map; const hb_set_t *catch_all_record_feature_idxes; const hb_hashmap_t> *feature_idx_tag_map; unsigned cur_script_index; + unsigned cur_feature_index; unsigned cur_feature_var_record_idx; hb_subset_layout_context_t (hb_subset_context_t *c_, @@ -155,6 +167,7 @@ struct hb_subset_layout_context_t : subset_context (c_), table_tag (tag_), cur_script_index (0xFFFFu), + cur_feature_index (Index::NOT_FOUND_INDEX), cur_feature_var_record_idx (0u), script_count (0), langsys_count (0), @@ -168,6 +181,7 @@ struct hb_subset_layout_context_t : feature_index_map = &c_->plan->gsub_features; feature_map_w_duplicates = &c_->plan->gsub_features_w_duplicates; feature_substitutes_map = &c_->plan->gsub_feature_substitutes_map; + lookup_variations = &c_->plan->gsub_lookup_variations; feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gsub_feature_record_cond_idx_map; catch_all_record_feature_idxes = &c_->plan->gsub_old_features; feature_idx_tag_map = &c_->plan->gsub_old_feature_idx_tag_map; @@ -179,6 +193,7 @@ struct hb_subset_layout_context_t : feature_index_map = &c_->plan->gpos_features; feature_map_w_duplicates = &c_->plan->gpos_features_w_duplicates; feature_substitutes_map = &c_->plan->gpos_feature_substitutes_map; + lookup_variations = &c_->plan->gpos_lookup_variations; feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gpos_feature_record_cond_idx_map; catch_all_record_feature_idxes = &c_->plan->gpos_old_features; feature_idx_tag_map = &c_->plan->gpos_old_feature_idx_tag_map; @@ -203,6 +218,7 @@ struct hb_collect_variation_indices_context_t : hb_set_t *layout_variation_indices; const hb_set_t *glyph_set; const hb_map_t *gpos_lookups; + hb_hashmap_t> *condition_values = nullptr; hb_collect_variation_indices_context_t (hb_set_t *layout_variation_indices_, const hb_set_t *glyph_set_, @@ -370,13 +386,15 @@ struct serialize_math_record_array_t { serialize_math_record_array_t (hb_serialize_context_t *serialize_context_, OutputArray& out_, - const void *base_) : serialize_context (serialize_context_), - out (out_), base (base_) {} + const void *base_, + const hb_hashmap_t> *variation_map_) : + serialize_context (serialize_context_), + out (out_), base (base_), variation_map (variation_map_) {} template bool operator () (T&& record) { - if (!serialize_context->copy (record, base)) return false; + if (!serialize_context->copy (record, base, variation_map)) return false; out.len++; return true; } @@ -385,6 +403,7 @@ struct serialize_math_record_array_t hb_serialize_context_t *serialize_context; OutputArray &out; const void *base; + const hb_hashmap_t> *variation_map; }; /* @@ -395,8 +414,9 @@ struct template serialize_math_record_array_t operator () (hb_serialize_context_t *serialize_context, OutputArray& out, - const void *base) const - { return serialize_math_record_array_t (serialize_context, out, base); } + const void *base, + const hb_hashmap_t> *variation_map) const + { return serialize_math_record_array_t (serialize_context, out, base, variation_map); } } HB_FUNCOBJ (serialize_math_record_array); @@ -441,7 +461,7 @@ struct IndexArray : Array16Of unsigned int *_count /* IN/OUT */, unsigned int *_indexes /* OUT */) const { - if (_count) + if (_count && _indexes) { + this->as_array ().sub_array (start_offset, _count) | hb_sink (hb_array (_indexes, *_count)) @@ -628,7 +648,7 @@ struct FeatureParamsCharacterVariants unsigned get_characters (unsigned start_offset, unsigned *char_count, hb_codepoint_t *chars) const { - if (char_count) + if (char_count && chars) { + characters.as_array ().sub_array (start_offset, char_count) | hb_sink (hb_array (chars, *char_count)) @@ -638,7 +658,7 @@ struct FeatureParamsCharacterVariants } size_t get_size () const - { return min_size + characters.len * HBUINT24::static_size; } + { return hb_unsigned_mul_add_saturate (characters.len, HBUINT24::static_size, min_size); } void collect_name_ids (hb_set_t *nameids_to_retain /* OUT */) const { @@ -706,7 +726,7 @@ struct FeatureParams return true; #endif TRACE_SANITIZE (this); - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return_trace (u.size.sanitize (c)); if ((tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return_trace (u.stylisticSet.sanitize (c)); @@ -720,7 +740,7 @@ struct FeatureParams #ifdef HB_NO_LAYOUT_FEATURE_PARAMS return; #endif - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return (u.size.collect_name_ids (nameids_to_retain)); if ((tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return (u.stylisticSet.collect_name_ids (nameids_to_retain)); @@ -730,9 +750,12 @@ struct FeatureParams bool subset (hb_subset_context_t *c, const Tag* tag) const { +#ifdef HB_NO_LAYOUT_FEATURE_PARAMS + return false; +#endif TRACE_SUBSET (this); if (!tag) return_trace (false); - if (*tag == HB_TAG ('s','i','z','e')) + if (*tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return_trace (u.size.subset (c)); if ((*tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return_trace (u.stylisticSet.subset (c)); @@ -744,7 +767,7 @@ struct FeatureParams #ifndef HB_NO_LAYOUT_FEATURE_PARAMS const FeatureParamsSize& get_size_params (hb_tag_t tag) const { - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return u.size; return Null (FeatureParamsSize); } @@ -812,13 +835,26 @@ struct Feature out->featureParams.serialize_subset (c, featureParams, this, tag); - auto it = - + hb_iter (lookupIndex) - | hb_filter (l->lookup_index_map) - | hb_map (l->lookup_index_map) - ; - - out->lookupIndex.serialize (c->serializer, l, it); + hb::shared_ptr *lookup_variations; + if (l->cur_feature_index != Index::NOT_FOUND_INDEX && + l->lookup_variations->has (l->cur_feature_index, &lookup_variations)) + { + auto it = + + hb_iter (**lookup_variations) + | hb_filter (l->lookup_index_map) + | hb_map (l->lookup_index_map) + ; + out->lookupIndex.serialize (c->serializer, l, it); + } + else + { + auto it = + + hb_iter (lookupIndex) + | hb_filter (l->lookup_index_map) + | hb_map (l->lookup_index_map) + ; + out->lookupIndex.serialize (c->serializer, l, it); + } // The decision to keep or drop this feature is already made before we get here // so always retain it. return_trace (true); @@ -900,7 +936,7 @@ struct RecordArrayOf : SortedArray16Of> unsigned int *record_count /* IN/OUT */, hb_tag_t *record_tags /* OUT */) const { - if (record_count) + if (record_count && record_tags) { + this->as_array ().sub_array (start_offset, record_count) | hb_map (&Record::tag) @@ -959,7 +995,9 @@ struct RecordListOfFeature : RecordListOf if (l->feature_substitutes_map->has (_.first, &f)) f_sub = *f; + l->cur_feature_index = _.first; subset_record_array (l, out, this, f_sub) (_.second); + l->cur_feature_index = Index::NOT_FOUND_INDEX; }) ; @@ -1426,7 +1464,7 @@ struct Lookup }; template -using LookupList = List16OfOffsetTo; +using LookupList = List16OfOffsetTo; template struct LookupOffsetList : List16OfOffsetTo @@ -1449,7 +1487,7 @@ struct LookupOffsetList : List16OfOffsetTo bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (List16OfOffset16To::sanitize (c, this)); + return_trace ((List16OfOffsetTo::sanitize (c, this))); } }; @@ -1482,13 +1520,15 @@ static bool ClassDef_remap_and_serialize (hb_serialize_context_t *c, } + if (unlikely (!c->propagate_error (glyph_and_klass, klasses, klass_map))) + return false; + for (unsigned i = 0; i < glyph_and_klass.length; i++) { hb_codepoint_t klass = glyph_and_klass[i].second; glyph_and_klass[i].second = klass_map->get (klass); } - c->propagate_error (glyph_and_klass, klasses); return ClassDef_serialize (c, glyph_and_klass.iter ()); } @@ -1522,7 +1562,7 @@ struct ClassDefFormat1_3 if (unlikely (!it)) { - classFormat = 1; + classFormat = Types::size == 2 ? 1 : 3; startGlyph = 0; classValue.len = 0; return_trace (true); @@ -1551,7 +1591,6 @@ struct ClassDefFormat1_3 const Coverage* glyph_filter = nullptr) const { TRACE_SUBSET (this); - const hb_map_t &glyph_map = c->plan->glyph_map_gsub; hb_sorted_vector_t glyph_and_klass; hb_set_t orig_klasses; @@ -1561,7 +1600,7 @@ struct ClassDefFormat1_3 for (const hb_codepoint_t gid : + hb_range (start, end)) { - hb_codepoint_t new_gid = glyph_map[gid]; + hb_codepoint_t new_gid = c->plan->map_gsub_glyph (gid); if (new_gid == HB_MAP_VALUE_INVALID) continue; if (glyph_filter && !glyph_filter->has(gid)) continue; @@ -1574,9 +1613,10 @@ struct ClassDefFormat1_3 if (use_class_zero) { + const hb_set_t& glyphset = *c->plan->glyphset_gsub (); unsigned glyph_count = glyph_filter - ? hb_len (hb_iter (glyph_map.keys()) | hb_filter (glyph_filter)) - : glyph_map.get_population (); + ? hb_len (hb_iter (glyphset) | hb_filter (glyph_filter)) + : glyphset.get_population (); use_class_zero = glyph_count <= glyph_and_klass.length; } if (!ClassDef_remap_and_serialize (c->serializer, @@ -1637,7 +1677,7 @@ struct ClassDefFormat1_3 if (classValue[iter - start]) return true; return false; } - bool intersects_class (const hb_set_t *glyphs, uint16_t klass) const + bool intersects_class (const hb_set_t *glyphs, unsigned klass) const { unsigned int count = classValue.len; if (klass == 0) @@ -1652,7 +1692,7 @@ struct ClassDefFormat1_3 } /* TODO Speed up, using set overlap first? */ /* TODO(iter) Rewrite as dagger. */ - const HBUINT16 *arr = classValue.arrayZ; + const typename Types::HBUINT *arr = classValue.arrayZ; for (unsigned int i = 0; i < count; i++) if (arr[i] == klass && glyphs->has (startGlyph + i)) return true; @@ -1695,6 +1735,17 @@ struct ClassDefFormat1_3 void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const { if (glyphs->is_empty ()) return; + + /* An empty ClassDef assigns class zero to every glyph, so every glyph in + * `glyphs` intersects class zero. Handle it up front: `end_glyph` below + * underflows when startGlyph is zero, and neither comparison can then be + * true. */ + if (!classValue.len) + { + intersect_classes->add (0); + return; + } + hb_codepoint_t end_glyph = startGlyph + classValue.len - 1; if (glyphs->get_min () < startGlyph || glyphs->get_max () > end_glyph) @@ -1712,7 +1763,7 @@ struct ClassDefFormat1_3 HBUINT16 classFormat; /* Format identifier--format = 1 */ typename Types::HBGlyphID startGlyph; /* First GlyphID of the classValueArray */ - typename Types::template ArrayOf + typename Types::template ArrayOf classValue; /* Array of Class Values--one per GlyphID */ public: DEFINE_SIZE_ARRAY (2 + 2 * Types::size, classValue); @@ -1747,7 +1798,7 @@ struct ClassDefFormat2_4 if (unlikely (!it)) { - classFormat = 2; + classFormat = Types::size == 2 ? 2 : 4; rangeRecord.len = 0; return_trace (true); } @@ -1810,7 +1861,6 @@ struct ClassDefFormat2_4 const Coverage* glyph_filter = nullptr) const { TRACE_SUBSET (this); - const hb_map_t &glyph_map = c->plan->glyph_map_gsub; const hb_set_t &glyph_set = *c->plan->glyphset_gsub (); hb_sorted_vector_t glyph_and_klass; @@ -1823,7 +1873,7 @@ struct ClassDefFormat2_4 { unsigned klass = get_class (g); if (!klass) continue; - hb_codepoint_t new_gid = glyph_map[g]; + hb_codepoint_t new_gid = c->plan->map_gsub_glyph (g); if (new_gid == HB_MAP_VALUE_INVALID) continue; if (glyph_filter && !glyph_filter->has (g)) continue; glyph_and_klass.push (hb_pair (new_gid, klass)); @@ -1841,7 +1891,7 @@ struct ClassDefFormat2_4 hb_codepoint_t end = hb_min (range.last + 1, num_source_glyphs); for (hb_codepoint_t g = start; g < end; g++) { - hb_codepoint_t new_gid = glyph_map[g]; + hb_codepoint_t new_gid = c->plan->map_gsub_glyph (g); if (new_gid == HB_MAP_VALUE_INVALID) continue; if (glyph_filter && !glyph_filter->has (g)) continue; @@ -1854,7 +1904,7 @@ struct ClassDefFormat2_4 const hb_set_t& glyphset = *c->plan->glyphset_gsub (); unsigned glyph_count = glyph_filter ? hb_len (hb_iter (glyphset) | hb_filter (glyph_filter)) - : glyph_map.get_population (); + : glyphset.get_population (); use_class_zero = use_class_zero && glyph_count <= glyph_and_klass.length; if (!ClassDef_remap_and_serialize (c->serializer, orig_klasses, @@ -1908,10 +1958,17 @@ struct ClassDefFormat2_4 return hb_any (+ hb_iter (rangeRecord) | hb_map ([glyphs] (const RangeRecord &range) { return range.intersects (*glyphs) && range.value; })); } - bool intersects_class (const hb_set_t *glyphs, uint16_t klass) const + bool intersects_class (const hb_set_t *glyphs, unsigned klass) const { if (klass == 0) { + /* An empty ClassDef assigns class zero to every glyph, so it intersects + * class zero as long as there is any glyph at all. The loop below is a + * no-op when there are no ranges, and the `g != HB_SET_VALUE_INVALID` + * guard after it would then wrongly report no intersection. */ + if (!rangeRecord.len) + return !glyphs->is_empty (); + /* Match if there's any glyph that is not listed! */ hb_codepoint_t g = HB_SET_VALUE_INVALID; hb_codepoint_t last = HB_SET_VALUE_INVALID; @@ -1993,6 +2050,16 @@ struct ClassDefFormat2_4 { if (glyphs->is_empty ()) return; + /* An empty ClassDef assigns class zero to every glyph, so every glyph in + * `glyphs` intersects class zero. Handle it up front: the loops below are + * no-ops when there are no ranges, and the `g != HB_SET_VALUE_INVALID` + * guard would then wrongly skip adding class zero. */ + if (!rangeRecord.len) + { + intersect_classes->add (0); + return; + } + hb_codepoint_t g = HB_SET_VALUE_INVALID; for (auto &range : rangeRecord) { @@ -2073,25 +2140,25 @@ struct ClassDef TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); - auto it = + it_with_class_zero | hb_filter (hb_second); + auto glyphs = + it_with_class_zero | hb_filter (hb_second); unsigned format = 2; hb_codepoint_t glyph_max = 0; - if (likely (it)) + unsigned class_max = 0; + if (likely (glyphs)) { - hb_codepoint_t glyph_min = (*it).first; + hb_codepoint_t glyph_min = (*glyphs).first; glyph_max = glyph_min; - unsigned num_glyphs = 0; unsigned num_ranges = 1; hb_codepoint_t prev_gid = glyph_min; - unsigned prev_klass = (*it).second; + unsigned prev_klass = (*glyphs).second; - for (const auto gid_klass_pair : it) + for (const auto gid_klass_pair : + glyphs) { hb_codepoint_t cur_gid = gid_klass_pair.first; unsigned cur_klass = gid_klass_pair.second; - num_glyphs++; + if (cur_klass > class_max) class_max = cur_klass; if (cur_gid == glyph_min) continue; if (cur_gid > glyph_max) glyph_max = cur_gid; if (cur_gid != prev_gid + 1 || @@ -2102,31 +2169,43 @@ struct ClassDef prev_klass = cur_klass; } - if (num_glyphs && 1 + (glyph_max - glyph_min + 1) <= num_ranges * 3) - format = 1; - } - + uint64_t best_size = UINT64_MAX; + unsigned glyph_span = glyph_max - glyph_min + 1; + auto consider = [&] (unsigned candidate, uint64_t size) + { + if (size >= best_size) return; + best_size = size; + format = candidate; + }; + + if (glyph_max <= 0xFFFFu && glyph_span <= 0xFFFFu && class_max <= 0xFFFFu) + consider (1, 6 + (uint64_t) HBUINT16::static_size * glyph_span); + if (glyph_max <= 0xFFFFu && num_ranges <= 0xFFFFu && class_max <= 0xFFFFu) + consider (2, 4 + (uint64_t) num_ranges * + (2 * HBGlyphID16::static_size + HBUINT16::static_size)); #ifndef HB_NO_BEYOND_64K - if (glyph_max > 0xFFFFu) - u.format.v += 2; - if (unlikely (glyph_max > 0xFFFFFFu)) -#else - if (unlikely (glyph_max > 0xFFFFu)) + if (glyph_max <= 0xFFFFFFu && glyph_span <= 0xFFFFFFu && class_max <= 0xFFFFFFu) + consider (3, 8 + (uint64_t) HBUINT24::static_size * glyph_span); + if (glyph_max <= 0xFFFFFFu && num_ranges <= 0xFFFFFFu && class_max <= 0xFFFFu) + consider (4, 5 + (uint64_t) num_ranges * + (2 * HBGlyphID24::static_size + HBUINT16::static_size)); #endif - { - c->check_success (false, HB_SERIALIZE_ERROR_INT_OVERFLOW); - return_trace (false); + if (unlikely (best_size == UINT64_MAX)) + { + c->check_success (false, HB_SERIALIZE_ERROR_INT_OVERFLOW); + return_trace (false); + } } u.format.v = format; switch (u.format.v) { - case 1: hb_barrier (); return_trace (u.format1.serialize (c, it)); - case 2: hb_barrier (); return_trace (u.format2.serialize (c, it)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, + it_with_class_zero | hb_filter (hb_second))); + case 2: hb_barrier (); return_trace (u.format2.serialize (c, + it_with_class_zero | hb_filter (hb_second))); #ifndef HB_NO_BEYOND_64K - case 3: hb_barrier (); return_trace (u.format3.serialize (c, it)); - case 4: hb_barrier (); return_trace (u.format4.serialize (c, it)); + case 3: hb_barrier (); return_trace (u.format3.serialize (c, + it_with_class_zero | hb_filter (hb_second))); + case 4: hb_barrier (); return_trace (u.format4.serialize (c, + it_with_class_zero | hb_filter (hb_second))); #endif default:return_trace (false); } @@ -2411,6 +2490,9 @@ struct delta_row_encoding_t bool is_empty () const { return !items; } + bool in_error () const + { return chars.in_error () || items.in_error (); } + static inline unsigned get_chars_overhead (unsigned num_columns) { unsigned c = 4 + 6; // 4 bytes for LOffset, 6 bytes for VarData header @@ -2527,10 +2609,25 @@ struct SparseVarRegionAxis return_trace (c->check_struct (this)); } - bool serialize (hb_serialize_context_t *c) const + bool serialize (hb_serialize_context_t *c, + const SparseVarRegionAxis *src, + const hb_map_t *axis_map) { TRACE_SERIALIZE (this); - return_trace (c->embed (this)); + auto *out = c->embed (src); + if (unlikely (!out)) return_trace (false); + if (axis_map) + { + if (unlikely (!axis_map->has (out->axisIndex))) + { + c->err (HB_SERIALIZE_ERROR_OTHER); + return_trace (false); + } + if (unlikely (!c->check_assign (out->axisIndex, axis_map->get (out->axisIndex), + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return_trace (false); + } + return_trace (true); } public: @@ -2544,9 +2641,7 @@ struct hb_scalar_cache_t { private: static constexpr unsigned STATIC_LENGTH = 128; - static constexpr int INVALID = INT_MIN; - static constexpr float MULTIPLIER = 1 << ((sizeof (int) * 8) - 2); - static constexpr float DIVISOR = 1.f / MULTIPLIER; + static constexpr float INVALID = NAN; public: hb_scalar_cache_t () {} @@ -2611,16 +2706,10 @@ struct hb_scalar_cache_t } auto *values = &static_values[0]; auto *cached_value = &values[i]; - // Super hot. Most common path is that we have a cached value of 0. - int v = *cached_value; - if (likely (!v)) - { - *value = 0.f; - return true; - } - if (v == INVALID) + float v = *cached_value; + if (std::isnan (v)) return false; - *value = v * DIVISOR; + *value = v; return true; } @@ -2630,12 +2719,13 @@ struct hb_scalar_cache_t if (unlikely (i >= length)) return; auto *values = &static_values[0]; auto *cached_value = &values[i]; - *cached_value = roundf(value * MULTIPLIER); + *cached_value = value; } - private: + public: unsigned length; - mutable hb_atomic_t static_values[STATIC_LENGTH]; + private: + mutable hb_atomic_t static_values[STATIC_LENGTH]; }; struct VarRegionList @@ -2791,7 +2881,10 @@ struct VarRegionList return !regions.in_error (); } - size_t get_size () const { return min_size + VarRegionAxis::static_size * axisCount * regionCount; } + size_t get_size () const + { return hb_unsigned_add_saturate (min_size, + hb_unsigned_mul_saturate (VarRegionAxis::static_size, + axisCount, regionCount)); } public: HBUINT16 axisCount; @@ -2803,21 +2896,79 @@ struct VarRegionList DEFINE_SIZE_ARRAY (4, axesZ); }; -struct SparseVariationRegion : Array16Of +/* Whether a variation region is unreachable given per-axis reachable + * final-coordinate ranges, in F2Dot14 units (avar2 partial-instancing + * culling; see hb_subset_plan_t::avar2_reachable_ranges). A region is dead + * if some axis's tent evaluates to zero over the axis's entire reachable + * range. Mirrors the runtime evaluation: invalid tents evaluate as + * constant 1 and never kill a region. */ +static inline bool +_hb_avar2_region_is_dead (const hb_hashmap_t &axis_tuples, + const hb_hashmap_t &reachable_ranges) +{ + for (auto _ : axis_tuples) + { + Triple *range; + if (!reachable_ranges.has (_.first, &range)) continue; + const Triple &tent = _.second; + int start = (int) roundf ((float) tent.minimum * 16384.f); + int peak = (int) roundf ((float) tent.middle * 16384.f); + int end = (int) roundf ((float) tent.maximum * 16384.f); + if (!peak) continue; + if (start > peak || peak > end) continue; + if (start < 0 && end > 0) continue; + int lo = (int) roundf ((float) range->minimum * 16384.f); + int hi = (int) roundf ((float) range->maximum * 16384.f); + /* Strict comparisons: the scalar is 1 (not 0) at v == peak, so a tent + * whose peak sits exactly on the range boundary is still live there. + * (Reachable ranges are padded by one F2Dot14 unit at their producer, + * which already covers this; strictness keeps the predicate correct on + * its own terms.) */ + if (hi < start || lo > end) + return true; + } + return false; +} + +struct SparseVariationRegion { float evaluate (const int *coords, unsigned int coord_len) const { float v = 1.f; - unsigned int count = len; + unsigned int count = axes.len; for (unsigned int i = 0; i < count; i++) { - float factor = arrayZ[i].evaluate (coords, coord_len); + float factor = (this+axes[i]).evaluate (coords, coord_len); if (factor == 0.f) return 0.; v *= factor; } return v; } + + bool serialize (hb_serialize_context_t *c, + const SparseVariationRegion *src, + const hb_map_t *axis_map) + { + TRACE_SERIALIZE (this); + if (unlikely (!axes.serialize (c, (unsigned) src->axes.len))) return_trace (false); + for (unsigned i = 0; i < axes.len; i++) + if (unlikely (src->axes[i].is_null () || + !axes[i].serialize_serialize (c, &(src+src->axes[i]), axis_map))) + return_trace (false); + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (axes.sanitize (c, this)); + } + + protected: + Array16Of> axes; + public: + DEFINE_SIZE_ARRAY (2, axes); }; struct SparseVarRegionList @@ -2849,11 +3000,33 @@ struct SparseVarRegionList return_trace (regions.sanitize (c, this)); } + bool serialize (hb_serialize_context_t *c, + const SparseVarRegionList *src, + const hb_inc_bimap_t ®ion_map, + const hb_map_t *axis_map) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (this))) return_trace (false); + regions.len = region_map.get_population (); + if (unlikely (!c->extend (regions))) return_trace (false); + + for (unsigned i = 0; i < regions.len; i++) + { + unsigned old_index = region_map.backward (i); + if (unlikely (old_index >= src->regions.len || + !regions[i].serialize_serialize (c, + &(src+src->regions[old_index]), + axis_map))) + return_trace (false); + } + return_trace (true); + } + public: - Array16Of> + Array32Of> regions; public: - DEFINE_SIZE_ARRAY (2, regions); + DEFINE_SIZE_ARRAY (4, regions); }; @@ -2868,16 +3041,16 @@ struct VarData unsigned get_region_index (unsigned i) const { return i >= regionIndices.len ? -1 : regionIndices[i]; } - unsigned int get_row_size () const + size_t get_row_size () const { return (wordCount () + regionIndices.len) * (longWords () ? 2 : 1); } size_t get_size () const - { return min_size - - regionIndices.min_size + regionIndices.get_size () - + itemCount * get_row_size (); - } + { return hb_unsigned_add_saturate (min_size - regionIndices.min_size, + regionIndices.get_size (), + hb_unsigned_mul_saturate (itemCount, get_row_size ())); } - float _get_delta (unsigned int inner, + template + Float _get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const VarRegionList ®ions, hb_scalar_cache_t *cache = nullptr) const @@ -2893,7 +3066,7 @@ struct VarData const HBUINT8 *bytes = get_delta_bytes (); const HBUINT8 *row = bytes + inner * get_row_size (); - float delta = 0.; + Float delta = 0; unsigned int i = 0; const HBINT32 *lcursor = reinterpret_cast (row); @@ -2901,7 +3074,7 @@ struct VarData { float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache); if (scalar) - delta += scalar * *lcursor; + delta += (Float) scalar * (int) *lcursor; lcursor++; } const HBINT16 *scursor = reinterpret_cast (lcursor); @@ -2909,7 +3082,7 @@ struct VarData { float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache); if (scalar) - delta += scalar * *scursor; + delta += (Float) scalar * (int) *scursor; scursor++; } const HBINT8 *bcursor = reinterpret_cast (scursor); @@ -2917,22 +3090,23 @@ struct VarData { float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache); if (scalar) - delta += scalar * *bcursor; + delta += (Float) scalar * (int) *bcursor; bcursor++; } return delta; } + template HB_ALWAYS_INLINE - float get_delta (unsigned int inner, + Float get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const VarRegionList ®ions, hb_scalar_cache_t *cache = nullptr) const { unsigned int count = regionIndices.len; - if (!count) return 0.f; // This is quite common, so optimize it. - return _get_delta (inner, coords, coord_count, regions, cache); + if (!count) return Float (0); // This is quite common, so optimize it. + return _get_delta (inner, coords, coord_count, regions, cache); } void get_region_scalars (const int *coords, unsigned int coord_count, @@ -2975,8 +3149,8 @@ struct VarData HB_SERIALIZE_ERROR_INT_OVERFLOW))) return_trace (false); - int min_threshold = has_long ? -65536 : -128; - int max_threshold = has_long ? +65535 : +127; + int min_threshold = has_long ? -32768 : -128; + int max_threshold = has_long ? +32767 : +127; enum delta_size_t { kZero=0, kNonWord, kWord }; hb_vector_t delta_sz; unsigned num_regions = rows[0]->length; @@ -3044,7 +3218,8 @@ struct VarData bool serialize (hb_serialize_context_t *c, const VarData *src, const hb_inc_bimap_t &inner_map, - const hb_inc_bimap_t ®ion_map) + const hb_inc_bimap_t ®ion_map, + const hb_set_t *culled_regions = nullptr) { TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (this))) return_trace (false); @@ -3073,7 +3248,7 @@ struct VarData for (unsigned old_gid : inner_map.keys()) { int32_t delta = src->get_item_delta_fast (old_gid, r, src_delta_bytes, src_row_size); - if (delta < -65536 || 65535 < delta) + if (delta < -32768 || 32767 < delta) { has_long = true; break; @@ -3082,13 +3257,15 @@ struct VarData } } - signed min_threshold = has_long ? -65536 : -128; - signed max_threshold = has_long ? +65535 : +127; + signed min_threshold = has_long ? -32768 : -128; + signed max_threshold = has_long ? +32767 : +127; for (r = 0; r < ri_count; r++) { bool short_circuit = src_long_words == has_long && src_word_count <= r; delta_sz[r] = kZero; + if (culled_regions && culled_regions->has (src->regionIndices[r])) + continue; /* unreachable region: drop its column */ for (unsigned old_gid : inner_map.keys()) { int32_t delta = src->get_item_delta_fast (old_gid, r, src_delta_bytes, src_row_size); @@ -3244,18 +3421,19 @@ struct VarData struct MultiVarData { size_t get_size () const - { return min_size - - regionIndices.min_size + regionIndices.get_size () - + StructAfter (regionIndices).get_size (); - } + { return hb_unsigned_add_saturate (min_size - regionIndices.min_size, + regionIndices.get_size ()); } + + const TupleList &get_delta_sets () const + { return this+StructAfter (regionIndices); } void get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const SparseVarRegionList ®ions, - hb_array_t out, + hb_array_t out, hb_scalar_cache_t *cache = nullptr) const { - auto &deltaSets = StructAfter (regionIndices); + auto &deltaSets = get_delta_sets (); auto values_iter = deltaSets.fetcher (inner); unsigned regionCount = regionIndices.len; @@ -3288,15 +3466,67 @@ struct MultiVarData format == 1 && regionIndices.sanitize (c) && hb_barrier () && - StructAfter (regionIndices).sanitize (c)); + StructAfter (regionIndices).sanitize (c, this)); + } + + unsigned get_item_count () const + { return get_delta_sets ().count; } + + void collect_region_refs (hb_set_t ®ion_indices) const + { + for (unsigned region : regionIndices) + region_indices.add (region); + } + + bool serialize (hb_serialize_context_t *c, + const MultiVarData *src, + const hb_inc_bimap_t &inner_map, + const hb_inc_bimap_t ®ion_map) + { + TRACE_SERIALIZE (this); + unsigned region_count = src->regionIndices.len; + unsigned header_size = HBUINT8::static_size + + Array16Of::min_size + + region_count * HBUINT16::static_size + + HBUINT32::static_size; + if (unlikely (!c->extend_size (this, header_size, false))) + return_trace (false); + format = 1; + regionIndices.len = region_count; + for (unsigned i = 0; i < regionIndices.len; i++) + { + unsigned old_region = src->regionIndices[i]; + if (unlikely (!region_map.has (old_region))) + return_trace (false); + regionIndices[i] = region_map.get (old_region); + } + + const auto &src_delta_sets = src->get_delta_sets (); + hb_vector_t delta_sets; + unsigned data_size = 0; + if (unlikely (!delta_sets.alloc_exact (inner_map.get_population ()))) + return_trace (false); + for (unsigned i = 0; i < inner_map.get_population (); i++) + { + unsigned old_inner = inner_map.backward (i); + if (unlikely (old_inner >= src_delta_sets.count)) return_trace (false); + hb_ubytes_t bytes = static_cast (src_delta_sets)[old_inner]; + data_size = hb_unsigned_add_saturate (data_size, bytes.length); + delta_sets.push (bytes); + } + if (unlikely (data_size == UINT_MAX || delta_sets.in_error ())) + return_trace (false); + + auto &out_delta_sets = StructAfter (regionIndices); + return_trace (out_delta_sets.serialize_serialize (c, delta_sets.iter (), &data_size)); } protected: HBUINT8 format; // 1 Array16Of regionIndices; - TupleList deltaSetsX; + Offset32To deltaSetsX; public: - DEFINE_SIZE_MIN (8); + DEFINE_SIZE_MIN (7); }; struct ItemVariationStore @@ -3317,37 +3547,52 @@ struct ItemVariationStore } private: - float get_delta (unsigned int outer, unsigned int inner, + template + Float get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const { #ifdef HB_NO_VAR - return 0.f; + return Float (0); #endif if (unlikely (outer >= dataSets.len)) - return 0.f; + return Float (0); - return (this+dataSets[outer]).get_delta (inner, + return (this+dataSets[outer]).get_delta (inner, coords, coord_count, this+regions, cache); } public: - float get_delta (unsigned int index, + bool has_delta_set (unsigned int index) const + { +#ifdef HB_NO_VAR + return false; +#endif + + unsigned int outer = index >> 16; + unsigned int inner = index & 0xFFFF; + return outer < dataSets.len && + inner < (this+dataSets[outer]).get_item_count (); + } + + template + Float get_delta (unsigned int index, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const { unsigned int outer = index >> 16; unsigned int inner = index & 0xFFFF; - return get_delta (outer, inner, coords, coord_count, cache); + return get_delta (outer, inner, coords, coord_count, cache); } - float get_delta (unsigned int index, + template + Float get_delta (unsigned int index, hb_array_t coords, hb_scalar_cache_t *cache = nullptr) const { - return get_delta (index, + return get_delta (index, coords.arrayZ, coords.length, cache); } @@ -3398,7 +3643,8 @@ struct ItemVariationStore bool serialize (hb_serialize_context_t *c, const ItemVariationStore *src, - const hb_array_t &inner_maps) + const hb_array_t &inner_maps, + const hb_set_t *culled_regions = nullptr) { TRACE_SERIALIZE (this); #ifdef HB_NO_VAR @@ -3425,6 +3671,9 @@ struct ItemVariationStore region_indices.del_range ((src_regions).regionCount, hb_set_t::INVALID); + if (culled_regions) + region_indices.subtract (*culled_regions); + /* TODO use constructor when our data-structures support that. */ hb_inc_bimap_t region_map; + hb_iter (region_indices) @@ -3446,7 +3695,8 @@ struct ItemVariationStore { if (!inner_maps[i].get_population ()) continue; if (unlikely (!dataSets[set_index++] - .serialize_serialize (c, &(src+src->dataSets[i]), inner_maps[i], region_map))) + .serialize_serialize (c, &(src+src->dataSets[i]), inner_maps[i], region_map, + culled_regions))) return_trace (false); } @@ -3478,6 +3728,30 @@ struct ItemVariationStore return_trace (out); } + /* Collect regions that a partial avar2 instance can never reach, per the + * plan's reachable final-coordinate ranges. */ + bool collect_dead_regions (const hb_map_t &axes_old_index_tag_map, + const hb_hashmap_t &reachable_ranges, + hb_set_t &dead_regions /* OUT */) const + { +#ifndef HB_NO_VAR + if (!reachable_ranges.get_population ()) return true; + const VarRegionList ®ion_list = this+regions; + unsigned count = region_list.regionCount; + for (unsigned i = 0; i < count; i++) + { + hb_hashmap_t axis_tuples; + if (!region_list.get_var_region (i, axes_old_index_tag_map, axis_tuples)) + return false; + if (_hb_avar2_region_is_dead (axis_tuples, reachable_ranges)) + dead_regions.add (i); + } + return !dead_regions.in_error (); +#else + return true; +#endif + } + bool subset (hb_subset_context_t *c, const hb_array_t &inner_maps) const { TRACE_SUBSET (this); @@ -3488,7 +3762,16 @@ struct ItemVariationStore ItemVariationStore *varstore_prime = c->serializer->start_embed (); if (unlikely (!varstore_prime)) return_trace (false); - varstore_prime->serialize (c->serializer, this, inner_maps); + /* avar2 partial instancing: cull unreachable regions. */ + hb_set_t dead_regions; + if (c->plan->has_avar2) + if (!collect_dead_regions (c->plan->axes_old_index_tag_map, + c->plan->avar2_reachable_ranges, + dead_regions)) + return_trace (false); + + varstore_prime->serialize (c->serializer, this, inner_maps, + dead_regions.get_population () ? &dead_regions : nullptr); return_trace ( !c->serializer->in_error() @@ -3573,7 +3856,7 @@ struct MultiItemVariationStore private: void get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, - hb_array_t out, + hb_array_t out, hb_scalar_cache_t *cache = nullptr) const { #ifdef HB_NO_VAR @@ -3593,7 +3876,7 @@ struct MultiItemVariationStore public: void get_delta (unsigned int index, const int *coords, unsigned int coord_count, - hb_array_t out, + hb_array_t out, hb_scalar_cache_t *cache = nullptr) const { unsigned int outer = index >> 16; @@ -3602,7 +3885,7 @@ struct MultiItemVariationStore } void get_delta (unsigned int index, hb_array_t coords, - hb_array_t out, + hb_array_t out, hb_scalar_cache_t *cache = nullptr) const { return get_delta (index, @@ -3625,6 +3908,80 @@ struct MultiItemVariationStore dataSets.sanitize (c, this)); } + bool create_subset_plan (const hb_set_t &var_indices, + hb_vector_t *inner_maps, + hb_map_t *varidx_map) const + { + if (unlikely (!inner_maps->resize (dataSets.len))) return false; + for (hb_codepoint_t var_idx : var_indices) + { + unsigned outer = var_idx >> 16; + unsigned inner = var_idx & 0xFFFFu; + if (unlikely (outer >= dataSets.len || + inner >= (this+dataSets[outer]).get_item_count ())) + return false; + (*inner_maps)[outer].add (inner); + } + + unsigned new_outer = 0; + for (unsigned outer = 0; outer < inner_maps->length; outer++) + { + const hb_inc_bimap_t &inner_map = (*inner_maps)[outer]; + if (!inner_map.get_population ()) continue; + if (unlikely (inner_map.in_error ())) return false; + for (unsigned new_inner = 0; + new_inner < inner_map.get_population (); + new_inner++) + { + unsigned old_inner = inner_map.backward (new_inner); + varidx_map->set ((outer << 16) | old_inner, + (new_outer << 16) | new_inner); + } + new_outer++; + } + return !inner_maps->in_error () && !varidx_map->in_error (); + } + + bool serialize (hb_serialize_context_t *c, + const MultiItemVariationStore *src, + const hb_array_t &inner_maps, + const hb_map_t *axis_map) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (this) || + inner_maps.length < src->dataSets.len)) + return_trace (false); + format = 1; + + const auto &src_regions = src+src->regions; + hb_set_t region_indices; + unsigned set_count = 0; + for (unsigned i = 0; i < src->dataSets.len; i++) + { + if (!inner_maps[i].get_population ()) continue; + set_count++; + (src+src->dataSets[i]).collect_region_refs (region_indices); + } + region_indices.del_range (src_regions.regions.len, hb_set_t::INVALID); + hb_inc_bimap_t region_map; + region_map.add_set (®ion_indices); + if (unlikely (region_indices.in_error () || region_map.in_error () || + !regions.serialize_serialize (c, &src_regions, region_map, axis_map))) + return_trace (false); + + dataSets.len = set_count; + if (unlikely (!c->extend (dataSets))) return_trace (false); + unsigned set_index = 0; + for (unsigned i = 0; i < src->dataSets.len; i++) + { + if (!inner_maps[i].get_population ()) continue; + if (unlikely (!dataSets[set_index++].serialize_serialize ( + c, &(src+src->dataSets[i]), inner_maps[i], region_map))) + return_trace (false); + } + return_trace (true); + } + protected: HBUINT16 format; // 1 Offset32To regions; @@ -3639,7 +3996,7 @@ struct DeltaSetIndexMapFormat01 friend struct DeltaSetIndexMap; size_t get_size () const - { return min_size + mapCount * get_width (); } + { return hb_unsigned_mul_add_saturate (mapCount, get_width (), min_size); } private: DeltaSetIndexMapFormat01* copy (hb_serialize_context_t *c) const @@ -3838,6 +4195,10 @@ struct ItemVarStoreInstancer { if (!varStore) varStore = &Null(ItemVariationStore); + /* Like hb_font_t::has_nonzero_coords, treat explicit all-zero coordinates + * as the default instance, which uses unadjusted values (OFF 7.1). */ + if (!hb_any (coords)) + this->coords = {}; } operator bool () const { return varStore && bool (coords); } @@ -3846,14 +4207,22 @@ struct ItemVarStoreInstancer { return (*this) (varIdx); } float operator() (uint32_t varIdx, unsigned short offset = 0) const + { return get_delta (varIdx, offset); } + + double get_condition_delta (uint32_t varIdx) const + { return get_delta (varIdx); } + + template + Float get_delta (uint32_t varIdx, unsigned short offset = 0) const { + /* Ordinary stores do not apply deltas at the default instance. */ if (!coords || varIdx == VarIdx::NO_VARIATION) - return 0.f; + return Float (0); varIdx += offset; if (varIdxMap) varIdx = varIdxMap->map (varIdx); - return varStore->get_delta (varIdx, coords, cache); + return varStore->get_delta (varIdx, coords, cache); } const ItemVariationStore *varStore; @@ -3874,18 +4243,22 @@ struct MultiItemVarStoreInstancer varStore = &Null(MultiItemVariationStore); } - operator bool () const { return varStore && bool (coords); } + operator bool () const { return varStore; } - float operator[] (uint32_t varIdx) const + double get_condition_delta (uint32_t varIdx) const + { return (double) (*this)[varIdx]; } + + double operator[] (uint32_t varIdx) const { - float v = 0; + double v = 0; (*this) (hb_array (&v, 1), varIdx); return v; } - void operator() (hb_array_t out, uint32_t varIdx, unsigned short offset = 0) const + void operator() (hb_array_t out, uint32_t varIdx, unsigned short offset = 0) const { - if (coords && varIdx != VarIdx::NO_VARIATION) + /* Static VARC fonts can have constant deltas even with empty coordinates. */ + if (varIdx != VarIdx::NO_VARIATION) { varIdx += offset; if (varIdxMap) @@ -3894,7 +4267,7 @@ struct MultiItemVarStoreInstancer } else for (unsigned i = 0; i < out.length; i++) - out.arrayZ[i] = 0.f; + out.arrayZ[i] = 0.; } const MultiItemVariationStore *varStore; @@ -3915,6 +4288,14 @@ enum Cond_with_Var_flag_t DROP_RECORD_WITH_VAR = 3, }; +enum lookup_condition_subset_result_t +{ + LOOKUP_CONDITION_SUBSET_ERROR, + LOOKUP_CONDITION_SUBSET_FALSE, + LOOKUP_CONDITION_SUBSET_TRUE, + LOOKUP_CONDITION_SUBSET_KEEP, +}; + struct Condition; template @@ -4025,6 +4406,7 @@ struct ConditionAxisRange return filterRangeMinValue.to_int () <= coord && coord <= filterRangeMaxValue.to_int (); } + public: bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4047,8 +4429,31 @@ struct ConditionValue bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); + auto *out = c->serializer->embed (this); + if (unlikely (!out)) return_trace (false); + + if (varIdx == VarIdx::NO_VARIATION) + return_trace (true); + + hb_pair_t *condition_value; + if (c->plan->layout_condition_idx_value_map.has ((uintptr_t) this, &condition_value)) + { + out->defaultValue = condition_value->second; + out->varIdx = condition_value->first; + return_trace (true); + } + + hb_pair_t *new_varidx_delta; + if (!c->plan->layout_variation_idx_delta_map.has (varIdx, &new_varidx_delta)) + return_trace (false); + + if (unlikely (!c->serializer->check_assign ( + out->defaultValue, + defaultValue + hb_second (*new_varidx_delta), + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return_trace (false); + out->varIdx = hb_first (*new_varidx_delta); + return_trace (true); } private: @@ -4056,20 +4461,12 @@ struct ConditionValue bool evaluate (const int *coords, unsigned int coord_len, Instancer *instancer) const { - float value = defaultValue; - value += (*instancer)[varIdx]; + double value = defaultValue; + value += instancer->get_condition_delta (varIdx); return value > 0; } - bool subset (hb_subset_context_t *c, - hb_subset_layout_context_t *l, - bool insert_catch_all) const - { - TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); - } - + public: bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4091,8 +4488,24 @@ struct ConditionAnd bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); + auto *out = c->serializer->start_embed (this); + if (unlikely (!out || !c->serializer->extend_min (out))) + return_trace (false); + out->format = format; + + for (const auto &offset : conditions) + { + if (offset.is_null ()) + { + auto *out_offset = out->conditions.serialize_append (c->serializer); + if (unlikely (!out_offset)) return_trace (false); + *out_offset = 0; + } + else if (unlikely (!subset_offset_array (c, out->conditions, this) (offset))) + return_trace (false); + } + + return_trace (true); } private: @@ -4109,15 +4522,7 @@ struct ConditionAnd return true; } - bool subset (hb_subset_context_t *c, - hb_subset_layout_context_t *l, - bool insert_catch_all) const - { - TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); - } - + public: bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4138,8 +4543,24 @@ struct ConditionOr bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); + auto *out = c->serializer->start_embed (this); + if (unlikely (!out || !c->serializer->extend_min (out))) + return_trace (false); + out->format = format; + + for (const auto &offset : conditions) + { + if (offset.is_null ()) + { + auto *out_offset = out->conditions.serialize_append (c->serializer); + if (unlikely (!out_offset)) return_trace (false); + *out_offset = 0; + } + else if (unlikely (!subset_offset_array (c, out->conditions, this) (offset))) + return_trace (false); + } + + return_trace (true); } private: @@ -4156,15 +4577,7 @@ struct ConditionOr return false; } - bool subset (hb_subset_context_t *c, - hb_subset_layout_context_t *l, - bool insert_catch_all) const - { - TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); - } - + public: bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4185,9 +4598,15 @@ struct ConditionNegate bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); - } + auto *out = c->serializer->embed (this); + if (unlikely (!out)) return_trace (false); + if (condition.is_null ()) + { + out->condition = 0; + return_trace (true); + } + return_trace (out->condition.serialize_subset (c, condition, this)); + } private: template @@ -4199,15 +4618,7 @@ struct ConditionNegate instancer); } - bool subset (hb_subset_context_t *c, - hb_subset_layout_context_t *l, - bool insert_catch_all) const - { - TRACE_SUBSET (this); - // TODO(subset) - return_trace (false); - } - + public: bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4223,11 +4634,31 @@ struct ConditionNegate struct Condition { + friend struct ConditionSet; + + static bool serialize_constant (hb_serialize_context_t *c, bool value) + { + auto *out = c->start_embed (); + if (unlikely (!out || !c->extend_min (out))) return false; + out->format = 2; + out->defaultValue = value ? 1 : 0; + out->varIdx = VarIdx::NO_VARIATION; + return true; + } + + lookup_condition_subset_result_t subset_lookup_condition ( + hb_subset_context_t *c, + unsigned depth = HB_MAX_NESTING_LEVEL, + bool materialize_true = false) const; + template bool evaluate (const int *coords, unsigned int coord_len, Instancer *instancer) const { switch (u.format.v) { + /* A null condition offset resolves to the nil Condition, whose reserved + * format 0 represents the True condition required by the specification. */ + case 0: return true; case 1: hb_barrier (); return u.format1.evaluate (coords, coord_len, instancer); case 2: hb_barrier (); return u.format2.evaluate (coords, coord_len, instancer); case 3: hb_barrier (); return u.format3.evaluate (coords, coord_len, instancer); @@ -4238,13 +4669,65 @@ struct Condition } Cond_with_Var_flag_t keep_with_variations (hb_collect_feature_substitutes_with_var_context_t *c, - hb_map_t *condition_map /* OUT */) const + hb_map_t *condition_map /* OUT */, + unsigned depth = HB_MAX_NESTING_LEVEL) const { + if (unlikely (!depth)) + { + c->apply = false; + return DROP_RECORD_WITH_VAR; + } + switch (u.format.v) { + case 0: return KEEP_RECORD_WITH_VAR; case 1: hb_barrier (); return u.format1.keep_with_variations (c, condition_map); - // TODO(subset) - default: c->apply = false; return KEEP_COND_WITH_VAR; + case 2: case 3: case 4: case 5: break; + default: c->apply = false; return DROP_RECORD_WITH_VAR; } + + hb_barrier (); + bool applies = evaluate (c->instancer->coords.arrayZ, + c->instancer->coords.length, c->instancer); + c->apply &= applies; + if (c->all_axes_pinned) + return applies ? DROP_COND_WITH_VAR : DROP_RECORD_WITH_VAR; + + if (u.format.v == 2) + return u.format2.varIdx == VarIdx::NO_VARIATION || + !c->instancer->varStore->has_delta_set (u.format2.varIdx) ? + (applies ? KEEP_RECORD_WITH_VAR : DROP_RECORD_WITH_VAR) : + KEEP_COND_WITH_VAR; + + auto classify_child = [c, condition_map, depth] (const Condition &child) + { + auto child_context = *c; + child_context.apply = true; + return child.keep_with_variations (&child_context, condition_map, depth - 1); + }; + + if (u.format.v == 5) + { + auto result = classify_child (&u.format5 + u.format5.condition); + return result == DROP_RECORD_WITH_VAR ? KEEP_RECORD_WITH_VAR : + result == KEEP_COND_WITH_VAR ? KEEP_COND_WITH_VAR : + DROP_RECORD_WITH_VAR; + } + + bool is_and = u.format.v == 3; + bool variable = false; + const auto &conditions = is_and ? u.format3.conditions : u.format4.conditions; + const void *base = is_and ? (const void *) &u.format3 : (const void *) &u.format4; + for (const auto &offset : conditions) + { + auto result = classify_child (base + offset); + if (is_and && result == DROP_RECORD_WITH_VAR) + return DROP_RECORD_WITH_VAR; + if (!is_and && (result == DROP_COND_WITH_VAR || result == KEEP_RECORD_WITH_VAR)) + return KEEP_RECORD_WITH_VAR; + variable |= result == KEEP_COND_WITH_VAR; + } + return variable ? KEEP_COND_WITH_VAR : + is_and ? KEEP_RECORD_WITH_VAR : DROP_RECORD_WITH_VAR; } template @@ -4265,18 +4748,27 @@ struct Condition bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - if (!u.format.v.sanitize (c)) return_trace (false); - hb_barrier (); - switch (u.format.v) { - case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); - case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); - case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); - case 4: hb_barrier (); return_trace (u.format4.sanitize (c)); - case 5: hb_barrier (); return_trace (u.format5.sanitize (c)); - default:return_trace (true); - } + + if (unlikely (!c->check_start_recursion (HB_MAX_NESTING_LEVEL))) + return_trace (c->no_dispatch_return_value ()); + + return_trace (c->end_recursion (this->dispatch (c))); } + bool collect_var_indices (hb_set_t *var_indices, + unsigned depth = HB_MAX_NESTING_LEVEL, + hb_hashmap_t> *condition_values = nullptr) const; + + bool serialize (hb_serialize_context_t *c, + const Condition *src, + const hb_map_t &varidx_map, + const hb_map_t *axis_map = nullptr); + + private: + lookup_condition_subset_result_t subset_lookup_condition_impl ( + hb_subset_context_t *c, + unsigned depth) const; + protected: union { struct { HBUINT16 v; } format; /* Format identifier */ @@ -4305,6 +4797,29 @@ struct ConditionList const Condition& operator[] (unsigned i) const { return this+conditions[i]; } + unsigned get_count () const { return conditions.len; } + + bool serialize (hb_serialize_context_t *c, + const ConditionList *src, + const hb_inc_bimap_t &condition_map, + const hb_map_t &varidx_map, + const hb_map_t *axis_map) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (this))) return_trace (false); + conditions.len = condition_map.get_population (); + if (unlikely (!c->extend (conditions))) return_trace (false); + for (unsigned i = 0; i < conditions.len; i++) + { + unsigned old_index = condition_map.backward (i); + if (unlikely (old_index >= src->conditions.len || + !conditions[i].serialize_serialize ( + c, &(src+src->conditions[old_index]), varidx_map, axis_map))) + return_trace (false); + } + return_trace (true); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -4317,6 +4832,375 @@ struct ConditionList DEFINE_SIZE_ARRAY (4, conditions); }; +inline bool +Condition::collect_var_indices (hb_set_t *var_indices, unsigned depth, + hb_hashmap_t> *condition_values) const +{ + if (unlikely (!depth)) return false; + switch (u.format.v) + { + case 0: + case 1: + return true; + case 2: + if (u.format2.varIdx != VarIdx::NO_VARIATION) + { + var_indices->add (u.format2.varIdx); + if (condition_values && + !condition_values->set ((uintptr_t) &u.format2, + hb_pair (unsigned (u.format2.varIdx), int (u.format2.defaultValue)))) + return false; + } + return !var_indices->in_error (); + case 3: + for (const auto &offset : u.format3.conditions) + if (unlikely (!(&u.format3+offset).collect_var_indices (var_indices, + depth - 1, condition_values))) + return false; + return true; + case 4: + for (const auto &offset : u.format4.conditions) + if (unlikely (!(&u.format4+offset).collect_var_indices (var_indices, + depth - 1, condition_values))) + return false; + return true; + case 5: + return (&u.format5+u.format5.condition).collect_var_indices (var_indices, + depth - 1, condition_values); + default: + return false; + } +} + +inline bool +Condition::serialize (hb_serialize_context_t *c, + const Condition *src, + const hb_map_t &varidx_map, + const hb_map_t *axis_map) +{ + TRACE_SERIALIZE (this); + switch (src->u.format.v) + { + case 0: + { + auto *out = c->start_embed (); + if (unlikely (!out || !c->extend_min (out))) return_trace (false); + out->format = 2; + out->defaultValue = 1; + out->varIdx = VarIdx::NO_VARIATION; + return_trace (true); + } + case 1: + { + auto *out = c->embed (&src->u.format1); + if (unlikely (!out)) return_trace (false); + if (axis_map) + { + if (unlikely (!axis_map->has (out->axisIndex))) + { + c->err (HB_SERIALIZE_ERROR_OTHER); + return_trace (false); + } + if (unlikely (!c->check_assign (out->axisIndex, axis_map->get (out->axisIndex), + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return_trace (false); + } + return_trace (true); + } + case 2: + { + auto *out = c->embed (&src->u.format2); + if (unlikely (!out || + (src->u.format2.varIdx != VarIdx::NO_VARIATION && + !varidx_map.has (src->u.format2.varIdx)))) + return_trace (false); + out->varIdx = src->u.format2.varIdx == VarIdx::NO_VARIATION ? + src->u.format2.varIdx : varidx_map.get (src->u.format2.varIdx); + return_trace (true); + } + case 3: + { + auto *out = c->start_embed (); + if (unlikely (!c->extend_min (out))) return_trace (false); + out->format = 3; + out->conditions.len = src->u.format3.conditions.len; + if (unlikely (!c->extend (out->conditions))) return_trace (false); + for (unsigned i = 0; i < out->conditions.len; i++) + if (unlikely (!out->conditions[i].serialize_serialize ( + c, &(&src->u.format3+src->u.format3.conditions[i]), + varidx_map, axis_map))) + return_trace (false); + return_trace (true); + } + case 4: + { + auto *out = c->start_embed (); + if (unlikely (!c->extend_min (out))) return_trace (false); + out->format = 4; + out->conditions.len = src->u.format4.conditions.len; + if (unlikely (!c->extend (out->conditions))) return_trace (false); + for (unsigned i = 0; i < out->conditions.len; i++) + if (unlikely (!out->conditions[i].serialize_serialize ( + c, &(&src->u.format4+src->u.format4.conditions[i]), + varidx_map, axis_map))) + return_trace (false); + return_trace (true); + } + case 5: + { + auto *out = c->embed (&src->u.format5); + if (unlikely (!out || + !out->condition.serialize_serialize ( + c, &(&src->u.format5+src->u.format5.condition), + varidx_map, axis_map))) + return_trace (false); + return_trace (true); + } + default: + return_trace (false); + } +} + +inline lookup_condition_subset_result_t +Condition::subset_lookup_condition (hb_subset_context_t *c, + unsigned depth, + bool materialize_true) const +{ + auto snap = c->serializer->snapshot (); + lookup_condition_subset_result_t result = + subset_lookup_condition_impl (c, depth); + if (result == LOOKUP_CONDITION_SUBSET_KEEP) + return result; + + c->serializer->revert (snap); + if (result != LOOKUP_CONDITION_SUBSET_TRUE || !materialize_true) + return result; + + return serialize_constant (c->serializer, true) ? + LOOKUP_CONDITION_SUBSET_KEEP : LOOKUP_CONDITION_SUBSET_ERROR; +} + +inline lookup_condition_subset_result_t +Condition::subset_lookup_condition_impl (hb_subset_context_t *c, + unsigned depth) const +{ + if (unlikely (!depth)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + auto subset_offset = [c, depth] (Array8OfOffset24To &out, + const Condition &condition) + -> lookup_condition_subset_result_t + { + auto snap = c->serializer->snapshot (); + auto *offset = out.serialize_append (c->serializer); + if (unlikely (!offset)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + c->serializer->push (); + lookup_condition_subset_result_t result = + condition.subset_lookup_condition (c, depth - 1); + if (result == LOOKUP_CONDITION_SUBSET_KEEP) + c->serializer->add_link (*offset, c->serializer->pop_pack ()); + else + { + c->serializer->pop_discard (); + out.pop (); + c->serializer->revert (snap); + } + return result; + }; + + switch (u.format.v) + { + case 0: + return LOOKUP_CONDITION_SUBSET_TRUE; + + case 1: + { + const ConditionAxisRange &src = u.format1; + if (c->plan->user_axes_location.is_empty ()) + return c->serializer->embed (&src) ? + LOOKUP_CONDITION_SUBSET_KEEP : + LOOKUP_CONDITION_SUBSET_ERROR; + + hb_codepoint_t *axis_tag; + if (!c->plan->axes_old_index_tag_map.has (src.axisIndex, &axis_tag)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + Triple axis_limit {-1.f, 0.f, 1.f}; + Triple *normalized_limit; + if (c->plan->axes_location.has (*axis_tag, &normalized_limit)) + axis_limit = *normalized_limit; + + float filter_min = src.filterRangeMinValue.to_float (); + float filter_max = src.filterRangeMaxValue.to_float (); + if (filter_min > filter_max) + return LOOKUP_CONDITION_SUBSET_FALSE; + if (axis_limit.is_point ()) + return filter_min <= axis_limit.middle && + axis_limit.middle <= filter_max ? + LOOKUP_CONDITION_SUBSET_TRUE : + LOOKUP_CONDITION_SUBSET_FALSE; + if (axis_limit.maximum < filter_min || + filter_max < axis_limit.minimum) + return LOOKUP_CONDITION_SUBSET_FALSE; + if (filter_min <= axis_limit.minimum && + axis_limit.maximum <= filter_max) + return LOOKUP_CONDITION_SUBSET_TRUE; + if (!c->plan->axes_index_map.has (src.axisIndex)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + auto *out = c->serializer->embed (&src); + if (unlikely (!out)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + TripleDistances axis_distances {1.f, 1.f}; + TripleDistances *distances; + if (c->plan->axes_triple_distances.has (*axis_tag, &distances)) + axis_distances = *distances; + + out->filterRangeMinValue.set_float ( + renormalizeValue (filter_min, axis_limit, axis_distances, false)); + out->filterRangeMaxValue.set_float ( + renormalizeValue (filter_max, axis_limit, axis_distances, false)); + if (unlikely (!c->serializer->check_assign ( + out->axisIndex, + c->plan->axes_index_map.get (src.axisIndex), + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return LOOKUP_CONDITION_SUBSET_ERROR; + return LOOKUP_CONDITION_SUBSET_KEEP; + } + + case 2: + { + const ConditionValue &src = u.format2; + auto *out = c->serializer->embed (&src); + if (unlikely (!out)) + return LOOKUP_CONDITION_SUBSET_ERROR; + + if (src.varIdx == VarIdx::NO_VARIATION) + return c->plan->user_axes_location.is_empty () ? + LOOKUP_CONDITION_SUBSET_KEEP : + ((int) src.defaultValue > 0 ? + LOOKUP_CONDITION_SUBSET_TRUE : + LOOKUP_CONDITION_SUBSET_FALSE); + + hb_pair_t *condition_value; + if (c->plan->layout_condition_idx_value_map.has ((uintptr_t) &src, &condition_value)) + { + out->defaultValue = condition_value->second; + out->varIdx = condition_value->first; + if (out->varIdx == VarIdx::NO_VARIATION) + return out->defaultValue > 0 ? LOOKUP_CONDITION_SUBSET_TRUE : + LOOKUP_CONDITION_SUBSET_FALSE; + return LOOKUP_CONDITION_SUBSET_KEEP; + } + + hb_pair_t *new_varidx_delta; + if (!c->plan->layout_variation_idx_delta_map.has (src.varIdx, + &new_varidx_delta)) + return c->plan->user_axes_location.is_empty () ? + LOOKUP_CONDITION_SUBSET_KEEP : + ((int) src.defaultValue > 0 ? + LOOKUP_CONDITION_SUBSET_TRUE : + LOOKUP_CONDITION_SUBSET_FALSE); + + if (!c->plan->user_axes_location.is_empty () && + hb_first (*new_varidx_delta) == VarIdx::NO_VARIATION) + { + // Conditions becoming constant depend on the unrounded sign, not + // the integer delta used to instance positioning values. + double value = (int) src.defaultValue + + c->plan->layout_variation_delta (src.varIdx); + return value > 0 ? LOOKUP_CONDITION_SUBSET_TRUE : + LOOKUP_CONDITION_SUBSET_FALSE; + } + + int default_value = (int) src.defaultValue + + hb_second (*new_varidx_delta); + if (unlikely (!c->serializer->check_assign ( + out->defaultValue, + default_value, + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return LOOKUP_CONDITION_SUBSET_ERROR; + out->varIdx = hb_first (*new_varidx_delta); + + return LOOKUP_CONDITION_SUBSET_KEEP; + } + + case 3: + { + const ConditionAnd &src = u.format3; + auto *out = c->serializer->start_embed (&src); + if (unlikely (!out || !c->serializer->extend_min (out))) + return LOOKUP_CONDITION_SUBSET_ERROR; + out->format = 3; + + for (const auto &offset : src.conditions) + { + lookup_condition_subset_result_t result = + subset_offset (out->conditions, &src + offset); + if (result == LOOKUP_CONDITION_SUBSET_ERROR || + result == LOOKUP_CONDITION_SUBSET_FALSE) + return result; + } + return out->conditions ? + LOOKUP_CONDITION_SUBSET_KEEP : + LOOKUP_CONDITION_SUBSET_TRUE; + } + + case 4: + { + const ConditionOr &src = u.format4; + auto *out = c->serializer->start_embed (&src); + if (unlikely (!out || !c->serializer->extend_min (out))) + return LOOKUP_CONDITION_SUBSET_ERROR; + out->format = 4; + + for (const auto &offset : src.conditions) + { + lookup_condition_subset_result_t result = + subset_offset (out->conditions, &src + offset); + if (result == LOOKUP_CONDITION_SUBSET_ERROR || + result == LOOKUP_CONDITION_SUBSET_TRUE) + return result; + } + return out->conditions ? + LOOKUP_CONDITION_SUBSET_KEEP : + LOOKUP_CONDITION_SUBSET_FALSE; + } + + case 5: + { + const ConditionNegate &src = u.format5; + auto *out = c->serializer->embed (&src); + if (unlikely (!out)) + return LOOKUP_CONDITION_SUBSET_ERROR; + out->condition = 0; + + c->serializer->push (); + lookup_condition_subset_result_t result = + (&src + src.condition).subset_lookup_condition (c, depth - 1); + if (result == LOOKUP_CONDITION_SUBSET_KEEP) + { + c->serializer->add_link (out->condition, + c->serializer->pop_pack ()); + return result; + } + + c->serializer->pop_discard (); + if (result == LOOKUP_CONDITION_SUBSET_TRUE) + return LOOKUP_CONDITION_SUBSET_FALSE; + if (result == LOOKUP_CONDITION_SUBSET_FALSE) + return LOOKUP_CONDITION_SUBSET_TRUE; + return result; + } + + default: + return LOOKUP_CONDITION_SUBSET_FALSE; + } +} + struct ConditionSet { bool evaluate (const int *coords, unsigned int coord_len, @@ -4341,13 +5225,20 @@ struct ConditionSet c->apply = true; bool should_keep = false; + /* The range map cannot identify value or boolean expressions uniquely. */ + bool can_deduplicate = true; unsigned num_kept_cond = 0, cond_idx = 0; for (const auto& offset : conditions) { - Cond_with_Var_flag_t ret = (this+offset).keep_with_variations (c, condition_map); + const Condition &condition = this+offset; + can_deduplicate &= condition.u.format.v <= 1; + Cond_with_Var_flag_t ret = condition.keep_with_variations (c, condition_map); // condition is not met or condition out of range, drop the entire record if (ret == DROP_RECORD_WITH_VAR) + { + c->apply = false; return; + } if (ret == KEEP_COND_WITH_VAR) { @@ -4362,17 +5253,19 @@ struct ConditionSet cond_idx++; } - if (!should_keep) return; + /* Satisfied pinned conditions still terminate first-match processing. + * Keep their universal record when other axes remain variable. */ + c->universal = num_kept_cond == 0; + if (!should_keep && c->all_axes_pinned) return; //check if condition_set is unique with variations - if (c->conditionset_map->has (p)) + if (can_deduplicate && c->conditionset_map->has (p)) //duplicate found, drop the entire record return; - c->conditionset_map->set (p, 1); + if (can_deduplicate) + c->conditionset_map->set (p, 1); c->record_cond_idx_map->set (c->cur_record_idx, s); - if (should_keep && num_kept_cond == 0) - c->universal = true; } bool subset (hb_subset_context_t *c, @@ -4394,7 +5287,28 @@ struct ConditionSet { if (retained_cond_set != nullptr && !retained_cond_set->has (i)) continue; - subset_offset_array (c, out->conditions, this) (conditions[i]); + const Condition &condition = this+conditions[i]; + if (condition.u.format.v == 1) + { + subset_offset_array (c, out->conditions, this) (conditions[i]); + continue; + } + + auto *offset = out->conditions.serialize_append (c->serializer); + if (unlikely (!offset)) return_trace (false); + c->serializer->push (); + auto result = condition.subset_lookup_condition (c, HB_MAX_NESTING_LEVEL, true); + if (result == LOOKUP_CONDITION_SUBSET_FALSE) + /* A false condition must not become a null (true) ConditionSet. */ + result = Condition::serialize_constant (c->serializer, false) ? + LOOKUP_CONDITION_SUBSET_KEEP : LOOKUP_CONDITION_SUBSET_ERROR; + if (unlikely (result == LOOKUP_CONDITION_SUBSET_ERROR)) + { + c->serializer->pop_discard (); + c->serializer->check_success (false); + return_trace (false); + } + c->serializer->add_link (*offset, c->serializer->pop_pack ()); } return_trace (bool (out->conditions)); @@ -4406,6 +5320,15 @@ struct ConditionSet return_trace (conditions.sanitize (c, this)); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &offset : conditions) + if (unlikely (!(this+offset).collect_var_indices (c->layout_variation_indices, + HB_MAX_NESTING_LEVEL, + c->condition_values))) + c->layout_variation_indices->err (); + } + protected: Array16OfOffset32To conditions; public: @@ -4475,13 +5398,22 @@ struct FeatureTableSubstitutionRecord if (unlikely (!out)) return_trace (false); out->featureIndex = *new_feature_index; - return_trace (out->feature.serialize_subset (c->subset_context, feature, base, c)); + hb_pair_t *original; + if (!c->feature_idx_tag_map->has (featureIndex, &original)) + return_trace (false); + const Tag *tag = reinterpret_cast (original->second); + return_trace (out->feature.serialize_subset (c->subset_context, feature, base, c, tag)); } - bool sanitize (hb_sanitize_context_t *c, const void *base) const + bool sanitize (hb_sanitize_context_t *c, const void *base, + const FeatureList *feature_list) const { TRACE_SANITIZE (this); - return_trace (c->check_struct (this) && feature.sanitize (c, base)); + if (unlikely (!c->check_struct (this))) return_trace (false); + hb_barrier (); + /* The substitute is read with the tag of the feature it replaces. */ + const Record_sanitize_closure_t closure = {feature_list->get_tag (featureIndex), base}; + return_trace (feature.sanitize (c, base, &closure)); } protected: @@ -4493,6 +5425,12 @@ struct FeatureTableSubstitutionRecord struct FeatureTableSubstitution { + void collect_feature_indices (hb_set_t *feature_indices) const + { + for (const FeatureTableSubstitutionRecord &record : substitutions) + feature_indices->add (record.featureIndex); + } + const Feature *find_substitute (unsigned int feature_index) const { unsigned int count = substitutions.len; @@ -4515,6 +5453,16 @@ struct FeatureTableSubstitution ; } + template + void collect_name_ids (const hb_map_t *feature_index_map, + TagGetter get_tag, + hb_set_t *nameids_to_retain) const + { + for (const FeatureTableSubstitutionRecord &record : substitutions) + if (feature_index_map->has (record.featureIndex)) + (this+record.feature).collect_name_ids (get_tag (record.featureIndex), nameids_to_retain); + } + void closure_features (const hb_map_t *lookup_indexes, hb_set_t *feature_indexes /* OUT */) const { @@ -4573,13 +5521,13 @@ struct FeatureTableSubstitution return_trace (bool (out->substitutions)); } - bool sanitize (hb_sanitize_context_t *c) const + bool sanitize (hb_sanitize_context_t *c, const FeatureList *feature_list) const { TRACE_SANITIZE (this); return_trace (version.sanitize (c) && hb_barrier () && likely (version.major == 1) && - substitutions.sanitize (c, this)); + substitutions.sanitize (c, this, feature_list)); } protected: @@ -4601,6 +5549,15 @@ struct FeatureVariationRecord return (base+substitutions).collect_lookups (feature_indexes, lookup_indexes); } + template + void collect_name_ids (const void *base, + const hb_map_t *feature_index_map, + TagGetter get_tag, + hb_set_t *nameids_to_retain) const + { + (base+substitutions).collect_name_ids (feature_index_map, get_tag, nameids_to_retain); + } + void closure_features (const void *base, const hb_map_t *lookup_indexes, hb_set_t *feature_indexes /* OUT */) const @@ -4631,19 +5588,30 @@ struct FeatureVariationRecord auto *out = c->subset_context->serializer->embed (this); if (unlikely (!out)) return_trace (false); - out->conditions.serialize_subset (c->subset_context, conditions, base, c, insert_catch_all); + hb_set_t *retained_conditions = c->feature_record_cond_idx_map ? + c->feature_record_cond_idx_map->get (c->cur_feature_var_record_idx).get () : nullptr; + if (!insert_catch_all && retained_conditions && retained_conditions->is_empty ()) + /* A null ConditionSet is the unconditional first-match record. */ + out->conditions = 0; + else + out->conditions.serialize_subset (c->subset_context, conditions, base, c, insert_catch_all); out->substitutions.serialize_subset (c->subset_context, substitutions, base, c, insert_catch_all); return_trace (true); } - bool sanitize (hb_sanitize_context_t *c, const void *base) const + bool sanitize (hb_sanitize_context_t *c, const void *base, + const FeatureList *feature_list) const { TRACE_SANITIZE (this); return_trace (conditions.sanitize (c, base) && - substitutions.sanitize (c, base)); + substitutions.sanitize (c, base, feature_list)); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const void *base) const + { (base+conditions).collect_variation_indices (c); } + protected: Offset32To conditions; @@ -4653,10 +5621,326 @@ struct FeatureVariationRecord DEFINE_SIZE_STATIC (8); }; +struct LookupIndexList +{ + void add_lookup_indexes_to (hb_set_t *lookup_indexes) const + { lookupIndices.add_indexes_to (lookup_indexes); } + + bool intersects_lookup_indexes (const hb_map_t *lookup_indexes) const + { return lookupIndices.intersects (lookup_indexes); } + + bool subset (hb_subset_context_t *c, + hb_subset_layout_context_t *l) const + { + TRACE_SUBSET (this); + auto *out = c->serializer->start_embed (this); + if (unlikely (!out || !c->serializer->extend_min (out))) + return_trace (false); + + auto it = + + hb_iter (lookupIndices) + | hb_filter (l->lookup_index_map) + | hb_map (l->lookup_index_map) + ; + out->lookupIndices.serialize (c->serializer, l, it); + return_trace (bool (out->lookupIndices)); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (lookupIndices.sanitize (c)); + } + + protected: + IndexArray lookupIndices; + public: + DEFINE_SIZE_ARRAY_SIZED (2, lookupIndices); +}; + +struct LookupConditionRecord +{ + unsigned get_condition_offset (const void *base, const void *variations) const + { return (const char *) &(base+condition) - (const char *) variations; } + + template + bool evaluate (const void *base, + const int *coords, + unsigned int coord_len, + Instancer *instancer) const + { return (base+condition).evaluate (coords, coord_len, instancer); } + + bool evaluate (const void *base, + const void *variations, + hb_sorted_array_t conditions) const + { + return !condition || hb_bsearch (get_condition_offset (base, variations), + conditions.arrayZ, conditions.length, + sizeof (unsigned), + _hb_cmp_operator); + } + + bool collect_condition (const void *base, + const void *variations, + const int *coords, + unsigned int coord_len, + ItemVarStoreInstancer *instancer, + hb_set_t *visited, + hb_vector_t *conditions) const + { + /* Null conditions always apply and need no key state. */ + if (!condition) return true; + + unsigned offset = get_condition_offset (base, variations); + if (visited->has (offset)) return true; + visited->add (offset); + if (unlikely (visited->in_error ())) return false; + + if (evaluate (base, coords, coord_len, instancer)) + conditions->push (offset); + return !conditions->in_error (); + } + + void add_lookup_indexes_to (const void *base, + hb_set_t *lookup_indexes) const + { (base+lookupIndices).add_lookup_indexes_to (lookup_indexes); } + + bool intersects_lookup_indexes (const void *base, + const hb_map_t *lookup_indexes) const + { return (base+lookupIndices).intersects_lookup_indexes (lookup_indexes); } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const void *base) const + { + if (unlikely (!(base+condition).collect_var_indices (c->layout_variation_indices, + HB_MAX_NESTING_LEVEL, + c->condition_values))) + c->layout_variation_indices->err (); + } + + bool subset (hb_subset_context_t *c, + hb_subset_layout_context_t *l, + const void *base) const + { + TRACE_SUBSET (this); + auto *out = c->serializer->embed (this); + if (unlikely (!out)) return_trace (false); + + out->condition = 0; + c->serializer->push (); + lookup_condition_subset_result_t result = + (base + condition).subset_lookup_condition (c, + HB_MAX_NESTING_LEVEL, + true); + if (result != LOOKUP_CONDITION_SUBSET_KEEP) + { + c->serializer->pop_discard (); + return_trace (false); + } + c->serializer->add_link (out->condition, c->serializer->pop_pack ()); + + return_trace (out->lookupIndices.serialize_subset (c, lookupIndices, base, l)); + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (condition.sanitize (c, base) && + lookupIndices.sanitize (c, base)); + } + + protected: + Offset32To condition; + Offset32To lookupIndices; + public: + DEFINE_SIZE_STATIC (8); +}; + +struct FeatureLookupsTable +{ + bool adds_default_lookups () const { return flags & 0x0001u; } + + bool collect_conditions (const void *variations, + const int *coords, + unsigned int coord_len, + ItemVarStoreInstancer *instancer, + hb_set_t *visited, + hb_vector_t *conditions) const + { + for (const LookupConditionRecord &record : records) + if (unlikely (!record.collect_condition (this, variations, coords, coord_len, + instancer, visited, conditions))) + return false; + return true; + } + + void collect_lookups (const void *variations, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes) const + { + for (const LookupConditionRecord &record : records) + if (record.evaluate (this, variations, conditions)) + record.add_lookup_indexes_to (this, lookup_indexes); + } + + template + void collect_lookups (const int *coords, + unsigned int coord_len, + Instancer *instancer, + hb_set_t *lookup_indexes) const + { + for (const LookupConditionRecord &record : records) + if (record.evaluate (this, coords, coord_len, instancer)) + record.add_lookup_indexes_to (this, lookup_indexes); + } + + void collect_lookups (hb_set_t *lookup_indexes) const + { + for (const LookupConditionRecord &record : records) + record.add_lookup_indexes_to (this, lookup_indexes); + } + + bool intersects_lookup_indexes (const hb_map_t *lookup_indexes) const + { + for (const LookupConditionRecord &record : records) + if (record.intersects_lookup_indexes (this, lookup_indexes)) + return true; + return false; + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const LookupConditionRecord &record : records) + record.collect_variation_indices (c, this); + } + + bool subset (hb_subset_context_t *c, + hb_subset_layout_context_t *l) const + { + TRACE_SUBSET (this); + auto *out = c->serializer->start_embed (this); + if (unlikely (!out || !c->serializer->extend_min (out))) + return_trace (false); + + out->version.major = version.major; + out->version.minor = version.minor; + out->flags = flags; + + for (const LookupConditionRecord &record : records) + { + auto snap = c->serializer->snapshot (); + if (record.subset (c, l, this)) + out->records.len++; + else + c->serializer->revert (snap); + } + + return_trace (true); + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (version.sanitize (c) && + hb_barrier () && + likely (version.major == 1) && + records.sanitize (c, this)); + } + + protected: + FixedVersion<> version; /* Version--0x00010000u */ + HBUINT16 flags; + Array32Of + records; + public: + DEFINE_SIZE_ARRAY (10, records); +}; + +struct LookupVariationRecord +{ + friend struct FeatureVariations; + + unsigned get_feature_index () const { return featureIndex; } + + void collect_lookups (const void *base, + const Feature &feature, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes) const + { + const FeatureLookupsTable &feature_lookups = base+featureLookups; + if (feature_lookups.adds_default_lookups ()) + feature.add_lookup_indexes_to (lookup_indexes); + feature_lookups.collect_lookups (base, conditions, lookup_indexes); + } + + void collect_lookups (const void *base, + const hb_set_t *feature_indexes, + hb_set_t *lookup_indexes) const + { + if (feature_indexes->has (featureIndex)) + (base+featureLookups).collect_lookups (lookup_indexes); + } + + void closure_features (const void *base, + const hb_map_t *lookup_indexes, + hb_set_t *feature_indexes) const + { + if ((base+featureLookups).intersects_lookup_indexes (lookup_indexes)) + feature_indexes->add (featureIndex); + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c, + const void *base) const + { (base+featureLookups).collect_variation_indices (c); } + + bool subset (hb_subset_layout_context_t *l, const void *base) const + { + hb_subset_context_t *c = l->subset_context; + TRACE_SUBSET (this); + uint32_t *new_feature_index; + if (!l->feature_map_w_duplicates->has (featureIndex, &new_feature_index)) + return_trace (false); + + auto *out = c->serializer->embed (this); + if (unlikely (!out || + !c->serializer->check_assign (out->featureIndex, + *new_feature_index, + HB_SERIALIZE_ERROR_INT_OVERFLOW))) + return_trace (false); + + return_trace (out->featureLookups.serialize_subset (c, featureLookups, base, l)); + } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + featureLookups.sanitize (c, base)); + } + + protected: + HBUINT16 featureIndex; + Offset32To featureLookups; + public: + DEFINE_SIZE_STATIC (6); +}; + struct FeatureVariations { static constexpr unsigned NOT_FOUND_INDEX = 0xFFFFFFFFu; + const Array32Of &get_lookup_variation_records () const + { + if (version.to_int () < 0x00010001u) + return Null (Array32Of); + return StructAfter> (varRecords); + } + + unsigned record_count () const + { + return varRecords.len; + } + bool find_index (const int *coords, unsigned int coord_len, unsigned int *index, ItemVarStoreInstancer *instancer) const @@ -4682,6 +5966,47 @@ struct FeatureVariations return (this+record.substitutions).find_substitute (feature_index); } + bool collect_lookup_conditions (const int *coords, + unsigned int coord_len, + ItemVarStoreInstancer *instancer, + hb_vector_t *state) const + { + hb_set_t visited_tables, visited_conditions; + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + { + unsigned offset = record.featureLookups; + if (visited_tables.has (offset)) continue; + visited_tables.add (offset); + if (unlikely (visited_tables.in_error ())) return false; + + const FeatureLookupsTable &feature_lookups = this+record.featureLookups; + if (unlikely (!feature_lookups.collect_conditions (this, coords, coord_len, + instancer, &visited_conditions, + state))) + return false; + } + + /* Key size depends on distinct conditions, not expanded lookup sets. + * Sorting makes it independent of their first traversal order. */ + state->qsort (_hb_cmp_operator); + return true; + } + + bool get_lookup_variations (unsigned feature_index, + const Feature &feature, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes) const + { + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + { + if (record.featureIndex != feature_index) continue; + + record.collect_lookups (this, feature, conditions, lookup_indexes); + return true; + } + return false; + } + void collect_feature_substitutes_with_variations (hb_collect_feature_substitutes_with_var_context_t *c) const { unsigned int count = varRecords.len; @@ -4714,6 +6039,29 @@ struct FeatureVariations continue; varRecords[i].collect_lookups (this, feature_indexes, lookup_indexes); } + + collect_lookup_variation_lookups (feature_indexes, lookup_indexes); + } + + template + void collect_name_ids (const hb_map_t *feature_index_map, + const hb_hashmap_t> *feature_record_cond_idx_map, + TagGetter get_tag, + hb_set_t *nameids_to_retain) const + { + for (unsigned i = 0; i < varRecords.len; i++) + { + if (feature_record_cond_idx_map && !feature_record_cond_idx_map->has (i)) + continue; + varRecords[i].collect_name_ids (this, feature_index_map, get_tag, nameids_to_retain); + } + } + + void collect_lookup_variation_lookups (const hb_set_t *feature_indexes, + hb_set_t *lookup_indexes /* OUT */) const + { + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + record.collect_lookups (this, feature_indexes, lookup_indexes); } void closure_features (const hb_map_t *lookup_indexes, @@ -4728,6 +6076,35 @@ struct FeatureVariations continue; varRecords[i].closure_features (this, lookup_indexes, feature_indexes); } + + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + record.closure_features (this, lookup_indexes, feature_indexes); + } + + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const FeatureVariationRecord &record : varRecords) + record.collect_variation_indices (c, this); + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + record.collect_variation_indices (c, this); + } + + void collect_feature_indices (hb_set_t *feature_indices) const + { + for (const FeatureVariationRecord &record : varRecords) + (this+record.substitutions).collect_feature_indices (feature_indices); + } + + bool has_lookup_variations (unsigned feature_index) const + { + for (const LookupVariationRecord &record : get_lookup_variation_records ()) + { + if (record.featureIndex == feature_index) + return true; + if (record.featureIndex > feature_index) + break; + } + return false; } bool subset (hb_subset_context_t *c, @@ -4765,16 +6142,31 @@ struct FeatureVariations subset_record_array (l, &(out->varRecords), this, insert_catch_all_record) (varRecords[0]); } - return_trace (bool (out->varRecords)); + Array32Of *out_lookup_records = nullptr; + if (version.minor >= 1) + { + out_lookup_records = &StructAfter> (out->varRecords); + if (unlikely (!c->serializer->extend_min (out_lookup_records))) + return_trace (false); + + + get_lookup_variation_records ().iter () + | hb_apply (subset_record_array (l, out_lookup_records, this)) + ; + } + + return_trace (bool (out->varRecords) || + (out_lookup_records && bool (*out_lookup_records))); } - bool sanitize (hb_sanitize_context_t *c) const + bool sanitize (hb_sanitize_context_t *c, const FeatureList *feature_list) const { TRACE_SANITIZE (this); return_trace (version.sanitize (c) && hb_barrier () && likely (version.major == 1) && - varRecords.sanitize (c, this)); + varRecords.sanitize (c, this, feature_list) && + (version.minor < 1 || + get_lookup_variation_records ().sanitize (c, this))); } protected: @@ -4888,6 +6280,16 @@ struct VariationDevice hb_scalar_cache_t *store_cache = nullptr) const { return !font->has_nonzero_coords ? 0 : font->em_scalef_y (get_delta (font, store, store_cache)); } + float get_x_delta_f (hb_font_t *font, + const ItemVariationStore &store, + hb_scalar_cache_t *store_cache) const + { return !font->has_nonzero_coords ? 0.f : font->em_fscalef_x (get_delta (font, store, store_cache)); } + + float get_y_delta_f (hb_font_t *font, + const ItemVariationStore &store, + hb_scalar_cache_t *store_cache) const + { return !font->has_nonzero_coords ? 0.f : font->em_fscalef_y (get_delta (font, store, store_cache)); } + VariationDevice* copy (hb_serialize_context_t *c, const hb_hashmap_t> *layout_variation_idx_delta_map) const { @@ -4897,6 +6299,11 @@ struct VariationDevice hb_pair_t *v; if (!layout_variation_idx_delta_map->has (varIdx, &v)) return_trace (nullptr); + /* The varidx was mapped to "no variations" during instancing (e.g. the + * instantiated row is all zeros). Drop the device instead of emitting one + * with an out-of-range varidx. */ + if (hb_first (*v) == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + return_trace (nullptr); c->start_zerocopy (this->static_size); auto *out = c->embed (this); @@ -4945,6 +6352,36 @@ struct DeviceHeader struct Device { + // Anchors retain fractional coordinates until their difference is rounded. + // Hinting adjustments and value records keep their integer semantics. + float get_x_delta_f (hb_font_t *font, + const ItemVariationStore &store, + hb_scalar_cache_t *store_cache = nullptr) const + { +#ifndef HB_NO_VAR + if (u.b.format == 0x8000) + { + hb_barrier (); + return u.variation.get_x_delta_f (font, store, store_cache); + } +#endif + return get_x_delta (font, store, store_cache); + } + + float get_y_delta_f (hb_font_t *font, + const ItemVariationStore &store, + hb_scalar_cache_t *store_cache = nullptr) const + { +#ifndef HB_NO_VAR + if (u.b.format == 0x8000) + { + hb_barrier (); + return u.variation.get_y_delta_f (font, store, store_cache); + } +#endif + return get_y_delta (font, store, store_cache); + } + hb_position_t get_x_delta (hb_font_t *font, const ItemVariationStore &store=Null (ItemVariationStore), hb_scalar_cache_t *store_cache = nullptr) const @@ -4953,10 +6390,12 @@ struct Device { #ifndef HB_NO_HINTING case 1: case 2: case 3: + hb_barrier (); return u.hinting.get_x_delta (font); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.get_x_delta (font, store, store_cache); #endif default: @@ -4971,10 +6410,12 @@ struct Device { case 1: case 2: case 3: #ifndef HB_NO_HINTING + hb_barrier (); return u.hinting.get_y_delta (font); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.get_y_delta (font, store, store_cache); #endif default: @@ -4989,10 +6430,12 @@ struct Device switch (u.b.format) { #ifndef HB_NO_HINTING case 1: case 2: case 3: + hb_barrier (); return_trace (u.hinting.sanitize (c)); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return_trace (u.variation.sanitize (c)); #endif default: @@ -5009,10 +6452,12 @@ struct Device case 1: case 2: case 3: + hb_barrier (); return_trace (reinterpret_cast (u.hinting.copy (c))); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return_trace (reinterpret_cast (u.variation.copy (c, layout_variation_idx_delta_map))); #endif default: @@ -5031,6 +6476,7 @@ struct Device #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); u.variation.collect_variation_index (c); return; #endif @@ -5044,6 +6490,7 @@ struct Device switch (u.b.format) { #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.varIdx; #endif default: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh index 8d5e1f186383..c46fd68de29c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh @@ -58,6 +58,24 @@ template return l.dispatch (c); } +/*static*/ hb_depend_context_t::return_t SubstLookup::depend_glyphs_recurse_func (hb_depend_context_t *c, unsigned lookup_index, hb_bit_page_t *covered_seq_indices, unsigned seq_index, unsigned end_index) +{ + const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index); + /* After a non-1-to-1 lookup (expansion/contraction), subsequent lookups in the same + * contextual rule see all glyphs, not position-specific ones. This matches closure behavior. + * Mark sequence positions as covered so later lookups use the full glyph set. */ + if (l.may_have_non_1to1 ()) + covered_seq_indices->add_range (seq_index, end_index); + + hb_depend_context_t::recurse_key_t key; + if (!c->get_recurse_key (lookup_index, &key)) + return hb_empty_t (); + + hb_depend_context_t::return_t ret = l.dispatch (c); + c->finish_recurse (key); + return ret; +} + template <> inline hb_closure_lookups_context_t::return_t SubstLookup::dispatch_recurse_func (hb_closure_lookups_context_t *c, unsigned this_index) @@ -96,7 +114,98 @@ inline bool SubstLookup::dispatch_recurse_func (hb_ot_app } /* namespace GSUB_impl */ } /* namespace Layout */ -} /* namespace OT */ +inline void +GSUB_accelerator_t::depend (hb_depend_data_builder_t *builder, hb_face_t *face) const +{ + if (!this->table->has_data ()) return; + + unsigned num_features = this->table->get_feature_count (); + unsigned num_lookups = this->table->get_lookup_count (); + + hb_vector_t feature_tags; + if (!builder->check_success (feature_tags.resize (num_features))) + return; + this->table->get_feature_tags (0, &num_features, feature_tags.arrayZ); + + if (!builder->init_lookup_features (num_lookups)) + return; + + hb_vector_t feature_query_v; + feature_query_v.resize (2); + feature_query_v[1] = 0; + + hb_set_t seen_features; + hb_set_t feature_indexes, lookup_indexes; + + for (auto ft : feature_tags) + { + if (seen_features.has (ft)) continue; + seen_features.add (ft); + feature_query_v[0] = ft; + feature_indexes.reset (); + hb_ot_layout_collect_features (face, HB_OT_TAG_GSUB, nullptr, nullptr, + feature_query_v.arrayZ, &feature_indexes); + lookup_indexes.reset (); + for (auto feature_index : feature_indexes) + this->table->get_feature (feature_index).add_lookup_indexes_to (&lookup_indexes); + + for (auto lookup_index : lookup_indexes) + if (unlikely (!builder->add_lookup_feature (lookup_index, ft))) + return; + + auto &fv = this->table->get_feature_variations (); + auto fi_count = fv.record_count (); + for (unsigned i = 0; i < fi_count; i++) + { + lookup_indexes.reset (); + for (auto feature_index : feature_indexes) + { + auto feature_ptr = fv.find_substitute (i, feature_index); + if (feature_ptr != nullptr) + feature_ptr->add_lookup_indexes_to (&lookup_indexes); + } + for (auto lookup_index : lookup_indexes) + if (unlikely (!builder->add_lookup_feature (lookup_index, ft))) + return; + } + +#ifndef HB_NO_VAR + lookup_indexes.reset (); + fv.collect_lookup_variation_lookups (&feature_indexes, &lookup_indexes); + for (auto lookup_index : lookup_indexes) + if (unlikely (!builder->add_lookup_feature (lookup_index, ft))) + return; +#endif + } + + if (unlikely (!builder->finish_lookup_features ())) + return; + + hb_set_t all_glyphs; + all_glyphs.add_range (0, face->get_num_glyphs () - 1); + + hb_depend_context_t c (builder, face, &all_glyphs); + + for (unsigned i = 0; i < num_lookups; i++) + { + auto features = builder->get_lookup_features (i); + if (!features) + { + DEBUG_MSG_LEVEL (DEPEND, nullptr, 1, 0, + "Skipping lookup %u (no features)", i); + continue; + } + DEBUG_MSG_LEVEL (DEPEND, nullptr, 1, 0, + "Processing lookup %u with features:", i); + c.lookup_index = i; + c.reset_recurse_cache (); + c.lookups_seen.clear (); + c.lookups_seen.add (i); /* Seed for A→B→A cycle detection in recurse(). */ + this->table->get_lookup (i).depend (&c); + } +} + +} /* namespace OT */ #endif /* HB_OT_LAYOUT_GSUB_TABLE_HH */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh index a2a45af9e760..eed4817e5f04 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh @@ -36,6 +36,7 @@ #include "hb-ot-map.hh" #include "hb-ot-layout-common.hh" #include "hb-ot-layout-gdef-table.hh" +#include "hb-depend-data.hh" namespace OT { @@ -105,9 +106,12 @@ struct hb_closure_context_t : return true; /* Have we visited this lookup with the current set of glyphs? */ - if (done_lookups_glyph_count->get (lookup_index) != glyphs->get_population ()) + unsigned pop = glyphs->get_population (); + if (unlikely (pop == HB_MAP_VALUE_INVALID)) // Avoid sentinel interference. + pop--; + if (done_lookups_glyph_count->get (lookup_index) != pop) { - done_lookups_glyph_count->set (lookup_index, glyphs->get_population ()); + done_lookups_glyph_count->set (lookup_index, pop); if (!done_lookups_glyph_set->has (lookup_index)) { @@ -375,7 +379,417 @@ struct hb_collect_glyphs_context_t : void set_recurse_func (recurse_func_t func) { recurse_func = func; } }; +struct hb_depend_context_t : + hb_dispatch_context_t +{ + enum glyph_set_type_t + { + GLYPH_SET_CLASS, + GLYPH_SET_COVERAGE, + GLYPH_SET_SINGLE + }; + + static constexpr hb_codepoint_t SINGLE_GLYPH_ACTIVE_FLAG = 0x80000000u; + + struct glyph_set_cache_key_t + { + glyph_set_cache_key_t () = default; + glyph_set_cache_key_t (const void *data_, unsigned value_, glyph_set_type_t type_) + : data (data_), value (value_), type (type_) {} + + bool operator == (const glyph_set_cache_key_t &o) const + { return data == o.data && value == o.value && type == o.type; } + + uint32_t hash () const + { + uint32_t current = hb_hash ((uintptr_t) data); + current = current * 31 + hb_hash (value); + return current * 31 + hb_hash ((unsigned) type); + } + + const void *data = nullptr; + unsigned value = 0; + glyph_set_type_t type = GLYPH_SET_CLASS; + }; + + struct context_set_cache_key_t + { + context_set_cache_key_t () = default; + context_set_cache_key_t (const void *rule_, + const void *record_, + const void *data_, + hb_codepoint_t active_glyphs_, + unsigned value_, + unsigned format_) + : rule (rule_), record (record_), data (data_), active_glyphs (active_glyphs_), + value (value_), format (format_) {} + + bool operator == (const context_set_cache_key_t &o) const + { + return rule == o.rule && + record == o.record && + data == o.data && + active_glyphs == o.active_glyphs && + value == o.value && + format == o.format; + } + + uint32_t hash () const + { + uint32_t current = hb_hash ((uintptr_t) rule); + current = current * 31 + hb_hash ((uintptr_t) record); + current = current * 31 + hb_hash ((uintptr_t) data); + current = current * 31 + hb_hash (active_glyphs); + current = current * 31 + hb_hash (value); + return current * 31 + hb_hash (format); + } + + const void *rule = nullptr; + const void *record = nullptr; + const void *data = nullptr; + hb_codepoint_t active_glyphs = HB_CODEPOINT_INVALID; + unsigned value = 0; + unsigned format = 0; + }; + + struct recurse_key_t + { + recurse_key_t () = default; + recurse_key_t (unsigned lookup_index_, + hb_codepoint_t active_glyphs_, + hb_codepoint_t recurse_path_, + hb_codepoint_t context_set_) + : lookup_index (lookup_index_), + active_glyphs (active_glyphs_), + recurse_path (recurse_path_), + context_set (context_set_) {} + + bool operator == (const recurse_key_t &o) const + { + return lookup_index == o.lookup_index && + active_glyphs == o.active_glyphs && + recurse_path == o.recurse_path && + context_set == o.context_set; + } + + uint32_t hash () const + { + uint32_t current = 0x84222325; + current = (current ^ hb_hash (lookup_index)) * 16777619; + current = (current ^ hb_hash (active_glyphs)) * 16777619; + current = (current ^ hb_hash (recurse_path)) * 16777619; + current = (current ^ hb_hash (context_set)) * 16777619; + return current; + } + + unsigned lookup_index = 0; + hb_codepoint_t active_glyphs = 0; + hb_codepoint_t recurse_path = 0; + hb_codepoint_t context_set = HB_CODEPOINT_INVALID; + }; + + typedef return_t (*recurse_func_t) (hb_depend_context_t *c, unsigned lookup_index, hb_bit_page_t *covered_seq_indices, unsigned seq_index, unsigned end_index); + /* return_t is hb_empty_t — dispatch is purely for side-effects, like hb_closure_context_t. */ + template + return_t dispatch (const T &obj) { obj.depend (this); return hb_empty_t (); } + static return_t default_return_value () { return hb_empty_t (); } + + void recurse (unsigned lookup_idx, hb_bit_page_t *covered_seq_indices, unsigned seq_index, unsigned end_index) + { + /* Cycle detection using call-stack semantics: block re-entry of a + * lookup that is currently on the execution stack, but allow it again + * once it has returned. + * + * A flat "visited" set would be wrong: the same lookup legitimately + * appears more than once when a rule iterates over multiple sequence + * positions — each such call is independent and must be processed. + * + * Cutting an in-progress cycle is safe because the active glyph set + * can only stay the same or shrink as we recurse. If we re-encounter + * lookup L while it is still on the stack, L is already executing + * with a context at least as broad, so any edges a re-entry would add + * are a subset of what L is already in the process of registering. + * + * lookups_seen is pre-seeded with the top-level lookup index in + * GSUB_accelerator_t::depend before the direct depend() call, so + * that indirect cycles of the form A→B→A are also caught here. */ + if (lookups_seen.has (lookup_idx)) return; + lookups_seen.add (lookup_idx); + + /* Intern the ordered recursion path instead of copying and interning the + * lookups_seen set. Path identity is more specific than set identity but + * never merges states with different cycle-detection behavior. */ + hb_codepoint_t parent_path = recurse_path; + uint64_t path_key = (uint64_t) parent_path << 32 | lookup_idx; + hb_codepoint_t *path = nullptr; + hb_codepoint_t path_index; + if (!recurse_path_to_index.has (path_key, &path)) + { + path_index = recurse_path_to_index.get_population () + 1; + if (unlikely (!recurse_path_to_index.set (path_key, path_index))) + { + depend_data->fail (); + lookups_seen.del (lookup_idx); + return; + } + } + else + path_index = *path; + recurse_path = path_index; + recurse_func (this, lookup_idx, covered_seq_indices, seq_index, end_index); + recurse_path = parent_path; + lookups_seen.del (lookup_idx); + } + + struct active_glyphs_frame_t + { + hb_set_t glyphs; + hb_codepoint_t active_idx = HB_CODEPOINT_INVALID; + bool use_root = false; + }; + + const hb_set_t& parent_active_glyphs () + { + if (!active_glyphs_stack_depth) + return *glyphs; + + const active_glyphs_frame_t &frame = active_glyphs_stack[active_glyphs_stack_depth - 1]; + return frame.use_root ? *glyphs : frame.glyphs; + } + + hb_set_t* push_cur_active_glyphs (hb_codepoint_t active_idx = HB_CODEPOINT_INVALID) + { + if (active_glyphs_stack_depth == active_glyphs_stack.length && + unlikely (!active_glyphs_stack.push_or_fail ())) + return nullptr; + + active_glyphs_frame_t &frame = active_glyphs_stack[active_glyphs_stack_depth++]; + frame.glyphs.clear (); + frame.active_idx = active_idx; + frame.use_root = false; + return &frame.glyphs; + } + + bool push_root_active_glyphs () + { + if (active_glyphs_stack_depth == active_glyphs_stack.length && + unlikely (!active_glyphs_stack.push_or_fail ())) + return false; + + active_glyphs_stack[active_glyphs_stack_depth++].use_root = true; + return true; + } + + bool pop_cur_done_glyphs () + { + if (!active_glyphs_stack_depth) + return false; + + active_glyphs_stack_depth--; + return true; + } + + bool get_parent_active_glyphs_index (hb_codepoint_t *active_idx) + { + if (!active_glyphs_stack_depth || + active_glyphs_stack[active_glyphs_stack_depth - 1].use_root) + { + *active_idx = HB_CODEPOINT_INVALID; + return true; + } + + active_glyphs_frame_t &frame = active_glyphs_stack[active_glyphs_stack_depth - 1]; + *active_idx = frame.active_idx; + if (*active_idx != HB_CODEPOINT_INVALID) + return true; + + hb_codepoint_t glyph; + if (frame.glyphs.get_singleton (&glyph) && + likely (glyph < SINGLE_GLYPH_ACTIVE_FLAG)) + *active_idx = glyph | SINGLE_GLYPH_ACTIVE_FLAG; + else if (!find_or_create_recurse_set (frame.glyphs, active_idx)) + return false; + + frame.active_idx = *active_idx; + return true; + } + + bool get_context_set_cache_key (const void *rule, + const void *record, + const void *data, + unsigned value, + unsigned format, + context_set_cache_key_t *key) + { + hb_codepoint_t active_idx; + if (!get_parent_active_glyphs_index (&active_idx)) + return false; + *key = context_set_cache_key_t (rule, record, data, active_idx, value, format); + return true; + } + + bool get_recurse_key (unsigned lookup_idx, recurse_key_t *key) + { + /* The active glyphs and in-progress lookup set are part of the state. + * Omitting the latter would make memoization incorrect for cyclic lookup + * graphs whose available recursive paths depend on their ancestry. + * Edge flags are not part of the state: they affect neither traversal nor + * edge identity, so revisiting with different flags can only find edges + * that the deduplication table already contains. */ + hb_codepoint_t active_idx; + if (!get_parent_active_glyphs_index (&active_idx)) + return false; + + *key = recurse_key_t (lookup_idx, + active_idx, + recurse_path, + depend_data->current_context_set_index); + return !completed_recursions.has (*key); + } + + void finish_recurse (const recurse_key_t &key) + { depend_data->check_success (completed_recursions.set (key, true)); } + + void reset_recurse_cache () + { + completed_recursions.clear (); + recurse_path_to_index.clear (); + recurse_path = 0; + } + + bool find_or_create_recurse_set (const hb_set_t &set, hb_codepoint_t *index) + { + hb_codepoint_t *existing = nullptr; + if (recurse_set_to_index.has (&set, &existing)) + { + *index = *existing; + return true; + } + + hb_set_t *copy = hb_object_create (); + if (unlikely (!copy)) + return depend_data->fail (); + copy->set (set); + if (unlikely (copy->in_error ())) + { + hb_set_destroy (copy); + return depend_data->fail (); + } + + *index = recurse_sets.length; + if (unlikely (*index & SINGLE_GLYPH_ACTIVE_FLAG)) + { + hb_set_destroy (copy); + return depend_data->fail (); + } + if (unlikely (!recurse_sets.push_or_fail (hb::unique_ptr {copy}))) + return depend_data->fail (); + if (unlikely (!recurse_set_to_index.set (recurse_sets[*index].get (), *index))) + return depend_data->fail (); + return true; + } + + const hb_set_t *find_or_create_glyph_set (const void *data, + unsigned value, + glyph_set_type_t type); + hb_codepoint_t find_or_create_cached_context_set (const hb_set_t *set); + + struct depend_scratch_t + { + void clear () + { + preliminary_context.clear (); + position_scratch.clear (); + pos_glyphs.clear (); + position_context.clear (); + disjunctive_indices.clear (); + filtered_disjunctive_indices.clear (); + backtrack_sets.clear (); + lookahead_sets.clear (); + input_position_glyphs.clear (); + cached_context_sets.clear (); + compact_workspace.clear (); + } + + hb_set_t preliminary_context; + hb_set_t position_scratch; + hb_set_t pos_glyphs; + hb_set_t position_context; + hb_set_t disjunctive_indices; + hb_set_t filtered_disjunctive_indices; + hb_vector_t backtrack_sets; + hb_vector_t lookahead_sets; + hb_vector_t input_position_glyphs; + hb_vector_t cached_context_sets; + hb_vector_t compact_workspace; + depend_scratch_t *next = nullptr; + }; + + depend_scratch_t *acquire_depend_scratch () + { + depend_scratch_t *scratch = depend_scratch_pool; + if (scratch) + depend_scratch_pool = scratch->next; + else + { + scratch = (depend_scratch_t *) hb_malloc (sizeof (depend_scratch_t)); + if (unlikely (!scratch)) + { + depend_data->fail (); + return nullptr; + } + new (scratch) depend_scratch_t (); + } + + scratch->next = nullptr; + scratch->clear (); + return scratch; + } + + void release_depend_scratch (depend_scratch_t *scratch) + { + scratch->next = depend_scratch_pool; + depend_scratch_pool = scratch; + } + hb_depend_data_builder_t *depend_data; + hb_face_t *face; + hb_set_t *glyphs; + hb_vector_t active_glyphs_stack; + unsigned active_glyphs_stack_depth = 0; + recurse_func_t recurse_func; + hb_codepoint_t lookup_index = HB_CODEPOINT_INVALID; + hb_bit_set_t lookups_seen; + hb_vector_t> recurse_sets; + hb_hashmap_t recurse_set_to_index; + hb_hashmap_t recurse_path_to_index; + hb_codepoint_t recurse_path = 0; + hb_hashmap_t completed_recursions; + hb_vector_t> glyph_sets; + hb_hashmap_t glyph_set_to_index; + hb_hashmap_t cached_context_set_indices; + hb_hashmap_t context_set_cache; + depend_scratch_t *depend_scratch_pool = nullptr; + + hb_depend_context_t (hb_depend_data_builder_t *depend_data_, + hb_face_t *face_, + hb_set_t *glyphs_) + : depend_data (depend_data_), + face(face_), + glyphs (glyphs_), + recurse_func (nullptr) {} + ~hb_depend_context_t () + { + while (depend_scratch_pool) + { + depend_scratch_t *scratch = depend_scratch_pool; + depend_scratch_pool = scratch->next; + scratch->~depend_scratch_t (); + hb_free (scratch); + } + } + void set_recurse_func (recurse_func_t func) { recurse_func = func; } +}; template struct hb_collect_coverage_context_t : @@ -481,6 +895,33 @@ struct matcher_t const void *match_data = nullptr; }; +/* A view of 16- or 24-bit glyph IDs or coverage offsets. */ +struct glyph_data_t +{ + template + glyph_data_t (const T *data_) : data (data_) +#ifndef HB_NO_BEYOND_64K + , wide (sizeof (T) == 3) +#endif + { + static_assert (sizeof (T) == 2 || sizeof (T) == 3, "invalid glyph data size"); + } + + unsigned operator [] (unsigned i) const + { +#ifndef HB_NO_BEYOND_64K + if (wide) + return ((const HBUINT24 *) data)[i]; +#endif + return ((const HBUINT16 *) data)[i]; + } + + const void *data; +#ifndef HB_NO_BEYOND_64K + bool wide; +#endif +}; + template struct skipping_iterator_t { @@ -503,20 +944,15 @@ struct skipping_iterator_t { matcher.set_match_func (match_func_, match_data_); } - void set_glyph_data (const HBUINT16 glyph_data[]) + void set_glyph_data (glyph_data_t glyph_data) { - match_glyph_data16 = glyph_data; #ifndef HB_NO_BEYOND_64K - match_glyph_data24 = nullptr; + match_glyph_data16 = glyph_data.wide ? nullptr : (const HBUINT16 *) glyph_data.data; + match_glyph_data24 = glyph_data.wide ? (const HBUINT24 *) glyph_data.data : nullptr; +#else + match_glyph_data16 = (const HBUINT16 *) glyph_data.data; #endif } -#ifndef HB_NO_BEYOND_64K - void set_glyph_data (const HBUINT24 glyph_data[]) - { - match_glyph_data16 = nullptr; - match_glyph_data24 = glyph_data; - } -#endif #ifndef HB_OPTIMIZE_SIZE HB_ALWAYS_INLINE @@ -577,9 +1013,6 @@ struct skipping_iterator_t return SKIP; } -#ifndef HB_OPTIMIZE_SIZE - HB_ALWAYS_INLINE -#endif bool next (unsigned *unsafe_to = nullptr) { auto *info = c->buffer->info; @@ -608,9 +1041,6 @@ struct skipping_iterator_t *unsafe_to = end; return false; } -#ifndef HB_OPTIMIZE_SIZE - HB_ALWAYS_INLINE -#endif bool prev (unsigned *unsafe_from = nullptr) { auto *out_info = c->buffer->out_info; @@ -721,7 +1151,6 @@ struct hb_ot_apply_context_t : recurse_func_t recurse_func = nullptr; const GDEF &gdef; const GDEF::accelerator_t &gdef_accel; - const hb_ot_layout_lookup_accelerator_t *lookup_accel = nullptr; const ItemVariationStore &var_store; hb_scalar_cache_t *var_store_cache; @@ -851,7 +1280,10 @@ struct hb_ot_apply_context_t : * match_props has the set index. */ if (match_props & LookupFlag::UseMarkFilteringSet) - return gdef_accel.mark_set_covers (match_props >> 16, info->codepoint); + { + unsigned set_index = match_props >> 16; + return gdef_accel.mark_set_covers (set_index, info->codepoint); + } /* The second byte of match_props has the meaning * "ignore marks of attachment type different than @@ -967,6 +1399,16 @@ enum class hb_ot_subtable_cache_op_t struct hb_accelerate_subtables_context_t : hb_dispatch_context_t { + template + static inline auto collect_second_glyphs_ (const T &obj, + hb_set_digest_t *digest, + hb_priority<1>) HB_RETURN (void, obj.collect_second_glyphs (digest) ) + template + static inline void collect_second_glyphs_ (const T &obj HB_UNUSED, + hb_set_digest_t *digest, + hb_priority<0>) + { *digest = hb_set_digest_t::full (); } + template static inline auto apply_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<1>) HB_RETURN (bool, obj->apply (c, external_cache) ) template @@ -1042,6 +1484,10 @@ struct hb_accelerate_subtables_context_t : { return digest.may_have (c->buffer->cur().codepoint) && apply_func (obj, c, nullptr); } + bool apply_no_digest (hb_ot_apply_context_t *c) const + { + return apply_func (obj, c, nullptr); + } #else bool apply (hb_ot_apply_context_t *c) const { @@ -1051,6 +1497,14 @@ struct hb_accelerate_subtables_context_t : { return digest.may_have (c->buffer->cur().codepoint) && apply_cached_func (obj, c, external_cache); } + bool apply_no_digest (hb_ot_apply_context_t *c) const + { + return apply_func (obj, c, external_cache); + } + bool apply_cached_no_digest (hb_ot_apply_context_t *c) const + { + return apply_cached_func (obj, c, external_cache); + } bool cache_enter (hb_ot_apply_context_t *c) const { @@ -1089,6 +1543,8 @@ struct hb_accelerate_subtables_context_t : template return_t dispatch (const T &obj) { + collect_second_glyphs_ (obj, &digest_second, hb_prioritize); + #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE void *external_cache = nullptr; if (i < 8) @@ -1132,6 +1588,7 @@ struct hb_accelerate_subtables_context_t : hb_applicable_t *array; unsigned i = 0; + hb_set_digest_t digest_second; #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE unsigned subtable_cache_user_idx = (unsigned) -1; @@ -1144,6 +1601,19 @@ typedef bool (*intersects_func_t) (const hb_set_t *glyphs, unsigned value, const typedef void (*intersected_glyphs_func_t) (const hb_set_t *glyphs, const void *data, unsigned value, hb_set_t *intersected_glyphs, void *cache); typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, unsigned value, const void *data); typedef bool (*match_func_t) (hb_glyph_info_t &info, unsigned value, const void *data); +typedef unsigned (*get_value_func_t) (hb_glyph_info_t &info, const void *data); + +/* One word per RuleSet, summarizing the classes accepted at the first + * input position after the current glyph. Collisions only cause extra work. */ +struct hb_ot_layout_ruleset_digest_t +{ + void init () { mask = 0; } + void set_full () { mask = (uint64_t) -1; } + void add (unsigned value) { mask |= (uint64_t) 1 << (value & 63); } + bool may_have (unsigned value) const { return mask & ((uint64_t) 1 << (value & 63)); } + + uint64_t mask; +}; struct ContextClosureFuncs { @@ -1184,7 +1654,7 @@ static inline bool intersects_class (const hb_set_t *glyphs, unsigned value, con } static inline bool intersects_coverage (const hb_set_t *glyphs, unsigned value, const void *data, void *cache HB_UNUSED) { - Offset16To coverage; + Offset32To coverage; coverage = value; return (data+coverage).intersects (glyphs); } @@ -1221,22 +1691,21 @@ static inline void intersected_class_glyphs (const hb_set_t *glyphs, const void static inline void intersected_coverage_glyphs (const hb_set_t *glyphs, const void *data, unsigned value, hb_set_t *intersected_glyphs, HB_UNUSED void *cache) { - Offset16To coverage; + Offset32To coverage; coverage = value; (data+coverage).intersect_set (*glyphs, *intersected_glyphs); } -template static inline bool array_is_subset_of (const hb_set_t *glyphs, unsigned int count, - const HBUINT values[], + glyph_data_t values, intersects_func_t intersects_func, const void *intersects_data, void *cache) { - for (const auto &_ : + hb_iter (values, count)) - if (!intersects_func (glyphs, _, intersects_data, cache)) return false; + for (unsigned i = 0; i < count; i++) + if (!intersects_func (glyphs, values[i], intersects_data, cache)) return false; return true; } @@ -1252,22 +1721,82 @@ static inline void collect_class (hb_set_t *glyphs, unsigned value, const void * } static inline void collect_coverage (hb_set_t *glyphs, unsigned value, const void *data) { - Offset16To coverage; + Offset32To coverage; coverage = value; (data+coverage).collect_coverage (glyphs); } -template + +inline const hb_set_t * +hb_depend_context_t::find_or_create_glyph_set (const void *data, + unsigned value, + glyph_set_type_t type) +{ + /* Class definitions and coverages are immutable for the lifetime of the + * context, so their expanded glyph sets can be shared across traversals. */ + glyph_set_cache_key_t key (data, value, type); + hb_codepoint_t *existing = nullptr; + if (glyph_set_to_index.has (key, &existing)) + return glyph_sets[*existing].get (); + + hb_set_t *set = hb_object_create (); + if (unlikely (!set)) + { + depend_data->fail (); + return nullptr; + } + + if (type == GLYPH_SET_COVERAGE) + collect_coverage (set, value, data); + else if (type == GLYPH_SET_CLASS) + collect_class (set, value, data); + else + set->add (value); + if (unlikely (set->in_error ())) + { + hb_set_destroy (set); + depend_data->fail (); + return nullptr; + } + + hb_codepoint_t index = glyph_sets.length; + if (unlikely (!glyph_sets.push_or_fail (hb::unique_ptr {set}))) + { + depend_data->fail (); + return nullptr; + } + if (unlikely (!glyph_set_to_index.set (key, index))) + { + depend_data->fail (); + return nullptr; + } + return glyph_sets[index].get (); +} + +inline hb_codepoint_t +hb_depend_context_t::find_or_create_cached_context_set (const hb_set_t *set) +{ + uintptr_t key = (uintptr_t) set; + hb_codepoint_t *existing = nullptr; + if (cached_context_set_indices.has (key, &existing)) + return *existing; + + hb_codepoint_t index = depend_data->find_or_create_context_set (*set); + if (unlikely (index == HB_CODEPOINT_INVALID)) + return HB_CODEPOINT_INVALID; + if (unlikely (!cached_context_set_indices.set (key, index))) + return depend_data->fail_invalid (); + return index; +} + static inline void collect_array (hb_collect_glyphs_context_t *c HB_UNUSED, hb_set_t *glyphs, unsigned int count, - const HBUINT values[], + glyph_data_t values, collect_glyphs_func_t collect_func, const void *collect_data) { - return - + hb_iter (values, count) - | hb_apply ([&] (const HBUINT &_) { collect_func (glyphs, _, collect_data); }) - ; + for (unsigned i = 0; i < count; i++) + collect_func (glyphs, values[i], collect_data); } @@ -1284,6 +1813,26 @@ static inline bool match_class (hb_glyph_info_t &info, unsigned value, const voi const ClassDef &class_def = *reinterpret_cast(data); return class_def.get_class (info.codepoint) == value; } +static inline unsigned get_class_value (hb_glyph_info_t &info, const void *data) +{ + const ClassDef &class_def = *reinterpret_cast (data); + return class_def.get_class (info.codepoint); +} +struct match_class_cache_data_t +{ + const ClassDef *class_def; + hb_ot_layout_mapping_cache_t *cache; +}; +static inline bool match_class_cache (hb_glyph_info_t &info, unsigned value, const void *data) +{ + const auto &cache_data = *reinterpret_cast (data); + return cache_data.class_def->get_class (info.codepoint, cache_data.cache) == value; +} +static inline unsigned get_class_cache_value (hb_glyph_info_t &info, const void *data) +{ + const auto &cache_data = *reinterpret_cast (data); + return cache_data.class_def->get_class (info.codepoint, cache_data.cache); +} static inline unsigned get_class_cached (const ClassDef &class_def, hb_glyph_info_t &info) { unsigned klass = info.syllable(); @@ -1299,6 +1848,11 @@ static inline bool match_class_cached (hb_glyph_info_t &info, unsigned value, co const ClassDef &class_def = *reinterpret_cast(data); return get_class_cached (class_def, info) == value; } +static inline unsigned get_class_cached_value (hb_glyph_info_t &info, const void *data) +{ + const ClassDef &class_def = *reinterpret_cast (data); + return get_class_cached (class_def, info); +} static inline unsigned get_class_cached1 (const ClassDef &class_def, hb_glyph_info_t &info) { unsigned klass = info.syllable() & 0x0F; @@ -1329,17 +1883,21 @@ static inline bool match_class_cached2 (hb_glyph_info_t &info, unsigned value, c const ClassDef &class_def = *reinterpret_cast(data); return get_class_cached2 (class_def, info) == value; } +static inline unsigned get_class_cached2_value (hb_glyph_info_t &info, const void *data) +{ + const ClassDef &class_def = *reinterpret_cast (data); + return get_class_cached2 (class_def, info); +} static inline bool match_coverage (hb_glyph_info_t &info, unsigned value, const void *data) { - Offset16To coverage; + Offset32To coverage; coverage = value; return (data+coverage).get_coverage (info.codepoint) != NOT_COVERED; } -template static inline bool would_match_input (hb_would_apply_context_t *c, unsigned int count, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ match_func_t match_func, const void *match_data) { @@ -1356,13 +1914,14 @@ static inline bool would_match_input (hb_would_apply_context_t *c, return true; } -template #ifndef HB_OPTIMIZE_SIZE HB_ALWAYS_INLINE +#else +inline #endif static bool match_input (hb_ot_apply_context_t *c, unsigned int count, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ match_func_t match_func, const void *match_data, unsigned int *end_position, @@ -1484,7 +2043,7 @@ static bool match_input (hb_ot_apply_context_t *c, return_trace (false); } - total_component_count += _hb_glyph_info_get_lig_num_comps (&buffer->info[skippy_iter.idx]); + total_component_count += _hb_glyph_info_get_lig_num_comps_in_ligation (&buffer->info[skippy_iter.idx]); } *end_position = skippy_iter.idx + 1; @@ -1588,7 +2147,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c, } last_lig_id = _hb_glyph_info_get_lig_id (&buffer->cur()); - last_num_components = _hb_glyph_info_get_lig_num_comps (&buffer->cur()); + last_num_components = _hb_glyph_info_get_lig_num_comps_in_ligation (&buffer->cur()); components_so_far += last_num_components; /* Skip the base glyph */ @@ -1614,13 +2173,14 @@ static inline bool ligate_input (hb_ot_apply_context_t *c, return_trace (true); } -template #ifndef HB_OPTIMIZE_SIZE HB_ALWAYS_INLINE +#else +inline #endif static bool match_backtrack (hb_ot_apply_context_t *c, unsigned int count, - const HBUINT backtrack[], + glyph_data_t backtrack, match_func_t match_func, const void *match_data, unsigned int *match_start) @@ -1652,13 +2212,14 @@ static bool match_backtrack (hb_ot_apply_context_t *c, return_trace (true); } -template #ifndef HB_OPTIMIZE_SIZE HB_ALWAYS_INLINE +#else +inline #endif static bool match_lookahead (hb_ot_apply_context_t *c, unsigned int count, - const HBUINT lookahead[], + glyph_data_t lookahead, match_func_t match_func, const void *match_data, unsigned int start_index, @@ -1720,9 +2281,9 @@ struct LookupRecord DEFINE_SIZE_STATIC (4); }; -static unsigned serialize_lookuprecord_array (hb_serialize_context_t *c, - const hb_array_t lookupRecords, - const hb_map_t *lookup_map) +static inline unsigned serialize_lookuprecord_array (hb_serialize_context_t *c, + const hb_array_t lookupRecords, + const hb_map_t *lookup_map) { unsigned count = 0; for (const LookupRecord& r : lookupRecords) @@ -1740,9 +2301,47 @@ static unsigned serialize_lookuprecord_array (hb_serialize_context_t *c, enum ContextFormat { SimpleContext = 1, ClassBasedContext = 2, CoverageBasedContext = 3 }; -template -static void context_closure_recurse_lookups (hb_closure_context_t *c, - unsigned inputCount, const HBUINT input[], +static inline const hb_set_t * +depend_position_glyphs (hb_depend_context_t *c, + ContextFormat context_format, + const void *data, + unsigned value, + bool filter_class_by_parent, + hb_set_t *scratch, + hb_vector_t *compact_workspace = nullptr) +{ + switch (context_format) + { + case ContextFormat::SimpleContext: + return c->find_or_create_glyph_set (nullptr, value, + hb_depend_context_t::GLYPH_SET_SINGLE); + case ContextFormat::ClassBasedContext: + { + const hb_set_t *class_set = c->find_or_create_glyph_set ( + data, value, hb_depend_context_t::GLYPH_SET_CLASS); + if (unlikely (!class_set)) + return nullptr; + if (!filter_class_by_parent) + return class_set; + scratch->set (*class_set); + scratch->intersect (c->parent_active_glyphs (), compact_workspace); + break; + } + case ContextFormat::CoverageBasedContext: + return c->find_or_create_glyph_set ( + data, value, hb_depend_context_t::GLYPH_SET_COVERAGE); + } + + if (unlikely (scratch->in_error ())) + { + c->depend_data->fail (); + return nullptr; + } + return scratch; +} + +static inline void context_closure_recurse_lookups (hb_closure_context_t *c, + unsigned inputCount, glyph_data_t input, unsigned lookupCount, const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */, unsigned value, @@ -1780,7 +2379,7 @@ static void context_closure_recurse_lookups (hb_closure_context_t *c, } else { - const void *input_data = input; + const void *input_data = input.data; unsigned input_value = seqIndex - 1; if (context_format != ContextFormat::SimpleContext) { @@ -1812,32 +2411,320 @@ static void context_closure_recurse_lookups (hb_closure_context_t *c, } } -template -static inline void recurse_lookups (context_t *c, - unsigned int lookupCount, - const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */) -{ - for (unsigned int i = 0; i < lookupCount; i++) - c->recurse (lookupRecord[i].lookupListIndex); -} - -static inline void apply_lookup (hb_ot_apply_context_t *c, - unsigned int count, /* Including the first glyph */ - unsigned int lookupCount, - const LookupRecord lookupRecord[], /* Array of LookupRecords--in design order */ - unsigned int match_end) +static bool +context_depend_sets_are_cached (hb_depend_context_t *c, + unsigned input_count, + unsigned lookup_count, + const LookupRecord lookup_records[], + const void *rule, + unsigned value, + ContextFormat context_format, + const void *data, + hb_vector_t *cached_context_sets) { - hb_buffer_t *buffer = c->buffer; - int end; - - /* All positions are distance from beginning of *output* buffer. - * Adjust. */ + hb_codepoint_t active_idx = HB_CODEPOINT_INVALID; + bool have_active_idx = false; + for (unsigned i = 0; i < lookup_count; i++) { - unsigned int bl = buffer->backtrack_len (); - end = bl + match_end - buffer->idx; + if (lookup_records[i].sequenceIndex >= input_count) + continue; - int delta = bl - buffer->idx; - /* Convert positions to new indexing. */ + if (!have_active_idx) + { + if (unlikely (!c->get_parent_active_glyphs_index (&active_idx))) + return false; + have_active_idx = true; + } + + hb_depend_context_t::context_set_cache_key_t key ( + rule, &lookup_records[i], data, active_idx, value, context_format); + hb_codepoint_t *cached_context_set = nullptr; + if (!c->context_set_cache.has (key, &cached_context_set)) + return false; + if (unlikely (!cached_context_sets->push_or_fail (*cached_context_set))) + return c->depend_data->fail (); + } + /* A rule with no valid records has no cache entries, and its preparation + * can still allocate dependency sets in an observable order. */ + return have_active_idx; +} + +static inline void context_depend_recurse_lookups (hb_depend_context_t *c, + unsigned inputCount, glyph_data_t input, + unsigned lookupCount, + const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */, + const void *rule, + unsigned value, + ContextFormat context_format, + const void *data, + intersected_glyphs_func_t intersected_glyphs_func, + void *cache, + const hb_set_t &preliminary_context, + const hb_vector_t *input_position_glyphs, + const hb_vector_t *cached_context_sets, + hb_depend_context_t::depend_scratch_t *scratch) +{ + /* For depend graph extraction, we filter active glyphs by InputCoverage constraints + * (same as closure), but we do NOT do sequential accumulation of outputs. + * + * - Position filtering (InputCoverage): Required. The contextual rule can only match + * glyphs in its InputCoverage. Edges for other glyphs are spurious. + * - Sequential accumulation: Not done. We want ALL possible edges, so we don't + * limit later lookups based on outputs from earlier lookups in the same rule. */ + + /* Sequence positions are tracked in one allocation-free bit page below. + * A rule longer than HB_MAX_CONTEXT_LENGTH never applies during shaping + * (the apply path rejects it), so skip it here instead of running past + * the fixed page in add_range(). */ + if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) + return; + + hb_bit_page_t covered_seq_indices; + hb_set_t &pos_glyphs = scratch->pos_glyphs; + hb_set_t &position_context = scratch->position_context; + hb_set_t &disjunctive_indices = scratch->disjunctive_indices; + hb_set_t &filtered_disjunctive_indices = scratch->filtered_disjunctive_indices; + unsigned cached_context_index = 0; + for (unsigned int i = 0; i < lookupCount; i++) + { + unsigned seqIndex = lookupRecord[i].sequenceIndex; + if (seqIndex >= inputCount) + continue; + + hb_depend_context_t::context_set_cache_key_t context_cache_key; + if (unlikely (!c->get_context_set_cache_key (rule, &lookupRecord[i], data, value, + context_format, &context_cache_key))) + return; + + hb_codepoint_t context_set_idx; + hb_codepoint_t *cached_context_set_idx; + if (cached_context_sets) + context_set_idx = (*cached_context_sets)[cached_context_index++]; + else if (c->context_set_cache.has (context_cache_key, &cached_context_set_idx)) + context_set_idx = *cached_context_set_idx; + else + { + if (unlikely (!input_position_glyphs)) + { + c->depend_data->fail (); + return; + } + + /* Build position-specific context_set for this lookup. */ + position_context.clear (); // Will hold direct glyphs + disjunctive_indices.clear (); // Will hold encoded set references + filtered_disjunctive_indices.clear (); + + /* Process preliminary_context in one pass. */ + hb_codepoint_t elem = HB_SET_VALUE_INVALID; + while (preliminary_context.next (&elem)) { + if (!(elem & HB_DEPEND_CONTEXT_SET_FLAG)) { + /* Direct glyph */ + position_context.add (elem); + } else { + /* Encoded set reference - defer processing until we have all direct requirements */ + disjunctive_indices.add (elem); + } + } + + /* Add singleton glyphs from OTHER input positions. */ + for (unsigned j = 0; j < input_position_glyphs->length; j++) { + if (j != seqIndex && (*input_position_glyphs)[j]->get_population () == 1) { + position_context.add ((*input_position_glyphs)[j]->get_min ()); + } + } + + /* Now position_context has all direct requirements. + * Process deferred encoded sets and filter them. */ + elem = HB_SET_VALUE_INVALID; + while (disjunctive_indices.next (&elem)) { + hb_codepoint_t set_idx = elem & 0x7FFFFFFF; + const hb_set_t *original_set = c->depend_data->get_set_from_index (set_idx); + if (unlikely (!original_set)) continue; + + /* Dependency context sets are never inverted. */ + if (!original_set->intersects (position_context)) { + /* No overlap with position_context - add full requirement */ + filtered_disjunctive_indices.add (elem); + } + /* Otherwise: position_context intersects with original_set. + * Since disjunctive requirements need only ONE glyph from the set, + * and position_context already has a glyph from this set, the + * requirement is satisfied - no need to add anything. */ + } + + /* Process non-singleton input positions. */ + for (unsigned j = 0; j < input_position_glyphs->length; j++) { + if (j != seqIndex && (*input_position_glyphs)[j]->get_population () > 1) { + /* Input-position sets are also never inverted. */ + if (!(*input_position_glyphs)[j]->intersects (position_context)) { + /* No overlap with position_context - add full requirement */ + bool cached_set = context_format == ContextFormat::CoverageBasedContext || + (context_format == ContextFormat::ClassBasedContext && j != 0); + hb_codepoint_t idx = cached_set + ? c->find_or_create_cached_context_set ((*input_position_glyphs)[j]) + : c->depend_data->find_or_create_context_set (*(*input_position_glyphs)[j]); + if (unlikely (idx == HB_CODEPOINT_INVALID)) + return; + filtered_disjunctive_indices.add (HB_DEPEND_CONTEXT_SET_FLAG | idx); + } + /* Otherwise: position_context intersects, requirement satisfied */ + } + } + + /* Combine direct + disjunctive. */ + position_context.union_ (filtered_disjunctive_indices); + if (unlikely (position_context.in_error () || + filtered_disjunctive_indices.in_error ())) + { + c->depend_data->fail (); + return; + } + + context_set_idx = position_context.is_empty () + ? HB_CODEPOINT_INVALID + : c->depend_data->find_or_create_context_set (position_context); + if (unlikely (!position_context.is_empty () && + context_set_idx == HB_CODEPOINT_INVALID)) + return; + + if (unlikely (!c->context_set_cache.set (context_cache_key, context_set_idx))) + { + c->depend_data->fail (); + return; + } + } + + /* Save outer context to restore after this lookup. When a contextual lookup + * calls another contextual lookup, we want each lookup in this rule to see + * the same outer context, not context from a sibling lookup. */ + hb_codepoint_t saved_context_set_index = c->depend_data->current_context_set_index; + hb_subset_depend_edge_flags_t saved_edge_flags = c->depend_data->current_edge_flags; + + /* Detect nested contextual: if we already have a context set, we're inside + * an outer contextual rule that called this one. The outer context will be + * lost, so edges created here may over-approximate. */ + bool nested_contextual = (saved_context_set_index != HB_CODEPOINT_INVALID); + + /* Set for this position's edges */ + c->depend_data->current_context_set_index = context_set_idx; + + /* Mark edges from multi-position rules (inputCount > 1) as potentially + * over-approximate. Depend extraction records edges based on what glyphs + * COULD be at each position per the static input coverage/class. But during + * closure computation, lookups within the rule are applied sequentially: + * lookups at earlier positions may transform later positions, and multiple + * lookups at the same position may interact (one produces a glyph, another + * immediately consumes it as an "intermediate"). So a glyph matching the + * coverage might not persist at that position when closure traverses. */ + c->depend_data->current_edge_flags = HB_SUBSET_DEPEND_EDGE_FLAG_NONE; + if (inputCount > 1) { + c->depend_data->current_edge_flags |= HB_SUBSET_DEPEND_EDGE_FLAG_FROM_CONTEXT_POSITION; + } + if (nested_contextual) { + c->depend_data->current_edge_flags |= HB_SUBSET_DEPEND_EDGE_FLAG_FROM_NESTED_CONTEXT; + } + + bool has_pos_glyphs = false; + + if (!covered_seq_indices.has (seqIndex)) + { + has_pos_glyphs = true; + pos_glyphs.clear (); + if (seqIndex == 0) + { + switch (context_format) { + case ContextFormat::SimpleContext: + pos_glyphs.add (value); + break; + case ContextFormat::ClassBasedContext: + intersected_glyphs_func (&c->parent_active_glyphs (), data, value, &pos_glyphs, cache); + break; + case ContextFormat::CoverageBasedContext: + pos_glyphs.set (c->parent_active_glyphs ()); + break; + } + } + else + { + const void *input_data = input.data; + unsigned input_value = seqIndex - 1; + if (context_format != ContextFormat::SimpleContext) + { + input_data = data; + input_value = input[seqIndex - 1]; + } + + intersected_glyphs_func (c->glyphs, input_data, input_value, &pos_glyphs, cache); + } + } + + covered_seq_indices.add (seqIndex); + if (has_pos_glyphs) + { + hb_codepoint_t active_idx = HB_CODEPOINT_INVALID; + if (context_format == ContextFormat::SimpleContext) + { + hb_codepoint_t glyph = seqIndex ? pos_glyphs.get_min () : value; + if (likely (glyph < hb_depend_context_t::SINGLE_GLYPH_ACTIVE_FLAG)) + active_idx = glyph | hb_depend_context_t::SINGLE_GLYPH_ACTIVE_FLAG; + } + hb_set_t *cur_active_glyphs = c->push_cur_active_glyphs (active_idx); + if (unlikely (!cur_active_glyphs)) + { + c->depend_data->current_context_set_index = saved_context_set_index; + c->depend_data->current_edge_flags = saved_edge_flags; + return; + } + *cur_active_glyphs = std::move (pos_glyphs); + } + else if (unlikely (!c->push_root_active_glyphs ())) + { + c->depend_data->current_context_set_index = saved_context_set_index; + c->depend_data->current_edge_flags = saved_edge_flags; + return; + } + + unsigned endIndex = inputCount; + if (context_format == ContextFormat::CoverageBasedContext) + endIndex += 1; + + c->recurse (lookupRecord[i].lookupListIndex, &covered_seq_indices, seqIndex, endIndex); + c->pop_cur_done_glyphs (); + + /* Restore outer context after this lookup, so subsequent lookups in this + * rule see the original context rather than this lookup's context. */ + c->depend_data->current_context_set_index = saved_context_set_index; + c->depend_data->current_edge_flags = saved_edge_flags; + } +} + +template +static inline void recurse_lookups (context_t *c, + unsigned int lookupCount, + const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */) +{ + for (unsigned int i = 0; i < lookupCount; i++) + c->recurse (lookupRecord[i].lookupListIndex); +} + +static inline void apply_lookup (hb_ot_apply_context_t *c, + unsigned int count, /* Including the first glyph */ + unsigned int lookupCount, + const LookupRecord lookupRecord[], /* Array of LookupRecords--in design order */ + unsigned int match_end) +{ + hb_buffer_t *buffer = c->buffer; + int end; + + /* All positions are distance from beginning of *output* buffer. + * Adjust. */ + { + unsigned int bl = buffer->backtrack_len (); + end = bl + match_end - buffer->idx; + + int delta = bl - buffer->idx; + /* Convert positions to new indexing. */ for (unsigned int j = 0; j < count; j++) c->match_positions.arrayZ[j] += delta; } @@ -1978,6 +2865,8 @@ struct ContextClosureLookupContext void *intersected_glyphs_cache; }; +typedef ContextClosureLookupContext ContextDependLookupContext; + struct ContextCollectGlyphsLookupContext { ContextCollectGlyphsFuncs funcs; @@ -1988,12 +2877,12 @@ struct ContextApplyLookupContext { ContextApplyFuncs funcs; const void *match_data; + get_value_func_t get_value; }; -template static inline bool context_intersects (const hb_set_t *glyphs, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ ContextClosureLookupContext &lookup_context) { return array_is_subset_of (glyphs, @@ -2003,10 +2892,9 @@ static inline bool context_intersects (const hb_set_t *glyphs, lookup_context.intersects_cache); } -template static inline void context_closure_lookup (hb_closure_context_t *c, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookupCount, const LookupRecord lookupRecord[], unsigned value, /* Index of first glyph in Coverage or Class value in ClassDef table */ @@ -2025,10 +2913,88 @@ static inline void context_closure_lookup (hb_closure_context_t *c, lookup_context.intersected_glyphs_cache); } -template +static inline void context_depend_lookup (hb_depend_context_t *c, + unsigned int inputCount, /* Including the first glyph (not matched) */ + glyph_data_t input, /* Array of input values--start with second glyph */ + unsigned int lookupCount, + const LookupRecord lookupRecord[], + const void *rule, + unsigned value, /* Index of first glyph in Coverage or Class value in ClassDef table */ + ContextDependLookupContext &lookup_context) +{ + if (!context_intersects (c->glyphs, + inputCount, input, + lookup_context)) + return; + + hb_depend_context_t::depend_scratch_t *scratch = c->acquire_depend_scratch (); + if (unlikely (!scratch)) + return; + HB_SCOPE_GUARD (c->release_depend_scratch (scratch)); + + bool context_sets_cached = context_depend_sets_are_cached ( + c, inputCount, lookupCount, lookupRecord, rule, value, + lookup_context.context_format, lookup_context.intersects_data, + &scratch->cached_context_sets); + if (unlikely (!c->depend_data->successful)) + return; + + /* Build preliminary_context (empty for ContextSubst - no backtrack/lookahead) */ + hb_set_t &preliminary_context = scratch->preliminary_context; + + /* Build glyph sets for ALL input positions */ + hb_set_t &position_scratch = scratch->position_scratch; + hb_vector_t &input_position_glyphs = scratch->input_position_glyphs; + + /* Cached labels no longer need the expanded input-position sets. */ + if (!context_sets_cached) + { + /* Position 0 (Coverage glyph) — must be in both the class AND the + * coverage, so intersect with parent_active_glyphs (= coverage ∩ glyphs + * set by the ContextFormat2/3 caller). */ + const hb_set_t *pos0_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data, value, + true, &position_scratch, &scratch->compact_workspace); + if (unlikely (!pos0_glyphs || + !input_position_glyphs.push_or_fail (pos0_glyphs))) + { + c->depend_data->fail (); + return; + } + + /* Positions 1+ (Input array) */ + for (unsigned i = 0; i + 1 < inputCount; i++) + { + const hb_set_t *pos_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data, + input[i], false, &position_scratch); + if (unlikely (!pos_glyphs || + !input_position_glyphs.push_or_fail (pos_glyphs))) + { + c->depend_data->fail (); + return; + } + } + } + + context_depend_recurse_lookups (c, + inputCount, input, + lookupCount, lookupRecord, + rule, + value, + lookup_context.context_format, + lookup_context.intersects_data, + lookup_context.funcs.intersected_glyphs, + lookup_context.intersected_glyphs_cache, + preliminary_context, + context_sets_cached ? nullptr : &input_position_glyphs, + context_sets_cached ? &scratch->cached_context_sets : nullptr, + scratch); +} + static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookupCount, const LookupRecord lookupRecord[], ContextCollectGlyphsLookupContext &lookup_context) @@ -2040,10 +3006,9 @@ static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c lookupCount, lookupRecord); } -template static inline bool context_would_apply_lookup (hb_would_apply_context_t *c, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookupCount HB_UNUSED, const LookupRecord lookupRecord[] HB_UNUSED, const ContextApplyLookupContext &lookup_context) @@ -2053,10 +3018,9 @@ static inline bool context_would_apply_lookup (hb_would_apply_context_t *c, lookup_context.funcs.match, lookup_context.match_data); } -template static inline bool context_apply_lookup (hb_ot_apply_context_t *c, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookupCount, const LookupRecord lookupRecord[], const ContextApplyLookupContext &lookup_context) @@ -2114,8 +3078,8 @@ static inline bool context_cache_func (hb_ot_apply_context_t *c, hb_ot_subtable_ template struct Rule { - template - friend struct RuleSet; + template + friend struct RuleSetOf; bool intersects (const hb_set_t *glyphs, ContextClosureLookupContext &lookup_context) const { @@ -2124,6 +3088,17 @@ struct Rule lookup_context); } + void depend (hb_depend_context_t *c, unsigned value, ContextDependLookupContext &lookup_context) const + { + const auto &lookupRecord = StructAfter> + (inputZ.as_array ((inputCount ? inputCount - 1 : 0))); + context_depend_lookup (c, + inputCount, inputZ.arrayZ, + lookupCount, lookupRecord.arrayZ, + this, + value, lookup_context); + } + void closure (hb_closure_context_t *c, unsigned value, ContextClosureLookupContext &lookup_context) const { if (unlikely (c->lookup_limit_exceeded ())) return; @@ -2158,6 +3133,24 @@ struct Rule lookup_context); } + void collect_second_glyphs (hb_set_digest_t *digest, + const ClassDef *class_def = nullptr) const + { + if (inputCount <= 1) + { + *digest = hb_set_digest_t::full (); + return; + } + + unsigned second = inputZ.arrayZ[0]; + if (!class_def) + digest->add (second); + else if (!second) + *digest = hb_set_digest_t::full (); + else + class_def->collect_class (digest, second); + } + bool would_apply (hb_would_apply_context_t *c, const ContextApplyLookupContext &lookup_context) const { @@ -2190,7 +3183,7 @@ struct Rule const auto input = inputZ.as_array (inputCount - 1); for (const auto org : input) { - HBUINT16 d; + typename Types::HBUINT d; d = input_mapping->get (org); c->copy (d); } @@ -2241,22 +3234,43 @@ struct Rule DEFINE_SIZE_ARRAY (4, inputZ); }; -template -struct RuleSet +template +struct RuleSetOf { - using Rule = OT::Rule; - bool intersects (const hb_set_t *glyphs, ContextClosureLookupContext &lookup_context) const { return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const Rule &_) { return _.intersects (glyphs, lookup_context); }) + | hb_map ([&] (const RuleType &_) { return _.intersects (glyphs, lookup_context); }) | hb_any ; } + void collect_first_input_classes (hb_ot_layout_ruleset_digest_t *digest) const + { + digest->init (); + for (unsigned i = 0; i < rule.len; i++) + { + const RuleType &r = this+rule.arrayZ[i]; + if (r.inputCount <= 1) + { + digest->set_full (); + return; + } + digest->add (r.inputZ.arrayZ[0]); + } + } + + void depend (hb_depend_context_t *c, unsigned value, ContextDependLookupContext &lookup_context) const + { + + hb_iter (rule) + | hb_map (hb_add (this)) + | hb_apply ([&] (const RuleType &_) { _.depend (c, value, lookup_context); }) + ; + } + void closure (hb_closure_context_t *c, unsigned value, ContextClosureLookupContext &lookup_context) const { @@ -2265,7 +3279,7 @@ struct RuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const Rule &_) { _.closure (c, value, lookup_context); }) + | hb_apply ([&] (const RuleType &_) { _.closure (c, value, lookup_context); }) ; } @@ -2275,7 +3289,7 @@ struct RuleSet if (unlikely (c->lookup_limit_exceeded ())) return; + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const Rule &_) { _.closure_lookups (c, lookup_context); }) + | hb_apply ([&] (const RuleType &_) { _.closure_lookups (c, lookup_context); }) ; } @@ -2285,7 +3299,16 @@ struct RuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const Rule &_) { _.collect_glyphs (c, lookup_context); }) + | hb_apply ([&] (const RuleType &_) { _.collect_glyphs (c, lookup_context); }) + ; + } + + void collect_second_glyphs (hb_set_digest_t *digest, + const ClassDef *class_def = nullptr) const + { + + hb_iter (rule) + | hb_map (hb_add (this)) + | hb_apply ([=] (const RuleType &_) { _.collect_second_glyphs (digest, class_def); }) ; } @@ -2295,13 +3318,14 @@ struct RuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const Rule &_) { return _.would_apply (c, lookup_context); }) + | hb_map ([&] (const RuleType &_) { return _.would_apply (c, lookup_context); }) | hb_any ; } bool apply (hb_ot_apply_context_t *c, - const ContextApplyLookupContext &lookup_context) const + const ContextApplyLookupContext &lookup_context, + const hb_ot_layout_ruleset_digest_t *digest = nullptr) const { TRACE_APPLY (this); @@ -2315,7 +3339,7 @@ struct RuleSet return_trace ( + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const Rule &_) { return _.apply (c, lookup_context); }) + | hb_map ([&] (const RuleType &_) { return _.apply (c, lookup_context); }) | hb_any ) ; @@ -2337,7 +3361,7 @@ struct RuleSet skippy_iter.set_glyph_data ((HBUINT16 *) nullptr); unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0; hb_glyph_info_t *first = nullptr, *second = nullptr; - bool matched = skippy_iter.next (); + bool matched = skippy_iter.next (&unsafe_to1); if (likely (matched)) { if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])) @@ -2349,19 +3373,32 @@ struct RuleSet first = &c->buffer->info[skippy_iter.idx]; unsafe_to1 = skippy_iter.idx + 1; + + if (digest && lookup_context.get_value && + !digest->may_have (lookup_context.get_value (*first, lookup_context.match_data))) + { + c->buffer->unsafe_to_concat (c->buffer->idx, unsafe_to1); + return_trace (false); + } } else { - /* Failed to match a next glyph. Only try applying rules that have - * no further input. */ - return_trace ( + bool unsafe_to_concat = false; + bool ret = + hb_iter (rule) | hb_map (hb_add (this)) - | hb_filter ([&] (const Rule &_) { return _.inputCount <= 1; }) - | hb_map ([&] (const Rule &_) { return _.apply (c, lookup_context); }) + | hb_filter ([&] (const RuleType &_) + { + if (_.inputCount <= 1) return true; + unsafe_to_concat = true; + return false; + }) + | hb_map ([&] (const RuleType &_) { return _.apply (c, lookup_context); }) | hb_any - ) ; + if (unsafe_to_concat) + c->buffer->unsafe_to_concat (c->buffer->idx, unsafe_to1); + return_trace (ret); } matched = skippy_iter.next (); if (likely (matched)) @@ -2436,7 +3473,7 @@ struct RuleSet auto *out = c->serializer->start_embed (*this); if (unlikely (!c->serializer->extend_min (out))) return_trace (false); - for (const Offset16To& _ : rule) + for (const auto& _ : rule) { if (!_) continue; auto o_snap = c->serializer->snapshot (); @@ -2463,13 +3500,19 @@ struct RuleSet } protected: - Array16OfOffset16To + Array16Of> rule; /* Array of Rule tables * ordered by preference */ public: DEFINE_SIZE_ARRAY (2, rule); }; +template +struct RuleSet : RuleSetOf> {}; + +template +struct ClassRuleSet : RuleSetOf> {}; + template struct ContextFormat1_4 @@ -2497,6 +3540,31 @@ struct ContextFormat1_4 bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + ContextDependLookupContext lookup_context = { + {intersects_glyph, intersected_glyph}, + ContextFormat::SimpleContext, + nullptr, + nullptr, /* intersects_cache */ + nullptr /* intersected_glyphs_cache */ + }; + + + hb_zip (this+coverage, hb_range ((unsigned) ruleSet.len)) + | hb_filter ([&] (hb_codepoint_t _) { + return c->parent_active_glyphs ().has (_); + }, hb_first) + | hb_map ([&](const hb_pair_t _) { return hb_pair_t (_.first, this+ruleSet[_.second]); }) + | hb_apply ([&] (const hb_pair_t& _) { _.second.depend (c, _.first, lookup_context); }) + ; + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); @@ -2553,6 +3621,14 @@ struct ContextFormat1_4 ; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + + hb_iter (ruleSet) + | hb_map (hb_add (this)) + | hb_apply ([digest] (const RuleSet &_) { _.collect_second_glyphs (digest); }) + ; + } + bool would_apply (hb_would_apply_context_t *c) const { const RuleSet &rule_set = this+ruleSet[(this+coverage).get_coverage (c->glyphs[0])]; @@ -2612,21 +3688,21 @@ struct ContextFormat1_4 protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of table */ - Array16Of> + typename Types::template ArrayOf> ruleSet; /* Array of RuleSet tables * ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (2 + 2 * Types::size, ruleSet); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, ruleSet); }; template struct ContextFormat2_5 { - using RuleSet = OT::RuleSet; + using RuleSet = OT::ClassRuleSet; bool intersects (const hb_set_t *glyphs) const { @@ -2665,6 +3741,41 @@ struct ContextFormat2_5 bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + if (!(this+coverage).intersects (c->glyphs)) + return; + + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + const ClassDef &class_def = this+classDef; + + hb_map_t cache; + intersected_class_cache_t intersected_cache; + ContextDependLookupContext lookup_context = { + {intersects_class, intersected_class_glyphs}, + ContextFormat::ClassBasedContext, + &class_def, + &cache, + &intersected_cache + }; + + + hb_enumerate (ruleSet) + | hb_filter ([&] (unsigned _) + { return class_def.intersects_class (&c->parent_active_glyphs (), _); }, + hb_first) + | hb_apply ([&] (const hb_pair_t&> _) + { + const RuleSet& rule_set = this+_.second; + rule_set.depend (c, _.first, lookup_context); + }) + ; + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { if (!(this+coverage).intersects (c->glyphs)) @@ -2744,6 +3855,15 @@ struct ContextFormat2_5 ; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + const ClassDef &class_def = this+classDef; + + hb_iter (ruleSet) + | hb_map (hb_add (this)) + | hb_apply ([=, &class_def] (const RuleSet &_) { _.collect_second_glyphs (digest, &class_def); }) + ; + } + bool would_apply (hb_would_apply_context_t *c) const { const ClassDef &class_def = this+classDef; @@ -2770,13 +3890,20 @@ struct ContextFormat2_5 struct external_cache_t { hb_ot_layout_binary_cache_t coverage; + hb_ot_layout_ruleset_digest_t rule_sets[HB_VAR_ARRAY]; }; void *external_cache_create () const { - external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t)); + unsigned count = ruleSet.len; + unsigned size = sizeof (external_cache_t) - + HB_VAR_ARRAY * sizeof (hb_ot_layout_ruleset_digest_t) + + count * sizeof (hb_ot_layout_ruleset_digest_t); + external_cache_t *cache = (external_cache_t *) hb_malloc (size); if (likely (cache)) { cache->coverage.clear (); + for (unsigned i = 0; i < count; i++) + (this+ruleSet[i]).collect_first_input_classes (&cache->rule_sets[i]); } return cache; } @@ -2797,12 +3924,18 @@ struct ContextFormat2_5 struct ContextApplyLookupContext lookup_context = { {cached ? match_class_cached : match_class}, - &class_def + &class_def, + cached ? get_class_cached_value : get_class_value }; index = cached ? get_class_cached (class_def, c->buffer->cur()) : class_def.get_class (c->buffer->cur().codepoint); const RuleSet &rule_set = this+ruleSet[index]; - return_trace (rule_set.apply (c, lookup_context)); +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + const hb_ot_layout_ruleset_digest_t *digest = cache && index < ruleSet.len ? &cache->rule_sets[index] : nullptr; +#else + const hb_ot_layout_ruleset_digest_t *digest = nullptr; +#endif + return_trace (rule_set.apply (c, lookup_context, digest)); } bool subset (hb_subset_context_t *c) const @@ -2869,21 +4002,22 @@ struct ContextFormat2_5 protected: HBUINT16 format; /* Format identifier--format = 2 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of table */ - typename Types::template OffsetTo + typename Types::template LOffsetTo classDef; /* Offset to glyph ClassDef table--from * beginning of table */ - Array16Of> + typename Types::template ArrayOf> ruleSet; /* Array of RuleSet tables * ordered by class */ public: - DEFINE_SIZE_ARRAY (4 + 2 * Types::size, ruleSet); + DEFINE_SIZE_ARRAY (2 + 2 * Types::LOffset::static_size + Types::HBUINT::static_size, ruleSet); }; -struct ContextFormat3 +template +struct ContextFormat3_6 { using RuleSet = OT::RuleSet; @@ -2898,13 +4032,39 @@ struct ContextFormat3 this }; return context_intersects (glyphs, - glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), + glyphCount, coverageZ.arrayZ + 1, lookup_context); } bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + if (!(this+coverageZ[0]).intersects (c->glyphs)) + return; + + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + const LookupRecord *lookupRecord = &StructAfter (coverageZ.as_array (glyphCount)); + ContextDependLookupContext lookup_context = { + {intersects_coverage, intersected_coverage_glyphs}, + ContextFormat::CoverageBasedContext, + this, + nullptr, /* intersects_cache */ + nullptr /* intersected_glyphs_cache */ + }; + context_depend_lookup (c, + glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), + lookupCount, lookupRecord, + this, + coverageZ[0], lookup_context); + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { if (!(this+coverageZ[0]).intersects (c->glyphs)) @@ -2922,7 +4082,7 @@ struct ContextFormat3 this }; context_closure_lookup (c, - glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), + glyphCount, coverageZ.arrayZ + 1, lookupCount, lookupRecord, 0, lookup_context); @@ -2950,11 +4110,19 @@ struct ContextFormat3 }; context_collect_glyphs_lookup (c, - glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), + glyphCount, coverageZ.arrayZ + 1, lookupCount, lookupRecord, lookup_context); } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + if (glyphCount <= 1) + *digest = hb_set_digest_t::full (); + else + (this+coverageZ[1]).collect_coverage (digest); + } + bool would_apply (hb_would_apply_context_t *c) const { const LookupRecord *lookupRecord = &StructAfter (coverageZ.as_array (glyphCount)); @@ -2963,7 +4131,7 @@ struct ContextFormat3 this }; return context_would_apply_lookup (c, - glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), + glyphCount, coverageZ.arrayZ + 1, lookupCount, lookupRecord, lookup_context); } @@ -2981,7 +4149,11 @@ struct ContextFormat3 {match_coverage}, this }; - return_trace (context_apply_lookup (c, glyphCount, (const HBUINT16 *) (coverageZ.arrayZ + 1), lookupCount, lookupRecord, lookup_context)); + return_trace (context_apply_lookup (c, + glyphCount, + coverageZ.arrayZ + 1, + lookupCount, lookupRecord, + lookup_context)); } bool subset (hb_subset_context_t *c) const @@ -2995,10 +4167,10 @@ struct ContextFormat3 auto coverages = coverageZ.as_array (glyphCount); - for (const Offset16To& offset : coverages) + for (const auto& offset : coverages) { /* TODO(subset) This looks like should not be necessary to write this way. */ - auto *o = c->serializer->allocate_size> (Offset16To::static_size); + auto *o = c->serializer->allocate_size> (Types::Offset::static_size); if (unlikely (!o)) return_trace (false); if (!o->serialize_subset (c, offset, this)) return_trace (false); } @@ -3030,7 +4202,7 @@ struct ContextFormat3 HBUINT16 glyphCount; /* Number of glyphs in the input glyph * sequence */ HBUINT16 lookupCount; /* Number of LookupRecords */ - UnsizedArrayOf> + UnsizedArrayOf> coverageZ; /* Array of offsets to Coverage * table in glyph sequence order */ /*UnsizedArrayOf @@ -3054,6 +4226,7 @@ struct Context #ifndef HB_NO_BEYOND_64K case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward (ds)...)); + case 6: hb_barrier (); return_trace (c->dispatch (u.format6, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -3064,10 +4237,11 @@ struct Context struct { HBUINT16 v; } format; /* Format identifier */ ContextFormat1_4 format1; ContextFormat2_5 format2; - ContextFormat3 format3; + ContextFormat3_6 format3; #ifndef HB_NO_BEYOND_64K ContextFormat1_4 format4; ContextFormat2_5 format5; + ContextFormat3_6 format6; #endif } u; }; @@ -3084,6 +4258,8 @@ struct ChainContextClosureLookupContext void *intersected_glyphs_cache; }; +typedef ChainContextClosureLookupContext ChainContextDependLookupContext; + struct ChainContextCollectGlyphsLookupContext { ContextCollectGlyphsFuncs funcs; @@ -3094,43 +4270,44 @@ struct ChainContextApplyLookupContext { ChainContextApplyFuncs funcs; const void *match_data[3]; + get_value_func_t get_input_value; }; -template static inline bool chain_context_intersects (const hb_set_t *glyphs, unsigned int backtrackCount, - const HBUINT backtrack[], + glyph_data_t backtrack, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookaheadCount, - const HBUINT lookahead[], + glyph_data_t lookahead, ChainContextClosureLookupContext &lookup_context) { - return array_is_subset_of (glyphs, + bool bt_ok = array_is_subset_of (glyphs, backtrackCount, backtrack, lookup_context.funcs.intersects, lookup_context.intersects_data[0], - lookup_context.intersects_cache[0]) - && array_is_subset_of (glyphs, + lookup_context.intersects_cache[0]); + bool in_ok = array_is_subset_of (glyphs, inputCount ? inputCount - 1 : 0, input, lookup_context.funcs.intersects, lookup_context.intersects_data[1], - lookup_context.intersects_cache[1]) - && array_is_subset_of (glyphs, + lookup_context.intersects_cache[1]); + bool la_ok = array_is_subset_of (glyphs, lookaheadCount, lookahead, lookup_context.funcs.intersects, lookup_context.intersects_data[2], lookup_context.intersects_cache[2]); + + return bt_ok && in_ok && la_ok; } -template static inline void chain_context_closure_lookup (hb_closure_context_t *c, unsigned int backtrackCount, - const HBUINT backtrack[], + glyph_data_t backtrack, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookaheadCount, - const HBUINT lookahead[], + glyph_data_t lookahead, unsigned int lookupCount, const LookupRecord lookupRecord[], unsigned value, @@ -3151,14 +4328,185 @@ static inline void chain_context_closure_lookup (hb_closure_context_t *c, lookup_context.intersected_glyphs_cache); } -template +static inline void chain_context_depend_lookup (hb_depend_context_t *c, + unsigned int backtrackCount, + glyph_data_t backtrack, + unsigned int inputCount, /* Including the first glyph (not matched) */ + glyph_data_t input, /* Array of input values--start with second glyph */ + unsigned int lookaheadCount, + glyph_data_t lookahead, + unsigned int lookupCount, + const LookupRecord lookupRecord[], + const void *rule, + unsigned value, + ChainContextDependLookupContext &lookup_context) +{ + if (!chain_context_intersects (c->glyphs, + backtrackCount, backtrack, + inputCount, input, + lookaheadCount, lookahead, + lookup_context)) + return; + + hb_depend_context_t::depend_scratch_t *scratch = c->acquire_depend_scratch (); + if (unlikely (!scratch)) + return; + HB_SCOPE_GUARD (c->release_depend_scratch (scratch)); + + bool context_sets_cached = context_depend_sets_are_cached ( + c, inputCount, lookupCount, lookupRecord, rule, value, + lookup_context.context_format, lookup_context.intersects_data[1], + &scratch->cached_context_sets); + if (unlikely (!c->depend_data->successful)) + return; + if (context_sets_cached) + { + context_depend_recurse_lookups (c, + inputCount, input, + lookupCount, lookupRecord, + rule, + value, + lookup_context.context_format, + lookup_context.intersects_data[1], + lookup_context.funcs.intersected_glyphs, + lookup_context.intersected_glyphs_cache, + scratch->preliminary_context, + nullptr, + &scratch->cached_context_sets, + scratch); + return; + } + + /* Cache misses and rules without valid records still perform the original + * dependency-set interning in its observable order. */ + hb_set_t &position_scratch = scratch->position_scratch; + hb_vector_t &backtrack_sets = scratch->backtrack_sets; + hb_vector_t &lookahead_sets = scratch->lookahead_sets; + + /* Extract backtrack glyphs */ + for (unsigned i = 0; i < backtrackCount; i++) + { + const hb_set_t *pos_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data[0], + backtrack[i], false, &position_scratch); + if (unlikely (!pos_glyphs)) + return; + if (!pos_glyphs->is_empty ()) + { + if (unlikely (!backtrack_sets.push_or_fail (pos_glyphs))) + { + c->depend_data->fail (); + return; + } + } + } + + /* Extract lookahead glyphs */ + for (unsigned i = 0; i < lookaheadCount; i++) + { + const hb_set_t *pos_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data[2], + lookahead[i], false, &position_scratch); + if (unlikely (!pos_glyphs)) + return; + if (!pos_glyphs->is_empty ()) + { + if (unlikely (!lookahead_sets.push_or_fail (pos_glyphs))) + { + c->depend_data->fail (); + return; + } + } + } + + /* Build preliminary_context with backtrack + lookahead encoded */ + hb_set_t &preliminary_context = scratch->preliminary_context; + for (const hb_set_t *back_set : backtrack_sets) + { + if (back_set->get_population () == 1) { + preliminary_context.add (back_set->get_min ()); // Direct glyph + } else if (back_set->get_population () > 1) { + hb_codepoint_t set_idx = lookup_context.context_format == ContextFormat::SimpleContext + ? c->depend_data->find_or_create_context_set (*back_set) + : c->find_or_create_cached_context_set (back_set); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return; + preliminary_context.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); // Encoded set reference + } + } + for (const hb_set_t *look_set : lookahead_sets) + { + if (look_set->get_population () == 1) { + preliminary_context.add (look_set->get_min ()); // Direct glyph + } else if (look_set->get_population () > 1) { + hb_codepoint_t set_idx = lookup_context.context_format == ContextFormat::SimpleContext + ? c->depend_data->find_or_create_context_set (*look_set) + : c->find_or_create_cached_context_set (look_set); + if (unlikely (set_idx == HB_CODEPOINT_INVALID)) + return; + preliminary_context.add (HB_DEPEND_CONTEXT_SET_FLAG | set_idx); // Encoded set reference + } + } + if (unlikely (preliminary_context.in_error ())) + { + c->depend_data->fail (); + return; + } + + /* Build glyph sets for ALL input positions */ + hb_vector_t &input_position_glyphs = scratch->input_position_glyphs; + + if (!context_sets_cached) + { + /* Position 0 (first input coverage/class/glyph) — must be in both the + * class AND the coverage, so intersect with parent_active_glyphs. */ + const hb_set_t *pos0_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data[1], value, + true, &position_scratch, &scratch->compact_workspace); + if (unlikely (!pos0_glyphs || + !input_position_glyphs.push_or_fail (pos0_glyphs))) + { + c->depend_data->fail (); + return; + } + + /* Positions 1+ (Input array) */ + for (unsigned i = 0; i + 1 < inputCount; i++) + { + const hb_set_t *pos_glyphs = depend_position_glyphs ( + c, lookup_context.context_format, lookup_context.intersects_data[1], + input[i], false, &position_scratch); + if (unlikely (!pos_glyphs || + !input_position_glyphs.push_or_fail (pos_glyphs))) + { + c->depend_data->fail (); + return; + } + } + } + + context_depend_recurse_lookups (c, + inputCount, input, + lookupCount, lookupRecord, + rule, + value, + lookup_context.context_format, + lookup_context.intersects_data[1], + lookup_context.funcs.intersected_glyphs, + lookup_context.intersected_glyphs_cache, + preliminary_context, + context_sets_cached ? nullptr : &input_position_glyphs, + context_sets_cached ? &scratch->cached_context_sets : nullptr, + scratch); +} + static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c, unsigned int backtrackCount, - const HBUINT backtrack[], + glyph_data_t backtrack, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookaheadCount, - const HBUINT lookahead[], + glyph_data_t lookahead, unsigned int lookupCount, const LookupRecord lookupRecord[], ChainContextCollectGlyphsLookupContext &lookup_context) @@ -3176,14 +4524,13 @@ static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_contex lookupCount, lookupRecord); } -template static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c, unsigned int backtrackCount, - const HBUINT backtrack[] HB_UNUSED, + glyph_data_t backtrack HB_UNUSED, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookaheadCount, - const HBUINT lookahead[] HB_UNUSED, + glyph_data_t lookahead HB_UNUSED, unsigned int lookupCount HB_UNUSED, const LookupRecord lookupRecord[] HB_UNUSED, const ChainContextApplyLookupContext &lookup_context) @@ -3194,14 +4541,13 @@ static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c lookup_context.funcs.match[1], lookup_context.match_data[1]); } -template static inline bool chain_context_apply_lookup (hb_ot_apply_context_t *c, unsigned int backtrackCount, - const HBUINT backtrack[], + glyph_data_t backtrack, unsigned int inputCount, /* Including the first glyph (not matched) */ - const HBUINT input[], /* Array of input values--start with second glyph */ + glyph_data_t input, /* Array of input values--start with second glyph */ unsigned int lookaheadCount, - const HBUINT lookahead[], + glyph_data_t lookahead, unsigned int lookupCount, const LookupRecord lookupRecord[], const ChainContextApplyLookupContext &lookup_context) @@ -3246,8 +4592,8 @@ static inline bool chain_context_apply_lookup (hb_ot_apply_context_t *c, template struct ChainRule { - template - friend struct ChainRuleSet; + template + friend struct ChainRuleSetOf; bool intersects (const hb_set_t *glyphs, ChainContextClosureLookupContext &lookup_context) const { @@ -3260,6 +4606,21 @@ struct ChainRule lookup_context); } + void depend (hb_depend_context_t *c, unsigned value, ChainContextDependLookupContext &lookup_context) const + { + const auto &input = StructAfter (backtrack); + const auto &lookahead = StructAfter (input); + const auto &lookup = StructAfter (lookahead); + chain_context_depend_lookup (c, + backtrack.len, backtrack.arrayZ, + input.lenP1, input.arrayZ, + lookahead.len, lookahead.arrayZ, + lookup.len, lookup.arrayZ, + this, + value, + lookup_context); + } + void closure (hb_closure_context_t *c, unsigned value, ChainContextClosureLookupContext &lookup_context) const { @@ -3303,6 +4664,39 @@ struct ChainRule lookup_context); } + void collect_second_glyphs (hb_set_digest_t *digest, + const ClassDef *input_class_def = nullptr, + const ClassDef *lookahead_class_def = nullptr) const + { + const auto &input = StructAfter (backtrack); + const auto &lookahead = StructAfter (input); + + unsigned second; + const ClassDef *class_def; + if (input.lenP1 > 1) + { + second = input.arrayZ[0]; + class_def = input_class_def; + } + else if (lookahead.len) + { + second = lookahead.arrayZ[0]; + class_def = lookahead_class_def; + } + else + { + *digest = hb_set_digest_t::full (); + return; + } + + if (!class_def) + digest->add (second); + else if (!second) + *digest = hb_set_digest_t::full (); + else + class_def->collect_class (digest, second); + } + bool would_apply (hb_would_apply_context_t *c, const ChainContextApplyLookupContext &lookup_context) const { @@ -3338,7 +4732,11 @@ struct ChainRule { c->copy (len); for (const auto g : it) - c->copy ((HBUINT16) g); + { + typename Types::HBUINT d; + d = g; + c->copy (d); + } } bool serialize (hb_serialize_context_t *c, @@ -3440,20 +4838,41 @@ struct ChainRule DEFINE_SIZE_MIN (8); }; -template -struct ChainRuleSet +template +struct ChainRuleSetOf { - using ChainRule = OT::ChainRule; - bool intersects (const hb_set_t *glyphs, ChainContextClosureLookupContext &lookup_context) const { return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const ChainRule &_) { return _.intersects (glyphs, lookup_context); }) + | hb_map ([&] (const ChainRuleType &_) { return _.intersects (glyphs, lookup_context); }) | hb_any ; } + + void collect_first_input_classes (hb_ot_layout_ruleset_digest_t *digest) const + { + digest->init (); + for (unsigned i = 0; i < rule.len; i++) + { + const ChainRuleType &r = this+rule.arrayZ[i]; + const auto &input = StructAfter (r.backtrack); + if (input.lenP1 <= 1) + { + digest->set_full (); + return; + } + digest->add (input.arrayZ[0]); + } + } + void depend (hb_depend_context_t *c, unsigned value, ChainContextDependLookupContext &lookup_context) const + { + + hb_iter (rule) + | hb_map (hb_add (this)) + | hb_apply ([&] (const ChainRuleType &_) { _.depend (c, value, lookup_context); }) + ; + } void closure (hb_closure_context_t *c, unsigned value, ChainContextClosureLookupContext &lookup_context) const { if (unlikely (c->lookup_limit_exceeded ())) return; @@ -3461,7 +4880,7 @@ struct ChainRuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const ChainRule &_) { _.closure (c, value, lookup_context); }) + | hb_apply ([&] (const ChainRuleType &_) { _.closure (c, value, lookup_context); }) ; } @@ -3472,7 +4891,7 @@ struct ChainRuleSet + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const ChainRule &_) { _.closure_lookups (c, lookup_context); }) + | hb_apply ([&] (const ChainRuleType &_) { _.closure_lookups (c, lookup_context); }) ; } @@ -3481,7 +4900,18 @@ struct ChainRuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_apply ([&] (const ChainRule &_) { _.collect_glyphs (c, lookup_context); }) + | hb_apply ([&] (const ChainRuleType &_) { _.collect_glyphs (c, lookup_context); }) + ; + } + + void collect_second_glyphs (hb_set_digest_t *digest, + const ClassDef *input_class_def = nullptr, + const ClassDef *lookahead_class_def = nullptr) const + { + + hb_iter (rule) + | hb_map (hb_add (this)) + | hb_apply ([=] (const ChainRuleType &_) + { _.collect_second_glyphs (digest, input_class_def, lookahead_class_def); }) ; } @@ -3491,13 +4921,14 @@ struct ChainRuleSet return + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const ChainRule &_) { return _.would_apply (c, lookup_context); }) + | hb_map ([&] (const ChainRuleType &_) { return _.would_apply (c, lookup_context); }) | hb_any ; } bool apply (hb_ot_apply_context_t *c, - const ChainContextApplyLookupContext &lookup_context) const + const ChainContextApplyLookupContext &lookup_context, + const hb_ot_layout_ruleset_digest_t *digest = nullptr) const { TRACE_APPLY (this); @@ -3511,7 +4942,7 @@ struct ChainRuleSet return_trace ( + hb_iter (rule) | hb_map (hb_add (this)) - | hb_map ([&] (const ChainRule &_) { return _.apply (c, lookup_context); }) + | hb_map ([&] (const ChainRuleType &_) { return _.apply (c, lookup_context); }) | hb_any ) ; @@ -3533,7 +4964,7 @@ struct ChainRuleSet skippy_iter.set_glyph_data ((HBUINT16 *) nullptr); unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0; hb_glyph_info_t *first = nullptr, *second = nullptr; - bool matched = skippy_iter.next (); + bool matched = skippy_iter.next (&unsafe_to1); if (likely (matched)) { if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])) @@ -3545,24 +4976,34 @@ struct ChainRuleSet first = &c->buffer->info[skippy_iter.idx]; unsafe_to1 = skippy_iter.idx + 1; + + if (digest && lookup_context.get_input_value && + !digest->may_have (lookup_context.get_input_value (*first, lookup_context.match_data[1]))) + { + c->buffer->unsafe_to_concat (c->buffer->idx, unsafe_to1); + return_trace (false); + } } else { - /* Failed to match a next glyph. Only try applying rules that have - * no further input and lookahead. */ - return_trace ( + bool unsafe_to_concat = false; + bool ret = + hb_iter (rule) | hb_map (hb_add (this)) - | hb_filter ([&] (const ChainRule &_) + | hb_filter ([&] (const ChainRuleType &_) { const auto &input = StructAfter (_.backtrack); const auto &lookahead = StructAfter (input); - return input.lenP1 <= 1 && lookahead.len == 0; + if (input.lenP1 <= 1 && lookahead.len == 0) return true; + unsafe_to_concat = true; + return false; }) - | hb_map ([&] (const ChainRule &_) { return _.apply (c, lookup_context); }) + | hb_map ([&] (const ChainRuleType &_) { return _.apply (c, lookup_context); }) | hb_any - ) ; + if (unsafe_to_concat) + c->buffer->unsafe_to_concat (c->buffer->idx, unsafe_to1); + return_trace (ret); } matched = skippy_iter.next (); if (likely (matched)) @@ -3652,7 +5093,7 @@ struct ChainRuleSet auto *out = c->serializer->start_embed (*this); if (unlikely (!c->serializer->extend_min (out))) return_trace (false); - for (const Offset16To& _ : rule) + for (const auto& _ : rule) { if (!_) continue; auto o_snap = c->serializer->snapshot (); @@ -3683,13 +5124,22 @@ struct ChainRuleSet } protected: - Array16OfOffset16To + Array16Of> rule; /* Array of ChainRule tables * ordered by preference */ public: DEFINE_SIZE_ARRAY (2, rule); }; +template +struct ChainRuleSet : ChainRuleSetOf> {}; + +static_assert (sizeof (ChainRuleSet) == + HBUINT16::static_size + Offset24::static_size, ""); + +template +struct ChainClassRuleSet : ChainRuleSetOf> {}; + template struct ChainContextFormat1_4 { @@ -3716,6 +5166,31 @@ struct ChainContextFormat1_4 bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + ChainContextDependLookupContext lookup_context = { + {intersects_glyph, intersected_glyph}, + ContextFormat::SimpleContext, + {nullptr, nullptr, nullptr}, + {nullptr, nullptr, nullptr}, /* intersects_cache */ + nullptr /* intersected_glyphs_cache */ + }; + + + hb_zip (this+coverage, hb_range ((unsigned) ruleSet.len)) + | hb_filter ([&] (hb_codepoint_t _) { + return c->parent_active_glyphs ().has (_); + }, hb_first) + | hb_map ([&](const hb_pair_t _) { return hb_pair_t (_.first, this+ruleSet[_.second]); }) + | hb_apply ([&] (const hb_pair_t& _) { _.second.depend (c, _.first, lookup_context); }) + ; + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); @@ -3773,6 +5248,14 @@ struct ChainContextFormat1_4 ; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + + hb_iter (ruleSet) + | hb_map (hb_add (this)) + | hb_apply ([digest] (const ChainRuleSet &_) { _.collect_second_glyphs (digest); }) + ; + } + bool would_apply (hb_would_apply_context_t *c) const { const ChainRuleSet &rule_set = this+ruleSet[(this+coverage).get_coverage (c->glyphs[0])]; @@ -3831,20 +5314,20 @@ struct ChainContextFormat1_4 protected: HBUINT16 format; /* Format identifier--format = 1 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of table */ - Array16Of> + typename Types::template ArrayOf> ruleSet; /* Array of ChainRuleSet tables * ordered by Coverage Index */ public: - DEFINE_SIZE_ARRAY (2 + 2 * Types::size, ruleSet); + DEFINE_SIZE_ARRAY (2 + Types::LOffset::static_size + Types::HBUINT::static_size, ruleSet); }; template struct ChainContextFormat2_5 { - using ChainRuleSet = OT::ChainRuleSet; + using ChainRuleSet = OT::ChainClassRuleSet; bool intersects (const hb_set_t *glyphs) const { @@ -3886,6 +5369,45 @@ struct ChainContextFormat2_5 bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + if (!(this+coverage).intersects (c->glyphs)) + return; + + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + const ClassDef &backtrack_class_def = this+backtrackClassDef; + const ClassDef &input_class_def = this+inputClassDef; + const ClassDef &lookahead_class_def = this+lookaheadClassDef; + + hb_map_t caches[3] = {}; + intersected_class_cache_t intersected_cache; + ChainContextDependLookupContext lookup_context = { + {intersects_class, intersected_class_glyphs}, + ContextFormat::ClassBasedContext, + {&backtrack_class_def, + &input_class_def, + &lookahead_class_def}, + {&caches[0], &caches[1], &caches[2]}, + &intersected_cache + }; + + + hb_enumerate (ruleSet) + | hb_filter ([&] (unsigned _) + { return input_class_def.intersects_class (&c->parent_active_glyphs (), _); }, + hb_first) + | hb_apply ([&] (const hb_pair_t&> _) + { + const ChainRuleSet& chainrule_set = this+_.second; + chainrule_set.depend (c, _.first, lookup_context); + }) + ; + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { if (!(this+coverage).intersects (c->glyphs)) @@ -3979,6 +5501,17 @@ struct ChainContextFormat2_5 ; } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + const ClassDef &input_class_def = this+inputClassDef; + const ClassDef &lookahead_class_def = this+lookaheadClassDef; + + hb_iter (ruleSet) + | hb_map (hb_add (this)) + | hb_apply ([digest, &input_class_def, &lookahead_class_def] (const ChainRuleSet &_) + { _.collect_second_glyphs (digest, &input_class_def, &lookahead_class_def); }) + ; + } + bool would_apply (hb_would_apply_context_t *c) const { const ClassDef &backtrack_class_def = this+backtrackClassDef; @@ -4010,13 +5543,24 @@ struct ChainContextFormat2_5 struct external_cache_t { hb_ot_layout_binary_cache_t coverage; + hb_ot_layout_mapping_cache_t input_class; + hb_ot_layout_mapping_cache_t lookahead_class; + hb_ot_layout_ruleset_digest_t rule_sets[HB_VAR_ARRAY]; }; void *external_cache_create () const { - external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t)); + unsigned count = ruleSet.len; + unsigned size = sizeof (external_cache_t) - + HB_VAR_ARRAY * sizeof (hb_ot_layout_ruleset_digest_t) + + count * sizeof (hb_ot_layout_ruleset_digest_t); + external_cache_t *cache = (external_cache_t *) hb_malloc (size); if (likely (cache)) { cache->coverage.clear (); + cache->input_class.clear (); + cache->lookahead_class.clear (); + for (unsigned i = 0; i < count; i++) + (this+ruleSet[i]).collect_first_input_classes (&cache->rule_sets[i]); } return cache; } @@ -4037,22 +5581,67 @@ struct ChainContextFormat2_5 const ClassDef &input_class_def = this+inputClassDef; const ClassDef &lookahead_class_def = this+lookaheadClassDef; +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + match_class_cache_data_t input_cache_data = { + &input_class_def, + cache ? &cache->input_class : nullptr + }; + match_class_cache_data_t lookahead_cache_data = { + &lookahead_class_def, + cache ? &cache->lookahead_class : nullptr + }; + const void *input_match_data = cached + ? static_cast (&input_class_def) + : static_cast (&input_cache_data); + const void *lookahead_match_data = cached + ? static_cast (&lookahead_class_def) + : static_cast (&lookahead_cache_data); + bool backtrack_uses_lookahead_cache = + !cached && &backtrack_class_def == &lookahead_class_def; + const void *backtrack_match_data = backtrack_uses_lookahead_cache + ? static_cast (&lookahead_cache_data) + : static_cast (&backtrack_class_def); +#endif + /* match_class_caches1 is slightly faster. Use it for lookahead, * which is typically longer. */ struct ChainContextApplyLookupContext lookup_context = { +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + {{cached && &backtrack_class_def == &lookahead_class_def ? match_class_cached1 : + backtrack_uses_lookahead_cache ? match_class_cache : match_class, + cached ? match_class_cached2 : match_class_cache, + cached ? match_class_cached1 : match_class_cache}}, + {backtrack_match_data, + input_match_data, + lookahead_match_data}, + cached ? get_class_cached2_value : get_class_cache_value +#else {{cached && &backtrack_class_def == &lookahead_class_def ? match_class_cached1 : match_class, cached ? match_class_cached2 : match_class, cached ? match_class_cached1 : match_class}}, {&backtrack_class_def, &input_class_def, - &lookahead_class_def} + &lookahead_class_def}, + cached ? get_class_cached2_value : get_class_value +#endif }; +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + index = cached + ? get_class_cached2 (input_class_def, c->buffer->cur()) + : input_class_def.get_class (c->buffer->cur().codepoint, input_cache_data.cache); +#else index = cached ? get_class_cached2 (input_class_def, c->buffer->cur()) : input_class_def.get_class (c->buffer->cur().codepoint); +#endif const ChainRuleSet &rule_set = this+ruleSet[index]; - return_trace (rule_set.apply (c, lookup_context)); +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + const hb_ot_layout_ruleset_digest_t *digest = cache && index < ruleSet.len ? &cache->rule_sets[index] : nullptr; +#else + const hb_ot_layout_ruleset_digest_t *digest = nullptr; +#endif + return_trace (rule_set.apply (c, lookup_context, digest)); } bool subset (hb_subset_context_t *c) const @@ -4134,18 +5723,18 @@ struct ChainContextFormat2_5 protected: HBUINT16 format; /* Format identifier--format = 2 */ - typename Types::template OffsetTo + typename Types::template LOffsetTo coverage; /* Offset to Coverage table--from * beginning of table */ - typename Types::template OffsetTo + typename Types::template LOffsetTo backtrackClassDef; /* Offset to glyph ClassDef table * containing backtrack sequence * data--from beginning of table */ - typename Types::template OffsetTo + typename Types::template LOffsetTo inputClassDef; /* Offset to glyph ClassDef * table containing input sequence * data--from beginning of table */ - typename Types::template OffsetTo + typename Types::template LOffsetTo lookaheadClassDef; /* Offset to glyph ClassDef table * containing lookahead sequence * data--from beginning of table */ @@ -4153,9 +5742,10 @@ struct ChainContextFormat2_5 ruleSet; /* Array of ChainRuleSet tables * ordered by class */ public: - DEFINE_SIZE_ARRAY (4 + 4 * Types::size, ruleSet); + DEFINE_SIZE_ARRAY (4 + 4 * Types::LOffset::static_size, ruleSet); }; +template struct ChainContextFormat3 { using RuleSet = OT::RuleSet; @@ -4174,15 +5764,47 @@ struct ChainContextFormat3 {this, this, this} }; return chain_context_intersects (glyphs, - backtrack.len, (const HBUINT16 *) backtrack.arrayZ, - input.len, (const HBUINT16 *) input.arrayZ + 1, - lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + backtrack.len, backtrack.arrayZ, + input.len, input.arrayZ + 1, + lookahead.len, lookahead.arrayZ, lookup_context); } bool may_have_non_1to1 () const { return true; } + void depend (hb_depend_context_t *c) const + { + const auto &input = StructAfter (backtrack); + + if (!(this+input[0]).intersects (c->glyphs)) + return; + + hb_set_t* cur_active_glyphs = c->push_cur_active_glyphs (); + if (unlikely (!cur_active_glyphs)) + return; + get_coverage ().intersect_set (*c->glyphs, *cur_active_glyphs); + + const auto &lookahead = StructAfter (input); + const auto &lookup = StructAfter (lookahead); + ChainContextDependLookupContext lookup_context = { + {intersects_coverage, intersected_coverage_glyphs}, + ContextFormat::CoverageBasedContext, + {this, this, this}, + {nullptr, nullptr, nullptr}, /* intersects_cache */ + nullptr /* intersected_glyphs_cache */ + }; + chain_context_depend_lookup (c, + backtrack.len, (const HBUINT16 *) backtrack.arrayZ, + input.len, (const HBUINT16 *) input.arrayZ + 1, + lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + lookup.len, lookup.arrayZ, + this, + input[0], lookup_context); + + c->pop_cur_done_glyphs (); + } + void closure (hb_closure_context_t *c) const { const auto &input = StructAfter (backtrack); @@ -4204,9 +5826,9 @@ struct ChainContextFormat3 {this, this, this} }; chain_context_closure_lookup (c, - backtrack.len, (const HBUINT16 *) backtrack.arrayZ, - input.len, (const HBUINT16 *) input.arrayZ + 1, - lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + backtrack.len, backtrack.arrayZ, + input.len, input.arrayZ + 1, + lookahead.len, lookahead.arrayZ, lookup.len, lookup.arrayZ, 0, lookup_context); @@ -4240,13 +5862,25 @@ struct ChainContextFormat3 {this, this, this} }; chain_context_collect_glyphs_lookup (c, - backtrack.len, (const HBUINT16 *) backtrack.arrayZ, - input.len, (const HBUINT16 *) input.arrayZ + 1, - lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + backtrack.len, backtrack.arrayZ, + input.len, input.arrayZ + 1, + lookahead.len, lookahead.arrayZ, lookup.len, lookup.arrayZ, lookup_context); } + void collect_second_glyphs (hb_set_digest_t *digest) const + { + const auto &input = StructAfter (backtrack); + const auto &lookahead = StructAfter (input); + if (input.len > 1) + (this+input[1]).collect_coverage (digest); + else if (lookahead.len) + (this+lookahead[0]).collect_coverage (digest); + else + *digest = hb_set_digest_t::full (); + } + bool would_apply (hb_would_apply_context_t *c) const { const auto &input = StructAfter (backtrack); @@ -4257,9 +5891,9 @@ struct ChainContextFormat3 {this, this, this} }; return chain_context_would_apply_lookup (c, - backtrack.len, (const HBUINT16 *) backtrack.arrayZ, - input.len, (const HBUINT16 *) input.arrayZ + 1, - lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + backtrack.len, backtrack.arrayZ, + input.len, input.arrayZ + 1, + lookahead.len, lookahead.arrayZ, lookup.len, lookup.arrayZ, lookup_context); } @@ -4284,9 +5918,9 @@ struct ChainContextFormat3 {this, this, this} }; return_trace (chain_context_apply_lookup (c, - backtrack.len, (const HBUINT16 *) backtrack.arrayZ, - input.len, (const HBUINT16 *) input.arrayZ + 1, - lookahead.len, (const HBUINT16 *) lookahead.arrayZ, + backtrack.len, backtrack.arrayZ, + input.len, input.arrayZ + 1, + lookahead.len, lookahead.arrayZ, lookup.len, lookup.arrayZ, lookup_context)); } @@ -4295,10 +5929,8 @@ struct ChainContextFormat3 bool serialize_coverage_offsets (hb_subset_context_t *c, Iterator it, const void* base) const { TRACE_SERIALIZE (this); - auto *out = c->serializer->start_embed> (); - - if (unlikely (!c->serializer->allocate_size (HBUINT16::static_size))) - return_trace (false); + auto *out = c->serializer->start_embed>> (); + if (unlikely (!out->serialize (c->serializer, 0u))) return_trace (false); for (auto& offset : it) { auto *o = out->serialize_append (c->serializer); @@ -4354,15 +5986,15 @@ struct ChainContextFormat3 protected: HBUINT16 format; /* Format identifier--format = 3 */ - Array16OfOffset16To + Array16Of> backtrack; /* Array of coverage tables * in backtracking sequence, in glyph * sequence order */ - Array16OfOffset16To + Array16Of> inputX ; /* Array of coverage * tables in input sequence, in glyph * sequence order */ - Array16OfOffset16To + Array16Of> lookaheadX; /* Array of coverage tables * in lookahead sequence, in glyph * sequence order */ @@ -4397,10 +6029,12 @@ struct ChainContext struct { HBUINT16 v; } format; /* Format identifier */ ChainContextFormat1_4 format1; ChainContextFormat2_5 format2; - ChainContextFormat3 format3; + ChainContextFormat3 format3; #ifndef HB_NO_BEYOND_64K ChainContextFormat1_4 format4; ChainContextFormat2_5 format5; + /* The beyond-64k spec adds sequence-context format 6, but no + * corresponding chained-context coverage format. */ #endif } u; }; @@ -4541,9 +6175,16 @@ struct hb_ot_layout_lookup_accelerator_t hb_accelerate_subtables_context_t c_accelerate_subtables (thiz->subtables); lookup.dispatch (&c_accelerate_subtables); + /* Invalid subtables do not collect and leave zeroed tail entries + * (see the calloc note above); trim them so the apply paths never + * see a null apply func. */ + while (count && !thiz->subtables[count - 1].apply_func) + count--; + thiz->digest.init (); for (auto& subtable : hb_iter (thiz->subtables, count)) thiz->digest.union_ (subtable.digest); + thiz->digest_second = c_accelerate_subtables.digest_second; thiz->count = count; @@ -4574,7 +6215,19 @@ struct hb_ot_layout_lookup_accelerator_t #endif bool apply (hb_ot_apply_context_t *c, bool use_cache) const { - c->lookup_accel = this; + if (count == 1) + { + /* The accelerator digest is the union of the subtable digests, so + * for a single subtable it equals that subtable's digest, which the + * caller has already tested; skip the redundant retest. Zeroed + * invalid entries were trimmed at create time, so the subtable is + * always valid here. */ +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + if (use_cache) + return subtables[0].apply_cached_no_digest (c); +#endif + return subtables[0].apply_no_digest (c); + } #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE if (use_cache) { @@ -4614,6 +6267,7 @@ struct hb_ot_layout_lookup_accelerator_t hb_set_digest_t digest; + hb_set_digest_t digest_second; private: unsigned count = 0; /* Number of subtables in the array. */ #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE @@ -4622,51 +6276,76 @@ struct hb_ot_layout_lookup_accelerator_t hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY]; }; -template -struct GSUBGPOSVersion1_2 +struct GSUBGPOS { - friend struct GSUBGPOS; - - protected: - FixedVersion<>version; /* Version of the GSUB/GPOS table--initially set - * to 0x00010000u */ - typename Types:: template OffsetTo - scriptList; /* ScriptList table */ - typename Types::template OffsetTo - featureList; /* FeatureList table */ - typename Types::template OffsetTo> - lookupList; /* LookupList table */ - Offset32To - featureVars; /* Offset to Feature Variations - table--from beginning of table - * (may be NULL). Introduced - * in version 0x00010001. */ - public: - DEFINE_SIZE_MIN (4 + 3 * Types::size); + using LookupListT = LookupList; + using LookupList2T = LookupList; + template + using TLookupList = List16OfOffsetTo; + template + using TLookupList2 = List16OfOffsetTo; + template + using TLookupOffsetList = LookupOffsetList; + template + using TLookupOffsetList2 = LookupOffsetList; size_t get_size () const { + if (version.major != 1) return version.static_size; + return min_size + - (version.to_int () >= 0x00010001u ? featureVars.static_size : 0); + (version.to_int () >= 0x00010001u ? featureVars.static_size : 0) + +#ifndef HB_NO_BEYOND_64K + (version.to_int () >= 0x00010002u ? 3 * Offset32::static_size : 0) +#else + 0 +#endif + ; } - const typename Types::template OffsetTo>* get_lookup_list_offset () const + const ScriptList &get_script_list () const { - return &lookupList; +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010002u && scriptList2) return this + scriptList2; +#endif + return this + scriptList; + } + const FeatureList &get_feature_list () const + { +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010002u && featureList2) return this + featureList2; +#endif + return this + featureList; } - template bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - typedef List16OfOffsetTo TLookupList; - if (unlikely (!(scriptList.sanitize (c, this) && - featureList.sanitize (c, this) && - reinterpret_cast &> (lookupList).sanitize (c, this)))) + if (unlikely (!version.sanitize (c) || + version.major != 1 || + !c->check_range (this, get_size ()))) + return_trace (false); + hb_barrier (); + + bool script_list_ok = scriptList.sanitize (c, this); + bool feature_list_ok = featureList.sanitize (c, this); + bool lookup_list_ok = typed_lookup_list_offset ().sanitize (c, this); + +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010002u) + { + if (scriptList2) script_list_ok = scriptList2.sanitize (c, this); + if (featureList2) feature_list_ok = featureList2.sanitize (c, this); + if (lookupList2) lookup_list_ok = typed_lookup_list2_offset ().sanitize (c, this); + } +#endif + + if (unlikely (!(script_list_ok && feature_list_ok && lookup_list_ok))) return_trace (false); #ifndef HB_NO_VAR - if (unlikely (!(version.to_int () < 0x00010001u || featureVars.sanitize (c, this)))) + if (unlikely (!(version.to_int () < 0x00010001u || + featureVars.sanitize (c, this, &get_feature_list ())))) return_trace (false); #endif @@ -4677,145 +6356,116 @@ struct GSUBGPOSVersion1_2 bool subset (hb_subset_layout_context_t *c) const { TRACE_SUBSET (this); + if (version.major != 1) return_trace (false); auto *out = c->subset_context->serializer->start_embed (this); if (unlikely (!c->subset_context->serializer->extend_min (out))) return_trace (false); out->version = version; - typedef LookupOffsetList TLookupList; - reinterpret_cast &> (out->lookupList) - .serialize_subset (c->subset_context, - reinterpret_cast &> (lookupList), - this, - c); +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010002u) + { + if (unlikely (!c->subset_context->serializer->extend_size (out, get_size ()))) + return_trace (false); - reinterpret_cast &> (out->featureList) - .serialize_subset (c->subset_context, - reinterpret_cast &> (featureList), - this, - c); + out->scriptList = 0; + out->featureList = 0; + out->lookupList = 0; - out->scriptList.serialize_subset (c->subset_context, - scriptList, - this, - c); + if (lookupList2) + serialize_subset_offset (c->subset_context, out->lookupList2, + subset_lookup_list2_offset (), + this, c); + else + serialize_subset_offset (c->subset_context, out->lookupList2, + subset_lookup_list_offset (), + this, c); + + if (featureList2) + serialize_subset_offset (c->subset_context, out->featureList2, + subset_feature_list2_offset (), + this, c); + else + serialize_subset_offset (c->subset_context, out->featureList2, + subset_feature_list_offset (), + this, c); + + if (scriptList2) + serialize_subset_offset (c->subset_context, out->scriptList2, scriptList2, this, c); + else + serialize_subset_offset (c->subset_context, out->scriptList2, scriptList, this, c); + } + else +#endif + { + out->subset_lookup_list_offset () + .serialize_subset (c->subset_context, + subset_lookup_list_offset (), + this, + c); + + out->subset_feature_list_offset () + .serialize_subset (c->subset_context, + subset_feature_list_offset (), + this, + c); + + out->scriptList.serialize_subset (c->subset_context, + scriptList, + this, + c); + } #ifndef HB_NO_VAR if (version.to_int () >= 0x00010001u) { auto snapshot = c->subset_context->serializer->snapshot (); - if (!c->subset_context->serializer->extend_min (&out->featureVars)) + if (version.to_int () < 0x00010002u && + !c->subset_context->serializer->extend_min (&out->featureVars)) return_trace (false); // if all axes are pinned all feature vars are dropped. bool ret = !c->subset_context->plan->all_axes_pinned && out->featureVars.serialize_subset (c->subset_context, featureVars, this, c); - if (!ret && version.major == 1) + if (!ret) { - c->subset_context->serializer->revert (snapshot); - out->version.major = 1; - out->version.minor = 0; + out->featureVars = 0; + if (version.to_int () < 0x00010002u) + { + c->subset_context->serializer->revert (snapshot); + out->version.major = 1; + out->version.minor = 0; + } } } #endif return_trace (true); } -}; - -struct GSUBGPOS -{ - size_t get_size () const - { - switch (u.version.major) { - case 1: hb_barrier (); return u.version1.get_size (); -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return u.version2.get_size (); -#endif - default: return u.version.static_size; - } - } - - template - bool sanitize (hb_sanitize_context_t *c) const - { - TRACE_SANITIZE (this); - if (unlikely (!u.version.sanitize (c))) return_trace (false); - hb_barrier (); - switch (u.version.major) { - case 1: hb_barrier (); return_trace (u.version1.sanitize (c)); -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return_trace (u.version2.sanitize (c)); -#endif - default: return_trace (true); - } - } - - template - bool subset (hb_subset_layout_context_t *c) const - { - switch (u.version.major) { - case 1: hb_barrier (); return u.version1.subset (c); -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return u.version2.subset (c); -#endif - default: return false; - } - } - const ScriptList &get_script_list () const - { - switch (u.version.major) { - case 1: hb_barrier (); return this+u.version1.scriptList; -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return this+u.version2.scriptList; -#endif - default: return Null (ScriptList); - } - } - const FeatureList &get_feature_list () const - { - switch (u.version.major) { - case 1: hb_barrier (); return this+u.version1.featureList; -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return this+u.version2.featureList; -#endif - default: return Null (FeatureList); - } - } unsigned int get_lookup_count () const { - switch (u.version.major) { - case 1: hb_barrier (); return (this+u.version1.lookupList).len; #ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return (this+u.version2.lookupList).len; + if (version.to_int () >= 0x00010002u && lookupList2) + return (this + lookupList2).len; #endif - default: return 0; - } + return (this + lookupList).len; } const Lookup& get_lookup (unsigned int i) const { - switch (u.version.major) { - case 1: hb_barrier (); return (this+u.version1.lookupList)[i]; #ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return (this+u.version2.lookupList)[i]; + if (version.to_int () >= 0x00010002u && lookupList2) + return (this + lookupList2)[i]; #endif - default: return Null (Lookup); - } + return (this + lookupList)[i]; } const FeatureVariations &get_feature_variations () const { - switch (u.version.major) { - case 1: hb_barrier (); return (u.version.to_int () >= 0x00010001u && hb_barrier () ? this+u.version1.featureVars : Null (FeatureVariations)); -#ifndef HB_NO_BEYOND_64K - case 2: hb_barrier (); return this+u.version2.featureVars; -#endif - default: return Null (FeatureVariations); - } + return (version.to_int () >= 0x00010001u && hb_barrier ()) ? this+featureVars : Null (FeatureVariations); } - bool has_data () const { return u.version.to_int (); } + bool has_data () const { return version.to_int (); } unsigned int get_script_count () const { return get_script_list ().len; } const Tag& get_script_tag (unsigned int i) const @@ -4852,12 +6502,44 @@ struct GSUBGPOS #endif return get_feature_variations ().find_index (coords, num_coords, index, instancer); } + bool get_feature_variations_state (const int *coords, + unsigned int num_coords, + unsigned int *index, + ItemVarStoreInstancer *instancer, + hb_vector_t *lookup_conditions) const + { + lookup_conditions->reset (); +#ifdef HB_NO_VAR + *index = FeatureVariations::NOT_FOUND_INDEX; + return true; +#else + find_variations_index (coords, num_coords, index, instancer); + return get_feature_variations ().collect_lookup_conditions ( + coords, + num_coords, + instancer, + lookup_conditions); +#endif + } + bool get_lookup_variations (unsigned feature_index, + unsigned variations_index, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes) const + { +#ifdef HB_NO_VAR + return false; +#else + return get_feature_variations ().get_lookup_variations ( + feature_index, get_feature_variation (feature_index, variations_index), + conditions, lookup_indexes); +#endif + } const Feature& get_feature_variation (unsigned int feature_index, unsigned int variations_index) const { #ifndef HB_NO_VAR if (FeatureVariations::NOT_FOUND_INDEX != variations_index && - u.version.to_int () >= 0x00010001u) + version.to_int () >= 0x00010001u) { const Feature *feature = get_feature_variations ().find_substitute (variations_index, feature_index); @@ -4877,6 +6559,13 @@ struct GSUBGPOS #endif } + void collect_feature_variation_indices (hb_collect_variation_indices_context_t *c) const + { +#ifndef HB_NO_VAR + get_feature_variations ().collect_variation_indices (c); +#endif + } + #ifndef HB_NO_VAR void collect_feature_substitutes_with_variations (hb_collect_feature_substitutes_with_var_context_t *c) const { get_feature_variations ().collect_feature_substitutes_with_variations (c); } @@ -4964,15 +6653,33 @@ struct GSUBGPOS } void collect_name_ids (const hb_map_t *feature_index_map, - hb_set_t *nameids_to_retain /* OUT */) const + hb_set_t *nameids_to_retain, /* OUT */ + const hb_hashmap_t *feature_substitutes_map, + const hb_hashmap_t> *feature_record_cond_idx_map HB_UNUSED, + const hb_set_t *catch_all_features, + bool all_axes_pinned HB_UNUSED) const { unsigned count = get_feature_count (); for (unsigned i = 0 ; i < count; i++) { if (!feature_index_map->has (i)) continue; hb_tag_t tag = get_feature_tag (i); - get_feature (i).collect_name_ids (tag, nameids_to_retain); + const Feature *feature = &get_feature (i); + const Feature **substitute; + if (feature_substitutes_map->has (i, &substitute)) + { + feature = *substitute; + if (catch_all_features->has (i)) + get_feature (i).collect_name_ids (tag, nameids_to_retain); + } + feature->collect_name_ids (tag, nameids_to_retain); } +#ifndef HB_NO_VAR + if (!all_axes_pinned) + get_feature_variations ().collect_name_ids (feature_index_map, feature_record_cond_idx_map, + [this] (unsigned i) { return get_feature_tag (i); }, + nameids_to_retain); +#endif } template @@ -5044,15 +6751,90 @@ struct GSUBGPOS }; protected: - union { - FixedVersion<> version; /* Version identifier */ - GSUBGPOSVersion1_2 version1; + template + const Offset16To>& typed_lookup_list_offset () const + { return reinterpret_cast>&> (lookupList); } + #ifndef HB_NO_BEYOND_64K - GSUBGPOSVersion1_2 version2; + template + const Offset32To>& typed_lookup_list2_offset () const + { return reinterpret_cast>&> (lookupList2); } +#endif + + template + const Offset16To>& subset_lookup_list_offset () const + { return reinterpret_cast>&> (lookupList); } + template + Offset16To>& subset_lookup_list_offset () + { return reinterpret_cast>&> (lookupList); } + +#ifndef HB_NO_BEYOND_64K + template + const Offset32To>& subset_lookup_list2_offset () const + { return reinterpret_cast>&> (lookupList2); } +#endif + + const Offset16To& subset_feature_list_offset () const + { return reinterpret_cast&> (featureList); } + Offset16To& subset_feature_list_offset () + { return reinterpret_cast&> (featureList); } + +#ifndef HB_NO_BEYOND_64K + const Offset32To& subset_feature_list2_offset () const + { return reinterpret_cast&> (featureList2); } +#endif + + const void* get_lookup_list_field_offset () const + { +#ifndef HB_NO_BEYOND_64K + if (version.to_int () >= 0x00010002u && lookupList2) return &lookupList2; +#endif + return &lookupList; + } + + template + static bool serialize_subset_offset (hb_subset_context_t *c, + OffsetOut& out, + const OffsetIn& in, + const Base *base, + Ts&&... ds) + { + out = 0; + if (in.is_null ()) return false; + + auto *s = c->serializer; + s->push (); + bool ret = c->dispatch (base+in, std::forward (ds)...); + if (ret) s->add_link (out, s->pop_pack ()); + else s->pop_discard (); + return ret; + } + + FixedVersion<>version; /* Version of the GSUB/GPOS table--initially set + * to 0x00010000u */ + Offset16To + scriptList; /* Offset to ScriptList table */ + Offset16To + featureList; /* Offset to FeatureList table */ + Offset16To + lookupList; /* Offset to LookupList table */ + Offset32To + featureVars; /* Offset to Feature Variations table--from + * beginning of table (may be NULL). + * Introduced in version 0x00010001. */ +#ifndef HB_NO_BEYOND_64K + Offset32To + scriptList2; /* 32-bit offset to ScriptList table. + * Introduced in version 0x00010002. */ + Offset32To + featureList2; /* 32-bit offset to FeatureList table. + * Introduced in version 0x00010002. */ + Offset32To + lookupList2; /* 32-bit offset to LookupList2 table. + * Introduced in version 0x00010002. */ #endif - } u; public: - DEFINE_SIZE_MIN (4); + DEFINE_SIZE_MIN (10); }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh index 823520f74834..40886ebb5bec 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh @@ -136,13 +136,15 @@ struct JstfLangSys : List16OfOffset16To * ExtenderGlyphs -- Extender Glyph Table */ -typedef SortedArray16Of ExtenderGlyphs; +template +using ExtenderGlyphs = SortedArray16Of; /* * JstfScript -- The Justification Table */ +template struct JstfScript { unsigned int get_lang_sys_count () const @@ -174,17 +176,63 @@ struct JstfScript } protected: - Offset16To + typename Types::template LOffsetTo> extenderGlyphs; /* Offset to ExtenderGlyph table--from beginning * of JstfScript table-may be NULL */ - Offset16To + typename Types::template LOffsetTo defaultLangSys; /* Offset to DefaultJstfLangSys table--from * beginning of JstfScript table--may be Null */ RecordArrayOf langSys; /* Array of JstfLangSysRecords--listed * alphabetically by LangSysTag */ public: - DEFINE_SIZE_ARRAY (6, langSys); + DEFINE_SIZE_ARRAY (2 * Types::LOffset::static_size + 2, langSys); +}; + +template +struct JstfScriptRecord +{ + int cmp (hb_tag_t a) const { return tag.cmp (a); } + + bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + const Record_sanitize_closure_t closure = {tag, base}; + return_trace (c->check_struct (this) && + offset.sanitize (c, base, &closure)); + } + + Tag tag; /* 4-byte JstfScript identification tag */ + typename Types::template LOffsetTo> + offset; /* Offset from beginning of JSTF header */ + public: + DEFINE_SIZE_STATIC (4 + Types::LOffset::static_size); +}; + +template +struct JstfScriptList : SortedArray16Of> +{ + const Tag& get_tag (unsigned int i) const + { return (*this)[i].tag; } + unsigned int get_tags (unsigned int start_offset, + unsigned int *script_count /* IN/OUT */, + hb_tag_t *script_tags /* OUT */) const + { + if (script_count) + { + + this->as_array ().sub_array (start_offset, script_count) + | hb_map (&JstfScriptRecord::tag) + | hb_sink (hb_array (script_tags, *script_count)) + ; + } + return this->len; + } + const JstfScript& get_script (const void *base, unsigned int i) const + { return base+(*this)[i].offset; } + bool find_index (hb_tag_t tag, unsigned int *index) const + { + return this->bfind (tag, index, HB_NOT_FOUND_STORE, Index::NOT_FOUND_INDEX); + } }; @@ -198,37 +246,90 @@ struct JSTF static constexpr hb_tag_t tableTag = HB_OT_TAG_JSTF; unsigned int get_script_count () const - { return scriptList.len; } + { +#ifndef HB_NO_BEYOND_64K + if (has_script_list2 ()) return get_script_list2 ().len; +#endif + return scriptList.len; + } const Tag& get_script_tag (unsigned int i) const - { return scriptList.get_tag (i); } + { +#ifndef HB_NO_BEYOND_64K + if (has_script_list2 ()) return get_script_list2 ().get_tag (i); +#endif + return scriptList.get_tag (i); + } unsigned int get_script_tags (unsigned int start_offset, unsigned int *script_count /* IN/OUT */, hb_tag_t *script_tags /* OUT */) const - { return scriptList.get_tags (start_offset, script_count, script_tags); } - const JstfScript& get_script (unsigned int i) const - { return this+scriptList[i].offset; } + { +#ifndef HB_NO_BEYOND_64K + if (has_script_list2 ()) + return get_script_list2 ().get_tags (start_offset, script_count, script_tags); +#endif + return scriptList.get_tags (start_offset, script_count, script_tags); + } + template + const JstfScript& get_script (unsigned int i) const; bool find_script_index (hb_tag_t tag, unsigned int *index) const - { return scriptList.find_index (tag, index); } + { +#ifndef HB_NO_BEYOND_64K + if (has_script_list2 ()) return get_script_list2 ().find_index (tag, index); +#endif + return scriptList.find_index (tag, index); + } bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (version.sanitize (c) && - hb_barrier () && - likely (version.major == 1) && - scriptList.sanitize (c, this)); + if (unlikely (!version.sanitize (c) || + !hb_barrier () || + version.major != 1 || + !scriptList.sanitize (c, this))) + return_trace (false); +#ifndef HB_NO_BEYOND_64K + if (unlikely (version.minor >= 1 && !get_script_list2 ().sanitize (c, this))) + return_trace (false); +#endif + return_trace (true); } + private: +#ifndef HB_NO_BEYOND_64K + bool has_script_list2 () const + { return version.minor >= 1 && get_script_list2 ().len; } + const JstfScriptList& get_script_list2 () const + { return StructAfter> (scriptList); } +#endif + protected: FixedVersion<>version; /* Version of the JSTF table--initially set * to 0x00010000u */ - RecordArrayOf + JstfScriptList scriptList; /* Array of JstfScripts--listed * alphabetically by ScriptTag */ +#ifndef HB_NO_BEYOND_64K +/*JstfScriptList + scriptList2;*//* Array of JstfScript2s--listed + * alphabetically by ScriptTag. + * Present only if minorVersion is 1 or greater. */ +#endif public: DEFINE_SIZE_ARRAY (6, scriptList); }; +template <> +inline const JstfScript& +JSTF::get_script (unsigned int i) const +{ return scriptList.get_script (this, i); } + +#ifndef HB_NO_BEYOND_64K +template <> +inline const JstfScript& +JSTF::get_script (unsigned int i) const +{ return get_script_list2 ().get_script (this, i); } +#endif + } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc index 5f0bd1bce848..1d5dacfd0583 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc @@ -265,6 +265,7 @@ OT::GDEF::is_blocklisted (hb_blob_t *blob, return false; } +template static void _hb_ot_layout_set_glyph_props (hb_font_t *font, hb_buffer_t *buffer) @@ -276,6 +277,8 @@ _hb_ot_layout_set_glyph_props (hb_font_t *font, hb_glyph_info_t *info = buffer->info; for (unsigned int i = 0; i < count; i++) { + if (SetDigest) + buffer->digest.add (info[i].codepoint); _hb_glyph_info_set_glyph_props (&info[i], gdef.get_glyph_props (info[i].codepoint)); _hb_glyph_info_clear_lig_props (&info[i]); } @@ -345,7 +348,7 @@ hb_ot_layout_get_glyphs_in_class (hb_face_t *face, * @start_offset: offset of the first attachment point to retrieve * @point_count: (inout) (nullable): Input = the maximum number of attachment points to return; * Output = the actual number of attachment points returned (may be zero) - * @point_array: (out) (array length=point_count): The array of attachment points found for the query + * @point_array: (out) (array length=point_count) (nullable): The array of attachment points found for the query * * Fetches a list of all attachment points for the specified glyph in the GDEF * table of the face. The list returned will begin at the offset provided. @@ -375,7 +378,7 @@ hb_ot_layout_get_attach_points (hb_face_t *face, * @start_offset: offset of the first caret position to retrieve * @caret_count: (inout) (nullable): Input = the maximum number of caret positions to return; * Output = the actual number of caret positions returned (may be zero) - * @caret_array: (out) (array length=caret_count): The array of caret positions found for the query + * @caret_array: (out) (array length=caret_count) (nullable): The array of caret positions found for the query * * Fetches a list of the caret positions defined for a ligature glyph in the GDEF * table of the font. The list returned will begin at the offset provided. @@ -446,7 +449,7 @@ get_gsubgpos_table (hb_face_t *face, * @start_offset: offset of the first script tag to retrieve * @script_count: (inout) (nullable): Input = the maximum number of script tags to return; * Output = the actual number of script tags returned (may be zero) - * @script_tags: (out) (array length=script_count): The array of #hb_tag_t script tags found for the query + * @script_tags: (out) (array length=script_count) (nullable): The array of #hb_tag_t script tags found for the query * * Fetches a list of all scripts enumerated in the specified face's GSUB table * or GPOS table. The list returned will begin at the offset provided. @@ -615,7 +618,7 @@ hb_ot_layout_table_select_script (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output = the actual number of feature tags returned (may be zero) - * @feature_tags: (out) (array length=feature_count): Array of feature tags found in the table + * @feature_tags: (out) (array length=feature_count) (nullable): Array of feature tags found in the table * * Fetches a list of all feature tags in the given face's GSUB or GPOS table. * Note that there might be duplicate feature tags, belonging to different @@ -685,7 +688,7 @@ hb_ot_layout_table_find_feature (hb_face_t *face, * @start_offset: offset of the first language tag to retrieve * @language_count: (inout) (nullable): Input = the maximum number of language tags to return; * Output = the actual number of language tags returned (may be zero) - * @language_tags: (out) (array length=language_count): Array of language tags found in the table + * @language_tags: (out) (array length=language_count) (nullable): Array of language tags found in the table * * Fetches a list of language tags in the given face's GSUB or GPOS table, underneath * the specified script index. The list returned will begin at the offset provided. @@ -913,7 +916,7 @@ hb_ot_layout_language_get_required_feature (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output: the actual number of feature tags returned (may be zero) - * @feature_indexes: (out) (array length=feature_count): The array of feature indexes found for the query + * @feature_indexes: (out) (array length=feature_count) (nullable): The array of feature indexes found for the query * * Fetches a list of all features in the specified face's GSUB table * or GPOS table, underneath the specified script and language. The list @@ -949,7 +952,7 @@ hb_ot_layout_language_get_feature_indexes (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output = the actual number of feature tags returned (may be zero) - * @feature_tags: (out) (array length=feature_count): The array of #hb_tag_t feature tags found for the query + * @feature_tags: (out) (array length=feature_count) (nullable): The array of #hb_tag_t feature tags found for the query * * Fetches a list of all features in the specified face's GSUB table * or GPOS table, underneath the specified script and language. The list @@ -975,7 +978,7 @@ hb_ot_layout_language_get_feature_tags (hb_face_t *face, static_assert ((sizeof (unsigned int) == sizeof (hb_tag_t)), ""); unsigned int ret = l.get_feature_indexes (start_offset, feature_count, (unsigned int *) feature_tags); - if (feature_tags) { + if (feature_count && feature_tags) { unsigned int count = *feature_count; for (unsigned int i = 0; i < count; i++) feature_tags[i] = g.get_feature_tag ((unsigned int) feature_tags[i]); @@ -1037,7 +1040,7 @@ hb_ot_layout_language_find_feature (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return; * Output = the actual number of lookups returned (may be zero) - * @lookup_indexes: (out) (array length=lookup_count): The array of lookup indexes found for the query + * @lookup_indexes: (out) (array length=lookup_count) (nullable): The array of lookup indexes found for the query * * Fetches a list of all lookups enumerated for the specified feature, in * the specified face's GSUB table or GPOS table. The list returned will @@ -1432,6 +1435,39 @@ hb_ot_layout_lookup_collect_glyphs (hb_face_t *face, /* Variations support */ +bool +_hb_ot_layout_table_get_feature_variations_state (hb_face_t *face, + hb_tag_t table_tag, + const int *coords, + unsigned int num_coords, + unsigned int *variations_index, + hb_vector_t *lookup_conditions) +{ + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::GDEF &gdef = *face->table.GDEF->table; + + auto instancer = OT::ItemVarStoreInstancer (&gdef.get_var_store (), nullptr, + hb_array (coords, num_coords)); + + return g.get_feature_variations_state (coords, + num_coords, + variations_index, + &instancer, + lookup_conditions); +} + +bool +_hb_ot_layout_feature_get_lookup_variations (hb_face_t *face, + hb_tag_t table_tag, + unsigned feature_index, + unsigned variations_index, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes) +{ + return get_gsubgpos_table (face, table_tag).get_lookup_variations ( + feature_index, variations_index, conditions, lookup_indexes); +} + /** * hb_ot_layout_table_find_feature_variations: @@ -1475,7 +1511,7 @@ hb_ot_layout_table_find_feature_variations (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return; * Output = the actual number of lookups returned (may be zero) - * @lookup_indexes: (out) (array length=lookup_count): The array of lookups found for the query + * @lookup_indexes: (out) (array length=lookup_count) (nullable): The array of lookups found for the query * * Fetches a list of all lookups enumerated for the specified feature, in * the specified face's GSUB table or GPOS table, enabled at the specified @@ -1573,7 +1609,15 @@ void hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer) { - _hb_ot_layout_set_glyph_props (font, buffer); + _hb_ot_layout_set_glyph_props (font, buffer); +} + +void +hb_ot_layout_substitute_start_with_digest (hb_font_t *font, + hb_buffer_t *buffer) +{ + buffer->digest = hb_set_digest_t (); + _hb_ot_layout_set_glyph_props (font, buffer); } /** @@ -1854,7 +1898,7 @@ hb_ot_layout_feature_get_name_ids (hb_face_t *face, * @start_offset: offset of the first character to retrieve * @char_count: (inout) (nullable): Input = the maximum number of characters to return; * Output = the actual number of characters returned (may be zero) - * @characters: (out caller-allocates) (array length=char_count): A buffer pointer. + * @characters: (out caller-allocates) (array length=char_count) (nullable): A buffer pointer. * The Unicode codepoints of the characters for which this feature provides * glyph variants. * @@ -2037,7 +2081,9 @@ inline void hb_ot_map_t::apply (const Proxy &proxy, !buffer->message (font, "start lookup %u feature '%c%c%c%c'", lookup_index, HB_UNTAG (lookup.feature_tag))) continue; /* Only try applying the lookup if there is any overlap. */ - if (accel->digest.may_intersect (buffer->digest)) + if (accel->digest.may_intersect (buffer->digest) && + ((buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) || + accel->digest_second.may_intersect (buffer->digest))) { c.set_lookup_index (lookup_index); c.set_lookup_mask (lookup.mask, false); @@ -2272,6 +2318,9 @@ hb_ot_layout_get_horizontal_baseline_tag_for_script (hb_script_t script) case HB_SCRIPT_NUSHU: /* Unicode-13.0 additions */ case HB_SCRIPT_KHITAN_SMALL_SCRIPT: + /* Unicode-18.0 additions */ + case HB_SCRIPT_JURCHEN: + case HB_SCRIPT_SEAL: return HB_OT_LAYOUT_BASELINE_TAG_IDEO_FACE_BOTTOM_OR_LEFT; default: @@ -2288,7 +2337,7 @@ hb_ot_layout_get_horizontal_baseline_tag_for_script (hb_script_t script) * @language_tag: language tag, currently unused. * @coord: (out) (nullable): baseline value if found. * - * Fetches a baseline value from the face. + * Fetches a baseline value from the font. * * Return value: `true` if found baseline value in the font. * @@ -2314,7 +2363,7 @@ hb_ot_layout_get_baseline (hb_font_t *font, * @language: (nullable): language, currently unused. * @coord: (out) (nullable): baseline value if found. * - * Fetches a baseline value from the face. + * Fetches a baseline value from the font. * * This function is like hb_ot_layout_get_baseline() but takes * #hb_script_t and #hb_language_t instead of OpenType #hb_tag_t. @@ -2350,7 +2399,7 @@ hb_ot_layout_get_baseline2 (hb_font_t *font, * @language_tag: language tag, currently unused. * @coord: (out): baseline value if found. * - * Fetches a baseline value from the face, and synthesizes + * Fetches a baseline value from the font, and synthesizes * it if the font does not have it. * * Since: 4.0.0 @@ -2389,7 +2438,7 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, hb_font_get_nominal_glyph (font, '-', &glyph)) && hb_font_get_glyph_extents (font, glyph, &extents)) { - *coord = extents.y_bearing + extents.height / 2; + *coord = hb_saturate_add (extents.y_bearing, extents.height / 2); } else { @@ -2421,9 +2470,11 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, &embox_bottom); if (baseline_tag == HB_OT_LAYOUT_BASELINE_TAG_IDEO_FACE_TOP_OR_RIGHT) - *coord = embox_top + (embox_bottom - embox_top) / 10; + *coord = hb_saturate_add (embox_top, + hb_clamp_to (((int64_t) embox_bottom - embox_top) / 10)); else - *coord = embox_bottom + (embox_top - embox_bottom) / 10; + *coord = hb_saturate_add (embox_bottom, + hb_clamp_to (((int64_t) embox_top - embox_bottom) / 10)); } break; @@ -2434,7 +2485,8 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, script_tag, language_tag, coord)) - *coord += HB_DIRECTION_IS_HORIZONTAL (direction) ? font->y_scale : font->x_scale; + *coord = hb_saturate_add (*coord, + HB_DIRECTION_IS_HORIZONTAL (direction) ? font->y_scale : font->x_scale); else { hb_font_extents_t font_extents; @@ -2450,7 +2502,8 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, script_tag, language_tag, coord)) - *coord -= HB_DIRECTION_IS_HORIZONTAL (direction) ? font->y_scale : font->x_scale; + *coord = hb_saturate_sub (*coord, + HB_DIRECTION_IS_HORIZONTAL (direction) ? font->y_scale : font->x_scale); else { hb_font_extents_t font_extents; @@ -2510,10 +2563,10 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, hb_font_get_glyph_extents (font, glyph, &extents)) *coord = extents.y_bearing; else - *coord = font->y_scale * 6 / 10; // FIXME makes assumptions about origin + *coord = hb_clamp_to ((int64_t) font->y_scale * 6 / 10); // FIXME makes assumptions about origin } else - *coord = font->x_scale * 6 / 10; // FIXME makes assumptions about origin + *coord = hb_clamp_to ((int64_t) font->x_scale * 6 / 10); // FIXME makes assumptions about origin break; case HB_OT_LAYOUT_BASELINE_TAG_IDEO_EMBOX_CENTRAL: @@ -2531,7 +2584,7 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, script_tag, language_tag, &bottom); - *coord = (top + bottom) / 2; + *coord = hb_clamp_to (((int64_t) top + bottom) / 2); } break; @@ -2551,7 +2604,7 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, script_tag, language_tag, &bottom); - *coord = (top + bottom) / 2; + *coord = hb_clamp_to (((int64_t) top + bottom) / 2); } break; @@ -2572,7 +2625,7 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, * @language: (nullable): language, currently unused. * @coord: (out): baseline value if found. * - * Fetches a baseline value from the face, and synthesizes + * Fetches a baseline value from the font, and synthesizes * it if the font does not have it. * * This function is like hb_ot_layout_get_baseline_with_fallback() but takes @@ -2629,7 +2682,7 @@ struct hb_get_glyph_alternates_dispatch_t : * @start_offset: starting offset. * @alternate_count: (inout) (nullable): Input = the maximum number of alternate glyphs to return; * Output = the actual number of alternate glyphs returned (may be zero). - * @alternate_glyphs: (out caller-allocates) (array length=alternate_count): A glyphs buffer. + * @alternate_glyphs: (out caller-allocates) (array length=alternate_count) (nullable): A glyphs buffer. * Alternate glyphs associated with the glyph id. * * Fetches alternates of a glyph from a given GSUB lookup index. Note that for one-to-one GSUB @@ -2764,13 +2817,13 @@ hb_ot_layout_lookup_get_optical_bound (hb_font_t *font, ret = pos.x_offset; break; case HB_DIRECTION_RTL: - ret = pos.x_advance - pos.x_offset; + ret = hb_saturate_sub (pos.x_advance, pos.x_offset); break; case HB_DIRECTION_TTB: ret = pos.y_offset; break; case HB_DIRECTION_BTT: - ret = pos.y_advance - pos.y_offset; + ret = hb_saturate_sub (pos.y_advance, pos.y_offset); break; case HB_DIRECTION_INVALID: default: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh index f669ac7c46d1..a32df83c83b0 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh @@ -102,6 +102,10 @@ HB_INTERNAL void hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer); +HB_INTERNAL void +hb_ot_layout_substitute_start_with_digest (hb_font_t *font, + hb_buffer_t *buffer); + namespace OT { struct hb_ot_apply_context_t; struct hb_ot_layout_lookup_accelerator_t; @@ -159,7 +163,8 @@ static inline unsigned int _hb_next_syllable (hb_buffer_t *buffer, unsigned int start) { hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; + unsigned int count = start + hb_min (buffer->len - start, + (unsigned) HB_MAX_SYLLABLE_LENGTH); unsigned int syllable = info[start].syllable(); while (++start < count && syllable == info[start].syllable()) @@ -567,6 +572,20 @@ _hb_glyph_info_multiplied (const hb_glyph_info_t *info) return info->glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED; } +static inline unsigned int +_hb_glyph_info_get_lig_num_comps_in_ligation (const hb_glyph_info_t *info) +{ + /* When a glyph is decomposed by a MultipleSubst and its pieces later become + * components of a ligature, the pieces belong to the same ligature component + * as the first piece, matching how MarkBasePos attaches marks only to the + * first piece. So the non-first pieces contribute no extra component. + * https://github.com/harfbuzz/harfbuzz/issues/4969 */ + if (_hb_glyph_info_multiplied (info) && + _hb_glyph_info_get_lig_comp (info)) + return 0; + return _hb_glyph_info_get_lig_num_comps (info); +} + static inline bool _hb_glyph_info_ligated_and_didnt_multiply (const hb_glyph_info_t *info) { diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc index a0cdfddfa632..94ae3e76bf28 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc @@ -128,7 +128,7 @@ void hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m, unsigned int table_index, unsigned int feature_index, - unsigned int variations_index, + const hb_ot_shape_plan_key_t &key, hb_mask_t mask, bool auto_zwnj, bool auto_zwj, @@ -142,13 +142,37 @@ hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m, table_lookup_count = hb_ot_layout_table_get_lookup_count (face, table_tags[table_index]); + hb_set_t varied_lookups; + if (key.get_lookup_variations (face, table_index, feature_index, &varied_lookups)) + { + if (unlikely (varied_lookups.in_error ())) + { + m.lookups[table_index].ensure_error (); + return; + } + for (unsigned int lookup_index : varied_lookups) + { + if (lookup_index >= table_lookup_count) + continue; + hb_ot_map_t::lookup_map_t *lookup = m.lookups[table_index].push (); + lookup->mask = mask; + lookup->index = lookup_index; + lookup->auto_zwnj = auto_zwnj; + lookup->auto_zwj = auto_zwj; + lookup->random = random; + lookup->per_syllable = per_syllable; + lookup->feature_tag = feature_tag; + } + return; + } + offset = 0; do { len = ARRAY_LENGTH (lookup_indices); hb_ot_layout_feature_with_variations_get_lookups (face, - table_tags[table_index], - feature_index, - variations_index, + table_tags[table_index], + feature_index, + key.variations_index[table_index], offset, &len, lookup_indices); @@ -342,7 +366,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m, required_feature_stage[table_index] == stage) add_lookups (m, table_index, required_feature_index[table_index], - key.variations_index[table_index], + key, global_bit_mask); for (auto &feature : m.features) @@ -350,7 +374,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m, if (feature.stage[table_index] == stage) add_lookups (m, table_index, feature.index[table_index], - key.variations_index[table_index], + key, feature.mask, feature.auto_zwnj, feature.auto_zwj, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh index 68af9792439f..dcefdcb37e14 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh @@ -247,7 +247,7 @@ struct hb_ot_map_builder_t HB_INTERNAL void add_lookups (hb_ot_map_t &m, unsigned int table_index, unsigned int feature_index, - unsigned int variations_index, + const hb_ot_shape_plan_key_t &key, hb_mask_t mask, bool auto_zwnj = true, bool auto_zwj = true, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh index ad9d7cb03e8b..08aab5f6f595 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh @@ -29,7 +29,9 @@ #include "hb-open-type.hh" #include "hb-ot-layout-common.hh" +#include "hb-ot-layout-gdef-table.hh" #include "hb-ot-math.h" +#include "hb-depend-data.hh" namespace OT { @@ -37,20 +39,38 @@ namespace OT { struct MathValueRecord { hb_position_t get_x_value (hb_font_t *font, const void *base) const - { return font->em_scale_x (value) + (base+deviceTable).get_x_delta (font); } + { return hb_saturate_add (font->em_scale_x (value), (base+deviceTable).get_x_delta (font, get_var_store (font, base))); } hb_position_t get_y_value (hb_font_t *font, const void *base) const - { return font->em_scale_y (value) + (base+deviceTable).get_y_delta (font); } + { return hb_saturate_add (font->em_scale_y (value), (base+deviceTable).get_y_delta (font, get_var_store (font, base))); } - MathValueRecord* copy (hb_serialize_context_t *c, const void *base) const + const ItemVariationStore &get_var_store (hb_font_t *font, const void *base) const + { +#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_LAYOUT) + if ((base+deviceTable).is_variation_device ()) + return font->face->table.GDEF->table->get_var_store (); +#endif + return Null (ItemVariationStore); + } + + MathValueRecord* copy (hb_serialize_context_t *c, const void *base, + const hb_hashmap_t> *variation_map) const { TRACE_SERIALIZE (this); auto *out = c->embed (this); if (unlikely (!out)) return_trace (nullptr); - out->deviceTable.serialize_copy (c, deviceTable, base, 0, hb_serialize_context_t::Head); + hb_pair_t *varidx_delta; + if (variation_map->has ((base+deviceTable).get_variation_index (), &varidx_delta) && + !c->check_assign (out->value, (int64_t) value + hb_second (*varidx_delta), + HB_SERIALIZE_ERROR_INT_OVERFLOW)) + return_trace (nullptr); + out->deviceTable.serialize_copy (c, deviceTable, base, 0, hb_serialize_context_t::Head, variation_map); return_trace (out); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c, const void *base) const + { (base+deviceTable).collect_variation_indices (c); } + bool sanitize (hb_sanitize_context_t *c, const void *base) const { TRACE_SANITIZE (this); @@ -71,7 +91,8 @@ struct MathConstants { friend struct MATH; - MathConstants* copy (hb_serialize_context_t *c) const + MathConstants* copy (hb_serialize_context_t *c, + const hb_hashmap_t> *variation_map) const { TRACE_SERIALIZE (this); auto *out = c->start_embed (this); @@ -86,13 +107,19 @@ struct MathConstants unsigned count = ARRAY_LENGTH (mathValueRecords); for (unsigned i = 0; i < count; i++) - if (!c->copy (mathValueRecords[i], this)) + if (!c->copy (mathValueRecords[i], this, variation_map)) return_trace (nullptr); if (!c->embed (radicalDegreeBottomRaisePercent)) return_trace (nullptr); return_trace (out); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &record : mathValueRecords) + record.collect_variation_indices (c, this); + } + bool sanitize_math_value_records (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -211,7 +238,7 @@ struct MathItalicsCorrectionInfo hb_sorted_vector_t new_coverage; + hb_zip (this+coverage, italicsCorrection) | hb_filter (glyphset, hb_first) - | hb_filter (serialize_math_record_array (c->serializer, out->italicsCorrection, this), hb_second) + | hb_filter (serialize_math_record_array (c->serializer, out->italicsCorrection, this, &c->plan->layout_variation_idx_delta_map), hb_second) | hb_map (hb_first) | hb_map (glyph_map) | hb_sink (new_coverage) @@ -221,6 +248,13 @@ struct MathItalicsCorrectionInfo return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &entry : hb_zip (this+coverage, italicsCorrection)) + if (c->glyph_set->has (hb_first (entry))) + hb_second (entry).collect_variation_indices (c, this); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -264,7 +298,7 @@ struct MathTopAccentAttachment hb_sorted_vector_t new_coverage; + hb_zip (this+topAccentCoverage, topAccentAttachment) | hb_filter (glyphset, hb_first) - | hb_filter (serialize_math_record_array (c->serializer, out->topAccentAttachment, this), hb_second) + | hb_filter (serialize_math_record_array (c->serializer, out->topAccentAttachment, this, &c->plan->layout_variation_idx_delta_map), hb_second) | hb_map (hb_first) | hb_map (glyph_map) | hb_sink (new_coverage) @@ -274,6 +308,13 @@ struct MathTopAccentAttachment return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &entry : hb_zip (this+topAccentCoverage, topAccentAttachment)) + if (c->glyph_set->has (hb_first (entry))) + hb_second (entry).collect_variation_indices (c, this); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -307,7 +348,8 @@ struct MathTopAccentAttachment struct MathKern { - MathKern* copy (hb_serialize_context_t *c) const + MathKern* copy (hb_serialize_context_t *c, + const hb_hashmap_t> *variation_map) const { TRACE_SERIALIZE (this); auto *out = c->start_embed (this); @@ -316,12 +358,18 @@ struct MathKern unsigned count = 2 * heightCount + 1; for (unsigned i = 0; i < count; i++) - if (!c->copy (mathValueRecordsZ.arrayZ[i], this)) + if (!c->copy (mathValueRecordsZ.arrayZ[i], this, variation_map)) return_trace (nullptr); return_trace (out); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &record : mathValueRecordsZ.as_array (2 * heightCount + 1)) + record.collect_variation_indices (c, this); + } + bool sanitize_math_value_records (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -355,7 +403,10 @@ struct MathKern unsigned int pos; auto cmp = +[](const void* key, const void* p, int sign, hb_font_t* font, const MathKern* mathKern) -> int { - return sign * *(hb_position_t*)key - sign * ((MathValueRecord*)p)->get_y_value(font, mathKern); + hb_position_t a = *(hb_position_t *) key; + hb_position_t b = ((MathValueRecord *) p)->get_y_value (font, mathKern); + if (a == b) return 0; + return sign > 0 ? (a < b ? -1 : +1) : (b < a ? -1 : +1); }; unsigned int i = hb_bsearch_impl(&pos, correction_height, correctionHeight, heightCount, MathValueRecord::static_size, @@ -372,7 +423,7 @@ struct MathKern const MathValueRecord* kernValue = mathValueRecordsZ.arrayZ + heightCount; const unsigned int entriesCount = heightCount + 1; - if (entries_count) + if (entries_count && kern_entries) { unsigned int start = hb_min (start_offset, entriesCount); unsigned int end = hb_min (start + *entries_count, entriesCount); @@ -413,7 +464,8 @@ struct MathKern struct MathKernInfoRecord { - MathKernInfoRecord* copy (hb_serialize_context_t *c, const void *base) const + MathKernInfoRecord* copy (hb_serialize_context_t *c, const void *base, + const hb_hashmap_t> *variation_map) const { TRACE_SERIALIZE (this); auto *out = c->embed (this); @@ -421,11 +473,17 @@ struct MathKernInfoRecord unsigned count = ARRAY_LENGTH (mathKern); for (unsigned i = 0; i < count; i++) - out->mathKern[i].serialize_copy (c, mathKern[i], base, 0, hb_serialize_context_t::Head); + out->mathKern[i].serialize_copy (c, mathKern[i], base, 0, hb_serialize_context_t::Head, variation_map); return_trace (out); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c, const void *base) const + { + for (const auto &offset : mathKern) + (base+offset).collect_variation_indices (c); + } + bool sanitize (hb_sanitize_context_t *c, const void *base) const { TRACE_SANITIZE (this); @@ -489,7 +547,7 @@ struct MathKernInfo hb_sorted_vector_t new_coverage; + hb_zip (this+mathKernCoverage, mathKernInfoRecords) | hb_filter (glyphset, hb_first) - | hb_filter (serialize_math_record_array (c->serializer, out->mathKernInfoRecords, this), hb_second) + | hb_filter (serialize_math_record_array (c->serializer, out->mathKernInfoRecords, this, &c->plan->layout_variation_idx_delta_map), hb_second) | hb_map (hb_first) | hb_map (glyph_map) | hb_sink (new_coverage) @@ -499,6 +557,13 @@ struct MathKernInfo return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &entry : hb_zip (this+mathKernCoverage, mathKernInfoRecords)) + if (c->glyph_set->has (hb_first (entry))) + hb_second (entry).collect_variation_indices (c, this); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -578,6 +643,13 @@ struct MathGlyphInfo return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + (this+mathItalicsCorrectionInfo).collect_variation_indices (c); + (this+mathTopAccentAttachment).collect_variation_indices (c); + (this+mathKernInfo).collect_variation_indices (c); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -662,6 +734,9 @@ struct MathGlyphVariantRecord return_trace (c->check_struct (this)); } + void depend (hb_depend_data_builder_t *depend_data, unsigned source) const + { depend_data->add_depend(source, HB_OT_TAG_MATH, variantGlyph); } + void closure_glyphs (hb_set_t *variant_glyphs) const { variant_glyphs->add (variantGlyph); } @@ -723,6 +798,9 @@ struct MathGlyphPartRecord (partFlags & PartFlags::Defined); } + void depend (hb_depend_data_builder_t *depend_data, unsigned source) const + { depend_data->add_depend(source, HB_OT_TAG_MATH, glyph); } + void closure_glyphs (hb_set_t *variant_glyphs) const { variant_glyphs->add (glyph); } @@ -753,7 +831,7 @@ struct MathGlyphAssembly { TRACE_SUBSET (this); - if (!c->serializer->copy (italicsCorrection, this)) return_trace (false); + if (!c->serializer->copy (italicsCorrection, this, &c->plan->layout_variation_idx_delta_map)) return_trace (false); if (!c->serializer->copy (partRecords.len)) return_trace (false); for (const auto& record : partRecords.iter ()) @@ -761,6 +839,11 @@ struct MathGlyphAssembly return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + italicsCorrection.collect_variation_indices (c, this); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -776,7 +859,7 @@ struct MathGlyphAssembly hb_ot_math_glyph_part_t *parts /* OUT */, hb_position_t *italics_correction /* OUT */) const { - if (parts_count) + if (parts_count && parts) { int64_t mult = font->dir_mult (direction); for (auto _ : hb_zip (partRecords.as_array ().sub_array (start_offset, parts_count), @@ -790,6 +873,12 @@ struct MathGlyphAssembly return partRecords.len; } + void depend (hb_depend_data_builder_t *depend_data, unsigned source) const + { + for (const auto& _ : partRecords.iter ()) + _.depend (depend_data, source); + } + void closure_glyphs (hb_set_t *variant_glyphs) const { for (const auto& _ : partRecords.iter ()) @@ -829,6 +918,11 @@ struct MathGlyphConstruction return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + (this+glyphAssembly).collect_variation_indices (c); + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -845,7 +939,7 @@ struct MathGlyphConstruction unsigned int *variants_count, /* IN/OUT */ hb_ot_math_glyph_variant_t *variants /* OUT */) const { - if (variants_count) + if (variants_count && variants) { int64_t mult = font->dir_mult (direction); for (auto _ : hb_zip (mathGlyphVariantRecord.as_array ().sub_array (start_offset, variants_count), @@ -855,6 +949,14 @@ struct MathGlyphConstruction return mathGlyphVariantRecord.len; } + void depend (hb_depend_data_builder_t *depend_data, unsigned source) const + { + (this+glyphAssembly).depend (depend_data, source); + + for (const auto& _ : mathGlyphVariantRecord.iter ()) + _.depend (depend_data, source); + } + void closure_glyphs (hb_set_t *variant_glyphs) const { (this+glyphAssembly).closure_glyphs (variant_glyphs); @@ -877,6 +979,34 @@ struct MathGlyphConstruction struct MathVariants { + void depend (hb_depend_data_builder_t *depend_data) const + { + const hb_array_t> glyph_construction_offsets = glyphConstruction.as_array (vertGlyphCount + horizGlyphCount); + + if (vertGlyphCoverage) + { + const auto vert_offsets = glyph_construction_offsets.sub_array (0, vertGlyphCount); + + hb_zip (this+vertGlyphCoverage, vert_offsets) + | hb_apply ([&] (const hb_pair_t&> &_) + { + const MathGlyphConstruction &mgc = this+_.second; + mgc.depend (depend_data, _.first); + }) + ; + } + if (horizGlyphCoverage) + { + const auto hori_offsets = glyph_construction_offsets.sub_array (vertGlyphCount, horizGlyphCount); + + hb_zip (this+horizGlyphCoverage, hori_offsets) + | hb_apply ([&] (const hb_pair_t&> &_) + { + const MathGlyphConstruction &mgc = this+_.second; + mgc.depend (depend_data, _.first); + }) + ; + } + } + void closure_glyphs (const hb_set_t *glyph_set, hb_set_t *variant_glyphs) const { @@ -931,7 +1061,7 @@ struct MathVariants bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - const hb_set_t &glyphset = c->plan->_glyphset_mathed; + const hb_set_t &glyphset = c->plan->_glyphset_cmaped; const hb_map_t &glyph_map = *c->plan->glyph_map; auto *out = c->serializer->start_embed (*this); @@ -965,6 +1095,16 @@ struct MathVariants return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c) const + { + for (const auto &entry : hb_zip (this+vertGlyphCoverage, glyphConstruction.as_array (vertGlyphCount))) + if (c->glyph_set->has (hb_first (entry))) + (this+hb_second (entry)).collect_variation_indices (c); + for (const auto &entry : hb_zip (this+horizGlyphCoverage, glyphConstruction.as_array (vertGlyphCount + horizGlyphCount).sub_array (vertGlyphCount))) + if (c->glyph_set->has (hb_first (entry))) + (this+hb_second (entry)).collect_variation_indices (c); + } + bool sanitize_offsets (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); @@ -1073,6 +1213,12 @@ struct MATH bool has_data () const { return version.to_int (); } + void depend (hb_depend_data_builder_t *depend_data) const + { + if (mathVariants) + (this+mathVariants).depend (depend_data); + } + void closure_glyphs (hb_set_t *glyph_set) const { if (mathVariants) @@ -1089,12 +1235,22 @@ struct MATH auto *out = c->serializer->embed (*this); if (unlikely (!out)) return_trace (false); - out->mathConstants.serialize_copy (c->serializer, mathConstants, this, 0, hb_serialize_context_t::Head); + out->mathConstants.serialize_copy (c->serializer, mathConstants, this, 0, hb_serialize_context_t::Head, &c->plan->layout_variation_idx_delta_map); out->mathGlyphInfo.serialize_subset (c, mathGlyphInfo, this); out->mathVariants.serialize_subset (c, mathVariants, this); return_trace (true); } + void collect_variation_indices (hb_collect_variation_indices_context_t *c, const hb_set_t *variant_glyph_set) const + { + (this+mathConstants).collect_variation_indices (c); + (this+mathGlyphInfo).collect_variation_indices (c); + auto *glyph_set = c->glyph_set; + c->glyph_set = variant_glyph_set; + (this+mathVariants).collect_variation_indices (c); + c->glyph_set = glyph_set; + } + bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc index ab1f50c8eb80..040fdd7a6b22 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc @@ -206,7 +206,7 @@ hb_ot_math_get_glyph_kerning (hb_font_t *font, * @start_offset: offset of the first kern entry to retrieve * @entries_count: (inout) (optional): Input = the maximum number of kern entries to return; * Output = the actual number of kern entries returned - * @kern_entries: (out caller-allocates) (array length=entries_count): array of kern entries returned + * @kern_entries: (out caller-allocates) (array length=entries_count) (nullable): array of kern entries returned * * Fetches the raw MathKern (cut-in) data for the specified font, glyph index, * and @kern. The corresponding list of kern values and correction heights is @@ -251,7 +251,7 @@ hb_ot_math_get_glyph_kernings (hb_font_t *font, * @start_offset: offset of the first variant to retrieve * @variants_count: (inout): Input = the maximum number of variants to return; * Output = the actual number of variants returned - * @variants: (out) (array length=variants_count): array of variants returned + * @variants: (out) (array length=variants_count) (nullable): array of variants returned * * Fetches the MathGlyphConstruction for the specified font, glyph index, and * direction. The corresponding list of size variants is returned as a list of @@ -313,7 +313,7 @@ hb_ot_math_get_min_connector_overlap (hb_font_t *font, * @start_offset: offset of the first glyph part to retrieve * @parts_count: (inout): Input = maximum number of glyph parts to return; * Output = actual number of parts returned - * @parts: (out) (array length=parts_count): the glyph parts returned + * @parts: (out) (array length=parts_count) (nullable): the glyph parts returned * @italics_correction: (out): italics correction of the glyph assembly * * Fetches the GlyphAssembly for the specified font, glyph index, and direction. diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh index f6eeda40ed67..72e34cb15d7b 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh @@ -28,6 +28,7 @@ #define HB_OT_MAXP_TABLE_HH #include "hb-open-type.hh" +#include "hb-ot-dual.hh" namespace OT { @@ -38,6 +39,7 @@ namespace OT { */ #define HB_OT_TAG_maxp HB_TAG('m','a','x','p') +#define HB_OT_TAG_MAXP HB_TAG('M','A','X','P') struct maxpV1Tail { @@ -69,10 +71,9 @@ struct maxpV1Tail }; -struct maxp +template +struct maxp_MAXP { - static constexpr hb_tag_t tableTag = HB_OT_TAG_maxp; - unsigned int get_num_glyphs () const { return numGlyphs; } void set_num_glyphs (unsigned int count) @@ -97,10 +98,11 @@ struct maxp bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - maxp *maxp_prime = c->serializer->embed (this); + maxp_MAXP *maxp_prime = c->serializer->embed (this); if (unlikely (!maxp_prime)) return_trace (false); - maxp_prime->numGlyphs = hb_min (c->plan->num_output_glyphs (), 0xFFFFu); + maxp_prime->numGlyphs = hb_min (c->plan->num_output_glyphs (), + (1u << (8 * Types::size)) - 1); if (maxp_prime->version.major == 1) { hb_barrier (); @@ -142,11 +144,66 @@ struct maxp protected: FixedVersion<>version;/* Version of the maxp table (0.5 or 1.0), * 0x00005000u or 0x00010000u. */ - HBUINT16 numGlyphs; + typename Types::HBUINT + numGlyphs; /* The number of glyphs in the font. */ /*maxpV1Tail v1Tail[HB_VAR_ARRAY]; */ public: - DEFINE_SIZE_STATIC (6); + DEFINE_SIZE_STATIC (4 + Types::HBUINT::static_size); +}; + +struct maxp : maxp_MAXP +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_maxp; +}; + +struct MAXP : maxp_MAXP +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_MAXP; +}; + +struct maxp_accelerator_t +{ + maxp_accelerator_t () + { + blob = hb_blob_get_empty (); + numGlyphs = 0; + } + + maxp_accelerator_t (hb_face_t *face) : maxp_accelerator_t () + { +#ifndef HB_NO_BEYOND_64K + if (init_table (face)) + return; +#endif + + init_table (face); + } + + ~maxp_accelerator_t () { hb_blob_destroy (blob); } + + unsigned int get_num_glyphs () const { return numGlyphs; } + hb_blob_t *get_blob () const { return blob; } + + private: + template + bool init_table (hb_face_t *face) + { + hb_sanitize_context_t c; + c.set_num_glyphs (0); + hb_blob_ptr_t
table = c.reference_table
(face); + bool ret = table.get_length (); + if (ret) + { + blob = hb_blob_reference (table.get_blob ()); + numGlyphs = table->get_num_glyphs (); + } + table.destroy (); + return ret; + } + + hb_blob_t *blob; + unsigned int numGlyphs; }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh index 20c62b83edbe..4e1f9637502a 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh @@ -83,7 +83,7 @@ struct meta unsigned int *count, hb_ot_meta_tag_t *entries) const { - if (count) + if (count && entries) { + table->dataMaps.as_array ().sub_array (start_offset, count) | hb_map (&DataMap::get_tag) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta.cc index 7ad29777714e..e93588cda110 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta.cc @@ -42,7 +42,7 @@ * @face: a face object * @start_offset: iteration's start offset * @entries_count:(inout) (optional): buffer size as input, filled size as output - * @entries: (out caller-allocates) (array length=entries_count): entries tags buffer + * @entries: (out caller-allocates) (array length=entries_count) (nullable): entries tags buffer * * Fetches all available feature types. * diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-metrics.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-metrics.cc index 4253d5bb03de..cd01736b0a6e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-metrics.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-metrics.cc @@ -69,33 +69,38 @@ _hb_ot_metrics_get_position_common (hb_font_t *font, #else #define GET_VAR .0f #endif -#define GET_METRIC_X(TABLE, ATTR) \ - (face->table.TABLE->has_data () && \ - ((void) (position && (*position = font->em_scalef_x (_fix_ascender_descender ( \ - face->table.TABLE->ATTR + GET_VAR, metrics_tag)))), true)) #define GET_METRIC_Y(TABLE, ATTR) \ (face->table.TABLE->has_data () && \ ((void) (position && (*position = font->em_scalef_y (_fix_ascender_descender ( \ face->table.TABLE->ATTR + GET_VAR, metrics_tag)))), true)) +#define GET_HEA_METRIC_X(TABLE, ATTR) \ + (face->table.TABLE->has_data () && \ + ((void) (position && (*position = font->em_scalef_x (_fix_ascender_descender ( \ + HB_DUAL_GET (*face->table.TABLE, table->ATTR) + GET_VAR, metrics_tag)))), true)) +#define GET_HEA_METRIC_Y(TABLE, ATTR) \ + (face->table.TABLE->has_data () && \ + ((void) (position && (*position = font->em_scalef_y (_fix_ascender_descender ( \ + HB_DUAL_GET (*face->table.TABLE, table->ATTR) + GET_VAR, metrics_tag)))), true)) case HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER: return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoAscender)) || - GET_METRIC_Y (hhea, ascender); + GET_HEA_METRIC_Y (hhea, ascender); case HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER: return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoDescender)) || - GET_METRIC_Y (hhea, descender); + GET_HEA_METRIC_Y (hhea, descender); case HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP: return (face->table.OS2->use_typo_metrics () && GET_METRIC_Y (OS2, sTypoLineGap)) || - GET_METRIC_Y (hhea, lineGap); + GET_HEA_METRIC_Y (hhea, lineGap); #ifndef HB_NO_VERTICAL - case HB_OT_METRICS_TAG_VERTICAL_ASCENDER: return GET_METRIC_X (vhea, ascender); - case HB_OT_METRICS_TAG_VERTICAL_DESCENDER: return GET_METRIC_X (vhea, descender); - case HB_OT_METRICS_TAG_VERTICAL_LINE_GAP: return GET_METRIC_X (vhea, lineGap); + case HB_OT_METRICS_TAG_VERTICAL_ASCENDER: return GET_HEA_METRIC_X (vhea, ascender); + case HB_OT_METRICS_TAG_VERTICAL_DESCENDER: return GET_HEA_METRIC_X (vhea, descender); + case HB_OT_METRICS_TAG_VERTICAL_LINE_GAP: return GET_HEA_METRIC_X (vhea, lineGap); #endif +#undef GET_HEA_METRIC_Y +#undef GET_HEA_METRIC_X #undef GET_METRIC_Y -#undef GET_METRIC_X #undef GET_VAR default: assert (0); return false; } @@ -158,6 +163,12 @@ hb_ot_metrics_get_position (hb_font_t *font, #define GET_METRIC_Y(TABLE, ATTR) \ (face->table.TABLE->has_data () && \ ((void) (position && (*position = font->em_scalef_y (face->table.TABLE->ATTR + GET_VAR))), true)) +#define GET_HEA_METRIC_X(TABLE, ATTR) \ + (face->table.TABLE->has_data () && \ + ((void) (position && (*position = font->em_scalef_x (HB_DUAL_GET (*face->table.TABLE, table->ATTR) + GET_VAR))), true)) +#define GET_HEA_METRIC_Y(TABLE, ATTR) \ + (face->table.TABLE->has_data () && \ + ((void) (position && (*position = font->em_scalef_y (HB_DUAL_GET (*face->table.TABLE, table->ATTR) + GET_VAR))), true)) case HB_OT_METRICS_TAG_HORIZONTAL_CLIPPING_ASCENT: return GET_METRIC_Y (OS2, usWinAscent); case HB_OT_METRICS_TAG_HORIZONTAL_CLIPPING_DESCENT: return GET_METRIC_Y (OS2, usWinDescent); @@ -168,17 +179,17 @@ hb_ot_metrics_get_position (hb_font_t *font, if (font->slant) { - unsigned rise = face->table.hhea->caretSlopeRise; + unsigned rise = HB_DUAL_GET (*face->table.hhea, table->caretSlopeRise); unsigned upem = face->get_upem (); mult = (rise && rise < upem) ? hb_min (upem / rise, 256u) : 1u; } if (metrics_tag == HB_OT_METRICS_TAG_HORIZONTAL_CARET_RISE) { - bool ret = GET_METRIC_Y (hhea, caretSlopeRise); + bool ret = GET_HEA_METRIC_Y (hhea, caretSlopeRise); if (position) - *position *= mult; + *position = hb_clamp_to ((int64_t) *position * mult); return ret; } @@ -186,28 +197,29 @@ hb_ot_metrics_get_position (hb_font_t *font, { hb_position_t rise = 0; - if (font->slant && position && GET_METRIC_Y (hhea, caretSlopeRise)) + if (font->slant && position && GET_HEA_METRIC_Y (hhea, caretSlopeRise)) rise = *position; - bool ret = GET_METRIC_X (hhea, caretSlopeRun); + bool ret = GET_HEA_METRIC_X (hhea, caretSlopeRun); if (position) { - *position *= mult; + *position = hb_clamp_to ((int64_t) *position * mult); if (font->slant) - *position += roundf (mult * font->slant_xy * rise); + *position = hb_saturate_add (*position, + hb_clamp_to (roundf (mult * font->slant_xy * rise))); } return ret; } } - case HB_OT_METRICS_TAG_HORIZONTAL_CARET_OFFSET: return GET_METRIC_X (hhea, caretOffset); + case HB_OT_METRICS_TAG_HORIZONTAL_CARET_OFFSET: return GET_HEA_METRIC_X (hhea, caretOffset); #ifndef HB_NO_VERTICAL - case HB_OT_METRICS_TAG_VERTICAL_CARET_RISE: return GET_METRIC_X (vhea, caretSlopeRise); - case HB_OT_METRICS_TAG_VERTICAL_CARET_RUN: return GET_METRIC_Y (vhea, caretSlopeRun); - case HB_OT_METRICS_TAG_VERTICAL_CARET_OFFSET: return GET_METRIC_Y (vhea, caretOffset); + case HB_OT_METRICS_TAG_VERTICAL_CARET_RISE: return GET_HEA_METRIC_X (vhea, caretSlopeRise); + case HB_OT_METRICS_TAG_VERTICAL_CARET_RUN: return GET_HEA_METRIC_Y (vhea, caretSlopeRun); + case HB_OT_METRICS_TAG_VERTICAL_CARET_OFFSET: return GET_HEA_METRIC_Y (vhea, caretOffset); #endif case HB_OT_METRICS_TAG_X_HEIGHT: return GET_METRIC_Y (OS2->v2 (), sxHeight); case HB_OT_METRICS_TAG_CAP_HEIGHT: return GET_METRIC_Y (OS2->v2 (), sCapHeight); @@ -226,11 +238,13 @@ hb_ot_metrics_get_position (hb_font_t *font, /* Private tags */ case _HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER_OS2: return GET_METRIC_Y (OS2, sTypoAscender); - case _HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER_HHEA: return GET_METRIC_Y (hhea, ascender); + case _HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER_HHEA: return GET_HEA_METRIC_Y (hhea, ascender); case _HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER_OS2: return GET_METRIC_Y (OS2, sTypoDescender); - case _HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER_HHEA: return GET_METRIC_Y (hhea, descender); + case _HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER_HHEA: return GET_HEA_METRIC_Y (hhea, descender); case _HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP_OS2: return GET_METRIC_Y (OS2, sTypoLineGap); - case _HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP_HHEA: return GET_METRIC_Y (hhea, lineGap); + case _HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP_HHEA: return GET_HEA_METRIC_Y (hhea, lineGap); +#undef GET_HEA_METRIC_Y +#undef GET_HEA_METRIC_X #undef GET_METRIC_Y #undef GET_METRIC_X #undef GET_VAR @@ -326,9 +340,10 @@ hb_ot_metrics_get_position_with_fallback (hb_font_t *font, case HB_OT_METRICS_TAG_CAP_HEIGHT: if (hb_font_get_nominal_glyph (font, 'O', &glyph) && hb_font_get_glyph_extents (font, glyph, &extents)) - *position = extents.height + 2 * extents.y_bearing; + *position = hb_clamp_to ((int64_t) extents.height + + 2 * (int64_t) extents.y_bearing); else - *position = font->y_scale * 2 / 3; + *position = hb_clamp_to ((int64_t) font->y_scale * 2 / 3); break; case HB_OT_METRICS_TAG_STRIKEOUT_SIZE: @@ -347,17 +362,17 @@ hb_ot_metrics_get_position_with_fallback (hb_font_t *font, break; case HB_OT_METRICS_TAG_UNDERLINE_OFFSET: - *position = - font->y_scale / 18; + *position = hb_saturate_neg (font->y_scale) / 18; break; case HB_OT_METRICS_TAG_SUBSCRIPT_EM_X_SIZE: case HB_OT_METRICS_TAG_SUPERSCRIPT_EM_X_SIZE: - *position = font->x_scale * 10 / 12; + *position = hb_clamp_to ((int64_t) font->x_scale * 10 / 12); break; case HB_OT_METRICS_TAG_SUBSCRIPT_EM_Y_SIZE: case HB_OT_METRICS_TAG_SUPERSCRIPT_EM_Y_SIZE: - *position = font->y_scale * 10 / 12; + *position = hb_clamp_to ((int64_t) font->y_scale * 10 / 12); break; case HB_OT_METRICS_TAG_SUBSCRIPT_EM_X_OFFSET: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh index a044b7f9c0cf..65ed98c96d93 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh @@ -272,7 +272,7 @@ struct OS2 Triple *axis_range; if (c->plan->user_axes_location.has (HB_TAG ('w','g','h','t'), &axis_range)) { - unsigned weight_class = static_cast (roundf (hb_clamp (axis_range->middle, 1.0, 1000.0))); + unsigned weight_class = static_cast (roundf (hb_clamp (axis_range->middle, 1.0f, 1000.0f))); if (os2_prime->usWeightClass != weight_class) os2_prime->usWeightClass = weight_class; } @@ -346,10 +346,10 @@ struct OS2 size_t get_size () const { - unsigned result = min_size; - if (version >= 1) result += v1X.get_size (); - if (version >= 2) result += v2X.get_size (); - if (version >= 5) result += v5X.get_size (); + size_t result = min_size; + if (version >= 1) result = hb_unsigned_add_saturate (result, v1X.get_size ()); + if (version >= 2) result = hb_unsigned_add_saturate (result, v2X.get_size ()); + if (version >= 5) result = hb_unsigned_add_saturate (result, v5X.get_size ()); return result; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh index 1de8864c4889..fa6d4dad6c52 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh @@ -116,7 +116,7 @@ struct post Triple *axis_range; if (c->plan->user_axes_location.has (HB_TAG ('s','l','n','t'), &axis_range)) { - float italic_angle = hb_max (-90.0, hb_min (axis_range->middle, 90.0)); + float italic_angle = hb_max (-90.f, hb_min (axis_range->middle, 90.f)); if (post_prime->italicAngle.to_float () != italic_angle) post_prime->italicAngle.set_float (italic_angle); } @@ -188,7 +188,7 @@ struct post if (unlikely (!gids)) { - gids = (uint16_t *) hb_malloc (count * sizeof (gids[0])); + gids = (uint16_t *) hb_malloc2 (count, sizeof (gids[0])); if (unlikely (!gids)) return false; /* Anything better?! */ @@ -197,7 +197,10 @@ struct post auto thiz = this; hb_array_t (gids, count) .qsort ([thiz] (const uint16_t &a, const uint16_t &b) { - return thiz->find_glyph_name (a).cmp (thiz->find_glyph_name (b)) > 0; + /* hb_array_t::cmp has reversed argument order, so + * x.cmp(y) returns sign of (y - x). Pass (b, a) to + * get standard "negative when a < b" ordering. */ + return thiz->find_glyph_name (b).cmp (thiz->find_glyph_name (a)); }); if (unlikely (!gids_sorted_by_name.cmpexch (nullptr, gids))) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc index c17e76289757..364cc7c2e4eb 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc @@ -197,8 +197,10 @@ zero_mark_advances (hb_buffer_t *buffer, { if (adjust_offsets_when_zeroing) { - buffer->pos[i].x_offset -= buffer->pos[i].x_advance; - buffer->pos[i].y_offset -= buffer->pos[i].y_advance; + buffer->pos[i].x_offset = hb_saturate_sub (buffer->pos[i].x_offset, + buffer->pos[i].x_advance); + buffer->pos[i].y_offset = hb_saturate_sub (buffer->pos[i].y_offset, + buffer->pos[i].y_advance); } buffer->pos[i].x_advance = 0; buffer->pos[i].y_advance = 0; @@ -231,10 +233,12 @@ position_mark (const hb_ot_shape_plan_t *plan HB_UNUSED, case HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW: case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE: if (buffer->props.direction == HB_DIRECTION_LTR) { - pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing; + pos.x_offset = hb_clamp_to ((int64_t) base_extents.x_bearing + base_extents.width - + mark_extents.width / 2 - mark_extents.x_bearing); break; } else if (buffer->props.direction == HB_DIRECTION_RTL) { - pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing; + pos.x_offset = hb_clamp_to ((int64_t) base_extents.x_bearing - + mark_extents.width / 2 - mark_extents.x_bearing); break; } HB_FALLTHROUGH; @@ -245,21 +249,24 @@ position_mark (const hb_ot_shape_plan_t *plan HB_UNUSED, case HB_UNICODE_COMBINING_CLASS_BELOW: case HB_UNICODE_COMBINING_CLASS_ABOVE: /* Center align. */ - pos.x_offset += base_extents.x_bearing + (base_extents.width - mark_extents.width) / 2 - mark_extents.x_bearing; + pos.x_offset = hb_clamp_to ((int64_t) base_extents.x_bearing + + ((int64_t) base_extents.width - mark_extents.width) / 2 - + mark_extents.x_bearing); break; case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT: case HB_UNICODE_COMBINING_CLASS_BELOW_LEFT: case HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT: /* Left align. */ - pos.x_offset += base_extents.x_bearing - mark_extents.x_bearing; + pos.x_offset = hb_saturate_sub (base_extents.x_bearing, mark_extents.x_bearing); break; case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT: case HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT: case HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT: /* Right align. */ - pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width - mark_extents.x_bearing; + pos.x_offset = hb_clamp_to ((int64_t) base_extents.x_bearing + base_extents.width - + mark_extents.width - mark_extents.x_bearing); break; } @@ -271,19 +278,20 @@ position_mark (const hb_ot_shape_plan_t *plan HB_UNUSED, case HB_UNICODE_COMBINING_CLASS_BELOW: case HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT: /* Add gap, fall-through. */ - base_extents.height -= y_gap; + base_extents.height = hb_saturate_sub (base_extents.height, y_gap); HB_FALLTHROUGH; case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT: case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW: - pos.y_offset = base_extents.y_bearing + base_extents.height - mark_extents.y_bearing; + pos.y_offset = hb_clamp_to ((int64_t) base_extents.y_bearing + + base_extents.height - mark_extents.y_bearing); /* Never shift up "below" marks. */ if ((y_gap > 0) == (pos.y_offset > 0)) { - base_extents.height -= pos.y_offset; + base_extents.height = hb_saturate_sub (base_extents.height, pos.y_offset); pos.y_offset = 0; } - base_extents.height += mark_extents.height; + base_extents.height = hb_saturate_add (base_extents.height, mark_extents.height); break; case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE: @@ -291,23 +299,24 @@ position_mark (const hb_ot_shape_plan_t *plan HB_UNUSED, case HB_UNICODE_COMBINING_CLASS_ABOVE: case HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT: /* Add gap, fall-through. */ - base_extents.y_bearing += y_gap; - base_extents.height -= y_gap; + base_extents.y_bearing = hb_saturate_add (base_extents.y_bearing, y_gap); + base_extents.height = hb_saturate_sub (base_extents.height, y_gap); HB_FALLTHROUGH; case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE: case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT: - pos.y_offset = base_extents.y_bearing - (mark_extents.y_bearing + mark_extents.height); + pos.y_offset = hb_clamp_to ((int64_t) base_extents.y_bearing - + mark_extents.y_bearing - mark_extents.height); /* Don't shift down "above" marks too much. */ if ((y_gap > 0) != (pos.y_offset > 0)) { - int correction = -pos.y_offset / 2; - base_extents.y_bearing += correction; - base_extents.height -= correction; - pos.y_offset += correction; + hb_position_t correction = -(pos.y_offset / 2); + base_extents.y_bearing = hb_saturate_add (base_extents.y_bearing, correction); + base_extents.height = hb_saturate_sub (base_extents.height, correction); + pos.y_offset = hb_saturate_add (pos.y_offset, correction); } - base_extents.y_bearing -= mark_extents.height; - base_extents.height += mark_extents.height; + base_extents.y_bearing = hb_saturate_sub (base_extents.y_bearing, mark_extents.height); + base_extents.height = hb_saturate_add (base_extents.height, mark_extents.height); break; } } @@ -332,7 +341,8 @@ position_around_base (const hb_ot_shape_plan_t *plan, zero_mark_advances (buffer, base + 1, end, adjust_offsets_when_zeroing); return; } - base_extents.y_bearing += buffer->pos[base].y_offset; + base_extents.y_bearing = hb_saturate_add (base_extents.y_bearing, + buffer->pos[base].y_offset); /* Use horizontal advance for horizontal positioning. * Generally a better idea. Also works for zero-ink glyphs. See: * https://github.com/harfbuzz/harfbuzz/issues/1532 */ @@ -346,8 +356,8 @@ position_around_base (const hb_ot_shape_plan_t *plan, hb_position_t x_offset = 0, y_offset = 0; if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) { - x_offset -= buffer->pos[base].x_advance; - y_offset -= buffer->pos[base].y_advance; + x_offset = hb_saturate_neg (buffer->pos[base].x_advance); + y_offset = hb_saturate_neg (buffer->pos[base].y_advance); } hb_glyph_extents_t component_extents = base_extents; @@ -376,9 +386,13 @@ position_around_base (const hb_ot_shape_plan_t *plan, horiz_dir = hb_script_get_horizontal_direction (plan->props.script); } if (horiz_dir == HB_DIRECTION_LTR) - component_extents.x_bearing += (this_lig_component * component_extents.width) / num_lig_components; + component_extents.x_bearing = hb_clamp_to ( + (int64_t) component_extents.x_bearing + + (int64_t) this_lig_component * component_extents.width / num_lig_components); else - component_extents.x_bearing += ((num_lig_components - 1 - this_lig_component) * component_extents.width) / num_lig_components; + component_extents.x_bearing = hb_clamp_to ( + (int64_t) component_extents.x_bearing + + (int64_t) (num_lig_components - 1 - this_lig_component) * component_extents.width / num_lig_components); component_extents.width /= num_lig_components; } } @@ -394,16 +408,16 @@ position_around_base (const hb_ot_shape_plan_t *plan, buffer->pos[i].x_advance = 0; buffer->pos[i].y_advance = 0; - buffer->pos[i].x_offset += x_offset; - buffer->pos[i].y_offset += y_offset; + buffer->pos[i].x_offset = hb_saturate_add (buffer->pos[i].x_offset, x_offset); + buffer->pos[i].y_offset = hb_saturate_add (buffer->pos[i].y_offset, y_offset); } else { if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) { - x_offset -= buffer->pos[i].x_advance; - y_offset -= buffer->pos[i].y_advance; + x_offset = hb_saturate_sub (x_offset, buffer->pos[i].x_advance); + y_offset = hb_saturate_sub (y_offset, buffer->pos[i].y_advance); } else { - x_offset += buffer->pos[i].x_advance; - y_offset += buffer->pos[i].y_advance; + x_offset = hb_saturate_add (x_offset, buffer->pos[i].x_advance); + y_offset = hb_saturate_add (y_offset, buffer->pos[i].y_advance); } } } @@ -559,7 +573,7 @@ _hb_ot_shape_fallback_spaces (const hb_ot_shape_plan_t *plan HB_UNUSED, if (horizontal) pos[i].x_advance = +font->x_scale / 4; else - pos[i].y_advance = -font->y_scale / 4; + pos[i].y_advance = -(int64_t) font->y_scale / 4; } hb_unicode_funcs_t::space_t space_type = _hb_glyph_info_get_unicode_space_fallback_type (&info[i]); @@ -579,16 +593,16 @@ _hb_ot_shape_fallback_spaces (const hb_ot_shape_plan_t *plan HB_UNUSED, case t::SPACE_EM_6: case t::SPACE_EM_16: if (horizontal) - pos[i].x_advance = +(font->x_scale + ((int) space_type)/2) / (int) space_type; + pos[i].x_advance = ((int64_t) font->x_scale + ((int) space_type)/2) / (int) space_type; else - pos[i].y_advance = -(font->y_scale + ((int) space_type)/2) / (int) space_type; + pos[i].y_advance = -((int64_t) font->y_scale + ((int) space_type)/2) / (int) space_type; break; case t::SPACE_4_EM_18: if (horizontal) - pos[i].x_advance = (int64_t) +font->x_scale * 4 / 18; + pos[i].x_advance = (int64_t) font->x_scale * 4 / 18; else - pos[i].y_advance = (int64_t) -font->y_scale * 4 / 18; + pos[i].y_advance = -(int64_t) font->y_scale * 4 / 18; break; case t::SPACE_FIGURE: diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc index 9d792cc7f11f..9cbacf466624 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc @@ -468,7 +468,8 @@ struct hb_ot_shape_context_t /* Prepare */ static void -hb_set_unicode_props (hb_buffer_t *buffer) +hb_set_unicode_props (hb_buffer_t *buffer, + hb_mask_t global_mask) { /* Implement enough of Unicode Graphemes here that shaping * in reverse-direction wouldn't break graphemes. Namely, @@ -482,6 +483,7 @@ hb_set_unicode_props (hb_buffer_t *buffer) hb_glyph_info_t *info = buffer->info; for (unsigned int i = 0; i < count; i++) { + info[i].mask = global_mask; _hb_glyph_info_set_unicode_props (&info[i], buffer); if (info[i].codepoint < 0x80) @@ -519,6 +521,7 @@ hb_set_unicode_props (hb_buffer_t *buffer) _hb_unicode_is_emoji_Extended_Pictographic (info[i + 1].codepoint)) { i++; + info[i].mask = global_mask; _hb_glyph_info_set_unicode_props (&info[i], buffer); _hb_glyph_info_set_continuation (&info[i], buffer); } @@ -743,16 +746,6 @@ hb_ot_shape_setup_masks_fraction (const hb_ot_shape_context_t *c) } } -static inline void -hb_ot_shape_initialize_masks (const hb_ot_shape_context_t *c) -{ - hb_ot_map_t *map = &c->plan->map; - hb_buffer_t *buffer = c->buffer; - - hb_mask_t global_mask = map->get_global_mask (); - buffer->reset_masks (global_mask); -} - static inline void hb_ot_shape_setup_masks (const hb_ot_shape_context_t *c) { @@ -912,22 +905,29 @@ hb_ot_substitute_plan (const hb_ot_shape_context_t *c) { hb_buffer_t *buffer = c->buffer; - hb_ot_layout_substitute_start (c->font, buffer); - - if (c->plan->fallback_glyph_classes) - hb_synthesize_glyph_classes (c->buffer); - #ifndef HB_NO_AAT_SHAPE if (unlikely (c->plan->apply_morx)) { + hb_ot_layout_substitute_start (c->font, buffer); + + if (c->plan->fallback_glyph_classes) + hb_synthesize_glyph_classes (buffer); + hb_aat_layout_substitute (c->plan, c->font, c->buffer, c->user_features, c->num_user_features); - c->buffer->update_digest (); + /* The buffer digest is only used by the OT lookup-apply loop; + * without GPOS ahead, nothing consumes it. */ + if (c->plan->apply_gpos) + c->buffer->update_digest (); } else #endif { - c->buffer->update_digest (); + hb_ot_layout_substitute_start_with_digest (c->font, buffer); + + if (c->plan->fallback_glyph_classes) + hb_synthesize_glyph_classes (buffer); + c->plan->substitute (c->font, buffer); } } @@ -973,8 +973,8 @@ hb_ot_substitute_post (const hb_ot_shape_context_t *c) static inline void adjust_mark_offsets (hb_glyph_position_t *pos) { - pos->x_offset -= pos->x_advance; - pos->y_offset -= pos->y_advance; + pos->x_offset = hb_saturate_sub (pos->x_offset, pos->x_advance); + pos->y_offset = hb_saturate_sub (pos->y_offset, pos->y_advance); } static inline void @@ -1175,8 +1175,7 @@ hb_ot_shape_internal (hb_ot_shape_context_t *c) _hb_buffer_allocate_unicode_vars (c->buffer); - hb_ot_shape_initialize_masks (c); - hb_set_unicode_props (c->buffer); + hb_set_unicode_props (c->buffer, c->plan->map.get_global_mask ()); hb_insert_dotted_circle (c->buffer, c->font); hb_form_clusters (c->buffer); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh index 649acddb4146..e5b08b452778 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh @@ -33,26 +33,71 @@ #include "hb-aat-map.hh" +HB_INTERNAL bool +_hb_ot_layout_table_get_feature_variations_state (hb_face_t *face, + hb_tag_t table_tag, + const int *coords, + unsigned int num_coords, + unsigned int *variations_index, + hb_vector_t *lookup_conditions); + +HB_INTERNAL bool +_hb_ot_layout_feature_get_lookup_variations (hb_face_t *face, + hb_tag_t table_tag, + unsigned feature_index, + unsigned variations_index, + hb_sorted_array_t conditions, + hb_set_t *lookup_indexes); + struct hb_ot_shape_plan_key_t { unsigned int variations_index[2]; + /* Sorted offsets of distinct true conditions within FeatureVariations. + * Different outcomes may conservatively separate equivalent lookup sets. */ + hb_vector_t lookup_conditions[2]; - void init (hb_face_t *face, + bool init (hb_face_t *face, const int *coords, unsigned num_coords) { for (unsigned int table_index = 0; table_index < 2; table_index++) - hb_ot_layout_table_find_feature_variations (face, - table_tags[table_index], - coords, - num_coords, - &variations_index[table_index]); + if (unlikely (!_hb_ot_layout_table_get_feature_variations_state ( + face, + table_tags[table_index], + coords, + num_coords, + &variations_index[table_index], + &lookup_conditions[table_index]))) + { + for (auto &v : lookup_conditions) + v.fini (); + return false; + } + return true; + } + + void fini () + { + for (auto &v : lookup_conditions) + v.fini (); + } + + bool get_lookup_variations (hb_face_t *face, + unsigned int table_index, + unsigned int feature_index, + hb_set_t *lookups) const + { + return _hb_ot_layout_feature_get_lookup_variations ( + face, table_tags[table_index], feature_index, variations_index[table_index], + lookup_conditions[table_index].as_sorted_array (), lookups); } bool equal (const hb_ot_shape_plan_key_t *other) { return variations_index[0] == other->variations_index[0] && - variations_index[1] == other->variations_index[1]; + variations_index[1] == other->variations_index[1] && + lookup_conditions[0] == other->lookup_conditions[0] && + lookup_conditions[1] == other->lookup_conditions[1]; } }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh index ff0b2acede1d..e428c63931dc 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh @@ -231,11 +231,7 @@ struct arabic_fallback_plan_t OT::hb_ot_layout_lookup_accelerator_t *accel_array[ARABIC_FALLBACK_MAX_LOOKUPS]; }; -#if defined(_WIN32) && !defined(HB_NO_WIN1256) -#define HB_WITH_WIN1256 -#endif - -#ifdef HB_WITH_WIN1256 +#ifndef HB_NO_WIN1256 #include "hb-ot-shaper-arabic-win1256.hh" #endif @@ -254,7 +250,7 @@ arabic_fallback_plan_init_win1256 (arabic_fallback_plan_t *fallback_plan HB_UNUS const hb_ot_shape_plan_t *plan HB_UNUSED, hb_font_t *font HB_UNUSED) { -#ifdef HB_WITH_WIN1256 +#ifndef HB_NO_WIN1256 /* Does this font look like it's Windows-1256-encoded? */ hb_codepoint_t g; if (!(hb_font_get_glyph (font, 0x0627u, 0, &g) && g == 199 /* ALEF */ && diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh index 79d3014d3e1b..19aa3ce0fc5c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh @@ -6,10 +6,10 @@ * * on files with these headers: * - * # ArabicShaping-17.0.0.txt - * # Date: 2025-08-14 - * # Scripts-17.0.0.txt - * # Date: 2025-07-24, 13:28:55 GMT + * # ArabicShaping-18.0.0.txt + * # Date: 2026-08-18, 19:02:41 GMT + * # Scripts-18.0.0.txt + * # Date: 2026-06-29, 15:25:26 GMT */ #ifndef HB_OT_SHAPER_ARABIC_JOINING_LIST_HH diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-pua.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-pua.hh index 7464e5d8a3b7..dbbee473fcf1 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-pua.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-pua.hh @@ -2,7 +2,7 @@ /* * The following table is generated by running: * - * ./gen-arabic-pua.py + * ./gen-arabic-pua.py ArabicPUASimplified.txt ArabicPUATraditional.txt * */ @@ -37,15 +37,15 @@ static const uint8_t _hb_arabic_pua_u8[453]= 33, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 37, 38, 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 40, 41, 42, 0, 43, 44, 0, 0, 45, 46, 0, 47, - 48, 49, 0, 0, 0, 0, 50, 0, 0, 51, 52, 0, 53, 54, 55, 56, - 57, 58, 0, 0, 0, 0, 0, 59, 60, 61, 62, 63, 64, 0, 0, 0, + 48, 49, 0, 0, 0, 0, 0, 0, 0, 50, 51, 0, 52, 53, 54, 55, + 56, 57, 0, 0, 0, 0, 0, 58, 59, 60, 61, 62, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 65, 0, 0, 66, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, + 0, 64, 0, 0, 65, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, }; -static const uint16_t _hb_arabic_pua_u16[717]= +static const uint16_t _hb_arabic_pua_u16[713]= { 0, 0, 0, 0, 0, 0, 0, 0,61728,61729,61730, 0, 0,61733, 0, 0, 61736,61737,61738,61739,61790,61741,61742,61743,61872,61873,61874,61875,61876,61877,61878,61879, @@ -77,21 +77,21 @@ static const uint16_t _hb_arabic_pua_u16[717]= 61952,61952,61952,61952, 0,62000,62001,62002,62003,62004,62005,62006,62007,62008,62009, 0, 62046,62046, 0, 0, 0,61964,61965,61966,61967,62012,62014, 0, 0,61954, 0,61981, 0, 0, 0,61955, 0,61982, 0,61956, 0, 0, 0,62111, 0, 0, 0, 0, - 61970,61971,61972,61957, 0,61980, 0, 0, 0, 0, 0,61958, 0,61983, 0, 0, + 61970,61971,61972,61957,62101,61980, 0, 0, 0, 0, 0,61958, 0,61983, 0, 0, 0, 0, 0,62191, 0,62188,62189,62192, 0, 0, 0,61973, 0, 0,62098, 0, - 0,61974, 0, 0,62099, 0, 0,62101, 0, 0,61975, 0, 0,62100, 0, 0, - 0,62080,62081,62082,62102, 0,62083,62084,62085,62103, 0, 0, 0,62106, 0,62107, - 0,62108, 0, 0, 0,61976, 0, 0, 0, 0,62086,62087,62088,62109,61978,62089, - 62090,62091,62110,62093,62094, 0,62104, 0, 0, 0, 0,62095,62096,62097,62105, 0, - 0,61977, 0, 0, 0, 0, 0,62075,62077,61968, 0, 0, 0, 0,62021,62022, - 62019,62020,62170,62171,62023,62024,62169,62168,62166,62167,62017,62018,62028,62027,62025,62026, - 62161,62162,62032,62031,62029,62030,62036,62035,62033,62034,62040,62039,62037,62038,62048,62044, - 62041,62042,62052,62051,62049,62050,62053,62054,62055,62056,62057,62058,62059,62060,62064,62063, - 62061,62062,62068,62067,62065,62066,62072,62071,62069,62070,62078,62076,62073,62074,62114,62113, - 62079,62193,62118,62117,62115,62116,62122,62121,62119,62120,62126,62125,62123,62124,62130,62129, - 62127,62128,62134,62133,62131,62132,62138,62137,62135,62136,62142,62141,62139,62140,62146,62145, - 62143,62144,62150,62149,62147,62148,62154,62153,62151,62152,62155,62156,62164,62163,62160,62159, - 62157,62158,62176,62177,62174,62175,62178,62179,62172,62173, 0, 0, 0, + 0,61974, 0, 0,62099, 0,61975, 0, 0,62100, 0, 0, 0,62080,62081,62082, + 62102, 0,62083,62084,62085,62103, 0, 0, 0,62106, 0,62107, 0,62108, 0, 0, + 0,61976, 0, 0, 0, 0,62086,62087,62088,62109,61978,62089,62090,62091,62110,62093, + 62094, 0,62104, 0, 0, 0, 0,62095,62096,62097,62105, 0, 0,61977, 0, 0, + 0, 0, 0,62075,62077,61968, 0, 0, 0, 0,62021,62022,62019,62020,62170,62171, + 62023,62024,62169,62168,62166,62167,62017,62018,62028,62027,62025,62026,62161,62162,62032,62031, + 62029,62030,62036,62035,62033,62034,62040,62039,62037,62038,62048,62044,62041,62042,62052,62051, + 62049,62050,62053,62054,62055,62056,62057,62058,62059,62060,62064,62063,62061,62062,62068,62067, + 62065,62066,62072,62071,62069,62070,62078,62076,62073,62074,62114,62113,62079,62193,62118,62117, + 62115,62116,62122,62121,62119,62120,62126,62125,62123,62124,62130,62129,62127,62128,62134,62133, + 62131,62132,62138,62137,62135,62136,62142,62141,62139,62140,62146,62145,62143,62144,62150,62149, + 62147,62148,62154,62153,62151,62152,62155,62156,62164,62163,62160,62159,62157,62158,62176,62177, + 62174,62175,62178,62179,62172,62173, 0, 0, 0, }; static inline uint8_t _hb_arabic_pua_b4 (const uint8_t* a, unsigned i) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh index 81c84cf19629..ffc5ecd74a1e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh @@ -6,10 +6,10 @@ * * on files with these headers: * - * # ArabicShaping-17.0.0.txt - * # Date: 2025-08-14 - * # Blocks-17.0.0.txt - * # Date: 2025-08-01 + * # ArabicShaping-18.0.0.txt + * # Date: 2026-08-18, 19:02:41 GMT + * # Blocks-18.0.0.txt + * # Date: 2026-07-08 * UnicodeData.txt does not have a header. */ @@ -20,7 +20,7 @@ #include -static const uint8_t _hb_arabic_joining_u8[737]= +static const uint8_t _hb_arabic_joining_u8[749]= { 0, 16, 2, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -45,11 +45,11 @@ static const uint8_t _hb_arabic_joining_u8[737]= 0, 0, 46, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 48, 6, 0, 0, 1, 1, 1, 1, 1, 1, 49, 0, 50, 51, 52, 53, 54, 55, 0, 0, 56, 57, 58, 0, 0, 59, 0, 0, 60, 1, 1, 1, 61, 0, 0, - 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, - 1, 64, 0, 65, 0, 0, 0, 66, 1, 67, 0, 0, 0, 0, 0, 68, - 69, 70, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 62, 0, 0, 63, 64, 65, 0, 0, 0, 0, 0, 0, 0, 0, 66, + 1, 67, 0, 68, 0, 0, 0, 69, 1, 70, 0, 0, 0, 0, 0, 71, + 72, 73, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 72, 73, 0, 0, 0, 0, 0, 0,119,119,119,119, 51, 51, 51, + 1, 75, 76, 0, 0, 0, 0, 0, 0,119,119,119,119, 51, 51, 51, 51, 34, 34, 34, 34,119,119, 7,119, 34, 51, 51, 51, 35, 51, 51, 51, 0,119,119,119,115,119,119,119, 0, 0, 0,119,112, 7,119, 119, 3, 34, 34, 35, 35, 51, 51, 35, 34, 50, 51, 51, 50,115,119, @@ -65,10 +65,10 @@ static const uint8_t _hb_arabic_joining_u8[737]= 119, 51, 51, 35, 32, 32, 2, 16, 34, 34, 50, 51, 19, 51, 51, 35, 51, 35, 0,114,119,119, 55, 51, 35, 35, 35, 34, 51, 35, 51, 50, 34, 35,119,119,119, 39, 34, 50, 3, 49, 51, 51, 51, 51, 50,119, - 119,119, 50,115, 51, 51, 35, 51, 51, 51, 51, 3,119, 55, 51,114, - 119, 51, 51, 34, 51, 51,119,119,119, 3, 51, 34, 2, 35, 50, 35, - 51, 48, 34, 3, 0, 32, 19,119,119, 51, 51,119,119,119,103,119, - 119, + 119,119, 50,115, 51, 23, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 113, 51, 35, 51, 51, 51, 51, 3,119, 55, 51,114,119, 51, 51, 34, + 51, 51,119,119,119, 3, 51, 34, 2, 35, 50, 35, 51, 48, 34, 3, + 0, 32, 19,119,119, 51, 51,119,119,119,103,119,119, }; static inline uint8_t _hb_arabic_joining_b4 (const uint8_t* a, unsigned i) @@ -280,7 +280,7 @@ static const struct ligature_set_t { struct ligature_pairs_t { uint16_t components[1]; uint16_t ligature; - } ligatures[14]; + } ligatures[15]; } ligature_table[] = { { 0xFE91u, { @@ -337,6 +337,7 @@ static const struct ligature_set_t { { {0xFEA8u}, 0xFCCBu }, /* ARABIC LIGATURE LAM WITH KHAH INITIAL FORM */ { {0xFEE2u}, 0xFC42u }, /* ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM */ { {0xFEE4u}, 0xFCCCu }, /* ARABIC LIGATURE LAM WITH MEEM INITIAL FORM */ + { {0xFEF0u}, 0xFC43u }, /* ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM */ { {0xFEF2u}, 0xFC44u }, /* ARABIC LIGATURE LAM WITH YEH ISOLATED FORM */ { {0xFEECu}, 0xFCCDu }, /* ARABIC LIGATURE LAM WITH HEH INITIAL FORM */ { {0xFE82u}, 0xFEF5u }, /* ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc index 611aa262f40f..1b1e6277f3c8 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc @@ -35,6 +35,9 @@ /* buffer var allocations */ #define arabic_shaping_action() ot_shaper_var_u8_auxiliary() /* arabic shaping action */ +/* buffer **position** var allocations, used after GPOS */ +#define stch_advance() var.i32 /* advance used for stretching */ + #define HB_BUFFER_SCRATCH_FLAG_ARABIC_HAS_STCH HB_BUFFER_SCRATCH_FLAG_SHAPER0 /* See: @@ -492,6 +495,9 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, * First pass calculates the exact number of extra glyphs we need, * We then enlarge buffer to have that much room, * Second pass applies the stretch, copying things to the end of buffer. + * + * Cache glyph advances in the position scratch field during the first pass, + * for re-use these during the second pass. */ int sign = font->x_scale < 0 ? -1 : +1; @@ -531,15 +537,17 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, hb_in_range (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING)) { i--; - hb_position_t width = font->get_glyph_h_advance (info[i].codepoint); + if (step == MEASURE) + pos[i].stch_advance() = font->get_glyph_h_advance (info[i].codepoint); + hb_position_t width = pos[i].stch_advance(); if (info[i].arabic_shaping_action() == STCH_FIXED) { - w_fixed += width; + w_fixed = hb_saturate_add (w_fixed, width); n_fixed++; } else { - w_repeating += width; + w_repeating = hb_saturate_add (w_repeating, width); n_repeating++; } } @@ -551,7 +559,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, HB_ARABIC_GENERAL_CATEGORY_IS_WORD (_hb_glyph_info_get_general_category (&info[context - 1])))) { context--; - w_total += pos[context].x_advance; + w_total = hb_saturate_add (w_total, pos[context].x_advance); } i++; // Don't touch i again. @@ -573,7 +581,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, w_remaining_signed = -w_remaining_signed; w_repeating_signed = -w_repeating_signed; } - hb_position_t w_remaining = (hb_position_t) (w_total - w_fixed); + hb_position_t w_remaining = hb_saturate_sub (w_total, w_fixed); if (w_remaining_signed > w_repeating_signed && w_repeating_signed > 0) n_copies = w_remaining_signed / w_repeating_signed - 1; @@ -586,7 +594,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, int64_t excess = (n_copies + 1) * w_repeating_signed - w_remaining_signed; if (excess > 0) { - extra_repeat_overlap = excess / (n_copies * n_repeating); + extra_repeat_overlap = hb_clamp_to (excess / ((int64_t) n_copies * (int64_t) n_repeating)); w_remaining = 0; } } @@ -617,7 +625,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, hb_position_t x_offset = w_remaining / 2; for (unsigned int k = end; k > start; k--) { - hb_position_t width = font->get_glyph_h_advance (info[k - 1].codepoint); + hb_position_t width = pos[k - 1].stch_advance(); unsigned int repeat = 1; if (info[k - 1].arabic_shaping_action() == STCH_REPEATING) @@ -630,9 +638,9 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, { if (rtl) { - x_offset -= width; + x_offset = hb_saturate_sub (x_offset, width); if (n > 0) - x_offset += extra_repeat_overlap; + x_offset = hb_saturate_add (x_offset, extra_repeat_overlap); } pos[k - 1].x_offset = x_offset; /* Append copy. */ @@ -642,9 +650,9 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED, if (!rtl) { - x_offset += width; + x_offset = hb_saturate_add (x_offset, width); if (n > 0) - x_offset -= extra_repeat_overlap; + x_offset = hb_saturate_sub (x_offset, extra_repeat_overlap); } } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc index 1430d142d14d..dbd7ff2b14ee 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc @@ -67,14 +67,23 @@ static void override_features_hangul (hb_ot_shape_planner_t *plan) { /* Uniscribe does not apply 'calt' for Hangul, and certain fonts - * (Noto Sans CJK, Source Sans Han, etc) apply all of jamo lookups - * in calt, which is not desirable. */ - plan->map.disable_feature (HB_TAG('c','a','l','t')); + * (Noto Sans CJK, Source Han Sans, etc) apply all of jamo lookups + * in calt, which is not desirable. + * + * Rather than disabling 'calt' for the entire run, which also turns + * it off for any other characters in the run, allocate a mask for it + * and clear that mask on jamo only (in setup_masks_hangul). That + * keeps jamo out of reach of such lookups while letting the rest of + * the run shape with 'calt' as usual. + * + * https://github.com/harfbuzz/harfbuzz/discussions/4853 */ + plan->map.add_feature (HB_TAG('c','a','l','t')); } struct hangul_shape_plan_t { hb_mask_t mask_array[HANGUL_FEATURE_COUNT]; + hb_mask_t calt_mask; }; static void * @@ -87,6 +96,8 @@ data_create_hangul (const hb_ot_shape_plan_t *plan) for (unsigned int i = 0; i < HANGUL_FEATURE_COUNT; i++) hangul_plan->mask_array[i] = plan->map.get_1_mask (hangul_features[i]); + hangul_plan->calt_mask = plan->map.get_1_mask (HB_TAG('c','a','l','t')); + return hangul_plan; } @@ -405,7 +416,14 @@ setup_masks_hangul (const hb_ot_shape_plan_t *plan, unsigned int count = buffer->len; hb_glyph_info_t *info = buffer->info; for (unsigned int i = 0; i < count; i++, info++) + { info->mask |= hangul_plan->mask_array[info->hangul_shaping_feature()]; + + /* Keep 'calt' away from jamo; see override_features_hangul(). */ + hb_codepoint_t u = info->codepoint; + if (isL (u) || isV (u) || isT (u)) + info->mask &= ~hangul_plan->calt_mask; + } } HB_BUFFER_DEALLOCATE_VAR (buffer, hangul_shaping_feature); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc index 74fe5efa3b7b..10ca0db6c56c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc @@ -6,12 +6,12 @@ * * on files with these headers: * - * # IndicSyllabicCategory-17.0.0.txt - * # Date: 2025-08-01, 04:02:23 GMT - * # IndicPositionalCategory-17.0.0.txt - * # Date: 2025-07-29, 13:35:52 GMT - * # Blocks-17.0.0.txt - * # Date: 2025-08-01 + * # IndicSyllabicCategory-18.0.0.txt + * # Date: 2026-07-02, 18:58:37 GMT + * # IndicPositionalCategory-18.0.0.txt + * # Date: 2026-06-24, 13:39:21 GMT + * # Blocks-18.0.0.txt + * # Date: 2026-07-08 */ #include "hb.hh" @@ -82,7 +82,7 @@ static_assert (OT_VPst == M_Cat(VPst), ""); #define _OT_CS OT_CS /* 4 chars; CS */ #define _OT_DC OT_DOTTEDCIRCLE /* 1 chars; DOTTEDCIRCLE */ #define _OT_H OT_H /* 11 chars; H */ -#define _OT_M OT_M /* 142 chars; M */ +#define _OT_M OT_M /* 144 chars; M */ #define _OT_MH OT_MH /* 1 chars; MH */ #define _OT_ML OT_ML /* 1 chars; ML */ #define _OT_MP OT_MPst /* 1 chars; MPst */ @@ -111,7 +111,7 @@ static_assert (OT_VPst == M_Cat(VPst), ""); #define _OT_ZWNJ OT_ZWNJ /* 1 chars; ZWNJ */ #define _POS_T POS_ABOVE_C /* 22 chars; ABOVE_C */ -#define _POS_A POS_AFTER_MAIN /* 3 chars; AFTER_MAIN */ +#define _POS_A POS_AFTER_MAIN /* 5 chars; AFTER_MAIN */ #define _POS_AP POS_AFTER_POST /* 50 chars; AFTER_POST */ #define _POS_AS POS_AFTER_SUB /* 51 chars; AFTER_SUB */ #define _POS_C POS_BASE_C /* 853 chars; BASE_C */ @@ -141,7 +141,7 @@ static const uint16_t _hb_indic_values[42]= _(VA,T), _(VB,B), _(VL,L), _(VR,R), _(VS,X), _(X,X), _(Xg,X), _(Yg,X), _(ZWJ,X),_(ZWNJ,X), }; -static const uint8_t _hb_indic_u8[1220]= +static const uint8_t _hb_indic_u8[1224]= { 1, 0, 50, 4, 5, 96, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -181,45 +181,45 @@ static const uint8_t _hb_indic_u8[1220]= 56, 12, 14, 6, 0, 0, 0, 4, 44, 2, 16, 2, 6, 22, 0, 4, 2, 0, 36, 28, 6, 28, 0, 4, 30, 30, 30, 30, 0, 0, 42, 0, 34, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 42, 12, 12, 6, 6, - 6, 6, 24, 2, 2, 18, 36,112, 18, 18, 18, 18, 18, 18,114,116, - 118,120,122, 18, 0, 6, 6, 6, 44, 10, 0, 2, 54, 32, 46, 10, + 6, 6, 24, 2, 2, 18, 36,110, 18, 18, 18, 18, 18, 18,112,114, + 116,118,120, 18, 0, 6, 6, 6, 44, 10, 0, 2, 54, 32, 46, 10, 26, 0, 0, 0, 0, 0, 34, 70, 6, 20, 0, 14, 44, 2, 16, 10, - 2, 0, 72, 50,124, 48, 0, 32, 48, 32, 46, 0,126, 0, 0, 0, - 16, 2, 10, 10, 12, 2,128, 0, 6, 6, 6, 14, 6, 14, 24, 2, - 22, 22, 52, 74, 76, 32, 46, 0, 16, 58, 58, 78,130, 12, 14, 6, - 2, 0, 36,132,134, 32, 46, 0, 0, 0, 80,136, 16, 0, 0, 0, + 2, 0, 72, 50,122, 48, 0, 32, 48, 32, 46, 0,124, 0, 0, 0, + 16, 2, 10, 10, 12, 2,126, 0, 6, 6, 6, 14, 6, 14, 24, 2, + 22, 22, 52, 74, 76, 32, 46, 0, 16, 58, 58, 78,128, 12, 14, 6, + 2, 0, 36,130,132, 32, 46, 0, 0,134,136,138, 16, 0, 0, 0, 0, 70, 14, 6, 6, 20, 0, 6, 20, 6, 24, 0, 16, 10, 10, 2, - 0, 16, 10, 0, 2, 10, 0, 2, 2, 0, 0, 22, 76, 48, 0, 82, - 54, 22, 84, 0, 12, 12,138, 6, 28, 60, 38, 28, 86, 28, 88, 0, - 0, 0,140, 86, 2, 10, 16, 0, 26, 2, 16, 2, 28, 60, 38, 60, - 38, 18, 88, 0, 0, 0, 74, 38, 0, 0, 16, 10,142,144, 0, 0, - 12, 12,146, 6, 2,148,150, 22, 22, 22, 48, 82, 54, 22, 84,152, - 0, 0, 2,154, 0, 0, 0, 14, 0, 2, 2, 2, 2, 2, 26, 2, - 2,156, 2, 2, 90, 6, 6, 6, 6,158, 92, 94,160,162, 62, 58, - 164,166,168,170, 4, 4, 0, 10, 2, 6, 6, 96, 98, 26, 2,172, - 174,100,176,178,100,102,102, 2,104, 62,180, 2, 2,182,184,186, - 12, 12, 12,188, 4, 12,190, 0, 2, 26, 2, 2, 2, 90, 6, 6, - 6, 6, 0, 92, 62, 94, 98,192,194,196, 96,198,200,106,106,108, - 108,202, 0, 0, 42, 0,204, 0, 8,206, 8, 8,208, 40,210, 40, - 40, 2,212,214, 8, 34, 0, 0, 0, 0,216, 0, 4, 4, 4, 0, - 0, 34, 0, 0, 0, 0,110, 0, 0, 64,110, 0, 0, 0,218, 0, - 0, 42, 4, 34, 8, 40, 40, 40, 0, 0, 0,220, 2, 2,104, 16, - 4, 2, 2, 10, 16, 2, 4, 34, 0,222, 78, 2, 56, 12, 0, 0, - 0, 80, 72, 0, 37, 37, 2, 2, 6, 6, 31, 31, 0, 0, 2, 37, + 0, 16, 10, 0, 2, 10, 0, 2, 2, 0, 0, 22, 76, 48, 0, 80, + 54, 22, 82, 0, 12, 12,140, 6, 28, 60, 38, 28, 84, 28, 86, 0, + 0, 0,142, 84, 2, 10, 16, 0, 26, 2, 16, 2, 28, 60, 38, 60, + 38, 18, 86, 0, 0, 0, 74, 38, 0, 0, 16, 10,144,146, 0, 0, + 12, 12,148, 6, 2,150,152, 22, 22, 22, 48, 80, 54, 22, 82,154, + 0, 0, 2,156, 0, 0, 0, 14, 0, 2, 2, 2, 2, 2, 26, 2, + 2,158, 2, 2, 88, 6, 6, 6, 6,160, 90, 92,162,164, 62, 58, + 166,168,170,172, 4, 4, 0, 10, 2, 6, 6, 94, 96, 26, 2,174, + 176, 98,178,180, 98,100,100, 2,102, 62,182, 2, 2,184,186,188, + 12, 12, 12,190, 4, 12,192, 0, 2, 26, 2, 2, 2, 88, 6, 6, + 6, 6, 0, 90, 62, 92, 96,194,196,198, 94,200,202,104,104,106, + 106,204, 0, 0, 42, 0,206, 0, 8,208, 8, 8,210, 40,212, 40, + 40, 2,214,216, 8, 34, 0, 0, 0, 0,218, 0, 4, 4, 4, 0, + 0, 34, 0, 0, 0, 0,108, 0, 0, 64,108, 0, 0, 0,220, 0, + 0, 42, 4, 34, 8, 40, 40, 40, 0, 0, 0,222, 2, 2,102, 16, + 4, 2, 2, 10, 16, 2, 4, 34, 0,224, 78, 2, 56, 12, 0, 0, + 0,226, 72, 0, 37, 37, 2, 2, 6, 6, 31, 31, 0, 0, 2, 37, 29, 29, 37, 31, 37, 2, 12, 12, 31, 37, 11, 11, 31, 2, 24, 2, 14, 14, 36, 36, 37, 11, 6, 37, 22, 27, 12, 37, 27, 27, 37, 6, 24, 37, 11, 7, 11, 37, 11, 15, 11, 12, 15, 37, 37, 29, 0, 22, 14, 12, 32, 32, 30, 30, 6, 29, 37, 15, 29, 37, 22, 37, 37, 12, - 12, 11, 22, 22, 37, 22, 15, 15, 11, 8, 14, 37, 14, 8, 2, 31, - 35, 32, 32, 33, 35, 35, 33, 33, 35, 23, 23, 23, 2, 32, 26, 38, - 38, 38, 30, 37, 12, 15, 12, 7, 15, 12, 37, 0, 0, 29, 29, 12, - 18, 11, 37, 13, 37, 3, 37, 28, 11, 10, 10, 37, 10, 11, 29, 31, - 37, 14, 37, 4, 4, 29, 6, 31, 2, 12, 12, 27, 25, 37, 2, 11, - 2, 24, 31, 35, 33, 34, 0, 32, 29, 9, 1, 21, 19, 20, 16, 2, - 21, 21, 17, 2, 23, 2, 2, 35, 32, 2, 20, 35, 34, 32, 32, 29, - 2, 29, 29, 32, 32, 35, 35, 34, 34, 34, 38, 39, 39, 26, 9, 39, - 27, 39, 0, 37, 0, 27, 27, 0, 0, 4, 4, 0, 41, 40, 5, 37, - 31, 12, 2, 23, + 12, 11, 22, 22, 15, 15, 11, 8, 14, 37, 14, 8, 2, 31, 35, 32, + 32, 33, 35, 35, 33, 33, 35, 23, 23, 23, 2, 32, 26, 38, 38, 38, + 30, 37, 12, 15, 12, 7, 15, 12, 37, 0, 0, 29, 29, 12, 18, 11, + 37, 13, 37, 3, 37, 28, 11, 10, 10, 37, 37, 10, 10, 22, 10, 11, + 29, 31, 37, 14, 37, 4, 4, 29, 6, 31, 2, 12, 12, 27, 25, 37, + 2, 11, 2, 24, 31, 35, 33, 34, 0, 32, 29, 9, 1, 21, 19, 20, + 16, 2, 21, 21, 17, 2, 23, 2, 2, 35, 32, 2, 20, 35, 34, 32, + 32, 29, 2, 29, 29, 32, 32, 35, 35, 34, 34, 34, 38, 39, 39, 26, + 9, 39, 27, 39, 0, 37, 0, 27, 27, 0, 0, 4, 4, 0, 41, 40, + 5, 37, 31, 12, 2, 23, 37, 22, }; static inline uint8_t _hb_indic_b4 (const uint8_t* a, unsigned i) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh index 0b038ba22016..9e8675e2d6d0 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh @@ -6,18 +6,18 @@ * * on files with these headers: * - * # IndicSyllabicCategory-17.0.0.txt - * # Date: 2025-08-01, 04:02:23 GMT - * # IndicPositionalCategory-17.0.0.txt - * # Date: 2025-07-29, 13:35:52 GMT - * # ArabicShaping-17.0.0.txt - * # Date: 2025-08-14 + * # IndicSyllabicCategory-18.0.0.txt + * # Date: 2026-07-02, 18:58:37 GMT + * # IndicPositionalCategory-18.0.0.txt + * # Date: 2026-06-24, 13:39:21 GMT + * # ArabicShaping-18.0.0.txt + * # Date: 2026-08-18, 19:02:41 GMT * # DerivedCoreProperties-17.0.0.txt * # Date: 2025-07-30, 23:55:08 GMT - * # Blocks-17.0.0.txt - * # Date: 2025-08-01 - * # Scripts-17.0.0.txt - * # Date: 2025-07-24, 13:28:55 GMT + * # Blocks-18.0.0.txt + * # Date: 2026-07-08 + * # Scripts-18.0.0.txt + * # Date: 2026-06-29, 15:25:26 GMT * # Override values For Indic_Syllabic_Category * # Not derivable * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17 @@ -28,6 +28,8 @@ * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16 * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14 * # Updated for Unicode 16.0 by Andrew Glass 2024-09-11 + * # Updated for Unicode 17.0 by Andrew Glass 2025-09-15 + * # Updated for Unicode 18.0 by Andrew Glass 2026-09-04 * # Override values For Indic_Positional_Category * # Not derivable * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17 @@ -40,6 +42,8 @@ * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16 * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14 * # Updated for Unicode 16.0 by Andrew Glass 2024-09-11 + * # Updated for Unicode 17.0 by Andrew Glass 2025-09-15 + * # Updated for Unicode 18.0 by Andrew Glass 2026-09-04 * UnicodeData.txt does not have a header. */ @@ -103,7 +107,7 @@ #include -static const uint8_t hb_use_u8[3343]= +static const uint8_t hb_use_u8[3359]= { 33, 3, 0, 0, 0, 4, 0, 80, 118, 128, 9, 10, 11, 192, 208, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -161,24 +165,24 @@ static const uint8_t hb_use_u8[3343]= 2, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 9, 41, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23, 6, 6, 6, 6, 6, 6, 6, - 6, 0, 0, 0, 0, 0, 0, 48, 0, 44, 0, 0, 0, 0, 0, 49, - 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, + 6, 0, 0, 0, 0, 0, 0, 49, 0, 44, 0, 0, 0, 0, 0, 50, + 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103, 2, 2, 2, 2, 2, 36, 9, - 9, 9, 9, 0, 0, 0, 5, 31, 0, 2, 2, 2, 2, 50, 51, 0, + 9, 9, 9, 0, 0, 0, 5, 31, 0, 2, 2, 2, 2, 51, 52, 0, 0, 9, 24, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 15, 32, - 19, 17, 6, 18, 7, 15, 11, 67, 22, 31, 52, 25, 6, 2, 2, 2, + 19, 17, 6, 18, 7, 15, 11, 67, 22, 31, 53, 25, 6, 2, 2, 2, 2, 104, 14, 8, 2, 2, 2, 5, 8, 5, 5, 0, 2, 2, 0, 32, 19, 0, 0, 0, 34, 0, 0, 2, 8, 2, 0, 0, 0, 0, 0, 5, 105, 31, 24, 8, 2, 2, 5, 0, 8, 5, 2, 8, 5, 2, 0, 35, - 19, 17, 13, 0, 25, 38, 25, 68, 0, 53, 0, 0, 0, 8, 2, 5, - 5, 54, 39, 77, 0, 0, 0, 0, 0, 31, 24, 8, 2, 2, 2, 2, + 19, 17, 13, 0, 25, 38, 25, 68, 0, 54, 0, 0, 0, 8, 2, 5, + 5, 55, 39, 77, 0, 0, 0, 0, 0, 31, 24, 8, 2, 2, 2, 2, 8, 5, 2, 8, 2, 2, 0, 32, 19, 17, 6, 18, 25, 7, 34, 67, - 0, 0, 0, 0, 0, 8, 54, 54, 46, 31, 14, 8, 2, 2, 2, 5, - 8, 5, 2, 8, 2, 2, 0, 32, 20, 0, 0, 25, 7, 0, 0, 2, + 0, 0, 0, 0, 0, 8, 55, 55, 46, 31, 14, 8, 2, 2, 2, 5, + 8, 5, 2, 8, 2, 2, 0, 32, 20, 0, 25, 7, 7, 0, 0, 2, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 26, 8, 2, 2, 5, 0, 2, 5, 2, 2, 0, 8, 5, 5, 2, 0, 8, 5, 0, 2, 5, 0, 2, 2, 2, 2, 2, 2, 0, 0, 11, 15, 27, 0, 12, 33, 12, 45, - 0, 0, 0, 0, 34, 0, 0, 0, 0, 24, 14, 55, 2, 2, 2, 5, + 0, 0, 0, 0, 34, 0, 0, 0, 0, 24, 14, 47, 2, 2, 2, 5, 2, 2, 2, 2, 2, 2, 0, 32, 7, 0, 0, 25, 13, 2, 5, 0, 0, 36, 14, 8, 2, 2, 2, 5, 2, 2, 2, 8, 2, 2, 0, 32, 20, 0, 0, 34, 27, 0, 0, 0, 5, 106, 78, 0, 0, 0, 0, 0, @@ -192,7 +196,7 @@ static const uint8_t hb_use_u8[3343]= 26, 18, 9, 13, 9, 2, 2, 79, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 81, 0, 0, 0, 0, 110, 0, 0, 0, 0, 2, 2, 2, 2, 2, 23, 20, 21, 57, 7, 7, 111, 82, 112, 113, - 83, 2, 2, 2, 2, 2, 48, 0, 44, 2, 2, 2, 11, 6, 2, 2, + 83, 2, 2, 2, 2, 2, 49, 0, 44, 2, 2, 2, 11, 6, 2, 2, 114, 83, 84, 41, 23, 84, 14, 14, 2, 30, 7, 40, 2, 2, 2, 2, 2, 2, 115, 58, 116, 14, 14, 117, 85, 2, 2, 2, 2, 2, 14, 20, 0, 2, 21, 59, 0, 0, 0, 0, 8, 2, 21, 27, 0, 0, 0, 0, @@ -200,19 +204,19 @@ static const uint8_t hb_use_u8[3343]= 2, 5, 21, 0, 0, 0, 0, 0, 0, 2, 2, 4, 20, 7, 21, 6, 12, 12, 12, 12, 24, 60, 118, 119, 120, 121, 122, 0, 0, 0, 0, 123, 0, 5, 0, 0, 8, 0, 124, 4, 125, 39, 39, 126, 86, 2, 2, 2, - 2, 2, 2, 2, 2, 50, 5, 0, 0, 7, 59, 20, 7, 127, 10, 0, + 2, 2, 2, 2, 2, 51, 5, 0, 0, 7, 59, 20, 7, 127, 10, 0, 0, 70, 128, 70, 70, 129, 130, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 14, 0, 0, 0, 2, 2, 2, 30, 71, 20, 0, 0, 2, 2, 131, 132, 42, 133, 10, 81, 134, 15, 20, 7, 21, 18, 59, - 12, 12, 58, 9, 9, 9, 87, 26, 53, 9, 88, 41, 2, 2, 2, 2, + 12, 12, 58, 9, 9, 9, 87, 26, 54, 9, 88, 41, 2, 2, 2, 2, 2, 2, 2, 89, 7, 6, 6, 7, 12, 12, 7, 61, 2, 2, 2, 5, 0, 0, 0, 0, 0, 0, 135, 62, 62, 62, 62, 0, 0, 0, 0, 0, 0, 88, 41, 2, 2, 2, 2, 2, 2, 79, 10, 21, 22, 7, 136, 10, 2, 2, 2, 2, 89, 7, 11, 20, 20, 42, 137, 0, 0, 0, 0, 0, 0, 2, 2, 10, 19, 12, 11, 90, 42, 42, 42, 138, 139, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 8, 2, 9, 26, 16, 16, 16, 9, 16, - 16, 24, 16, 16, 16, 52, 0, 53, 0, 0, 0, 140, 78, 9, 44, 0, - 0, 0, 0, 0, 0, 0, 141, 0, 0, 0, 0, 0, 0, 0, 49, 142, + 16, 24, 16, 16, 16, 53, 0, 54, 0, 0, 0, 140, 78, 9, 44, 0, + 0, 0, 0, 0, 0, 0, 141, 0, 0, 0, 0, 0, 0, 0, 50, 142, 3, 39, 39, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 72, 0, 0, 91, 0, 0, 0, 0, 0, 0, 76, 91, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, @@ -222,31 +226,31 @@ static const uint8_t hb_use_u8[3343]= 0, 14, 2, 2, 2, 2, 2, 2, 2, 2, 2, 144, 11, 11, 11, 11, 11, 11, 11, 92, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 2, 0, 0, 0, 0, 0, 30, 2, 2, 2, 7, 7, 145, 16, - 0, 2, 2, 2, 47, 6, 21, 6, 90, 42, 146, 0, 0, 0, 0, 0, + 0, 2, 2, 2, 48, 6, 21, 6, 90, 42, 146, 0, 0, 0, 0, 0, 0, 9, 147, 2, 2, 2, 2, 2, 2, 2, 148, 11, 7, 6, 12, 149, 150, 93, 0, 0, 0, 0, 0, 0, 0, 2, 2, 30, 8, 2, 2, 2, 2, 2, 2, 2, 2, 36, 7, 21, 71, 58, 151, 94, 152, 0, 0, 0, 0, 2, 153, 2, 2, 2, 2, 154, 0, 8, 2, 39, 44, 0, 85, 24, - 2, 73, 6, 40, 47, 73, 2, 2, 95, 36, 5, 0, 0, 0, 0, 0, + 2, 73, 6, 40, 48, 73, 2, 2, 95, 36, 5, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 155, 18, 22, 0, 0, 156, 96, 0, 0, 0, 0, 2, 23, 20, 11, 59, 27, 157, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 3, 3, 3, 3, 72, 0, 0, 0, 2, 5, 2, 8, 2, 2, 2, - 2, 2, 8, 2, 2, 2, 8, 5, 0, 47, 6, 25, 13, 0, 0, 158, - 159, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 2, 0, 51, 35, 0, - 97, 2, 2, 50, 35, 0, 8, 2, 2, 0, 0, 0, 0, 8, 2, 2, - 5, 2, 2, 9, 54, 0, 0, 0, 0, 2, 2, 2, 0, 25, 7, 7, + 50, 3, 3, 3, 3, 72, 0, 0, 0, 2, 5, 2, 8, 2, 2, 2, + 2, 2, 8, 2, 2, 2, 8, 5, 0, 48, 6, 25, 13, 0, 0, 158, + 159, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 2, 0, 52, 35, 0, + 97, 2, 2, 51, 35, 0, 8, 2, 2, 0, 0, 0, 0, 8, 2, 2, + 5, 2, 2, 9, 55, 0, 0, 0, 0, 2, 2, 2, 0, 25, 7, 7, 8, 2, 2, 2, 2, 2, 25, 38, 0, 2, 2, 2, 16, 16, 16, 16, - 16, 160, 2, 5, 0, 0, 0, 0, 0, 2, 51, 51, 0, 0, 0, 0, + 16, 160, 2, 5, 0, 0, 0, 0, 0, 2, 52, 52, 0, 0, 0, 0, 0, 5, 2, 2, 5, 2, 2, 2, 2, 8, 2, 5, 0, 8, 2, 0, 0, 161, 162, 163, 2, 2, 2, 2, 2, 2, 2, 2, 2, 7, 7, 6, 6, 6, 7, 7, 93, 0, 0, 0, 0, 0, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 2, 2, 2, 2, 2, 40, 30, 40, 0, 0, 0, 0, 164, 19, 17, 18, 15, 67, 35, 0, 0, 0, 13, 0, 0, 0, 0, 0, - 0, 9, 55, 2, 2, 2, 2, 2, 2, 2, 2, 2, 47, 6, 7, 165, + 0, 9, 47, 2, 2, 2, 2, 2, 2, 2, 2, 2, 48, 6, 7, 165, 7, 18, 166, 98, 2, 2, 2, 2, 2, 0, 0, 23, 167, 0, 0, 0, - 0, 2, 50, 0, 0, 0, 0, 0, 0, 2, 23, 22, 6, 6, 6, 7, + 0, 2, 51, 0, 0, 0, 0, 0, 0, 2, 23, 22, 6, 6, 6, 7, 7, 61, 64, 0, 0, 69, 99, 13, 100, 2, 2, 2, 2, 2, 2, 11, - 17, 7, 7, 168, 46, 0, 0, 0, 55, 47, 0, 0, 0, 0, 0, 0, + 17, 7, 7, 168, 46, 0, 0, 0, 47, 48, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 5, 5, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 36, 19, 17, 18, 7, 169, 13, 0, 0, 9, 9, 8, 2, 2, 2, 5, 8, 5, 2, 8, 2, 2, 56, 32, @@ -254,7 +258,7 @@ static const uint8_t hb_use_u8[3343]= 2, 2, 11, 0, 9, 9, 9, 26, 0, 9, 9, 26, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 8, 0, 5, 2, 2, 2, 8, 20, 21, 6, 6, 13, 33, 29, 29, 22, 170, 14, 171, 101, 35, 0, 0, 0, 0, 0, - 0, 31, 52, 0, 0, 0, 0, 0, 0, 2, 2, 23, 22, 6, 6, 6, + 0, 31, 53, 0, 0, 0, 0, 0, 0, 2, 2, 23, 22, 6, 6, 6, 7, 11, 92, 24, 32, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 172, 173, 0, 0, 0, 0, 0, 0, 0, 19, 17, 6, 6, 57, 71, 22, 100, 9, 102, 5, 0, 0, 0, 0, 0, 22, 6, 6, 0, 12, 12, 9, @@ -268,13 +272,14 @@ static const uint8_t hb_use_u8[3343]= 101, 176, 177, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 2, 2, 2, 23, 22, 6, 6, 0, 7, 11, 14, 61, 0, 33, 0, 0, 0, 0, 0, 30, 6, 7, 7, 7, 73, 2, 2, 2, 178, 95, 9, 24, 179, 10, - 180, 0, 0, 48, 97, 0, 0, 0, 0, 30, 6, 7, 15, 17, 6, 2, + 180, 0, 0, 49, 97, 0, 0, 0, 0, 30, 6, 7, 15, 17, 6, 2, 2, 2, 2, 64, 64, 64, 43, 43, 43, 43, 43, 43, 24, 181, 0, 8, - 0, 15, 6, 15, 15, 0, 0, 0, 0, 7, 6, 6, 13, 7, 7, 9, - 65, 0, 10, 10, 10, 10, 10, 10, 10, 57, 18, 60, 26, 0, 0, 0, - 0, 2, 2, 2, 5, 2, 8, 2, 2, 30, 7, 7, 13, 0, 38, 7, - 25, 9, 99, 182, 183, 0, 0, 0, 0, 2, 2, 2, 8, 5, 2, 2, - 2, 2, 2, 2, 2, 2, 11, 11, 27, 7, 34, 60, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 15, 6, 15, 15, 0, 0, 0, + 0, 7, 6, 6, 13, 7, 7, 9, 65, 0, 10, 10, 10, 10, 10, 10, + 10, 57, 18, 60, 26, 0, 0, 0, 0, 2, 2, 2, 5, 2, 8, 2, + 2, 30, 7, 7, 13, 0, 38, 7, 25, 9, 99, 182, 183, 0, 0, 0, + 0, 2, 2, 2, 8, 5, 2, 2, 2, 2, 2, 2, 2, 2, 11, 11, + 27, 7, 34, 60, 82, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 2, 184, 57, 27, 0, 0, 0, 0, 9, 185, 2, 2, 2, 2, 2, 2, 2, 2, 11, 7, 6, 13, 0, 12, 15, 96, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 98, 0, 0, 66, 66, 66, 186, 187, 66, 1, @@ -283,10 +288,10 @@ static const uint8_t hb_use_u8[3343]= 7, 7, 7, 7, 7, 7, 191, 192, 193, 9, 9, 9, 26, 0, 0, 0, 0, 14, 41, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23, 27, 0, 2, 2, 2, 2, 2, 5, 0, 56, 194, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 0, 0, 0, 53, 16, 52, 0, 0, 0, 0, 0, + 6, 6, 6, 6, 6, 0, 0, 0, 54, 16, 53, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 2, 2, 2, 2, 2, 0, 56, 35, 0, 49, 3, 3, 3, 72, 0, - 0, 9, 9, 9, 55, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0, + 8, 2, 2, 2, 2, 2, 0, 56, 35, 0, 50, 3, 3, 3, 72, 0, + 0, 9, 9, 9, 47, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 26, 2, 2, 2, 2, 2, 2, 9, 9, 2, 2, 2, 2, 2, 2, 7, 7, 2, 2, 2, 2, 2, 2, 2, 6, 2, 2, 46, 46, 46, 86, 0, 0, O, O, G, G, B, B, WJ, @@ -295,8 +300,8 @@ static const uint8_t hb_use_u8[3343]= VPre, VPst, VAbv, VAbv, VBlw, VPre, VPst, B, VPst,VMAbv,VMPst, O, VAbv,VMAbv, O, VPst, O, N, N, O, VPre, B, VAbv, O,VMAbv,CMBlw, B, VPre, O, O, VPst,CMBlw, O, B,VMAbv, HM, HM, VAbv, O, GB, GB, VAbv, B,VMPst, B, FAbv, FAbv, FBlw, - FBlw, GB, O, VPre, H,CMAbv,CMAbv, B, VBlw, O, GB, O, WJ, B,CMBlw,CMBlw, - CMBlw,VMBlw, O, O,VMBlw,VMAbv,CMAbv,VMAbv, B, O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw, + FBlw, GB, O, VPre, H,CMAbv,CMAbv,VMAbv, B, B, VBlw, O, GB, O, WJ, B, + CMBlw,CMBlw,CMBlw,VMBlw, O, O,VMBlw,VMAbv,CMAbv, O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw, VPst, VPst,VMAbv, H, B,SMAbv,SMAbv, SB, SE, R, R,VMPst, H, J, J, VPst, H, VAbv, H, O,FMBlw, FPst, FPst, VAbv, VPre, WJ, O, VBlw, B, O, SB, O, SE,FMPst,FMPst, O, MBlw, CS,VMPst, B, SUB, O, SUB, SUB, O,VMPst, IS, MBlw, @@ -358,18 +363,18 @@ static const uint16_t hb_use_u16[864]= 24,1872,1880, 200,1888, 0, 0, 0, 24, 24,1896,1904, 0, 0, 0, 0, 1912,1920, 24,1928,1936, 32, 0, 0, 0, 0,1944, 24, 24,1952,1960, 0, 1968, 24, 24,1976,1984,1992, 24, 24,2000,2008, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,2016, 0, 48, 24, 256,2024, 128, 24, 88, 144, - 24,2032, 176,2040, 0, 0, 0, 0,2048, 24, 24,2056,2064, 32,2072, 24, - 2080,2088, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,2096, - 2104, 80, 24,2112,2120,2128, 0, 0, 8, 8, 8,2136,2144,2152, 8, 8, - 8, 8, 8, 8, 8, 8, 8,2160, 24,2168,2176, 32, 0, 0, 0, 0, - 0, 0, 0, 0, 32, 0, 0, 0, 24, 24, 24,2184, 0, 0, 0, 0, - 0, 0, 0, 0,2192, 24,2200, 32, 24, 24, 24, 24,2208,2216, 264, 264, - 2224,2232, 0, 0, 0, 0,2240, 0, 24, 24, 24, 24, 24, 232, 0,2248, - 24, 24, 24, 24, 24, 24, 104, 88, 96,2256, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,2264, 24, 24, 88,2272,2280, 0, 0, 0, - 0, 24,2288, 0, 24, 24,2296, 32, 0, 0, 0, 0, 0, 24,2304, 32, - 0, 0, 0, 0, 0, 24,2312, 104, 24, 24, 24, 24,2320, 32, 0, 0, + 2016, 0, 0, 0, 0, 0,2024, 0, 48, 24, 256,2032, 128, 24, 88, 144, + 24,2040, 176,2048, 0, 0, 0, 0,2056, 24, 24,2064,2072, 32,2080, 24, + 2088,2096, 32, 0, 0, 0, 0,2104, 0, 0, 0, 0, 0, 0, 24,2112, + 2120, 80, 24,2128,2136,2144, 0, 0, 8, 8, 8,2152,2160,2168, 8, 8, + 8, 8, 8, 8, 8, 8, 8,2176, 24,2184,2192, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 32, 0, 0, 0, 24, 24, 24,2200, 0, 0, 0, 0, + 0, 0, 0, 0,2208, 24,2216, 32, 24, 24, 24, 24,2224,2232, 264, 264, + 2240,2248, 0, 0, 0, 0,2256, 0, 24, 24, 24, 24, 24, 232, 0,2264, + 24, 24, 24, 24, 24, 24, 104, 88, 96,2272, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,2280, 24, 24, 88,2288,2296, 0, 0, 0, + 0, 24,2304, 0, 24, 24,2312, 32, 0, 0, 0, 0, 0, 24,2320, 32, + 0, 0, 0, 0, 0, 24,2328, 104, 24, 24, 24, 24,2336, 32, 0, 0, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 16, }; @@ -380,7 +385,7 @@ static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i) static inline uint8_t hb_use_get_category (unsigned u) { /* packtab: [2^4,2^5,2^3,2^3,2^1] */ - return u<921600u ? (uint8_t)(hb_use_u8[2953u+((hb_use_u8[625u+hb_use_u16[((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((u)>>1))>>3))>>3))>>5)))<<5)+((((((((u)>>1))>>3))>>3))&31)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O; + return u<921600u ? (uint8_t)(hb_use_u8[2969u+((hb_use_u8[625u+hb_use_u16[((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((u)>>1))>>3))>>3))>>5)))<<5)+((((((((u)>>1))>>3))>>3))&31)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O; } @@ -388,7 +393,7 @@ static inline uint8_t hb_use_get_category (unsigned u) #include -static const uint8_t hb_use_u8[3663]= +static const uint8_t hb_use_u8[3679]= { 33, 3, 0, 0, 0, 4, 0, 80, 118, 128, 9, 10, 11, 192, 208, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -438,18 +443,18 @@ static const uint8_t hb_use_u8[3663]= 0, 0, 0, 0, 0, 3, 182, 183, 0, 3, 184, 185, 0, 3, 186, 187, 188, 189, 190, 191, 0, 0, 0, 0, 0, 3, 192, 0, 0, 0, 0, 0, 0, 193, 194, 195, 0, 0, 196, 197, 198, 199, 200, 201, 3, 202, 0, 0, - 0, 0, 0, 0, 203, 0, 0, 0, 0, 204, 205, 206, 207, 208, 209, 0, - 0, 210, 211, 212, 213, 214, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 215, 216, 217, 218, 0, 0, 0, 0, 0, 1, 219, 220, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 221, 222, 223, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 224, 0, 0, 0, 0, 0, - 0, 0, 0, 225, 226, 0, 0, 0, 0, 3, 3, 227, 228, 229, 0, 0, - 230, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 231, - 232, 3, 3, 3, 233, 234, 0, 0, 0, 0, 0, 0, 235, 0, 0, 0, - 0, 3, 236, 237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 238, 3, - 239, 0, 0, 0, 0, 0, 0, 5, 240, 0, 0, 0, 0, 0, 0, 5, - 241, 3, 3, 242, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, - 243, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 203, 0, 0, 204, 0, 0, 0, 0, 205, 206, 207, 208, 209, 210, 0, + 0, 211, 212, 213, 214, 215, 6, 0, 216, 0, 0, 0, 0, 0, 0, 0, + 217, 218, 219, 220, 0, 0, 0, 0, 0, 1, 221, 222, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 223, 224, 225, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 6, 0, 3, 226, 0, 0, 0, 0, 0, + 0, 0, 0, 227, 228, 0, 0, 0, 0, 3, 3, 229, 230, 231, 0, 0, + 232, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 233, + 234, 3, 3, 3, 235, 236, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, + 0, 3, 238, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 240, 3, + 241, 0, 0, 0, 0, 0, 0, 5, 242, 0, 0, 0, 0, 0, 0, 5, + 243, 3, 3, 244, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, + 245, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 5, 2, 2, 2, 2, 6, 0, 2, 2, 2, 2, @@ -466,24 +471,24 @@ static const uint8_t hb_use_u8[3663]= 2, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 9, 41, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23, 6, 6, 6, 6, 6, 6, 6, - 6, 0, 0, 0, 0, 0, 0, 48, 0, 44, 0, 0, 0, 0, 0, 49, - 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, + 6, 0, 0, 0, 0, 0, 0, 49, 0, 44, 0, 0, 0, 0, 0, 50, + 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103, 2, 2, 2, 2, 2, 36, 9, - 9, 9, 9, 0, 0, 0, 5, 31, 0, 2, 2, 2, 2, 50, 51, 0, + 9, 9, 9, 0, 0, 0, 5, 31, 0, 2, 2, 2, 2, 51, 52, 0, 0, 9, 24, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 15, 32, - 19, 17, 6, 18, 7, 15, 11, 67, 22, 31, 52, 25, 6, 2, 2, 2, + 19, 17, 6, 18, 7, 15, 11, 67, 22, 31, 53, 25, 6, 2, 2, 2, 2, 104, 14, 8, 2, 2, 2, 5, 8, 5, 5, 0, 2, 2, 0, 32, 19, 0, 0, 0, 34, 0, 0, 2, 8, 2, 0, 0, 0, 0, 0, 5, 105, 31, 24, 8, 2, 2, 5, 0, 8, 5, 2, 8, 5, 2, 0, 35, - 19, 17, 13, 0, 25, 38, 25, 68, 0, 53, 0, 0, 0, 8, 2, 5, - 5, 54, 39, 77, 0, 0, 0, 0, 0, 31, 24, 8, 2, 2, 2, 2, + 19, 17, 13, 0, 25, 38, 25, 68, 0, 54, 0, 0, 0, 8, 2, 5, + 5, 55, 39, 77, 0, 0, 0, 0, 0, 31, 24, 8, 2, 2, 2, 2, 8, 5, 2, 8, 2, 2, 0, 32, 19, 17, 6, 18, 25, 7, 34, 67, - 0, 0, 0, 0, 0, 8, 54, 54, 46, 31, 14, 8, 2, 2, 2, 5, - 8, 5, 2, 8, 2, 2, 0, 32, 20, 0, 0, 25, 7, 0, 0, 2, + 0, 0, 0, 0, 0, 8, 55, 55, 46, 31, 14, 8, 2, 2, 2, 5, + 8, 5, 2, 8, 2, 2, 0, 32, 20, 0, 25, 7, 7, 0, 0, 2, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 26, 8, 2, 2, 5, 0, 2, 5, 2, 2, 0, 8, 5, 5, 2, 0, 8, 5, 0, 2, 5, 0, 2, 2, 2, 2, 2, 2, 0, 0, 11, 15, 27, 0, 12, 33, 12, 45, - 0, 0, 0, 0, 34, 0, 0, 0, 0, 24, 14, 55, 2, 2, 2, 5, + 0, 0, 0, 0, 34, 0, 0, 0, 0, 24, 14, 47, 2, 2, 2, 5, 2, 2, 2, 2, 2, 2, 0, 32, 7, 0, 0, 25, 13, 2, 5, 0, 0, 36, 14, 8, 2, 2, 2, 5, 2, 2, 2, 8, 2, 2, 0, 32, 20, 0, 0, 34, 27, 0, 0, 0, 5, 106, 78, 0, 0, 0, 0, 0, @@ -497,7 +502,7 @@ static const uint8_t hb_use_u8[3663]= 26, 18, 9, 13, 9, 2, 2, 79, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 81, 0, 0, 0, 0, 110, 0, 0, 0, 0, 2, 2, 2, 2, 2, 23, 20, 21, 57, 7, 7, 111, 82, 112, 113, - 83, 2, 2, 2, 2, 2, 48, 0, 44, 2, 2, 2, 11, 6, 2, 2, + 83, 2, 2, 2, 2, 2, 49, 0, 44, 2, 2, 2, 11, 6, 2, 2, 114, 83, 84, 41, 23, 84, 14, 14, 2, 30, 7, 40, 2, 2, 2, 2, 2, 2, 115, 58, 116, 14, 14, 117, 85, 2, 2, 2, 2, 2, 14, 20, 0, 2, 21, 59, 0, 0, 0, 0, 8, 2, 21, 27, 0, 0, 0, 0, @@ -505,19 +510,19 @@ static const uint8_t hb_use_u8[3663]= 2, 5, 21, 0, 0, 0, 0, 0, 0, 2, 2, 4, 20, 7, 21, 6, 12, 12, 12, 12, 24, 60, 118, 119, 120, 121, 122, 0, 0, 0, 0, 123, 0, 5, 0, 0, 8, 0, 124, 4, 125, 39, 39, 126, 86, 2, 2, 2, - 2, 2, 2, 2, 2, 50, 5, 0, 0, 7, 59, 20, 7, 127, 10, 0, + 2, 2, 2, 2, 2, 51, 5, 0, 0, 7, 59, 20, 7, 127, 10, 0, 0, 70, 128, 70, 70, 129, 130, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 14, 0, 0, 0, 2, 2, 2, 30, 71, 20, 0, 0, 2, 2, 131, 132, 42, 133, 10, 81, 134, 15, 20, 7, 21, 18, 59, - 12, 12, 58, 9, 9, 9, 87, 26, 53, 9, 88, 41, 2, 2, 2, 2, + 12, 12, 58, 9, 9, 9, 87, 26, 54, 9, 88, 41, 2, 2, 2, 2, 2, 2, 2, 89, 7, 6, 6, 7, 12, 12, 7, 61, 2, 2, 2, 5, 0, 0, 0, 0, 0, 0, 135, 62, 62, 62, 62, 0, 0, 0, 0, 0, 0, 88, 41, 2, 2, 2, 2, 2, 2, 79, 10, 21, 22, 7, 136, 10, 2, 2, 2, 2, 89, 7, 11, 20, 20, 42, 137, 0, 0, 0, 0, 0, 0, 2, 2, 10, 19, 12, 11, 90, 42, 42, 42, 138, 139, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 8, 2, 9, 26, 16, 16, 16, 9, 16, - 16, 24, 16, 16, 16, 52, 0, 53, 0, 0, 0, 140, 78, 9, 44, 0, - 0, 0, 0, 0, 0, 0, 141, 0, 0, 0, 0, 0, 0, 0, 49, 142, + 16, 24, 16, 16, 16, 53, 0, 54, 0, 0, 0, 140, 78, 9, 44, 0, + 0, 0, 0, 0, 0, 0, 141, 0, 0, 0, 0, 0, 0, 0, 50, 142, 3, 39, 39, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 72, 0, 0, 91, 0, 0, 0, 0, 0, 0, 76, 91, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, @@ -527,31 +532,31 @@ static const uint8_t hb_use_u8[3663]= 0, 14, 2, 2, 2, 2, 2, 2, 2, 2, 2, 144, 11, 11, 11, 11, 11, 11, 11, 92, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 2, 0, 0, 0, 0, 0, 30, 2, 2, 2, 7, 7, 145, 16, - 0, 2, 2, 2, 47, 6, 21, 6, 90, 42, 146, 0, 0, 0, 0, 0, + 0, 2, 2, 2, 48, 6, 21, 6, 90, 42, 146, 0, 0, 0, 0, 0, 0, 9, 147, 2, 2, 2, 2, 2, 2, 2, 148, 11, 7, 6, 12, 149, 150, 93, 0, 0, 0, 0, 0, 0, 0, 2, 2, 30, 8, 2, 2, 2, 2, 2, 2, 2, 2, 36, 7, 21, 71, 58, 151, 94, 152, 0, 0, 0, 0, 2, 153, 2, 2, 2, 2, 154, 0, 8, 2, 39, 44, 0, 85, 24, - 2, 73, 6, 40, 47, 73, 2, 2, 95, 36, 5, 0, 0, 0, 0, 0, + 2, 73, 6, 40, 48, 73, 2, 2, 95, 36, 5, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 155, 18, 22, 0, 0, 156, 96, 0, 0, 0, 0, 2, 23, 20, 11, 59, 27, 157, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 3, 3, 3, 3, 72, 0, 0, 0, 2, 5, 2, 8, 2, 2, 2, - 2, 2, 8, 2, 2, 2, 8, 5, 0, 47, 6, 25, 13, 0, 0, 158, - 159, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 2, 0, 51, 35, 0, - 97, 2, 2, 50, 35, 0, 8, 2, 2, 0, 0, 0, 0, 8, 2, 2, - 5, 2, 2, 9, 54, 0, 0, 0, 0, 2, 2, 2, 0, 25, 7, 7, + 50, 3, 3, 3, 3, 72, 0, 0, 0, 2, 5, 2, 8, 2, 2, 2, + 2, 2, 8, 2, 2, 2, 8, 5, 0, 48, 6, 25, 13, 0, 0, 158, + 159, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 2, 0, 52, 35, 0, + 97, 2, 2, 51, 35, 0, 8, 2, 2, 0, 0, 0, 0, 8, 2, 2, + 5, 2, 2, 9, 55, 0, 0, 0, 0, 2, 2, 2, 0, 25, 7, 7, 8, 2, 2, 2, 2, 2, 25, 38, 0, 2, 2, 2, 16, 16, 16, 16, - 16, 160, 2, 5, 0, 0, 0, 0, 0, 2, 51, 51, 0, 0, 0, 0, + 16, 160, 2, 5, 0, 0, 0, 0, 0, 2, 52, 52, 0, 0, 0, 0, 0, 5, 2, 2, 5, 2, 2, 2, 2, 8, 2, 5, 0, 8, 2, 0, 0, 161, 162, 163, 2, 2, 2, 2, 2, 2, 2, 2, 2, 7, 7, 6, 6, 6, 7, 7, 93, 0, 0, 0, 0, 0, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 2, 2, 2, 2, 2, 40, 30, 40, 0, 0, 0, 0, 164, 19, 17, 18, 15, 67, 35, 0, 0, 0, 13, 0, 0, 0, 0, 0, - 0, 9, 55, 2, 2, 2, 2, 2, 2, 2, 2, 2, 47, 6, 7, 165, + 0, 9, 47, 2, 2, 2, 2, 2, 2, 2, 2, 2, 48, 6, 7, 165, 7, 18, 166, 98, 2, 2, 2, 2, 2, 0, 0, 23, 167, 0, 0, 0, - 0, 2, 50, 0, 0, 0, 0, 0, 0, 2, 23, 22, 6, 6, 6, 7, + 0, 2, 51, 0, 0, 0, 0, 0, 0, 2, 23, 22, 6, 6, 6, 7, 7, 61, 64, 0, 0, 69, 99, 13, 100, 2, 2, 2, 2, 2, 2, 11, - 17, 7, 7, 168, 46, 0, 0, 0, 55, 47, 0, 0, 0, 0, 0, 0, + 17, 7, 7, 168, 46, 0, 0, 0, 47, 48, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 5, 5, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, 2, 36, 19, 17, 18, 7, 169, 13, 0, 0, 9, 9, 8, 2, 2, 2, 5, 8, 5, 2, 8, 2, 2, 56, 32, @@ -559,7 +564,7 @@ static const uint8_t hb_use_u8[3663]= 2, 2, 11, 0, 9, 9, 9, 26, 0, 9, 9, 26, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 8, 0, 5, 2, 2, 2, 8, 20, 21, 6, 6, 13, 33, 29, 29, 22, 170, 14, 171, 101, 35, 0, 0, 0, 0, 0, - 0, 31, 52, 0, 0, 0, 0, 0, 0, 2, 2, 23, 22, 6, 6, 6, + 0, 31, 53, 0, 0, 0, 0, 0, 0, 2, 2, 23, 22, 6, 6, 6, 7, 11, 92, 24, 32, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 172, 173, 0, 0, 0, 0, 0, 0, 0, 19, 17, 6, 6, 57, 71, 22, 100, 9, 102, 5, 0, 0, 0, 0, 0, 22, 6, 6, 0, 12, 12, 9, @@ -573,13 +578,14 @@ static const uint8_t hb_use_u8[3663]= 101, 176, 177, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 2, 2, 2, 23, 22, 6, 6, 0, 7, 11, 14, 61, 0, 33, 0, 0, 0, 0, 0, 30, 6, 7, 7, 7, 73, 2, 2, 2, 178, 95, 9, 24, 179, 10, - 180, 0, 0, 48, 97, 0, 0, 0, 0, 30, 6, 7, 15, 17, 6, 2, + 180, 0, 0, 49, 97, 0, 0, 0, 0, 30, 6, 7, 15, 17, 6, 2, 2, 2, 2, 64, 64, 64, 43, 43, 43, 43, 43, 43, 24, 181, 0, 8, - 0, 15, 6, 15, 15, 0, 0, 0, 0, 7, 6, 6, 13, 7, 7, 9, - 65, 0, 10, 10, 10, 10, 10, 10, 10, 57, 18, 60, 26, 0, 0, 0, - 0, 2, 2, 2, 5, 2, 8, 2, 2, 30, 7, 7, 13, 0, 38, 7, - 25, 9, 99, 182, 183, 0, 0, 0, 0, 2, 2, 2, 8, 5, 2, 2, - 2, 2, 2, 2, 2, 2, 11, 11, 27, 7, 34, 60, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 15, 6, 15, 15, 0, 0, 0, + 0, 7, 6, 6, 13, 7, 7, 9, 65, 0, 10, 10, 10, 10, 10, 10, + 10, 57, 18, 60, 26, 0, 0, 0, 0, 2, 2, 2, 5, 2, 8, 2, + 2, 30, 7, 7, 13, 0, 38, 7, 25, 9, 99, 182, 183, 0, 0, 0, + 0, 2, 2, 2, 8, 5, 2, 2, 2, 2, 2, 2, 2, 2, 11, 11, + 27, 7, 34, 60, 82, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 2, 184, 57, 27, 0, 0, 0, 0, 9, 185, 2, 2, 2, 2, 2, 2, 2, 2, 11, 7, 6, 13, 0, 12, 15, 96, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 98, 0, 0, 66, 66, 66, 186, 187, 66, 1, @@ -588,10 +594,10 @@ static const uint8_t hb_use_u8[3663]= 7, 7, 7, 7, 7, 7, 191, 192, 193, 9, 9, 9, 26, 0, 0, 0, 0, 14, 41, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23, 27, 0, 2, 2, 2, 2, 2, 5, 0, 56, 194, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 0, 0, 0, 53, 16, 52, 0, 0, 0, 0, 0, + 6, 6, 6, 6, 6, 0, 0, 0, 54, 16, 53, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 2, 2, 2, 2, 2, 0, 56, 35, 0, 49, 3, 3, 3, 72, 0, - 0, 9, 9, 9, 55, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0, + 8, 2, 2, 2, 2, 2, 0, 56, 35, 0, 50, 3, 3, 3, 72, 0, + 0, 9, 9, 9, 47, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 26, 2, 2, 2, 2, 2, 2, 9, 9, 2, 2, 2, 2, 2, 2, 7, 7, 2, 2, 2, 2, 2, 2, 2, 6, 2, 2, 46, 46, 46, 86, 0, 0, O, O, G, G, B, B, WJ, @@ -600,8 +606,8 @@ static const uint8_t hb_use_u8[3663]= VPre, VPst, VAbv, VAbv, VBlw, VPre, VPst, B, VPst,VMAbv,VMPst, O, VAbv,VMAbv, O, VPst, O, N, N, O, VPre, B, VAbv, O,VMAbv,CMBlw, B, VPre, O, O, VPst,CMBlw, O, B,VMAbv, HM, HM, VAbv, O, GB, GB, VAbv, B,VMPst, B, FAbv, FAbv, FBlw, - FBlw, GB, O, VPre, H,CMAbv,CMAbv, B, VBlw, O, GB, O, WJ, B,CMBlw,CMBlw, - CMBlw,VMBlw, O, O,VMBlw,VMAbv,CMAbv,VMAbv, B, O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw, + FBlw, GB, O, VPre, H,CMAbv,CMAbv,VMAbv, B, B, VBlw, O, GB, O, WJ, B, + CMBlw,CMBlw,CMBlw,VMBlw, O, O,VMBlw,VMAbv,CMAbv, O,CMBlw, VBlw, VPre, VPre, VAbv, VBlw, VPst, VPst,VMAbv, H, B,SMAbv,SMAbv, SB, SE, R, R,VMPst, H, J, J, VPst, H, VAbv, H, O,FMBlw, FPst, FPst, VAbv, VPre, WJ, O, VBlw, B, O, SB, O, SE,FMPst,FMPst, O, MBlw, CS,VMPst, B, SUB, O, SUB, SUB, O,VMPst, IS, MBlw, @@ -620,7 +626,7 @@ static const uint8_t hb_use_u8[3663]= SUB, SUB, GB,CMAbv, IS, VBlw, IS, R, MBlw, GB, VAbv, R,VMPst, J, SB, SE, J, HR, G, G, HM, G, O, MPre, MPre, MPst,VMAbv, MBlw, VBlw, O, VBlw, }; -static const uint16_t hb_use_u16[488]= +static const uint16_t hb_use_u16[492]= { 0, 0, 8, 8, 16, 16, 24, 24, 40, 40, 0, 24, 32, 0, 0, 120, 136, 24, 56, 0, 168, 24, 240, 24, 272, 32, 280, 288, 0, 296, 304, 0, @@ -647,12 +653,12 @@ static const uint16_t hb_use_u16[488]= 24,1768,1776,1784,1792, 0, 248, 24, 24,1800,1808, 32, 256,1816,1824,1832, 24,1840,1848, 32,1856,1864, 32, 24, 208, 0, 24,1872,1880, 200,1888, 0, 1896,1904,1912,1920, 24,1928,1936, 32,1944, 24, 24,1952,1960, 0,1968, 24, - 24,1976,1984,1992,2000,2008,2016, 0, 48, 24, 256,2024, 128, 24, 88, 144, - 24,2032, 176,2040,2048, 24, 24,2056,2064, 32,2072, 24,2080,2088, 24,2096, - 2104, 80, 24,2112,2120,2128, 8,2136,2144,2152, 8,2160, 24,2168,2176, 32, - 24,2184,2192, 24,2200, 32,2208,2216, 264, 264,2224,2232,2240, 0, 24, 232, - 0,2248, 104, 88, 96,2256, 0,2264, 88,2272,2280, 0,2288, 0,2296, 32, - 2304, 32,2312, 104,2320, 32, 40, 16, + 24,1976,1984,1992,2000,2008,2016, 0,2024, 0, 48, 24, 256,2032, 128, 24, + 88, 144, 24,2040, 176,2048,2056, 24, 24,2064,2072, 32,2080, 24,2088,2096, + 0,2104, 24,2112,2120, 80, 24,2128,2136,2144, 8,2152,2160,2168, 8,2176, + 24,2184,2192, 32, 24,2200,2208, 24,2216, 32,2224,2232, 264, 264,2240,2248, + 2256, 0, 24, 232, 0,2264, 104, 88, 96,2272, 0,2280, 88,2288,2296, 0, + 2304, 0,2312, 32,2320, 32,2328, 104,2336, 32, 40, 16, }; static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i) @@ -662,7 +668,7 @@ static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i) static inline uint8_t hb_use_get_category (unsigned u) { /* packtab: [2^4,2^4,2^3,2^1,2^3,2^1] */ - return u<921600u ? (uint8_t)(hb_use_u8[3273u+((hb_use_u8[945u+hb_use_u16[((hb_use_u8[369u+((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((((u)>>1))>>3))>>1))>>3))>>4)))<<4)+((((((((((u)>>1))>>3))>>1))>>3))&15)])<<3)+((((((((u)>>1))>>3))>>1))&7)])<<1)+((((((u)>>1))>>3))&1)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O; + return u<921600u ? (uint8_t)(hb_use_u8[3289u+((hb_use_u8[945u+hb_use_u16[((hb_use_u8[369u+((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((((u)>>1))>>3))>>1))>>3))>>4)))<<4)+((((((((((u)>>1))>>3))>>1))>>3))&15)])<<3)+((((((((u)>>1))>>3))>>1))&7)])<<1)+((((((u)>>1))>>3))&1)]+((((u)>>1))&7)])<<1)+((u)&1)]) : O; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc index f834752c51ac..1a5137e28fac 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc @@ -10,8 +10,8 @@ * # Date: 2015-03-12, 21:17:00 GMT [AG] * # Date: 2019-11-08, 23:22:00 GMT [AG] * - * # Scripts-17.0.0.txt - * # Date: 2025-07-24, 13:28:55 GMT + * # Scripts-18.0.0.txt + * # Date: 2026-06-29, 15:25:26 GMT */ #include "hb.hh" diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh index 9993507e360b..d5ed30fdde17 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh @@ -402,6 +402,11 @@ hb_ot_shaper_categorize (hb_script_t script, case HB_SCRIPT_TAI_YO: case HB_SCRIPT_TOLONG_SIKI: + /* Unicode-18.0 additions */ + case HB_SCRIPT_JURCHEN: + case HB_SCRIPT_PROTO_CUNEIFORM: + case HB_SCRIPT_SEAL: + /* If the designer designed the font for the 'DFLT' script, * (or we ended up arbitrarily pick 'latn'), use the default shaper. * Otherwise, use the specific shaper. diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh index 28bc23d8f011..5b3a55b4b1c3 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh @@ -63,9 +63,8 @@ static bool axis_value_is_outside_axis_range (hb_tag_t axis_tag, float axis_valu if (!user_axes_location->has (axis_tag)) return false; - double axis_value_double = static_cast(axis_value); Triple axis_range = user_axes_location->get (axis_tag); - return (axis_value_double < axis_range.minimum || axis_value_double > axis_range.maximum); + return (axis_value < axis_range.minimum || axis_value > axis_range.maximum); } struct StatAxisRecord diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh index 30e106554d6b..c0131d071501 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh @@ -7,7 +7,7 @@ * on files with these headers: * * - * File-Date: 2025-08-25 + * File-Date: 2026-09-17 */ #ifndef HB_OT_TAG_TABLE_HH @@ -82,7 +82,7 @@ static const LangTag ot_languages2[] = { {HB_TAG('h','y',' ',' '), HB_TAG('H','Y','E','0')}, /* Armenian -> Armenian East */ {HB_TAG('h','y',' ',' '), HB_TAG('H','Y','E',' ')}, /* Armenian */ {HB_TAG('h','z',' ',' '), HB_TAG('H','E','R',' ')}, /* Herero */ - {HB_TAG('i','a',' ',' '), HB_TAG('I','N','A',' ')}, /* Interlingua (International Auxiliary Language Association) */ + {HB_TAG('i','a',' ',' '), HB_TAG('I','N','A',' ')}, /* Interlingua (IALA) */ {HB_TAG('i','d',' ',' '), HB_TAG('I','N','D',' ')}, /* Indonesian */ {HB_TAG('i','d',' ',' '), HB_TAG('M','L','Y',' ')}, /* Indonesian -> Malay */ {HB_TAG('i','e',' ',' '), HB_TAG('I','L','E',' ')}, /* Interlingue */ @@ -516,7 +516,7 @@ static const LangTag ot_languages3[] = { {HB_TAG('c','c','q',' '), HB_TAG('A','R','K',' ')}, /* Chaungtha (retired code) -> Rakhine */ {HB_TAG('c','d','o',' '), HB_TAG('Z','H','S',' ')}, /* Min Dong Chinese -> Chinese, Simplified */ {HB_TAG('c','e','k',' '), HB_TAG('Q','I','N',' ')}, /* Eastern Khumi Chin -> Chin */ - {HB_TAG('c','e','y',' '), HB_TAG('Q','I','N',' ')}, /* Ekai Chin -> Chin */ + {HB_TAG('c','e','y',' '), HB_TAG('Q','I','N',' ')}, /* Laoktu Chin -> Chin */ {HB_TAG('c','h','f',' '), HB_TAG('M','Y','N',' ')}, /* Tabasco Chontal -> Mayan */ {HB_TAG('c','h','j',' '), HB_TAG('C','C','H','N')}, /* Ojitlán Chinantec -> Chinantec */ {HB_TAG('c','h','k',' '), HB_TAG('C','H','K','0')}, /* Chuukese */ @@ -834,7 +834,7 @@ static const LangTag ot_languages3[] = { {HB_TAG('m','c','m',' '), HB_TAG('C','P','P',' ')}, /* Malaccan Creole Portuguese -> Creoles */ {HB_TAG('m','c','t',' '), HB_TAG('B','T','I',' ')}, /* Mengisa -> Beti */ {HB_TAG('m','d','f',' '), HB_TAG('M','O','K',' ')}, /* Moksha */ - {HB_TAG('m','d','y',' '), HB_TAG('M','L','E',' ')}, /* Male (Ethiopia) */ + {HB_TAG('m','d','y',' '), HB_TAG('M','L','E',' ')}, /* Male */ {HB_TAG('m','e','n',' '), HB_TAG('M','D','E',' ')}, /* Mende (Sierra Leone) */ {HB_TAG('m','e','o',' '), HB_TAG('M','L','Y',' ')}, /* Kedah Malay -> Malay */ {HB_TAG('m','f','b',' '), HB_TAG('M','L','Y',' ')}, /* Bangka -> Malay */ @@ -854,7 +854,7 @@ static const LangTag ot_languages3[] = { {HB_TAG('m','o','p',' '), HB_TAG('M','Y','N',' ')}, /* Mopán Maya -> Mayan */ {HB_TAG('m','p','e',' '), HB_TAG('M','A','J',' ')}, /* Majang */ {HB_TAG('m','q','g',' '), HB_TAG('M','L','Y',' ')}, /* Kota Bangun Kutai Malay -> Malay */ - {HB_TAG('m','r','h',' '), HB_TAG('Q','I','N',' ')}, /* Mara Chin -> Chin */ + {HB_TAG('m','r','h',' '), HB_TAG('Q','I','N',' ')}, /* Mara -> Chin */ {HB_TAG('m','r','j',' '), HB_TAG('H','M','A',' ')}, /* Western Mari -> High Mari */ {HB_TAG('m','s','c',' '), HB_TAG('M','N','K',' ')}, /* Sankaran Maninka -> Maninka */ {HB_TAG('m','s','h',' '), HB_TAG('M','L','G',' ')}, /* Masikoro Malagasy -> Malagasy */ @@ -1016,7 +1016,7 @@ static const LangTag ot_languages3[] = { {HB_TAG('s','e','z',' '), HB_TAG('Q','I','N',' ')}, /* Senthang Chin -> Chin */ {HB_TAG('s','g','c',' '), HB_TAG('K','A','L',' ')}, /* Kipsigis -> Kalenjin */ {HB_TAG('s','g','w',' '), HB_TAG('C','H','G',' ')}, /* Sebat Bet Gurage -> Chaha Gurage */ - {HB_TAG('s','h','l',' '), HB_TAG('Q','I','N',' ')}, /* Shendu -> Chin */ + {HB_TAG('s','h','l',' '), HB_TAG('Q','I','N',' ')}, /* Shendu (retired code) -> Chin */ {HB_TAG('s','h','u',' '), HB_TAG('A','R','A',' ')}, /* Chadian Arabic -> Arabic */ {HB_TAG('s','h','y',' '), HB_TAG('B','B','R',' ')}, /* Tachawit -> Berber */ {HB_TAG('s','i','z',' '), HB_TAG('B','B','R',' ')}, /* Siwi -> Berber */ @@ -1040,7 +1040,7 @@ static const LangTag ot_languages3[] = { {HB_TAG('s','r','m',' '), HB_TAG('C','P','P',' ')}, /* Saramaccan -> Creoles */ {HB_TAG('s','r','n',' '), HB_TAG('C','P','P',' ')}, /* Sranan Tongo -> Creoles */ {HB_TAG('s','r','o',' '), HB_TAG('S','R','D',' ')}, /* Campidanese Sardinian -> Sardinian */ - {HB_TAG('s','r','s',' '), HB_TAG('A','T','H',' ')}, /* Sarsi -> Athapaskan */ + {HB_TAG('s','r','s',' '), HB_TAG('A','T','H',' ')}, /* Tsuut'ina -> Athapaskan */ {HB_TAG('s','s','h',' '), HB_TAG('A','R','A',' ')}, /* Shihhi Arabic -> Arabic */ {HB_TAG('s','t','a',' '), HB_TAG('C','P','P',' ')}, /* Settla -> Creoles */ {HB_TAG('s','t','v',' '), HB_TAG('S','I','G',' ')}, /* Silt'e -> Silte Gurage */ @@ -1236,8 +1236,8 @@ static const hb_tag_t ot_languages3_multi_values[] = { HB_TAG('D','C','R',' '), /* Woods Cree */ HB_TAG('T','C','R',' '), /* Woods Cree -> TH-Cree */ HB_TAG('C','R','E',' '), /* Woods Cree -> Cree */ - HB_TAG('S','L','A',' '), /* Slave (Athapascan) [macrolanguage] -> Slavey */ - HB_TAG('A','T','H',' '), /* Slave (Athapascan) [macrolanguage] -> Athapaskan */ + HB_TAG('S','L','A',' '), /* Slavey [macrolanguage] */ + HB_TAG('A','T','H',' '), /* Slavey [macrolanguage] -> Athapaskan */ HB_TAG('D','G','O',' '), /* Dogri (individual language) */ HB_TAG('D','G','R',' '), /* Dogri (macrolanguage) */ HB_TAG('D','I','Q',' '), /* Dimli */ @@ -1490,7 +1490,7 @@ static const LangTagRange ot_languages3_multi[] = { {HB_TAG('c','r','x',' '), 59, 2}, /* Carrier */ {HB_TAG('c','s','w',' '), 61, 3}, /* Swampy Cree -> N-Cree */ {HB_TAG('c','w','d',' '), 64, 3}, /* Woods Cree */ - {HB_TAG('d','e','n',' '), 67, 2}, /* Slave (Athapascan) [macrolanguage] -> Slavey */ + {HB_TAG('d','e','n',' '), 67, 2}, /* Slavey [macrolanguage] */ {HB_TAG('d','g','o',' '), 69, 2}, /* Dogri (individual language) */ {HB_TAG('d','i','q',' '), 71, 2}, /* Dimli */ {HB_TAG('d','r','w',' '), 73, 2}, /* Darwazi (retired code) -> Dari */ @@ -1659,6 +1659,13 @@ hb_ot_tags_from_complex_language (const char *lang_str, *count = 1; return true; } + if (subtag_matches (p, limit, "-fonupa", 7)) + { + /* Undetermined; Uralic Phonetic Alphabet */ + tags[0] = HB_TAG('U','P','P','H'); /* Uralic Phonetic Alphabet */ + *count = 1; + return true; + } if (subtag_matches (p, limit, "-geok", 5)) { /* Undetermined; Khutsuri (Asomtavruli and Nuskhuri) */ @@ -3110,6 +3117,8 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag) return hb_language_from_string ("tmh", -1); /* Tamashek [macrolanguage] */ case HB_TAG('T','O','D',' '): /* Todo */ return hb_language_from_string ("xwo", -1); /* Written Oirat */ + case HB_TAG('U','P','P','H'): /* Uralic Phonetic Alphabet */ + return hb_language_from_string ("und-fonupa", -1); /* Undetermined; Uralic Phonetic Alphabet */ case HB_TAG('W','D','T',' '): /* Wendat */ return hb_language_from_string ("wdt", -1); /* Wendat */ case HB_TAG('W','Y','N',' '): /* Wyandot */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc index 79407dd6661d..dd9079d0a5b5 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc @@ -43,8 +43,10 @@ hb_ot_old_tag_from_script (hb_script_t script) case HB_SCRIPT_INVALID: return HB_OT_TAG_DEFAULT_SCRIPT; case HB_SCRIPT_MATH: return HB_OT_TAG_MATH_SCRIPT; - /* KATAKANA and HIRAGANA both map to 'kana' */ + /* Hiragana, Katakana, and their collective ISO 15924 script all map to 'kana'. */ case HB_SCRIPT_HIRAGANA: return HB_TAG('k','a','n','a'); + case HB_TAG('H','r','k','t'): + return HB_TAG('k','a','n','a'); /* Spaces at the end are preserved, unlike ISO 15924 */ case HB_SCRIPT_LAO: return HB_TAG('l','a','o',' '); @@ -350,7 +352,7 @@ hb_ot_tags_from_language (const char *lang_str, if (first_len == 2) { - static hb_atomic_t last_tag_idx_2 = 0; /* Poor man's cache. */ + static hb_atomic_t last_tag_idx_2 {0}; /* Poor man's cache. */ unsigned tag_idx = last_tag_idx_2; if (likely (tag_idx < ARRAY_LENGTH (ot_languages2) && @@ -376,7 +378,7 @@ hb_ot_tags_from_language (const char *lang_str, #ifndef HB_NO_LANGUAGE_LONG else if (first_len == 3) { - static hb_atomic_t last_tag_idx_3 = 0; /* Poor man's cache. */ + static hb_atomic_t last_tag_idx_3 {0}; /* Poor man's cache. */ unsigned tag_idx = last_tag_idx_3; if (likely (tag_idx < ARRAY_LENGTH (ot_languages3) && @@ -394,7 +396,7 @@ hb_ot_tags_from_language (const char *lang_str, return; } - static hb_atomic_t last_tag_idx_3_multi = 0; /* Poor man's cache. */ + static hb_atomic_t last_tag_idx_3_multi {0}; /* Poor man's cache. */ unsigned multi_tag_idx = last_tag_idx_3_multi; if (likely (multi_tag_idx < ARRAY_LENGTH (ot_languages3_multi) && @@ -666,10 +668,10 @@ hb_ot_tags_to_script_and_language (hb_tag_t script_tag, primary_script_tag, nullptr, nullptr); *language = hb_ot_tag_to_language (language_tag); - if (script_count == 0 || primary_script_tag[0] != script_tag) + const char *lang_str = *language ? hb_language_to_string (*language) : nullptr; + if (lang_str && (script_count == 0 || primary_script_tag[0] != script_tag)) { unsigned char *buf; - const char *lang_str = hb_language_to_string (*language); size_t len = strlen (lang_str); buf = (unsigned char *) hb_malloc (len + 16); if (unlikely (!buf)) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh index 8a9307d6933a..054d22aaab0e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh @@ -29,6 +29,7 @@ #include "hb-open-type.hh" #include "hb-ot-var-common.hh" +#include "hb-ot-var-fvar-table.hh" /* @@ -103,6 +104,11 @@ struct AxisValueMap from_coord = renormalizeValue ((double) from_coord, unmapped_range, triple_distances); to_coord = renormalizeValue ((double) to_coord, axis_range, triple_distances); + /* Malformed input can renormalize outside [-1,1], which would + * overflow F2DOT14. */ + from_coord = hb_clamp (from_coord, -1.f, 1.f); + to_coord = hb_clamp (to_coord, -1.f, 1.f); + coords[0].set_float (from_coord); coords[1].set_float (to_coord); } @@ -220,10 +226,10 @@ struct SegmentMaps : Array16Of if (value < map[i].fromCoord) break; - if (i == 0) + if (i == start) { // Value before all segments; Shift. - return value - map[0].fromCoord + map[0].toCoord; + return value - map[start].fromCoord + map[start].toCoord; } if (i == end) { @@ -251,10 +257,11 @@ struct SegmentMaps : Array16Of float unmapped_middle = unmap_float (axis_range.middle); float unmapped_max = unmap_float (axis_range.maximum); - return Triple{(double) unmapped_min, (double) unmapped_middle, (double) unmapped_max}; + return Triple{unmapped_min, unmapped_middle, unmapped_max}; } - bool subset (hb_subset_context_t *c, hb_tag_t axis_tag) const + bool subset (hb_subset_context_t *c, hb_tag_t axis_tag, + hb_vector_t *out_mappings = nullptr) const { TRACE_SUBSET (this); @@ -262,9 +269,14 @@ struct SegmentMaps : Array16Of * We should instead keep the design coords in the shape plan and use * those. unmap_axis_range needs to be killed. */ - /* avar mapped normalized axis range*/ + /* avar mapped normalized axis range. Under avar2, axes_location holds + * only the self-contained pins for the other tables; avar itself uses + * the intermediate-space ranges of all restricted axes. */ + const auto &axes_location = c->plan->has_avar2 + ? c->plan->old_intermediates + : c->plan->axes_location; Triple *axis_range; - if (!c->plan->axes_location.has (axis_tag, &axis_range)) + if (!axes_location.has (axis_tag, &axis_range)) return c->serializer->embed (*this); TripleDistances *axis_triple_distances; @@ -304,18 +316,185 @@ struct SegmentMaps : Array16Of value_mappings.qsort (); + if (unlikely (value_mappings.in_error ())) + return_trace (false); + for (const auto& _ : value_mappings) { if (!_.serialize (c->serializer)) return_trace (false); } - return_trace (c->serializer->check_assign (out->len, value_mappings.length, HB_SERIALIZE_ERROR_INT_OVERFLOW)); + if (!c->serializer->check_assign (out->len, value_mappings.length, HB_SERIALIZE_ERROR_INT_OVERFLOW)) + return_trace (false); + /* Hand the instantiated mappings to the caller; avar2 offset + * compensation needs them to locate the new mapping's kinks. */ + if (out_mappings) + *out_mappings = std::move (value_mappings); + return_trace (true); } public: DEFINE_SIZE_ARRAY (2, *this); }; +/* One knot of the avar2 offset-compensation function + * offset(z) = inv_renorm(z) - z, in new intermediate space. */ +struct avar2_offset_knot_t +{ + double z; + double offset; +}; + +/* Insert a knot keeping the vector sorted by z; first insertion wins on + * duplicate z. */ +static inline void +_avar2_add_knot (hb_vector_t &knots, double z, double offset) +{ + unsigned i = 0; + while (i < knots.length && knots.arrayZ[i].z < z) i++; + if (i < knots.length && knots.arrayZ[i].z == z) return; + knots.push (avar2_offset_knot_t {0.0, 0.0}); + if (unlikely (knots.in_error ())) return; + for (unsigned j = knots.length - 1; j > i; j--) + knots.arrayZ[j] = knots.arrayZ[j - 1]; + knots.arrayZ[i] = avar2_offset_knot_t {z, offset}; +} + +/* Piecewise-linear evaluation over the sorted knots. Inputs are always + * within [-1, +1] and anchor knots at -1/0/+1 always exist. */ +static inline double +_avar2_eval_offset (const hb_vector_t &knots, double z) +{ + unsigned len = knots.length; + for (unsigned i = 0; i < len; i++) + { + if (z == knots.arrayZ[i].z) return knots.arrayZ[i].offset; + if (z < knots.arrayZ[i].z) + { + if (!i) return knots.arrayZ[0].offset; + const auto &before = knots.arrayZ[i - 1]; + const auto &after = knots.arrayZ[i]; + double denom = after.z - before.z; + return before.offset + (after.offset - before.offset) * (z - before.z) / denom; + } + } + return len ? knots.arrayZ[len - 1].offset : 0.0; +} + +/* Piecewise-linear evaluation over instantiated avar v1 mappings, as + * produced by SegmentMaps::subset (sorted, with -1/0/+1 anchors). + * Matches SegmentMaps::map_float for such well-formed mappings. */ +static inline double +_avar2_map_new_mapping (const hb_vector_t &mappings, double v, + unsigned from_offset = 0, unsigned to_offset = 1) +{ + unsigned len = mappings.length; + if (!len) return v; + + for (unsigned i = 0; i < len; i++) + { + double from = (double) mappings.arrayZ[i].coords[from_offset].to_float (); + if (v == from) + return (double) mappings.arrayZ[i].coords[to_offset].to_float (); + if (v < from) + { + double to = (double) mappings.arrayZ[i].coords[to_offset].to_float (); + if (!i) return v - from + to; + double prev_from = (double) mappings.arrayZ[i - 1].coords[from_offset].to_float (); + double prev_to = (double) mappings.arrayZ[i - 1].coords[to_offset].to_float (); + double denom = from - prev_from; + if (denom == 0.0) return prev_to; + return prev_to + (to - prev_to) * (v - prev_from) / denom; + } + } + return v - (double) mappings.arrayZ[len - 1].coords[from_offset].to_float () + + (double) mappings.arrayZ[len - 1].coords[to_offset].to_float (); +} + +/* Inverse of _avar2_map_new_mapping: pull an output coordinate back to a + * preimage input coordinate. For a non-strictly-monotone mapping this picks + * one preimage, which is fine for its only use (augmenting the error + * estimator's sample set). */ +static inline double +_avar2_unmap_new_mapping (const hb_vector_t &mappings, double v) +{ + return _avar2_map_new_mapping (mappings, v, 1, 0); +} + +/* Plain (non-avar) fvar-style normalization of a user value against a + * user-space (min, default, max) triple. */ +static inline double +_avar2_normalize_value (double v, double min, double def, double max) +{ + v = hb_clamp (v, min, max); + if (v == def) return 0.0; + if (v < def) return def == min ? 0.0 : (v - def) / (def - min); + return def == max ? 0.0 : (v - def) / (max - def); +} + +/* Inverse of the above: map a normalized value back to user space. */ +static inline double +_avar2_denormalize_value (double v, double min, double def, double max) +{ + if (v == 0.0) return def; + return v < 0.0 ? def + v * (def - min) : def + v * (max - def); +} + +/* Estimate the residual offset-compensation error for one restricted axis: + * the max |old-avar1-final - (new-avar1 + offset)| over the retained user + * range, in F2Dot14 units. offset(z) is the piecewise-linear function + * through the knots. The residual is dominated by F2Dot14 requantization of + * a steep retained avar v1 segment (e.g. a moved default compressing part + * of the axis into a narrow z band); offset compensation cannot remove it. + * Used only to pick the better knot set and decide whether to warn. + * + * Sampled on a uniform grid augmented with the user-space preimages of + * every kink of the residual (old/new avar v1 breakpoints and offset(z) + * knots), so the worst kink cannot fall between uniform samples. The + * pointwise F2Dot14 rounding makes this an estimate rather than an exact + * bound, but every piecewise-linear extremum is visited. */ +static inline unsigned +_avar2_estimate_offset_error (const SegmentMaps &old_seg, + const hb_vector_t &new_mapping, + double old_min, double old_def, double old_max, + double new_min, double new_def, double new_max, + const hb_vector_t &knots) +{ + constexpr unsigned samples = 257; + hb_vector_t us; + if (unlikely (!us.alloc (samples + old_seg.as_array ().length + + new_mapping.length + knots.length))) + return UINT_MAX; /* estimator only; fail towards "worse" */ + for (unsigned i = 0; i < samples; i++) + us.push (new_min + (new_max - new_min) * i / (samples - 1)); + for (const auto &_ : old_seg.as_array ()) + us.push (_avar2_denormalize_value ((double) _.coords[0].to_float (), + old_min, old_def, old_max)); + for (const auto &_ : new_mapping) + us.push (_avar2_denormalize_value ((double) _.coords[0].to_float (), + new_min, new_def, new_max)); + for (const auto &knot : knots) + us.push (_avar2_denormalize_value ( + _avar2_unmap_new_mapping (new_mapping, knot.z), + new_min, new_def, new_max)); + if (unlikely (us.in_error ())) return UINT_MAX; + + unsigned max_err = 0; + for (double u : us) + { + if (u < new_min || u > new_max) continue; + double n_old = _avar2_normalize_value (u, old_min, old_def, old_max); + double old_final = (double) old_seg.map_float ((float) n_old); + double n_new = _avar2_normalize_value (u, new_min, new_def, new_max); + double z = _avar2_map_new_mapping (new_mapping, n_new); + double new_final = z + _avar2_eval_offset (knots, z); + int err = abs ((int) roundf ((float) (old_final * 16384.0)) - + (int) roundf ((float) (new_final * 16384.0))); + if ((unsigned) err > max_err) max_err = err; + } + return max_err; +} + struct avar { static constexpr hb_tag_t tableTag = HB_OT_TAG_avar; @@ -400,7 +579,12 @@ struct avar int v = coords[i]; uint32_t varidx = varidx_map.map (i); float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache); - v += roundf (delta * 4); // 2.14 -> 16.16 + /* Apply the delta unclamped and clamp only the result to [-1, +1], + * matching fontTools. Since inputs and results are in [-1, +1], + * deltas beyond ±2 are equivalent to ±2; clamp to that range only + * to keep the float->int conversion safe. */ + float d = hb_clamp (delta * 4, -(float) (1<<17), +(float) (1<<17)); // 2.14 -> 16.16 + v += (int) roundf (d); v = hb_clamp (v, -(1<<16), +(1<<16)); out.push (v); } @@ -411,25 +595,53 @@ struct avar #endif } + /* An avar version 2 font is never downgraded to v1: even with a NULL + * varStore offset (legal; maps like plain v1) the avar2 subsetting path + * applies, with "no variation" semantics for rows that don't resolve — + * offset compensation then creates delta rows on demand. */ bool has_v2_data () const { return version.major > 1; } + /* Resolve the avar2 VarStore and VarIdxMap, for the subset planner. + * Either pointer may be to the Null object (nullable offsets). */ + bool get_v2_store_and_map (const ItemVariationStore **store, + const DeltaSetIndexMap **varidx_map) const + { +#ifndef HB_NO_AVAR2 + if (version.major < 2) return false; + const SegmentMaps *map = &firstAxisSegmentMaps; + for (unsigned i = 0; i < axisCount; i++) + map = &StructAfter (*map); + const auto &v2 = * (const avarV2Tail *) map; + *store = &(this+v2.varStore); + *varidx_map = &(this+v2.varIdxMap); + return true; +#else + return false; +#endif + } + // axis normalization is done in 2.14 here // TODO: deprecate this API once fonttools is updated to use 16.16 normalization - bool map_coords_2_14 (float *coords, unsigned int coords_length) const + bool map_coords_2_14 (float *coords, unsigned int coords_length, + bool v1_only = false) const { hb_vector_t coords_2_14; - if (!coords_2_14.resize (coords_length)) return false; + if (!v1_only && !coords_2_14.resize (coords_length)) return false; unsigned int count = hb_min (coords_length, axisCount); const SegmentMaps *map = &firstAxisSegmentMaps; for (unsigned int i = 0; i < count; i++) { int v = roundf (map->map_float (coords[i]) * 16384.f); - coords_2_14[i] = v; + if (!v1_only) + coords_2_14[i] = v; coords[i] = v / 16384.f; map = &StructAfter (*map); } + if (v1_only) + return true; + #ifndef HB_NO_AVAR2 if (version.major < 2) return true; @@ -449,8 +661,10 @@ struct avar int v = coords_2_14[i]; uint32_t varidx = varidx_map.map (i); float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache); - v += roundf (delta); - v = hb_clamp (v, -(1<<16), +(1<<16)); + /* As above: apply the delta unclamped (±2 covers every useful case) + * and clamp the result to [-1, +1], matching fontTools. */ + v += (int) hb_clamp (roundf (delta), -(float) (1<<15), +(float) (1<<15)); + v = hb_clamp (v, -(1<<14), +(1<<14)); coords[i] = v / 16384.f; } @@ -471,11 +685,17 @@ struct avar avar *out = c->serializer->allocate_min (); if (unlikely (!out)) return_trace (false); - out->version.major = 1; + out->version.major = c->plan->has_avar2 ? 2 : 1; out->version.minor = 0; if (!c->serializer->check_assign (out->axisCount, retained_axis_count, HB_SERIALIZE_ERROR_INT_OVERFLOW)) return_trace (false); + /* For avar2, keep the instantiated v1 mappings around; offset + * compensation needs them to locate the new mappings' kinks. */ + hb_vector_t> new_mappings; + if (c->plan->has_avar2 && !new_mappings.resize (axisCount)) + return_trace (false); + const hb_map_t& axes_index_map = c->plan->axes_index_map; const SegmentMaps *map = &firstAxisSegmentMaps; unsigned count = axisCount; @@ -486,14 +706,495 @@ struct avar hb_tag_t *axis_tag; if (!c->plan->axes_old_index_tag_map.has (i, &axis_tag)) return_trace (false); - if (!map->subset (c, *axis_tag)) - return_trace (false); + + Triple *axis_location; + if (c->plan->has_avar2 && + c->plan->user_axes_location.has (*axis_tag, &axis_location) && + axis_location->is_point ()) + { + /* Pinned axis in avar2 mode: serialize identity segment map + * {-1->-1, 0->0, 1->1}. The axis is kept in fvar as hidden, + * so avar needs a segment map entry for it. */ + auto *identity_map = c->serializer->start_embed (); + if (unlikely (!c->serializer->extend_min (identity_map))) + return_trace (false); + AxisValueMap m; + m.set_mapping (-1.f, -1.f); + if (!m.serialize (c->serializer)) return_trace (false); + m.set_mapping (0.f, 0.f); + if (!m.serialize (c->serializer)) return_trace (false); + m.set_mapping (1.f, 1.f); + if (!m.serialize (c->serializer)) return_trace (false); + if (!c->serializer->check_assign (identity_map->len, 3u, + HB_SERIALIZE_ERROR_INT_OVERFLOW)) + return_trace (false); + } + else + { + /* Restricted or free axis: use standard SegmentMaps::subset() */ + if (!map->subset (c, *axis_tag, + c->plan->has_avar2 ? &new_mappings[i] : nullptr)) + return_trace (false); + } } map = &StructAfter (*map); } + + if (c->plan->has_avar2) + return_trace (_subset_avar2 (c, new_mappings)); + return_trace (true); } + private: + struct avar2_index_map_plan_t + { + bool init (const hb_vector_t &varidx_mapping, + const hb_map_t &axes_index_map, + unsigned axis_count) + { + if (!output_map.alloc (axes_index_map.get_population ())) + return false; + + bool has_no_variation = false; + unsigned max_outer = 0, max_inner = 0; + for (unsigned i = 0; i < axis_count; i++) + { + if (!axes_index_map.has (i)) continue; + uint32_t varidx = varidx_mapping[i]; + output_map.push (varidx); + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + { + has_no_variation = true; + continue; + } + max_outer = hb_max (max_outer, varidx >> 16); + max_inner = hb_max (max_inner, varidx & 0xFFFF); + } + if (output_map.in_error () || + output_map.length != axes_index_map.get_population ()) + return false; + + if (has_no_variation) + { + width = 4; + inner_bit_count = 16; + } + else + { + inner_bit_count = hb_max (1u, hb_bit_storage (max_inner)); + unsigned outer_bit_count = hb_max (1u, hb_bit_storage (max_outer)); + width = hb_clamp ((inner_bit_count + outer_bit_count + 7) / 8, 1u, 4u); + if (inner_bit_count + outer_bit_count > width * 8) + inner_bit_count = width * 8 - outer_bit_count; + } + return true; + } + + unsigned get_inner_bit_count () const { return inner_bit_count; } + unsigned get_width () const { return width; } + hb_array_t get_output_map () const { return output_map.as_array (); } + + unsigned inner_bit_count = 1; + unsigned width = 1; + hb_vector_t output_map; + }; + + bool _subset_avar2 (hb_subset_context_t *c, + const hb_vector_t> &new_mappings) const + { +#if defined (HB_NO_VAR) || defined (HB_NO_AVAR2) + /* Not reachable: the plan never sets has_avar2 in these configurations. */ + return false; +#else + + /* 1. Locate original avar2 data, keeping per-axis old segment maps */ + hb_vector_t old_seg_maps; + if (!old_seg_maps.alloc (axisCount)) return false; + const SegmentMaps *map = &firstAxisSegmentMaps; + for (unsigned i = 0; i < axisCount; i++) + { + old_seg_maps.push (map); + map = &StructAfter (*map); + } + + const auto &v2 = * (const avarV2Tail *) map; + const auto &varidx_map = this+v2.varIdxMap; + const auto &var_store = this+v2.varStore; + + auto fvar_axes = c->plan->source->table.fvar->get_axes (); + + /* 2. Compute default deltas by evaluating VarStore at old defaults */ + hb_vector_t default_coords; + if (!default_coords.resize (axisCount)) return false; + for (unsigned i = 0; i < axisCount; i++) + { + hb_tag_t *axis_tag; + if (c->plan->axes_old_index_tag_map.has (i, &axis_tag) && + c->plan->old_intermediates.has (*axis_tag)) + { + float d_i = (float) c->plan->old_intermediates.get (*axis_tag).middle; + default_coords[i] = roundf (d_i * 16384.f); + } + else + default_coords[i] = 0; + } + + auto *store_cache = var_store.create_cache (); + hb_vector_t default_deltas; + if (!default_deltas.resize (axisCount)) { + ItemVariationStore::destroy_cache (store_cache); + return false; + } + for (unsigned i = 0; i < axisCount; i++) + { + uint32_t varidx = varidx_map.map (i); + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + default_deltas[i] = 0.f; + else + default_deltas[i] = var_store.get_delta (varidx, default_coords.arrayZ, + default_coords.length, store_cache); + } + ItemVariationStore::destroy_cache (store_cache); + + /* 3. Rebase IVS regions */ + item_variations_t item_vars; + if (!item_vars.create_from_item_varstore (var_store, c->plan->axes_old_index_tag_map)) + return false; + if (!item_vars.instantiate_tuple_vars (c->plan->old_intermediates, + c->plan->axes_triple_distances, + false)) + return false; + + /* 4. Self-contained pinned axes (whose final coordinate is constant over + * the retained box) were detected at plan time + * (_compute_avar2_reachable_ranges) and removed from axes_index_map. + * They are skipped below; their constant contribution is baked into the + * other variation tables by standard instancing at the plan's + * axes_location/normalized_coords. */ + + /* 5. Build per-axis varIdx mapping (may create new VarDatas). + * Entries (or the implicit identity mapping) that don't resolve to a + * real store row behave as "no variation" at runtime; normalize them to + * NO_VARIATIONS_INDEX so the offset loop creates fresh rows instead of + * writing into nonexistent ones. This also covers a NULL VarStore + * (never downgraded: rows are created on demand). */ + hb_vector_t new_varidx_mapping; + if (!new_varidx_mapping.resize (axisCount)) return false; + for (unsigned i = 0; i < axisCount; i++) + { + uint32_t varidx = varidx_map.map (i); + if (varidx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX && + !var_store.has_delta_set (varidx)) + varidx = HB_OT_LAYOUT_NO_VARIATIONS_INDEX; + new_varidx_mapping[i] = varidx; + } + + /* 5.5. Privatize shared varIdx delta rows before adding offset + * compensation. avar2's VarIdxMap may map several fvar axes to the SAME + * IVS delta row. Writing one axis's offset-compensation deltas into a + * shared row would corrupt every other axis that reads that row. So give + * each offset-receiving axis whose row is shared its own private copy of + * the row (identical contents, preserving the rebased deltas), then + * repoint its varIdx. Sharers keep the clean row; the varstore + * optimization pass re-merges identical rows afterwards. */ + hb_hashmap_t varidx_ref_count; + for (unsigned i = 0; i < axisCount; i++) + { + if (!c->plan->axes_index_map.has (i)) continue; /* self-contained: dropped */ + uint32_t varidx = new_varidx_mapping[i]; + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) continue; + unsigned *count; + if (varidx_ref_count.has (varidx, &count)) + (*count)++; + else if (!varidx_ref_count.set (varidx, 1)) + return false; + } + for (unsigned i = 0; i < axisCount; i++) + { + hb_tag_t *axis_tag_ptr; + if (!c->plan->axes_old_index_tag_map.has (i, &axis_tag_ptr)) + return false; + /* Only axes that will receive offset compensation (restricted or + * pinned) can contaminate a shared row. */ + if (!c->plan->axes_index_map.has (i) || + !c->plan->user_axes_location.has (*axis_tag_ptr)) + continue; + uint32_t varidx = new_varidx_mapping[i]; + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + continue; /* gets a fresh, private VarData in the offset loop below */ + unsigned *count; + if (!varidx_ref_count.has (varidx, &count) || *count <= 1) + continue; /* sole owner: safe to write offsets in place */ + unsigned outer = varidx >> 16; + unsigned new_inner = item_vars.duplicate_row (outer, varidx & 0xFFFF); + if (unlikely (new_inner == (unsigned) -1)) return false; + new_varidx_mapping[i] = (outer << 16) | new_inner; + (*count)--; + } + + /* 6. Add offset compensation tuples. + * Track processed (outer,inner) pairs to avoid adding duplicate biases + * when multiple axes share the same varIdx. */ + hb_set_t processed_varidxes; + for (unsigned i = 0; i < axisCount; i++) + { + hb_tag_t *axis_tag_ptr; + if (!c->plan->axes_old_index_tag_map.has (i, &axis_tag_ptr)) + return false; + hb_tag_t axis_tag = *axis_tag_ptr; + + /* Self-contained pinned axes are removed from fvar/avar; their + * contribution is baked into the variation tables instead. */ + if (!c->plan->axes_index_map.has (i)) + continue; + + Triple *new_user; + if (c->plan->user_axes_location.has (axis_tag, &new_user)) + { + /* This axis is being restricted or pinned */ + Triple *old_int; + if (!c->plan->old_intermediates.has (axis_tag, &old_int)) + return false; + + float a_i = (float) old_int->minimum; + float d_i = (float) old_int->middle; + float b_i = (float) old_int->maximum; + + int d_int = roundf (d_i * 16384.f); + + bool is_pinned = new_user->is_point (); + + uint32_t varidx = new_varidx_mapping[i]; + unsigned outer, inner, item_count; + + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + { + /* No existing avar2 mapping. Create new VarData. */ + outer = item_vars.add_vardata (1); + inner = 0; + item_count = 1; + new_varidx_mapping[i] = (outer << 16) | inner; + default_deltas[i] = 0.f; /* no prior default delta */ + } + else + { + outer = varidx >> 16; + inner = varidx & 0xFFFF; + item_count = item_vars.get_item_count (outer); + } + + /* Empty-region bias: d_int + round(defaultDelta) */ + int bias = d_int + (int) roundf (default_deltas[i]); + if (bias != 0) + { + hb_hashmap_t empty_region; + item_vars.add_tuple (outer, std::move (empty_region), + inner, bias, item_count); + } + + if (!is_pinned) + { + /* Offset compensation encodes, as avar2 deltas on this axis, the + * piecewise-linear function offset(z) = inv_renorm(z) - z, where + * inv_renorm maps a new intermediate coordinate z back to the old + * intermediate coordinate. It is known at these knots in the new + * intermediate space: + * z = -1 -> a_i + 1 (new minimum) + * z = 0 -> d_i (new default) + * z = +1 -> b_i - 1 (new maximum) + */ + hb_vector_t knots; + _avar2_add_knot (knots, -1.0, (double) a_i + 1.0); + _avar2_add_knot (knots, 0.0, (double) d_i); + _avar2_add_knot (knots, 1.0, (double) b_i - 1.0); + + const hb_vector_t &new_mapping = new_mappings[i]; + + float min_f = 0.f, def_f = 0.f, max_f = 0.f; + if (likely (i < fvar_axes.length)) + fvar_axes[i].get_coordinates (min_f, def_f, max_f); + double old_min = (double) min_f; + double old_def = (double) def_f; + double old_max = (double) max_f; + + /* If the axis default MOVED, inv_renorm also kinks where the OLD + * default lands in the new space (the old intermediate coordinate + * crosses 0 there), at + * z = z_old -> -z_old + * Omitting that knot (as a plain two-tent encoding would) makes + * interior coordinates wrong. */ + double z_old = _avar2_normalize_value ((double) old_def, + (double) new_user->minimum, + (double) new_user->middle, + (double) new_user->maximum); + z_old = _avar2_map_new_mapping (new_mapping, z_old); + z_old = (double) roundf ((float) (z_old * 16384.0)) / 16384.0; + if (-1.0 < z_old && z_old < 1.0) + _avar2_add_knot (knots, z_old, -z_old); + + /* Interior avar v1 breakpoints inside the retained range each put + * a kink in offset(z). Sampling only {-1, 0, +1, z_old} would + * linearly interpolate across those kinks. The instantiated + * mapping keeps exactly the in-range old breakpoints, and the new + * mapping kinks at each one's output coordinate; add that z with + * its old intermediate value so offset(z) is reproduced at every + * kink. */ + hb_vector_t with_breakpoints (knots); + for (const auto &m : new_mapping) + { + double from = (double) m.coords[0].to_float (); + if (from == -1.0 || from == 0.0 || from == 1.0) + continue; /* anchors already seeded */ + double z = (double) m.coords[1].to_float (); + if (!(-1.0 < z && z < 1.0)) + continue; + double user = _avar2_denormalize_value (from, + (double) new_user->minimum, + (double) new_user->middle, + (double) new_user->maximum); + double n_old = _avar2_normalize_value (user, old_min, old_def, old_max); + double x_old = (double) old_seg_maps[i]->map_float ((float) n_old); + x_old = (double) roundf ((float) (x_old * 16384.0)) / 16384.0; + _avar2_add_knot (with_breakpoints, z, x_old - z); + } + + if (unlikely (knots.in_error () || with_breakpoints.in_error ())) + return false; + + /* Extra tents cost F2Dot14 rounding, so for a steep segment they + * can add more quantization noise than the structural error they + * remove. Keep the interior breakpoints only when they do not + * increase the estimated residual; this makes the collection a + * strict (never-worse) improvement over the {-1, 0, +1, z_old} + * anchors. Warn when even the better choice is not bit-exact (a + * steep retained segment that cannot be reproduced in F2Dot14). */ + unsigned err = _avar2_estimate_offset_error (*old_seg_maps[i], new_mapping, + old_min, old_def, old_max, + (double) new_user->minimum, + (double) new_user->middle, + (double) new_user->maximum, + knots); + if (with_breakpoints.length != knots.length) + { + unsigned err_with = _avar2_estimate_offset_error (*old_seg_maps[i], new_mapping, + old_min, old_def, old_max, + (double) new_user->minimum, + (double) new_user->middle, + (double) new_user->maximum, + with_breakpoints); + if (err_with <= err) + { + knots = std::move (with_breakpoints); + err = err_with; + } + } + if (err > 8) + DEBUG_MSG (SUBSET, nullptr, + "avar2 offset compensation is approximate for axis %c%c%c%c: " + "max residual %u F2Dot14 units", + HB_UNTAG (axis_tag), err); + + /* Synthesize tents. Adjacent tents evaluate to zero at each + * other's peaks, so each knot's delta is offset(z) - offset(0); + * the base value offset(0) = d_i is carried by the empty-region + * bias above. This reduces to the classic pair of tents + * (-1,-1,0) / (0,+1,+1) when the default is unchanged and there + * are no interior knots. */ + for (unsigned k = 0; k < knots.length; k++) + { + double z = knots.arrayZ[k].z; + if (z == 0.0) continue; + int delta = (int) roundf ((float) ((knots.arrayZ[k].offset - (double) d_i) * 16384.0)); + if (!delta) continue; + double lower, upper; + if (z > 0.0) + { + lower = knots.arrayZ[k - 1].z; + upper = k + 1 < knots.length ? knots.arrayZ[k + 1].z : z; + } + else + { + upper = knots.arrayZ[k + 1].z; + lower = k > 0 ? knots.arrayZ[k - 1].z : z; + } + hb_hashmap_t region; + if (unlikely (!region.set (axis_tag, Triple (lower, z, upper)))) + return false; + item_vars.add_tuple (outer, std::move (region), + inner, delta, item_count); + } + } + } + else + { + /* Free or private axis — not being restricted. + * If it has a non-zero default delta, add it back as a bias. + * Skip if this (outer,inner) was already processed (shared varIdx). */ + uint32_t varidx = new_varidx_mapping[i]; + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + continue; + + if (processed_varidxes.has (varidx)) + continue; + processed_varidxes.add (varidx); + + unsigned outer = varidx >> 16; + unsigned inner = varidx & 0xFFFF; + int dd = (int) roundf (default_deltas[i]); + if (dd != 0) + { + unsigned item_count = item_vars.get_item_count (outer); + hb_hashmap_t empty_region; + item_vars.add_tuple (outer, std::move (empty_region), + inner, dd, item_count); + } + } + } + + /* 7. Finalize: build region list + convert to varstore */ + if (!item_vars.build_region_list ()) return false; + if (!item_vars.as_item_varstore (true /* optimize */, + false /* use_no_variation_idx */)) + return false; + + /* 8. Apply varidx_map optimization remapping */ + const auto &opt_varidx_map = item_vars.get_varidx_map (); + for (unsigned i = 0; i < axisCount; i++) + { + uint32_t varidx = new_varidx_mapping[i]; + if (varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + continue; + uint32_t *new_idx; + if (opt_varidx_map.has (varidx, &new_idx)) + new_varidx_mapping[i] = *new_idx; + } + + /* 9. Serialize avarV2Tail. Entries cover the retained axes only; + * self-contained pinned axes are removed from fvar. */ + avar2_index_map_plan_t index_map_plan; + if (!index_map_plan.init (new_varidx_mapping, + c->plan->axes_index_map, + axisCount)) + return false; + + auto *tail = c->serializer->allocate_size (avarV2Tail::static_size); + if (unlikely (!tail)) return false; + if (!tail->varIdxMap.serialize_serialize (c->serializer, index_map_plan)) + return false; + if (!tail->varStore.serialize_serialize (c->serializer, + item_vars.has_long_word (), + c->plan->axis_tags, + item_vars.get_region_list (), + item_vars.get_vardata_encodings ())) + return false; + + return true; +#endif + } + + public: + protected: FixedVersion<>version; /* Version of the avar table * initially set to 0x00010000u */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh index 26c4d6cfec99..70aba42a2954 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh @@ -47,7 +47,7 @@ struct TupleVariationHeader if (unlikely ((ti & (TupleIndex::EmbeddedPeakTuple | TupleIndex::IntermediateRegion)))) { unsigned count = ((ti & TupleIndex::EmbeddedPeakTuple) != 0) + ((ti & TupleIndex::IntermediateRegion) != 0) * 2; - return min_size + count * axis_count_times_2; + return hb_unsigned_mul_add_saturate (count, axis_count_times_2, min_size); } return min_size; } @@ -103,18 +103,31 @@ struct TupleVariationHeader start = hb_min (peak, 0.f); end = hb_max (peak, 0.f); } - axis_tuples.set (*axis_tag, Triple ((double) start, (double) peak, (double) end)); + axis_tuples.set (*axis_tag, Triple (start, peak, end)); } return true; } HB_ALWAYS_INLINE - double calculate_scalar (hb_array_t coords, unsigned int coord_count, + float calculate_scalar (hb_array_t coords, unsigned int coord_count, const hb_array_t shared_tuples, - hb_scalar_cache_t *shared_tuple_scalar_cache = nullptr) const + hb_scalar_cache_t *shared_tuple_scalar_cache = (hb_scalar_cache_t *) &Null(hb_scalar_cache_t)) const { unsigned tuple_index = tupleIndex; + unsigned int index = tuple_index & TupleIndex::TupleIndexMask; + + /* The gvar shared-tuple cache is clamped to the 12-bit tuple-index range. + * Only PrivatePointNumbers may accompany a cached shared-tuple index; any + * other flag sets a bit at or above 0x1000, making this range test fail. + */ + bool plain_shared_tuple = (tuple_index & ~TupleIndex::PrivatePointNumbers) < shared_tuple_scalar_cache->length; + if (likely (plain_shared_tuple)) + { + float scalar; + if (likely (shared_tuple_scalar_cache->get (index, &scalar))) + return scalar; + } const F2DOT14 *peak_tuple; @@ -127,20 +140,19 @@ struct TupleVariationHeader } else { - unsigned int index = tuple_index & TupleIndex::TupleIndexMask; // Inlined for performance - float scalar; - if (shared_tuple_scalar_cache && + if (!plain_shared_tuple && + shared_tuple_scalar_cache->length && shared_tuple_scalar_cache->get (index, &scalar)) { if (has_interm && (scalar != 0 && scalar != 1.f)) shared_tuple_scalar_cache = nullptr; else - return (double) scalar; + return scalar; } if (unlikely ((index + 1) * coord_count > shared_tuples.length)) - return 0.0; + return 0.f; peak_tuple = shared_tuples.arrayZ + (coord_count * index); } @@ -154,7 +166,7 @@ struct TupleVariationHeader end_tuple = get_end_tuple (coord_count); } - double scalar = 1.0; + float scalar = 1.f; #ifndef HB_OPTIMIZE_SIZE #if HB_FAST_NUM_ACCESS bool skip = coord_count >= 16; @@ -180,7 +192,7 @@ struct TupleVariationHeader if (!peak) continue; int v = coords[i]; - if (!v) { scalar = 0.0; break; } + if (!v) { scalar = 0.f; break; } if (v == peak) continue; if (has_interm) @@ -190,18 +202,18 @@ struct TupleVariationHeader int end = end_tuple[i].to_int (); if (unlikely (start > peak || peak > end || (start < 0 && end > 0 && peak))) continue; - if (v < start || v > end) { scalar = 0.0; break; } + if (v < start || v > end) { scalar = 0.f; break; } if (v < peak) - { if (peak != start) scalar *= (double) (v - start) / (peak - start); } + { if (peak != start) scalar *= (float) (v - start) / (peak - start); } else - { if (peak != end) scalar *= (double) (end - v) / (end - peak); } + { if (peak != end) scalar *= (float) (end - v) / (end - peak); } } - else if (v < hb_min (0, peak) || v > hb_max (0, peak)) { scalar = 0.0; break; } + else if (v < hb_min (0, peak) || v > hb_max (0, peak)) { scalar = 0.f; break; } else - scalar *= (double) v / peak; + scalar *= (float) v / peak; } if (shared_tuple_scalar_cache) - shared_tuple_scalar_cache->set (get_index (), scalar); + shared_tuple_scalar_cache->set (index, scalar); return scalar; } @@ -209,6 +221,7 @@ struct TupleVariationHeader bool has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; } bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; } unsigned get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; } + static constexpr unsigned max_shared_tuple_count = 0x1000u; protected: struct TupleIndex : HBUINT16 @@ -399,21 +412,21 @@ struct tuple_delta_t return; } - if ((tent->minimum < 0.0 && tent->maximum > 0.0) || + if ((tent->minimum < 0.f && tent->maximum > 0.f) || !(tent->minimum <= tent->middle && tent->middle <= tent->maximum)) return; - if (tent->middle == 0.0) + if (tent->middle == 0.f) { out.push (std::move (*this)); return; } if (!axis_limit.is_point () && - !(-1.0 <= axis_limit.minimum && + !(-1.f <= axis_limit.minimum && axis_limit.minimum <= axis_limit.middle && axis_limit.middle <= axis_limit.maximum && - axis_limit.maximum <= +1.0)) + axis_limit.maximum <= +1.f)) return; rebase_tent_result_t &solutions = scratch.first; @@ -604,7 +617,7 @@ struct tuple_delta_t for (unsigned i = 0; i < point_indices.length; i++) { if (!point_indices[i]) continue; - rounded_deltas.arrayZ[j++] = (int) roundf (x_deltas.arrayZ[i]); + rounded_deltas.arrayZ[j++] = hb_clamp_to (roundf ((double) x_deltas.arrayZ[i])); } rounded_deltas.resize (j); @@ -629,7 +642,7 @@ struct tuple_delta_t for (unsigned idx = 0; idx < point_indices.length; idx++) { if (!point_indices[idx]) continue; - int rounded_delta = (int) roundf (y_deltas.arrayZ[idx]); + int rounded_delta = hb_clamp_to (roundf ((double) y_deltas.arrayZ[idx])); if (j >= rounded_deltas.length) return false; @@ -710,14 +723,14 @@ struct tuple_delta_t { i = next_index (i, start_point, end_point); if (i == next) break; - deltas_x.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].x, - (double) orig_points.arrayZ[prev].x, - (double) orig_points.arrayZ[next].x, - (double) deltas_x.arrayZ[prev], (double) deltas_x.arrayZ[next]); - deltas_y.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].y, - (double) orig_points.arrayZ[prev].y, - (double) orig_points.arrayZ[next].y, - (double) deltas_y.arrayZ[prev], (double) deltas_y.arrayZ[next]); + deltas_x.arrayZ[i] = infer_delta (orig_points.arrayZ[i].x, + orig_points.arrayZ[prev].x, + orig_points.arrayZ[next].x, + deltas_x.arrayZ[prev], deltas_x.arrayZ[next]); + deltas_y.arrayZ[i] = infer_delta (orig_points.arrayZ[i].y, + orig_points.arrayZ[prev].y, + orig_points.arrayZ[next].y, + deltas_y.arrayZ[prev], deltas_y.arrayZ[next]); inferred_idxes.add (i); if (--unref_count == 0) goto no_more_gaps; } @@ -734,8 +747,8 @@ struct tuple_delta_t { if (!inferred_idxes.has (i)) { - deltas_x.arrayZ[i] = 0.0; - deltas_y.arrayZ[i] = 0.0; + deltas_x.arrayZ[i] = 0.f; + deltas_y.arrayZ[i] = 0.f; } indices[i] = true; } @@ -763,8 +776,8 @@ struct tuple_delta_t for (unsigned i = 0; i < count; i++) { - rounded_x_deltas.arrayZ[i] = (int) roundf (deltas_x.arrayZ[i]); - rounded_y_deltas.arrayZ[i] = (int) roundf (deltas_y.arrayZ[i]); + rounded_x_deltas.arrayZ[i] = hb_clamp_to (roundf ((double) deltas_x.arrayZ[i])); + rounded_y_deltas.arrayZ[i] = hb_clamp_to (roundf ((double) deltas_y.arrayZ[i])); } if (!iup_delta_optimize (contour_points, rounded_x_deltas, rounded_y_deltas, opt_indices, scratch.iup, tolerance)) @@ -906,16 +919,16 @@ struct tuple_delta_t return compiled_points.resize_dirty (pos); } - static double infer_delta (double target_val, double prev_val, double next_val, double prev_delta, double next_delta) + static float infer_delta (float target_val, float prev_val, float next_val, float prev_delta, float next_delta) { if (prev_val == next_val) - return (prev_delta == next_delta) ? prev_delta : 0.0; + return (prev_delta == next_delta) ? prev_delta : 0.f; else if (target_val <= hb_min (prev_val, next_val)) return (prev_val < next_val) ? prev_delta : next_delta; else if (target_val >= hb_max (prev_val, next_val)) return (prev_val > next_val) ? prev_delta : next_delta; - double r = (target_val - prev_val) / (next_val - prev_val); + float r = (target_val - prev_val) / (next_val - prev_val); return prev_delta + r * (next_delta - prev_delta); } @@ -936,12 +949,14 @@ struct TupleVariationData size_t get_size (unsigned axis_count_times_2) const { - unsigned total_size = min_size; + size_t total_size = min_size; unsigned count = tupleVarCount.get_count (); const TupleVariationHeader *tuple_var_header = &(get_tuple_var_header()); for (unsigned i = 0; i < count; i++) { - total_size += tuple_var_header->get_size (axis_count_times_2) + tuple_var_header->get_data_size (); + total_size = hb_unsigned_add_saturate (total_size, + tuple_var_header->get_size (axis_count_times_2), + (size_t) tuple_var_header->get_data_size ()); tuple_var_header = &tuple_var_header->get_next (axis_count_times_2); } @@ -1144,7 +1159,7 @@ struct TupleVariationData Triple *axis_limit; if (!normalized_axes_location.has (axis_tag, &axis_limit)) return false; - TripleDistances axis_triple_distances{1.0, 1.0}; + TripleDistances axis_triple_distances{1.f, 1.f}; if (axes_triple_distances.has (axis_tag)) axis_triple_distances = axes_triple_distances.get (axis_tag); @@ -1290,6 +1305,22 @@ struct TupleVariationData } public: + /* avar2 partial-instancing culling: drop tuples whose region a partial + * instance can never reach (hb_subset_plan_t::avar2_reachable_ranges). */ + void cull_unreachable (const hb_hashmap_t &reachable_ranges) + { + unsigned j = 0; + for (unsigned i = 0; i < tuple_vars.length; i++) + { + if (_hb_avar2_region_is_dead (tuple_vars.arrayZ[i].axis_tuples, reachable_ranges)) + continue; + if (i != j) + tuple_vars.arrayZ[j] = std::move (tuple_vars.arrayZ[i]); + j++; + } + tuple_vars.shrink (j); + } + bool instantiate (const hb_hashmap_t& normalized_axes_location, const hb_hashmap_t& axes_triple_distances, optimize_scratch_t &scratch, @@ -1511,6 +1542,105 @@ struct TupleVariationData bool has_shared_point_numbers () const { return tupleVarCount.has_shared_point_numbers (); } + /* avar2 partial-instancing culling: rewrite this tuple variation data, + * dropping TupleVariations whose region a partial instance can never + * reach (see hb_subset_plan_t::avar2_reachable_ranges). On success with + * *changed set, out contains the rewritten data — possibly empty, when + * every tuple died. Keeps the original data (*changed stays false) when + * nothing is culled or the data is malformed. Returns false only on + * allocation failure. */ + bool cull_tuple_variations (hb_bytes_t var_data_bytes, + unsigned axis_count, + hb_array_t shared_tuples, + const hb_map_t *axes_old_index_tag_map, + const hb_hashmap_t &reachable_ranges, + hb_vector_t &out /* OUT */, + bool *changed /* OUT */) const + { + *changed = false; + + hb_vector_t shared_indices; + tuple_iterator_t iterator; + if (!get_tuple_iterator (var_data_bytes, axis_count, this, + shared_indices, &iterator)) + return true; /* no tuples or malformed: keep original */ + + const char *bytes_start = var_data_bytes.arrayZ; + const char *bytes_end = bytes_start + var_data_bytes.length; + const char *serialized_base = (const char *) &(this+data); + const char *shared_points_end = (const char *) iterator.get_serialized_data (); + if (unlikely (serialized_base < bytes_start || serialized_base > bytes_end || + shared_points_end < serialized_base || shared_points_end > bytes_end)) + return true; + + struct kept_tuple_t + { + const char *header; + unsigned header_size; + const char *data; + unsigned data_size; + }; + hb_vector_t kept; + unsigned total = 0; + unsigned kept_headers_size = 0, kept_data_size = 0; + do + { + const TupleVariationHeader *header = iterator.current_tuple; + unsigned header_size = header->get_size (axis_count * 2); + unsigned data_size = header->get_data_size (); + const char *tuple_data = (const char *) iterator.get_serialized_data (); + if (unlikely (tuple_data < serialized_base || + data_size > (unsigned) (bytes_end - tuple_data))) + return true; /* malformed: keep original */ + + hb_hashmap_t axis_tuples; + if (!header->unpack_axis_tuples (axis_count, shared_tuples, + axes_old_index_tag_map, axis_tuples)) + return true; + + total++; + if (!_hb_avar2_region_is_dead (axis_tuples, reachable_ranges)) + { + kept.push (kept_tuple_t {(const char *) header, header_size, + tuple_data, data_size}); + kept_headers_size += header_size; + kept_data_size += data_size; + } + } while (iterator.move_to_next ()); + + if (unlikely (kept.in_error ())) return false; + if (kept.length == total) return true; /* nothing to cull */ + + *changed = true; + if (!kept.length) return true; /* everything culled: no variation data */ + + unsigned shared_points_size = shared_points_end - serialized_base; + unsigned data_offset = min_size + kept_headers_size; + unsigned new_size = data_offset + shared_points_size + kept_data_size; + if (unlikely (!out.resize (new_size))) + return false; + + TupleVariationData *out_data = (TupleVariationData *) out.arrayZ; + out_data->tupleVarCount = (uint16_t) (kept.length | + (has_shared_point_numbers () ? 0x8000u : 0u)); + out_data->data = data_offset; + + char *p = out.arrayZ + min_size; + for (const auto &t : kept) + { + hb_memcpy (p, t.header, t.header_size); + p += t.header_size; + } + hb_memcpy (p, serialized_base, shared_points_size); + p += shared_points_size; + for (const auto &t : kept) + { + hb_memcpy (p, t.data, t.data_size); + p += t.data_size; + } + return true; + } + static bool decompile_points (const HBUINT8 *&p /* IN/OUT */, hb_vector_t &points /* OUT */, const HBUINT8 *end) @@ -1721,15 +1851,145 @@ struct item_variations_t const hb_subset_plan_t *plan, bool optimize=true, bool use_no_variation_idx=true, - const hb_array_t inner_maps = hb_array_t ()) + const hb_array_t inner_maps = hb_array_t (), + bool layout_conditions = false) { if (!create_from_item_varstore (varStore, plan->axes_old_index_tag_map, inner_maps)) return false; - if (!instantiate_tuple_vars (plan->axes_location, plan->axes_triple_distances)) + /* avar2 partial instancing: cull unreachable regions. */ + if (plan->has_avar2 && plan->avar2_reachable_ranges.get_population ()) + for (tuple_variations_t& tuple_vars : vars) + tuple_vars.cull_unreachable (plan->avar2_reachable_ranges); + if (!instantiate_tuple_vars (plan->axes_location, plan->axes_triple_distances, + !layout_conditions)) + return false; + if (layout_conditions && + (!instantiate_condition_values (plan, varStore) || !build_region_list ())) return false; return as_item_varstore (optimize, use_no_variation_idx); } + bool instantiate_condition_values (const hb_subset_plan_t *plan, + const ItemVariationStore &varStore) + { + // GDEF serialization can be retried; always start from the source values. + auto &condition_map = plan->layout_condition_idx_value_map; + condition_map.clear (); + if (!plan->layout_condition_values) return true; + using condition_value_t = hb_pair_t>; + hb_vector_t conditions; + for (auto condition : plan->layout_condition_values.iter ()) + conditions.push (condition); + if (unlikely (conditions.in_error ())) return false; + // Row order must not depend on the addresses of the source conditions. + conditions.qsort ([] (const condition_value_t &a, const condition_value_t &b) { + if (a.second.first != b.second.first) + return a.second.first < b.second.first ? -1 : 1; + return a.second.second < b.second.second ? -1 : + a.second.second > b.second.second ? 1 : 0; + }); + hb_map_t outer_map; + unsigned new_outer = 0; + for (unsigned i = 0; i < plan->gdef_varstore_inner_maps.length; i++) + if (plan->gdef_varstore_inner_maps[i].get_population ()) + if (!outer_map.set (i, new_outer++)) return false; + for (auto condition : conditions) + { + unsigned old_idx = condition.second.first; + double value = condition.second.second + + varStore.get_delta (old_idx, plan->normalized_coords.as_array ()); + unsigned old_outer = old_idx >> 16; + if (!outer_map.has (old_outer)) + continue; + unsigned outer = outer_map.get (old_outer); + unsigned inner = plan->gdef_varstore_inner_maps[old_outer].get (old_idx & 0xFFFF); + unsigned idx = (outer << 16) | inner; + if (outer >= vars.length || inner >= var_data_num_rows[outer]) + continue; + + double maximum = fabs ((double) value); + bool variable = false; + for (const tuple_delta_t &tuple : vars[outer].tuple_vars) + { + if (unlikely (inner >= tuple.deltas_x.length)) return false; + float delta = tuple.deltas_x[inner]; + variable |= delta != 0.f; + maximum = hb_max (maximum, fabs ((double) delta)); + } + if (!variable) + { + if (!condition_map.set (condition.first, + hb_pair (unsigned (VarIdx::NO_VARIATION), int (value > 0)))) + return false; + continue; + } + + double scale = 1.; + while (maximum * scale > INT_MAX) + scale *= .5; + // Positive rescaling preserves the Boolean boundary. Prefer exact + // integers, otherwise use the available 32-bit precision. + while (maximum * scale * 2 <= INT_MAX) + { + bool integral = (double) value * scale == round ((double) value * scale); + for (const tuple_delta_t &tuple : vars[outer].tuple_vars) + integral &= (double) tuple.deltas_x[inner] * scale == + round ((double) tuple.deltas_x[inner] * scale); + if (integral) break; + scale *= 2; + } + int default_value = (int) round ((double) value * scale); + if (scale != 1. || default_value < -32768 || default_value > 32767) + { + // A condition may share its row with a positioning value. Give it a + // private copy before integer rounding discards fractional deltas. + tuple_variations_t private_row; + for (const tuple_delta_t &tuple : vars[outer].tuple_vars) + { + if (!tuple.deltas_x[inner]) continue; + tuple_delta_t copy; + copy.axis_tuples = tuple.axis_tuples; + copy.indices.push (true); + copy.deltas_x.push ((float) round ((double) tuple.deltas_x[inner] * scale)); + if (unlikely (copy.axis_tuples.in_error () || copy.indices.in_error () || + copy.deltas_x.in_error ())) return false; + private_row.tuple_vars.push (std::move (copy)); + } + if (unlikely (vars.length >= 0xFFFFu)) return false; + if (unlikely (private_row.tuple_vars.in_error ())) return false; + idx = vars.length << 16; + vars.push (std::move (private_row)); + var_data_num_rows.push (1); + if (unlikely (vars.in_error () || var_data_num_rows.in_error ())) return false; + if (default_value < -32768 || default_value > 32767) + { + // Keep the Boolean result in the int16 default: no deltas apply + // at the default instance. A neutral region carries the excess. + // Each part is exact in float; integer row assembly adds them + // before serialization, preserving all 32 bits of the bias. + int bias = default_value - hb_clamp (default_value, -32768, 32767); + default_value -= bias; + int high = bias / 65536 * 65536; + int parts[] = {high, bias - high}; + for (int part : parts) + { + if (!part) continue; + unsigned count = vars[idx >> 16].tuple_vars.length; + add_tuple (idx >> 16, hb_hashmap_t (), + 0, part, 1); + const auto &tuples = vars[idx >> 16].tuple_vars; + if (unlikely (tuples.in_error () || tuples.length != count + 1 || + tuples.tail ().indices.in_error () || + tuples.tail ().deltas_x.in_error ())) return false; + } + } + } + if (!condition_map.set (condition.first, hb_pair (idx, default_value))) + return false; + } + return !condition_map.in_error (); + } + /* keep below APIs public only for unit test: test-item-varstore */ bool create_from_item_varstore (const ItemVariationStore& varStore, const hb_map_t& axes_old_index_tag_map, @@ -1764,15 +2024,75 @@ struct item_variations_t } bool instantiate_tuple_vars (const hb_hashmap_t& normalized_axes_location, - const hb_hashmap_t& axes_triple_distances) + const hb_hashmap_t& axes_triple_distances, + bool build_regions = true) { optimize_scratch_t scratch; for (tuple_variations_t& tuple_vars : vars) if (!tuple_vars.instantiate (normalized_axes_location, axes_triple_distances, scratch)) return false; - if (!build_region_list ()) return false; - return true; + return !build_regions || build_region_list (); + } + + /* Add a new VarData subtable. Returns outer index. */ + unsigned add_vardata (unsigned item_count) + { + vars.push (tuple_variations_t ()); + var_data_num_rows.push (item_count); + return vars.length - 1; + } + + /* Get item count for a VarData subtable. */ + unsigned get_item_count (unsigned outer) const + { return outer < var_data_num_rows.length ? var_data_num_rows[outer] : 0; } + + /* Duplicate the delta row at position inner within VarData subtable outer, + * appending the copy as a new item. Used to give an axis a private copy of + * a delta row that avar2's VarIdxMap shares between several axes, before + * per-axis offset-compensation deltas are written into it. Returns the new + * inner index, or (unsigned) -1 on failure. */ + unsigned duplicate_row (unsigned outer, unsigned inner) + { + if (unlikely (outer >= vars.length || + inner >= var_data_num_rows[outer] || + var_data_num_rows[outer] >= 0xFFFFu)) + return (unsigned) -1; + for (tuple_delta_t& tuple : vars[outer].tuple_vars) + { + if (unlikely (inner >= tuple.deltas_x.length || + inner >= tuple.indices.length)) + return (unsigned) -1; + tuple.indices.push (tuple.indices.arrayZ[inner]); + tuple.deltas_x.push (tuple.deltas_x.arrayZ[inner]); + if (inner < tuple.deltas_y.length) + tuple.deltas_y.push (tuple.deltas_y.arrayZ[inner]); + if (unlikely (tuple.indices.in_error () || + tuple.deltas_x.in_error () || + tuple.deltas_y.in_error ())) + return (unsigned) -1; + } + return var_data_num_rows[outer]++; + } + + /* Add a tuple with a single non-zero delta at position inner. + * axis_tuples defines the region (empty map = constant/bias tuple). */ + void add_tuple (unsigned outer, + hb_hashmap_t&& axis_tuples, + unsigned inner, int delta, unsigned item_count) + { + if (outer >= vars.length) return; + tuple_delta_t tuple; + tuple.axis_tuples = std::move (axis_tuples); + if (!tuple.indices.resize (item_count) || + !tuple.deltas_x.resize (item_count)) return; + for (unsigned i = 0; i < item_count; i++) + { + tuple.indices.arrayZ[i] = true; + tuple.deltas_x.arrayZ[i] = 0.f; + } + tuple.deltas_x[inner] = (float) delta; + vars[outer].tuple_vars.push (std::move (tuple)); } bool build_region_list () @@ -1793,7 +2113,7 @@ struct item_variations_t bool all_zeros = true; for (float d : tuple.deltas_x) { - int delta = (int) roundf (d); + int delta = hb_clamp_to (roundf ((double) d)); if (delta != 0) { all_zeros = false; @@ -1921,9 +2241,12 @@ struct item_variations_t for (unsigned i = 0; i < num_rows; i++) { - int rounded_delta = roundf (tuple.deltas_x[i]); - delta_rows[start_row + i][*col_idx] += rounded_delta; - has_long |= rounded_delta < -65536 || rounded_delta > 65535; + int rounded_delta = hb_clamp_to (roundf ((double) tuple.deltas_x[i])); + int &delta = delta_rows[start_row + i][*col_idx]; + int64_t sum = (int64_t) delta + rounded_delta; + if (unlikely (sum < INT_MIN || sum > INT_MAX)) return false; + delta = (int) sum; + has_long |= delta < -32768 || delta > 32767; } } @@ -1949,16 +2272,28 @@ struct item_variations_t if (!front_mapping.set ((major<<16) + minor, &row)) return false; - if (delta_rows_map.has (&row)) - continue; + /* Duplicate rows may only be dropped when optimizing: without a + * varidx_map the caller relies on original VariationIndex values + * staying valid (e.g. HVAR/VVAR with an implicit advance mapping). */ + if (optimize) + { + if (delta_rows_map.has (&row)) + continue; - delta_rows_map.set (&row, 1); + delta_rows_map.set (&row, 1); + } major_rows.push (&row); } + if (unlikely (major_rows.in_error () || delta_rows_map.in_error ())) + return false; if (major_rows) - encoding_objs.push (delta_row_encoding_t (std::move (major_rows), num_cols)); + { + auto *encoding = encoding_objs.push (std::move (major_rows), num_cols); + if (unlikely (encoding_objs.in_error () || encoding->in_error ())) + return false; + } start_row += num_rows; } @@ -2011,8 +2346,10 @@ struct item_variations_t removed_todo_idxes.add (i); removed_todo_idxes.add (j); + if (unlikely (removed_todo_idxes.in_error ())) return false; encoding.merge (other_encoding); + if (unlikely (encoding.in_error ())) return false; for (unsigned idx = 0; idx < encoding_objs.length; idx++) { @@ -2030,8 +2367,10 @@ struct item_variations_t for (const auto& row : obj.items) encoding.add_row (row); + if (unlikely (encoding.in_error ())) return false; removed_todo_idxes.add (idx); + if (unlikely (removed_todo_idxes.in_error ())) return false; continue; } @@ -2041,7 +2380,8 @@ struct item_variations_t } auto moved_encoding = std::move (encoding); - encoding_objs.push (moved_encoding); + encoding_objs.push (std::move (moved_encoding)); + if (unlikely (encoding_objs.in_error ())) return false; } int num_final_encodings = (int) encoding_objs.length - (int) removed_todo_idxes.get_population (); @@ -2069,7 +2409,7 @@ struct item_variations_t { delta_row_encoding_t& encoding = encodings[i]; /* just sanity check, this shouldn't happen */ - if (encoding.is_empty ()) + if (encoding.is_empty () || encoding.in_error ()) return false; unsigned num_rows = encoding.items.length; @@ -2095,7 +2435,9 @@ struct item_variations_t return false; } - split_encodings.push (delta_row_encoding_t (std::move (rows), num_cols)); + auto *split = split_encodings.push (std::move (rows), num_cols); + if (unlikely (split_encodings.in_error () || split->in_error ())) + return false; } } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh index d8f497d53468..d33326d73cfd 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh @@ -79,12 +79,12 @@ struct cvar unsigned num_cvt_item, const TupleVariationData<> *tuple_var_data, const void *base, + unsigned var_data_length, hb_vector_t& cvt_deltas /* OUT */) { if (!coords) return true; hb_vector_t shared_indices; TupleVariationData<>::tuple_iterator_t iterator; - unsigned var_data_length = tuple_var_data->get_size (axis_count * 2); hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast (tuple_var_data), var_data_length); if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base, shared_indices, &iterator)) @@ -191,8 +191,17 @@ struct cvar return false; } + /* Bound the tuple variation data by the actual cvar table length rather + * than trusting tupleVarCount to walk the headers; an inflated count would + * otherwise run get_size() off the end of the table. */ + hb_blob_t *cvar_blob = hb_face_reference_table (plan->source, cvar::tableTag); + unsigned cvar_length = hb_blob_get_length (cvar_blob); + hb_blob_destroy (cvar_blob); + unsigned var_data_offset = (unsigned) ((const char *) tuple_var_data - (const char *) base); + unsigned var_data_length = var_data_offset < cvar_length ? cvar_length - var_data_offset : 0; + if (!calculate_cvt_deltas (plan->normalized_coords.length, plan->normalized_coords.as_array (), - num_cvt_item, tuple_var_data, base, cvt_deltas)) + num_cvt_item, tuple_var_data, base, var_data_length, cvt_deltas)) { hb_blob_destroy (cvt_prime_blob); return false; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh index 74d392de9b78..cd7f7fdb84fe 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh @@ -43,7 +43,7 @@ static bool axis_coord_pinned_or_within_axis_range (const hb_array_t(coords[axis_index].to_float ()); + float axis_coord = coords[axis_index].to_float (); if (axis_limit.is_point ()) { if (axis_limit.minimum != axis_coord) @@ -107,8 +107,9 @@ struct InstanceRecord if (!axis_coord_pinned_or_within_axis_range (coords, i, *axis_limit)) return_trace (false); - //skip pinned axis - if (axis_limit->is_point ()) + //skip axes dropped from fvar (pinned; or self-contained under avar2, + //where other pinned axes stay in fvar as hidden) + if (axis_limit->is_point () && !c->plan->axes_index_map.has (i)) continue; } @@ -179,6 +180,8 @@ struct AxisRecord hb_tag_t get_axis_tag () const { return axisTag; } + bool is_hidden () const { return flags & AXIS_FLAG_HIDDEN; } + float normalize_axis_value (float v) const { float min_value, default_value, max_value; @@ -219,10 +222,7 @@ struct AxisRecord { float min, default_, max; get_coordinates (min, default_, max); - return TripleDistances ( - static_cast(min), - static_cast(default_), - static_cast(max)); + return TripleDistances (min, default_, max); } bool subset (hb_subset_context_t *c) const @@ -235,9 +235,21 @@ struct AxisRecord Triple *axis_limit; if (user_axes_location.has (axisTag, &axis_limit)) { - out->minValue.set_float (axis_limit->minimum); - out->defaultValue.set_float (axis_limit->middle); - out->maxValue.set_float (axis_limit->maximum); + if (c->plan->has_avar2 && axis_limit->is_point ()) + { + /* Pinned axis in avar2 mode: keep in fvar as hidden with + * min=default=max=pinned_value. */ + out->minValue.set_float (axis_limit->middle); + out->defaultValue.set_float (axis_limit->middle); + out->maxValue.set_float (axis_limit->middle); + out->flags = out->flags | (HBUINT16) AXIS_FLAG_HIDDEN; + } + else + { + out->minValue.set_float (axis_limit->minimum); + out->defaultValue.set_float (axis_limit->middle); + out->maxValue.set_float (axis_limit->maximum); + } } return_trace (true); } @@ -285,7 +297,7 @@ struct fvar unsigned int *axes_count /* IN/OUT */, hb_ot_var_axis_t *axes_array /* OUT */) const { - if (axes_count) + if (axes_count && axes_array) { hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) @@ -299,7 +311,7 @@ struct fvar unsigned int *axes_count /* IN/OUT */, hb_ot_var_axis_info_t *axes_array /* OUT */) const { - if (axes_count) + if (axes_count && axes_array) { hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) @@ -360,7 +372,7 @@ struct fvar return 0; } - if (coords_length && *coords_length) + if (coords_length && *coords_length && coords) { hb_array_t instanceCoords = instance->get_coordinates (axisCount) .sub_array (0, coords_length); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh index ec24253b429b..512a0176c711 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh @@ -30,6 +30,7 @@ #include "hb-decycler.hh" #include "hb-open-type.hh" +#include "hb-ot-dual.hh" #include "hb-ot-var-common.hh" /* @@ -150,6 +151,18 @@ struct glyph_variations_t contour_point_vector_t *all_points; if (!plan->new_gid_contour_points_map.has (new_gid, &all_points)) return false; + /* IUP adds rebased constant deltas to the contour coordinates. Keep + * the plan's original points intact across serialization retries. */ + contour_point_vector_t points; + if (iup_optimize) + { + points = *all_points; + if (unlikely (points.in_error ())) return false; + all_points = &points; + } + /* avar2 partial instancing: cull unreachable tuples. */ + if (plan->has_avar2 && plan->avar2_reachable_ranges.get_population ()) + glyph_variations[i].cull_unreachable (plan->avar2_reachable_ranges); if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, scratch, &pool, all_points, iup_optimize)) return false; } @@ -301,12 +314,14 @@ struct glyph_variations_t } }; -template +template struct gvar_GVAR { - static constexpr hb_tag_t tableTag = TableTag; + using GlyphCountType = typename Types::HBUINT; - using GlyphVariationData = TupleVariationData; + using GlyphVariationData = TupleVariationData; + static constexpr unsigned glyph_count_max () + { return (1u << (8 * GlyphCountType::static_size)) - 1; } bool has_data () const { return version.to_int () != 0; } @@ -327,7 +342,7 @@ struct gvar_GVAR { return sanitize_shallow (c); } bool decompile_glyph_variations (hb_subset_context_t *c, - glyph_variations_t& glyph_vars /* OUT */) const + glyph_variations_t& glyph_vars /* OUT */) const { hb_hashmap_t new_gid_var_data_map; auto it = hb_iter (c->plan->new_to_old_gid_list); @@ -354,7 +369,7 @@ struct gvar_GVAR template bool serialize (hb_serialize_context_t *c, - const glyph_variations_t& glyph_vars, + const glyph_variations_t& glyph_vars, Iterator it, unsigned axis_count, unsigned num_glyphs, @@ -367,7 +382,7 @@ struct gvar_GVAR out->version.major = 1; out->version.minor = 0; out->axisCount = axis_count; - out->glyphCountX = hb_min (0xFFFFu, num_glyphs); + out->glyphCountX = hb_min (glyph_count_max (), num_glyphs); unsigned glyph_var_data_size = glyph_vars.compiled_byte_size (); /* According to the spec: If the short format (Offset16) is used for offsets, @@ -376,7 +391,8 @@ struct gvar_GVAR bool long_offset = glyph_var_data_size > 0x1FFFEu || force_long_offsets; out->flags = long_offset ? 1 : 0; - HBUINT8 *glyph_var_data_offsets = c->allocate_size ((long_offset ? 4 : 2) * (num_glyphs + 1), false); + unsigned glyph_var_data_offsets_size = (long_offset ? 4 : 2) * (num_glyphs + 1); + HBUINT8 *glyph_var_data_offsets = c->allocate_size (glyph_var_data_offsets_size, false); if (!glyph_var_data_offsets) return_trace (false); /* shared tuples */ @@ -384,7 +400,7 @@ struct gvar_GVAR out->sharedTupleCount = shared_tuple_count; if (!shared_tuple_count) - out->sharedTuples = 0; + out->sharedTuples = (char *) glyph_var_data_offsets + glyph_var_data_offsets_size - (char *) out; else { hb_array_t shared_tuples = glyph_vars.compiled_shared_tuples.as_array ().copy (c); @@ -403,7 +419,7 @@ struct gvar_GVAR bool instantiate (hb_subset_context_t *c) const { TRACE_SUBSET (this); - glyph_variations_t glyph_vars; + glyph_variations_t glyph_vars; if (!decompile_glyph_variations (c, glyph_vars)) return_trace (false); @@ -442,24 +458,57 @@ struct gvar_GVAR out->sharedTupleCount = sharedTupleCount; unsigned int num_glyphs = c->plan->num_output_glyphs (); - out->glyphCountX = hb_min (0xFFFFu, num_glyphs); + out->glyphCountX = hb_min (glyph_count_max (), num_glyphs); + + /* avar2 partial instancing: cull tuple variations whose region falls + * outside the reachable old-space final-coord ranges. Rewritten glyph + * data is cached per new gid; untouched glyphs are copied verbatim. */ + hb_vector_t> culled_vars; + hb_set_t culled_gids; + if (c->plan->has_avar2 && c->plan->avar2_reachable_ranges.get_population ()) + { + hb_array_t shared_tuples_array = + (this+sharedTuples).as_array ((unsigned) sharedTupleCount * (unsigned) axisCount); + if (unlikely (!culled_vars.resize (num_glyphs))) return_trace (false); + auto cull_it = hb_iter (c->plan->new_to_old_gid_list); + if (cull_it->first == 0 && !(c->plan->flags & HB_SUBSET_FLAGS_NOTDEF_OUTLINE)) + cull_it++; + for (auto &_ : cull_it) + { + hb_bytes_t var_data_bytes = get_glyph_var_data_bytes (c->source_blob, glyph_count, _.second); + if (var_data_bytes.length < GlyphVariationData::min_size) continue; + bool changed = false; + if (unlikely (!var_data_bytes.as () + ->cull_tuple_variations (var_data_bytes, axisCount, + shared_tuples_array, + &c->plan->axes_old_index_tag_map, + c->plan->avar2_reachable_ranges, + culled_vars[_.first], &changed))) + return_trace (false); + if (changed) culled_gids.add (_.first); + } + if (unlikely (culled_gids.in_error ())) return_trace (false); + } auto it = hb_iter (c->plan->new_to_old_gid_list); if (it->first == 0 && !(c->plan->flags & HB_SUBSET_FLAGS_NOTDEF_OUTLINE)) it++; - size_t subset_data_size = 0; + unsigned subset_data_size = 0; unsigned padding_size = 0; for (auto &_ : it) { hb_codepoint_t old_gid = _.second; - unsigned glyph_data_size = get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length; + unsigned glyph_data_size = culled_gids.has (_.first) + ? culled_vars[_.first].length + : get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length; if (glyph_data_size % 2) { glyph_data_size++; padding_size++; } - subset_data_size += glyph_data_size; + if (unlikely (hb_unsigned_add_overflows (subset_data_size, glyph_data_size, &subset_data_size))) + return_trace (false); } /* According to the spec: If the short format (Offset16) is used for offsets, @@ -471,12 +520,13 @@ struct gvar_GVAR #endif out->flags = long_offset ? 1 : 0; - HBUINT8 *subset_offsets = c->serializer->allocate_size ((long_offset ? 4 : 2) * (num_glyphs + 1), false); + unsigned subset_offsets_size = (long_offset ? 4 : 2) * (num_glyphs + 1); + HBUINT8 *subset_offsets = c->serializer->allocate_size (subset_offsets_size, false); if (!subset_offsets) return_trace (false); /* shared tuples */ if (!sharedTupleCount || !sharedTuples) - out->sharedTuples = 0; + out->sharedTuples = (char *) subset_offsets + subset_offsets_size - (char *) out; else { unsigned int shared_tuple_size = F2DOT14::static_size * axisCount * sharedTupleCount; @@ -523,9 +573,12 @@ struct gvar_GVAR for (; last < gid; last++) ((HBUINT16 *) subset_offsets)[last] = glyph_offset / 2; - hb_bytes_t var_data_bytes = get_glyph_var_data_bytes (c->source_blob, - glyph_count, - old_gid); + hb_bytes_t var_data_bytes = culled_gids.has (gid) + ? hb_bytes_t (culled_vars[gid].arrayZ, + culled_vars[gid].length) + : get_glyph_var_data_bytes (c->source_blob, + glyph_count, + old_gid); hb_memcpy (subset_data, var_data_bytes.arrayZ, var_data_bytes.length); unsigned glyph_data_size = var_data_bytes.length; @@ -588,7 +641,8 @@ struct gvar_GVAR hb_scalar_cache_t *create_cache () const { - return hb_scalar_cache_t::create (table->sharedTupleCount); + return hb_scalar_cache_t::create (hb_min ((unsigned) table->sharedTupleCount, + +TupleVariationHeader::max_shared_tuple_count)); } static void destroy_cache (hb_scalar_cache_t *cache) @@ -600,7 +654,7 @@ struct gvar_GVAR accelerator_t (hb_face_t *face) { - table = hb_sanitize_context_t ().reference_table (face); + table = hb_sanitize_context_t ().reference_table (face, T::tableTag); /* If sanitize failed, set glyphCount to 0. */ glyphCount = table->version.to_int () ? face->get_num_glyphs () : 0; } @@ -717,9 +771,13 @@ struct gvar_GVAR const hb_array_t points, hb_glyf_scratch_t &scratch, hb_scalar_cache_t *gvar_cache = nullptr, - bool phantom_only = false) const + bool phantom_only = false, + int64_t *budget = nullptr) const { if (unlikely (glyph >= glyphCount)) return true; + hb_scalar_cache_t *scalar_cache = gvar_cache ? + gvar_cache : + (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); hb_bytes_t var_data_bytes = table->get_glyph_var_data_bytes (table.get_blob (), glyphCount, glyph); if (!var_data_bytes.as ()->has_data ()) return true; @@ -759,10 +817,15 @@ struct gvar_GVAR do { float scalar = iterator.current_tuple->calculate_scalar (coords, num_coords, shared_tuples, - gvar_cache); + scalar_cache); if (scalar == 0.f) continue; + if (budget && + unlikely (!hb_budget_spend (*budget, HB_BUDGET_1, + phantom_only && count >= 4 ? 4 : count))) + return false; + if (!private_points_checked) { auto scan = iterator; @@ -992,7 +1055,8 @@ struct gvar_GVAR NNOffset32To> sharedTuples; /* Offset from the start of this table to the shared tuple records. * Array of tuple records shared across all glyph variation data tables. */ - GidOffsetType glyphCountX; /* The number of glyphs in this font. This must match the number of + GlyphCountType + glyphCountX; /* The number of glyphs in this font. This must match the number of * glyphs stored elsewhere in the font. */ HBUINT16 flags; /* Bit-field that gives the format of the offset array that follows. * If bit 0 is clear, the offsets are uint16; if bit 0 is set, the @@ -1004,17 +1068,54 @@ struct gvar_GVAR offsetZ; /* Offsets from the start of the GlyphVariationData array * to each GlyphVariationData table. */ public: - DEFINE_SIZE_ARRAY (20, offsetZ); + DEFINE_SIZE_ARRAY (18 + GlyphCountType::static_size, offsetZ); }; -using gvar = gvar_GVAR; -using GVAR = gvar_GVAR; +struct gvar : gvar_GVAR +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_gvar; +}; -struct gvar_accelerator_t : gvar::accelerator_t { - gvar_accelerator_t (hb_face_t *face) : gvar::accelerator_t (face) {} +struct GVAR : gvar_GVAR +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_GVAR; }; -struct GVAR_accelerator_t : GVAR::accelerator_t { - GVAR_accelerator_t (hb_face_t *face) : GVAR::accelerator_t (face) {} + +struct gvar_accelerator_t : hb_dual_accelerator_t +{ + gvar_accelerator_t (hb_face_t *face) : + hb_dual_accelerator_t (face) {} + + hb_scalar_cache_t *create_cache () const + { + if (has_data ()) return HB_DUAL_GET (*this, create_cache ()); + return nullptr; + } + + static void destroy_cache (hb_scalar_cache_t *cache) + { + hb_scalar_cache_t::destroy (cache); + } + + bool apply_deltas_to_points (hb_codepoint_t glyph, + hb_array_t coords, + const hb_array_t points, + hb_glyf_scratch_t &scratch, + hb_scalar_cache_t *gvar_cache = nullptr, + bool phantom_only = false, + int64_t *budget = nullptr) const + { + return HB_DUAL_GET (*this, apply_deltas_to_points (glyph, coords, points, + scratch, gvar_cache, + phantom_only, budget)); + } + + unsigned int get_axis_count () const + { + if (has_data ()) return HB_DUAL_GET (*this, get_axis_count ()); + return 0; + } }; } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh index 5c0b415f4aa5..95cb772be9de 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh @@ -49,6 +49,12 @@ struct index_map_subset_plan_t bool bypass_empty = true) { map_count = 0; + full_map_count = plan->new_to_old_gid_list.length ? + plan->new_to_old_gid_list.tail ().first + 1 : 0; + /* Only the advance mapping may be dropped in favor of implicit + * glyph-id indexing (for the others a null offset means no deltas), + * and only when the source was map-less too, preserving its form. */ + can_drop_to_implicit = !bypass_empty && !index_map; max_inners.init (); output_map.init (); @@ -181,13 +187,30 @@ struct index_map_subset_plan_t unsigned int get_map_count () const { return map_count; } size_t get_size () const - { return (map_count? (DeltaSetIndexMap::min_size + get_width () * map_count): 0); } + { + if (!map_count) return 0; + return hb_unsigned_mul_add_saturate (get_width (), map_count, + DeltaSetIndexMap::min_size); + } - bool is_identity () const { return get_output_map ().length == 0; } + bool is_identity () const + { + if (!output_map) return true; + /* An advance map whose entries are the identity over every output + * glyph is equivalent to implicit glyph-id indexing; drop it. A + * truncated map doesn't qualify: glyphs past its end share its last + * value, not their own ids. */ + if (!can_drop_to_implicit || map_count != full_map_count) return false; + for (unsigned i = 0; i < map_count; i++) + if (output_map.arrayZ[i] != i) return false; + return true; + } hb_array_t get_output_map () const { return output_map.as_array (); } protected: unsigned int map_count; + unsigned int full_map_count; + bool can_drop_to_implicit; hb_vector_t max_inners; unsigned int outer_bit_count; unsigned int inner_bit_count; @@ -390,10 +413,18 @@ struct HVARVVAR } else { + /* avar2 partial instancing: cull unreachable regions. */ + hb_set_t dead_regions; + if (c->plan->has_avar2) + hvar_plan.var_store->collect_dead_regions (c->plan->axes_old_index_tag_map, + c->plan->avar2_reachable_ranges, + dead_regions); + if (unlikely (!out->varStore .serialize_serialize (c->serializer, hvar_plan.var_store, - hvar_plan.inner_maps.as_array ()))) + hvar_plan.inner_maps.as_array (), + dead_regions.get_population () ? &dead_regions : nullptr))) return_trace (false); } @@ -406,6 +437,9 @@ struct HVARVVAR const int *coords, unsigned int coord_count, hb_scalar_cache_t *store_cache = nullptr) const { + /* Implicit mapping uses outer index zero and the glyph id as the + * inner index. An oversized glyph id must not select another table. */ + if (!advMap && glyph > 0xFFFFu) return 0.f; uint32_t varidx = (this+advMap).map (glyph); return (this+varStore).get_delta (varidx, coords, coord_count, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc index 4d594d587d8c..538e2b2f43bf 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc @@ -89,7 +89,7 @@ hb_ot_var_get_axis_count (hb_face_t *face) * @start_offset: offset of the first lookup to retrieve * @axes_count: (inout) (optional): Input = the maximum number of variation axes to return; * Output = the actual number of variation axes returned (may be zero) - * @axes_array: (out caller-allocates) (array length=axes_count): The array of variation axes found + * @axes_array: (out caller-allocates) (array length=axes_count) (nullable): The array of variation axes found * * Fetches a list of all variation axes in the specified face. The list returned will begin * at the offset provided. @@ -135,7 +135,7 @@ hb_ot_var_find_axis (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @axes_count: (inout) (optional): Input = the maximum number of variation axes to return; * Output = the actual number of variation axes returned (may be zero) - * @axes_array: (out caller-allocates) (array length=axes_count): The array of variation axes found + * @axes_array: (out caller-allocates) (array length=axes_count) (nullable): The array of variation axes found * * Fetches a list of all variation axes in the specified face. The list returned will begin * at the offset provided. @@ -239,7 +239,7 @@ hb_ot_var_named_instance_get_postscript_name_id (hb_face_t *face, * @instance_index: The index of the named instance to query * @coords_length: (inout) (optional): Input = the maximum number of coordinates to return; * Output = the actual number of coordinates returned (may be zero) - * @coords: (out) (array length=coords_length): The array of coordinates found for the query + * @coords: (out) (array length=coords_length) (nullable): The array of coordinates found for the query * * Fetches the design-space coordinates corresponding to the given * named instance in the face. diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh index ff7ce678e4e4..51be3c04acf5 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh @@ -28,6 +28,7 @@ #define HB_OT_VORG_TABLE_HH #include "hb-open-type.hh" +#include "hb-ot-dual.hh" /* * VORG -- Vertical Origin Table @@ -37,6 +38,7 @@ namespace OT { +template struct VertOriginMetric { int cmp (hb_codepoint_t g) const { return glyph.cmp (g); } @@ -48,14 +50,16 @@ struct VertOriginMetric } public: - HBGlyphID16 glyph; + typename Types::HBGlyphID + glyph; FWORD vertOriginY; public: - DEFINE_SIZE_STATIC (4); + DEFINE_SIZE_STATIC (Types::HBGlyphID::static_size + FWORD::static_size); }; -struct VORG +template +struct VORGFormat1_2 { static constexpr hb_tag_t tableTag = HB_OT_TAG_VORG; @@ -79,7 +83,7 @@ struct VORG if (unlikely (!c->extend_min ((*this)))) return; - this->version.major = 1; + this->version.major = Types::size == 2 ? 1 : 2; this->version.minor = 0; this->defaultVertOriginY = defaultVertOriginY; @@ -91,18 +95,18 @@ struct VORG bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - auto *vorg_prime = c->serializer->start_embed (); + auto *vorg_prime = c->serializer->start_embed (); if (unlikely (!c->serializer->check_success (vorg_prime))) return_trace (false); auto it = + vertYOrigins.as_array () - | hb_filter (c->plan->glyphset (), &VertOriginMetric::glyph) - | hb_map ([&] (const VertOriginMetric& _) + | hb_filter (c->plan->glyphset (), &VertOriginMetric::glyph) + | hb_map ([&] (const VertOriginMetric& _) { hb_codepoint_t new_glyph = HB_SET_VALUE_INVALID; c->plan->new_gid_for_old_gid (_.glyph, &new_glyph); - VertOriginMetric metric; + VertOriginMetric metric; metric.glyph = new_glyph; metric.vertOriginY = _.vertOriginY; return metric; @@ -119,19 +123,78 @@ struct VORG TRACE_SANITIZE (this); return_trace (c->check_struct (this) && hb_barrier () && - version.major == 1 && + version.major == (Types::size == 2 ? 1 : 2) && vertYOrigins.sanitize (c)); } protected: - FixedVersion<>version; /* Version of VORG table. Set to 0x00010000u. */ + FixedVersion<>version; /* Version of VORG table. */ FWORD defaultVertOriginY; /* The default vertical origin. */ - SortedArray16Of + typename Types::template SortedArrayOf> vertYOrigins; /* The array of vertical origins. */ public: - DEFINE_SIZE_ARRAY(8, vertYOrigins); + DEFINE_SIZE_ARRAY(6 + Types::HBUINT::static_size, vertYOrigins); +}; + +struct VORG +{ + static constexpr hb_tag_t tableTag = HB_OT_TAG_VORG; + + bool has_data () const { return u.version.v.to_int (); } + + HB_ALWAYS_INLINE + int get_y_origin (hb_codepoint_t glyph) const + { + switch (u.version.v.major) { + case 1: return u.version1.get_y_origin (glyph); +#ifndef HB_NO_BEYOND_64K + case 2: return u.version2.get_y_origin (glyph); +#endif + default: return 0; + } + } + + bool subset (hb_subset_context_t *c) const + { + TRACE_SUBSET (this); + switch (u.version.v.major) { + case 1: return_trace (u.version1.subset (c)); +#ifndef HB_NO_BEYOND_64K + case 2: return_trace (u.version2.subset (c)); +#endif + default: return_trace (false); + } + } + + bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.version.v.sanitize (c))) return_trace (false); + hb_barrier (); + switch (u.version.v.major) { + case 1: hb_barrier (); return_trace (u.version1.sanitize (c)); +#ifndef HB_NO_BEYOND_64K + case 2: hb_barrier (); return_trace (u.version2.sanitize (c)); +#endif + default: return_trace (false); + } + } + + protected: + union { + struct { + FixedVersion<>v; /* Version of VORG table. */ + } version; + VORGFormat1_2version1; +#ifndef HB_NO_BEYOND_64K + VORGFormat1_2version2; +#endif + } u; + + public: + DEFINE_SIZE_UNION (4, version.v); }; } /* namespace OT */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot.h b/src/java.desktop/share/native/libharfbuzz/hb-ot.h index f2dbaa1b317e..f0d3521a893f 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ot.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-ot.h @@ -30,6 +30,7 @@ #include "hb.h" +#include "hb-ot-fetch.h" #include "hb-ot-color.h" #include "hb-ot-deprecated.h" #include "hb-ot-font.h" diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc index 12963fe46e38..88190403d7bd 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc @@ -298,6 +298,16 @@ hb_outline_recording_pen_close_path (hb_draw_funcs_t *dfuncs HB_UNUSED, c->contours.push (c->points.length); } +static int64_t * +hb_outline_recording_pen_get_budget_remaining (hb_draw_funcs_t *dfuncs HB_UNUSED, + void *data, + void *user_data HB_UNUSED) +{ + hb_outline_t *c = (hb_outline_t *) data; + + return c->budget_remaining; +} + static inline void free_static_outline_recording_pen_funcs (); static struct hb_outline_recording_pen_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t @@ -311,6 +321,7 @@ static struct hb_outline_recording_pen_funcs_lazy_loader_t : hb_draw_funcs_lazy_ hb_draw_funcs_set_quadratic_to_func (funcs, hb_outline_recording_pen_quadratic_to, nullptr, nullptr); hb_draw_funcs_set_cubic_to_func (funcs, hb_outline_recording_pen_cubic_to, nullptr, nullptr); hb_draw_funcs_set_close_path_func (funcs, hb_outline_recording_pen_close_path, nullptr, nullptr); + hb_draw_funcs_set_get_budget_remaining_func (funcs, hb_outline_recording_pen_get_budget_remaining, nullptr, nullptr); hb_draw_funcs_make_immutable (funcs); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh index e23f5afa0a84..306e1d365790 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh @@ -76,6 +76,7 @@ struct hb_outline_t hb_vector_t points; hb_vector_t contours; + int64_t *budget_remaining = nullptr; }; HB_INTERNAL hb_draw_funcs_t * diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc index e867f37f3c56..46cea29effaa 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc @@ -62,6 +62,103 @@ hb_paint_extents_pop_transform (hb_paint_funcs_t *funcs HB_UNUSED, c->pop_transform (); } +/* Like the hb_draw_extents_get_funcs() sink, but tied to the paint + * session's live work budget. */ +struct hb_paint_extents_sink_t +{ + hb_extents_t<> extents; + int64_t *budget_remaining; + + bool consume_segment () + { + return hb_budget_spend (*budget_remaining, HB_BUDGET_1); + } +}; + +static void +hb_paint_extents_count_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED, void *data, + hb_draw_state_t *st HB_UNUSED, + float to_x, float to_y, + void *user_data HB_UNUSED) +{ + hb_paint_extents_sink_t *sink = (hb_paint_extents_sink_t *) data; + if (unlikely (!sink->consume_segment ())) return; + sink->extents.add_point (to_x, to_y); +} + +static void +hb_paint_extents_count_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED, void *data, + hb_draw_state_t *st HB_UNUSED, + float to_x, float to_y, + void *user_data HB_UNUSED) +{ + hb_paint_extents_sink_t *sink = (hb_paint_extents_sink_t *) data; + if (unlikely (!sink->consume_segment ())) return; + sink->extents.add_point (to_x, to_y); +} + +static void +hb_paint_extents_count_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED, void *data, + hb_draw_state_t *st HB_UNUSED, + float control_x, float control_y, + float to_x, float to_y, + void *user_data HB_UNUSED) +{ + hb_paint_extents_sink_t *sink = (hb_paint_extents_sink_t *) data; + if (unlikely (!sink->consume_segment ())) return; + sink->extents.add_point (control_x, control_y); + sink->extents.add_point (to_x, to_y); +} + +static void +hb_paint_extents_count_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED, void *data, + hb_draw_state_t *st HB_UNUSED, + float control1_x, float control1_y, + float control2_x, float control2_y, + float to_x, float to_y, + void *user_data HB_UNUSED) +{ + hb_paint_extents_sink_t *sink = (hb_paint_extents_sink_t *) data; + if (unlikely (!sink->consume_segment ())) return; + sink->extents.add_point (control1_x, control1_y); + sink->extents.add_point (control2_x, control2_y); + sink->extents.add_point (to_x, to_y); +} + +static int64_t * +hb_paint_extents_get_budget_remaining (hb_draw_funcs_t *, void *draw_data, void *) +{ + return ((hb_paint_extents_sink_t *) draw_data)->budget_remaining; +} + +static inline void free_static_paint_extents_draw_funcs (); + +static struct hb_paint_extents_draw_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t +{ + static hb_draw_funcs_t *create () + { + hb_draw_funcs_t *funcs = hb_draw_funcs_create (); + + hb_draw_funcs_set_move_to_func (funcs, hb_paint_extents_count_move_to, nullptr, nullptr); + hb_draw_funcs_set_line_to_func (funcs, hb_paint_extents_count_line_to, nullptr, nullptr); + hb_draw_funcs_set_quadratic_to_func (funcs, hb_paint_extents_count_quadratic_to, nullptr, nullptr); + hb_draw_funcs_set_cubic_to_func (funcs, hb_paint_extents_count_cubic_to, nullptr, nullptr); + hb_draw_funcs_set_get_budget_remaining_func (funcs, hb_paint_extents_get_budget_remaining, nullptr, nullptr); + + hb_draw_funcs_make_immutable (funcs); + + hb_atexit (free_static_paint_extents_draw_funcs); + + return funcs; + } +} static_paint_extents_draw_funcs; + +static inline +void free_static_paint_extents_draw_funcs () +{ + static_paint_extents_draw_funcs.free_instance (); +} + static void hb_paint_extents_push_clip_glyph (hb_paint_funcs_t *funcs HB_UNUSED, void *paint_data, @@ -71,10 +168,12 @@ hb_paint_extents_push_clip_glyph (hb_paint_funcs_t *funcs HB_UNUSED, { hb_paint_extents_context_t *c = (hb_paint_extents_context_t *) paint_data; - hb_extents_t<> extents; - hb_draw_funcs_t *draw_extent_funcs = hb_draw_extents_get_funcs (); - hb_font_draw_glyph (font, glyph, draw_extent_funcs, &extents); - c->push_clip (extents); + hb_paint_extents_sink_t sink {{}, &c->budget_remaining}; + /* Skip the outline extraction when the session work budget is + * spent; an empty clip clips everything out. */ + if (likely (c->budget_remaining >= 0)) + hb_font_draw_glyph (font, glyph, static_paint_extents_draw_funcs.get_unconst (), &sink); + c->push_clip (sink.extents); } static void @@ -200,6 +299,29 @@ hb_paint_extents_paint_sweep_gradient (hb_paint_funcs_t *funcs HB_UNUSED, c->paint (); } +static hb_bool_t +hb_paint_extents_set_budget (hb_paint_funcs_t *, void *paint_data, + int64_t budget, void *) +{ + auto *context = (hb_paint_extents_context_t *) paint_data; + context->budget = budget; + context->budget_initialized = true; + context->recharge_budget (); + return true; +} + +static int64_t +hb_paint_extents_get_budget (hb_paint_funcs_t *, void *paint_data, void *) +{ + return ((hb_paint_extents_context_t *) paint_data)->budget; +} + +static int64_t * +hb_paint_extents_get_budget_remaining (hb_paint_funcs_t *, void *paint_data, void *) +{ + return &((hb_paint_extents_context_t *) paint_data)->budget_remaining; +} + static inline void free_static_paint_extents_funcs (); static struct hb_paint_extents_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t @@ -220,6 +342,9 @@ static struct hb_paint_extents_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_ hb_paint_funcs_set_linear_gradient_func (funcs, hb_paint_extents_paint_linear_gradient, nullptr, nullptr); hb_paint_funcs_set_radial_gradient_func (funcs, hb_paint_extents_paint_radial_gradient, nullptr, nullptr); hb_paint_funcs_set_sweep_gradient_func (funcs, hb_paint_extents_paint_sweep_gradient, nullptr, nullptr); + hb_paint_funcs_set_set_budget_func (funcs, hb_paint_extents_set_budget, nullptr, nullptr); + hb_paint_funcs_set_get_budget_func (funcs, hb_paint_extents_get_budget, nullptr, nullptr); + hb_paint_funcs_set_get_budget_remaining_func (funcs, hb_paint_extents_get_budget_remaining, nullptr, nullptr); hb_paint_funcs_make_immutable (funcs); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh index 531eb3c7c52b..cd77d5555701 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh @@ -40,6 +40,15 @@ struct hb_paint_extents_context_t transforms.clear (); clips.clear (); groups.clear (); + /* COLR scratch storage is zero-allocated and reused without running + * constructors. Distinguish that state from an explicitly requested + * zero budget. */ + if (unlikely (!budget_initialized)) + { + budget = HB_BUDGET_DEFAULT; + budget_initialized = true; + } + recharge_budget (); transforms.push (hb_transform_t<>{}); clips.push (hb_bounds_t<>{hb_bounds_t<>::UNBOUNDED}); @@ -131,6 +140,19 @@ struct hb_paint_extents_context_t group.union_ (clip); } + /* Cumulative work budget for the current session; reset by clear(). + * Outline traversal and consumed segments charge the same live + * counter. */ + int64_t budget = HB_BUDGET_DEFAULT; + bool budget_initialized = true; + int64_t budget_remaining = HB_BUDGET_GLYPH; + + void recharge_budget () + { + budget_remaining = budget == HB_BUDGET_DEFAULT ? + HB_BUDGET_GLYPH : budget; + } + protected: hb_vector_t> transforms; hb_vector_t> clips; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint.cc index 56e9c0901f11..d18369c92c6c 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-paint.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.cc @@ -60,6 +60,20 @@ hb_paint_color_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_font_t *font, void *user_data) { return false; } +static void +hb_paint_fill_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color, + void *user_data) +{ + /* Decompose into the equivalent general sequence. */ + funcs->push_clip_glyph (paint_data, glyph, font); + funcs->color (paint_data, is_foreground, color); + funcs->pop_clip (paint_data); +} + static void hb_paint_push_clip_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, @@ -146,6 +160,19 @@ hb_paint_custom_palette_color_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_color_t *color, void *user_data) { return false; } +static hb_bool_t +hb_paint_set_budget_nil (hb_paint_funcs_t *funcs HB_UNUSED, void *paint_data HB_UNUSED, + int64_t budget HB_UNUSED, + void *user_data HB_UNUSED) { return false; } + +static int64_t +hb_paint_get_budget_nil (hb_paint_funcs_t *funcs HB_UNUSED, void *paint_data HB_UNUSED, + void *user_data HB_UNUSED) { return HB_BUDGET_DEFAULT; } + +static int64_t * +hb_paint_get_budget_remaining_nil (hb_paint_funcs_t *funcs HB_UNUSED, void *paint_data HB_UNUSED, + void *user_data HB_UNUSED) { return nullptr; } + static bool _hb_paint_funcs_set_preamble (hb_paint_funcs_t *funcs, bool func_is_null, @@ -406,6 +433,67 @@ hb_paint_funcs_is_immutable (hb_paint_funcs_t *funcs) return hb_object_is_immutable (funcs); } +/** + * hb_paint_set_budget: + * @funcs: paint functions object + * @paint_data: associated paint data + * @budget: the new work-budget policy + * + * Sets the work-budget policy and recharges the live work budget. Negative + * values other than #HB_BUDGET_DEFAULT are clamped to zero. + * + * Return value: `true` if the paint functions support work budgets + * + * Since: 14.5.0 + **/ +hb_bool_t +hb_paint_set_budget (hb_paint_funcs_t *funcs, void *paint_data, int64_t budget) +{ + return funcs->set_budget (paint_data, budget); +} + +/** + * hb_paint_get_budget: + * @funcs: paint functions object + * @paint_data: associated paint data + * + * Fetches the configured work-budget policy. + * + * Return value: the configured policy, or #HB_BUDGET_DEFAULT if unsupported + * + * Since: 14.5.0 + **/ +int64_t +hb_paint_get_budget (hb_paint_funcs_t *funcs, void *paint_data) +{ + return funcs->get_budget (paint_data); +} + +/** + * hb_paint_get_budget_remaining: + * @funcs: paint functions object + * @paint_data: associated paint data + * + * Fetches the live work budget. A negative value means the budget was + * exhausted. Zero means the preceding work fit exactly, but no positive-cost + * work can start. + * + * Return value: the live work budget; if it is not tracked, the concrete + * configured policy or #HB_BUDGET_UNLIMITED + * + * Since: 14.5.0 + **/ +int64_t +hb_paint_get_budget_remaining (hb_paint_funcs_t *funcs, void *paint_data) +{ + int64_t *remaining = funcs->get_budget_remaining_ptr (paint_data); + if (remaining) + return *remaining; + + int64_t budget = funcs->get_budget (paint_data); + return budget == HB_BUDGET_DEFAULT ? HB_BUDGET_UNLIMITED : budget; +} + /** * hb_color_line_get_color_stops: @@ -551,6 +639,30 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data, return funcs->color_glyph (paint_data, glyph, font); } +/** + * hb_paint_fill_glyph: + * @funcs: paint functions + * @paint_data: associated data passed by the caller + * @glyph: the glyph ID + * @font: the font + * @is_foreground: whether the color is the foreground + * @color: The color to use + * + * Perform a "fill-glyph" paint operation: fill the glyph's shape + * with a solid color. + * + * Since: 14.3.0 + */ +void +hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color) +{ + funcs->fill_glyph (paint_data, glyph, font, is_foreground, color); +} + /** * hb_paint_push_clip_glyph: * @funcs: paint functions @@ -939,7 +1051,7 @@ hb_paint_normalize_color_line (hb_color_stop_t *stops, hb_array_t (stops, len) .qsort ([] (const hb_color_stop_t &a, const hb_color_stop_t &b) { - return a.offset < b.offset; + return (a.offset > b.offset) - (a.offset < b.offset); }); float mn = stops[0].offset, mx = stops[0].offset; @@ -1082,34 +1194,53 @@ hb_paint_sweep_gradient_tiles (hb_color_stop_t *stops, else { float span = angles[n_stops - 1] - angles[0]; - if (fabsf (span) < 1e-6f) + if (!(fabsf (span) >= 1e-6f)) /* Reversed to catch NaN. */ goto done; - int k = 0; - if (angles[0] >= 0) - { - float ss = angles[0]; - while (ss > 0) - { - if (span > 0) { ss -= span; k--; } - else { ss += span; k++; } - } - } - else + span = fabsf (span); + + if (span < HB_2_PI / HB_PAINT_MAX_SWEEP_TILES) { - float ee = angles[n_stops - 1]; - while (ee < 0) + /* The pattern repeats faster than the tile resolution; tiling + * it would cost unbounded work for sub-visual detail. Fill + * the whole circle with the period-average color instead. */ + float r = 0.f, g = 0.f, b = 0.f, a = 0.f; + for (unsigned i = 1; i < n_stops; i++) { - if (span > 0) { ee += span; k++; } - else { ee -= span; k--; } + float w = (angles[i] - angles[i - 1]) / span * 0.5f; + r += w * (hb_color_get_red (colors[i - 1]) + hb_color_get_red (colors[i])); + g += w * (hb_color_get_green (colors[i - 1]) + hb_color_get_green (colors[i])); + b += w * (hb_color_get_blue (colors[i - 1]) + hb_color_get_blue (colors[i])); + a += w * (hb_color_get_alpha (colors[i - 1]) + hb_color_get_alpha (colors[i])); } + hb_color_t avg = HB_COLOR (hb_clamp_to ((double) b + 0.5), + hb_clamp_to ((double) g + 0.5), + hb_clamp_to ((double) r + 0.5), + hb_clamp_to ((double) a + 0.5)); + emit_patch (0.f, avg, HB_2_PI, avg, user_data); + goto done; } - span = fabsf (span); - for (int l = k; l < 1000; l++) + /* First repeat that can reach angle 0, computed by division; + * counting there one span at a time can take effectively forever, + * or fail to terminate outright once the span drops below the + * float ulp of the angles. One repeat of slack absorbs rounding + * differences; earlier repeats are fully clipped anyway. */ + double dk = floor (-(double) hb_max (angles[0], angles[n_stops - 1]) / (double) span) - 1.; + if (!(dk >= -1.e18 && dk <= 1.e18)) /* Non-finite angles. */ + goto done; + + unsigned iterations = 0, tiles = 0; + for (int64_t l = (int64_t) dk; ; l++) { for (unsigned i = 1; i < n_stops; i++) { + /* Bounds clipped-away segments too; those stay negligible for + * sorted stops but are unbounded if the sort contract is + * violated. */ + if (unlikely (iterations++ >= 256 * HB_PAINT_MAX_SWEEP_TILES)) + goto done; + float a0_l, a1_l; hb_color_t col0, col1; if ((l % 2 != 0) && (extend == HB_PAINT_EXTEND_REFLECT)) @@ -1128,6 +1259,8 @@ hb_paint_sweep_gradient_tiles (hb_color_stop_t *stops, } if (a1_l < 0.f) continue; + if (unlikely (tiles++ >= HB_PAINT_MAX_SWEEP_TILES)) + goto done; if (a0_l < 0.f) { float f = (0.f - a0_l) / (a1_l - a0_l); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.h b/src/java.desktop/share/native/libharfbuzz/hb-paint.h index e00d9b187328..a6e58961f82a 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-paint.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.h @@ -63,6 +63,109 @@ HB_BEGIN_DECLS **/ typedef struct hb_paint_funcs_t hb_paint_funcs_t; +/** + * hb_paint_set_budget_func_t: + * @funcs: paint functions object + * @paint_data: The data accompanying the paint functions + * @budget: the new work-budget policy + * @user_data: User data pointer passed to hb_paint_funcs_set_set_budget_func() + * + * Sets the work-budget policy and recharges the live work budget. @budget is + * #HB_BUDGET_DEFAULT, #HB_BUDGET_UNLIMITED, or a non-negative concrete value. + * + * Return value: `true` if the budget was set, `false` if unsupported + * + * Since: 14.5.0 + **/ +typedef hb_bool_t (*hb_paint_set_budget_func_t) (hb_paint_funcs_t *funcs, + void *paint_data, + int64_t budget, + void *user_data); + +/** + * hb_paint_get_budget_func_t: + * @funcs: paint functions object + * @paint_data: The data accompanying the paint functions + * @user_data: User data pointer passed to hb_paint_funcs_set_get_budget_func() + * + * Fetches the configured work-budget policy. + * + * Return value: the configured work-budget policy + * + * Since: 14.5.0 + **/ +typedef int64_t (*hb_paint_get_budget_func_t) (hb_paint_funcs_t *funcs, + void *paint_data, + void *user_data); + +/** + * hb_paint_get_budget_remaining_func_t: + * @funcs: paint functions object + * @paint_data: The data accompanying the paint functions + * @user_data: User data pointer passed to + * hb_paint_funcs_set_get_budget_remaining_func() + * + * Fetches the address of the live work budget. The returned address must stay + * valid while @paint_data is used with @funcs. The live value must be concrete; + * it must not contain #HB_BUDGET_DEFAULT. + * + * Return value: (nullable) (transfer none): the live work budget, or `NULL` if + * live budget accounting is unsupported + * + * Since: 14.5.0 + **/ +typedef int64_t *(*hb_paint_get_budget_remaining_func_t) (hb_paint_funcs_t *funcs, + void *paint_data, + void *user_data); + +/** + * hb_paint_funcs_set_set_budget_func: + * @funcs: paint functions object + * @func: (closure user_data) (destroy destroy) (scope notified): budget setter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the budget setter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_paint_funcs_set_set_budget_func (hb_paint_funcs_t *funcs, + hb_paint_set_budget_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_paint_funcs_set_get_budget_func: + * @funcs: paint functions object + * @func: (closure user_data) (destroy destroy) (scope notified): budget getter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the budget-policy getter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_paint_funcs_set_get_budget_func (hb_paint_funcs_t *funcs, + hb_paint_get_budget_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_paint_funcs_set_get_budget_remaining_func: + * @funcs: paint functions object + * @func: (closure user_data) (destroy destroy) (scope notified): live-budget getter + * @user_data: Data to pass to @func + * @destroy: (nullable): callback to destroy @user_data + * + * Sets the live-budget getter callback. + * + * Since: 14.5.0 + **/ +HB_EXTERN void +hb_paint_funcs_set_get_budget_remaining_func (hb_paint_funcs_t *funcs, + hb_paint_get_budget_remaining_func_t func, + void *user_data, hb_destroy_func_t destroy); + HB_EXTERN hb_paint_funcs_t * hb_paint_funcs_create (void); @@ -93,6 +196,16 @@ hb_paint_funcs_make_immutable (hb_paint_funcs_t *funcs); HB_EXTERN hb_bool_t hb_paint_funcs_is_immutable (hb_paint_funcs_t *funcs); +HB_EXTERN hb_bool_t +hb_paint_set_budget (hb_paint_funcs_t *funcs, void *paint_data, + int64_t budget); + +HB_EXTERN int64_t +hb_paint_get_budget (hb_paint_funcs_t *funcs, void *paint_data); + +HB_EXTERN int64_t +hb_paint_get_budget_remaining (hb_paint_funcs_t *funcs, void *paint_data); + /** * hb_paint_push_transform_func_t: * @funcs: paint functions object @@ -157,6 +270,31 @@ typedef hb_bool_t (*hb_paint_color_glyph_func_t) (hb_paint_funcs_t *funcs, hb_font_t *font, void *user_data); +/** + * hb_paint_fill_glyph_func_t: + * @funcs: paint functions object + * @paint_data: The data accompanying the paint functions in hb_font_paint_glyph() + * @glyph: the glyph ID + * @font: the font + * @is_foreground: whether the color is the foreground + * @color: The color to use, unpremultiplied + * @user_data: User data pointer passed to hb_paint_funcs_set_fill_glyph_func() + * + * A virtual method for the #hb_paint_funcs_t to fill a glyph's shape with + * a solid color. If not implemented, a sequence of "push-clip-glyph", + * "color", "pop-clip" paint operations, in that order, will be emitted + * instead. + * + * Since: 14.3.0 + */ +typedef void (*hb_paint_fill_glyph_func_t) (hb_paint_funcs_t *funcs, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color, + void *user_data); + /** * hb_paint_push_clip_glyph_func_t: * @funcs: paint functions object @@ -854,6 +992,23 @@ hb_paint_funcs_set_color_glyph_func (hb_paint_funcs_t *funcs, void *user_data, hb_destroy_func_t destroy); +/** + * hb_paint_funcs_set_fill_glyph_func: + * @funcs: A paint functions struct + * @func: (closure user_data) (destroy destroy) (scope notified): The fill-glyph callback + * @user_data: Data to pass to @func + * @destroy: (nullable): Function to call when @user_data is no longer needed + * + * Sets the fill-glyph callback on the paint functions struct. + * + * Since: 14.3.0 + */ +HB_EXTERN void +hb_paint_funcs_set_fill_glyph_func (hb_paint_funcs_t *funcs, + hb_paint_fill_glyph_func_t func, + void *user_data, + hb_destroy_func_t destroy); + /** * hb_paint_funcs_set_push_clip_glyph_func: * @funcs: A paint functions struct @@ -1117,6 +1272,13 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, hb_font_t *font); +HB_EXTERN void +hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color); + HB_EXTERN void hb_paint_push_clip_glyph (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh index df37e8bf6e98..d4ab0a3413b9 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh @@ -48,6 +48,10 @@ HB_PAINT_FUNC_IMPLEMENT (push_group_for) \ HB_PAINT_FUNC_IMPLEMENT (pop_group) \ HB_PAINT_FUNC_IMPLEMENT (custom_palette_color) \ + HB_PAINT_FUNC_IMPLEMENT (fill_glyph) \ + HB_PAINT_FUNC_IMPLEMENT (set_budget) \ + HB_PAINT_FUNC_IMPLEMENT (get_budget) \ + HB_PAINT_FUNC_IMPLEMENT (get_budget_remaining) \ /* ^--- Add new callbacks here */ struct hb_paint_funcs_t @@ -92,7 +96,7 @@ struct hb_paint_funcs_t { return func.color_glyph (this, paint_data, glyph, font, - !user_data ? nullptr : user_data->push_clip_glyph); } + !user_data ? nullptr : user_data->color_glyph); } void push_clip_glyph (void *paint_data, hb_codepoint_t glyph, hb_font_t *font) @@ -121,6 +125,15 @@ struct hb_paint_funcs_t { func.color (this, paint_data, is_foreground, color, !user_data ? nullptr : user_data->color); } + void fill_glyph (void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color) + { func.fill_glyph (this, paint_data, + glyph, font, + is_foreground, color, + !user_data ? nullptr : user_data->fill_glyph); } bool image (void *paint_data, hb_blob_t *image, unsigned width, unsigned height, @@ -173,6 +186,19 @@ struct hb_paint_funcs_t color_index, color, !user_data ? nullptr : user_data->custom_palette_color); } + bool set_budget (void *paint_data, int64_t budget) + { + if (budget < 0 && budget != HB_BUDGET_DEFAULT) + budget = 0; + return func.set_budget (this, paint_data, budget, + !user_data ? nullptr : user_data->set_budget); + } + int64_t get_budget (void *paint_data) + { return func.get_budget (this, paint_data, + !user_data ? nullptr : user_data->get_budget); } + int64_t *get_budget_remaining_ptr (void *paint_data) + { return func.get_budget_remaining (this, paint_data, + !user_data ? nullptr : user_data->get_budget_remaining); } /* Internal specializations. */ @@ -268,7 +294,12 @@ hb_color_lerp (hb_color_t c0, hb_color_t c1, float t) auto lerp = [&] (unsigned shift) -> unsigned { unsigned v0 = (c0 >> shift) & 0xFF; unsigned v1 = (c1 >> shift) & 0xFF; - return (unsigned) (v0 + t * ((float) v1 - (float) v0) + 0.5f); + float v = v0 + t * ((float) v1 - (float) v0) + 0.5f; + /* t may be outside [0,1] (or NaN) for malformed gradients; + * keep the float-to-unsigned conversion defined. */ + if (!(v > 0.f)) return 0; + if (v > 255.f) return 255; + return (unsigned) v; }; return HB_COLOR (lerp (0), lerp (8), lerp (16), lerp (24)); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh index b5dfae19960c..d7903a897141 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh @@ -35,6 +35,7 @@ #include "graph/serialize.hh" using graph::graph_t; +using graph::graph_result_t; /* * For a detailed writeup on the overflow resolution algorithm see: @@ -69,7 +70,7 @@ struct lookup_size_t }; static inline -bool _presplit_subtables_if_needed (graph::gsubgpos_graph_context_t& ext_context) +graph_result_t _presplit_subtables_if_needed (graph::gsubgpos_graph_context_t& ext_context) { // For each lookup this will check the size of subtables and split them as needed // so that no subtable is at risk of overflowing. (where we support splitting for @@ -87,11 +88,10 @@ bool _presplit_subtables_if_needed (graph::gsubgpos_graph_context_t& ext_context for (unsigned lookup_index : lookup_indices) { graph::Lookup* lookup = ext_context.lookups.get(lookup_index); - if (!lookup->split_subtables_if_needed (ext_context, lookup_index)) - return false; + TRY (lookup->split_subtables_if_needed (ext_context, lookup_index)); } - return true; + return Ok(); } /* @@ -99,7 +99,7 @@ bool _presplit_subtables_if_needed (graph::gsubgpos_graph_context_t& ext_context * to extension lookups. */ static inline -bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context) +graph_result_t _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context) { // Simple Algorithm (v1, current): // 1. Calculate how many bytes each non-extension lookup consumes. @@ -117,7 +117,7 @@ bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context // TODO(garretrieger): also support extension promotion during iterative resolution phase, then // we can use a less conservative threshold here. // TODO(grieger): skip this for the 24 bit case. - if (!ext_context.lookups) return true; + if (!ext_context.lookups) return Ok(); unsigned total_lookup_table_sizes = 0; hb_vector_t lookup_sizes; @@ -132,7 +132,7 @@ bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context hb_set_t visited; lookup_sizes.push (lookup_size_t { lookup_index, - ext_context.graph.find_subgraph_size (lookup_index, visited), + ext_context.graph.find_subgraph_size (lookup_index, visited).value_or (0), lookup->number_of_subtables (), }); } @@ -167,7 +167,7 @@ bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context { size_t lookup_size = ext_context.graph.vertices_[p.lookup_index].table_size (); hb_set_t visited; - size_t subtables_size = ext_context.graph.find_subgraph_size (p.lookup_index, visited, 1) - lookup_size; + size_t subtables_size = ext_context.graph.find_subgraph_size (p.lookup_index, visited, 1).value_or (0) - lookup_size; size_t remaining_size = p.size - subtables_size - lookup_size; l3_l4_size += subtables_size; @@ -181,16 +181,15 @@ bool _promote_extensions_if_needed (graph::gsubgpos_graph_context_t& ext_context layers_full = true; } - if (!ext_context.lookups.get(p.lookup_index)->make_extension (ext_context, p.lookup_index)) - return false; + TRY (ext_context.lookups.get(p.lookup_index)->make_extension (ext_context, p.lookup_index)); } - return true; + return Ok(); } static inline -bool _try_isolating_subgraphs (const hb_vector_t& overflows, - graph_t& sorted_graph) +graph_result_t _try_isolating_subgraphs (const hb_vector_t& overflows, + graph_t& sorted_graph) { unsigned space = 0; hb_set_t roots_to_isolate; @@ -212,7 +211,7 @@ bool _try_isolating_subgraphs (const hb_vector_t& over roots_to_isolate.add(root); } - if (!roots_to_isolate) return false; + if (!roots_to_isolate) return Ok(false); unsigned maximum_to_move = hb_max ((sorted_graph.num_roots_for_space (space) / 2u), 1u); if (roots_to_isolate.get_population () > maximum_to_move) { @@ -237,17 +236,16 @@ bool _try_isolating_subgraphs (const hb_vector_t& over sorted_graph.num_roots_for_space (space), roots_to_isolate.get_population (), sorted_graph.next_space ()); + TRY (sorted_graph.isolate_subgraph (roots_to_isolate)); + TRY (sorted_graph.move_to_new_space (roots_to_isolate)); - sorted_graph.isolate_subgraph (roots_to_isolate); - sorted_graph.move_to_new_space (roots_to_isolate); - - return true; + return Ok(true); } static inline -bool _resolve_shared_overflow(const hb_vector_t& overflows, - int overflow_index, - graph_t& sorted_graph) +graph_result_t _resolve_shared_overflow(const hb_vector_t& overflows, + int overflow_index, + graph_t& sorted_graph) { const graph::overflow_record_t& r = overflows[overflow_index]; @@ -263,8 +261,8 @@ bool _resolve_shared_overflow(const hb_vector_t& overf } } - unsigned result = sorted_graph.duplicate(&parents, r.child); - if (result == (unsigned) -1 && parents.get_population() > 2) { + auto result = sorted_graph.duplicate(&parents, r.child); + if (!result.is_ok () && parents.get_population() > 2) { // All links to the child are overflowing, so we can't include all // in the duplication. Remove one parent from the duplication. // Remove the lowest index parent, which will be the closest to the child. @@ -272,7 +270,7 @@ bool _resolve_shared_overflow(const hb_vector_t& overf result = sorted_graph.duplicate(&parents, r.child); } - if (result == (unsigned) -1) return false; + if (!result.is_ok ()) return Ok(false); if (parents.get_population() > 1) { // If the duplicated node has more than one parent pre-emptively raise it's priority to the maximum. @@ -286,16 +284,16 @@ bool _resolve_shared_overflow(const hb_vector_t& overf // to move nodes closer, but only for non-shared nodes. Since this node is shared, it will simply be given // further duplication which defeats the attempt to duplicate with multiple parents. To fix this we // pre-emptively raise priority now which allows the duplicated node to pack into the same layer as it's parents. - sorted_graph.vertices_[result].give_max_priority(); + sorted_graph.vertices_[*result].give_max_priority(); } - return true; + return Ok(true); } static inline -bool _process_overflows (const hb_vector_t& overflows, - hb_set_t& priority_bumped_parents, - graph_t& sorted_graph) +graph_result_t _process_overflows (const hb_vector_t& overflows, + hb_set_t& priority_bumped_parents, + graph_t& sorted_graph) { bool resolution_attempted = false; @@ -303,19 +301,19 @@ bool _process_overflows (const hb_vector_t& overflows, for (int i = overflows.length - 1; i >= 0; i--) { const graph::overflow_record_t& r = overflows[i]; - const auto& child = sorted_graph.vertices_[r.child]; - if (child.is_shared ()) + if (sorted_graph.vertices_[r.child].is_shared ()) { // The child object is shared, we may be able to eliminate the overflow // by duplicating it. - if (_resolve_shared_overflow(overflows, i, sorted_graph)) - return true; + TRY_ASSIGN (bool resolved, _resolve_shared_overflow(overflows, i, sorted_graph)); + if (resolved) + return Ok(true); // Sometimes we can't duplicate a node which looks shared because it's not actually shared // (eg. all links from the same parent) in this case continue on to other resolution options. } - if (child.is_leaf () && !priority_bumped_parents.has (r.parent)) + if (sorted_graph.vertices_[r.child].is_leaf () && !priority_bumped_parents.has (r.parent)) { // This object is too far from it's parent, attempt to move it closer. // @@ -328,7 +326,8 @@ bool _process_overflows (const hb_vector_t& overflows, // is < then the total size of the children (and the parent can be moved). // Since in that case moving the parent will cause a smaller increase in // the length of other offsets. - if (sorted_graph.raise_childrens_priority (r.parent)) { + TRY_ASSIGN (bool raised, sorted_graph.raise_childrens_priority (r.parent)); + if (raised) { priority_bumped_parents.add (r.parent); resolution_attempted = true; } @@ -340,88 +339,106 @@ bool _process_overflows (const hb_vector_t& overflows, // - Table splitting. } - return resolution_attempted; + return Ok(resolution_attempted); } -inline bool +inline graph_result_t +_assign_spaces_and_sort (graph_t& sorted_graph /* IN/OUT */) +{ + DEBUG_MSG (SUBSET_REPACK, nullptr, "Assigning spaces to 32 bit subgraphs."); + TRY_ASSIGN (bool assigned, sorted_graph.assign_spaces ()); + if (assigned) + return sorted_graph.sort_shortest_distance (); + else + return sorted_graph.sort_shortest_distance_if_needed (); +} + +inline graph_result_t +_gsub_gpos_specialization (hb_tag_t table_tag, + bool always_recalculate_extensions, + graph_t& sorted_graph /* IN/OUT */) +{ + DEBUG_MSG (SUBSET_REPACK, nullptr, "Applying GSUB/GPOS repacking specializations."); + if (!always_recalculate_extensions) return _assign_spaces_and_sort (sorted_graph); + + auto context_res = graph::gsubgpos_graph_context_t::create (table_tag, sorted_graph); + + if (unlikely (context_res.is_err())) { + if (context_res.error() == graph::SANITIZE_FAILURE) + // Sanitize failures are ignored, and we just skip splitting/extension promotion which needs a valid + // GSUB/GPOS + return _assign_spaces_and_sort (sorted_graph); + else + // All other errors are propagated. + return Err(context_res.error()); + } + + // Otherwise we have a valid GSUB/GPOS table and can try extension promotion and splitting + auto& ext_context = *context_res; + DEBUG_MSG (SUBSET_REPACK, nullptr, "Splitting subtables if needed."); + TRY (_presplit_subtables_if_needed (ext_context)); + + DEBUG_MSG (SUBSET_REPACK, nullptr, "Promoting lookups to extensions if needed."); + TRY (_promote_extensions_if_needed (ext_context)); + + // an additional sorting is needed before assign_spaces () which requires + // correct topological ordering to find space roots + TRY (sorted_graph.sort_shortest_distance_if_needed ()); + + TRY_ASSIGN (bool will_overflow, graph::will_overflow (sorted_graph)); + if (!will_overflow) return Ok(); + return _assign_spaces_and_sort (sorted_graph); +} + +inline graph_result_t hb_resolve_graph_overflows (hb_tag_t table_tag, unsigned max_rounds , bool always_recalculate_extensions, graph_t& sorted_graph /* IN/OUT */) { DEBUG_MSG (SUBSET_REPACK, nullptr, "Repacking %c%c%c%c.", HB_UNTAG(table_tag)); - sorted_graph.sort_shortest_distance (); - if (sorted_graph.in_error ()) - { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Sorted graph in error state after initial sort."); - return false; - } + TRY (sorted_graph.sort_shortest_distance ()); - bool will_overflow = graph::will_overflow (sorted_graph); + TRY_ASSIGN (bool will_overflow, graph::will_overflow (sorted_graph)); if (!will_overflow) - return true; + return Ok(); bool is_gsub_or_gpos = (table_tag == HB_OT_TAG_GPOS || table_tag == HB_OT_TAG_GSUB); - graph::gsubgpos_graph_context_t ext_context (table_tag, sorted_graph); - if (is_gsub_or_gpos && will_overflow) - { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Applying GSUB/GPOS repacking specializations."); - if (always_recalculate_extensions) - { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Splitting subtables if needed."); - if (!_presplit_subtables_if_needed (ext_context)) { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Subtable splitting failed."); - return false; - } - - DEBUG_MSG (SUBSET_REPACK, nullptr, "Promoting lookups to extensions if needed."); - if (!_promote_extensions_if_needed (ext_context)) { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Extensions promotion failed."); - return false; - } - } - - DEBUG_MSG (SUBSET_REPACK, nullptr, "Assigning spaces to 32 bit subgraphs."); - if (sorted_graph.assign_spaces ()) - sorted_graph.sort_shortest_distance (); - else - sorted_graph.sort_shortest_distance_if_needed (); - } + if (is_gsub_or_gpos) + TRY(_gsub_gpos_specialization (table_tag, always_recalculate_extensions, sorted_graph)); unsigned round = 0; unsigned total_iterations = 0; hb_vector_t overflows; // TODO(garretrieger): select a good limit for max rounds. - while (!sorted_graph.in_error () - && graph::will_overflow (sorted_graph, &overflows) - && round < max_rounds - && total_iterations < HB_REPACKER_MAX_ITERATIONS) { + while (round < max_rounds && total_iterations < HB_REPACKER_MAX_ITERATIONS) { + TRY_ASSIGN (bool overflows_exist, graph::will_overflow (sorted_graph, &overflows)); + if (!overflows_exist) + break; + DEBUG_MSG (SUBSET_REPACK, nullptr, "=== Overflow resolution round %u ===", round); print_overflows (sorted_graph, overflows); total_iterations++; hb_set_t priority_bumped_parents; - if (!_try_isolating_subgraphs (overflows, sorted_graph)) + TRY_ASSIGN (bool isolated, _try_isolating_subgraphs (overflows, sorted_graph)); + if (!isolated) { round++; - if (!_process_overflows (overflows, priority_bumped_parents, sorted_graph)) + TRY_ASSIGN (bool processed, _process_overflows (overflows, priority_bumped_parents, sorted_graph)); + if (!processed) { DEBUG_MSG (SUBSET_REPACK, nullptr, "No resolution available :("); break; } } - sorted_graph.sort_shortest_distance (); - } - - if (sorted_graph.in_error ()) - { - DEBUG_MSG (SUBSET_REPACK, nullptr, "Sorted graph in error state."); - return false; + TRY (sorted_graph.sort_shortest_distance ()); } - if (graph::will_overflow (sorted_graph)) + TRY_ASSIGN (bool has_overflow, graph::will_overflow (sorted_graph)); + if (unlikely (has_overflow)) { if (is_gsub_or_gpos && !always_recalculate_extensions) { // If this a GSUB/GPOS table and we didn't try to extension promotion and table splitting then @@ -431,10 +448,10 @@ hb_resolve_graph_overflows (hb_tag_t table_tag, } DEBUG_MSG (SUBSET_REPACK, nullptr, "Offset overflow resolution failed."); - return false; + return Err(graph::OVERFLOW_RESOLUTION_FAILED); } - return true; + return Ok(); } /* @@ -456,31 +473,32 @@ hb_resolve_overflows (const T& packed, hb_tag_t table_tag, unsigned max_rounds = 32, bool recalculate_extensions = false) { - graph_t sorted_graph (packed); - if (sorted_graph.in_error ()) + auto graph_res = graph_t::create (packed); + if (!graph_res.is_ok ()) { - // Invalid graph definition. + DEBUG_MSG (SUBSET_REPACK, nullptr, + "Graph creation failed, cause: %s", graph::to_string(graph_res.error())); return nullptr; } + graph_t sorted_graph = std::move (*graph_res); - if (!sorted_graph.is_fully_connected ()) + auto resolve_res = hb_resolve_graph_overflows (table_tag, max_rounds, recalculate_extensions, sorted_graph); + if (resolve_res.is_err ()) { - sorted_graph.print_orphaned_nodes (); + DEBUG_MSG (SUBSET_REPACK, nullptr, + "Overflow resolution failed, cause: %s", graph::to_string(resolve_res.error())); return nullptr; } - if (sorted_graph.in_error ()) + auto serialize_res = graph::serialize (sorted_graph); + if (serialize_res.is_err ()) { - // Allocations failed somewhere DEBUG_MSG (SUBSET_REPACK, nullptr, - "Graph is in error, likely due to a memory allocation error."); + "Serialization failed, cause: %s", graph::to_string(serialize_res.error())); return nullptr; } - if (!hb_resolve_graph_overflows (table_tag, max_rounds, recalculate_extensions, sorted_graph)) - return nullptr; - - return graph::serialize (sorted_graph); + return *serialize_res; } #endif /* HB_REPACKER_HH */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-script-list.h b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h index 16347b9d84e4..4e1e298c0da2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-script-list.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h @@ -227,6 +227,9 @@ HB_END_DECLS * @HB_SCRIPT_SIDETIC: `Sidt`, Since: 11.5.0 * @HB_SCRIPT_TAI_YO: `Tayo`, Since: 11.5.0 * @HB_SCRIPT_TOLONG_SIKI: `Tols`, Since: 11.5.0 + * @HB_SCRIPT_JURCHEN: `Jurc`, Since: 14.5.0 + * @HB_SCRIPT_PROTO_CUNEIFORM: `Pcun`, Since: 14.5.0 + * @HB_SCRIPT_SEAL: `Seal`, Since: 14.5.0 * @HB_SCRIPT_INVALID: No script set * * Data type for scripts. Each #hb_script_t's value is an #hb_tag_t corresponding @@ -473,6 +476,13 @@ typedef enum HB_SCRIPT_TAI_YO = HB_TAG ('T','a','y','o'), /*17.0*/ HB_SCRIPT_TOLONG_SIKI = HB_TAG ('T','o','l','s'), /*17.0*/ + /* + * Since: 14.5.0 + */ + HB_SCRIPT_JURCHEN = HB_TAG ('J','u','r','c'), /*18.0*/ + HB_SCRIPT_PROTO_CUNEIFORM = HB_TAG ('P','c','u','n'), /*18.0*/ + HB_SCRIPT_SEAL = HB_TAG ('S','e','a','l'), /*18.0*/ + /* No script set. */ HB_SCRIPT_INVALID = HB_TAG_NONE, @@ -492,5 +502,4 @@ typedef enum } hb_script_t; - #endif /* HB_SCRIPT_LIST_H */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh index 9fe99c85ea7b..7af870538795 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh @@ -87,6 +87,11 @@ struct hb_serialize_context_t virtual_links.push (o.virtual_links[i]); } + bool in_error () const + { + return real_links.in_error() || virtual_links.in_error(); + } + bool add_virtual_link (objidx_t objidx) { if (!objidx) @@ -195,7 +200,7 @@ struct hb_serialize_context_t }; } - hb_serialize_context_t (void *start_, unsigned int size) : + hb_serialize_context_t (void *start_, size_t size) : start ((char *) start_), end (start + size), current (nullptr) @@ -230,7 +235,7 @@ struct hb_serialize_context_t || errors == HB_SERIALIZE_ERROR_ARRAY_OVERFLOW; } - void reset (void *start_, unsigned int size) + void reset (void *start_, size_t size) { start = (char*) start_; end = start + size; @@ -680,7 +685,7 @@ struct hb_serialize_context_t HB_NODISCARD Type *embed (const Type *obj) { - unsigned int size = obj->get_size (); + size_t size = obj->get_size (); Type *ret = this->allocate_size (size, false); if (unlikely (!ret)) return nullptr; hb_memcpy (ret, obj, size); @@ -733,6 +738,7 @@ struct hb_serialize_context_t Type *extend_size (Type *obj, size_t size, bool clear = true) { if (unlikely (in_error ())) return nullptr; + if (unlikely (size >= INT_MAX)) { err (HB_SERIALIZE_ERROR_OTHER); return nullptr; } assert (this->start <= (char *) obj); assert ((char *) obj <= this->head); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set.cc b/src/java.desktop/share/native/libharfbuzz/hb-set.cc index 6d45840cdf1f..4da1dbb5b464 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-set.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-set.cc @@ -357,6 +357,24 @@ hb_set_is_equal (const hb_set_t *set, return set->is_equal (*other); } +/** + * hb_set_intersects: + * @set: A set + * @other: Another set + * + * Tests whether @set and @other have any elements in common. + * + * Return value: `true` if the two sets intersect, `false` otherwise. + * + * Since: 14.4.0 + **/ +hb_bool_t +hb_set_intersects (const hb_set_t *set, + const hb_set_t *other) +{ + return set->intersects (*other); +} + /** * hb_set_hash: * @set: A set diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set.h b/src/java.desktop/share/native/libharfbuzz/hb-set.h index 25ea1ca34a5d..97e6de29b7f7 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-set.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-set.h @@ -131,6 +131,10 @@ HB_EXTERN hb_bool_t hb_set_is_equal (const hb_set_t *set, const hb_set_t *other); +HB_EXTERN hb_bool_t +hb_set_intersects (const hb_set_t *set, + const hb_set_t *other); + HB_EXTERN unsigned int hb_set_hash (const hb_set_t *set); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-set.hh index c5df9b8aec47..b09b22ce1ab6 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-set.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-set.hh @@ -87,6 +87,7 @@ struct hb_sparseset_t uint32_t hash () const { return s.hash (); } void add (hb_codepoint_t g) { s.add (g); } + void add_bits (hb_codepoint_t g, uint64_t bits) { s.add_bits (g, bits); } bool add_range (hb_codepoint_t first, hb_codepoint_t last) { return s.add_range (first, last); } template @@ -125,6 +126,9 @@ struct hb_sparseset_t bool may_intersect (const hb_sparseset_t &other) const { return s.may_intersect (other.s); } + bool intersects (const hb_sparseset_t &other) const + { return s.intersects (other.s); } + bool intersects (hb_codepoint_t first, hb_codepoint_t last) const { return s.intersects (first, last); } @@ -137,11 +141,15 @@ struct hb_sparseset_t bool is_subset (const hb_sparseset_t &larger_set) const { return s.is_subset (larger_set.s); } void union_ (const hb_sparseset_t &other) { s.union_ (other.s); } - void intersect (const hb_sparseset_t &other) { s.intersect (other.s); } + void intersect (const hb_sparseset_t &other, + hb_vector_t *workspace = nullptr) + { s.intersect (other.s, workspace); } void subtract (const hb_sparseset_t &other) { s.subtract (other.s); } void symmetric_difference (const hb_sparseset_t &other) { s.symmetric_difference (other.s); } bool next (hb_codepoint_t *codepoint) const { return s.next (codepoint); } + bool next_bits (hb_codepoint_t *codepoint, uint64_t *bits) const + { return s.next_bits (codepoint, bits); } bool previous (hb_codepoint_t *codepoint) const { return s.previous (codepoint); } bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const { return s.next_range (first, last); } @@ -151,6 +159,7 @@ struct hb_sparseset_t { return s.next_many (codepoint, out, size); } unsigned int get_population () const { return s.get_population (); } + bool get_singleton (hb_codepoint_t *codepoint) const { return s.get_singleton (codepoint); } hb_codepoint_t get_min () const { return s.get_min (); } hb_codepoint_t get_max () const { return s.get_max (); } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc index 19188f8006a0..97e2030d3a94 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc @@ -52,6 +52,20 @@ * Most client programs will not need to deal with shape plans directly. **/ +#ifdef HAVE_HARFRUST +extern "C" void _hb_harfrust_shape_plan_destroy_rs (void *data); +#endif + +hb_shape_plan_t::~hb_shape_plan_t () +{ +#ifdef HAVE_HARFRUST + void *data = harfrust_data.get_relaxed (); + if (data) + _hb_harfrust_shape_plan_destroy_rs (data); +#endif + key.fini (); +} + /* * hb_shape_plan_key_t @@ -89,7 +103,8 @@ hb_shape_plan_key_t::init (bool copy, this->shaper_func = nullptr; this->shaper_name = nullptr; #ifndef HB_NO_OT_SHAPE - this->ot.init (face, coords, num_coords); + if (unlikely (!this->ot.init (face, coords, num_coords))) + goto bail; #endif /* @@ -115,6 +130,7 @@ hb_shape_plan_key_t::init (bool copy, else if (0 == strcmp (*shaper_list, #shaper)) \ HB_SHAPER_PLAN (shaper); #include "hb-shaper-list.hh" + #undef HB_SHAPER_IMPLEMENT } else @@ -132,6 +148,9 @@ hb_shape_plan_key_t::init (bool copy, #undef HB_SHAPER_PLAN bail: +#ifndef HB_NO_OT_SHAPE + this->ot.fini (); +#endif ::hb_free (features); return false; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh index 1cf47784ff6c..46cb6b139ff7 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh @@ -31,7 +31,6 @@ #include "hb-shaper.hh" #include "hb-ot-shape.hh" - struct hb_shape_plan_key_t { hb_segment_properties_t props; @@ -55,7 +54,14 @@ struct hb_shape_plan_key_t unsigned int num_coords, const char * const *shaper_list); - HB_INTERNAL void fini () { hb_free ((void *) user_features); user_features = nullptr; } + HB_INTERNAL void fini () + { + hb_free ((void *) user_features); + user_features = nullptr; +#ifndef HB_NO_OT_SHAPE + ot.fini (); +#endif + } HB_INTERNAL bool user_features_match (const hb_shape_plan_key_t *other); @@ -64,13 +70,16 @@ struct hb_shape_plan_key_t struct hb_shape_plan_t { - ~hb_shape_plan_t () { key.fini (); } + HB_INTERNAL ~hb_shape_plan_t (); hb_object_header_t header; hb_face_t *face_unsafe; /* We don't carry a reference to face. */ hb_shape_plan_key_t key; #ifndef HB_NO_OT_SHAPE hb_ot_shape_plan_t ot; #endif +#ifdef HAVE_HARFRUST + hb_atomic_t harfrust_data; +#endif }; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc index a36fa14fb285..2589af3fd5b0 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc @@ -144,7 +144,7 @@ hb_shape_full (hb_font_t *font, hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached2 (font->face, &buffer->props, features, num_features, - font->coords, font->num_coords, + font->coords, font->has_nonzero_coords ? font->num_coords : 0, shaper_list); hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features); @@ -316,9 +316,10 @@ hb_shape_justify (hb_font_t *font, /* Copy buffer text as we need it so we can shape multiple times. */ unsigned text_len = buffer->len; - auto *text_info = (hb_glyph_info_t *) hb_malloc (text_len * sizeof (buffer->info[0])); + auto *text_info = (hb_glyph_info_t *) hb_malloc2 (text_len, sizeof (buffer->info[0])); if (unlikely (text_len && !text_info)) return false; + HB_SCOPE_GUARD (hb_free (text_info)); hb_memcpy (text_info, buffer->info, text_len * sizeof (buffer->info[0])); auto text = hb_array (text_info, text_len); @@ -428,8 +429,6 @@ hb_shape_justify (hb_font_t *font, (double) min_target_advance, (double) max_target_advance, ya, yb, y); - hb_free (text_info); - if (failed) return false; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-static.cc b/src/java.desktop/share/native/libharfbuzz/hb-static.cc index 78713b220490..9867d3407501 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-static.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-static.cc @@ -69,25 +69,6 @@ const unsigned char *endchar_str = static_endchar_str; /* hb_face_t */ -#ifndef HB_NO_BEYOND_64K -static inline unsigned -load_num_glyphs_from_loca (const hb_face_t *face) -{ - unsigned ret = 0; - - unsigned indexToLocFormat = face->table.head->indexToLocFormat; - - if (indexToLocFormat <= 1) - { - bool short_offset = 0 == indexToLocFormat; - hb_blob_t *loca_blob = face->table.loca.get_blob (); - ret = hb_max (1u, loca_blob->length / (short_offset ? 2 : 4)) - 1; - } - - return ret; -} -#endif - static inline unsigned load_num_glyphs_from_maxp (const hb_face_t *face) { @@ -97,16 +78,8 @@ load_num_glyphs_from_maxp (const hb_face_t *face) unsigned int hb_face_t::load_num_glyphs () const { - unsigned ret = 0; - -#ifndef HB_NO_BEYOND_64K - ret = hb_max (ret, load_num_glyphs_from_loca (this)); -#endif - - ret = hb_max (ret, load_num_glyphs_from_maxp (this)); - - num_glyphs = ret; - return ret; + num_glyphs = load_num_glyphs_from_maxp (this); + return num_glyphs; } unsigned int diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc index e6d3ecccdbe5..14c902978709 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc @@ -49,6 +49,7 @@ bool hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan, unsigned int fdCount, const FDSelect &src, /* IN */ + unsigned int src_num_glyphs, unsigned int &subset_fd_count /* OUT */, unsigned int &subset_fdselect_size /* OUT */, unsigned int &subset_fdselect_format /* OUT */, @@ -83,7 +84,13 @@ hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan, /* fonttools retains FDSelect & font dicts for missing glyphs. do the same */ old_glyph = gid; } - auto fd_range = src.get_fd_range (old_glyph); + /* FDSelect may only cover the CharStrings glyphs; see subset_get_fd (). */ + hb_pair_t fd_range = + likely (old_glyph < src_num_glyphs) ? + src.get_fd_range (old_glyph) : + hb_pair_t {0, HB_CODEPOINT_INVALID}; + if (old_glyph < src_num_glyphs) + fd_range.second = hb_min (fd_range.second, src_num_glyphs); unsigned fd = fd_range.first; if (fd != prev_fd) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh index 518b35466fff..68b7433ec98d 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh @@ -34,6 +34,16 @@ namespace CFF { +/* CFF2 CharStrings may omit a tail of glyphs provided by VARC, in which + * case FDSelect only covers the CharStrings glyphs. Use FD 0 for glyphs + * beyond that. */ +template +static inline unsigned +subset_get_fd (const ACC &acc, hb_codepoint_t glyph) +{ + return likely (glyph < acc.num_glyphs) ? acc.fdSelect->get_fd (glyph) : 0; +} + /* Used for writing a temporary charstring */ struct str_encoder_t { @@ -334,6 +344,9 @@ struct cs_command_t typedef hb_vector_t *cs_command_vec_t; +struct cff2_instancing_plan_t; +struct cff2_cs_rounding_t; + struct flatten_param_t { flatten_param_t (str_buff_t &flatStr_, @@ -346,6 +359,12 @@ struct flatten_param_t bool drop_hints; const hb_subset_plan_t *plan; cs_command_vec_t commands; /* Optional: capture parsed commands for specialization */ + + /* CFF2 partial instancing: when set, blends are rewritten against the + * instanced variation store instead of being copied or flattened. */ + const cff2_instancing_plan_t *instancer = nullptr; + cff2_cs_rounding_t *rounding = nullptr; + bool emitted_blend = false; }; template @@ -371,7 +390,7 @@ struct subr_flattener_t continue; } const hb_ubytes_t str = (*acc.charStrings)[glyph]; - unsigned int fd = acc.fdSelect->get_fd (glyph); + unsigned int fd = subset_get_fd (acc, glyph); if (unlikely (fd >= acc.fdCount)) return false; @@ -422,8 +441,7 @@ struct parsed_cs_op_t : op_str_t bool is_hinting () const { return hinting_flag; } void set_hinting () { hinting_flag = true; } - /* The layout of this struct is designed to fit within the - * padding of op_str_t! */ + /* Metadata for retained charstring tokens. */ protected: bool hinting_flag = false; @@ -438,30 +456,93 @@ struct parsed_cs_str_t : parsed_values_t parsed (false), hint_dropped (false), has_prefix_ (false), - has_calls_ (false) + has_calls_ (false), + coalescing_ (false) { SUPER::init (); } + HB_ALWAYS_INLINE void add_op (op_code_t op, const byte_str_ref_t& str_ref) { - if (!is_parsed ()) - SUPER::add_op (op, str_ref); + if (is_parsed ()) return; + last_op_ = op; + if (coalescing_) + { + /* Do not record individual tokens; only note their boundaries. + * Bytes are flushed as verbatim segments at call sites and at + * the end of the string. Only enabled when per-op granularity + * is not needed later for hint analysis. */ + penultimate_end_ = last_end_; + last_end_ = str_ref.get_offset (); + if (unlikely (op == OpCode_return || op == OpCode_endchar)) + flush_segment (str_ref, last_end_); + return; + } + SUPER::add_op (op, str_ref); + } + + bool has_immediate_subr_number () const + { + if (is_parsed ()) return true; + op_code_t op = coalescing_ ? last_op_ : + values.length ? values.tail ().op : OpCode_Invalid; + return op == OpCode_shortint || op == OpCode_fixedcs || + (OpCode_OneByteIntFirst <= op && op <= OpCode_TwoByteNegInt3); } void add_call_op (op_code_t op, const byte_str_ref_t& str_ref, unsigned int subr_num) { - if (!is_parsed ()) + if (is_parsed ()) return; + has_calls_ = true; + last_op_ = op; + + if (coalescing_) { - has_calls_ = true; + /* Flush bytes preceding the subroutine-number token, then skip + * over the number: it is re-encoded with the new bias. */ + flush_segment (str_ref, penultimate_end_); + opStart = last_end_; + SUPER::add_op (op, str_ref, {subr_num}); + penultimate_end_ = last_end_ = str_ref.get_offset (); + return; + } - /* Pop the subroutine number. */ - values.pop (); + /* Pop the subroutine number. */ + values.pop (); - SUPER::add_op (op, str_ref, {subr_num}); + SUPER::add_op (op, str_ref, {subr_num}); + } + + /* Flush pending bytes [opStart, end) as verbatim segment entries. */ + void flush_segment (const byte_str_ref_t& str_ref, unsigned end) + { + unsigned start = opStart; + if (end <= start) return; + while (start < end) + { + auto arr = str_ref.sub_array (start, hb_min (end - start, 255u)); + if (unlikely (!arr.length)) break; + parsed_cs_op_t *val = values.push (); + val->ptr = arr.arrayZ; + val->length = arr.length; + start += arr.length; } + opStart = end; } + /* For coalescing mode: flush any pending bytes through the current + * position; used where the string ends without an explicit + * return/endchar op (CFF2). */ + void flush_coalesced (const byte_str_ref_t& str_ref) + { + if (coalescing_ && !is_parsed ()) + flush_segment (str_ref, str_ref.get_offset ()); + } + + void enable_coalescing () { coalescing_ = true; } + bool is_coalescing () const { return coalescing_; } + void set_prefix (const number_t &num, op_code_t op = OpCode_Invalid) { has_prefix_ = true; @@ -525,6 +606,14 @@ struct parsed_cs_str_t : parsed_values_t bool vsindex_dropped : 1; bool has_prefix_ : 1; bool has_calls_ : 1; + /* Record verbatim byte segments instead of individual tokens, + * making a separate compact() pass unnecessary; incompatible with + * hint analysis. */ + bool coalescing_ : 1; + /* End offsets of the last two tokens seen (coalescing mode). */ + op_code_t last_op_ = OpCode_Invalid; + unsigned penultimate_end_ = 0; + unsigned last_end_ = 0; op_code_t prefix_op_; number_t prefix_num_; @@ -605,14 +694,19 @@ struct subr_subset_param_t parsed_cs_str_vec_t *parsed_local_subrs_, hb_set_t *global_closure_, hb_set_t *local_closure_, - bool drop_hints_) : + bool drop_hints_, + bool coalesce_ = false) : current_parsed_str (parsed_charstring_), parsed_charstring (parsed_charstring_), parsed_global_subrs (parsed_global_subrs_), parsed_local_subrs (parsed_local_subrs_), global_closure (global_closure_), local_closure (local_closure_), - drop_hints (drop_hints_) {} + drop_hints (drop_hints_), + coalesce (coalesce_) + { + if (coalesce) parsed_charstring->enable_coalescing (); + } parsed_cs_str_t *get_parsed_str_for_context (call_context_t &context) { @@ -651,7 +745,10 @@ struct subr_subset_param_t else { if (!parsed_str->is_parsed ()) + { parsed_str->alloc (env.str_ref.total_size ()); + if (coalesce) parsed_str->enable_coalescing (); + } current_parsed_str = parsed_str; } } @@ -664,6 +761,7 @@ struct subr_subset_param_t hb_set_t *global_closure; hb_set_t *local_closure; bool drop_hints; + bool coalesce; }; struct subr_remap_t : hb_inc_bimap_t @@ -738,8 +836,9 @@ struct subr_subsetter_t * Phase #3 walks charstrings/subroutines forward then backward (hence parsing required), * because we can't tell if a number belongs to a hint op until we see the first moveto. * - * Assumption: a callsubr/callgsubr operator must immediately follow a (biased) subroutine number - * within the same charstring/subroutine, e.g., not split across a charstring and a subroutine. + * Retained calls require an immediately preceding subroutine-number token + * within the same program. Caller-supplied operands are rejected; use + * desubroutinization for those programs. */ bool subset (void) { @@ -781,6 +880,12 @@ struct subr_subsetter_t return false; } + /* When hints are not analyzed (not dropping hints, not populating + * the accelerator), coalesce parsed tokens as they are added, + * instead of a separate compact() pass. */ + bool coalesce = !(plan->flags & HB_SUBSET_FLAGS_NO_HINTING) && + !plan->inprogress_accelerator; + /* phase 1 & 2 */ for (auto _ : plan->new_to_old_gid_list) { @@ -788,7 +893,7 @@ struct subr_subsetter_t hb_codepoint_t old_glyph = _.second; const hb_ubytes_t str = (*acc.charStrings)[old_glyph]; - unsigned int fd = acc.fdSelect->get_fd (old_glyph); + unsigned int fd = subset_get_fd (acc, old_glyph); if (unlikely (fd >= acc.fdCount)) return false; @@ -813,7 +918,8 @@ struct subr_subsetter_t &parsed_local_subrs_storage[fd], &closures.global_closure, &closures.local_closures[fd], - plan->flags & HB_SUBSET_FLAGS_NO_HINTING); + plan->flags & HB_SUBSET_FLAGS_NO_HINTING, + coalesce); if (unlikely (!interp.interpret (param))) return false; @@ -845,8 +951,11 @@ struct subr_subsetter_t * * The compacting both saves memory and makes further operations * faster. + * + * Not needed when tokens were coalesced during parsing. */ - parsed_charstrings[new_glyph].compact (); + if (!coalesce) + parsed_charstrings[new_glyph].compact (); } /* Since parsed strings were loaded from accelerator, we still need @@ -887,7 +996,7 @@ struct subr_subsetter_t } last++; // Skip over gid - unsigned int fd = acc.fdSelect->get_fd (old_glyph); + unsigned int fd = subset_get_fd (acc, old_glyph); if (unlikely (fd >= acc.fdCount)) return false; if (unlikely (!encode_str (get_parsed_charstring (gid), fd, buffArray.arrayZ[gid], encode_prefix))) @@ -1071,7 +1180,7 @@ struct subr_subsetter_t { hb_codepoint_t new_glyph = _.first; hb_codepoint_t old_glyph = _.second; - unsigned int fd = acc.fdSelect->get_fd (old_glyph); + unsigned int fd = subset_get_fd (acc, old_glyph); if (unlikely (fd >= acc.fdCount)) return false; @@ -1230,6 +1339,7 @@ HB_INTERNAL bool hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan, unsigned int fdCount, const CFF::FDSelect &src, /* IN */ + unsigned int src_num_glyphs, unsigned int &subset_fd_count /* OUT */, unsigned int &subset_fdselect_size /* OUT */, unsigned int &subset_fdselect_format /* OUT */, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc index 558b61121a78..9446e99e627e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc @@ -348,6 +348,11 @@ struct cff1_cs_opset_subr_subset_t : cff1_cs_opset_thas_immediate_subr_number ())) + { + env.set_error (); + return; + } byte_str_ref_t str_ref = env.str_ref; env.call_subr (subrs, type); param.current_parsed_str->add_call_op (op, str_ref, env.context.subr_num); @@ -518,6 +523,7 @@ struct cff1_subset_plan glyph_to_sid_map_t *glyph_to_sid_map = acc.cff_accelerator ? acc.cff_accelerator->glyph_to_sid_map.get_acquire () : nullptr; + bool created_map = false; if (!glyph_to_sid_map && acc.cff_accelerator) { @@ -525,11 +531,17 @@ struct cff1_subset_plan glyph_to_sid_map = acc.create_glyph_to_sid_map (); } + if (!glyph_to_sid_map || glyph_to_sid_map->in_error ()) + { + glyph_to_sid_map = nullptr; + created_map = false; + } + auto it = hb_iter (plan->new_to_old_gid_list); if (it->first == 0) it++; auto _ = *it; bool not_is_cid = !acc.is_CID (); - bool skip = !not_is_cid && glyph_to_sid_map; + bool skip = !not_is_cid && glyph_to_sid_map && !identity_charset; if (not_is_cid) sidmap.alloc (num_glyphs); for (hb_codepoint_t glyph = 1; glyph < num_glyphs; glyph++) @@ -545,12 +557,18 @@ struct cff1_subset_plan /* Retain the SID for the old missing glyph ID */ old_glyph = glyph; } - unsigned sid = glyph_to_sid_map ? - glyph_to_sid_map->arrayZ[old_glyph].code : - acc.glyph_to_sid (old_glyph, &glyph_to_sid_cache); + unsigned sid; + if (identity_charset) + sid = glyph; + else + { + sid = glyph_to_sid_map ? + glyph_to_sid_map->arrayZ[old_glyph].code : + acc.glyph_to_sid (old_glyph, &glyph_to_sid_cache); - if (not_is_cid) - sid = sidmap.add (sid); + if (not_is_cid) + sid = sidmap.add (sid); + } if (sid != last_sid + 1) subset_charset_ranges.push (code_pair_t {sid, glyph}); @@ -621,6 +639,7 @@ struct cff1_subset_plan orig_fdcount = acc.fdCount; drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING; desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE; + identity_charset = (plan->flags & HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET) && acc.is_CID (); #ifdef HB_EXPERIMENTAL_API min_charstrings_off_size = (plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS) ? 4 : 0; @@ -628,7 +647,7 @@ struct cff1_subset_plan min_charstrings_off_size = 0; #endif - subset_charset = !acc.is_predef_charset (); + subset_charset = !acc.is_predef_charset () || identity_charset; if (!subset_charset) /* check whether the subset renumbers any glyph IDs */ for (const auto &_ : plan->new_to_old_gid_list) @@ -663,6 +682,7 @@ struct cff1_subset_plan if (unlikely (!hb_plan_subset_cff_fdselect (plan, orig_fdcount, *acc.fdSelect, + acc.num_glyphs, subset_fdcount, info.fd_select.size, subset_fdselect_format, @@ -786,6 +806,7 @@ struct cff1_subset_plan unsigned int topDictModSIDs[name_dict_values_t::ValCount]; bool desubroutinize = false; + bool identity_charset = false; unsigned min_charstrings_off_size = 0; }; @@ -993,6 +1014,7 @@ OT::cff1::accelerator_subset_t::subset (hb_subset_context_t *c) const if (unlikely (!cff_plan.create (*this, c->plan))) { DEBUG_MSG(SUBSET, nullptr, "Failed to generate a cff subsetting plan."); + c->serializer->err (HB_SERIALIZE_ERROR_OTHER); return false; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc index cce15bafe90e..9f33256b3f27 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc @@ -30,14 +30,368 @@ #include "hb-open-type.hh" #include "hb-ot-cff2-table.hh" +#include "hb-ot-var-common.hh" #include "hb-set.h" #include "hb-subset-plan.hh" #include "hb-subset-cff-common.hh" #include "hb-cff2-interp-cs.hh" +#include "hb-subset-cff2-round.hh" #include "hb-subset-cff2-to-cff1.hh" using namespace CFF; +namespace CFF { + +/* + * Partial instancing (some axes pinned or limited, others kept). + * + * This is a port of fontTools' instantiateCFF2 (fonttools/fonttools#3506), + * with one simplification: the variation-store instancing solver acts on + * regions independently of the per-blend delta values, so instead of lifting + * every blend's deltas into the store, instancing it, and reading the rows + * back, we instance each VarData once with identity delta rows. The + * instantiated tuples then give, per VarData, a fixed linear map from old + * per-region deltas to new per-region deltas. The contribution that folds + * into each blend's default value is the old store's region scalars + * evaluated at the new default location (plan->normalized_coords); the + * surviving rebased regions all evaluate to zero there. + * + * Use: create (), then note_use () for every blend the retained charstrings + * and private dicts hold, then finalize (); only VarDatas that are both + * still variable and actually used survive into the new store. + */ +struct cff2_instancing_plan_t +{ + struct vardata_transform_t + { + /* new_deltas[j] = Σ_i matrix[j][i] * old_deltas[i] */ + hb_vector_t> matrix; + /* Default-value fold-in scalars, one per old region: the old store's + * region scalars at the new default location. */ + hb_vector_t gains; + /* Surviving regions, parallel to matrix rows. */ + hb_vector_t> regions; + /* Index into the new global region list, per new region (finalize). */ + hb_vector_t region_indices; + unsigned new_major = 0; + bool alive_ = false; + bool alive () const { return alive_; } + + /* One value's delta for new region j, from its old per-region deltas. */ + double transform_delta (unsigned j, hb_array_t deltas) const + { + const hb_vector_t &col = matrix.arrayZ[j]; + double d = 0.; + unsigned count = hb_min (col.length, deltas.length); + for (unsigned c = 0; c < count; c++) + d += (double) col.arrayZ[c] * deltas.arrayZ[c].to_real (); + return d; + } + }; + + hb_vector_t transforms; /* per old VarData (vsindex) */ + hb_vector_t> new_regions; /* global region list */ + hb_set_t used_majors; + unsigned new_major_count = 0; + + bool has_variations () const { return new_major_count; } + + const vardata_transform_t *get_transform (unsigned major) const + { return major < transforms.length ? &transforms.arrayZ[major] : nullptr; } + + /* Record that a retained blend references this VarData. */ + void note_use (unsigned major) { used_majors.add (major); } + + /* The new vsindex a private dict's (or charstring's) old ivs maps to; + * dead VarDatas fall back to 0, their blends having become static. */ + unsigned remap_ivs (unsigned old_ivs) const + { + const vardata_transform_t *t = get_transform (old_ivs); + return (t && t->alive ()) ? t->new_major : 0; + } + + double fold_deltas (unsigned old_ivs, hb_array_t deltas) const + { + const vardata_transform_t *t = get_transform (old_ivs); + if (unlikely (!t || t->gains.length != deltas.length)) return 0.; + double v = 0.; + for (unsigned i = 0; i < deltas.length; i++) + v += (double) t->gains.arrayZ[i] * deltas.arrayZ[i].to_real (); + return v; + } + + bool create (const CFF2ItemVariationStore *cff2VarStore, + const hb_subset_plan_t *plan) + { + const OT::ItemVariationStore &varStore = cff2VarStore->varStore; + unsigned major_count = varStore.get_sub_table_count (); + if (!transforms.resize (major_count)) return false; + + if (!varStore.get_region_list ().get_var_regions (plan->axes_old_index_tag_map, orig_regions)) + return false; + + /* Instance each VarData with identity delta rows; the surviving tuples' + * delta columns are the old-region → new-region transform. */ + OT::optimize_scratch_t scratch; + for (unsigned m = 0; m < major_count; m++) + { + const OT::VarData &var_data = varStore.get_sub_table (m); + unsigned k = var_data.get_region_index_count (); + vardata_transform_t &t = transforms.arrayZ[m]; + + if (!t.gains.resize_exact (k)) return false; + varStore.get_region_scalars (m, plan->normalized_coords.arrayZ, + plan->normalized_coords.length, + t.gains.arrayZ, k); + + OT::tuple_variations_t tuples; + for (unsigned r = 0; r < k; r++) + { + OT::tuple_delta_t tuple; + if (!tuple.deltas_x.resize (k) || + !tuple.indices.resize (k)) + return false; + for (unsigned i = 0; i < k; i++) + tuple.indices.arrayZ[i] = true; + tuple.deltas_x.arrayZ[r] = 1.f; + unsigned region_index = var_data.get_region_index (r); + if (unlikely (region_index >= orig_regions.length)) return false; + tuple.axis_tuples = orig_regions.arrayZ[region_index]; + if (unlikely (tuple.axis_tuples.in_error ())) return false; + tuples.tuple_vars.push (std::move (tuple)); + } + if (unlikely (tuples.tuple_vars.in_error ())) return false; + + if (!tuples.instantiate (plan->axes_location, plan->axes_triple_distances, scratch)) + return false; + + for (auto &tuple : tuples.tuple_vars) + { + if (unlikely (tuple.deltas_x.length != k)) return false; + hb_vector_t col; + if (unlikely (!col.resize_exact (k))) return false; + for (unsigned i = 0; i < k; i++) + col.arrayZ[i] = tuple.deltas_x.arrayZ[i]; + t.matrix.push (std::move (col)); + t.regions.push (std::move (tuple.axis_tuples)); + } + if (unlikely (t.matrix.in_error () || t.regions.in_error ())) return false; + } + + return true; + } + + /* Decide which VarDatas survive, number them, and build the new global + * region list: surviving original regions first, in their original order, + * then solver-split new regions in order of appearance (fontTools' + * rebuildRegions + prune_regions). */ + bool finalize () + { + for (unsigned m = 0; m < transforms.length; m++) + { + vardata_transform_t &t = transforms.arrayZ[m]; + t.alive_ = t.matrix.length && used_majors.has (m); + if (t.alive_) + t.new_major = new_major_count++; + } + + /* Keys hash by content, so pointers into different owners compare fine. */ + hb_hashmap_t*, unsigned> region_idx_map; + hb_vector_t*> region_ptrs; + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + if (!region_idx_map.has (®ion)) + if (unlikely (!region_idx_map.set (®ion, (unsigned) -1))) + return false; + } + for (const auto &r : orig_regions) + { + unsigned *idx; + if (region_idx_map.has (&r, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (&r, region_ptrs.length))) return false; + region_ptrs.push (&r); + } + } + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + { + unsigned *idx; + if (region_idx_map.has (®ion, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (®ion, region_ptrs.length))) return false; + region_ptrs.push (®ion); + } + } + } + if (unlikely (region_ptrs.in_error ())) return false; + + for (vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + { + unsigned *idx; + if (unlikely (!region_idx_map.has (®ion, &idx))) return false; + t.region_indices.push (*idx); + } + if (unlikely (t.region_indices.in_error ())) return false; + } + + if (!new_regions.resize (region_ptrs.length)) return false; + for (unsigned i = 0; i < region_ptrs.length; i++) + { + new_regions.arrayZ[i] = *region_ptrs.arrayZ[i]; + if (unlikely (new_regions.arrayZ[i].in_error ())) return false; + } + + return true; + } + + /* Serialize the instanced store: a CFF2ItemVariationStore whose VarDatas + * carry no items, just region indexes (blend deltas live in charstrings). + * Laid out manually since all sizes are known up front. */ + bool serialize_var_store (hb_serialize_context_t *c, + const hb_vector_t &axis_tags) const + { + unsigned data_count = new_major_count; + unsigned header_size = 2 + 4 + 2 + 4 * data_count; + + uint64_t offset = header_size; + hb_vector_t data_offsets; + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + data_offsets.push ((unsigned) offset); + offset += 6 + 2 * (uint64_t) t.region_indices.length; + } + if (unlikely (data_offsets.in_error () || data_offsets.length != data_count)) + return false; + unsigned regions_offset = (unsigned) offset; + uint64_t total = offset + 4 + (uint64_t) new_regions.length * axis_tags.length * 6; + if (unlikely (total > 0xFFFFFFFFu)) return false; + + HBUINT16 *size_field = c->allocate_size (HBUINT16::static_size); + if (unlikely (!size_field)) return false; + /* OFF 2026 5.3.3.11.2 permits larger stores with length=65535. */ + *size_field = hb_min (total, (uint64_t) 0xFFFFu); + + char *header = c->allocate_size (header_size); + if (unlikely (!header)) return false; + * (HBUINT16 *) (header + 0) = 1; /* format */ + * (HBUINT32 *) (header + 2) = regions_offset; + * (HBUINT16 *) (header + 6) = data_count; + for (unsigned i = 0; i < data_count; i++) + * (HBUINT32 *) (header + 8 + 4 * i) = data_offsets.arrayZ[i]; + + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + unsigned k = t.region_indices.length; + HBUINT16 *v = (HBUINT16 *) c->allocate_size (6 + 2 * k); + if (unlikely (!v)) return false; + v[0] = 0; /* itemCount */ + v[1] = 0; /* wordSizeCount */ + v[2] = k; /* regionIndices.len */ + for (unsigned j = 0; j < k; j++) + v[3 + j] = t.region_indices.arrayZ[j]; + } + + hb_vector_t*> region_ptrs; + if (unlikely (!region_ptrs.alloc_exact (new_regions.length))) return false; + for (const auto &r : new_regions) + region_ptrs.push (&r); + auto *region_list = c->start_embed (); + return region_list->serialize (c, axis_tags, region_ptrs); + } + + private: + hb_vector_t> orig_regions; +}; + +/* Usage-collection pass for partial instancing: record which VarDatas the + * retained charstrings' and private dicts' blends reference. Mirrors the + * emission pass: blends consumed by dropped hint ops don't count. */ +struct cff2_usage_param_t +{ + void init () {} + + cff2_instancing_plan_t *instancing = nullptr; + bool drop_hints = false; + bool has_blend = false; + bool has_flex1 = false; + unsigned ivs = 0; /* dict-side current vsindex */ +}; + +struct cff2_cs_opset_usage_t : cff2_cs_opset_t +{ + static void flush_args_and_op (op_code_t op, cff2_cs_interp_env_t &env, cff2_usage_param_t& param) + { + param.has_flex1 |= op == OpCode_flex1; + bool counts = true; + switch (op) + { + case OpCode_return: + case OpCode_endchar: + counts = false; + break; + + case OpCode_hstem: + case OpCode_hstemhm: + case OpCode_vstem: + case OpCode_vstemhm: + case OpCode_hintmask: + case OpCode_cntrmask: + if (param.drop_hints) + counts = false; + break; + + default: + break; + } + + if (counts) + for (unsigned int i = 0; i < env.argStack.get_count (); i++) + if (env.argStack[i].blending ()) + { + param.has_blend = true; + if (param.instancing) param.instancing->note_use (env.get_ivs ()); + break; + } + + env.clear_args (); + } +}; + +struct cff2_private_dict_usage_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, cff2_priv_dict_interp_env_t& env, cff2_usage_param_t& param) + { + switch (op) { + case OpCode_vsindexdict: + env.process_vsindex (); + param.ivs = env.get_ivs (); + env.clear_args (); + return; + case OpCode_blenddict: + param.instancing->note_use (param.ivs); + env.clear_args (); + return; + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + env.clear_args (); + return; + } + } +}; + +} /* namespace CFF */ + struct cff2_sub_table_info_t : cff_sub_table_info_t { cff2_sub_table_info_t () @@ -74,54 +428,52 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) { - /* Optionally capture command for specialization (before flushing, to preserve args) */ - if (param.commands) + bool skip_command = false; + switch (op) { - bool skip_command = false; + case OpCode_return: + case OpCode_endchar: + skip_command = true; + break; - switch (op) - { - case OpCode_return: - case OpCode_endchar: - skip_command = true; - break; + case OpCode_hstem: + case OpCode_hstemhm: + case OpCode_vstem: + case OpCode_vstemhm: + case OpCode_hintmask: + case OpCode_cntrmask: + skip_command = param.drop_hints; + break; - case OpCode_hstem: - case OpCode_hstemhm: - case OpCode_vstem: - case OpCode_vstemhm: - case OpCode_hintmask: - case OpCode_cntrmask: - if (param.drop_hints) - skip_command = true; - break; + default: + break; + } - default: - break; - } + if (!skip_command && param.rounding && unlikely (!round_args (op, env, param))) + { + env.set_error (); + return; + } - if (!skip_command) + /* Capture resolved commands for CFF2-to-CFF1 specialization. */ + if (param.commands && !skip_command) + { + cs_command_t cmd (op); + for (unsigned int i = 0; i < env.argStack.get_count ();) { - cs_command_t cmd (op); - /* Capture resolved blend values */ - for (unsigned int i = 0; i < env.argStack.get_count ();) + const blend_arg_t &arg = env.argStack[i]; + if (arg.blending ()) { - const blend_arg_t &arg = env.argStack[i]; - if (arg.blending ()) - { - /* For blend args, capture only the resolved default value */ - cmd.args.push (arg); - /* Skip over the multiple blend values */ - i += arg.numValues; - } - else - { - cmd.args.push (arg); - i++; - } + cmd.args.push (arg); + i += arg.numValues; + } + else + { + cmd.args.push (arg); + i++; } - param.commands->push (cmd); } + param.commands->push (cmd); } switch (op) @@ -129,6 +481,8 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) { + if (param.rounding) + { + encode_rounded_args (env, param); + SUPER::flush_args (env, param); + return; + } for (unsigned int i = 0; i < env.argStack.get_count ();) { const blend_arg_t &arg = env.argStack[i]; @@ -162,7 +522,10 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) + { + unsigned k = 0; + if (param.instancer) + { + unsigned ivs = env.get_ivs (); + const auto *t = param.instancer->get_transform (ivs); + k = t && t->alive () ? t->matrix.length : 0; + for (unsigned i = 0; i < env.argStack.get_count (); i++) + { + auto &arg = env.argStack[i]; + if (!arg.blending ()) continue; + if (unlikely (!t || arg.deltas.length != t->gains.length)) return false; + double value = arg.to_real () + param.instancer->fold_deltas (ivs, arg.deltas.as_array ()); + hb_vector_t deltas = std::move (arg.deltas); + arg.set_real (value); + if (unlikely (!arg.deltas.resize (k))) return false; + for (unsigned r = 0; r < k; r++) + arg.deltas.arrayZ[r].set_real (t->transform_delta (r, deltas.as_array ())); + } + } + return param.rounding->round (op, hb_array (env.argStack.arrayZ, env.argStack.get_count ()), k); + } + + static void encode_rounded_args (cff2_cs_interp_env_t &env, flatten_param_t& param) + { + str_encoder_t encoder (param.flatStr); + unsigned count = env.argStack.get_count (); + for (unsigned i = 0; i < count;) + { + const auto &arg = env.argStack[i]; + if (!arg.blending ()) + { + encoder.encode_num_cs (arg); + i++; + continue; + } + unsigned k = arg.deltas.length; + unsigned n = 1; + while (i + n < count && env.argStack[i + n].deltas.length == k) n++; + /* Previously emitted operands remain on the stack during each blend. */ + unsigned chunk = hb_min (n, (512 - i) / (k + 1)); + if (unlikely (!chunk)) + { + env.set_error (); + return; + } + for (unsigned j = 0; j < chunk; j++) + encoder.encode_num_cs (env.argStack[i + j]); + for (unsigned j = 0; j < chunk; j++) + for (const auto &d : env.argStack[i + j].deltas) + encoder.encode_num_cs (d); + encoder.encode_int (chunk); + encoder.encode_op (OpCode_blendcs); + param.emitted_blend = true; + i += chunk; + } + } + static void flatten_blends (const blend_arg_t &arg, unsigned int i, cff2_cs_interp_env_t &env, flatten_param_t& param) { /* flatten the default values */ @@ -202,6 +624,113 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) + { + const cff2_instancing_plan_t &instancer = *param.instancer; + unsigned ivs = env.get_ivs (); + const cff2_instancing_plan_t::vardata_transform_t *t = instancer.get_transform (ivs); + if (unlikely (!t)) + { + env.set_error (); + return; + } + + unsigned n = arg.numValues; + for (unsigned int j = 0; j < n; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + if (unlikely (!(arg1.blending () && (arg1.numValues == n) && (arg1.valueIndex == j) && + (arg1.deltas.length == env.get_region_count ()) && + (arg1.deltas.length == t->gains.length)))) + { + env.set_error (); + return; + } + } + + str_encoder_t encoder (param.flatStr); + unsigned k_new = t->alive () ? t->matrix.length : 0; + + if (!k_new) + { + /* All of this VarData's regions died; blends dissolve into statics. */ + for (unsigned int j = 0; j < n; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + number_t v; + v.set_real (arg1.to_real () + round (instancer.fold_deltas (ivs, arg1.deltas.as_array ()))); + encoder.encode_num_cs (v); + } + return; + } + + /* Emit in chunks so the output charstring stays within the argument + * stack limit: values already emitted for this op, plus this chunk's + * defaults, deltas and count, must not exceed 513. */ + unsigned done = 0; + while (done < n) + { + unsigned avail = 512 > (i + done) ? 512 - (i + done) : 0; + unsigned chunk = hb_min (avail / (k_new + 1), n - done); + if (unlikely (!chunk)) + { + env.set_error (); + return; + } + + for (unsigned int j = done; j < done + chunk; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + number_t v; + v.set_real (arg1.to_real () + round (instancer.fold_deltas (ivs, arg1.deltas.as_array ()))); + encoder.encode_num_cs (v); + } + for (unsigned int j = done; j < done + chunk; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + for (unsigned r = 0; r < k_new; r++) + { + number_t v; + v.set_int (hb_clamp_to (round (t->transform_delta (r, arg1.deltas.as_array ())))); + encoder.encode_num_cs (v); + } + } + encoder.encode_int (chunk); + encoder.encode_op (OpCode_blendcs); + done += chunk; + } + param.emitted_blend = true; + } + + /* Partial instancing: prepend a vsindex op when the charstring's + * (remapped) ivs differs from its FD's (remapped) private-dict ivs. */ + static void emit_vsindex_prefix (cff2_cs_interp_env_t &env, flatten_param_t& param) + { + if (!param.emitted_blend) return; + const cff2_instancing_plan_t &instancer = *param.instancer; + unsigned new_ivs = instancer.remap_ivs (env.get_ivs ()); + unsigned fd_ivs = instancer.remap_ivs (env.get_orig_ivs ()); + if (new_ivs == fd_ivs) return; + + str_buff_t prefix; + str_encoder_t enc (prefix); + enc.encode_int ((int) new_ivs); + enc.encode_op (OpCode_vsindexcs); + + str_buff_t &buf = param.flatStr; + unsigned old_len = buf.length; + if (unlikely (prefix.in_error () || !buf.resize (old_len + prefix.length))) + { + env.set_error (); + return; + } + memmove (buf.arrayZ + prefix.length, buf.arrayZ, old_len); + hb_memcpy (buf.arrayZ, prefix.arrayZ, prefix.length); + } + static void flush_op (op_code_t op, cff2_cs_interp_env_t &env, flatten_param_t& param) { switch (op) @@ -254,12 +783,14 @@ struct cff2_cs_opset_subr_subset_t : cff2_cs_opset_tflush_coalesced (env.str_ref); param.current_parsed_str->set_parsed (); env.return_from_subr (); param.set_current_str (env, false); break; case OpCode_endchar: + param.current_parsed_str->flush_coalesced (env.str_ref); param.current_parsed_str->set_parsed (); SUPER::process_op (op, env, param); break; @@ -284,6 +815,11 @@ struct cff2_cs_opset_subr_subset_t : cff2_cs_opset_t &env, subr_subset_param_t& param, cff2_biased_subrs_t& subrs, hb_set_t *closure) { + if (unlikely (!param.current_parsed_str->has_immediate_subr_number ())) + { + env.set_error (); + return; + } byte_str_ref_t str_ref = env.str_ref; env.call_subr (subrs, type); param.current_parsed_str->add_call_op (op, str_ref, env.context.subr_num); @@ -326,7 +862,12 @@ struct cff2_private_blend_encoder_param_t if (!seen_blend) { region_count = varStore->varStore.get_region_index_count (ivs); - scalars.resize_exact (region_count); + if (unlikely (!scalars.resize_exact (region_count))) + { + if (c) c->err (HB_SERIALIZE_ERROR_OTHER); + seen_blend = true; + return; + } varStore->varStore.get_region_scalars (ivs, normalized_coords.arrayZ, normalized_coords.length, &scalars[0], region_count); seen_blend = true; @@ -353,6 +894,13 @@ struct cff2_private_blend_encoder_param_t hb_vector_t scalars; const CFF2ItemVariationStore *varStore = nullptr; hb_array_t normalized_coords; + + /* CFF2 partial instancing: when set, blends are rewritten against the + * instanced variation store instead of being flattened. */ + const cff2_instancing_plan_t *instancer = nullptr; + /* Error-compensated fold rounding state, per dict operator. */ + double fold_exact = 0.; + double fold_emitted = 0.; }; struct cff2_private_dict_blend_opset_t : dict_opset_t @@ -365,6 +913,98 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t arg.set_int (round (arg.to_real () + param.blend_deltas (blends))); } + /* The fold added to a value, error-compensated across the operator: most + * blended private-dict values (BlueValues, StemSnap*, ...) are + * delta-encoded, so independently rounded folds would accumulate in the + * decoded absolutes; keeping the emitted cumulative fold equal to the + * rounded exact cumulative fold bounds every absolute within ±0.5. */ + static double fold (cff2_private_blend_encoder_param_t& param, + const hb_array_t blends) + { + double f = param.blend_deltas (blends); + double emit = round (param.fold_exact + f) - param.fold_emitted; + param.fold_exact += f; + param.fold_emitted += emit; + return emit; + } + + /* Partial instancing: emit the args preceding this blend group, then the + * group itself rewritten against the instanced store, and clear the + * stack. The op's remaining args are flushed at process_op time. */ + static void rewrite_blends (cff2_priv_dict_interp_env_t& env, + cff2_private_blend_encoder_param_t& param, + unsigned start, unsigned n, unsigned k) + { + const cff2_instancing_plan_t &instancer = *param.instancer; + const cff2_instancing_plan_t::vardata_transform_t *t = instancer.get_transform (param.ivs); + if (unlikely (!t || t->gains.length != k)) + { + env.set_error (); + return; + } + + str_buff_t str; + str_encoder_t encoder (str); + + for (unsigned idx = 0; idx < start; idx++) + encoder.encode_num_tp (env.argStack[idx]); + + unsigned k_new = t->alive () ? t->matrix.length : 0; + if (!k_new) + { + /* This VarData died (or is unused by any retained charstring, which + * can happen for FDs kept only for retain-gids holes); blends + * dissolve into statics. */ + for (unsigned j = 0; j < n; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + number_t v; + v.set_real (env.argStack[start + j].to_real () + fold (param, blends)); + encoder.encode_num_tp (v); + } + } + else + { + unsigned done = 0; + while (done < n) + { + unsigned avail = 512 > (start + done) ? 512 - (start + done) : 0; + unsigned chunk = hb_min (avail / (k_new + 1), n - done); + if (unlikely (!chunk)) + { + env.set_error (); + return; + } + + for (unsigned j = done; j < done + chunk; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + number_t v; + v.set_real (env.argStack[start + j].to_real () + fold (param, blends)); + encoder.encode_num_tp (v); + } + for (unsigned j = done; j < done + chunk; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + for (unsigned r = 0; r < k_new; r++) + { + number_t v; + v.set_int (hb_clamp_to (round (t->transform_delta (r, blends)))); + encoder.encode_num_tp (v); + } + } + encoder.encode_int (chunk); + encoder.encode_op (OpCode_blenddict); + done += chunk; + } + } + + auto bytes = str.as_bytes (); + param.c->embed (&bytes, bytes.length); + + env.clear_args (); + } + static void process_blend (cff2_priv_dict_interp_env_t& env, cff2_private_blend_encoder_param_t& param) { unsigned int n, k; @@ -372,14 +1012,30 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t param.process_blend (); k = param.region_count; n = env.argStack.pop_uint (); + + unsigned count = env.argStack.get_count (); + unsigned int total; + if (unlikely (hb_unsigned_mul_overflows (k + 1, n, &total) || total > count)) + { + env.set_error (); + return; + } + /* copy the blend values into blend array of the default values */ - unsigned int start = env.argStack.get_count () - ((k+1) * n); + unsigned int start = count - total; /* let an obvious error case fail, but note CFF2 spec doesn't forbid n==0 */ - if (unlikely (start > env.argStack.get_count ())) + if (unlikely (start > count)) { env.set_error (); return; } + + if (param.instancer && k) + { + rewrite_blends (env, param, start, n, k); + return; + } + for (unsigned int i = 0; i < n; i++) { const hb_array_t blends = env.argStack.sub_array (start + n + (i * k), k); @@ -410,6 +1066,20 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t case OpCode_vsindexdict: env.process_vsindex (); param.ivs = env.get_ivs (); + if (param.instancer) + { + /* Re-emit with the remapped vsindex; 0 is the dict default. */ + unsigned new_ivs = param.instancer->remap_ivs (param.ivs); + if (new_ivs) + { + str_buff_t str; + str_encoder_t encoder (str); + encoder.encode_int ((int) new_ivs); + encoder.encode_op (OpCode_vsindexdict); + auto bytes = str.as_bytes (); + param.c->embed (&bytes, bytes.length); + } + } env.clear_args (); return; case OpCode_blenddict: @@ -439,6 +1109,7 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t param.c->embed (&bytes, bytes.length); env.clear_args (); + param.fold_exact = param.fold_emitted = 0.; } }; @@ -446,9 +1117,11 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t { cff2_private_dict_op_serializer_t (bool desubroutinize_, bool drop_hints_, bool pinned_, const CFF::CFF2ItemVariationStore* varStore_, - hb_array_t normalized_coords_) + hb_array_t normalized_coords_, + const cff2_instancing_plan_t *instancer_ = nullptr) : desubroutinize (desubroutinize_), drop_hints (drop_hints_), pinned (pinned_), - varStore (varStore_), normalized_coords (normalized_coords_) {} + param (nullptr, varStore_, normalized_coords_) + { param.instancer = instancer_; } bool serialize (hb_serialize_context_t *c, const op_str_t &opstr, @@ -467,11 +1140,13 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t return_trace (FontDict::serialize_link2_op (c, opstr.op, subrs_link)); } - if (pinned) + if (pinned || param.instancer) { - // Reinterpret opstr and process blends. + /* Reinterpret opstr and process blends. The param persists across + * this dict's opstrs, so that an ivs set by a vsindexdict opstr is + * still in effect when a later opstr's blends are processed. */ cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; - cff2_private_blend_encoder_param_t param (c, varStore, normalized_coords); + param.c = c; dict_interpreter_t interp (env); return_trace (interp.interpret (param)); } @@ -483,11 +1158,11 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t const bool desubroutinize; const bool drop_hints; const bool pinned; - const CFF::CFF2ItemVariationStore* varStore; - hb_array_t normalized_coords; + mutable cff2_private_blend_encoder_param_t param; }; + namespace OT { struct cff2_subset_plan { @@ -502,12 +1177,21 @@ struct cff2_subset_plan orig_fdcount = acc.fdArray->count; drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING; - pinned = (bool) plan->normalized_coords; + bool instancing_requested = (bool) plan->normalized_coords; + pinned = instancing_requested && plan->all_axes_pinned; normalized_coords = plan->normalized_coords; head_maxp_info = plan->head_maxp_info; hmtx_map = &plan->hmtx_map; desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE || - pinned; // For instancing we need this path + instancing_requested; // For instancing we need this path + + /* Partial instancing: some axes pinned or limited, others kept. */ + partial_instancing = instancing_requested && !pinned && + acc.varStore != &Null (CFF2ItemVariationStore); + if (partial_instancing && + unlikely (!instancing.create (acc.varStore, plan))) + return false; + axis_tags = &plan->axis_tags; /* Enable command capture for CFF2→CFF1 conversion (for specialization) */ capture_commands = pinned; @@ -520,6 +1204,92 @@ struct cff2_subset_plan if (desubroutinize) { + if (instancing_requested) + { + /* Identify charstrings that can round absolute coordinates. Conservatively + * keep relative rounding for flex1, whose implicit direction can vary. + * Also collect the VarDatas referenced by partial instances. */ + hb_vector_t round_charstrings; + if (unlikely (!round_charstrings.resize (num_glyphs))) return false; + hb_set_t used_fds; + for (unsigned int i = 0; i < num_glyphs; i++) + { + hb_codepoint_t glyph; + if (!plan->old_gid_for_new_gid (i, &glyph)) + continue; + const hb_ubytes_t str = (*acc.charStrings)[glyph]; + unsigned int fd = CFF::subset_get_fd (acc, glyph); + if (unlikely (fd >= acc.fdCount)) + return false; + used_fds.add (fd); + + cff2_cs_interp_env_t env (str, acc, fd); + cs_interpreter_t, cff2_cs_opset_usage_t, cff2_usage_param_t> interp (env); + cff2_usage_param_t param; + param.instancing = partial_instancing ? &instancing : nullptr; + param.drop_hints = drop_hints; + if (unlikely (!interp.interpret (param))) + return false; + round_charstrings.arrayZ[i] = param.has_blend && !param.has_flex1; + } + if (partial_instancing) + { + for (unsigned fd : used_fds) + { + cff2_usage_param_t param; + param.instancing = &instancing; + unsigned count = acc.privateDicts[fd].get_count (); + for (unsigned j = 0; j < count; j++) + { + const op_str_t &opstr = acc.privateDicts[fd][j]; + if (drop_hints && dict_opset_t::is_hint_op (opstr.op)) + continue; + cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; + dict_interpreter_t interp (env); + if (unlikely (!interp.interpret (param))) + return false; + } + } + if (unlikely (!instancing.finalize ())) + return false; + } + + /* Keep full-instance blends unrounded until their absolute positions + * are known; partial-instance blends stay symbolic for rewriting. */ + if (!subset_charstrings.resize_exact (num_glyphs)) + return false; + if (capture_commands && !charstring_commands.resize_exact (num_glyphs)) + return false; + for (unsigned int i = 0; i < num_glyphs; i++) + { + hb_codepoint_t glyph; + if (!plan->old_gid_for_new_gid (i, &glyph)) + continue; + const hb_ubytes_t str = (*acc.charStrings)[glyph]; + unsigned int fd = CFF::subset_get_fd (acc, glyph); + if (unlikely (fd >= acc.fdCount)) + return false; + + cff2_cs_interp_env_t env (str, acc, fd, + pinned ? plan->normalized_coords.arrayZ : nullptr, + pinned ? plan->normalized_coords.length : 0); + env.round_blends = !round_charstrings.arrayZ[i]; + cs_interpreter_t, cff2_cs_opset_flatten_t, flatten_param_t> interp (env); + flatten_param_t param = { + subset_charstrings.arrayZ[i], + (bool) (plan->flags & HB_SUBSET_FLAGS_NO_HINTING), + plan, + capture_commands ? &charstring_commands.arrayZ[i] : nullptr + }; + cff2_cs_rounding_t rounding; + if (round_charstrings.arrayZ[i]) param.rounding = &rounding; + param.instancer = partial_instancing ? &instancing : nullptr; + if (unlikely (!interp.interpret (param))) + return false; + } + } + else + { /* Flatten global & local subrs */ subr_flattener_t, cff2_cs_opset_flatten_t> flattener(acc, plan); @@ -538,6 +1308,7 @@ struct cff2_subset_plan if (!flattener.flatten (subset_charstrings)) return false; } + } } else { @@ -571,6 +1342,7 @@ struct cff2_subset_plan if (unlikely (!hb_plan_subset_cff_fdselect (plan, orig_fdcount, *(const FDSelect *)acc.fdSelect, + acc.num_glyphs, subset_fdcount, subset_fdselect_size, subset_fdselect_format, @@ -603,6 +1375,10 @@ struct cff2_subset_plan bool drop_hints = false; bool desubroutinize = false; + bool partial_instancing = false; + cff2_instancing_plan_t instancing; + const hb_vector_t *axis_tags = nullptr; + unsigned min_charstrings_off_size = 0; hb_array_t normalized_coords; // For instantiation @@ -695,7 +1471,7 @@ _serialize_cff1_charstrings (hb_serialize_context_t *c, } unsigned data_size = 0; - unsigned total_size = CFF1CharStrings::total_size (cff1_charstrings, &data_size); + unsigned total_size = CFF1CharStrings::total_size (cff1_charstrings, &data_size, plan.min_charstrings_off_size); if (unlikely (!c->start_zerocopy (total_size))) { c->pop_discard (); @@ -703,7 +1479,7 @@ _serialize_cff1_charstrings (hb_serialize_context_t *c, } auto *cs = c->start_embed (); - if (unlikely (!cs->serialize (c, cff1_charstrings))) + if (unlikely (!cs->serialize (c, cff1_charstrings, &data_size, plan.min_charstrings_off_size))) { c->pop_discard (); return false; @@ -1138,7 +1914,8 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c, } auto *pd = c->push (); cff2_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints, plan.pinned, - varStore, normalized_coords); + varStore, normalized_coords, + plan.partial_instancing ? &plan.instancing : nullptr); if (likely (pd->serialize (c, privateDicts[i], privSzr, subrs_link))) { unsigned fd = plan.fdmap[i]; @@ -1191,13 +1968,30 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c, if (varStore != &Null (CFF2ItemVariationStore) && !plan.pinned) { - auto *dest = c->push (); - if (unlikely (!dest->serialize (c, varStore))) + if (plan.partial_instancing) { - c->pop_discard (); - return false; + if (plan.instancing.has_variations ()) + { + c->push (); + if (unlikely (!plan.instancing.serialize_var_store (c, *plan.axis_tags))) + { + c->pop_discard (); + return false; + } + plan.info.var_store_link = c->pop_pack (false); + } + /* else: the store emptied; the vstore op gets dropped along with it. */ + } + else + { + auto *dest = c->push (); + if (unlikely (!dest->serialize (c, varStore))) + { + c->pop_discard (); + return false; + } + plan.info.var_store_link = c->pop_pack (false); } - plan.info.var_store_link = c->pop_pack (false); } OT::cff2 *cff2 = c->allocate_min (); @@ -1228,7 +2022,11 @@ OT::cff2::accelerator_subset_t::subset (hb_subset_context_t *c) const { cff2_subset_plan cff2_plan; - if (unlikely (!cff2_plan.create (*this, c->plan))) return false; + if (unlikely (!cff2_plan.create (*this, c->plan))) + { + c->serializer->err (HB_SERIALIZE_ERROR_OTHER); + return false; + } // If instantiating (pinned) and downgrade flag is set, convert to CFF1 if (cff2_plan.pinned && (c->plan->flags & HB_SUBSET_FLAGS_DOWNGRADE_CFF2)) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-depend.h b/src/java.desktop/share/native/libharfbuzz/hb-subset-depend.h new file mode 100644 index 000000000000..9d784fc62586 --- /dev/null +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-depend.h @@ -0,0 +1,133 @@ +/* + * Copyright © 2024 Adobe, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Adobe Author(s): Skef Iterum + */ + +#ifndef HB_SUBSET_DEPEND_H +#define HB_SUBSET_DEPEND_H + +#if !defined(HB_SUBSET_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR) +#error "Include instead." +#endif + +#include "hb.h" + +HB_BEGIN_DECLS + +/** + * hb_subset_depend_edge_flags_t: + * @HB_SUBSET_DEPEND_EDGE_FLAG_NONE: No flags set. + * @HB_SUBSET_DEPEND_EDGE_FLAG_FROM_CONTEXT_POSITION: Edge from a multi-position + * contextual rule (Context or ChainContext with inputCount > 1). Depend + * extraction records edges based on what glyphs could statically be at each + * position according to input coverage or class. However, at runtime lookups + * within the rule are applied sequentially: a lookup at an earlier position + * may transform the glyph at a later position, and two lookups at the same + * position may interact such that one produces a glyph that another + * immediately consumes as an "intermediate". A glyph that matches the static + * coverage may therefore not persist at that position when the rule actually + * fires, so this edge may not trigger during closure. + * @HB_SUBSET_DEPEND_EDGE_FLAG_FROM_NESTED_CONTEXT: Edge from a lookup invoked + * within another contextual lookup. The outer context's requirements are not + * propagated to this edge, so the edge may fire even when those requirements + * are not met. + * + * Flags on dependency edges returned by hb_subset_depend_lookup_glyph() that + * mark edges which may produce expected over-approximation when computing + * closure via the depend graph, relative to + * hb_ot_layout_lookups_substitute_closure(). These flags help distinguish + * known limitations of static dependency analysis (expected over-approximation) + * from bugs (unexpected over-approximation). + * + * Since: 14.3.0 + */ +typedef enum { /*< flags >*/ + HB_SUBSET_DEPEND_EDGE_FLAG_NONE = 0x00u, + HB_SUBSET_DEPEND_EDGE_FLAG_FROM_CONTEXT_POSITION = 0x01u, + HB_SUBSET_DEPEND_EDGE_FLAG_FROM_NESTED_CONTEXT = 0x02u, +} hb_subset_depend_edge_flags_t; +#define HB_SUBSET_DEPEND_EDGE_FLAGS_T_DEFINED +/* HB_MARK_AS_FLAG_T is applied in hb-depend-data.hh (internal header only) */ + +#ifndef HB_NO_SUBSET_DEPEND + +/** + * hb_subset_depend_t: + * + * Data type for holding glyph dependency graphs. + * + * Highly experimental API. Subject to change. + * + * Since: 14.3.0 + */ +typedef struct hb_subset_depend_t hb_subset_depend_t; + +/** + * hb_subset_depend_entry_t: + * @table_tag: Source table (e.g. GSUB, glyf, CFF, COLR, MATH). + * @dependent: Target glyph ID. + * @layout_tag: Feature tag for GSUB edges; 0 otherwise. + * @ligature_set_index: Index into the sets array for ligature component + * glyphs, or #HB_CODEPOINT_INVALID if not a ligature edge. + * @context_set_index: Index into the sets array for context requirement + * glyphs, or #HB_CODEPOINT_INVALID if none. Use hb_subset_depend_lookup_set() + * to retrieve the set. + * @flags: Edge flags (#hb_subset_depend_edge_flags_t). + * + * A single dependency edge returned by hb_subset_depend_lookup_glyph(). + * + * Since: 14.3.0 + */ +typedef struct { + hb_tag_t table_tag; + hb_codepoint_t dependent; + hb_tag_t layout_tag; + hb_codepoint_t ligature_set_index; + hb_codepoint_t context_set_index; + hb_subset_depend_edge_flags_t flags; +} hb_subset_depend_entry_t; + +HB_EXTERN hb_subset_depend_t * +hb_subset_depend_from_face_or_fail (hb_face_t *face); + +HB_EXTERN unsigned int +hb_subset_depend_lookup_glyph (hb_subset_depend_t *depend, + hb_codepoint_t gid, + unsigned int start_offset, + unsigned int *entry_count, /* IN/OUT */ + hb_subset_depend_entry_t *entries /* OUT */); + +HB_EXTERN hb_bool_t +hb_subset_depend_lookup_set (hb_subset_depend_t *depend, + hb_codepoint_t index, + hb_set_t *out /* OUT */); + +HB_EXTERN void +hb_subset_depend_destroy (hb_subset_depend_t *depend); + +#endif + +HB_END_DECLS + +#endif /* HB_SUBSET_DEPEND_H */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc index 5de29081cc1b..47d8e63ab346 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc @@ -128,6 +128,7 @@ hb_subset_input_t::hb_subset_input_t () HB_TAG ('v', 'c', 'h', 'w'), HB_TAG ('h', 'a', 'l', 't'), HB_TAG ('v', 'h', 'a', 'l'), + HB_TAG ('p', 'a', 'l', 't'), //private HB_TAG ('H', 'a', 'r', 'f'), @@ -425,8 +426,7 @@ hb_subset_input_keep_everything (hb_subset_input_t *input) * * Pin all axes to default locations in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * @@ -466,8 +466,7 @@ hb_subset_input_pin_all_axes_to_default (hb_subset_input_t *input, * * Pin an axis to its default location in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * @@ -495,8 +494,7 @@ hb_subset_input_pin_axis_to_default (hb_subset_input_t *input, * * Pin an axis to a fixed location in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * @@ -665,7 +663,8 @@ hb_subset_axis_range_from_string (const char *str, int len, } double v; - if (!hb_parse_double (&str, part, &v)) return false; + const char *piece_end = part ? part : end; + if (!hb_parse_double (&str, piece_end, &v)) return false; values[i] = v; if (part == NULL) break; @@ -736,6 +735,374 @@ hb_subset_axis_range_to_string (hb_subset_input_t *input, } #endif +#ifdef HB_EXPERIMENTAL_API +static void +_append_arg (hb_vector_t &sb, const char *arg) +{ + if (sb.in_error ()) return; + if (sb.length) + sb.push (' '); + unsigned len = strlen (arg); + sb.extend (hb_bytes_t (arg, len)); +} +static void +_format_number_set (const hb_set_t *set, hb_vector_t &out, unsigned base = 10) +{ + assert (base == 10 || base == 16); + if (unlikely (base != 10 && base != 16)) return; + + hb_codepoint_t first = HB_SET_VALUE_INVALID, last = HB_SET_VALUE_INVALID; + bool first_range = true; + while (hb_set_next_range (set, &first, &last)) + { + if (!first_range) + out.push (','); + first_range = false; + + char buf[64]; + int len; + if (first == last) + { + if (base == 16) + len = snprintf (buf, sizeof (buf), "%X", first); + else + len = snprintf (buf, sizeof (buf), "%u", first); + } + else + { + if (base == 16) + len = snprintf (buf, sizeof (buf), "%X-%X", first, last); + else + len = snprintf (buf, sizeof (buf), "%u-%u", first, last); + } + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return; + out.extend (hb_bytes_t (buf, len)); + } +} + +static void +_format_tag (hb_tag_t tag, hb_vector_t &out) +{ + char buf[4]; + hb_tag_to_string (tag, buf); + + unsigned len = 4; + while (len > 0 && buf[len - 1] == ' ') + len--; + + for (unsigned i = 0; i < len; i++) + { + char c = buf[i]; + if (!((c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') || + (c >= '0' && c <= '9') || + c == '-' || c == '_')) + { + c = '_'; + } + out.push (c); + } +} + +static void +_format_tag_set (const hb_set_t *set, hb_vector_t &out) +{ + bool first_tag = true; + for (hb_codepoint_t tag : *set) + { + if (!first_tag) + out.push (','); + first_tag = false; + + _format_tag (tag, out); + } +} + +static bool +_is_set_default (const hb_set_t *set, const hb_set_t *default_set) +{ + return hb_set_is_inverted (set) == hb_set_is_inverted (default_set) && + hb_set_is_equal (set, default_set); +} + +template +static void +_format_set_arg (const hb_set_t *set, + const char *opt_name, + Formatter &&formatter, + hb_vector_t &sb) +{ + if (hb_set_is_inverted (set)) + { + hb_set_t *excluded = hb_set_copy (set); + hb_set_invert (excluded); + + hb_vector_t opt; + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("=*", 2)); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + + if (!hb_set_is_empty (excluded)) + { + hb_vector_t formatted; + formatter (excluded, formatted); + if (formatted.length) + { + hb_vector_t opt2; + opt2.extend (hb_bytes_t ("--", 2)); + opt2.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt2.extend (hb_bytes_t ("-=", 2)); + opt2.extend (formatted.as_array ()); + opt2.push ('\0'); + if (opt2.arrayZ) _append_arg (sb, opt2.arrayZ); + } + } + hb_set_destroy (excluded); + } + else if (hb_set_is_empty (set)) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("-=*", 3)); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + else + { + hb_vector_t formatted; + formatter (set, formatted); + if (formatted.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("=", 1)); + opt.extend (formatted.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + } +} + +static void +_format_number_set_arg (const hb_set_t *set, + const char *opt_name, + hb_vector_t &sb, + unsigned base = 10) +{ + _format_set_arg (set, opt_name, [base] (const hb_set_t *s, hb_vector_t &out) { + _format_number_set (s, out, base); + }, sb); +} + +static void +_format_tag_set_arg (const hb_set_t *set, + const char *opt_name, + hb_vector_t &sb) +{ + _format_set_arg (set, opt_name, _format_tag_set, sb); +} + +static bool +_format_glyph_map_arg (const hb_map_t &glyph_map, + hb_vector_t &sb) +{ + if (glyph_map.is_empty ()) + return true; + + hb_set_t keys; + hb_map_keys (&glyph_map, &keys); + hb_vector_t pairs; + bool first = true; + for (hb_codepoint_t key : keys) + { + if (!first) + pairs.push (','); + first = false; + hb_codepoint_t val = hb_map_get (&glyph_map, key); + char buf[64]; + int len = snprintf (buf, sizeof (buf), "%u:%u", key, val); + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return false; + pairs.extend (hb_bytes_t (buf, len)); + } + if (pairs.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--gid-map=", 10)); + opt.extend (pairs.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + return true; +} + +static bool +_format_axes_location_arg (const hb_hashmap_t &axes_location, + hb_vector_t &sb) +{ + if (axes_location.is_empty ()) + return true; + + hb_vector_t axis_tags; + for (auto tag : axes_location.keys ()) + axis_tags.push (tag); + axis_tags.qsort ([] (const hb_tag_t &a, const hb_tag_t &b) { return a < b ? -1 : a > b ? 1 : 0; }); + + hb_vector_t specs; + bool first = true; + for (hb_tag_t tag : axis_tags) + { + Triple triple = axes_location.get (tag); + if (!first) + specs.push (','); + first = false; + + hb_vector_t tag_buf; + _format_tag (tag, tag_buf); + + char buf[128]; + int len; + if (triple.minimum == triple.middle && triple.middle == triple.maximum) + { + len = snprintf (buf, sizeof (buf), "%.*s=%g", (int) tag_buf.length, tag_buf.arrayZ, (double) triple.middle); + } + else if (std::isnan (triple.minimum) && std::isnan (triple.middle) && std::isnan (triple.maximum)) + { + len = snprintf (buf, sizeof (buf), "%.*s=drop", (int) tag_buf.length, tag_buf.arrayZ); + } + else + { + len = snprintf (buf, sizeof (buf), "%.*s=%g:%g:%g", (int) tag_buf.length, tag_buf.arrayZ, + (double) triple.minimum, (double) triple.middle, (double) triple.maximum); + } + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return false; + specs.extend (hb_bytes_t (buf, len)); + } + if (specs.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--variations=", 13)); + opt.extend (specs.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + return true; +} + +/** + * hb_subset_input_to_string_or_fail: + * @input: a #hb_subset_input_t object. + * + * Produces a command line string representation of the given subset input + * suitable for use with the `hb-subset` command line tool. + * + * Return value: (transfer full): A new #hb_blob_t containing the command line + * string, or `NULL` if failed. Destroy with hb_blob_destroy(). + * + * XSince: EXPERIMENTAL + **/ +hb_blob_t * +hb_subset_input_to_string_or_fail (hb_subset_input_t *input) +{ + if (unlikely (!input || input->in_error ())) + return nullptr; + + hb_vector_t sb; + + struct flag_option_t { + hb_subset_flags_t flag; + char option[32]; + }; + static const flag_option_t flag_options[] = { + { HB_SUBSET_FLAGS_NO_HINTING, "no-hinting" }, + { HB_SUBSET_FLAGS_RETAIN_GIDS, "retain-gids" }, + { HB_SUBSET_FLAGS_DESUBROUTINIZE, "desubroutinize" }, + { HB_SUBSET_FLAGS_NAME_LEGACY, "name-legacy" }, + { HB_SUBSET_FLAGS_SET_OVERLAPS_FLAG, "set-overlaps-flag" }, + { HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED, "passthrough-tables" }, + { HB_SUBSET_FLAGS_NOTDEF_OUTLINE, "notdef-outline" }, + { HB_SUBSET_FLAGS_GLYPH_NAMES, "glyph-names" }, + { HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES, "no-prune-unicode-ranges" }, + { HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE, "no-layout-closure" }, + { HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS, "optimize" }, + { HB_SUBSET_FLAGS_NO_BIDI_CLOSURE, "no-bidi-closure" }, +#ifdef HB_EXPERIMENTAL_API + { HB_SUBSET_FLAGS_IFTB_REQUIREMENTS, "iftb-requirements" }, + { HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS, "retain-num-glyphs" }, +#endif + { HB_SUBSET_FLAGS_DOWNGRADE_CFF2, "downgrade-cff2" }, + }; + +#ifdef HB_EXPERIMENTAL_API + static_assert (sizeof (flag_options) / sizeof (flag_options[0]) == 15, + "Check all flags in hb_subset_flags_t are handled here."); +#else + static_assert (sizeof (flag_options) / sizeof (flag_options[0]) == 13, + "Check all flags in hb_subset_flags_t are handled here."); +#endif + + for (const auto &fo : flag_options) + { + if (input->flags & fo.flag) + { + char buf[36]; + snprintf (buf, sizeof (buf), "--%s", fo.option); + _append_arg (sb, buf); + } + } + + hb_subset_input_t *default_input = hb_subset_input_create_or_fail (); + if (unlikely (!default_input)) + return nullptr; + + // Serialize all sets if they are not equal to their default setting: +#define PROCESS_NUMBER_SET(field, opt_name, ...) \ + if (!_is_set_default (input->sets.field, default_input->sets.field)) \ + _format_number_set_arg (input->sets.field, opt_name, sb, ##__VA_ARGS__) + +#define PROCESS_TAG_SET(field, opt_name) \ + if (!_is_set_default (input->sets.field, default_input->sets.field)) \ + _format_tag_set_arg (input->sets.field, opt_name, sb) + + PROCESS_NUMBER_SET (unicodes, "unicodes", 16); + PROCESS_NUMBER_SET (glyphs, "gids"); + PROCESS_NUMBER_SET (name_ids, "name-IDs"); + PROCESS_NUMBER_SET (name_languages, "name-languages"); + PROCESS_TAG_SET (layout_features, "layout-features"); + PROCESS_TAG_SET (layout_scripts, "layout-scripts"); + PROCESS_TAG_SET (drop_tables, "drop-tables"); + PROCESS_TAG_SET (no_subset_tables, "passthrough-tables"); + +#undef PROCESS_NUMBER_SET +#undef PROCESS_TAG_SET + + hb_subset_input_destroy (default_input); + + static_assert (sizeof (input->sets) / sizeof (hb_set_t*) == 8, + "Check all sets in hb_subset_input_t::sets_t are handled here."); + + if (unlikely (!_format_glyph_map_arg (input->glyph_map, sb))) + return nullptr; + + if (unlikely (!_format_axes_location_arg (input->axes_location, sb))) + return nullptr; + + sb.push ('\0'); + if (unlikely (sb.in_error ())) + return nullptr; + + unsigned len = 0; + char *buf = sb.steal (&len); + if (unlikely (!buf)) + return nullptr; + + return hb_blob_create_or_fail (buf, len, HB_MEMORY_MODE_WRITABLE, buf, hb_free); +} +#endif + /** * hb_subset_preprocess: * @source: a #hb_face_t object. diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc index 78aab09c6514..e430f255fea7 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc @@ -32,28 +32,28 @@ * This should be safe. */ -constexpr static double EPSILON = 1.0 / (1 << 14); -constexpr static double MAX_F2DOT14 = double (0x7FFF) / (1 << 14); +constexpr static float EPSILON = 1.f / (1 << 14); +constexpr static float MAX_F2DOT14 = float (0x7FFF) / (1 << 14); static inline Triple _reverse_negate(const Triple &v) { return {-v.maximum, -v.middle, -v.minimum}; } -static inline double supportScalar (double coord, const Triple &tent) +static inline float supportScalar (float coord, const Triple &tent) { /* Copied from VarRegionAxis::evaluate() */ - double start = tent.minimum, peak = tent.middle, end = tent.maximum; + float start = tent.minimum, peak = tent.middle, end = tent.maximum; if (unlikely (start > peak || peak > end)) - return 1.; + return 1.f; if (unlikely (start < 0 && end > 0 && peak != 0)) - return 1.; + return 1.f; if (peak == 0 || coord == peak) - return 1.; + return 1.f; if (coord <= start || end <= coord) - return 0.; + return 0.f; /* Interpolate */ if (coord < peak) @@ -66,12 +66,12 @@ static inline void _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative = false) { out.reset(); - double axisMin = axisLimit.minimum; - double axisDef = axisLimit.middle; - double axisMax = axisLimit.maximum; - double lower = tent.minimum; - double peak = tent.middle; - double upper = tent.maximum; + float axisMin = axisLimit.minimum; + float axisDef = axisLimit.middle; + float axisMax = axisLimit.maximum; + float lower = tent.minimum; + float peak = tent.middle; + float upper = tent.maximum; // Mirror the problem such that axisDef <= peak if (axisDef > peak) @@ -129,7 +129,7 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative */ if (axisMax < peak) { - double mult = supportScalar (axisMax, tent); + float mult = supportScalar (axisMax, tent); tent = Triple{lower, axisMax, axisMax}; _solve (tent, axisLimit, out); @@ -142,13 +142,13 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative // lower <= axisDef <= peak <= axisMax - double gain = supportScalar (axisDef, tent); + float gain = supportScalar (axisDef, tent); out.push(hb_pair (gain, Triple{})); // First, the positive side // outGain is the scalar of axisMax at the tent. - double outGain = supportScalar (axisMax, tent); + float outGain = supportScalar (axisMax, tent); /* Case 3a: Gain is more than outGain. The tent down-slope crosses * the axis into negative. We have to split it into multiples. @@ -172,10 +172,10 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative // Note that this is the branch taken if both gain and outGain are 0. // Crossing point on the axis. - double crossing = peak + (1 - gain) * (upper - peak); + float crossing = peak + (1 - gain) * (upper - peak); Triple loc{hb_max (lower, axisDef), peak, crossing}; - double scalar = 1.0; + float scalar = 1.f; // The part before the crossing point. out.push (hb_pair (scalar - gain, loc)); @@ -190,7 +190,7 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative if (upper >= axisMax) { Triple loc {crossing, axisMax, axisMax}; - double scalar = outGain; + float scalar = outGain; out.push (hb_pair (scalar - gain, loc)); } @@ -220,11 +220,11 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative // Downslope. Triple loc1 {crossing, upper, axisMax}; - double scalar1 = 0.0; + float scalar1 = 0.f; // Eternity justify. Triple loc2 {upper, axisMax, axisMax}; - double scalar2 = 0.0; + float scalar2 = 0.f; out.push (hb_pair (scalar1 - gain, loc1)); out.push (hb_pair (scalar2 - gain, loc2)); @@ -253,7 +253,7 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative * | | newUpper * axisDef axisMax */ - double newUpper = peak + (1 - gain) * (upper - peak); + float newUpper = peak + (1 - gain) * (upper - peak); assert (axisMax <= newUpper); // Because outGain > gain /* Disabled because ots doesn't like us: * https://github.com/fonttools/fonttools/issues/3350 */ @@ -269,7 +269,7 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative } Triple loc {hb_max (axisDef, lower), peak, upper}; - double scalar = 1.0; + float scalar = 1.f; out.push (hb_pair (scalar - gain, loc)); } @@ -293,10 +293,10 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative else { Triple loc1 {hb_max (axisDef, lower), peak, axisMax}; - double scalar1 = 1.0; + float scalar1 = 1.f; Triple loc2 {peak, axisMax, axisMax}; - double scalar2 = outGain; + float scalar2 = outGain; out.push (hb_pair (scalar1 - gain, loc1)); // Don't add a dirac delta! @@ -324,7 +324,7 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative if (lower <= axisMin) { Triple loc {axisMin, axisMin, axisDef}; - double scalar = supportScalar (axisMin, tent); + float scalar = supportScalar (axisMin, tent); out.push (hb_pair (scalar - gain, loc)); } @@ -352,11 +352,11 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative // Downslope. Triple loc1 {axisMin, lower, axisDef}; - double scalar1 = 0.0; + float scalar1 = 0.f; // Eternity justify. Triple loc2 {axisMin, axisMin, lower}; - double scalar2 = 0.0; + float scalar2 = 0.f; out.push (hb_pair (scalar1 - gain, loc1)); out.push (hb_pair (scalar2 - gain, loc2)); @@ -366,48 +366,48 @@ _solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative static inline TripleDistances _reverse_triple_distances (const TripleDistances &v) { return TripleDistances (v.positive, v.negative); } -double renormalizeValue (double v, const Triple &triple, +float renormalizeValue (float v, const Triple &triple, const TripleDistances &triple_distances, bool extrapolate) { - double lower = triple.minimum, def = triple.middle, upper = triple.maximum; + float lower = triple.minimum, def = triple.middle, upper = triple.maximum; if (unlikely (!(lower <= def && def <= upper))) - return hb_clamp (v, -1.0, +1.0); + return hb_clamp (v, -1.f, +1.f); if (!extrapolate) v = hb_clamp (v, lower, upper); if (v == def) - return 0.0; + return 0.f; - if (def < 0.0) + if (def < 0.f) return -renormalizeValue (-v, _reverse_negate (triple), _reverse_triple_distances (triple_distances), extrapolate); /* default >= 0 and v != default */ if (v > def) { - double positive_range = upper - def; + float positive_range = upper - def; if (unlikely (!positive_range)) - return +1.0; + return +1.f; return (v - def) / positive_range; } /* v < def */ - if (lower >= 0.0) + if (lower >= 0.f) { - double negative_range = def - lower; + float negative_range = def - lower; if (unlikely (!negative_range)) - return -1.0; + return -1.f; return (v - def) / negative_range; } /* lower < 0 and v < default */ - double total_distance = triple_distances.negative * (-lower) + triple_distances.positive * def; + float total_distance = triple_distances.negative * (-lower) + triple_distances.positive * def; if (unlikely (!total_distance)) - return 0.0; + return 0.f; - double v_distance; - if (v >= 0.0) + float v_distance; + if (v >= 0.f) v_distance = (def - v) * triple_distances.positive; else v_distance = (-v) * triple_distances.negative + triple_distances.positive * def; @@ -420,15 +420,15 @@ rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distance rebase_tent_result_t &out, rebase_tent_result_t &scratch) { - if (unlikely (!(-1.0 <= axisLimit.minimum && + if (unlikely (!(-1.f <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && - axisLimit.maximum <= +1.0) || - !(-2.0 <= tent.minimum && + axisLimit.maximum <= +1.f) || + !(-2.f <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && - tent.maximum <= +2.0) || - tent.middle == 0.0)) + tent.maximum <= +2.f) || + tent.middle == 0.f)) { out.reset (); return; @@ -437,7 +437,7 @@ rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distance rebase_tent_result_t &sols = scratch; _solve (tent, axisLimit, sols); - auto n = [&axisLimit, &axis_triple_distances] (double v) { return renormalizeValue (v, axisLimit, axis_triple_distances); }; + auto n = [&axisLimit, &axis_triple_distances] (float v) { return renormalizeValue (v, axisLimit, axis_triple_distances); }; out.reset(); for (auto &p : sols) diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh index 574d58d53d87..6ea13ca156e2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh @@ -30,23 +30,23 @@ /* pre-normalized distances */ struct TripleDistances { - TripleDistances (): negative (1.0), positive (1.0) {} - TripleDistances (double neg_, double pos_): negative (neg_), positive (pos_) {} - TripleDistances (double min, double default_, double max) + TripleDistances (): negative (1.f), positive (1.f) {} + TripleDistances (float neg_, float pos_): negative (neg_), positive (pos_) {} + TripleDistances (float min, float default_, float max) { negative = default_ - min; positive = max - default_; } - double negative; - double positive; + float negative; + float positive; }; struct Triple { Triple () = default; - Triple (double minimum_, double middle_, double maximum_) : + Triple (float minimum_, float middle_, float maximum_) : minimum (minimum_), middle (middle_), maximum (maximum_) {} bool operator == (const Triple &o) const @@ -62,7 +62,7 @@ struct Triple bool is_point () const { return minimum == middle && middle == maximum; } - bool contains (double point) const + bool contains (float point) const { return minimum <= point && point <= maximum; } /* from hb_array_t hash ()*/ @@ -80,18 +80,18 @@ struct Triple return current; } - double minimum = 0; - double middle = 0; - double maximum = 0; + float minimum = 0; + float middle = 0; + float maximum = 0; }; -using rebase_tent_result_item_t = hb_pair_t; +using rebase_tent_result_item_t = hb_pair_t; using rebase_tent_result_t = hb_vector_t; /* renormalize a normalized value v to the range of an axis, * considering the prenormalized distances as well as the new axis limits. * Ported from fonttools */ -HB_INTERNAL double renormalizeValue (double v, const Triple &triple, +HB_INTERNAL float renormalizeValue (float v, const Triple &triple, const TripleDistances &triple_distances, bool extrapolate = true); /* Given a tuple (lower,peak,upper) "tent" and new axis limits diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh index 398fe81eca93..dab9fac5f334 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh @@ -61,10 +61,17 @@ HB_SUBSET_PLAN_MEMBER (hb_set_t, drop_tables) // Old -> New glyph id mapping HB_SUBSET_PLAN_MEMBER (hb_map_t, glyph_map_gsub) +// Same mapping as glyph_map_gsub, as a flat array indexed by old gid, +// with HB_MAP_VALUE_INVALID entries for glyphs not retained. Sized to +// the highest retained GSUB gid plus one. +HB_SUBSET_PLAN_MEMBER (hb_vector_t, glyph_map_gsub_flat) + HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_gsub) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_mathed) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_colred) +HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_varced) +HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_cmaped) //active lookups we'd like to retain HB_SUBSET_PLAN_MEMBER (hb_map_t, gsub_lookups) @@ -94,12 +101,16 @@ HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(>), gpo HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), gsub_feature_substitutes_map) HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), gpos_feature_substitutes_map) +//feature index->resolved lookup set mapping for fully-instanced lookup variations +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(>), gsub_lookup_variations) +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(>), gpos_lookup_variations) + // old feature_indexes set, used to reinstate the old features HB_SUBSET_PLAN_MEMBER (hb_set_t, gsub_old_features) HB_SUBSET_PLAN_MEMBER (hb_set_t, gpos_old_features) -//feature_index->pair of (address of old feature, feature tag), used for inserting a catch all record -//if necessary +//feature_index->pair of (address of old feature, feature tag), used for alternate feature +//parameter formats and inserting a catch all record if necessary HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E()>), gsub_old_feature_idx_tag_map) HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E()>), gpos_old_feature_idx_tag_map) @@ -116,6 +127,11 @@ HB_SUBSET_PLAN_MEMBER (hb_map_t, colrv1_new_deltaset_idx_varidx_map) //Old layout item variation index -> (New varidx, delta) mapping HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E()>), layout_variation_idx_delta_map) +//Layout condition -> (source variation index, default value) +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E()>), layout_condition_values) +//Layout condition -> (private variation index, rescaled default value) +HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E()>), layout_condition_idx_value_map) + //gdef varstore retained varidx mapping HB_SUBSET_PLAN_MEMBER (hb_vector_t, gdef_varstore_inner_maps) @@ -133,6 +149,20 @@ HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), axes_triple_ //retained old axis index -> new axis index mapping in fvar axis array HB_SUBSET_PLAN_MEMBER (hb_map_t, axes_index_map) +//old intermediate coords (post-fvar, post-avar-v1, pre-avar-v2) at new min/default/max +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), old_intermediates) + +//avar2: reachable old-space final-coord range per axis, as Triple +//(minimum, unused middle, maximum), F2Dot14-quantized. Only axes with a +//constraining range (narrower than [-1, +1]) have entries. Used to cull +//variation tuples/regions that a partial instance can never reach. +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), avar2_reachable_ranges) + +//avar2: self-contained pinned axes -> constant old-space final coord. +//These axes are removed from fvar/avar entirely; their contribution is +//baked into the variation tables like an ordinary pin at that coord. +HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(), avar2_self_contained) + //axis_index->axis_tag mapping in fvar axis array HB_SUBSET_PLAN_MEMBER (hb_map_t, axes_old_index_tag_map) //vector of retained axis tags in the order of axes given in the 'fvar' table diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc index 8c3fd97899b4..77479861ffb6 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc @@ -41,6 +41,7 @@ #include "OT/Color/COLR/colrv1-closure.hh" #include "OT/Color/CPAL/CPAL.hh" #include "hb-ot-var-fvar-table.hh" +#include "hb-ot-var-varc-table.hh" #include "hb-ot-stat-table.hh" #include "hb-ot-math-table.hh" @@ -104,8 +105,8 @@ _cmap_closure (hb_face_t *face, const hb_set_t *unicodes, hb_set_t *glyphset) { - OT::cmap::accelerator_t cmap (face); - cmap.table->closure_glyphs (unicodes, glyphset); + OT::cmap_accelerator_t cmap (face); + cmap.closure_glyphs (unicodes, glyphset); } static void _colr_closure (hb_subset_plan_t* plan, @@ -131,13 +132,6 @@ static void _colr_closure (hb_subset_plan_t* plan, _remap_palette_indexes (&palette_indices, &plan->colr_palettes); #ifndef HB_NO_VAR - if (!colr.has_var_store () || !variation_indices) return; - - const OT::ItemVariationStore &var_store = colr.get_var_store (); - // generated inner_maps is used by ItemVariationStore serialize(), which is subset only - unsigned subtable_count = var_store.get_sub_table_count (); - generate_varstore_inner_maps (variation_indices, subtable_count, plan->colrv1_varstore_inner_maps); - /* colr variation indices mapping during planning phase: * generate colrv1_variation_idx_delta_map. When delta set index map is not * included, it's a mapping from varIdx-> (new varIdx,delta). Otherwise, it's @@ -146,21 +140,29 @@ static void _colr_closure (hb_subset_plan_t* plan, * Besides, we need to generate a delta set idx-> new var_idx map for updating * delta set index map if exists. This map will be updated again after * instancing. */ - if (!plan->all_axes_pinned) + if (colr.has_var_store () && variation_indices) { - remap_variation_indices (var_store, + const OT::ItemVariationStore &var_store = colr.get_var_store (); + // generated inner_maps is used by ItemVariationStore serialize(), which is subset only + unsigned subtable_count = var_store.get_sub_table_count (); + generate_varstore_inner_maps (variation_indices, subtable_count, plan->colrv1_varstore_inner_maps); + + if (!plan->all_axes_pinned) + remap_variation_indices (var_store, variation_indices, plan->normalized_coords, false, /* no need to calculate delta for COLR during planning */ plan->all_axes_pinned, plan->colrv1_variation_idx_delta_map); - - if (colr.has_delta_set_index_map ()) - remap_colrv1_delta_set_index_indices (colr.get_delta_set_index_map (), - delta_set_indices, - plan->colrv1_variation_idx_delta_map, - plan->colrv1_new_deltaset_idx_varidx_map); } + + /* Sentinel-only maps still need their delta-set indices remapped, even + * when there are no live variation rows or no variation store. */ + if (!plan->all_axes_pinned && colr.has_delta_set_index_map ()) + remap_colrv1_delta_set_index_indices (colr.get_delta_set_index_map (), + delta_set_indices, + plan->colrv1_variation_idx_delta_map, + plan->colrv1_new_deltaset_idx_varidx_map); #endif } @@ -247,7 +249,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes_in, hb_set_t unicodes = _unicode_closure(unicodes_in, !(plan->flags & HB_SUBSET_FLAGS_NO_BIDI_CLOSURE)); - OT::cmap::accelerator_t cmap (plan->source); + OT::cmap_accelerator_t cmap (plan->source); unsigned size_threshold = plan->source->get_num_glyphs (); if (glyphs->is_empty () && unicodes.get_population () < size_threshold) @@ -405,7 +407,7 @@ _glyf_add_gid_and_children (const OT::glyf_accelerator_t &glyf, for (auto &item : glyph.get_composite_iterator ()) operation_count = _glyf_add_gid_and_children (glyf, - item.get_gid (), + item.get_gid (glyph.is_extended ()), gids_to_retain, operation_count, depth); @@ -451,6 +453,14 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, plan->_glyphset_gsub.add (0); // Not-def _cmap_closure (plan->source, &plan->unicodes, &plan->_glyphset_gsub); + plan->_glyphset_cmaped = plan->_glyphset_gsub; + + if (!drop_tables->has (HB_OT_TAG_MATH)) + { + _math_closure (plan, &plan->_glyphset_gsub); + _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ()); + } + plan->_glyphset_mathed = plan->_glyphset_gsub; #ifndef HB_NO_SUBSET_LAYOUT layout_populate_gids_to_retain(plan, drop_tables); @@ -458,14 +468,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ()); - plan->_glyphset_mathed = plan->_glyphset_gsub; - if (!drop_tables->has (HB_OT_TAG_MATH)) - { - _math_closure (plan, &plan->_glyphset_mathed); - _remove_invalid_gids (&plan->_glyphset_mathed, plan->source->get_num_glyphs ()); - } - - hb_set_t cur_glyphset = plan->_glyphset_mathed; + hb_set_t cur_glyphset = plan->_glyphset_gsub; if (!drop_tables->has (HB_OT_TAG_COLR)) { _colr_closure (plan, &cur_glyphset); @@ -474,7 +477,19 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, plan->_glyphset_colred = cur_glyphset; - // XXX TODO VARC closure / subset +#ifndef HB_NO_VAR_COMPOSITES + if (!drop_tables->has (OT::VARC::tableTag)) + { + if (unlikely (!plan->source->table.VARC->closure_glyphs (&cur_glyphset))) + { + plan->check_success (false); + return; + } + _remove_invalid_gids (&cur_glyphset, plan->source->get_num_glyphs ()); + } +#endif + + plan->_glyphset_varced = cur_glyphset; _nameid_closure (plan, drop_tables); /* Populate a full set of glyphs to retain by adding all referenced @@ -507,18 +522,30 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, #endif } -static void +static bool _create_glyph_map_gsub (const hb_set_t* glyph_set_gsub, const hb_map_t* glyph_map, - hb_map_t* out) + hb_map_t* out, + hb_vector_t* out_flat) { + if (unlikely (glyph_set_gsub->in_error ())) + return false; + + hb_codepoint_t max_gid = HB_SET_VALUE_INVALID; + hb_set_previous (glyph_set_gsub, &max_gid); + unsigned flat_size = max_gid == HB_SET_VALUE_INVALID ? 0 : max_gid + 1; + if (unlikely (!out_flat->resize_dirty (flat_size))) + return false; + hb_memset (out_flat->arrayZ, 0xFF, flat_size * sizeof (hb_codepoint_t)); + out->alloc (glyph_set_gsub->get_population ()); - + hb_iter (glyph_set_gsub) - | hb_map ([&] (hb_codepoint_t gid) { - return hb_codepoint_pair_t (gid, glyph_map->get (gid)); - }) - | hb_sink (out) - ; + for (auto gid : *glyph_set_gsub) + { + hb_codepoint_t new_gid = glyph_map->get (gid); + out->set (gid, new_gid); + out_flat->arrayZ[gid] = new_gid; + } + return !out->in_error (); } static bool @@ -647,6 +674,7 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, all_axes_pinned = false; pinned_at_default = true; has_gdef_varstore = false; + has_avar2 = false; #ifdef HB_EXPERIMENTAL_API for (auto _ : input->name_table_overrides) @@ -676,10 +704,31 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, if (unlikely (in_error ())) return; +#ifndef HB_NO_VAR_COMPOSITES + if (!input->sets.drop_tables->has (OT::VARC::tableTag) && + input->sets.no_subset_tables->has (OT::VARC::tableTag) && + !(input->flags & HB_SUBSET_FLAGS_RETAIN_GIDS) && + face->table.VARC->has_data ()) + { + check_success (false); + return; + } +#endif + #ifndef HB_NO_VAR if (!check_success (normalize_axes_location (face, this))) return; #endif +#ifndef HB_NO_VAR_COMPOSITES + if (!user_axes_location.is_empty () && + !input->sets.drop_tables->has (OT::VARC::tableTag) && + input->sets.no_subset_tables->has (OT::VARC::tableTag) && + face->table.VARC->has_data ()) + { + check_success (false); + return; + } +#endif _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, this); @@ -708,10 +757,12 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, } #endif - _create_glyph_map_gsub ( + if (!check_success (_create_glyph_map_gsub ( &_glyphset_gsub, glyph_map, - &glyph_map_gsub); + &glyph_map_gsub, + &glyph_map_gsub_flat))) + return; // Now that we have old to new gid map update the unicode to new gid list. for (unsigned i = 0; i < unicode_to_new_gid_list.length; i++) @@ -743,8 +794,10 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face, if (unlikely (in_error ())) return; -#ifndef HB_NO_VAR +#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_CFF) update_instance_metrics_map_from_cff2 (this); +#endif +#ifndef HB_NO_VAR if (!check_success (get_instance_glyphs_contour_points (this))) return; #endif diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh index 0362ed7292ef..82664de9b4cf 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh @@ -169,6 +169,9 @@ struct hb_subset_plan_t // whether GDEF ItemVariationStore is retained mutable bool has_gdef_varstore; + // whether we're doing avar2 partial instancing + bool has_avar2; + #define HB_SUBSET_PLAN_MEMBER(Type, Name) Type Name; #include "hb-subset-plan-member-list.hh" #undef HB_SUBSET_PLAN_MEMBER @@ -178,8 +181,8 @@ struct hb_subset_plan_t os2_info_t os2_info; - const hb_subset_accelerator_t* accelerator; - hb_subset_accelerator_t* inprogress_accelerator; + const hb_subset_accelerator_t* accelerator = nullptr; + hb_subset_accelerator_t* inprogress_accelerator = nullptr; public: @@ -212,6 +215,8 @@ struct hb_subset_plan_t bool in_error () const { return !successful; } + HB_INTERNAL double layout_variation_delta (unsigned var_idx); + bool check_success(bool success) { successful = (successful && success); @@ -238,6 +243,18 @@ struct hb_subset_plan_t return &_glyphset_gsub; } + /* + * Old-to-new glyph id mapping for GSUB glyphs, through the flat + * array; returns HB_MAP_VALUE_INVALID for glyphs not retained. + */ + inline hb_codepoint_t + map_gsub_glyph (hb_codepoint_t old_gid) const + { + return old_gid < glyph_map_gsub_flat.length + ? glyph_map_gsub_flat.arrayZ[old_gid] + : HB_MAP_VALUE_INVALID; + } + /* * The total number of output glyphs in the final subset. */ diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h b/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h index 9035d4ced7a1..a3ca3bfbae65 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h @@ -26,6 +26,11 @@ #ifndef HB_SUBSET_SERIALIZE_H #define HB_SUBSET_SERIALIZE_H +#if !defined(HB_SUBSET_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR) +// Disabled to not break pre-existing users. +//#error "Include instead." +#endif + #include "hb.h" HB_BEGIN_DECLS diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc index 51134ed09ce2..dc26b795901b 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc @@ -90,20 +90,38 @@ static hb_tag_t known_tables[] { HB_TAG('g','a','s','p'), HB_TAG('G','D','E','F'), HB_TAG('g','l','y','f'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('G','L','Y','F'), +#endif HB_TAG('G','P','O','S'), HB_TAG('G','S','U','B'), HB_TAG('g','v','a','r'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('G','V','A','R'), +#endif HB_TAG('h','d','m','x'), HB_TAG('h','e','a','d'), HB_TAG('h','h','e','a'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('H','H','E','A'), +#endif HB_TAG('h','m','t','x'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('H','M','T','X'), +#endif HB_TAG('H','V','A','R'), HB_TAG('J','S','T','F'), HB_TAG('k','e','r','n'), HB_TAG('l','o','c','a'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('L','O','C','A'), +#endif HB_TAG('L','T','S','H'), HB_TAG('M','A','T','H'), HB_TAG('m','a','x','p'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('M','A','X','P'), +#endif HB_TAG('M','E','R','G'), HB_TAG('m','e','t','a'), HB_TAG('M','V','A','R'), @@ -115,8 +133,15 @@ static hb_tag_t known_tables[] { HB_TAG('S','V','G',' '), HB_TAG('V','D','M','X'), HB_TAG('v','h','e','a'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('V','H','E','A'), +#endif HB_TAG('v','m','t','x'), +#ifndef HB_NO_BEYOND_64K + HB_TAG('V','M','T','X'), +#endif HB_TAG('V','O','R','G'), + HB_TAG('V','A','R','C'), HB_TAG('V','V','A','R'), HB_TAG('n','a','m','e'), HB_TAG('O','S','/','2') @@ -223,6 +248,9 @@ _should_drop_table (hb_subset_plan_t *plan, hb_tag_t tag) case HB_TAG('a','v','a','r'): case HB_TAG('f','v','a','r'): case HB_TAG('g','v','a','r'): +#ifndef HB_NO_BEYOND_64K + case HB_TAG('G','V','A','R'): +#endif case HB_TAG('H','V','A','R'): case HB_TAG('V','V','A','R'): case HB_TAG('M','V','A','R'): @@ -238,15 +266,38 @@ _dependencies_satisfied (hb_subset_plan_t *plan, hb_tag_t tag, const hb_set_t &subsetted_tags, const hb_set_t &pending_subset_tags) { + bool outline_pending = pending_subset_tags.has (HB_TAG('g','l','y','f')); +#ifndef HB_NO_BEYOND_64K + outline_pending |= pending_subset_tags.has (HB_TAG('G','L','Y','F')); +#endif + switch (tag) { case HB_TAG('h','m','t','x'): case HB_TAG('v','m','t','x'): case HB_TAG('m','a','x','p'): +#ifndef HB_NO_BEYOND_64K + case HB_TAG('H','M','T','X'): + case HB_TAG('V','M','T','X'): + case HB_TAG('M','A','X','P'): +#endif case HB_TAG('O','S','/','2'): - return !plan->normalized_coords || !pending_subset_tags.has (HB_TAG('g','l','y','f')); + return !plan->normalized_coords || !outline_pending; case HB_TAG('G','P','O','S'): + case HB_TAG('G','S','U','B'): return plan->all_axes_pinned || !pending_subset_tags.has (HB_TAG('G','D','E','F')); + /* For avar2, variation tables must wait for avar to be subsetted first. */ + case HB_TAG('g','v','a','r'): +#ifndef HB_NO_BEYOND_64K + case HB_TAG('G','V','A','R'): +#endif + case HB_TAG('c','v','a','r'): + case HB_TAG('H','V','A','R'): + case HB_TAG('V','V','A','R'): + case HB_TAG('M','V','A','R'): + case HB_TAG('G','D','E','F'): + case HB_TAG('C','F','F','2'): + return !plan->has_avar2 || !pending_subset_tags.has (HB_TAG('a','v','a','r')); default: return true; } @@ -275,9 +326,19 @@ _subset_table (hb_subset_plan_t *plan, switch (tag) { case HB_TAG('h','e','a','d'): - if (_is_table_present (plan->source, HB_TAG('g','l','y','f')) && !_should_drop_table (plan, HB_TAG('g','l','y','f'))) - return true; /* skip head, handled by glyf */ + { + bool outline_table_handles_head = + _is_table_present (plan->source, HB_TAG('g','l','y','f')) && + !_should_drop_table (plan, HB_TAG('g','l','y','f')); +#ifndef HB_NO_BEYOND_64K + outline_table_handles_head |= + _is_table_present (plan->source, HB_TAG('G','L','Y','F')) && + !_should_drop_table (plan, HB_TAG('G','L','Y','F')); +#endif + if (outline_table_handles_head) + return true; /* skip head, handled by the outline table */ return _hb_subset_table (plan, buf); + } case HB_TAG('S','T','A','T'): if (!plan->user_axes_location.is_empty ()) return _hb_subset_table (plan, buf); @@ -449,4 +510,4 @@ hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan) end: return success ? hb_face_reference (plan->dest) : nullptr; -} \ No newline at end of file +} diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.h b/src/java.desktop/share/native/libharfbuzz/hb-subset.h index edc13121825b..c94e47fbaf1b 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-subset.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.h @@ -26,9 +26,15 @@ #ifndef HB_SUBSET_H #define HB_SUBSET_H +#define HB_SUBSET_H_IN #include "hb.h" #include "hb-ot.h" +#include "hb-subset-serialize.h" +#include "hb-subset-depend.h" +#include "hb-subset-serialize.h" + +#undef HB_SUBSET_H_IN HB_BEGIN_DECLS @@ -84,9 +90,12 @@ typedef struct hb_subset_plan_t hb_subset_plan_t; * HB_SUBSET_FLAGS_RETAIN_GIDS then the number of glyphs in the font won't * be reduced as a result of subsetting. If necessary empty glyphs will be * included at the end of the font to keep the number of glyphs unchanged. - * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font, - * convert the output CFF2 table to CFF1. This enables compatibility with older - * renderers that don't support CFF2. Since: 13.0.0 + * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font + * with all axes pinned, convert the output CFF2 table to CFF1. This enables + * compatibility with older renderers that don't support CFF2. Since: 13.0.0 + * @HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET: If set and subsetting a CID-keyed CFF + * font, the output CFF charset will use sequential identity CIDs (CID = new + * GID) rather than preserving the original CIDs. Since: 14.3.0 * * List of boolean properties that can be configured on the subset input. * @@ -111,6 +120,7 @@ typedef enum { /*< flags >*/ HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS = 0x00002000u, #endif HB_SUBSET_FLAGS_DOWNGRADE_CFF2 = 0x00004000u, + HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET = 0x00008000u, } hb_subset_flags_t; /** @@ -228,6 +238,9 @@ hb_subset_axis_range_to_string (hb_subset_input_t *input, unsigned size); #ifdef HB_EXPERIMENTAL_API +HB_EXTERN hb_blob_t * +hb_subset_input_to_string_or_fail (hb_subset_input_t *input); + HB_EXTERN hb_bool_t hb_subset_input_override_name_table (hb_subset_input_t *input, hb_ot_name_id_t name_id, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh index d2d23cf59b83..4d4b2b5e86d2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh @@ -4,7 +4,7 @@ * * ./gen-ucd-table.py ucd.nounihan.grouped.xml hb-script-list.h * - * on file with this description: Unicode 17.0.0 + * on file with this description: Unicode 18.0.0 */ #ifndef HB_UCD_TABLE_HH @@ -14,7 +14,7 @@ #include -static const hb_script_t _hb_ucd_sc_map[176]= +static const hb_script_t _hb_ucd_sc_map[179]= { HB_SCRIPT_COMMON, HB_SCRIPT_INHERITED, HB_SCRIPT_UNKNOWN, HB_SCRIPT_ARABIC, @@ -104,6 +104,8 @@ static const hb_script_t _hb_ucd_sc_map[176]= HB_SCRIPT_TODHRI, HB_SCRIPT_TULU_TIGALARI, HB_SCRIPT_BERIA_ERFE, HB_SCRIPT_SIDETIC, HB_SCRIPT_TAI_YO, HB_SCRIPT_TOLONG_SIKI, + HB_SCRIPT_JURCHEN, HB_SCRIPT_PROTO_CUNEIFORM, + HB_SCRIPT_SEAL, }; static const uint16_t _hb_ucd_dm1_p0_map[825]= { @@ -763,7 +765,7 @@ static const uint64_t _hb_ucd_dm2_u64_map[408]= #include -static const uint8_t _hb_ucd_u8[19845]= +static const uint8_t _hb_ucd_u8[19991]= { 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 2, 2, 2, 2, 2, 2, @@ -774,27 +776,29 @@ static const uint8_t _hb_ucd_u8[19845]= 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 37, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 2, 58, 59, 0, 0, 0, 0, 60, 2, 2, 61, 2, 2, 2, 2, 2, - 2, 62, 2, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 0, 0, 0, 2, 65, 66, 67, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 69, 70, 71, 0, 0, 0, 0, 72, 0, - 0, 0, 0, 0, 0, 0, 73, 74, 75, 76, 77, 78, 4, 79, 0, 80, - 81, 82, 83, 84, 85, 0, 86, 87, 88, 89, 4, 90, 91, 92, 0, 0, + 2, 58, 59, 60, 0, 0, 0, 61, 2, 2, 62, 2, 2, 2, 2, 2, + 2, 63, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 65, 0, 0, 0, 2, 66, 67, 68, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 69, 2, 70, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 71, 72, 73, 0, 0, 0, 0, 74, 0, + 0, 0, 0, 0, 0, 0, 75, 76, 77, 78, 79, 80, 4, 81, 0, 82, + 83, 84, 85, 86, 87, 0, 88, 89, 90, 91, 4, 92, 93, 94, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 93, 2, 2, 2, 2, 2, 2, 2, 2, 94, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 95, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 96, 2, 97, 0, 0, 0, 0, 2, 98, 0, 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 99, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,100, 0, 0, 0, 0, 0, + 2, 2, 2, 95, 2, 2, 2, 2, 2, 2, 2, 2, 96, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 97, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 98, 2, 99, 0, 0, 0, 0, 2,100, 0, 0, + 2, 2, 2, 2, 2, 2, 2, 2, 2,101, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -875,9 +879,7 @@ static const uint8_t _hb_ucd_u8[19845]= 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -892,7 +894,7 @@ static const uint8_t _hb_ucd_u8[19845]= 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,102, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,105, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -904,590 +906,633 @@ static const uint8_t _hb_ucd_u8[19845]= 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, - 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, - 5, 5, 5, 5, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, - 11, 11, 11, 11, 11, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, - 13, 13, 13, 13, 13, 13, 13, 13, 16, 16, 16, 16, 16, 16, 16, 16, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 14, - 1, 1, 1, 1, 14, 1, 1, 1, 18, 18, 18, 18, 18, 18, 18, 18, - 1, 5, 0, 11, 11, 11, 11, 11, 1, 1, 1, 1, 1, 1, 14, 0, - 1, 1, 1, 1, 14, 0, 0, 0, 6, 6, 6, 6, 7, 7, 7, 7, - 1, 1, 1, 1, 1, 14, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 14, 0, 0, 0, 0, - 1, 1, 1, 14, 1, 1, 1, 14, 3, 3, 3, 3, 3, 3, 0, 0, - 28, 28, 28, 28, 28, 28, 28, 28, 11, 11, 11, 11, 11, 1, 1, 1, - 14, 17, 1, 1, 1, 1, 1, 1, 14, 0, 0, 0, 0, 0, 0, 0, - 14, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 0, 0, 0, - 3, 3, 3, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 29, 0, + 5, 5, 5, 5, 5, 5, 5, 5, 9, 9, 9, 9, 9, 9, 9, 9, + 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, + 12, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 0, 0, 0, + 10, 10, 10, 10, 10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, + 1, 1, 1, 1, 1, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 0, + 1, 1, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 15, 0, 0, 0, + 18, 18, 18, 18, 18, 18, 18, 18, 1, 1, 1, 1, 1, 15, 0, 0, + 1, 5, 0, 11, 11, 11, 11, 11, 1, 1, 1, 1, 1, 1, 15, 0, + 6, 6, 6, 6, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 15, 0, 0, 0, 0, + 1, 1, 1, 15, 1, 1, 1, 15, 28, 28, 28, 28, 28, 28, 28, 28, + 11, 11, 11, 11, 11, 1, 1, 1, 15, 17, 1, 1, 1, 1, 1, 1, + 15, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 29, 0, 1, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 6, 6, 6, 0, 0, 0, 11, 11, 11, 11, 11, 17, 1, 1, 1, 1, 1, 1, 1, - 11, 11, 11, 11, 11, 10, 10, 10, 1, 1, 1, 0, 0, 0, 0, 0, - 5, 46, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 41, 41, 41, 41, - 3, 3, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 0, 0, 12, - 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 49, 10, 10, 10, 10, 10, 10, 10, 7, 6, 6, 6, 6, 6, 6, 6, - 44, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, - 3, 3, 3, 3, 0, 0, 0, 0, 11, 11, 11, 11, 11, 12, 9, 77, - 88, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,102,103,104, - 89, 6, 6, 6, 6, 6, 6, 6, 22, 22, 22, 22, 22, 22, 22, 22, - 26, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 5, 5, 5, 5, 5, + 11, 11, 11, 11, 11, 10, 10, 10, 3, 3, 3, 3, 3, 0, 0, 0, + 5, 45, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 42, 42, 42, 42, + 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 29, + 11, 11, 11, 11, 11, 0, 0, 13, 1, 1, 0, 0, 0, 0, 0, 0, + 48, 10, 10, 10, 10, 10, 10, 10, 7, 6, 6, 6, 6, 6, 6, 6, + 54, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 13, 9, 77, 88, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7,104,105,106, 89, 6, 6, 6, 6, 6, 6, 6, + 22, 22, 22, 22, 22, 22, 22, 22, 27, 5, 5, 5, 5, 5, 5, 5, + 1, 1, 1, 5, 5, 5, 5, 5, 25, 0, 0, 0, 0, 0, 0, 0, 5, 20, 1, 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 1, 1, - 11, 11, 11, 11, 11, 12, 12, 12, 1, 1, 1, 1, 14, 1, 1, 0, - 14, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, - 10, 10, 10, 10, 10, 10, 51, 0,115, 1, 1, 1, 1, 1, 1, 1, - 5, 5, 5, 5, 5, 5, 5, 0, 1, 1, 1, 1, 13, 13, 13, 12, - 6, 6, 6, 0, 7, 7, 7, 0, 30, 30, 30, 30, 30, 30, 30, 30, - 3, 3, 3, 3, 3, 29, 0, 0, 3, 3, 3, 3, 3, 3, 3, 29, + 11, 11, 11, 11, 11, 13, 13, 13, 1, 1, 1, 1, 15, 1, 1, 0, + 15, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 15, 1, 1, 1, 1, + 10, 10, 10, 10, 10, 10, 51, 0,117, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 14, 14, 14, 13, 6, 6, 6, 0, 7, 7, 7, 0, + 30, 30, 30, 30, 30, 30, 30, 30, 3, 3, 3, 3, 3, 29, 0, 0, 10, 10, 10, 10, 10, 3, 3, 3, 75, 10, 10, 10, 10, 10, 10, 10, - 3, 3, 3, 29, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, + 3, 3, 3, 29, 0, 0, 0, 0, 6, 8, 8, 8, 8, 8, 8, 8, + 6, 6, 6, 46, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 7, 7, 7, 7, 7, 32, 7, 7, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 51, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 10, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 15, 19, - 1, 1, 1, 1, 1, 1, 1, 34, 1, 1, 1, 1, 1, 1, 1, 5, - 15, 15, 15, 15, 15, 15, 15, 15, 1, 14, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 23, 0, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, - 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, - 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, - 3, 3, 3, 3, 29, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 87, 12,100, 12, 27,101, 76, 12, 6, 6, 6, 6, 6,105,106,135, - 87, 30, 30, 66,107,136,137,108, 50, 10, 89, 12,138,139, 10, 78, - 7, 7, 7, 59, 7, 7, 7, 8, 6, 6, 6, 60, 6, 6, 6, 6, - 8, 8, 8, 8, 21, 21, 21, 21, 21, 21, 21, 21, 6, 8, 8, 8, - 8, 8, 8, 8, 7, 21, 21, 6, 21, 8, 8, 7, 21, 7, 6, 7, - 7, 21, 8, 7, 8, 6, 7, 21, 8, 8, 8, 7, 21, 6, 8, 7, - 21, 7, 21, 21, 8, 67, 8, 6, 1, 1,109, 21,110,109, 21, 21, - 21, 21, 21, 21, 21, 21, 6, 8, 21,110, 8, 7, 8, 8, 8, 8, - 8, 8, 6, 6, 6, 7, 21, 8, 21, 21, 7, 8, 8, 8, 8, 8, - 6, 6, 1, 6, 6, 6, 6, 6, 13, 22, 22, 13, 13, 13, 13, 13, - 13, 22, 22, 22, 22, 22, 22, 22, 13, 13, 68, 22, 22, 22, 68, 68, - 8, 8, 68, 8, 0, 69, 6, 88, 0, 0, 22,140, 7, 32, 32, 7, - 21, 7, 7, 7, 7, 7, 7, 7, 7, 39, 7, 7, 7, 7, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 21, 6, 7, 8, 6, 8, 8, 8, 8, - 6, 6, 8, 90, 21, 8, 21, 7, 8, 43, 5, 5, 79, 8, 8, 8, - 7, 21, 21, 21, 21, 21, 21, 6, 39, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 32, 54, 12, 12, 12, 6, 6, 6, 6,111,141, 44, 70, - 5, 5, 5, 5, 5, 5, 5,142, 71, 36, 5, 71, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 14, 0, 17, 1, 40, 33, 0, 0, 0, 0, 0, - 18, 18, 18, 9, 77, 80, 12, 3, 5, 5, 5, 5, 5, 36,143, 12, - 52, 1, 1, 1, 1, 24, 5, 5, 11, 11, 11, 11, 11, 12, 12, 1, - 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 53, 5, 5, 5,144, 43, - 5, 5, 81, 72, 55, 5, 5, 1, 11, 11, 11, 11, 11, 1, 56, 82, - 12, 12, 12, 12, 12, 12, 12, 73, 24, 1, 1, 1, 1, 1, 1, 1, - 5, 5, 5, 5, 5, 23, 17, 1, 25, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 24, 5, 5, 5, 5, 13, 66, 12, 61, 26, 30, - 1, 1, 1, 5, 5, 72, 5, 5, 5, 5, 72, 5, 72, 5, 5, 0, - 12, 12, 12, 12, 12, 12, 12, 33, 1, 1, 1, 1, 24, 5, 0, 33, - 1, 1, 1, 1,145, 1, 1, 1, 18, 0, 0, 26, 5, 5, 5, 5, - 1, 1, 1, 1, 45, 5, 5, 5, 5, 91, 5, 5, 5, 5, 5, 5, - 1, 1, 1, 1, 1, 20, 25, 15, 19, 5, 5, 5, 20, 15, 19, 15, - 24, 5, 5, 5, 1, 1, 1, 1, 1, 5, 12, 11, 11, 11, 11, 11, - 62, 1, 1, 1, 1, 1, 1, 1, 24, 15, 17, 1, 1, 1, 14, 17, - 14, 14, 0, 1, 1, 0, 25, 15, 19, 5, 23, 35, 37, 35, 19, 14, - 0, 0, 0, 35, 0, 0, 1, 17, 1, 30, 10, 10, 10, 70, 40, 23, - 26, 20, 17, 1, 1, 14, 0, 17, 14, 1, 17, 14, 1, 0, 23, 15, - 19, 23, 0, 26, 23, 26, 5, 0, 26, 0, 0, 0, 17, 1, 14, 14, - 5, 1, 24, 33, 0, 0, 0, 0, 26, 20, 17, 1, 1, 1, 1, 17, - 14, 1, 17, 1, 1, 0, 25, 15, 19, 5, 5, 26, 20, 35, 19, 0, - 80, 0, 0, 0, 17, 5, 5, 5, 26, 15, 17, 1, 1, 1, 14, 17, - 14, 1, 17, 1, 1, 0, 25, 19, 19, 5, 23, 35, 37, 35, 19, 0, - 0, 0, 26, 20, 0, 0, 1, 17, 82, 10, 10, 10, 0, 0, 0, 0, - 0, 25, 17, 1, 1, 14, 0, 1, 14, 1, 1, 0, 17, 14, 14, 1, - 0, 17, 14, 0, 1, 14, 0, 1, 1, 1, 1, 1, 1, 0, 0, 15, - 20, 37, 0, 15, 37, 15, 19, 0, 14, 0, 0, 35, 0, 0, 0, 0, - 10, 63, 3, 3, 70, 29, 0, 0, 20, 15, 25, 1, 1, 1, 14, 1, - 1, 1, 1, 1, 1, 0, 25, 5, 20, 15, 37, 5, 23, 5, 5, 0, - 0, 0, 26, 23, 1, 14, 1, 0, 0, 0, 0, 38, 10, 10, 10, 63, - 24, 15, 53, 1, 1, 1, 14, 1, 1, 1, 17, 1, 1, 0, 25, 19, - 15, 15, 37, 20, 37, 15, 5, 0, 0, 0, 35, 37, 0, 0, 1, 14, - 17, 34, 0, 0, 0, 0, 0, 0, 5, 15, 1, 1, 1, 1, 14, 1, - 1, 1, 1, 1, 1, 24, 25, 15, 19, 5, 23, 15, 37, 15, 19, 56, - 0, 0, 1, 34, 10, 10, 10,112, 10, 10, 10, 10, 63, 1, 1, 1, - 26, 15, 17, 1, 1, 1, 1, 1, 1, 1, 1, 14, 0, 1, 1, 1, - 1, 17, 1, 1, 1, 1, 17, 0, 1, 1, 1, 14, 0, 23, 0, 35, - 15, 5, 23, 23, 15, 15, 15, 15, 0, 15, 33, 0, 0, 0, 0, 0, - 24, 1, 5, 5, 5, 23, 0,113, 1, 1, 1, 72, 5, 5, 5, 36, - 11, 11, 11, 11, 11, 12, 0, 0, 17, 14, 14, 1, 1, 14, 1, 1, + 1, 1, 1, 1, 1, 1, 16, 19, 1, 1, 1, 1, 1, 1, 1, 34, + 1, 1, 1, 1, 1, 1, 1, 5, 16, 16, 16, 16, 16, 16, 16, 16, + 1, 15, 0, 0, 0, 0, 0, 0, 5, 5, 5, 23, 0, 0, 0, 0, + 10, 10, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 7, 7, + 7, 7, 7, 6, 6, 6, 6, 6, 3, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 3, 0, 87, 13,102, 13, 26,103, 76, 13, + 6, 6, 6, 6, 6,107,108,138, 87, 30, 30, 65,109,139,140,110, + 49, 10, 89, 13,141,142, 10, 78, 7, 7, 7, 59, 7, 7, 7, 8, + 6, 6, 6, 60, 6, 6, 6, 6, 8, 8, 8, 8, 21, 21, 21, 21, + 21, 21, 21, 21, 6, 8, 8, 8, 8, 8, 8, 8, 7, 21, 21, 6, + 21, 8, 8, 7, 21, 7, 6, 7, 7, 21, 8, 7, 8, 6, 7, 21, + 8, 8, 8, 7, 21, 6, 8, 7, 21, 7, 21, 21, 8, 66, 8, 6, + 1, 1,111, 21,112,111, 21, 21, 21, 21, 21, 21, 21, 21, 6, 8, + 21,112, 8, 7, 8, 8, 8, 8, 8, 8, 6, 6, 6, 7, 21, 8, + 21, 21, 7, 8, 8, 8, 8, 8, 6, 6, 1, 6, 6, 6, 6, 6, + 14, 22, 22, 14, 14, 14, 14, 14, 14, 22, 22, 22, 22, 22, 22, 22, + 14, 14, 67, 22, 22, 22, 67, 67, 8, 8, 67, 8, 0, 68, 6, 88, + 0, 0, 22,143, 7, 32, 32, 7, 21, 7, 7, 7, 7, 7, 7, 7, + 7, 39, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 21, + 6, 7, 8, 6, 8, 8, 8, 8, 6, 6, 8, 90, 21, 8, 21, 7, + 8, 41, 5, 5, 79, 8, 8, 8, 7, 21, 21, 21, 21, 21, 21, 6, + 39, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 32, 14, 13, 13, 13, + 6, 6, 6, 6,113, 91,144, 69, 5, 5, 5, 5, 5, 5, 5,145, + 70, 36, 5, 70, 5, 0, 0, 0, 1, 1, 1, 1, 1, 15, 0, 17, + 1, 40, 33, 0, 0, 0, 0, 0, 18, 18, 18, 9, 77, 80, 13, 3, + 5, 5, 5, 5, 5, 36,146, 13, 52, 1, 1, 1, 1, 24, 5, 5, + 11, 11, 11, 11, 11, 13, 13, 1, 25, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 53, 5, 5, 5,147, 41, 5, 5, 81, 71, 50, 5, 5, 1, + 11, 11, 11, 11, 11, 1, 55, 72, 13, 13, 13, 13, 13, 13, 13, 73, + 24, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 5, 5, 23, 17, 1, + 1, 1, 1, 1, 1, 24, 5, 5, 5, 5, 14, 65, 13, 82, 27, 30, + 1, 1, 1, 5, 5, 71, 5, 5, 5, 5, 71, 5, 71, 5, 5, 0, + 13, 13, 13, 13, 13, 13, 13, 33, 1, 1, 1, 1, 24, 5, 0, 33, + 1, 1, 1, 1,148, 1, 1, 1, 18, 0, 0, 27, 5, 5, 5, 5, + 1, 1, 1, 1, 44, 5, 5, 5, 5, 92, 5, 5, 5, 5, 5, 5, + 1, 1, 1, 1, 1, 20, 25, 16, 19, 5, 5, 5, 20, 16, 19, 16, + 24, 5, 5, 5, 1, 1, 1, 1, 1, 5, 13, 11, 11, 11, 11, 11, + 61, 1, 1, 1, 1, 1, 1, 1, 24, 16, 17, 1, 1, 1, 15, 17, + 15, 15, 0, 1, 1, 0, 25, 16, 19, 5, 23, 35, 37, 35, 19, 15, + 0, 0, 0, 35, 0, 0, 1, 17, 1, 30, 10, 10, 10, 69, 40, 23, + 27, 20, 17, 1, 1, 15, 0, 17, 15, 1, 17, 15, 1, 0, 23, 16, + 19, 23, 0, 27, 23, 27, 5, 0, 27, 0, 0, 0, 17, 1, 15, 15, + 5, 1, 24, 33, 0, 0, 0, 0, 27, 20, 17, 1, 1, 1, 1, 17, + 15, 1, 17, 1, 1, 0, 25, 16, 19, 5, 5, 27, 20, 35, 19, 0, + 80, 0, 0, 0, 17, 5, 5, 5, 27, 16, 17, 1, 1, 1, 15, 17, + 15, 1, 17, 1, 1, 0, 25, 19, 19, 5, 23, 35, 37, 35, 19, 0, + 0, 27, 5, 20, 0, 0, 1, 17, 72, 10, 10, 10, 0, 0, 0, 0, + 0, 25, 17, 1, 1, 15, 0, 1, 15, 1, 1, 0, 17, 15, 15, 1, + 0, 17, 15, 0, 1, 15, 0, 1, 1, 1, 1, 1, 1, 0, 0, 16, + 20, 37, 0, 16, 37, 16, 19, 0, 15, 0, 0, 35, 0, 0, 0, 0, + 10, 62, 3, 3, 69, 29, 0, 0, 20, 16, 25, 1, 1, 1, 15, 1, + 1, 1, 1, 1, 1, 0, 25, 5, 20, 16, 37, 5, 23, 5, 5, 0, + 0, 0, 27, 23, 1, 15, 1, 0, 0, 0, 0, 38, 10, 10, 10, 62, + 24, 16, 53, 1, 1, 1, 15, 1, 1, 1, 17, 1, 1, 0, 25, 19, + 16, 16, 37, 20, 37, 16, 5, 0, 0, 0, 35, 37, 0, 0, 1, 15, + 17, 34, 0, 0, 0, 0, 0, 0, 5, 16, 1, 1, 1, 1, 15, 1, + 1, 1, 1, 1, 1, 24, 25, 16, 19, 5, 23, 16, 37, 16, 19, 55, + 0, 0, 1, 34, 10, 10, 10,114, 10, 10, 10, 10, 62, 1, 1, 1, + 27, 16, 17, 1, 1, 1, 1, 1, 1, 1, 1, 15, 0, 1, 1, 1, + 1, 17, 1, 1, 1, 1, 17, 0, 1, 1, 1, 15, 0, 23, 0, 35, + 16, 5, 23, 23, 16, 16, 16, 16, 0, 16, 33, 0, 0, 0, 0, 0, + 24, 1, 5, 5, 5, 23, 0,115, 1, 1, 1, 71, 5, 5, 5, 36, + 11, 11, 11, 11, 11, 13, 0, 0, 17, 15, 15, 1, 1, 15, 1, 1, 1, 1, 17, 17, 1, 1, 1, 1, 24, 1, 5, 5, 5, 5, 25, 0, - 1, 1, 14, 61, 5, 5, 5, 23, 11, 11, 11, 11, 11, 0, 1, 1, - 56, 3, 12, 12, 12, 12, 12, 12, 12, 57, 57, 3, 5, 3, 3, 3, - 10, 10, 43, 43, 43, 27, 27, 15, 1, 1, 1, 1, 17, 1, 1, 1, - 26, 5, 5, 5, 5, 5, 5, 20, 5, 5, 36, 5, 1, 1, 24, 5, - 5, 5, 5, 5, 26, 5, 5, 5, 5, 5, 5, 5, 5, 5, 23, 3, - 3, 3, 3, 55, 3, 3, 29, 3, 12, 12, 57, 3, 66, 33, 0, 0, + 1, 1, 15, 82, 5, 5, 5, 23, 11, 11, 11, 11, 11, 0, 1, 1, + 55, 3, 13, 13, 13, 13, 13, 13, 13, 56, 56, 3, 5, 3, 3, 3, + 10, 10, 41, 41, 41, 26, 26, 16, 1, 1, 1, 1, 17, 1, 1, 1, + 27, 5, 5, 5, 5, 5, 5, 20, 5, 5, 36, 5, 1, 1, 24, 5, + 5, 5, 5, 5, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 23, 3, + 3, 3, 3, 50, 3, 3, 29, 3, 13, 13, 56, 3, 65, 33, 0, 0, 1, 1, 1, 1, 1, 34, 19, 5, 20, 5, 5, 5, 19, 20, 19, 25, - 1, 1, 1, 15, 5, 1, 1, 5, 25, 15, 46, 34, 15, 15, 15, 1, - 24, 5, 25, 1, 1, 1, 1, 1, 1, 20, 19, 20, 15, 15, 19, 34, - 11, 11, 11, 11, 11, 15, 19, 3, 7, 7, 7, 39, 0, 0, 39, 0, - 6, 6, 6, 6, 6,111, 69, 6, 1, 1, 1, 14, 14, 1, 1, 0, - 14, 1, 1, 0, 1, 1, 1, 14, 1, 1, 1, 1, 1, 14, 26, 5, - 12, 12, 12, 12,114, 10, 10, 10, 7, 7, 7, 0, 6, 6, 6, 0, - 1, 1, 1, 1, 1, 1, 56, 53,146, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1,147,116, 0, 1, 1, 1, 1, 1, 40, 12, 16, - 148, 1, 1, 1, 14, 0, 0, 0, 1, 5, 20, 0, 0, 0, 0, 17, + 1, 1, 1, 16, 5, 1, 1, 5, 25, 16, 45, 34, 16, 16, 16, 1, + 24, 5, 25, 1, 1, 1, 1, 1, 1, 20, 19, 20, 16, 16, 19, 34, + 11, 11, 11, 11, 11, 16, 19, 3, 7, 7, 7, 39, 0, 0, 39, 0, + 6, 6, 6, 6, 6,113, 68, 6, 1, 1, 1, 15, 15, 1, 1, 0, + 15, 1, 1, 0, 1, 1, 1, 15, 1, 1, 1, 1, 1, 15, 27, 5, + 13, 13, 13, 13,116, 10, 10, 10, 7, 7, 7, 0, 6, 6, 6, 0, + 1, 1, 1, 1, 1, 1, 55, 53,149, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1,150,151, 0, 1, 1, 1, 1, 1, 40, 13, 12, + 152, 1, 1, 1, 15, 0, 0, 0, 1, 5, 20, 0, 0, 0, 0, 17, 1, 5, 83, 33, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 14, 1, 14, 5, 0, 0, 0, 0, 0, 0, - 1, 1, 5, 19, 5, 5, 5, 15, 15, 15, 15, 20, 19, 5, 5, 5, - 5, 5, 12, 62, 12, 80, 24, 0, 10, 10, 10, 10, 10, 0, 0, 0, - 12, 12, 12, 92, 12, 71, 5, 91, 1, 45, 1, 1, 1, 1, 1, 1, - 1, 1, 24, 25, 1, 1, 1, 1, 1, 1, 1, 1, 24, 14, 0, 0, - 5, 20, 15, 19, 20, 15, 0, 0, 15, 20, 15, 15, 19, 5, 0, 0, - 29, 0, 12, 11, 11, 11, 11, 11, 1, 1, 14, 0, 0, 0, 0, 0, - 11, 11, 11, 11, 11, 51, 0, 3, 1, 1, 1, 24, 20, 19, 0, 12, - 1, 1, 34, 20, 5, 5, 5, 23, 20, 20, 19, 5, 5, 5, 20, 15, - 15, 19, 5, 5, 5, 5, 23, 26, 12, 12, 12, 62, 12, 12, 12, 0, - 5, 5, 5, 5, 5, 5, 5, 93, 5, 5, 5, 5, 5, 5, 0, 0, - 5, 5, 46, 1, 1, 1, 1, 1, 1, 1, 20, 5, 5, 20, 20, 15, - 15, 20, 46, 1, 1, 1, 14, 12, 57, 3, 3, 3, 3, 43, 5, 5, - 5, 5, 3, 3, 3, 3, 66, 12, 34, 5, 5, 15, 5, 19, 5, 1, - 1, 1, 1, 20, 5, 15, 19, 19, 5, 15, 0, 0, 0, 0, 12, 12, - 1, 1, 15, 15, 15, 15, 5, 5, 5, 5, 15, 5, 0, 38, 12, 12, - 11, 11, 11, 11, 11, 0, 17, 1, 6, 6, 6, 6, 21, 47, 0, 0, - 7, 7, 7, 7, 7, 32, 39, 7, 12, 12, 12, 12, 0, 0, 0, 0, - 5, 36, 5, 5, 5, 5, 5, 5, 20, 5, 5, 5, 25, 1, 24, 1, - 1, 1, 25, 34, 5, 14, 0, 0, 6, 6, 6, 6, 6, 6, 13, 13, - 13, 13, 13, 13, 13, 69, 6, 6, 6, 6, 6, 6, 69, 6, 6, 6, - 6, 6, 6, 6, 6,117, 13, 13, 8, 8, 8, 6, 6, 6, 6, 8, - 6, 6, 6, 6, 39, 39, 39, 39, 6, 6, 6, 6, 6, 6, 6, 0, - 6, 6, 47, 6, 7, 7, 94,118, 22, 6, 47, 6, 7, 7, 94, 22, - 6, 6, 0, 6, 7, 7,149, 22, 6, 6, 6, 6, 7, 7,150, 22, - 0, 6, 47, 6, 7, 7, 94,151, 74, 74, 74, 74, 74,152, 18, 18, - 84, 84, 84, 12, 58,119, 58,119, 12, 12, 12, 12,153, 18, 18,154, - 12, 12, 12, 12,120,121, 12,122,123, 12, 64, 65, 12, 12, 12, 12, - 12, 77,123, 12, 12, 12, 12,155, 18, 18,156, 18, 18, 18, 18, 18, - 157, 0, 10, 10, 10, 9, 64,158, 10, 10, 10, 10, 10, 9, 64,116, - 13, 13, 13, 13, 13, 13, 61, 0, 30, 0, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 5, 5, 5,159, 79, 93, 79, 93, 5, 5, 5, 5, 5, - 23, 0, 0, 0, 0, 0, 0, 0, 3, 85, 3, 95, 3, 21, 7, 6, - 7, 8, 95, 3, 90, 7, 7, 3, 3, 3, 85, 85, 85, 7, 7,160, - 7, 7, 67, 1,124, 3, 6, 7, 9, 9, 90, 6, 6, 50, 3,125, - 16,161,162, 16,126, 3, 0, 0, 9, 9, 48, 3, 3, 9, 3, 3, - 48, 50, 3, 48, 3, 3, 3, 48, 3, 3, 3, 3, 3, 3, 3, 9, - 3, 48, 48, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, 9, 9, - 3, 3, 3, 3, 27, 27, 3, 3, 9, 3, 3, 3,163,164, 3, 3, - 3, 3, 3, 3, 3, 3, 48, 3, 3, 3, 3, 3, 3, 50, 9, 9, - 9, 9, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, - 9, 3, 3, 3, 3, 3, 3, 3, 10, 10, 10, 10, 10, 10, 3, 3, - 3, 3, 3, 3, 3, 10, 10, 10, 3, 3, 3, 50, 3, 3, 3, 3, - 50, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, - 3, 3, 3, 3, 3, 3, 3, 50, 3, 3, 3, 3, 27, 27, 27, 27, - 27, 27, 27, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, - 9, 9, 64,127, 9, 9, 9, 9, 9, 9, 9, 27, 27, 27, 27, 27, - 9, 64, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,127, 9, 9, 9, - 9, 9, 9, 9, 27, 27, 9, 9, 9, 9, 9, 9, 9, 9, 27, 9, - 9, 9, 48, 50, 9, 9, 48, 3, 3, 3, 0, 3, 3, 3, 3, 3, - 8, 7, 8, 21, 21, 21, 21, 7, 8, 8, 21, 6, 6, 6, 13, 7, - 8, 8,125, 3, 3, 95, 21,165, 5, 8, 0, 0, 38, 12,114, 12, - 6, 6, 6, 42, 0, 0, 42, 0, 1, 1, 1, 1, 0, 0, 0, 54, - 33, 0, 0, 0, 0, 0, 0, 26, 12, 58, 58, 12,120,121, 58, 12, - 12, 12, 12, 76, 12, 92, 58, 12, 58, 27, 27, 27, 27, 12, 12, 62, - 12, 12, 12, 12, 12, 84, 12, 12, 92,166, 12, 12, 12, 12, 12, 12, - 3, 12, 96, 31, 31, 31,167, 0, 3, 3, 3, 3, 3, 44, 3, 3, - 87, 12,168,128, 27, 27, 27, 27, 27, 3, 27, 27, 27, 27,129,169, - 170, 16, 16, 16, 16, 5, 5, 15,130, 13, 13, 3, 16,171, 40, 3, - 1, 1, 1, 14, 26,172,131, 52, 1, 1, 1, 1, 1, 40, 13, 52, + 1, 1, 1, 1, 1, 1, 15, 1, 15, 5, 0, 0, 0, 0, 0, 0, + 1, 1, 5, 19, 5, 5, 5, 16, 16, 16, 16, 20, 19, 5, 5, 5, + 5, 5, 13, 61, 13, 80, 24, 0, 10, 10, 10, 10, 10, 0, 0, 0, + 13, 13, 13, 93, 13, 70, 5, 92, 1, 44, 1, 1, 1, 1, 1, 1, + 1, 1, 24, 25, 1, 1, 1, 1, 1, 1, 1, 1, 24, 15, 0, 0, + 5, 20, 16, 19, 20, 16, 0, 0, 16, 20, 16, 16, 19, 5, 0, 0, + 29, 0, 13, 11, 11, 11, 11, 11, 1, 1, 15, 0, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 51, 0, 3, 1, 1, 1, 24, 20, 19, 0, 13, + 1, 1, 34, 20, 5, 5, 5, 23, 20, 20, 19, 5, 5, 5, 20, 16, + 16, 19, 5, 5, 5, 5, 23, 27, 13, 13, 13, 61, 13, 13, 13, 0, + 5, 5, 5, 5, 5, 5, 5, 94, 5, 5, 45, 1, 1, 1, 1, 1, + 1, 1, 20, 5, 5, 20, 20, 16, 16, 20, 45, 1, 1, 1, 15, 13, + 56, 3, 3, 3, 3, 41, 5, 5, 5, 5, 3, 3, 3, 3, 65, 13, + 34, 5, 5, 16, 5, 19, 5, 1, 1, 1, 1, 20, 5, 16, 19, 19, + 5, 16, 0, 0, 0, 0, 13, 13, 1, 1, 16, 16, 16, 16, 5, 5, + 5, 5, 16, 5, 0, 38, 13, 13, 11, 11, 11, 11, 11, 0, 17, 1, + 6, 6, 6, 6, 21, 46, 0, 0, 7, 7, 7, 7, 7, 32, 39, 7, + 13, 13, 13, 13, 0, 0, 0, 0, 5, 36, 5, 5, 5, 5, 5, 5, + 20, 5, 5, 5, 25, 1, 24, 1, 1, 1, 25, 34, 5, 15, 0, 0, + 6, 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 14, 68, 6, 6, + 6, 6, 6, 6, 68, 6, 6, 6, 6, 6, 6, 6, 6,118, 14, 14, + 8, 8, 8, 6, 6, 6, 6, 8, 6, 6, 6, 6, 39, 39, 39, 39, + 6, 6, 6, 6, 6, 6, 6, 0, 6, 6, 46, 6, 7, 7, 95,119, + 22, 6, 46, 6, 7, 7, 95, 22, 6, 6, 0, 6, 7, 7,120, 22, + 6, 6, 6, 6, 7, 7,153, 22, 0, 6, 46, 6, 7, 7, 95,154, + 74, 74, 74, 74, 74,155, 18, 18, 84, 84, 84, 13, 57,121, 57,121, + 13, 13, 13, 13,156, 18, 18,157, 13, 13, 13, 13,122,123, 13,124, + 125, 13, 63, 64, 13, 13, 13, 13, 13, 77,125, 13, 13, 13, 13,158, + 18, 18,159, 18, 18, 18, 18, 18,160, 0, 10, 10, 10, 9, 63,126, + 10, 10, 10, 10, 10, 9, 63,126, 30, 30,127, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 5,161, 79, 94, 79, 94, 5, 5, 5, 5, 5, + 3, 85, 3, 96, 3, 21, 7, 6, 7, 8, 96, 3, 90, 7, 7, 3, + 3, 3, 85, 85, 85, 7, 7,162, 7, 7, 66, 1,128, 3, 6, 7, + 9, 9, 90, 6, 6, 49, 3,129, 12,163,164, 12,130, 3, 0, 0, + 9, 9, 47, 3, 3, 9, 3, 3, 47, 49, 3, 47, 3, 3, 3, 47, + 3, 3, 3, 3, 3, 3, 3, 9, 3, 47, 47, 3, 3, 3, 3, 3, + 3, 3, 9, 9, 9, 9, 9, 9, 3, 3, 3, 3, 26, 26, 3, 3, + 9, 3, 3, 3,165,166, 3, 3, 3, 3, 3, 3, 3, 3, 47, 3, + 3, 3, 3, 3, 3, 49, 9, 9, 9, 9, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 9, 9, 9, 3, 3, 3, 3, 3, 3, 3, + 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 10, 10, 10, + 3, 3, 3, 49, 3, 3, 3, 3, 49, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 9, 9, 9, 9, 3, 3, 3, 3, 3, 3, 3, 49, + 3, 3, 3, 3, 26, 26, 26, 26, 26, 26, 26, 10, 10, 10, 10, 10, + 10, 10, 3, 3, 3, 3, 3, 3, 9, 9, 63,131, 9, 9, 9, 9, + 9, 9, 9, 26, 26, 26, 26, 26, 9, 63, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31,131, 9, 9, 9, 9, 9, 9, 9, 26, 26, 9, 9, + 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 47, 49, 9, 9, 47, 3, + 3, 3, 0, 3, 3, 3, 3, 3, 8, 7, 8, 21, 21, 21, 21, 7, + 8, 8, 21, 6, 6, 6, 14, 7, 8, 8,129, 3, 3, 96, 21,167, + 5, 8, 0, 0, 38, 13,116, 13, 6, 6, 6, 43, 0, 0, 43, 0, + 1, 1, 1, 1, 0, 0, 0, 58, 33, 0, 0, 0, 0, 0, 0, 27, + 13, 57, 57, 13,122,123, 57, 13, 13, 13, 13, 76, 13, 93, 57, 13, + 57, 26, 26, 26, 26, 13, 13, 61, 13, 13, 13, 13, 13, 84, 13, 13, + 93,168, 13, 13, 13, 13, 13, 13, 3, 13, 97, 31, 31, 31,169, 0, + 13, 26, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 54, 3, 3, + 87, 13,170,132, 26, 26, 26, 26, 26, 3, 26, 26, 26, 26,133,171, + 172, 12, 12, 12, 12, 5, 5, 16, 91, 14, 14, 3, 12,173, 40, 3, + 1, 1, 1, 15, 27,174,134, 52, 1, 1, 1, 1, 1, 40, 14, 52, 0, 0, 17, 1, 1, 1, 1, 1, 3, 10, 10, 3, 3, 3, 3, 3, - 3, 3, 3, 0, 0, 0, 0, 44, 3, 3, 3, 3, 10, 10, 10, 10, - 1, 1, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,132, 12, + 3, 3, 3, 0, 0, 0, 0, 54, 3, 3, 3, 3, 10, 10, 10, 10, + 1, 1, 44, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,135, 13, 11, 11, 11, 11, 11, 1, 0, 0, 8, 8, 8, 8, 8, 8, 8, 24, - 79,173, 5, 5, 5, 5, 5, 62, 8, 8, 8, 8, 8, 8, 13, 5, - 1, 1, 1, 16, 16, 16, 16, 16, 5, 12, 12, 12, 0, 0, 0, 0, - 22, 22, 22,131, 13, 13, 13, 13, 22, 8, 8, 8, 8, 8, 8, 8, - 6, 8, 8, 8, 8, 8, 8, 8, 69, 6, 6, 6, 21, 21, 21, 8, - 8, 8, 8, 8, 68,174, 21, 67, 8, 8, 6, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 7, 7, 8, 7, 7, 8, 8, 8, 8, 8, 8, - 8, 8, 7, 7, 21, 21, 8, 8, 8, 8, 8, 8, 8, 8, 32, 0, - 54, 13,175, 67, 13, 67, 1, 1, 1, 25, 1, 25, 1, 24, 1, 1, - 1, 34, 19, 20, 3, 3, 23, 0, 10, 10, 10, 3, 97, 0, 0, 0, - 1, 1, 12, 12, 0, 0, 0, 0, 15, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 15, 15, 15, 15, 15, 15, 15, 15, 5, 0, 0, 0, 0, 12, - 5, 1, 1, 1, 12, 53, 53, 24, 1, 1, 1, 5, 5, 5, 5, 12, - 1, 1, 1, 24, 5, 5, 5, 5, 5, 15, 0, 0, 0, 0, 0, 38, - 1, 24, 15, 5, 5, 15, 5, 15, 83, 12, 12, 12, 12, 12, 12, 54, - 1, 1, 24, 52, 1, 1, 1, 1, 11, 11, 11, 11, 11, 1, 1, 14, + 79,175, 5, 5, 5, 5, 5, 61, 8, 8, 8, 8, 8, 8, 14, 5, + 1, 1, 1, 12, 12, 12, 12, 12, 5, 13, 13, 13, 0, 0, 0, 0, + 22, 22, 22,134, 14, 14, 14, 14, 22, 8, 8, 8, 8, 8, 8, 8, + 68, 6, 6, 6, 21, 21, 21, 8, 8, 8, 8, 8, 67,176, 21, 66, + 8, 8, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, + 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 21, 21, 8, 8, + 8, 8, 8, 8, 8, 8, 7, 0, 0, 32, 0, 0, 0, 0, 0, 0, + 58, 14,177, 66, 14, 66, 1, 1, 1, 25, 1, 25, 1, 24, 1, 1, + 1, 34, 19, 20, 3, 3, 23, 0, 10, 10, 10, 3, 98, 0, 0, 0, + 1, 1, 13, 13, 0, 0, 0, 0, 16, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 16, 16, 16, 16, 16, 16, 16, 16, 5, 0, 0, 0, 0, 13, + 5, 1, 1, 1, 13, 53, 53, 24, 1, 1, 1, 5, 5, 5, 5, 13, + 1, 1, 1, 24, 5, 5, 5, 5, 5, 16, 0, 0, 0, 0, 0, 38, + 1, 24, 16, 5, 5, 16, 5, 16, 83, 13, 13, 13, 13, 13, 13, 58, + 1, 1, 24, 52, 1, 1, 1, 1, 11, 11, 11, 11, 11, 1, 1, 15, 1, 1, 1, 1, 24, 5, 5, 20, 19, 20, 19, 23, 0, 0, 0, 0, - 1, 24, 1, 1, 1, 1, 20, 0, 11, 11, 11, 11, 11, 0, 12, 12, - 52, 1, 1, 56, 3, 34, 20, 1, 25, 5, 25, 24, 25, 1, 1, 5, - 24, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 45, 12, - 1, 1, 1, 1, 1, 34, 5, 15, 12, 45,176, 23, 0, 0, 0, 0, - 17, 1, 1, 14, 17, 1, 1, 14, 17, 1, 1, 14, 0, 0, 0, 0, - 6, 6, 6, 6, 6,118, 13, 13, 6, 6, 6, 6,117, 22, 0, 0, - 1, 34, 19, 15, 20, 83, 19, 0, 1, 1, 1, 14, 0, 17, 1, 1, - 6, 6, 6, 47, 0, 0, 0, 0, 0, 42, 6, 6, 0, 0, 17, 25, - 1, 1, 1, 1,177, 1, 1, 1, 1, 1, 1, 14, 1, 1, 14, 14, - 1, 17, 14, 1, 1, 1, 1, 1, 1, 22, 22, 22, 22, 22, 22, 22, - 22,107, 3, 3, 3, 3, 3, 3, 3, 82, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 31, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 97, 3, - 12, 12, 12, 96, 65, 0, 0, 0, 76,178,179, 31, 31, 31, 31, 31, - 31, 31, 65, 96, 65, 12,122,180, 12, 33, 12, 12,129, 31, 31, 65, - 12,181, 9, 98, 80, 12, 0, 0, 1, 1, 14, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 14, 73, 38, 12,100, 12, 27,101, 76, 12, - 6, 6, 6, 6, 6,105,106, 64, 65, 27, 12, 1, 1, 1, 1, 1, - 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, - 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 14, 0, - 30,182, 70,183, 50, 9, 48, 29, 0, 0, 0, 0, 73, 18, 3, 0, - 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 1, 1, 14, 1, 17, - 12, 33, 0, 49, 10, 10, 10, 10, 10, 10, 0, 44, 3, 3, 3, 3, - 16, 16,126, 10, 63, 3, 3, 3, 3, 3, 3, 3, 3, 10, 3, 29, - 3, 3, 3, 3, 3, 3, 43, 0,133, 10, 10, 10, 10, 10, 10, 10, + 1, 24, 1, 1, 1, 1, 20, 0, 11, 11, 11, 11, 11, 0, 13, 13, + 52, 1, 1, 55, 3, 34, 20, 1, 25, 5, 25, 24, 25, 1, 1, 5, + 24, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 44, 13, + 1, 1, 1, 1, 1, 34, 5, 16, 13, 44,178, 23, 0, 0, 0, 0, + 17, 1, 1, 15, 17, 1, 1, 15, 17, 1, 1, 15, 0, 0, 0, 0, + 6, 6, 6, 6, 6,119, 14, 14, 6, 6, 6, 6,118, 22, 7, 0, + 1, 34, 19, 16, 20, 83, 19, 0, 1, 1, 1, 15, 0, 17, 1, 1, + 0, 43, 6, 6, 0, 0, 17, 25, 1, 1, 1, 1,179, 1, 1, 1, + 1, 1, 1, 15, 1, 1, 15, 15, 1, 17, 15, 1, 1, 1, 1, 1, + 1, 22, 22, 22, 22, 22, 22, 22, 22,109, 3, 3, 3, 3, 3, 3, + 3, 72, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 98, 3, 13, 13, 13, 97, 64, 0, 0, 0, + 76,180,181, 31, 31, 31, 31, 31, 31, 31, 64, 97, 64, 13,124,182, + 13, 33, 13, 13,133, 31, 31, 64, 13,183, 9, 99, 80, 13, 0, 0, + 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 15, 73, + 38, 13,102, 13, 26,103, 76, 13, 6, 6, 6, 6, 6,107,108, 63, + 64, 26, 13, 1, 1, 1, 1, 1, 52, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 14, 0, 1, 1, 1, 0, 1, 1, 1, + 0, 1, 1, 1, 0, 1, 15, 0, 30,184, 69,127, 49, 9, 47, 29, + 0, 0, 0, 0, 73, 18, 3, 0, 1, 1, 1, 1, 1, 1, 17, 1, + 1, 1, 1, 1, 1, 15, 1, 17, 13, 33, 0, 48, 10, 10, 10, 10, + 10, 10, 0, 54, 3, 3, 3, 3, 12, 12,130, 10, 62, 3, 3, 3, + 3, 3, 3, 3, 3, 10, 3, 29, 29, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 41, 0,136, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 10, 10, 0, 0, 0, 0, 17, 1, - 128, 1, 1, 1, 1, 99, 0, 0, 1, 1, 1, 5, 5, 23, 0, 0, + 132, 1, 1, 1, 1,100, 0, 0, 1, 1, 1, 5, 5, 23, 0, 0, 1, 1, 1, 1, 1, 1, 1, 38, 1, 1, 0, 0, 1, 1, 1, 1, - 184, 16, 16, 0, 0, 0, 0, 0, 7, 7, 7, 7, 6, 6, 6, 6, + 137, 12, 12, 0, 0, 0, 0, 0, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 0, - 1, 1, 0, 0, 0, 0, 0, 38, 7, 32, 7, 42, 6, 6, 6, 6, - 6, 42, 6, 6, 6, 6, 6, 6, 6, 42, 6, 6, 6, 42, 47, 0, - 13, 13, 13, 54, 13, 13, 13, 13, 61, 13, 13, 13, 13, 61, 0, 0, - 1, 1, 1, 0, 14, 1, 1, 1, 1, 1, 1, 17, 14, 0, 14, 17, - 1, 1, 1, 38, 10, 10, 10, 10, 1, 1, 1, 56, 75, 10, 10, 10, - 0, 0, 0, 49, 10, 10, 10, 10, 1, 14, 1, 0, 0, 49, 10, 10, + 1, 1, 0, 0, 0, 0, 0, 38, 7, 32, 7, 43, 6, 6, 6, 6, + 6, 43, 6, 6, 6, 6, 6, 6, 6, 43, 6, 6, 6, 43, 46, 0, + 14, 14, 14, 58, 14, 14, 14, 14, 82, 14, 14, 14, 14, 14, 14, 14, + 1, 1, 1, 0, 15, 1, 1, 1, 1, 1, 1, 17, 15, 0, 15, 17, + 1, 1, 1, 38, 10, 10, 10, 10, 1, 1, 1, 55, 75, 10, 10, 10, + 0, 0, 0, 48, 10, 10, 10, 10, 1, 15, 1, 0, 0, 48, 10, 10, 1, 1, 1, 10, 10, 10, 0, 38, 1, 1, 1, 1, 1, 0, 0, 38, - 1, 1, 1, 1, 0, 0, 10, 1, 24, 5, 26, 23, 0, 0, 5, 5, - 1, 1, 17, 1, 17, 1, 1, 1, 1, 1, 1, 0, 5, 23, 0, 26, - 12, 12, 12, 12, 33, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 78, - 1, 1, 1, 1, 82, 1, 1, 1, 1, 1, 24, 23, 0, 49, 10, 10, - 12, 12, 12, 33, 0, 0, 0, 0, 1, 1, 1, 0, 38, 12, 12, 12, - 1, 1, 1, 0, 10, 10, 10, 10, 1, 14, 0, 0, 10, 10, 10, 10, - 1, 0, 0, 0, 38, 12, 33, 0, 0, 0, 0, 0, 49, 10, 10, 10, - 7, 32, 0, 0, 0, 0, 0, 0, 6, 47, 0, 0, 0, 10, 10, 10, + 1, 1, 1, 1, 0, 0, 10, 1, 24, 5, 27, 23, 0, 0, 5, 5, + 1, 1, 17, 1, 17, 1, 1, 1, 1, 1, 1, 0, 5, 23, 0, 27, + 13, 13, 13, 13, 33, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 78, + 1, 1, 1, 1, 72, 1, 1, 1, 1, 1, 24, 23, 0, 48, 10, 10, + 13, 13, 13, 33, 0, 0, 0, 0, 1, 1, 1, 0, 38, 13, 13, 13, + 1, 1, 1, 0, 10, 10, 10, 10, 1, 15, 0, 0, 10, 10, 10, 10, + 1, 0, 0, 0, 38, 13, 33, 0, 0, 0, 0, 0, 48, 10, 10, 10, + 7, 32, 0, 0, 0, 0, 0, 0, 6, 46, 0, 0, 0, 10, 10, 10, 1, 1, 5, 5, 0, 0, 0, 0, 11, 11, 11, 11, 11, 1, 1, 52, - 7, 7, 7, 0, 26, 5, 5,130, 6, 6, 6, 0, 0, 0, 0, 9, - 10, 10, 10, 10, 10, 10, 10, 51, 1, 1, 1, 1, 1, 26,185, 0, - 0, 1, 45, 1, 0, 0, 0, 0, 57, 3, 3, 3, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 5, 5, 10, 10, 10,112, 0, 0, 0, 0, - 133, 10, 78, 12, 12, 0, 0, 0, 1, 5, 5, 12, 12, 0, 0, 0, - 1, 1, 86, 10, 10, 10, 0, 0, 19, 46, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 5, 5, 5, 5, 5, 5, 5, 36, 12, 12, 12, 0, - 10, 10, 10, 11, 11, 11, 11, 11, 25, 24, 25, 0, 0, 0, 0, 26, - 15, 19, 5, 20, 19, 36,186, 12, 12, 23, 0, 0, 0, 0, 73, 0, - 5, 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 24, 5, 5, 19, 5, - 5, 5, 23, 11, 11, 11, 11, 11, 12, 12, 34, 46, 0, 0, 0, 0, - 1, 24, 12, 14, 0, 0, 0, 0, 1, 34, 15, 5, 5, 5, 5, 20, - 46, 1, 40, 12, 71, 5, 36, 19, 11, 11, 11, 11, 11, 40, 40, 12, - 10, 10, 51, 0, 0, 0, 0, 0, 5, 15, 20, 5, 12, 12, 12, 25, - 24, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 14, 14, 1, 1, 17, - 1, 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 40, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 24, 15, 19, 5, 5, 5, 23, 0, 0, - 5, 15, 17, 1, 1, 1, 14, 17, 14, 1, 17, 1, 1, 26, 25, 15, - 20, 15, 37, 35, 37, 35, 15, 0, 14, 0, 0, 35, 0, 0, 17, 1, - 1, 15, 0, 5, 5, 5, 23, 0, 5, 5, 23, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 17, 0, 14, 1, 1, 1, 17, 15, 19, 5, 5, - 23, 37, 35, 35, 15, 37, 15, 20, 25, 25, 12, 38, 33, 0, 0, 0, - 26, 23, 0, 0, 0, 0, 0, 0, 1, 1, 34, 15, 5, 5, 5, 5, - 15, 5, 20, 25, 1, 40, 12, 12, 11, 11, 11, 11, 11, 12, 38, 25, - 15, 19, 5, 5, 20, 20, 15, 19, 20, 5, 1, 53, 0, 0, 0, 0, - 15, 5, 5, 0, 15, 15, 5, 19, 36, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 1, 1, 5, 0, 15, 19, 5, 5, 5, 20, 19, 19, - 36, 12, 14, 0, 0, 0, 0, 0, 12, 12, 12, 12, 12, 12, 33, 0, - 1, 1, 1, 1, 1, 24, 19, 15, 5, 5, 5, 19, 40, 0, 0, 0, - 11, 11, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 14, 26, 19, - 15, 5, 5, 19, 5, 5, 0, 0, 11, 11, 11, 11, 11, 10, 12, 57, - 5, 5, 5, 5, 19, 36, 0, 0, 10, 51, 0, 0, 0, 0, 0, 17, - 1, 1, 1, 14, 17, 0, 1, 1, 1, 1, 17, 14, 1, 1, 1, 1, - 15, 15, 15, 35, 37, 26, 20, 25, 46, 19, 12, 33, 0, 0, 0, 0, - 1, 1, 1, 1, 0, 1, 1, 1, 34, 15, 5, 5, 0, 5, 15, 15, - 25, 53, 37, 0, 0, 0, 0, 0, 24, 5, 5, 5, 5, 25, 1, 1, - 1, 24, 5, 5, 20, 24, 5, 36, 12, 12, 12, 71, 0, 0, 0, 0, - 24, 5, 5, 20, 19, 5, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, - 5, 5, 5, 20, 5, 12, 53, 12, 12, 33, 0, 0, 0, 0, 0, 0, - 12, 12, 12, 12, 12, 0, 0, 0, 20, 5, 20, 20, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 23, 5, 5, 5, 19, - 40, 12, 12, 0, 0, 0, 0, 0, 12, 1, 1, 1, 1, 1, 1, 1, - 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 35, 5, 5, 5, - 20, 5, 19, 23, 0, 0, 0, 0, 1, 1, 1, 14, 1, 17, 1, 1, - 24, 5, 5, 23, 0, 23, 5, 26, 5, 5, 5, 24, 0, 0, 0, 0, - 1, 1, 1, 17, 14, 1, 1, 1, 1, 1, 1, 1, 1, 15, 15, 37, - 5, 35, 19, 19, 14, 0, 0, 0, 1, 1, 1, 1, 45, 1, 0, 0, - 1, 24, 20, 83, 33, 0, 0, 0, 5, 34, 1, 1, 1, 1, 1, 1, - 1, 1, 15, 5, 5, 23, 0, 15, 20, 36, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 23, 0, 0, 10, 10, 63, 3, 3, 3, 70, 30, - 97, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 38, - 16, 16, 16, 16, 16, 16, 16, 99, 12, 12, 33, 0, 0, 0, 0, 0, - 40, 33, 0, 0, 0, 0, 0, 0, 25, 1, 1, 24, 5, 5, 5, 5, - 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 15, 19, 5, - 5, 5, 36, 0, 0, 0, 0, 0, 5, 5, 5, 36, 12, 12, 3, 3, - 13, 13, 57, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 49, 10, 10, - 10, 17, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 17, 1, - 13, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 45,132, 12, - 10, 10, 10, 78, 12, 33, 0, 0, 7, 7, 7, 7, 32, 42, 6, 6, - 6, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 14, 0, 26, - 34, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 0, 26, - 5, 81, 13, 13, 13, 13, 13, 13, 13, 62, 23, 0, 0, 0, 0, 0, - 15, 13, 16, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, - 13, 13, 54, 13, 13, 13, 54, 61, 0, 14, 0, 0, 0, 0, 0, 0, - 1, 14, 17, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 0, 43, 36, 18, 18, 0, 0, 0, 0, 0, 0, - 11, 11, 11, 11, 11, 3, 29, 0, 3, 3, 0, 0, 0, 3, 3, 3, - 98, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 29, 44, 3, 3, 3, - 3, 3,134, 19, 5, 3,134, 15, 15,187, 18, 18, 18, 91, 5, 5, - 5, 55, 43, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 5, 5, 3, - 3, 5, 55, 0, 0, 0, 0, 0, 6, 6, 47, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 32, 7, 0, 32, 39, 32, 39, 7, 32, 7, - 7, 7, 7, 6, 6, 42, 42, 6, 6, 6, 42, 6, 6, 6, 6, 6, - 6, 6, 7, 39, 7, 32, 39, 7, 7, 7, 32, 7, 7, 7, 32, 6, - 6, 6, 6, 6, 7, 39, 7, 32, 7, 7, 32, 32, 0, 7, 7, 7, - 32, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 7, 7, 7, 7, - 59, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 60, 6, 6, - 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 59, 6, 6, - 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 59, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, - 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, 8, 0, 11, - 5, 5, 5, 55, 3, 43, 5, 5, 5, 5, 5, 5, 5, 5, 55, 3, - 3, 3, 43, 3, 3, 3, 3, 3, 3, 3, 55, 66, 12, 12, 0, 0, - 0, 0, 0, 0, 0, 26, 5, 5, 6, 6, 6, 6, 6,124, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 47, 0, 0, 42, 6, 6, 47, 0, 0, - 5, 5, 5, 23, 5, 5, 5, 5, 5, 5, 5, 5, 23, 26, 5, 5, - 5, 26, 23, 5, 5, 23, 0, 0, 13, 13, 13, 13, 13, 13, 13, 0, - 0, 0, 0, 0, 0, 0, 0, 26, 5, 5, 5, 81, 13, 13, 13, 0, - 11, 11, 11, 11, 11, 0, 0, 56, 1, 1, 1, 1, 1, 1, 1, 23, - 1, 1, 1, 1, 1, 1, 5, 5, 11, 11, 11, 11, 11, 0, 0,113, - 1, 1, 1, 1, 1, 45, 5, 5,188, 11, 11, 11, 11,189, 0, 38, - 1, 24, 1, 25, 1, 1, 1, 5, 1, 1, 24, 0, 0, 0, 0, 45, - 1, 1, 1, 14, 1, 1, 17, 14, 1, 1, 14, 49, 10, 10, 10, 10, + 7, 7, 7, 0, 27, 5, 5, 91, 6, 6, 6, 0, 0, 0, 0, 9, + 10, 10, 10, 10, 10, 10, 10, 51, 1, 1, 1, 1, 1, 27,185, 0, + 0, 1, 44, 1,120,186, 5, 5, 56, 3, 3, 3, 72, 1, 1, 1, + 10, 10, 10,114, 0, 0, 0, 0,136, 10, 78, 13, 13, 0, 0, 0, + 1, 5, 5, 13, 13, 0, 0, 0, 1, 1, 86, 10, 10, 10, 0, 0, + 19, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 5, + 5, 5, 5, 36, 13, 13, 13, 0, 10, 10, 10, 11, 11, 11, 11, 11, + 25, 24, 25, 0, 0, 0, 0, 27, 16, 19, 5, 20, 19, 36,187, 13, + 13, 23, 0, 0, 0, 0, 73, 0, 5, 25, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 24, 5, 5, 19, 5, 5, 5, 23, 11, 11, 11, 11, 11, + 13, 13, 34, 45, 0, 0, 0, 0, 1, 24, 13, 15, 0, 0, 0, 0, + 1, 34, 16, 5, 5, 5, 5, 20, 45, 1, 40, 13, 70, 5, 36, 19, + 11, 11, 11, 11, 11, 40, 40, 13, 10, 10, 51, 0, 0, 0, 0, 0, + 5, 16, 20, 5, 13, 13, 13, 25, 24, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 15, 15, 1, 1, 17, 1, 1, 1, 1, 1, 1, 1, 17, + 1, 1, 1, 1, 40, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 24, + 16, 19, 5, 5, 5, 23, 0, 0, 5, 16, 17, 1, 1, 1, 15, 17, + 15, 1, 17, 1, 1, 27, 25, 16, 20, 16, 37, 35, 37, 35, 16, 0, + 15, 0, 0, 35, 0, 0, 17, 1, 1, 16, 0, 5, 5, 5, 23, 0, + 5, 5, 23, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 17, 0, 15, + 1, 1, 1, 17, 16, 19, 5, 5, 23, 37, 35, 35, 16, 37, 16, 20, + 25, 25, 13, 38, 33, 0, 0, 0, 27, 23, 0, 0, 0, 0, 0, 0, + 1, 1, 34, 16, 5, 5, 5, 5, 16, 5, 20, 25, 1, 40, 13, 13, + 11, 11, 11, 11, 11, 13, 38, 25, 16, 19, 5, 5, 20, 20, 16, 19, + 20, 5, 1, 53, 0, 0, 0, 0, 16, 5, 5, 0, 16, 16, 5, 19, + 36, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 1, 1, 5, 0, + 16, 19, 5, 5, 5, 20, 19, 19, 36, 13, 15, 0, 0, 0, 0, 0, + 13, 13, 13, 13, 13, 13, 33, 0, 1, 1, 1, 1, 1, 24, 19, 16, + 5, 5, 5, 19, 40, 0, 0, 0, 11, 11, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 15, 27, 19, 16, 5, 5, 19, 5, 5, 0, 0, + 11, 11, 11, 11, 11, 10, 13, 56, 5, 5, 5, 5, 19, 36, 0, 0, + 10, 51, 0, 0, 0, 0, 0, 17, 1, 1, 1, 15, 17, 0, 1, 1, + 1, 1, 17, 15, 1, 1, 1, 1, 16, 16, 16, 35, 37, 27, 20, 25, + 45, 19, 13, 33, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, + 34, 16, 5, 5, 0, 5, 16, 16, 25, 53, 37, 0, 0, 0, 0, 0, + 24, 5, 5, 5, 5, 25, 1, 1, 1, 24, 5, 5, 20, 24, 5, 36, + 13, 13, 13, 70, 0, 0, 0, 0, 24, 5, 5, 20, 19, 5, 1, 1, + 1, 1, 1, 1, 1, 5, 5, 5, 5, 5, 5, 20, 5, 13, 53, 13, + 13, 33, 0, 0, 0, 0, 0, 0, 13, 13, 13, 13, 13, 15, 0, 0, + 20, 5, 20, 20, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 5, 23, 5, 5, 5, 19, 40, 13, 13, 0, 0, 0, 0, 0, + 13, 1, 1, 1, 1, 1, 1, 1, 0, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 35, 5, 5, 5, 20, 5, 19, 23, 0, 0, 0, 0, + 1, 1, 1, 15, 1, 17, 1, 1, 24, 5, 5, 23, 0, 23, 5, 27, + 5, 5, 5, 24, 0, 0, 0, 0, 1, 1, 1, 17, 15, 1, 1, 1, + 1, 1, 1, 1, 1, 16, 16, 37, 5, 35, 19, 19, 15, 0, 0, 0, + 1, 1, 1, 1, 44, 1, 0, 0, 1, 24, 20, 83, 33, 0, 0, 0, + 5, 34, 1, 1, 1, 1, 1, 1, 1, 1, 16, 5, 5, 23, 0, 16, + 20, 36, 13, 13, 13, 13, 13, 13, 11, 11, 11, 11, 11, 23, 0, 0, + 10, 10, 62, 3, 3, 3, 69, 30, 98, 3, 3, 3, 3, 3, 3, 3, + 3, 0, 0, 0, 0, 0, 0, 38, 13, 13,137, 12, 12, 12, 12, 12, + 12, 12, 12,100, 0, 0, 0, 0, 40, 33, 0, 0, 0, 0, 0, 0, + 25, 1, 1, 24, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 16, 19, 5, 5, 5, 36, 0, 0, 0, 0, 0, + 5, 5, 5, 36, 13, 13, 3, 3, 14, 14, 56, 0, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 48, 10, 10, 10, 17, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 0, 17, 1, 14, 52, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 44,135, 13, 10, 10, 10, 78, 13, 33, 0, 0, + 7, 7, 7, 7, 32, 43, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 15, 0, 27, 34, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 0, 0, 0, 27, 5, 81, 14, 14, 14, 14, 14, 14, + 14, 61, 23, 0, 0, 0, 0, 0, 16, 14, 12,100, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 17, 14, 14, 58, 14, 14, 14, 58, 82, + 0, 15, 0, 0, 0, 0, 0, 0, 1, 15, 17, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 15, 0, 0, 0, 1, 1, 1, 1, 1, 0, 41, 36, + 18, 18, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 3, 29, 0, + 3, 3, 0, 0, 0, 3, 3, 3, 29, 3, 29, 0, 0, 0,188, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 5, 5, 5, 5, 5, 5, 5, 0, + 3, 3, 3, 41, 50, 3, 3, 3, 3, 3,101, 19, 5, 3,101, 16, + 16,189, 18, 18, 18, 92, 5, 5, 5, 50, 41, 5, 5, 5, 3, 3, + 3, 3, 3, 3, 3, 5, 5, 3, 3, 5, 50, 0, 0, 0, 0, 0, + 16,190, 3, 3, 3, 41, 50,101, 16, 0, 0, 0, 0, 0, 0, 0, + 6, 6, 46, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 32, 7, + 0, 32, 39, 32, 39, 7, 32, 7, 7, 7, 7, 6, 6, 43, 43, 6, + 6, 6, 43, 6, 6, 6, 6, 6, 6, 6, 7, 39, 7, 32, 39, 7, + 7, 7, 32, 7, 7, 7, 32, 6, 6, 6, 6, 6, 7, 39, 7, 32, + 7, 7, 32, 32, 0, 7, 7, 7, 32, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 46, 7, 7, 7, 7, 59, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, + 7, 7, 59, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 60, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 59, + 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 59, 6, 6, 6, + 6, 60, 6, 6, 6, 8, 0, 11, 5, 5, 5, 50, 3, 41, 5, 5, + 5, 5, 5, 5, 5, 5, 50, 3, 3, 3, 41, 3, 3, 3, 3, 3, + 3, 3, 50, 65, 13, 13, 0, 0, 0, 0, 0, 0, 0, 27, 5, 5, + 9, 9, 9, 9, 9, 9, 99, 0, 6, 6, 6, 6, 6,128, 6, 6, + 8, 6, 6, 6, 8, 8, 21, 6, 21, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 58, 14, + 5, 5, 5, 23, 5, 5, 5, 5, 5, 5, 5, 5, 23, 27, 5, 5, + 5, 27, 23, 5, 5, 23, 0, 0, 14, 14, 14, 14, 14, 14, 14, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 5, 5, 5, 81, 14, 14, 14, 0, + 11, 11, 11, 11, 11, 0, 0, 55, 1, 1, 1, 1, 1, 1, 1, 23, + 1, 1, 1, 1, 1, 1, 5, 5, 11, 11, 11, 11, 11, 0, 0,115, + 1, 1, 1, 1, 1, 44, 5, 5,191, 11, 11, 11, 11,192, 0, 38, + 1, 24, 1, 25, 1, 1, 1, 5, 1, 1, 24, 0, 0, 0, 0, 44, + 1, 1, 1, 15, 1, 1, 17, 15, 1, 1, 15, 48, 10, 10, 10, 10, 6, 6, 5, 5, 5, 81, 0, 0, 10, 10, 10, 10, 10, 10, 75, 10, - 190, 10, 51, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 75, + 193, 10, 51, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 75, 10, 10, 10, 10, 10, 10, 10, 0, 1, 1, 17, 1, 1, 1, 1, 1, - 17, 14, 14, 17, 17, 1, 1, 1, 1, 14, 1, 1, 17, 17, 0, 0, - 0, 14, 0, 17, 17, 17, 17, 1, 17, 14, 14, 17, 17, 17, 17, 17, - 17, 14, 14, 17, 1, 14, 1, 1, 1, 14, 1, 1, 17, 1, 14, 14, + 17, 15, 15, 17, 17, 1, 1, 1, 1, 15, 1, 1, 17, 17, 0, 0, + 0, 15, 0, 17, 17, 17, 17, 1, 17, 15, 15, 17, 17, 17, 17, 17, + 17, 15, 15, 17, 1, 15, 1, 1, 1, 15, 1, 1, 17, 1, 15, 15, 1, 1, 1, 1, 1, 17, 1, 1, 17, 1, 17, 1, 1, 17, 1, 1, - 9, 0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 63, 3, + 9, 0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 62, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 29, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3,108, 22, 22, 3, 3, 3, 3, 29, 0, 3, 3, - 9, 9, 9, 9, 98, 0, 0, 0, 3, 3, 3, 3, 3, 29, 0, 3, - 3, 3, 3, 29, 29, 0, 44, 3, 3, 3, 3, 3, 3, 3, 29, 44, - 3, 3, 3, 3, 3, 29, 0, 44, 3, 29, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 29, 0, 0, 0, 3, 3, 3, 3, 3,110, 22, 22, + 3, 3, 3, 3, 3, 0, 3, 3, 9, 9, 9, 9, 99, 0, 0, 0, + 3, 3, 3, 29, 29, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 54, + 3, 3, 3, 3, 3, 3, 0, 54, 3, 29, 3, 3, 3, 3, 3, 3, 11, 11, 11, 11, 11, 29, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 7, 7, 3, 3, 26, 26, 4, 4, 12, 12, 5, 5, 9, 9, 9, 5, 25, 25, 15, 15, 13, 13, - 21, 21, 6, 6, 7, 2, 10, 10, 14, 14, 2, 7, 1, 1, 10, 12, - 12, 10, 5, 9, 24, 24, 12, 2, 7, 12, 12, 7, 2, 12, 22, 18, + 14, 14, 21, 21, 6, 6, 7, 2, 10, 10, 2, 7, 1, 1, 10, 12, + 12, 10, 5, 9, 24, 24, 12, 2, 7, 12, 12, 7, 22, 18, 2, 12, 0, 0, 26, 2, 23, 23, 18, 22, 9, 2, 21, 2, 7, 10, 2, 10, - 12, 21, 10, 2, 2, 21, 2, 9, 7, 21, 8, 8, 2, 5, 26, 12, - 2, 26, 7, 6, 10, 7, 5, 2, 25, 26, 2, 15, 26, 25, 15, 2, - 6, 7, 21, 7, 2, 6, 12, 26, 7, 26, 21, 26, 20, 19, 9, 25, - 5, 25, 6, 2, 21, 6, 15, 26, 25, 22, 18, 21, 26, 21, 5, 7, - 6, 24, 6, 5, 26, 23, 21, 12, 6, 12, 2, 1, 29, 29, 26, 15, - 21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12, 6, 26, 7, 10, 21, - 17, 17, 9, 26, 7, 15, 29, 21, 21, 9, 24, 5, 25, 9, 1, 12, - 17, 21, 11, 12, 8, 24, 26, 9, 21, 22, 23, 26, 25, 2, 14, 2, - 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, 5, 22, 25, 18, 24, 26, - 26, 24, 9, 8, 8, 5, 5, 21, 15, 7, 2, 23, 21, 15, 17, 7, - 18, 2, 5, 6, 5, 24, 22, 20, 21, 20, 19, 21, 21, 16, 16, 21, - 7, 5, 5, 26, 14, 15, 18, 25, 7, 14, 17, 22, 17, 6, 24, 6, - 6, 21, 12, 15, 26, 10, 25, 0, 7, 20, 25, 1, 24, 15, 7, 19, - 9, 21, 17, 2, 17, 12, 1, 21, 12, 1, 24, 7, 29, 7, 7, 22, - 14, 7, 2, 24, 9, 24, 24, 2, 29, 1, 27, 28, 1, 29, 21, 29, - 1, 2, 15, 6, 18, 6, 12, 11, 26, 5, 14, 9, 5, 14, 26, 22, - 18, 26, 5, 12, 22, 21, 18, 17, 26, 6, 18, 18, 26, 14, 14, 6, - 12, 24, 11, 21, 24, 9, 6, 9, 6, 10, 7, 25, 17, 16, 16, 22, - 16, 16, 25, 17, 25, 24, 23, 2, 21, 14, 12, 17, 21, 1, 10, 1, - 7, 13, 13, 2, 23, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 10, 11, 12, 13, 0, 14, 0, 0, 0, 0, 0, 15, 0, 16, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 20, 0, 21, 22, 23, 0, 0, 0, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 36, 0, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, - 0, 0, 0, 0, 0, 0, 41, 42, 43, 44, 45, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 11, 12, 13, 14, 0, 0, 0, 0, 0, 0, 0, 0, 15, - 0, 0, 0, 0, 0, 0, 0, 16, 17, 18, 0, 19, 0, 20, 21, 0, - 0, 22, 23, 24, 25, 26, 0, 0, 0, 0, 27, 28, 29, 30, 0, 31, - 0, 32, 33, 0, 2, 34, 0, 0, 2, 1, 35, 0, 2, 1, 0, 0, - 2, 1, 0, 0, 2, 1, 0, 0, 0, 1, 0, 0, 2, 36, 0, 0, - 2, 1, 0, 0, 37, 1, 0, 0, 0, 38, 0, 0, 39, 40, 0, 0, - 41, 42, 0, 43, 44, 0, 45, 46, 0, 47, 0, 0, 48, 0, 0, 49, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 51, 4, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, - 53, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 55, 0, 0, 56, 0, - 57, 58, 59, 0, 60, 5, 61, 0, 62, 0, 63, 0, 64, 0, 0, 0, - 0, 65, 66, 0, 0, 0, 0, 0, 0, 67, 68, 0, 0, 0, 0, 0, - 0, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 71, 0, 0, 0, 3, 0, 0, 0, 72, 0, 73, 0, 0, 74, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, - 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 6, 78, 0, 0, 0, - 0, 5, 79, 0, 80, 81, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0, - 82, 83, 84, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, - 0, 0, 88, 0, 0, 0, 89, 0, 0, 0, 0, 90, 91, 0, 0, 0, - 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 93, 0, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 95, 0, 96, 0, 0, 97, 0, 98, 0, 0, 0, 0, 0, 6, 99, 0, - 9, 0, 0,100,101, 0, 7, 0, 0,102, 0, 0,103, 0, 0, 0, - 0, 0,104, 0,105, 1,106, 0, 0,107, 0, 0, 0,108, 0, 0, - 0,109, 0, 0, 0, 0, 0, 0, 3,110, 0, 0, 3, 0, 0, 0, - 111, 0, 0, 0,112, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, - 0, 0, 0, 0,113,114, 0, 0, 0, 0, 8, 0, 4,115, 0,116, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0,117, 0,118, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,121, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,122, 0, 0, 0, 0,123, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,124,125,126, 0, 0, 0, 0,127, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,129, 0, 0,130, - 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 131, 0,132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,133, 0, 0, 0, 0, 0, 0, 0,134, 0, 0, 0, 0, 0, - 0, 0,135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,136, 0, 0, 0,137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 1, 12, 0, 0, 1, 1, - 1, 1, 1, 49, 50, 5, 51, 52, 53, 5, 5, 22, 32, 23, 1, 54, - 24, 55, 16, 33, 56, 57, 58, 1, 1, 1, 0, 0, 0, 0, 6, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 59, 7, 60, 1, 34, 5, - 7, 61, 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 1, 68, 0, 0, 0, 69, 70, 71, 35, 1, 25, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 8, 1, 26, 16, 26, - 73, 27, 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, - 0, 0, 36, 25, 75, 37, 7, 37, 76, 0, 0, 0, 0, 0, 0, 0, - 6, 1, 7, 0, 0, 17, 0, 0, 0, 0, 0, 8, 38, 1, 1, 13, - 13, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 0, - 0, 0, 0, 6, 18, 1, 0, 0, 8, 16, 5, 1, 1, 1, 77, 7, - 36, 18, 78, 7, 35, 1, 0, 0, 0, 4, 79, 10, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 19, 0, 0, 0, 4, 0, 80, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 3, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 81, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 83, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 85, 86, 0, 0, 0, - 0, 0, 87, 88, 89, 90, 91, 92, 0, 0, 0, 0, 0, 0, 0, 93, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 28, 0, 0, 0, - 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, - 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 14, 0, 0, 20, 0, 0, - 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 0, 0, 0, - 0, 0, 0, 6, 29, 0, 3, 0, 0, 0, 0, 13, 1, 96, 0, 0, - 0, 0, 1, 18, 33, 97, 25, 23, 7, 1, 1, 1, 1, 27, 1, 7, - 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 6, 23, 1, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 21, - 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, - 0, 0, 12, 32, 24, 5, 99, 22, 42, 17, 0, 10, 11, 0, 7, 1, - 7,100,101, 1, 1, 1, 1, 1, 1, 1, 1,102,103,104, 0, 0, - 0, 0,105, 1,106, 10, 20,107,108, 5, 10, 0, 0, 0, 0, 0, - 0, 6, 11, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 109,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,111, 0, 0, 0, - 0, 6, 0, 1, 1, 11, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, - 0, 0, 11, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 1, - 1, 1, 11, 0, 0, 0, 0, 0, 43, 40, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 44,112, 10, 8, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, - 0, 0, 0, 0, 0,113, 1, 16, 5, 24, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 17, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 8, 12, 0, 0, 0, 0,114, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,115, 2, 0,116, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 13, 11, 0, 0, 0, 0, 0, 0, - 6, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 39, 0, 45, - 16, 18, 29, 0, 0, 0, 46, 27, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 2, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 3, 0, 0, 3, 0, 21, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 31, 0, 0, 0, 0,117, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, 0, 0, - 0, 30, 3, 0, 0, 0, 14, 21, 0, 0, 0, 0, 0, 19, 47, 0, - 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 47, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 28, 15, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 21, 41, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 28, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 22, 42, 0, 0, 0, 0, 0, 0,118, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,119, 0,120,121,122,123, 0, 43, 5, 48, 13, - 34, 0, 0, 0, 0, 0, 0, 0, 8, 11, 0, 0, 0, 0, 8, 10, - 0, 0, 0, 0, 0, 0, 1, 12, 1, 1, 1, 1, 26, 1, 38, 44, - 12, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0,124, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 6, 19, - 0, 8, 0, 20, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 1, - 125, 0, 0, 0, 0, 0,230,230,230,230, 0, 0, 0, 9, 9, 0, - 0, 0, 0, 9, 0, 0,220,220,220,220, 0, 0, 0,230,230,230, - 220,230, 0, 0,230,230, 7, 0, 0, 0,230, 0, 0, 0,230,230, - 0, 0,230,230,230, 0, 0,230,230,230, 0, 0, 9, 0, 0, 0, - 0, 7,230,230,230,220, 0,220, 0, 0,230,220,220,220, 0, 0, - 230, 0, 0,230, 0, 0, 0, 0, 7, 0, 1, 1, 1, 1,220,230, - 230,230,220,220,230,230,220,230,230,220,230, 0, 0,230,230,220, - 0, 0, 0, 9, 9, 0,220, 0, 0, 0, 0, 0, 9, 9, 0, 9, - 7, 0, 1,220,220,220,220,220,220,230,230,230,220,220,230,220, - 220,230,230,220,230,230,220,230,220,230,230,230, 0,230, 0,220, - 220,220,220,220, 0, 0, 9, 9, 0, 0, 1, 0, 0, 0, 0, 0, - 0,220,230, 0,230,230, 0, 0,220,220, 0, 0,230,220, 0, 0, - 9, 7,220,220,220, 0,230,232,220,220,220,220,232,216,220,202, - 202,220,220,220,220,202,202,220,220,220,230,240,230,220,230,220, - 220, 0,232,220,220,230,233,234,234,233,234,234,233,230, 0,220, - 230,230,230,230,222,220,230,222,228,230, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 19, 20, 21, 22, 0, 23, 0, 24, 25, 0,230,220, - 0, 18, 30, 31, 32, 0, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, - 34,230, 35, 0, 0, 0,230, 0,220,230, 0, 36, 0, 0,220,220, - 230,220,220,230,230, 0,230,230, 0,220, 27, 28, 29,230, 0,230, - 220,230, 0, 84, 91, 0,103,103, 9, 0,107,107,107,107,118,118, - 9, 0,122,122,122,122, 0,220, 0,220, 0,216, 0, 0, 0,129, - 130, 0,132, 0, 0, 0, 0, 0,130,130,130,130, 0, 0,130, 0, - 230,230, 9, 0,230,230, 0, 0,220, 0, 0,228, 0, 0, 0,222, - 230,220,230, 0, 0,220,230,220, 0,220,230,230,230,234,230, 0, - 1, 1,230,234,214,220,202,230,230,230,230,230,232,228,228,220, - 218,230,233,220,230,220,230,230, 1, 1, 1, 1, 1,230, 0, 1, - 1,230,220,230, 1, 1, 0, 0,218,228,232,222,224,224, 0, 8, - 8, 0,220, 0, 0,230, 0, 0, 26, 0, 0,220, 0,230,230, 1, - 220, 0, 0,230,220, 0, 0, 7, 9, 0, 6, 6, 0, 0, 0, 0, - 1, 0, 0,216,216, 1, 1, 1, 0, 0, 0,226,216,216,216,216, - 216, 0,232,232,220,230,230,230, 7, 0, 1, 0, 0, 0, 0, 0, - 0, 32, 0, 0, 0, 3, 0, 0, 0, 0, 4,101, 0,112,128,169, - 0, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,237, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2, 1, 1, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 6, 7, 8, 9, 0, - 0, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 20, 0, 0, 21, 22, 0, 0, 0, 0, 23, 24, - 25, 26, 0, 27, 0, 28, 29, 30, 31, 32, 0, 0, 0, 0, 0, 0, - 0, 33, 34, 35, 36, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 38, 39, 0, 0, 0, 0, 2, 1, 40, 41, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 36, 0, 0, - 8, 0, 0, 0, 0, 44, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 16, 8, 0, 0, 0, 0, 0, 0, 24, 48, 0, 0, - 0, 0, 0, 0, 28, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, - 60, 64, 0, 68, 0, 72, 76, 80, 0, 0, 0, 0, 0, 8, 84, 88, - 0, 92, 16, 8, 0, 0, 0, 4, 4, 16, 4, 4, 4, 4, 4, 4, - 4, 24, 20, 0, 96, 0, 16,100,104, 0, 4, 4,108, 0, 0, 0, - 40,112, 8, 16, 4, 4, 4, 4, 4, 8,116,120,124,128, 0, 0, - 4, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, - 4, 4, 4, 8, 0, 0, 24, 20,132, 36, 0, 28, 0,136, 16, 4, - 4, 4, 0, 0, 0, 0, 24, 12, 12,140,144, 12,148, 0,152, 8, - 4, 4, 0, 0,156, 0, 8, 8, 0, 24, 20, 8, 4, 0, 0, 0, - 8, 0, 0,160, 8, 8, 0, 0, 24, 20, 0, 8, 0, 8, 0, 8, - 0, 0, 0, 0, 40, 12, 12, 12, 12, 12, 12, 12, 12, 12, 20, 16, - 4,164, 12, 12, 12, 12, 12, 12, 12, 12, 12, 20, 0,168,172,176, - 0,180, 0, 24, 20, 0, 0, 0, 0, 0, 0, 0, 0,184, 16, 8, - 28, 8, 0, 0, 0, 8, 4, 4, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 12, 48, 0, 0, 4, 4, 8, 4, 4, 0, 0, 0, - 0, 0, 0, 0, 40, 20, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 32,188,192, 0, 0, 0, 0, 0, 0, 0, 4, 5, - 6, 7, 8, 9, 10, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 12, 13, 2, 2, 2, 2, 14, 0, 0, 0, 0, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 0, 0, 0, 25, 26, 3, 3, 3, 27, - 0, 0, 0, 28, 29, 30, 0, 31, 32, 33, 34, 35, 36, 37, 1, 1, + 12, 21, 10, 2, 2, 21, 2, 9, 7, 21, 26, 12, 8, 8, 2, 5, + 7, 6, 10, 7, 5, 2, 25, 26, 2, 15, 26, 25, 12, 26, 15, 2, + 6, 7, 21, 7, 2, 26, 7, 26, 21, 26, 20, 19, 2, 6, 9, 25, + 5, 25, 21, 6, 15, 26, 25, 22, 18, 21, 26, 21, 5, 7, 6, 24, + 6, 5, 26, 23, 21, 12, 6, 12, 26, 7, 2, 1, 29, 29, 26, 15, + 21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12, 6, 6, 2, 10, 21, + 17, 17, 9, 26, 7, 15, 29, 21, 21, 9, 24, 5, 25, 9, 17, 6, + 1, 12, 17, 21, 11, 12, 8, 24, 26, 9, 21, 22, 23, 26, 25, 2, + 14, 2, 26, 10, 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, 5, 22, + 25, 18, 24, 26, 26, 24, 9, 8, 8, 5, 5, 21, 15, 7, 2, 23, + 21, 15, 17, 7, 5, 6, 5, 24, 2, 24, 22, 20, 21, 20, 19, 21, + 21, 16, 16, 21, 18, 6, 23, 2, 7, 5, 5, 26, 14, 15, 18, 25, + 7, 14, 17, 22, 24, 6, 6, 21, 12, 15, 21, 14, 25, 0, 7, 20, + 25, 1, 24, 15, 7, 19, 9, 21, 6, 26, 17, 12, 1, 21, 12, 1, + 24, 7, 29, 7, 7, 22, 18, 2, 14, 7, 9, 24, 24, 2, 29, 1, + 27, 28, 1, 29, 21, 29, 1, 2, 15, 6, 12, 11, 26, 5, 14, 9, + 5, 14, 26, 22, 18, 26, 5, 12, 22, 21, 18, 17, 26, 6, 18, 18, + 26, 14, 14, 6, 12, 24, 11, 21, 24, 9, 6, 9, 6, 10, 7, 25, + 17, 16, 16, 22, 16, 16, 25, 17, 25, 24, 12, 17, 24, 12, 21, 1, + 2, 25, 10, 1, 10, 26, 7, 13, 13, 2, 23, 15, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 0, 14, 0, 0, 0, + 0, 0, 15, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, + 18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, 22, 23, 0, 0, + 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, + 0, 36, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, 41, 42, 43, 44, + 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 12, 13, 14, 0, 0, 0, + 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 16, 17, 18, + 0, 19, 0, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 0, 0, 0, + 27, 28, 29, 30, 0, 31, 0, 32, 33, 0, 2, 34, 0, 0, 2, 1, + 35, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 0, 1, + 0, 0, 2, 36, 0, 0, 2, 1, 0, 0, 37, 1, 0, 0, 0, 38, + 0, 0, 39, 40, 0, 0, 41, 42, 0, 43, 44, 0, 45, 46, 0, 47, + 0, 0, 48, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 4, 0, 0, 0, 0, 52, + 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 54, 0, 0, 0, 0, 0, + 0, 55, 0, 0, 56, 0, 57, 58, 59, 0, 60, 5, 61, 0, 62, 0, + 63, 0, 64, 0, 0, 0, 0, 65, 66, 0, 0, 0, 0, 0, 0, 67, + 68, 0, 0, 0, 0, 0, 0, 69, 70, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 3, 0, 0, 0, + 72, 0, 73, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, + 0, 6, 78, 0, 0, 0, 0, 5, 79, 0, 80, 81, 0, 0, 7, 8, + 0, 0, 0, 0, 0, 0, 82, 83, 84, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, + 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 87, 0, 0, 0, 0, 0, 0, 0, 88, 0, 0, 0, 89, 0, 0, 0, + 0, 90, 91, 0, 0, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 0, 94, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 95, 96, 97, 0, 0, 98, 0, 99, 0, 0, + 0, 0, 0, 6,100, 0, 9, 0, 0,101,102, 0, 7, 0, 0,103, + 0, 0,104, 0, 0, 0, 0, 0,105, 0,106, 1,107, 0, 0,108, + 0, 0, 0,109, 0, 0, 0,110, 0, 0, 0, 0, 0, 0, 3,111, + 0, 0, 3, 0, 0, 0,112, 0, 0, 0,113, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 0, 0, 0,114,115, 0, 0, 0, 0, + 8, 0, 4,116, 0,117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,118, 0,119, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,120, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,121, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,122, 0, 10, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 123, 0, 0, 0, 0,124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,125, 0,126,127,128, 0, + 0, 0, 0,129, 0,130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,131,132, 0, 0,133, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,134, 0,135, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,136, 0, 0, 0, 0, 0, 0, 0, + 137, 0, 0, 0, 0, 0, 0, 0,138, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,139, 0, 0, 0,140, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, + 1, 12, 0, 0, 1, 1, 1, 1, 1, 49, 50, 6, 51, 52, 53, 6, + 6, 25, 36, 26, 1, 54, 17, 55, 16, 27, 56, 57, 58, 1, 1, 1, + 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 59, 7, 60, 1, 18, 6, 7, 61, 62, 63, 64, 65, 66, 67, 68, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 69, 0, 0, 0, 70, 71, + 72, 37, 1, 28, 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, + 0, 8, 1, 29, 16, 29, 74, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 75, 0, 0, 0, 0, 0, 0, 0, 30, 28, 76, 31, 7, 31, 77, 0, + 0, 0, 0, 0, 0, 0, 5, 1, 7, 0, 0, 19, 0, 0, 0, 0, + 0, 8, 39, 1, 1, 13, 13, 11, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 40, 0, 0, 0, 0, 0, 0, 5, 20, 1, 0, 0, 8, 16, + 6, 1, 1, 1, 78, 7, 30, 20, 79, 7, 37, 1, 0, 0, 0, 4, + 80, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 4, + 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 14, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 83, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 85, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, + 0, 86, 87, 0, 0, 0, 0, 0, 88, 89, 90, 91, 92, 93, 0, 0, + 0, 0, 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 32, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 13, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, + 14, 0, 0, 22, 0, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 96, 0, 0, 0, 0, 0, 0, 5, 23, 0, 3, 0, 0, 0, + 0, 13, 1, 97, 0, 0, 0, 0, 1, 20, 27, 98, 28, 26, 7, 1, + 1, 1, 1, 30, 1, 7, 99, 18, 10, 0, 0, 0, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 5, 26, 1, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 24, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 0, 0, 0, 12, 36, 17, 6,100, 25, 43, 19, + 0, 10, 11, 0, 7, 1, 7,101,102, 1, 1, 1, 1, 1, 1, 1, + 1,103,104,105, 0, 0, 0, 0,106, 1,107, 10, 22,108,109, 6, + 10, 0, 0, 0, 0, 0, 0, 5, 11, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 0,110,111, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,112, 0, 0, 0, 0, 5, 0, 1, 1, 11, 0, 0, 0, 0, + 0, 0, 0, 8, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 1, 1, 1, 1, 11, 0, 0, 0, 0, 0, 34, 41, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 44,113, 10, 8, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,114, 1, 16, 6, 17, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 23, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 12, 0, 0, 0, 0,115, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,116, 2, 0,117, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 13, 11, + 0, 0, 0, 0, 0, 0, 5, 10, 0, 0, 0, 0, 0, 0, 5, 17, + 0, 0, 0, 0, 0, 0, 0, 0, 27, 31, 18, 40, 0,118, 16, 20, + 23, 0, 0, 0, 45, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 2, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 3, 0, 0, 3, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 35, 0, 0, 0, 0,119, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, 0, 0, 0, 33, + 3, 0, 0, 0, 14, 24, 0, 0, 0, 0, 0, 21, 46, 0, 0, 0, + 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 32, 15, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 24, 42, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, + 25, 43, 0, 0, 0, 0, 0, 0,120, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,121, 0, 34, 23, 0, 0, 0, 0, 0, 0,122,123,124, + 47, 0, 34, 6, 48, 13, 18, 0, 0, 0, 0, 0, 0, 0, 8, 11, + 0, 0, 0, 0, 8, 10, 0, 0, 47, 0,125,126,127, 0, 0, 0, + 0, 0, 0, 0, 1, 12, 1, 1, 1, 1, 29, 1, 39, 44, 12, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 21, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,128, + 0, 0, 0, 0, 0, 0, 0, 45, 0, 0, 0, 0, 5, 21, 0, 8, + 0, 22, 0, 0, 0, 0, 0, 0, 6, 48, 0, 0, 0, 1,129, 0, + 0, 0, 0, 0,230,230,230,230, 0, 0, 0, 9, 9, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 0,230,220,220,220,220,230,230,220,230, + 0, 0,230,230, 7, 0, 0, 0,230, 0, 0, 0,230,230, 0, 0, + 230,230,230, 0, 0,230,230,230, 0, 0, 9, 0, 0, 0, 0, 7, + 230,230,230,220,220,220,230,230,230,230,220,220, 0,220, 0, 0, + 230,220,220,220, 0, 0,230, 0, 0,230, 0, 0,220, 0, 0, 0, + 0, 0, 7, 0, 1, 1, 1, 1,220,230,230,230,220,220,220,230, + 220,230,230,220,230, 0, 0,230,230,220,230,230,220,230,220,230, + 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,220, 0, 9, 7, 0, + 1,220,220,220,230,220,220,230,230,220, 0, 0,230,230, 0,230, + 0,220,220,220,220,220, 0, 0, 9, 9, 0, 0, 1, 0, 0, 0, + 230, 0,230,230, 0, 0,230,220, 0, 0, 9, 7,216,216,216, 0, + 220,220,220, 0,230,232,220,220,220,220,232,216,220,202,202,220, + 220,220,220,202,202,220,220,220,230,240,230,220,230,220,220, 0, + 232,220,220,230,233,234,234,233,234,234,233,230, 0,220,230,230, + 230,230,222,220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 19, 20, 21, 22, 0, 23, 0, 24, 25, 0,230,220, 0, 18, + 10, 21, 0, 0, 30, 31, 32, 0, 0, 0, 0, 27, 28, 29, 30, 31, + 32, 33, 34,230, 35, 0, 0, 0,230, 0,220,230, 0, 36, 0, 0, + 220,220,230,220,220,230,230, 0,230,230, 0,220, 27, 28, 29,230, + 0,230,220,230, 0, 84, 91, 0,103,103, 9, 0,107,107,107,107, + 118,118, 9, 0,122,122,122,122, 0,220, 0,220, 0,216, 0, 0, + 0,129,130, 0,132, 0, 0, 0, 0, 0,130,130,130,130, 0, 0, + 130, 0,230,230, 9, 0,230,230, 0, 0,220, 0, 0,228, 0, 0, + 0,222,230,220,230, 0, 0,220,230,220, 0,220,230,230,230,234, + 230, 0, 1, 1,230,234,214,220,202,230,230,230,230,230,232,228, + 228,220,218,230,233,220,230,220,230,230, 1, 1, 1, 1, 1,230, + 0, 1, 1,230,220,230, 1, 1, 0, 0,218,228,232,222,224,224, + 0, 8, 8, 0,220, 0, 0,230, 0, 0, 26, 0, 0,220, 0,230, + 230, 1,220, 0, 0,230,220, 0, 0, 0,220,220, 0, 7, 9, 0, + 6, 6, 0, 0, 0, 0, 1, 0, 0,216,216, 1, 1, 1, 0, 0, + 0,226,216,216, 0, 0, 0, 1, 1, 0, 0,216,216,216, 0, 0, + 232,232,220,230,230,230, 7, 0, 1, 0, 0, 32, 0, 48, 0, 0, + 84, 96,135,144, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,176, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 1, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 21, 22, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 25, 26, 0, + 27, 0, 28, 29, 30, 31, 32, 0, 0, 0, 0, 0, 0, 0, 33, 34, + 35, 36, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 39, 40, 0, 0, 0, 0, 2, 1, 41, 42, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 32, 36, 0, 0, 8, 0, 0, 0, 0, 44, + 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 16, 8, + 0, 0, 0, 0, 0, 0, 24, 48, 0, 0, 0, 0, 0, 0, 28, 0, + 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, + 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 60, 64, 0, 68, 0, 72, + 76, 80, 0, 0, 0, 0, 0, 8, 84, 88, 0, 92, 16, 8, 0, 0, + 0, 4, 4, 16, 4, 4, 4, 4, 4, 4, 4, 24, 20, 0, 96, 0, + 16,100,104, 0, 4, 4,108, 0, 0, 0, 40,112, 8, 16, 4, 4, + 4, 4, 4, 8,116,120,124,128, 0, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 8, 0, 0, + 24, 20,132, 36, 0, 28, 0,136, 16, 4, 4, 4, 0, 0, 0, 0, + 24, 12, 12,140,144, 12,148, 0,152, 8, 4, 4, 0, 0,156, 0, + 8, 8, 0, 24, 20, 8, 4, 0, 0, 0, 8, 0, 0,160, 8, 8, + 0, 0, 24, 20, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 40, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 20, 16, 4,164, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 20, 0,168,172,176, 0,180, 0, 24, 20, 0, + 0, 0, 0, 0, 0, 0, 0,184, 16, 8, 28, 8, 0, 0, 0, 8, + 4, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 12, 48, + 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 8, 4, 4, 0, + 0, 0, 0, 0, 0, 0, 40, 20, 0, 8, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 32,188,192, 0, 0, 0, 0, 0, 0, 0, + 24, 20, 8, 0,196, 0, 0, 0, 19, 19, 19, 19, 20, 18, 20, 18, + 20, 18, 19, 19, 18, 20, 18, 20, 19, 19, 20, 18, 18, 20, 18, 19, + 19, 19, 19, 20, 19, 20, 18, 19, 19, 19, 19, 21, 19, 17, 19, 19, + 19, 20, 18, 20, 21, 19, 17, 19, 18, 19, 19, 19, 19, 19, 19, 25, + 19, 19, 19, 13, 22, 22, 22, 16, 16, 16, 19, 19, 19, 32, 19, 19, + 19, 38, 19, 37, 31, 29, 30, 19, 36, 19, 19, 19, 19, 19, 19, 26, + 19, 23, 19, 19, 15, 19, 19, 19, 28, 19, 19, 19, 19, 19, 33, 19, + 35, 34, 19, 34, 27, 19, 19, 19, 18, 12, 19, 19, 20, 18, 24, 24, + 24, 19, 23, 23, 19, 19, 14, 14, 14, 15, 15, 19, 20, 18, 19, 21, + 11, 20, 18, 19, 18, 22, 20, 18, 16, 20, 18, 20, 18, 19, 19, 9, + 8, 19, 19, 7, 10, 19, 19, 19, 19, 6, 19, 19, 20, 18, 19, 20, + 19, 19, 5, 19, 19, 19, 19, 4, 3, 4, 19, 19, 20, 18, 2, 19, + 19, 19, 1, 19, 19, 17, 19, 20, 18, 19, 20, 18, 0, 19, 19, 19, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 1, 1, 1, + 1, 1, 1, 19, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 20, 21, 22, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 23, 0, 0, 0, 0, 0, 0, 0, 0, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, 36, 5, 37, 5, 5, + 38, 39, 0, 0, 0, 0, 0, 0, 40, 0, 41, 42, 4, 4, 4, 4, + 4, 4, 43, 44, 45, 0, 0, 0, 0, 0, 0, 46, 47, 0, 0, 48, + 0, 0, 0, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 38, 1, 1, 39, 1, 40, 1, 1, 1, 41, 0, 42, 1, 1, - 43, 1, 1, 1, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 61, 1, 1, 1, 1, 62, 1, + 1, 1, 1, 63, 1, 1, 1, 1, 1, 1, 64, 65, 0, 0, 66, 0, + 1, 1, 1, 1, 67, 1, 1, 1, 1, 1, 1, 1, 1, 68, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 69, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1508,506 +1553,472 @@ static const uint8_t _hb_ucd_u8[19845]= 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 20, - 21, 8, 8, 8, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 2, 2, 51, 52, 53, 54, 9, 9, 9, 9, 9, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 8, 8, 70, 71, 72, - 73, 74, 75, 5, 5, 5, 5, 76, 5, 5, 5, 5, 5, 5, 5, 15, - 15, 5, 5, 5, 5, 77, 5, 78, 79, 80, 81, 82, 83, 1, 84, 85, - 86, 87, 88, 89, 90, 91, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 92, 1, 1, 1, 1, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 93, 16, 16, 94, 95, 96, 97, 98, - 99,100,101,102,103,104,105, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,106, 0, - 0, 1, 1,107,108,109, 13, 13, 13,110,111,112,113,114,115,116, - 117,118,119, 0,120,121,122,123,124,125,126, 17, 17,127,128,129, - 130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145, - 146,147,148,149,150,151,152,153,154, 0,155,156,157,158, 0,159, - 160,161,162,163,164,165,166,167,168,169,170, 0,171,172,173, 7, - 7, 7, 7, 7, 7, 7,174,175, 7,176, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,177, 4, - 4, 4, 4, 4, 4, 4, 4,178, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4,179, 11, 11, 11, 11,180, 0, 0, 0, 0, - 0,181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, - 12, 12, 12,182,183,184,185, 0, 0,186, 0,187,188,189,190, 3, - 3, 3, 3, 3, 3, 14, 14, 14,191,192,193, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,194,195, - 196,197, 18, 18,198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,199,200, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 5,201, 5, 5, 5,202,203,204, 5, - 205,206,207,208,209,210, 0,211,212,213, 5, 5,214, 5,215, 10, - 10, 10, 10, 10,216, 0, 0, 0, 0, 0, 0, 0, 0,217, 0,218, - 219,220, 0, 0,221, 0, 0, 0,222, 0,223, 0,224, 0,225,226, - 227,228, 0, 0, 0, 0, 0,229,230,231, 0,232,233, 0, 0,234, - 235, 5,236,237, 0, 5, 5, 5, 5, 5, 5, 5,238, 5,239,240, - 241, 5, 5,242,243, 5,244, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,245, 1, 1,246, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,247, 1, 1, 1, - 1, 1, 1, 1, 1, 1,248, 1, 1, 1, 1,249, 0, 0, 0, 1, - 1, 1, 1,250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 1,251, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1,252, 0, 0, 0, 0, 0, 0, 0,253, - 0, 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, - 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 13, 13, 13, 13, 13, 12, - 12, 12, 12, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0,136, - 136,136,136,136,136,136,136, 80, 80, 80, 80, 80, 80, 80, 80, 19, - 19, 19, 19, 19, 19, 19, 19, 3, 3, 3, 3, 3, 3, 3, 3, 63, - 63, 63, 63, 63, 63, 63, 63, 39, 39, 39, 39, 39, 39, 39, 39, 28, - 28, 28, 28, 28, 28, 28, 28, 79, 79, 79, 79, 79, 79, 79, 79,131, - 131,131,131,131,131,131,131, 1, 1, 1, 1, 1, 1, 1, 1,127, - 127,127,127,127,127,127,127, 6, 6, 6, 6, 6, 6, 6, 6,155, - 155,155,155,155,155,155,155,139,139,139,139,139,139,139,139, 9, - 9, 9, 9, 9, 9, 9, 9, 15, 15, 15, 15, 15, 15, 15, 15, 30, - 30, 30, 30, 30, 30, 30, 30,110,110,110,110,110,110,110,110, 77, - 77, 77, 77, 77, 77, 77, 77, 17, 17, 17, 17, 17, 17, 17, 17, 27, - 27, 27, 27, 27, 27, 27, 27, 33, 33, 33, 33, 33, 33, 33, 33,113, - 113,113,113,113,113,113,113, 49, 49, 49, 49, 49, 49, 49, 49, 25, - 25, 25, 25, 25, 25, 25, 25, 29, 29, 29, 29, 29, 29, 29, 29, 7, - 7, 7, 7, 7, 7, 7, 7, 32, 32, 32, 32, 32, 32, 32, 32, 8, - 8, 8, 8, 8, 8, 8, 8, 99, 99, 99, 99, 99, 99, 99, 99, 31, - 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 2,105, - 105,105,105,105,105,105,105, 55, 55, 55, 55, 55, 55, 55, 55, 62, - 62, 62, 62, 62, 62, 62, 62, 56, 56, 56, 56, 56, 56, 56, 56, 91, - 91, 91, 91, 91, 91, 91, 91, 0, 0, 0, 0, 2, 2, 2, 2,100, - 100,100,100,100,100,100,100,119,119,119,119,119,119,119,119, 14, - 14, 14, 14, 14, 14, 14, 14,130,130,130,130,130,130,130,130, 94, - 94, 94, 94, 94, 94, 94, 94,157,157,157,157,157,157,157,157,137, - 137,137,137,137,137,137,137,146,146,146,146,146,146,146,146, 20, - 20, 20, 20, 20, 20, 20, 20, 35, 35, 35, 35, 35, 35, 35, 35, 0, - 0, 0, 0, 0, 0, 2, 2, 84, 84, 84, 84, 84, 84, 84, 84, 40, - 40, 40, 40, 40, 40, 40, 40, 97, 97, 97, 97, 97, 97, 97, 97,124, - 124,124,124,124,124,124,124,123,123,123,123,123,123,123,123,125, - 125,125,125,125,125,125,125,140,140,140,140,140,140,140,140,159, - 159,159,159,159,159,159,159,132,132,132,132,132,132,132,132, 37, - 37, 37, 37, 37, 37, 37, 37, 22, 22, 22, 22, 22, 22, 22, 22, 24, - 24, 24, 24, 24, 24, 24, 24, 58, 58, 58, 58, 58, 58, 58, 58, 76, - 76, 76, 76, 76, 76, 76, 76, 26, 26, 26, 26, 26, 26, 26, 26, 75, - 75, 75, 75, 75, 75, 75, 75, 89, 89, 89, 89, 89, 89, 89, 89,114, - 114,114,114,114,114,114,114,141,141,141,141,141,141,141,141,133, - 133,133,133,133,133,133,133,163,163,163,163,163,163,163,163, 4, - 4, 4, 4, 4, 4, 4, 4, 70, 70, 70, 70, 70, 70, 70, 70, 0, - 0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 2, 2, 2, 2, 2, 68, - 68, 68, 68, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, 92, 87, - 87, 87, 87, 87, 87, 87, 87,135,135,135,135,135,135,135,135, 85, - 85, 85, 85, 85, 85, 85, 85, 96, 96, 96, 96, 96, 96, 96, 96,109, - 109,109,109,109,109,109,109,102,102,102,102,102,102,102,102, 64, - 64, 64, 64, 64, 64, 64, 64, 61, 61, 61, 61, 61, 61, 61, 61, 65, - 65, 65, 65, 65, 65, 65, 65, 2, 0, 0, 0, 0, 0, 0, 0,108, - 108,108,108,108,108,108,108,142,142,142,142,142,142,142,142,121, - 121,121,121,121,121,121,121,166,166,166,166,166,166,166,166,167, - 167,167,167,167,167,167,167, 0, 2, 2, 2, 2, 2, 2, 2,151, - 151,151,151,151,151,151,151,152,152,152,152,152,152,152,152, 38, - 38, 38, 38, 38, 38, 38, 38, 90, 90, 90, 90, 90, 90, 90, 90, 23, - 23, 23, 23, 23, 23, 23, 23, 36, 36, 36, 36, 36, 36, 36, 36, 30, - 2, 30, 30, 30, 30, 2, 2, 48, 48, 48, 48, 48, 48, 48, 48, 93, - 93, 93, 93, 93, 93, 93, 93, 73, 73, 73, 73, 73, 73, 73, 73, 9, - 9, 9, 9, 9, 9, 2, 2, 13, 13, 13, 13, 13, 13, 2, 2, 86, - 86, 86, 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 2, 2, 2, 67, - 67, 67, 67, 67, 67, 67, 67, 51, 51, 51, 51, 51, 51, 51, 51,104, - 104,104,104,104,104,104,104,170,170,170,170,170,170,170,170, 78, - 78, 78, 78, 78, 78, 78, 78,144,144,144,144,144,144,144,144,165, - 165,165,165,165,165,165,165,171,171,171,171,171,171,171,171,126, - 126,126,126,126,126,126,126,150,150,150,150,150,150,150,150,134, - 134,134,134,134,134,134,134,138,138,138,138,138,138,138,138,175, - 175,175,175,175,175,175,175, 18, 18, 18, 18, 18, 18, 18, 18, 0, - 0, 0, 0, 0, 2, 0, 0, 60, 60, 60, 60, 60, 60, 60, 60, 69, - 69, 69, 69, 69, 69, 69, 69,118,118,118,118,118,118,118,118, 59, - 59, 59, 59, 59, 59, 59, 59,106,106,106,106,106,106,106,106,156, - 156,156,156,156,156,156,156,147,147,147,147,147,147,147,147,148, - 148,148,148,148,148,148,148,169,169,169,169,169,169,169,169,172, - 172,172,172,172,172,172,172,164,164,164,164,164,164,164,164,168, - 168,168,168,168,168,168,168,174,174,174,174,174,174,174,174, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, 0, 0, 0, 0, 5, - 5, 5, 5, 5, 5, 5, 5, 21, 21, 21, 21, 21, 21, 21, 21, 16, - 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, 12, 12, 2, 74, - 74, 74, 74, 74, 74, 74, 74, 42, 42, 42, 42, 42, 42, 42, 42, 50, - 50, 50, 50, 50, 50, 50, 50,161,161,161,161,161,161,161,161, 47, - 47, 47, 47, 47, 47, 47, 47,120,120,120,120,120,120,120,120,116, - 116,116,116,116,116,116,116, 98, 98, 98, 98, 98, 98, 98, 98, 57, - 57, 57, 57, 57, 57, 57, 57, 88, 88, 88, 88, 88, 88, 88, 88,117, - 117,117,117,117,117,117,117,112,112,112,112,112,112,112,112,101, - 101,101,101,101,101,101,101,111,111,111,111,111,111,111,111,154, - 154,154,154,154,154,154,154,143,143,143,143,143,143,143,143,115, - 115,115,115,115,115,115,115, 0, 0, 19, 0, 0, 0, 0, 0, 95, - 95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 11, 11, 11, 11, 11, 10, - 10, 10, 10, 10, 10, 10, 10, 22, 22, 22, 2, 2, 2, 22, 22, 2, - 25, 25, 25, 25, 25, 25, 25, 34, 34, 34, 34, 34, 34, 34, 34, 52, - 52, 52, 52, 52, 52, 52, 52, 54, 54, 54, 54, 54, 54, 54, 54, 0, - 0, 0, 2, 2, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 2, 2, - 2, 12, 12, 12, 12, 12, 12, 71, 71, 71, 71, 71, 71, 71, 71, 41, - 41, 41, 41, 41, 41, 41, 41, 53, 53, 53, 53, 53, 53, 53, 53, 81, - 81, 81, 81, 81, 81, 81, 81, 66, 66, 66, 66, 66, 66, 66, 66, 72, - 72, 72, 72, 72, 72, 72, 72,173,173,173,173,173,173,173,173, 83, - 83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, 82,158, - 158,158,158,158,158,158,158,153,153,153,153,153,153,153,153,145, - 145,145,145,145,145,145,145,103,103,103,103,103,103,103,103,160, - 160,160,160,160,160,160,160, 2, 3, 3, 2, 3, 2, 2, 3, 3, - 3, 3, 2, 3, 3, 3, 3, 19, 19, 19, 19, 19, 19, 19, 0, 2, - 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 0, 3, 3, 5, - 5, 5, 5, 5, 2, 2, 5, 11, 11, 11, 2, 2, 2, 2, 11, 10, - 10, 10, 10, 10, 10, 2, 10, 21, 21, 21, 21, 21, 2, 2, 21, 22, - 2, 22, 22, 22, 22, 2, 2, 23, 23, 23, 23, 23, 2, 23, 23, 23, - 2, 23, 23, 23, 23, 23, 23, 16, 16, 16, 16, 16, 2, 16, 16, 16, - 2, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 20, 2, 20, 20, 20, - 2, 20, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, 36, 36, 2, 25, - 25, 25, 25, 25, 2, 25, 25, 8, 8, 8, 8, 8, 8, 2, 8, 2, - 2, 2, 2, 2, 8, 2, 2, 29, 29, 29, 29, 29, 29, 2, 2, 45, - 45, 45, 45, 45, 45, 45, 45, 44, 44, 44, 44, 44, 44, 44, 44, 43, - 43, 43, 43, 43, 43, 43, 43, 31, 31, 2, 2, 2, 2, 2, 2, 48, - 48, 48, 48, 2, 2, 2, 2, 91, 91, 2, 2, 2, 2, 2, 2, 1, - 1, 1, 1, 1, 1, 2, 2, 9, 9, 9, 9, 9, 2, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 2, 19, 19, 19, 19, 19, 2, 2, 2, 0, - 0, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 61, 0, - 17, 17, 17, 17, 17, 17, 17, 12, 12, 12, 12, 2, 2, 2, 2, 13, - 13, 2, 2, 2, 2, 2, 2, 19, 19, 19, 19, 19, 19, 19, 2, 0, - 0, 0, 2, 0, 0, 0, 0, 49, 49, 49, 49, 49, 49, 2, 2, 0, - 0, 0, 2, 2, 2, 2, 0,135,135,135,135, 2, 2, 2, 2,161, - 161,161, 2,161,161,161,161,161,161, 2,161,161,161,161,161, 19, - 19, 19, 2, 2, 2, 2, 2,128,128,128,128,128,128,128,128, 57, - 2, 2, 2, 2, 2, 2, 2,112,112,112,112,112,112,112, 2,122, - 122,122,122,122,122,122,122,130,130,130, 2, 2, 2, 2, 2,165, - 165,165,165,165,165, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3,149, - 149,149,149,149,149,149,149, 94, 94, 94, 94, 94, 94, 2, 2,129, - 129,129,129,129,129,129,129,107,107,107,107,107, 2, 2,107,107, - 107,107,107,107,107,107,107,107,107,107,107,107, 2, 2, 2,171, - 171,171,171,171,171, 2,171,123,123,123,123,123,123, 2, 2,102, - 102, 2, 2, 2, 2, 2, 2,154,154,154,154,154,154,154, 2, 2, - 2,150,150,150,150,150,150,169,169, 2, 2, 2, 2, 2, 2,138, - 138,138,138,138,138,138, 2,103,103,103,103,103,103, 2, 2,119, - 119, 2,119,119,119,119,119, 2, 2, 0, 0, 0, 0, 0, 0, 3, - 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 19, - 0, 0, 0, 0, 0, 0, 0, 19, 19, 19, 19, 19, 0, 0, 0, 0, - 0, 26, 26, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 2, - 2, 9, 9, 9, 9, 0, 9, 2, 2, 2, 2, 9, 0, 9, 0, 9, - 9, 9, 2, 9, 2, 9, 9, 9, 9, 2, 9, 9, 9, 9, 9, 9, - 9, 55, 55, 55, 55, 55, 55, 6, 6, 6, 6, 6, 1, 1, 6, 4, - 4, 4, 4, 4, 4, 4, 2, 4, 4, 4, 2, 2, 4, 4, 4, 2, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 2, 2, 2, 2, 14, 14, - 14, 14, 14, 14, 2, 2, 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, - 3, 3, 0, 3, 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, - 3, 3, 3, 3, 3, 3, 3, 37, 37, 37, 37, 37, 37, 2, 37, 37, - 37, 37, 2, 2, 37, 37, 37, 38, 38, 2, 2, 2, 2, 2, 2, 64, - 64, 64, 2, 2, 64, 64, 64, 90, 90, 90, 90, 90, 90, 2, 2, 90, - 90, 90, 90, 90, 90, 90, 2, 95, 95, 95, 95, 2, 2, 95, 2, 37, - 37, 37, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 3, 3, - 3, 0, 3, 3, 3, 3, 3, 7, 1, 1, 1, 1, 7, 7, 7, 7, - 7, 7, 7, 0, 0, 7, 7, 5, 5, 5, 5, 2, 5, 5, 5, 5, - 2, 2, 5, 5, 5, 5, 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, - 2, 5, 2, 2, 2, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, 5, - 2, 2, 5, 5, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, - 2, 2, 2, 5, 5, 2, 5, 5, 5, 5, 5, 2, 2, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 2, 2, 11, 11, 11, 2, 11, 11, 11, 11, - 2, 2, 11, 11, 11, 11, 11, 11, 2, 11, 11, 11, 11, 11, 11, 11, - 2, 11, 11, 2, 11, 11, 2, 11, 11, 2, 2, 11, 2, 11, 11, 11, - 2, 2, 11, 11, 11, 2, 2, 2, 11, 2, 2, 2, 2, 2, 2, 2, - 11, 11, 11, 11, 2, 11, 2, 2, 2, 2, 2, 2, 2, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 2, 2, 10, 10, 10, 2, 10, 10, 10, 10, - 10, 2, 10, 10, 10, 10, 10, 10, 2, 10, 10, 10, 10, 10, 10, 10, - 2, 10, 10, 2, 10, 10, 10, 10, 10, 2, 2, 10, 10, 10, 10, 10, - 10, 2, 10, 10, 10, 2, 2, 10, 2, 2, 2, 2, 2, 2, 2, 10, - 10, 10, 10, 2, 2, 10, 10, 10, 10, 2, 2, 2, 2, 2, 2, 2, - 10, 10, 10, 10, 10, 10, 10, 2, 21, 21, 21, 2, 21, 21, 21, 21, - 2, 2, 21, 21, 21, 21, 21, 21, 2, 21, 21, 21, 21, 21, 21, 21, - 2, 21, 21, 2, 21, 21, 21, 21, 21, 2, 2, 21, 21, 21, 21, 21, - 2, 2, 21, 21, 21, 2, 2, 2, 2, 2, 2, 2, 21, 21, 21, 2, - 2, 2, 2, 21, 21, 2, 21, 21, 21, 21, 21, 2, 2, 21, 21, 2, - 2, 22, 22, 2, 22, 22, 22, 2, 22, 22, 2, 22, 2, 22, 22, 2, - 2, 2, 22, 22, 2, 2, 2, 22, 22, 2, 2, 2, 2, 22, 22, 22, - 2, 2, 2, 2, 2, 2, 22, 2, 2, 2, 2, 2, 2, 22, 22, 22, - 22, 22, 2, 2, 2, 2, 2, 23, 23, 2, 2, 23, 23, 23, 23, 23, - 2, 23, 23, 23, 23, 2, 2, 2, 2, 2, 2, 2, 23, 23, 2, 23, - 23, 23, 2, 23, 23, 2, 2, 23, 23, 23, 23, 2, 2, 23, 23, 2, - 2, 2, 2, 2, 2, 2, 23, 16, 16, 16, 16, 2, 16, 16, 16, 16, - 16, 2, 2, 16, 16, 16, 16, 16, 2, 16, 16, 16, 16, 2, 2, 2, - 2, 2, 2, 2, 16, 16, 2, 2, 2, 2, 2, 16, 16, 16, 2, 16, - 16, 16, 16, 2, 2, 16, 16, 2, 16, 16, 16, 2, 2, 2, 2, 2, - 2, 2, 2, 20, 20, 20, 20, 20, 20, 20, 20, 2, 2, 20, 20, 2, - 36, 36, 36, 2, 36, 36, 36, 2, 2, 36, 36, 36, 36, 36, 36, 36, - 36, 2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 2, 36, 2, 2, 2, - 2, 36, 2, 2, 2, 2, 36, 36, 36, 36, 36, 36, 2, 36, 2, 2, - 2, 2, 2, 2, 2, 36, 36, 2, 2, 36, 36, 36, 2, 2, 2, 2, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 2, 2, 2, 2, 0, 24, - 24, 24, 24, 2, 2, 2, 2, 2, 18, 18, 2, 18, 2, 18, 18, 18, - 18, 18, 2, 18, 18, 18, 18, 18, 18, 18, 18, 2, 18, 2, 18, 18, - 18, 18, 18, 18, 18, 2, 2, 18, 18, 18, 18, 18, 2, 18, 2, 18, - 18, 18, 18, 18, 18, 18, 2, 18, 18, 2, 2, 18, 18, 18, 18, 25, - 25, 25, 25, 25, 2, 2, 2, 25, 25, 25, 25, 25, 0, 0, 0, 0, - 25, 25, 2, 2, 2, 2, 2, 8, 8, 8, 0, 8, 8, 8, 8, 30, - 30, 30, 2, 2, 30, 30, 30, 30, 30, 30, 30, 30, 2, 2, 2, 30, - 30, 2, 2, 2, 2, 2, 2, 34, 34, 34, 34, 34, 2, 2, 2, 35, - 35, 35, 0, 0, 0, 35, 35, 35, 2, 2, 2, 2, 2, 2, 2, 45, - 45, 45, 45, 45, 45, 2, 2, 2, 2, 2, 2, 2, 2, 2, 45, 44, - 44, 44, 44, 44, 0, 0, 2, 43, 43, 43, 43, 2, 2, 2, 2, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 2, 46, 46, 46, - 2, 46, 46, 2, 2, 2, 2, 31, 31, 31, 31, 31, 31, 2, 2, 32, - 32, 0, 0, 32, 0, 32, 32, 32, 32, 2, 2, 2, 2, 2, 2, 32, - 2, 2, 2, 2, 2, 2, 2, 32, 32, 32, 2, 2, 2, 2, 2, 28, - 28, 28, 28, 28, 28, 2, 2, 48, 48, 48, 48, 48, 48, 48, 2, 48, - 2, 2, 2, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 2, 2, 52, - 52, 52, 52, 52, 2, 2, 2, 58, 58, 58, 58, 2, 2, 2, 2, 58, - 58, 2, 2, 2, 2, 2, 2, 58, 58, 58, 2, 2, 2, 58, 58, 54, - 54, 54, 54, 2, 2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 2, 91, - 91, 91, 91, 91, 2, 2, 91, 91, 91, 91, 91, 91, 91, 2, 2, 1, - 1, 1, 1, 2, 2, 2, 2, 62, 62, 62, 62, 62, 2, 62, 62, 93, - 93, 93, 93, 2, 2, 2, 2, 2, 2, 2, 2, 93, 93, 93, 93, 2, - 2, 2, 70, 70, 70, 70, 70, 70, 70, 2, 2, 2, 70, 70, 70, 6, - 6, 6, 2, 2, 2, 2, 2, 8, 8, 8, 2, 2, 8, 8, 8, 1, - 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, - 1, 0, 2, 2, 2, 2, 2, 19, 19, 19, 19, 19, 19, 9, 9, 9, - 9, 9, 6, 19, 19, 19, 19, 19, 19, 19, 19, 19, 9, 9, 9, 9, - 9, 19, 19, 19, 19, 9, 9, 9, 9, 9, 19, 19, 19, 19, 19, 6, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 9, 2, - 9, 2, 9, 2, 9, 2, 9, 9, 9, 9, 9, 2, 2, 9, 9, 9, - 9, 9, 9, 2, 9, 9, 9, 2, 2, 9, 9, 9, 2, 9, 9, 0, - 0, 0, 0, 1, 1, 0, 0, 0, 19, 2, 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 19, 1, 2, 2, 2, 2, 2, 2, 2, 0, - 0, 0, 0, 0, 0, 9, 0, 0, 0, 19, 19, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 19, 0, 19, 0, 0, 0, 2, 2, 2, 2, 55, - 55, 55, 55, 2, 2, 2, 2, 2, 55, 55, 55, 55, 55, 55, 55, 61, - 2, 2, 2, 2, 2, 2, 2, 13, 13, 2, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 2, 2, 2, 2, 0, 0, 0, 0, 0, 13, 0, 13, 0, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 1, 1, 1, 1, 12, 12, 13, - 13, 13, 13, 0, 0, 0, 0, 2, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 2, 2, 1, 1, 0, 0, 15, 15, 15, 17, - 17, 17, 0, 0, 17, 17, 17, 2, 2, 2, 2, 2, 26, 26, 26, 2, - 12, 12, 12, 12, 12, 12, 12, 2, 2, 2, 2, 2, 2, 2, 0, 12, - 12, 12, 12, 12, 12, 12, 0, 17, 17, 17, 17, 17, 17, 17, 0, 39, - 39, 39, 39, 39, 2, 2, 2, 39, 39, 39, 39, 39, 39, 39, 2, 77, - 77, 77, 77, 2, 2, 2, 2, 0, 0, 19, 19, 19, 19, 19, 19, 0, - 0, 0, 19, 19, 19, 19, 19, 2, 19, 19, 19, 19, 19, 19, 19, 60, - 60, 60, 60, 60, 2, 2, 2, 75, 75, 75, 75, 75, 75, 2, 2, 2, - 2, 2, 2, 2, 2, 75, 75, 75, 75, 2, 2, 2, 2, 2, 2, 69, - 69, 69, 69, 69, 69, 0, 69, 74, 74, 74, 74, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 74, 12, 12, 12, 12, 12, 2, 2, 2, 84, - 84, 84, 84, 84, 84, 2, 0, 84, 84, 2, 2, 2, 2, 84, 84, 33, - 33, 33, 33, 33, 33, 33, 2, 68, 68, 68, 68, 68, 68, 68, 2, 68, - 68, 68, 68, 68, 68, 2, 2, 68, 68, 2, 2, 68, 68, 68, 68, 92, - 92, 92, 2, 2, 2, 2, 2, 2, 2, 2, 92, 92, 92, 92, 92, 87, - 87, 87, 87, 87, 87, 87, 2, 19, 19, 19, 0, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 9, 19, 19, 19, 19, 0, 0, 2, 2, 2, 2, 87, - 87, 87, 87, 87, 87, 2, 2, 87, 87, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 12, 12, 12, 12, 12, 2, 2, 2, 4, 4, 4, 4, 4, 2, - 2, 2, 2, 2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 2, 14, - 14, 14, 14, 14, 2, 14, 2, 14, 14, 2, 14, 14, 2, 14, 14, 3, - 3, 3, 3, 3, 3, 0, 0, 1, 1, 1, 1, 1, 1, 6, 6, 3, - 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 0, 0, - 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 0, 0, 2, - 2, 12, 12, 12, 2, 2, 2, 2, 0, 0, 0, 0, 0, 2, 2, 49, - 49, 49, 49, 2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 2, 49, - 49, 49, 2, 49, 49, 2, 49, 49, 49, 49, 2, 2, 2, 2, 2, 0, - 0, 0, 0, 2, 2, 2, 0, 9, 2, 2, 2, 2, 2, 2, 2, 0, - 0, 0, 0, 0, 1, 2, 2, 71, 71, 71, 71, 71, 2, 2, 2, 67, - 2, 2, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 42, - 42, 42, 42, 2, 2, 2, 2, 2, 2, 2, 2, 2, 42, 42, 42, 41, - 41, 41, 2, 2, 2, 2, 2,118,118,118, 2, 2, 2, 2, 2, 53, - 53, 53, 53, 53, 53, 2, 53, 59, 59, 59, 59, 2, 2, 2, 2, 59, - 59, 59, 59, 59, 59, 2, 2, 50, 50, 50, 50, 50, 50, 2, 2, 50, - 50, 2, 2, 2, 2, 2, 2,104,104,104,104, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2,104,161,161,161, 2,161,161, 2,161,161, - 161, 2,161,161, 2, 2, 2,170,170,170,170, 2, 2, 2, 2,110, - 110,110,110,110,110,110, 2,110,110,110,110,110,110, 2, 2, 19, - 19, 19, 19, 19, 19, 2, 19, 19, 2, 19, 19, 19, 19, 19, 19, 47, - 47, 47, 47, 47, 47, 2, 2, 47, 2, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 2, 47, 47, 2, 2, 2, 47, 2, 2, 47, 81, - 81, 81, 81, 81, 81, 2, 81,116,116,116,116,116,116,116, 2, 2, - 2, 2, 2, 2, 2, 2,116,128,128,128, 2,128,128, 2, 2, 2, - 2, 2,128,128,128,128,128, 66, 66, 66, 66, 2, 2, 2, 66, 72, - 72, 2, 2, 2, 2, 2, 72,173,173, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 97, 97, 97, 97, 2, 2, 97, 97, 97, 97, 97, 97, 57, - 57, 57, 57, 2, 57, 57, 2, 2, 2, 2, 2, 57, 57, 57, 57, 57, - 57, 57, 57, 2, 57, 57, 57, 2, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 2, 2, 57, 57, 57, 2, 2, 2, 2, 57, 2, - 2, 2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 2, 2, 2, - 78, 78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, 2, 2, 82, - 82, 82, 2, 2, 2, 2, 2,122,122, 2, 2, 2, 2, 2, 2, 2, - 122,122,122,122, 2, 2, 2, 2,122,122,122,122,122,122,122, 89, - 2, 2, 2, 2, 2, 2, 2, 2, 2,130,130,130,130,130,130,144, - 144, 2, 2, 2, 2, 2, 2, 2,165,165,165,165,165,165,165, 2, - 2, 2, 2, 2, 2,165,165, 3, 3, 3, 3, 3, 3, 3, 2,156, - 156, 2,156,156,156, 2, 2,156,156, 2, 2, 2, 2, 2, 2, 3, - 2, 2, 2, 2, 2, 2, 2,148,148, 2, 2, 2, 2, 2, 2,158, - 158, 2, 2, 2, 2, 2, 2,153,153,153,153, 2, 2, 2, 2,149, - 149,149,149,149,149,149, 2, 2, 2, 94, 94, 94, 94, 94, 94, 2, - 2, 2, 2, 2, 2, 2, 94, 85, 85, 85, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 85, 2, 2,101, 2, 2, 2, 2, 2, 2, 2,101, - 101, 2, 2, 2, 2, 2, 2, 96, 96, 96, 96, 96, 2, 96, 96,111, - 111,111,111,111,111,111, 2, 2, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 2, 2, 2,108,108, 2,108,108,108,108,108,108, - 108, 2, 2, 2, 2, 2, 2,129,129,129,129,129,129,129, 2,129, - 2,129,129,129,129, 2,129,129,129,129,129,129,129, 2,129,129, - 129, 2, 2, 2, 2, 2, 2,109,109,109, 2, 2, 2, 2, 2,109, - 109, 2, 2, 2, 2, 2, 2,107,107,107,107, 2,107,107,107,107, - 2, 2,107,107,107,107,107,107, 2,107,107,107,107,107,107,107, - 2,107,107, 2,107,107,107,107,107, 2, 1,107,107,107,107,107, - 2, 2,107,107,107, 2, 2,107, 2, 2, 2, 2, 2, 2,107, 2, - 2, 2, 2, 2,107,107,107,107,107,107,107, 2, 2,107,107,171, - 171, 2,171, 2, 2,171, 2,171, 2,171, 2, 2,171, 2,171,171, - 171,171, 2,171,171,171,171,171, 2, 2, 2, 2, 2, 2, 2, 2, - 171,171, 2, 2, 2, 2, 2,137,137,137,137, 2,137,137,137,137, - 137, 2, 2, 2, 2, 2, 2,124,124, 2, 2, 2, 2, 2, 2,114, - 114,114,114,114, 2, 2, 2,114,114, 2, 2, 2, 2, 2, 2, 32, - 32, 32, 32, 32, 2, 2, 2, 33, 33, 33, 33, 2, 2, 2, 2,126, - 126,126, 2, 2,126,126,126,126,126,126,126, 2, 2, 2, 2,126, - 126,126,126,126,126,126, 2,142,142,142,142, 2, 2, 2, 2,125, - 125,125, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,125, 2, - 154, 2, 2,154,154,154,154,154,154,154,154, 2,154,154, 2,154, - 154,154,154,154,154, 2,154,154, 2, 2,154,154,154,154,154,154, - 154, 2, 2, 2, 2, 2, 2,150,150,150,150,150, 2, 2, 2,140, - 140,140, 2, 2, 2, 2, 2,121, 2, 2, 2, 2, 2, 2, 2, 7, - 7, 2, 2, 2, 2, 2, 2,133, 2,133,133,133,133,133,133,133, - 133,133,133,133,133,133, 2,133,133,133,133,133,133, 2, 2,133, - 133,133,133,133, 2, 2, 2, 2, 2,134,134,134,134,134,134, 2, - 134,134,134,134,134,134,134,134,134,134,134,134,134,134, 2,138, - 138, 2,138,138,138,138,138, 2, 2,138, 2,138,138, 2,138,138, - 138, 2, 2, 2, 2, 2, 2,143,143,143,143,143,143, 2,143,143, - 2,143,143,143,143,143,143,143,143,143,143,143,143,143, 2,143, - 143, 2,143,143,143,143,143,143, 2, 2, 2, 2, 2, 2, 2,143, - 143, 2, 2, 2, 2, 2, 2,175,175,175,175, 2, 2, 2, 2,175, - 175, 2, 2, 2, 2, 2, 2,145, 2, 2, 2, 2, 2, 2, 2,163, - 2,163,163,163,163,163,163,163,163,163, 2, 2, 2,163,163,163, - 163,163, 2, 2, 2, 2, 2, 86, 2, 2, 2, 2, 2, 2, 2, 22, - 22, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 22, 63, - 63, 2, 2, 2, 2, 2, 2, 63, 63, 63, 63, 63, 63, 63, 2, 63, - 63, 63, 63, 63, 2, 2, 2, 63, 63, 63, 63, 2, 2, 2, 2,157, - 157,157, 2, 2, 2, 2, 2, 80, 80, 80, 80, 80, 80, 2, 2, 80, - 80, 80, 2, 2, 2, 2, 2,127,127,127,127,127,127,127, 2,166, - 166, 2, 2, 2, 2, 2, 2, 79, 2, 2, 2, 2, 2, 2, 2,115, - 115,115,115,115,115,115, 2,115,115, 2, 2, 2, 2,115,115,159, - 159,159,159,159,159,159, 2,159,159, 2, 2, 2, 2, 2, 2,119, - 119,119,119,119,119, 2, 2, 2, 2, 2, 2, 2,119,119,119,167, - 167, 2, 2, 2, 2, 2, 2,146,146,146, 2, 2, 2, 2, 2,172, - 2, 2,172,172,172,172,172,172,172,172,172, 2, 2, 2, 2, 99, - 99, 99, 2, 2, 2, 2, 99, 2, 2, 2, 2, 2, 2, 2, 99,136, - 139, 13, 13,155, 2, 2, 2, 13, 13, 13, 13, 13, 13, 13, 2,155, - 155,155,155,155,155, 2, 2, 2, 2, 2, 2, 2, 2, 2,155,136, - 136,136,136,136,136,136, 2,136,136,136, 2, 2, 2, 2, 2, 17, - 17, 17, 17, 2, 17, 17, 17, 17, 17, 17, 17, 2, 17, 17, 2, 17, - 15, 15, 15, 15, 15, 15, 15, 17, 17, 17, 2, 2, 2, 2, 2, 2, - 2, 15, 2, 2, 2, 2, 2, 15, 15, 15, 2, 2, 17, 2, 2, 2, - 2, 2, 2, 17, 17, 17, 17,139,139,139,139, 2, 2, 2, 2,105, - 105,105, 2, 2, 2, 2, 2,105,105,105,105,105, 2, 2, 2,105, - 2, 2, 2, 2, 2, 2, 2,105,105, 2, 2,105,105,105,105, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 0, 0, 2, 2, 0, 2, 2, 0, 0, 2, 2, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, - 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, - 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 2, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0,131, - 131,131,131, 2, 2, 2, 2, 2, 2, 2,131,131,131,131,131, 2, - 131,131,131,131,131,131,131, 2, 2, 2, 2, 2, 19, 19, 19, 56, - 56, 56, 56, 56, 56, 56, 2, 56, 2, 2, 56, 56, 56, 56, 56, 56, - 56, 2, 56, 56, 2, 56, 56, 56, 56, 56, 2, 2, 2, 2, 2, 6, - 6, 6, 6, 6, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6,151, - 151,151,151,151, 2, 2, 2,151,151,151,151,151,151, 2, 2,151, - 151, 2, 2, 2, 2,151,151,160,160,160,160,160,160,160, 2,152, - 152, 2, 2, 2, 2, 2,152,164,164, 2, 2, 2, 2, 2, 2,168, - 168,168, 2, 2, 2, 2,168,174,174,174,174,174,174,174, 2,174, - 174,174,174,174,174, 2, 2, 2, 2, 2, 2, 2, 2,174,174, 30, - 30, 30, 30, 2, 30, 30, 2,113,113,113,113,113, 2, 2,113,113, - 113,113,113,113,113,113, 2,132,132,132,132, 2, 2, 2, 2,132, - 132, 2, 2, 2, 2,132,132, 3, 3, 3, 3, 2, 3, 3, 3, 2, - 3, 3, 3, 3, 3, 3, 3, 2, 3, 2, 3, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 2, - 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 2, 3, 2, 2, - 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 0, 0, 15, 0, 0, 2, 2, 2, 2, 2, 0, - 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, - 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 13, - 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 2, 2, 2, 2, 2, 2, - 0, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 0, 0, 0, 10, 0, 11, 12, 13, 0, 0, 0, 14, 0, 0, 15, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 19, - 20, 21, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 24, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 24, 25, 26, 27, - 28, 29, 30, 0, 0, 31, 32, 0, 33, 0, 34, 0, 35, 0, 0, 0, - 0, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 45, 0, 0, 0, 0, 0, - 0, 46, 47, 0, 0, 0, 0, 0, 48, 0, 49, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 0, 0, 0, 52, 0, - 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, - 0, 55, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, - 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 59, 60, 61, 62, 63, 64, - 65, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 67, 68, 0, 69, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99,100,101,102,103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, 0, 0,105,106, - 0,107, 0, 0, 0,108, 0,109, 0,110, 0,111,112,113, 0,114, - 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,118,119,120,121, 0,122,123, - 124,125,126, 0,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,128,129,130,131,132,133,134,135,136,137,138, - 139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154, - 155,156,157, 0, 0, 0,158,159,160,161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,162, 0,163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,164,165, - 0, 0, 0, 0, 0, 0, 0,166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,167, 0, 0, 0,168,169, 0, - 0,170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,176,177, 0, 0, 0, 0, - 178,179, 0, 0, 0,180,181,182,183,184,185,186,187,188,189,190, - 191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206, - 207,208,209,210,211,212,213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, + 70, 2, 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 13, 13, 13, 13, + 13, 12, 12, 12, 12, 12, 12, 12, 12,178,178,178,178,178,178,178, + 178, 0, 0, 0, 0, 0, 0, 0, 0,136,136,136,136,136,136,136, + 136, 80, 80, 80, 80, 80, 80, 80, 80, 19, 19, 19, 19, 19, 19, 19, + 19, 63, 63, 63, 63, 63, 63, 63, 63, 3, 3, 3, 3, 3, 3, 3, + 3, 39, 39, 39, 39, 39, 39, 39, 39,176,176,176,176,176,176,176, + 176, 28, 28, 28, 28, 28, 28, 28, 28, 79, 79, 79, 79, 79, 79, 79, + 79,131,131,131,131,131,131,131,131, 1, 1, 1, 1, 1, 1, 1, + 1,127,127,127,127,127,127,127,127, 6, 6, 6, 6, 6, 6, 6, + 6,155,155,155,155,155,155,155,155,139,139,139,139,139,139,139, + 139, 9, 9, 9, 9, 9, 9, 9, 9, 15, 15, 15, 15, 15, 15, 15, + 15, 30, 30, 30, 30, 30, 30, 30, 30,110,110,110,110,110,110,110, + 110, 77, 77, 77, 77, 77, 77, 77, 77, 17, 17, 17, 17, 17, 17, 17, + 17, 27, 27, 27, 27, 27, 27, 27, 27, 33, 33, 33, 33, 33, 33, 33, + 33,113,113,113,113,113,113,113,113, 49, 49, 49, 49, 49, 49, 49, + 49, 25, 25, 25, 25, 25, 25, 25, 25, 29, 29, 29, 29, 29, 29, 29, + 29,177,177,177,177,177,177,177,177, 7, 7, 7, 7, 7, 7, 7, + 7, 32, 32, 32, 32, 32, 32, 32, 32, 8, 8, 8, 8, 8, 8, 8, + 8, 99, 99, 99, 99, 99, 99, 99, 99, 31, 31, 31, 31, 31, 31, 31, + 31, 30, 30, 30, 30, 30, 30, 30, 2,105,105,105,105,105,105,105, + 105, 55, 55, 55, 55, 55, 55, 55, 55, 62, 62, 62, 62, 62, 62, 62, + 62, 0, 0, 0, 0, 2, 2, 2, 2, 56, 56, 56, 56, 56, 56, 56, + 56, 91, 91, 91, 91, 91, 91, 91, 91,100,100,100,100,100,100,100, + 100,119,119,119,119,119,119,119,119, 14, 14, 14, 14, 14, 14, 14, + 14,130,130,130,130,130,130,130,130, 94, 94, 94, 94, 94, 94, 94, + 94,157,157,157,157,157,157,157,157,137,137,137,137,137,137,137, + 137,146,146,146,146,146,146,146,146, 4, 4, 4, 4, 4, 4, 4, + 4, 20, 20, 20, 20, 20, 20, 20, 20, 35, 35, 35, 35, 35, 35, 35, + 35, 84, 84, 84, 84, 84, 84, 84, 84, 40, 40, 40, 40, 40, 40, 40, + 40, 97, 97, 97, 97, 97, 97, 97, 97,124,124,124,124,124,124,124, + 124,123,123,123,123,123,123,123,123,125,125,125,125,125,125,125, + 125,140,140,140,140,140,140,140,140,159,159,159,159,159,159,159, + 159,132,132,132,132,132,132,132,132, 37, 37, 37, 37, 37, 37, 37, + 37, 22, 22, 22, 22, 22, 22, 22, 22, 24, 24, 24, 24, 24, 24, 24, + 24, 58, 58, 58, 58, 58, 58, 58, 58, 76, 76, 76, 76, 76, 76, 76, + 76, 0, 0, 0, 0, 0, 0, 2, 2, 26, 26, 26, 26, 26, 26, 26, + 26, 75, 75, 75, 75, 75, 75, 75, 75, 89, 89, 89, 89, 89, 89, 89, + 89,114,114,114,114,114,114,114,114,141,141,141,141,141,141,141, + 141,133,133,133,133,133,133,133,133,163,163,163,163,163,163,163, + 163, 70, 70, 70, 70, 70, 70, 70, 70, 0, 0, 0, 0, 0, 2, 2, + 2, 68, 68, 68, 68, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, + 92, 87, 87, 87, 87, 87, 87, 87, 87, 0, 0, 0, 0, 0, 0, 0, + 2,135,135,135,135,135,135,135,135, 85, 85, 85, 85, 85, 85, 85, + 85, 96, 96, 96, 96, 96, 96, 96, 96,109,109,109,109,109,109,109, + 109,102,102,102,102,102,102,102,102, 64, 64, 64, 64, 64, 64, 64, + 64, 0, 0, 2, 2, 2, 2, 2, 2, 61, 61, 61, 61, 61, 61, 61, + 61, 65, 65, 65, 65, 65, 65, 65, 65,108,108,108,108,108,108,108, + 108,142,142,142,142,142,142,142,142,121,121,121,121,121,121,121, + 121,166,166,166,166,166,166,166,166,167,167,167,167,167,167,167, + 167,151,151,151,151,151,151,151,151,152,152,152,152,152,152,152, + 152, 38, 38, 38, 38, 38, 38, 38, 38, 90, 90, 90, 90, 90, 90, 90, + 90, 23, 23, 23, 23, 23, 23, 23, 23, 36, 36, 36, 36, 36, 36, 36, + 36, 30, 2, 30, 30, 30, 30, 2, 2, 48, 48, 48, 48, 48, 48, 48, + 48, 93, 93, 93, 93, 93, 93, 93, 93, 73, 73, 73, 73, 73, 73, 73, + 73, 9, 9, 9, 9, 9, 9, 2, 2, 86, 86, 86, 86, 86, 86, 86, + 86, 2, 0, 0, 0, 0, 0, 0, 0, 67, 67, 67, 67, 67, 67, 67, + 67, 51, 51, 51, 51, 51, 51, 51, 51,104,104,104,104,104,104,104, + 104,170,170,170,170,170,170,170,170, 78, 78, 78, 78, 78, 78, 78, + 78,144,144,144,144,144,144,144,144,165,165,165,165,165,165,165, + 165,171,171,171,171,171,171,171,171,126,126,126,126,126,126,126, + 126,150,150,150,150,150,150,150,150,134,134,134,134,134,134,134, + 134,138,138,138,138,138,138,138,138,175,175,175,175,175,175,175, + 175, 18, 18, 18, 18, 18, 18, 18, 18, 0, 0, 0, 0, 0, 2, 0, + 0, 13, 13, 13, 13, 13, 13, 2, 2, 60, 60, 60, 60, 60, 60, 60, + 60, 69, 69, 69, 69, 69, 69, 69, 69,118,118,118,118,118,118,118, + 118, 59, 59, 59, 59, 59, 59, 59, 59,106,106,106,106,106,106,106, + 106,156,156,156,156,156,156,156,156,147,147,147,147,147,147,147, + 147,148,148,148,148,148,148,148,148,169,169,169,169,169,169,169, + 169,172,172,172,172,172,172,172,172,164,164,164,164,164,164,164, + 164,168,168,168,168,168,168,168,168,174,174,174,174,174,174,174, + 174, 0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, 0, 0, 0, + 0, 5, 5, 5, 5, 5, 5, 5, 5, 21, 21, 21, 21, 21, 21, 21, + 21, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, 12, 12, + 2, 74, 74, 74, 74, 74, 74, 74, 74, 42, 42, 42, 42, 42, 42, 42, + 42, 50, 50, 50, 50, 50, 50, 50, 50,161,161,161,161,161,161,161, + 161, 47, 47, 47, 47, 47, 47, 47, 47,120,120,120,120,120,120,120, + 120,116,116,116,116,116,116,116,116, 98, 98, 98, 98, 98, 98, 98, + 98, 57, 57, 57, 57, 57, 57, 57, 57, 88, 88, 88, 88, 88, 88, 88, + 88,117,117,117,117,117,117,117,117,112,112,112,112,112,112,112, + 112,101,101,101,101,101,101,101,101,111,111,111,111,111,111,111, + 111,154,154,154,154,154,154,154,154,143,143,143,143,143,143,143, + 143,115,115,115,115,115,115,115,115, 0, 0, 19, 0, 0, 0, 0, + 0, 95, 95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 11, 11, 11, 11, + 11, 10, 10, 10, 10, 10, 10, 10, 10, 22, 22, 22, 2, 2, 2, 22, + 22, 2, 25, 25, 25, 25, 25, 25, 25, 34, 34, 34, 34, 34, 34, 34, + 34, 52, 52, 52, 52, 52, 52, 52, 52, 54, 54, 54, 54, 54, 54, 54, + 54, 0, 0, 0, 2, 2, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, + 2, 2, 2, 12, 12, 12, 12, 12, 12, 71, 71, 71, 71, 71, 71, 71, + 71, 41, 41, 41, 41, 41, 41, 41, 41, 53, 53, 53, 53, 53, 53, 53, + 53, 81, 81, 81, 81, 81, 81, 81, 81, 66, 66, 66, 66, 66, 66, 66, + 66, 72, 72, 72, 72, 72, 72, 72, 72,173,173,173,173,173,173,173, + 173, 83, 83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, + 82,158,158,158,158,158,158,158,158,153,153,153,153,153,153,153, + 153,145,145,145,145,145,145,145,145,103,103,103,103,103,103,103, + 103, 0, 2, 2, 2, 2, 2, 2, 2,160,160,160,160,160,160,160, + 160, 2, 3, 3, 2, 3, 2, 2, 3, 3, 3, 3, 2, 3, 3, 3, + 3, 19, 19, 19, 19, 19, 19, 19, 0, 3, 3, 3, 3, 3, 0, 3, + 3, 5, 5, 5, 5, 5, 2, 2, 5, 11, 11, 11, 2, 2, 2, 2, + 11, 10, 10, 10, 10, 10, 10, 2, 10, 21, 21, 21, 21, 21, 2, 2, + 21, 22, 2, 22, 22, 22, 22, 2, 2, 23, 23, 23, 23, 23, 2, 23, + 23, 23, 2, 23, 23, 23, 23, 23, 23, 16, 16, 16, 16, 16, 2, 16, + 16, 16, 2, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 20, 2, 20, + 20, 20, 2, 20, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, 36, 36, + 2, 25, 25, 25, 25, 25, 2, 25, 25, 8, 8, 8, 8, 8, 8, 2, + 8, 2, 2, 2, 2, 2, 8, 2, 2, 29, 29, 29, 29, 29, 29, 2, + 2, 45, 45, 45, 45, 45, 45, 45, 45, 44, 44, 44, 44, 44, 44, 44, + 44, 43, 43, 43, 43, 43, 43, 43, 43, 31, 31, 2, 2, 2, 2, 2, + 2, 48, 48, 48, 48, 2, 2, 2, 2, 91, 91, 2, 2, 2, 2, 2, + 2, 1, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 9, 9, 2, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 2, 0, 0, 0, 0, 2, 2, 0, + 0, 2, 2, 2, 2, 2, 2, 2, 61, 0, 17, 17, 17, 17, 17, 17, + 17, 12, 12, 12, 12, 2, 2, 2, 2, 13, 13, 2, 2, 2, 2, 2, + 2, 19, 19, 19, 19, 19, 19, 19, 2, 0, 0, 0, 2, 0, 0, 0, + 0, 49, 49, 49, 49, 49, 49, 2, 2, 0, 0, 0, 0, 2, 2, 2, + 0, 1, 0, 0, 0, 0, 0, 0, 0,135,135,135,135, 2, 2, 2, + 2,161,161,161, 2,161,161,161,161,161,161, 2,161,161,161,161, + 161,128,128,128,128,128,128,128,128, 57, 2, 2, 2, 2, 2, 2, + 2,112,112,112,112,112,112,112, 2,122,122,122,122,122,122,122, + 122,130,130,130, 2, 2, 2, 2, 2,165,165,165,165,165,165, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, + 3,149,149,149,149,149,149,149,149, 94, 94, 94, 94, 94, 94, 2, + 2,129,129,129,129,129,129,129,129,107,107,107,107,107, 2, 2, + 107,107,107,107,107,107,107,107,107,107,107,107,107,107, 2, 2, + 2,171,171,171,171,171,171, 2,171,123,123,123,123,123,123, 2, + 2,102,102, 2, 2, 2, 2, 2, 2,154,154,154,154,154,154,154, + 2, 2, 2,150,150,150,150,150,150,169,169, 2, 2, 2, 2, 2, + 2,138,138,138,138,138,138,138, 2,103,103,103,103,103,103, 2, + 2,119,119, 2,119,119,119,119,119, 13, 13, 13, 13, 13, 13, 13, + 2, 17, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, + 0, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 19, 0, 0, 0, 0, 0, 0, 0, 19, 19, 19, 19, 19, 0, 0, + 0, 0, 0, 26, 26, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, + 9, 2, 2, 9, 9, 9, 9, 0, 9, 2, 2, 2, 2, 9, 0, 9, + 0, 9, 9, 9, 2, 9, 2, 9, 9, 9, 9, 2, 9, 9, 9, 9, + 9, 9, 9, 55, 55, 55, 55, 55, 55, 6, 6, 6, 6, 6, 1, 1, + 6, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 2, 2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 2, 2, 2, 2, 2, + 2, 14, 14, 14, 2, 2, 2, 2, 14, 14, 14, 14, 14, 14, 2, 2, + 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, + 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 3, 3, 3, + 3, 37, 37, 37, 37, 37, 37, 2, 37, 37, 37, 37, 2, 2, 37, 37, + 37, 38, 38, 2, 2, 2, 2, 2, 2, 64, 64, 64, 2, 2, 64, 64, + 64, 90, 90, 90, 90, 90, 90, 2, 2, 90, 90, 90, 90, 90, 90, 90, + 2, 95, 95, 95, 95, 2, 2, 95, 2, 37, 37, 37, 2, 2, 2, 2, + 2, 3, 3, 2, 2, 2, 2, 2, 3, 3, 3, 0, 3, 3, 3, 3, + 3, 7, 1, 1, 1, 1, 7, 7, 7, 7, 7, 7, 7, 0, 0, 7, + 7, 5, 5, 5, 5, 2, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, + 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, 2, 5, 2, 2, 2, 5, + 5, 5, 5, 2, 2, 5, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, + 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, 2, 5, 5, 2, + 5, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 2, 2, 11, 11, 11, 2, 11, 11, 11, 11, 2, 2, 11, 11, 11, 11, + 11, 11, 2, 11, 11, 11, 11, 11, 11, 11, 2, 11, 11, 2, 11, 11, + 2, 11, 11, 2, 2, 11, 2, 11, 11, 11, 2, 2, 11, 11, 11, 2, + 2, 2, 11, 2, 2, 2, 2, 2, 2, 2, 11, 11, 11, 11, 2, 11, + 2, 2, 2, 2, 2, 2, 2, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 2, 2, 10, 10, 10, 2, 10, 10, 10, 10, 10, 2, 10, 10, 10, 10, + 10, 10, 2, 10, 10, 10, 10, 10, 10, 10, 2, 10, 10, 2, 10, 10, + 10, 10, 10, 2, 2, 10, 10, 10, 10, 10, 10, 2, 10, 10, 10, 2, + 2, 10, 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, 2, 2, 10, + 10, 10, 10, 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, + 10, 2, 21, 21, 21, 2, 21, 21, 21, 21, 2, 2, 21, 21, 21, 21, + 21, 21, 2, 21, 21, 21, 21, 21, 21, 21, 2, 21, 21, 2, 21, 21, + 21, 21, 21, 2, 2, 21, 21, 21, 21, 21, 2, 2, 21, 21, 21, 2, + 2, 2, 2, 2, 21, 21, 21, 21, 21, 2, 2, 2, 2, 21, 21, 2, + 21, 21, 21, 21, 21, 2, 2, 21, 21, 2, 2, 22, 22, 2, 22, 22, + 22, 2, 22, 22, 2, 22, 2, 22, 22, 2, 2, 2, 22, 22, 2, 2, + 2, 22, 22, 2, 2, 2, 2, 22, 22, 22, 2, 2, 2, 2, 2, 2, + 22, 2, 2, 2, 2, 2, 2, 22, 22, 22, 22, 22, 2, 2, 2, 2, + 2, 23, 23, 2, 2, 23, 23, 23, 23, 23, 2, 23, 23, 23, 23, 2, + 2, 2, 2, 2, 2, 2, 23, 23, 2, 23, 23, 23, 2, 23, 23, 2, + 2, 23, 23, 23, 23, 2, 2, 23, 23, 2, 2, 2, 2, 2, 2, 2, + 23, 16, 16, 16, 16, 2, 16, 16, 16, 16, 16, 2, 2, 16, 16, 16, + 16, 16, 2, 16, 16, 16, 16, 2, 2, 2, 2, 2, 2, 2, 16, 16, + 2, 2, 2, 2, 2, 16, 16, 16, 2, 16, 16, 16, 16, 2, 2, 16, + 16, 2, 16, 16, 16, 2, 2, 2, 2, 2, 2, 2, 2, 20, 20, 20, + 20, 20, 20, 20, 20, 2, 2, 20, 20, 2, 36, 36, 36, 2, 36, 36, + 36, 2, 2, 36, 36, 36, 36, 36, 36, 36, 36, 2, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 2, 36, 2, 2, 2, 2, 36, 2, 2, 2, 2, + 36, 36, 36, 36, 36, 36, 2, 36, 2, 2, 2, 2, 2, 2, 2, 36, + 36, 2, 2, 36, 36, 36, 2, 2, 2, 2, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 2, 2, 2, 2, 0, 24, 24, 24, 24, 2, 2, 2, + 2, 2, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, 2, 18, 18, 18, + 18, 18, 18, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, 18, 18, 2, + 2, 18, 18, 18, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, 18, 18, + 2, 18, 18, 2, 2, 18, 18, 18, 18, 25, 25, 25, 25, 25, 2, 2, + 2, 25, 25, 25, 25, 25, 0, 0, 0, 0, 25, 25, 2, 2, 2, 2, + 2, 8, 8, 8, 0, 8, 8, 8, 8, 30, 30, 30, 2, 2, 30, 30, + 30, 30, 30, 30, 30, 30, 2, 2, 2, 30, 30, 2, 2, 2, 2, 2, + 2, 34, 34, 34, 34, 34, 2, 2, 2, 35, 35, 35, 0, 0, 0, 35, + 35, 35, 2, 2, 2, 2, 2, 2, 2, 45, 45, 45, 45, 45, 45, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 45, 44, 44, 44, 44, 44, 0, 0, + 2, 43, 43, 43, 43, 2, 2, 2, 2, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 2, 46, 46, 46, 2, 46, 46, 2, 2, 2, + 2, 31, 31, 31, 31, 31, 31, 2, 2, 32, 32, 0, 0, 32, 0, 32, + 32, 32, 32, 2, 2, 2, 2, 2, 2, 32, 2, 2, 2, 2, 2, 2, + 2, 32, 32, 32, 2, 2, 2, 2, 2, 28, 28, 28, 28, 28, 28, 2, + 2, 48, 48, 48, 48, 48, 48, 48, 2, 48, 2, 2, 2, 48, 48, 48, + 48, 52, 52, 52, 52, 52, 52, 2, 2, 52, 52, 52, 52, 52, 2, 2, + 2, 58, 58, 58, 58, 2, 2, 2, 2, 58, 58, 2, 2, 2, 2, 2, + 2, 58, 58, 58, 2, 2, 2, 58, 58, 54, 54, 54, 54, 2, 2, 54, + 54, 91, 91, 91, 91, 91, 91, 91, 2, 91, 91, 91, 91, 91, 2, 2, + 91, 91, 91, 91, 91, 91, 91, 2, 2, 62, 62, 62, 62, 62, 2, 62, + 62, 93, 93, 93, 93, 2, 2, 2, 2, 2, 2, 2, 2, 93, 93, 93, + 93, 2, 2, 2, 70, 70, 70, 70, 70, 70, 70, 2, 2, 2, 70, 70, + 70, 6, 6, 6, 2, 2, 2, 2, 2, 8, 8, 8, 2, 2, 8, 8, + 8, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 1, 1, 0, 2, 2, 2, 2, 2, 19, 19, 19, 19, 19, 19, 9, + 9, 9, 9, 9, 6, 19, 19, 19, 19, 19, 19, 19, 19, 19, 9, 9, + 9, 9, 9, 19, 19, 19, 19, 9, 9, 9, 9, 9, 19, 19, 19, 19, + 19, 6, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 9, 2, 9, 2, 9, 2, 9, 2, 9, 9, 9, 9, 9, 2, 2, 9, + 9, 9, 9, 9, 9, 2, 9, 9, 9, 2, 2, 9, 9, 9, 2, 9, + 9, 0, 0, 0, 0, 1, 1, 0, 0, 0, 19, 2, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 9, + 0, 0, 0, 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, + 0, 19, 0, 0, 0, 2, 2, 2, 2, 55, 55, 55, 55, 2, 2, 2, + 2, 2, 55, 55, 55, 55, 55, 55, 55, 61, 2, 2, 2, 2, 2, 2, + 2, 13, 13, 2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 2, 2, 2, + 2, 0, 0, 0, 0, 0, 13, 0, 13, 0, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 1, 1, 1, 1, 12, 12, 13, 13, 13, 13, 0, 0, 0, + 0, 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 2, 2, 1, 1, 0, 0, 15, 15, 15, 17, 17, 17, 0, 0, 17, 17, + 17, 2, 2, 2, 2, 2, 26, 26, 26, 2, 12, 12, 12, 12, 12, 12, + 12, 2, 2, 2, 2, 2, 2, 2, 0, 12, 12, 12, 12, 12, 12, 12, + 0, 17, 17, 17, 17, 17, 17, 17, 0, 39, 39, 39, 39, 39, 2, 2, + 2, 39, 39, 39, 39, 39, 39, 39, 2, 77, 77, 77, 77, 2, 2, 2, + 2, 0, 0, 19, 19, 19, 19, 19, 19, 0, 0, 0, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 2, 2, 2, 2, 19, 2, 2, 2, 2, + 2, 2, 19, 19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 2, 2, + 2, 75, 75, 75, 75, 75, 75, 2, 2, 2, 2, 2, 2, 2, 2, 75, + 75, 75, 75, 2, 2, 2, 2, 2, 2, 69, 69, 69, 69, 69, 69, 0, + 69, 74, 74, 74, 74, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 74, 12, 12, 12, 12, 12, 2, 2, 2, 84, 84, 84, 84, 84, 84, 2, + 0, 84, 84, 2, 2, 2, 2, 84, 84, 33, 33, 33, 33, 33, 33, 33, + 2, 68, 68, 68, 68, 68, 68, 68, 2, 68, 68, 68, 68, 68, 68, 2, + 2, 68, 68, 2, 2, 68, 68, 68, 68, 92, 92, 92, 2, 2, 2, 2, + 2, 2, 2, 2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, + 2, 19, 19, 19, 0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 9, 19, + 19, 19, 19, 0, 0, 19, 19, 2, 2, 87, 87, 87, 87, 87, 87, 2, + 2, 87, 87, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, 12, 12, + 12, 2, 2, 2, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 2, 14, 14, 14, 14, 14, 2, 14, + 2, 14, 14, 2, 14, 14, 2, 14, 14, 3, 3, 3, 3, 3, 3, 0, + 0, 1, 1, 1, 1, 1, 1, 6, 6, 3, 3, 3, 3, 3, 2, 3, + 3, 3, 3, 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 17, + 17, 17, 17, 17, 17, 17, 17, 0, 0, 2, 2, 12, 12, 12, 2, 2, + 2, 2, 0, 0, 0, 0, 0, 2, 2, 49, 49, 49, 49, 2, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 2, 49, 49, 49, 2, 49, 49, 2, + 49, 49, 49, 49, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, + 0, 9, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 1, 2, + 2, 71, 71, 71, 71, 71, 2, 2, 2, 67, 2, 2, 2, 2, 2, 2, + 2, 42, 42, 42, 42, 2, 2, 2, 2, 2, 2, 2, 2, 2, 42, 42, + 42, 41, 41, 41, 2, 2, 2, 2, 2,118,118,118, 2, 2, 2, 2, + 2, 53, 53, 53, 53, 53, 53, 2, 53, 59, 59, 59, 59, 2, 2, 2, + 2, 59, 59, 59, 59, 59, 59, 2, 2, 50, 50, 50, 50, 50, 50, 2, + 2, 50, 50, 2, 2, 2, 2, 2, 2,104,104,104,104, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2,104,161,161,161, 2,161,161, 2, + 161,161,161, 2,161,161, 2, 2, 2,170,170,170,170, 2, 2, 2, + 2,110,110,110,110,110,110,110, 2,110,110,110,110,110,110, 2, + 2, 19, 19, 19, 19, 19, 19, 2, 19, 19, 2, 19, 19, 19, 19, 19, + 19, 47, 47, 47, 47, 47, 47, 2, 2, 47, 2, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 2, 47, 47, 2, 2, 2, 47, 2, 2, + 47, 81, 81, 81, 81, 81, 81, 2, 81,116,116,116,116,116,116,116, + 2, 2, 2, 2, 2, 2, 2, 2,116,128,128,128, 2,128,128, 2, + 2, 2, 2, 2,128,128,128,128,128, 66, 66, 66, 66, 2, 2, 2, + 66, 72, 72, 2, 2, 2, 2, 2, 72,173,173, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 97, 97, 97, 97, 2, 2, 97, 97, 97, 97, 97, + 97, 57, 57, 57, 57, 2, 57, 57, 2, 2, 2, 2, 2, 57, 57, 57, + 57, 57, 57, 57, 57, 2, 57, 57, 57, 2, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 2, 2, 57, 57, 57, 2, 2, 2, 2, + 57, 2, 2, 2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 2, + 2, 2, 78, 78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, 2, + 2, 82, 82, 82, 2, 2, 2, 2, 2,122,122, 2, 2, 2, 2, 2, + 2, 2,122,122,122,122, 2, 2, 2, 2,122,122,122,122,122,122, + 122, 89, 2, 2, 2, 2, 2, 2, 2, 2, 2,130,130,130,130,130, + 130,144,144, 2, 2, 2, 2, 2, 2, 2,165,165,165,165,165,165, + 165, 2, 2, 2, 2, 2, 2,165,165,156,156, 2,156,156,156, 2, + 2,156,156, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 3,148,148, 2, 2, 2, 2, 2, 2,158,158, 2, 2, 2, 2, 2, + 2,153,153,153,153, 2, 2, 2, 2,149,149,149,149,149,149,149, + 2, 2, 2, 94, 94, 94, 94, 94, 94, 2, 2, 2, 2, 2, 2, 2, + 94, 85, 85, 85, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 85, 2, + 2,101, 2, 2, 2, 2, 2, 2, 2,101,101, 2, 2, 2, 2, 2, + 2, 96, 96, 96, 96, 96, 2, 96, 96,111,111,111,111,111,111,111, + 2, 2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 2, 2, + 2,108,108, 2,108,108,108,108,108,108,108, 2, 2, 2, 2, 2, + 2,129,129,129,129,129,129,129, 2,129, 2,129,129,129,129, 2, + 129,129,129,129,129,129,129, 2,129,129,129, 2, 2, 2, 2, 2, + 2,109,109,109, 2, 2, 2, 2, 2,109,109, 2, 2, 2, 2, 2, + 2,107,107,107,107, 2,107,107,107,107, 2, 2,107,107,107,107, + 107,107, 2,107,107,107,107,107,107,107, 2,107,107, 2,107,107, + 107,107,107, 2, 1,107,107,107,107,107, 2, 2,107,107,107, 2, + 2,107, 2, 2, 2, 2, 2, 2,107, 2, 2, 2, 2, 2,107,107, + 107,107,107,107,107, 2, 2,107,107,171,171, 2,171, 2, 2,171, + 2,171, 2,171, 2, 2,171, 2,171,171,171,171, 2,171,171,171, + 171,171, 2, 2, 2, 2, 2, 2, 2, 2,171,171, 2, 2, 2, 2, + 2,137,137,137,137, 2,137,137,137,137,137, 2, 2, 2, 2, 2, + 2,124,124, 2, 2, 2, 2, 2, 2,114,114,114,114,114, 2, 2, + 2,114,114, 2, 2, 2, 2, 2, 2, 32, 32, 32, 32, 32, 2, 2, + 2, 33, 33, 33, 33, 2, 2, 2, 2,126,126,126, 2, 2,126,126, + 126,126,126,126,126, 2, 2, 2, 2,126,126,126,126,126,126,126, + 2,142,142,142,142, 2, 2, 2, 2,125,125,125, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2,125, 2,154, 2, 2,154,154,154, + 154,154,154,154,154, 2,154,154, 2,154,154,154,154,154,154, 2, + 154,154, 2, 2,154,154,154,154,154,154,154, 2, 2, 2, 2, 2, + 2,150,150,150,150,150, 2, 2, 2,140,140,140, 2, 2, 2, 2, + 2,121, 2, 2, 2, 2, 2, 2, 2, 7, 7, 7, 2, 2, 2, 2, + 2,133, 2,133,133,133,133,133,133,133,133,133,133,133,133,133, + 2,133,133,133,133,133,133, 2, 2,133,133,133,133,133, 2, 2, + 2, 2, 2,134,134,134,134,134,134, 2,134,134,134,134,134,134, + 134,134,134,134,134,134,134,134, 2,138,138, 2,138,138,138,138, + 138, 2, 2,138, 2,138,138, 2,138,138,138, 2, 2, 2, 2, 2, + 2,143,143,143,143,143,143, 2,143,143, 2,143,143,143,143,143, + 143,143,143,143,143,143,143,143, 2,143,143, 2,143,143,143,143, + 143,143, 2, 2, 2, 2, 2, 2, 2,143,143, 2, 2, 2, 2, 2, + 2,175,175,175,175, 2, 2, 2, 2,175,175, 2, 2, 2, 2, 2, + 2, 5, 5, 2, 2, 2, 2, 2, 2,145, 2, 2, 2, 2, 2, 2, + 2,163, 2,163,163,163,163,163,163,163,163,163, 2, 2, 2,163, + 163,163,163,163, 2, 2, 2, 2, 2, 86, 2, 2, 2, 2, 2, 2, + 2, 22, 22, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 22, 63, 63, 2, 2, 2, 2, 2, 2, 63, 63, 63, 63, 2, 2, 2, + 2,177,177,177,177, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 2,157,157,157, 2, 2, 2, 2, 2, 80, 80, 80, 80, 80, 80, 2, + 2, 80, 80, 80, 2, 2, 2, 2, 2,127,127,127,127,127,127,127, + 2,166,166, 2, 2, 2, 2, 2, 2, 79, 2, 2, 2, 2, 2, 2, + 2,115,115,115,115,115,115,115, 2,115,115, 2, 2, 2, 2,115, + 115,159,159,159,159,159,159,159, 2,159,159, 2, 2, 2, 2, 2, + 2,119,119,119,119,119,119, 2, 2, 2, 2, 2, 2, 2,119,119, + 119,167,167, 2, 2, 2, 2, 2, 2,146,146,146, 2, 2, 2, 2, + 2,172, 2, 2,172,172,172,172,172,172,172,172,172, 2, 2, 2, + 2, 99, 99, 99, 2, 2, 2, 2, 99, 2, 2, 2, 2, 2, 2, 2, + 99,136,139, 13, 13,155, 2, 2, 2,155,155,155, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2,155,136, 2, 2, 2, 2, 2, 2, + 2,136,136,136, 2, 2, 2, 2, 2,176,176, 2, 2, 2, 2, 2, + 2,176,176,176, 2, 2, 2, 2, 2, 17, 17, 17, 17, 2, 17, 17, + 17, 17, 17, 17, 17, 2, 17, 17, 2, 17, 15, 15, 15, 15, 15, 15, + 15, 17, 17, 17, 15, 17, 17, 17, 17, 2, 2, 15, 2, 2, 2, 2, + 2, 15, 15, 15, 2, 2, 17, 2, 2, 2, 2, 2, 2, 17, 17, 17, + 17,139,139,139,139, 2, 2, 2, 2,105,105,105, 2, 2, 2, 2, + 2,105,105,105,105,105, 2, 2, 2,105, 2, 2, 2, 2, 2, 2, + 2,105,105, 2, 2,105,105,105,105, 0, 2, 0, 0, 0, 2, 2, + 2, 2, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 0, 2, 2, 0, 2, 2, 0, 0, + 2, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, + 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, + 2, 0, 2, 0, 0, 0, 0, 0, 0,131,131,131,131, 2, 2, 2, + 2, 2, 2, 2,131,131,131,131,131, 2,131,131,131,131,131,131, + 131, 19, 19, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 19, 19, + 19, 19, 19, 19, 9, 9, 19, 19, 19, 56, 56, 56, 56, 56, 56, 56, + 2, 56, 2, 2, 56, 56, 56, 56, 56, 56, 56, 2, 56, 56, 2, 56, + 56, 56, 56, 56, 2, 2, 2, 2, 2, 6, 6, 6, 6, 6, 6, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 6,151,151,151,151,151, 2, 2, + 2,151,151,151,151,151,151, 2, 2,151,151, 2, 2, 2, 2,151, + 151,160,160,160,160,160,160,160, 2,152,152, 2, 2, 2, 2, 2, + 152,164,164, 2, 2, 2, 2, 2, 2,168,168,168, 2, 2, 2, 2, + 168,174,174,174,174,174,174,174, 2,174,174,174,174,174,174, 2, + 2, 2, 2, 2, 2, 2, 2,174,174, 30, 30, 30, 30, 2, 30, 30, + 2,113,113,113,113,113, 2, 2,113,113,113,113,113,113,113,113, + 2,132,132,132,132, 2, 2, 2, 2,132,132, 2, 2, 2, 2,132, + 132, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 2, 3, 2, 2, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 3, + 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 2, 3, + 2, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 0, 0, 15, 0, 0, 2, 2, 2, 2, + 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, + 0, 13, 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 2, 2, 2, 2, + 2, 2, 0, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 0, 0, 0, 0, 10, 0, 11, 12, 13, 0, 0, 0, 14, 0, + 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, 0, 0, 0, 0, + 0, 19, 20, 21, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 24, 25, + 26, 27, 28, 29, 30, 0, 0, 31, 32, 0, 33, 0, 34, 0, 35, 0, + 0, 0, 0, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 45, 0, 0, 0, + 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, 48, 0, 49, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 0, 0, 0, + 52, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, + 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, + 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 59, 60, 61, 62, + 63, 64, 65, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 67, 68, 0, 69, 70, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99,100,101,102,103, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, 0, 0, + 105,106, 0,107, 0, 0, 0,108, 0,109, 0,110, 0,111,112,113, + 0,114, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118,119,120,121, 0, + 122,123,124,125,126, 0,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,128,129,130,131,132,133,134,135,136, + 137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152, + 153,154,155,156,157, 0, 0, 0,158,159,160,161, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,162, 0,163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 164,165, 0, 0, 0, 0, 0, 0, 0,166, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,167, 0, 0, 0,168, + 169, 0, 0,170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,173, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,174, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,175, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,176,177, 0, 0, + 0, 0,178,179, 0, 0, 0,180,181,182,183,184,185,186,187,188, + 189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204, + 205,206,207,208,209,210,211,212,213, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, }; -static const uint16_t _hb_ucd_u16[10784]= +static const uint16_t _hb_ucd_u16[11240]= { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2019,716 +2030,737 @@ static const uint16_t _hb_ucd_u16[10784]= 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 224, 224, 768, 424, 432, 440, 448, 776, 224, 224, 784, 792, 72, 800, 40, 808, - 48, 48, 48, 816, 824, 48, 48, 832, 840, 848, 856, 864, 872, 880, 48, 888, - 48, 48, 48, 896, 904, 40, 40, 40, 40, 912, 40, 96, 920, 928, 936, 456, - 64, 64, 64, 64, 64, 64, 64, 944, 952, 960, 968, 40, 976, 984, 48, 992, - 72, 72, 72, 40, 40, 40, 48, 48,1000, 48, 48, 48,1008, 48, 48, 48, - 48, 48, 48,1016, 72,1024, 40, 40,1032, 464, 64,1040,1048, 8,1056,1064, - 1072,1080, 8, 8,1088, 64,1096,1104, 8, 8, 8, 8, 8,1112,1120,1128, - 1136,1144, 8, 64,1152, 8, 8, 8, 8, 8, 472,1160, 232, 8,1168,1176, - 8,1184,1192,1200, 8,1208, 176, 8,1216,1224, 8, 8,1232, 64,1240, 64, - 480, 8, 8,1248,1256,1264,1272,1280,1288, 240, 128,1296,1304,1312, 144,1320, - 1328, 240, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 248, 144,1392, - 1400, 240, 128,1408,1416,1424, 144,1432,1440,1448,1456,1464,1472,1480, 304,1488, - 1496, 256, 128,1504,1512,1520, 144,1528,1536, 256, 128,1544,1552,1560, 144,1568, - 1576, 256, 8,1584,1592,1600, 144,1608,1616,1624, 8,1632,1640,1648, 304,1656, + 232, 232, 776, 416, 424, 432, 440, 784, 232, 232, 792, 800, 72, 808, 40, 816, + 64, 64, 64, 824, 832, 64, 64, 840, 848, 856, 864, 872, 880, 888, 64, 896, + 64, 64, 64, 904, 912, 40, 40, 40, 40, 920, 40, 104, 928, 936, 944, 448, + 48, 48, 48, 48, 48, 48, 48, 952, 960, 968, 976, 40, 984, 992, 64,1000, + 72, 72, 72, 40, 40, 40, 64, 64,1008, 64, 64, 64,1016, 64, 64, 64, + 64, 64, 64,1024, 72,1032, 40, 40,1040, 456, 48,1048,1056, 8,1064,1072, + 1080,1088, 8, 8,1096, 48,1104,1112, 8, 8, 8, 8, 8,1120,1128,1136, + 1144,1152, 8, 48,1160, 8, 8, 8, 8, 8, 464, 472, 240, 8,1168,1176, + 8,1184,1192,1200, 8,1208, 152, 8,1216,1224, 8, 8,1232, 48,1240, 48, + 480, 8, 8,1248,1256,1264,1272,1280,1288, 248, 128,1296,1304,1312, 160,1320, + 1328, 248, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 192, 160,1392, + 1400, 248, 128,1408,1416,1424, 160,1432,1440,1448,1456,1464,1472,1480, 304,1488, + 1496, 256, 128,1504,1512,1520, 160,1528,1536, 256, 128,1544,1552,1560, 160,1568, + 1576, 256, 8,1584,1592,1600, 160,1608,1616,1624, 8,1632,1640,1648, 304,1656, 312, 8, 8,1664,1672,1680, 0, 0,1688, 8,1696,1704,1712,1720, 0, 0, - 1728,1736, 320,1744,1752, 8, 152,1760,1768,1776, 64,1784,1792,1800, 0, 0, + 1728,1736, 320,1744,1752, 8, 168,1760,1768,1776, 48,1784,1792,1800, 0, 0, 8, 8,1808,1816, 496,1824,1832,1840,1848,1856, 72, 72,1864, 40, 40,1872, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 504,1880, 8, 8, 504, 8, 8,1888, 512, 520, 8, 8, - 8, 512, 8, 8, 8,1896,1904, 528, 8, 264, 72, 72, 72, 72, 72,1912, + 8, 512, 8, 8, 8,1896,1904, 528, 8, 328, 72, 72, 72, 72, 72,1912, 536, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1920, 8,1928,1936, 8, 8, 8, 8,1944,1952, - 8,1960, 8,1968, 8,1976,1984,1992, 8, 8, 8,2000,2008,2016, 80,2024, - 2032, 80, 8, 8,2040, 8, 8, 160,2048, 8,2056, 8, 8, 8, 8, 328, - 8, 120,2064,2072,2080, 8, 112,2088, 8, 8, 184, 8, 192,2096, 24, 24, - 8,2104, 8, 8, 8,2112,2120,2128, 80, 80,2136,2144, 64, 544,2152, 0, - 2160, 8, 8,2168,2176, 496,2184,2192, 336, 8,2200, 232, 8, 8,2208,2216, - 8, 8,2224,2232,2240, 232, 8, 552,2248, 72, 72,2256,2264,2272,2280,2288, - 40, 40,2296, 96, 96, 96,2304,2312, 40,2320, 96, 96, 64, 64, 64, 64, - 48, 48, 48, 48, 48, 48, 48, 48, 48,2328, 48, 48, 48, 48, 48, 48, - 168, 560, 168, 168, 560,2336, 168,2344, 344, 344, 344,2352,2360,2368,2376,2384, - 2392,2400,2408,2416,2424,2432,2440,2448,2456,2464, 568, 568,2472,2480,2488,2496, - 2504,2512,2520,2528,2536, 88, 104, 104,2544,2552,2560, 24,2568,2576, 24,2584, + 8,1960, 8,1968, 8,1976,1984,1992, 8, 8, 8,2000,2008,2016, 88,2024, + 2032, 88, 8, 8,2040, 8, 8, 136,2048, 8,2056, 8, 8, 8, 8, 544, + 8, 112,2064,2072,2080, 8, 120,2088, 8, 8, 200, 8, 208,2096, 24, 24, + 8,2104, 8, 8, 8,2112,2120,2128, 88, 88,2136,2144, 48, 48, 48, 552, + 2152, 8, 8,2160,2168, 496,2176,2184, 336, 8,2192, 240, 8, 8,2200,2208, + 8, 8,2216,2224,2232, 240, 8, 560,2240, 72, 72,2248,2256,2264,2272,2280, + 40, 40,2288, 104, 104, 104,2296,2304, 40,2312, 104, 104, 48, 48, 48, 48, + 64, 64, 64, 64, 64, 64, 64, 64, 64,2320, 64, 64, 64, 64, 64, 64, + 176, 568, 176, 176, 568,2328, 176,2336, 344, 344, 344,2344,2352,2360,2368,2376, + 2384,2392,2400,2408,2416,2424,2432,2440,2448, 104, 576, 576,2456,2464,2472, 552, + 2480,2488,2496,2504,2512, 96, 80, 80,2520,2528,2536, 24,2544,2552, 24,2560, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 2592, 24,2600, 24, 24, 24, 24,2608, 24,2616, 56,2624, 24,2632,2640, 24, - 24, 24, 264, 0, 576, 0, 88, 88, 88,2648, 24, 24, 24, 24,2656, 88, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,2664,2672, 24, 24,2680, - 24, 24, 24, 24, 24, 24,2688, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24,2696,2704, 88,2712, 24, 24,2720, 56,2728, 56, + 2568, 24,2576, 24, 24, 24, 24,2584, 24,2592, 56,2600, 24,2608,2616, 24, + 24, 24, 328, 0, 584, 0, 96, 96, 96,2624, 24, 24, 24, 24,2632, 96, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,2640,2648, 24, 24,2656, + 24, 24, 24, 24, 24, 24,2664, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24,2672,2680, 96,2688, 24, 24,2696, 56,2704, 56, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 56, 56, 56, 56, 56, 56, 56, 56,2736,2744, 56, 56, 56,2752, 56,2760, + 56, 56, 56, 56, 56, 56, 56, 56,2712,2720, 56, 56, 56,2728, 56,2736, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 24, 24, 24, 56,2768, 24, 24,2776, 24, 24, 24, 24, 24, 24, 24, 24, - 72, 72, 72, 40, 40, 40,2784,2792, 48, 48, 48, 48, 48, 48,2800,2808, - 40, 40,2816, 8, 8, 8,2824,2832, 8, 200, 208, 208, 208, 208, 64, 64, - 2840,2848,2856,2864,2872,2880, 0, 0, 24,2888, 24, 24, 24, 24, 24, 352, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 272, 0, 24, - 2896,2904,2912,2920, 312, 8, 8, 8, 8,2928, 536, 8, 8, 8, 8,2936, - 2944, 8, 8, 312, 8, 8, 8, 8, 120,2952, 8, 8, 24, 24,2960, 8, - 24, 584, 592, 24,2968, 600, 24, 24, 592, 24, 24, 600, 24, 24, 24, 24, + 24, 24, 24, 56,2744, 24, 24,2752, 24, 24, 24, 24, 24, 24, 24, 24, + 72, 72, 72, 40, 40, 40,2760,2768, 64, 64, 64, 64, 64, 64,2776,2784, + 40, 40,2792, 8, 8, 8,2800,2808, 8, 216, 224, 224, 224, 224, 48, 48, + 2816,2824,2832,2840,2848,2856,2864, 0, 24,2872, 24, 24, 24, 24, 24, 352, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, 0, 24, + 2880,2888,2896,2904, 312, 8, 8, 8, 8,2912, 536, 8, 8, 8, 8,2920, + 2928, 8, 8, 312, 8, 8, 8, 8, 112,2936, 8, 8, 24, 24,2944, 8, + 24, 360, 592, 24,2952, 600, 24, 24, 592, 24, 24, 600, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, - 8,2976, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8,2960, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 152, 24, 24, 24, 608, 8, 8, 552, + 8, 8, 8, 8, 8, 8, 8, 8, 168, 24, 24, 24, 608, 8, 8, 560, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 2984, 8,2992, 0, 48, 48,3000,3008, 48,3016, 8, 8, 8, 8,3024,3032, - 456,3040,3048,3056, 48, 48, 48,3064,3072,3080,3088,3096,3104,3112, 0,3120, - 3128, 8,3136,3144, 8, 8, 8,3152,3160, 8, 8,3168,3176, 80, 64,3184, - 232, 8,3192, 8,3200,3208, 8, 152, 480, 8, 8,3216,3224, 360,3232,3240, - 8, 8,3248,3256,3264,3272, 8,3280, 8, 8, 8,3288,3296,3304,3312,3320, - 3328,3336, 208, 40, 40,3344,3352, 40, 40, 40, 40, 40, 8, 8,3360, 80, + 2968, 8,2976, 0, 64, 64,2984,2992, 64,3000, 8, 8, 8, 8,3008,3016, + 448,3024,3032, 616, 64, 64, 64,3040,3048,3056,3064,3072,3080,3088,3096,3104, + 3112, 8,3120,3128, 8, 8, 8,3136,3144, 8, 8,3152,3160, 88, 48,3168, + 240, 8,3176, 8,3184,3192, 8, 168, 480, 8, 8,3200,3208, 368,3216,3224, + 8, 8,3232,3240,3248,3256, 8,3264, 8, 8, 8,3272,3280,3288,3296,3304, + 3312,3320, 224, 40, 40,3328,3336, 40, 40, 40, 40, 40, 8, 8,3344, 88, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 368, 8,3368, 8, 8, 184, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 376, 8,3352, 8, 8, 200, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 112, 8, 8, 8, 8, 8, 8, 192, 0, 0, - 3376,3384,3392,3400,3408, 8, 8, 8, 8, 8, 8,3416,3424,3432, 8, 8, + 8, 8, 8, 8, 8, 8, 120, 8, 8, 8, 8, 8, 8, 208, 0, 0, + 624,3360,3368,3376,3384, 8, 8, 8, 8, 8, 8,3392,3400,3408, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8,3440, 24, 8, 8, 8, 8,3448, 8, 8,3456, 0, 0,3464, - 64,3472, 64,3480,3488,3496,3504,3512, 8, 8, 8, 8, 8, 8, 8,3520, - 3528, 424, 432, 440, 448,3536,3544,3552, 8,3560, 8, 120,3568,3576,3584,3592, - 3600, 8, 520,3608, 112, 112, 0, 0, 8, 8, 8, 8, 8, 8, 8, 176, - 3616, 88, 88,3624, 104, 104, 104,3632,3640, 280, 376, 0, 0, 24, 24,3648, - 0, 0, 0, 0, 0, 0, 0, 0, 8, 152, 8, 8, 8, 248,3656,3664, - 8, 8,3672, 8,3680, 8, 8,3688, 8,3696, 8, 8,3704,3712, 0, 0, - 72, 72,3720, 40, 40, 8, 8, 8, 8, 112, 80, 72, 72,3728, 40,3736, - 8, 8, 616, 8, 8, 8,3744, 624, 624,3752,3760,3768, 8, 8, 8, 368, + 8, 8, 8,3416, 24, 8, 8, 8, 8,3424, 8, 8,3432, 0, 0,3440, + 48,3448, 48,3456,3464,3472,3480,3488, 8, 8, 8, 8, 8, 8, 8,3496, + 3504, 416, 424, 432, 440,3512,3520,3528, 8,3536, 8, 112,3544,3552,3560,3568, + 3576, 8, 520,3584, 120, 120, 0, 0, 8, 8, 8, 8, 8, 8, 8, 152, + 3592, 96, 96,3600, 80, 80, 80,3608,3616, 272,3624, 0, 0, 24, 24,3632, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 168, 8, 8, 8, 192,3640,3648, + 8, 8,3656, 8,3664, 8, 8,3672, 8,3680, 8, 8,3688,3696, 0, 0, + 72, 72,3704, 40, 40, 8, 8, 8, 8, 120, 88, 72, 72,3712, 40,3720, + 8, 8, 632, 8, 8, 8,3728, 640, 640,3736,3744,3752, 8, 8, 8, 376, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 200, 8, 328, 616, 0,3776, 96, 96,3784, 0, 0, 0, 0, - 3792, 8, 8,3800, 8,3808, 8,3816, 8, 120,3824, 0, 0, 0, 8,3832, - 8,3840, 8,3848, 8, 192, 0, 0, 8, 8, 8,3856, 88, 632, 88, 88, - 3864,3872, 8,3880, 640,3888, 8,3896, 8, 648, 0, 0,3904, 8,3912,3920, - 8, 8, 8,3928, 8,3936, 8,3944, 8,3952,3960, 0, 0, 0, 0, 0, - 8, 8, 8, 8, 160, 0, 0, 0, 72, 72, 72,3968, 40, 40, 40,3976, - 8, 8,3984, 80,3992, 72,4000, 40,4008, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 88,4016, 8, 8,4024, 656,4032,4040, 0,4048, - 8, 648,4056, 8, 472,4064, 0, 8,4072, 0, 0, 8,4080, 0, 8, 200, - 4088, 8, 8,4096,4104, 632,4112,4120, 336, 8, 8,4128,4136, 8, 160, 80, - 4144, 8,4152,4160,4168, 8, 8,4176, 336, 8, 8,4184,4192,4200, 384,4208, - 8, 488, 664,4216,4224, 0, 0, 0,4232,4240,4248, 8, 8,4256,4264, 80, - 4272, 240, 128,4280,4288,4296,4304,4312,4320, 8, 8,4328,4336,4344,4352, 0, - 8, 8, 8,4360,4368,4376, 656, 0, 8, 8, 8,4384,4392, 80, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 672,4400,4408,4416, 0, 0, - 8, 8, 8,4424,4432, 80,4440, 0, 8, 8,4448,4456, 80, 288,4464, 0, - 8,4472,4480,4488, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 664,4496, 0, 0, 0, 0, 0, 0, 72, 72, 40, 40, 320,4504, - 4512,4520, 8,4528,4536, 80, 0, 0, 0, 0,4544, 8, 8,4552,4560, 0, - 4568, 8, 8,4576,4584,4592, 8, 8,4600,4608,4616, 8, 8, 8, 8, 160, - 4624, 0, 0, 0, 0, 0,4632, 0, 0, 0, 0, 0, 8, 8,4640, 80, - 128, 8, 672,4648,4656, 320, 528,4664, 8,4672,4680,4688, 0, 0, 0, 0, - 4696, 8, 8,4704,4712, 80,4720, 8,4728,4736, 80, 8, 8,4744, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,4752, - 4760, 256, 8,4768,4776,4784, 0, 0, 0, 0, 0, 248, 88,4792,4800,4808, + 8, 8, 8, 216, 8, 544, 632, 0,3760, 104, 104,3768, 0, 0, 0, 0, + 3776, 8, 8,3784, 8,3792, 8,3800, 8, 112,3808, 0, 0, 0, 8,3816, + 8,3824, 8,3832, 8, 208, 0, 0, 8, 8, 8,3840, 96, 648, 96, 96, + 3848,3856, 8,3864, 656,3872, 8,3880, 8, 664, 0, 0,3888, 8,3896,3904, + 8, 8, 8,3912, 8,3920, 8,3928, 8,3936,3944, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 136, 0, 0, 0, 72, 72, 72,3952, 40, 40, 40,3960, + 8, 8,3968, 88,3976, 72,3984, 40,3992, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 96,4000, 8, 8,4008, 280,4016,4024, 112, 48, + 8, 664,4032, 8, 464,4040, 0, 8,4048, 0, 0, 8,4056, 0, 8, 216, + 4064, 8, 8,4072,4080, 648,4088,4096, 336, 8, 8,4104,4112, 8, 136, 88, + 4120, 8,4128,4136,4144, 8, 8,4152, 336, 8, 8,4160,4168,4176, 384,4184, + 8, 488, 672,4192,4200, 0, 0, 0,4208,4216,4224, 8, 8,4232,4240, 88, + 4248, 248, 128,4256,4264,4272,4280,4288,4296, 8, 8,4304,4312,4320,4328, 0, + 8, 8, 8,4336,4344,4352, 280, 0, 8, 8, 8,4360,4368, 88, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 680,4376,4384,4392, 0, 0, + 8, 8, 8,4400,4408, 88,4416, 0, 8, 8,4424,4432, 88, 288,4440, 0, + 8,4448,4456,4464, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 672,4472, 0, 0, 0, 0, 0, 0, 72, 72, 40, 40, 320,4480, + 4488,4496, 8,4504,4512, 88, 0, 0, 0, 0,4520, 8, 8,4528,4536, 0, + 4544, 8, 8,4552,4560,4568, 8, 8,4576,4584,4592, 8, 8, 8, 8, 136, + 4600, 0, 0, 0, 0, 0,4608, 0, 0, 0, 0, 0, 8, 8,4616, 88, + 128, 8, 680,4624,4632, 320, 528,4640, 8,4648,4656,4664, 0, 0, 0, 0, + 4672, 8, 8,4680,4688, 88,4696, 8,4704,4712, 88, 8, 8,4720, 88, 472, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,4728, + 4736, 256, 8,4744,4752,4760, 0, 0, 0, 0, 0, 192, 96,4768,4776,4784, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 192, 0, 0, 0, 0, 0, 0, - 104, 104, 104, 104, 104, 104,4816,4824, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 208, 0, 0, 0, 0, 0, 0, + 80, 80, 80, 80, 80, 80, 80,4792, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 376, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80,4800, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8,4832, - 8, 8, 8, 136,4840,4848, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8,4808, + 8, 8, 8, 144,4816,4824, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 176, - 8, 8, 8, 8, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 152, + 8, 8, 8, 8, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 680,4856, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 8, 160, 8, 120, 360, 8, 8, 8, 8, 120, 80, 8, 112,4864, - 8, 8, 8,4872,4880,4888,4896,4904, 8, 0, 0, 0, 0, 0, 0, 0, + 8, 688,4832, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 136, 8, 112, 368, 8, 8, 8, 8, 112, 88, 8, 120,4840, + 8, 8, 8,4848,4856,4864,4872,4880, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,4912, 8,4920, 80, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 72, 72, 40, 40, 88,4928, 72,4936, 40,4944, 0, 0, - 8, 8, 8, 8,4952,4960, 688, 688,4968,4976, 0, 0, 0, 0,4984,4992, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 328, 0,5000, - 8, 120, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 696, + 0, 0, 0, 0,4888, 8,4896, 88, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 72, 72, 40, 40, 96,4904, 72,4912, 40,4920, 0, 0, + 8, 8, 8, 8,4928,4936, 696, 696,4944,4952, 0, 0, 0, 0,4960,4968, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 152, 0,4976, + 8, 8, 192, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 704, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 280, 8, 8, 8, 704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5008, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,4984, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 696,5016, 0,5024,5032, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 184, + 8, 8, 136,4992, 0,5000,5008, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 8, 8, 8, 8, 176, 152, 160,5040,5048, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 152, 168, 136,5016,5024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5056, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5032, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5064, 24, 376, 24,5072, - 64, 64, 544, 64, 704, 24, 24, 24, 24, 24, 24, 24, 352, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 272, - 24, 24,5080, 24, 24, 24,5088,5096,5104, 24,5112, 24, 24, 24, 576, 0, - 24, 24, 24, 24,5120, 0, 0, 0, 0, 0, 0, 0, 88, 712, 88, 712, - 24, 24, 24, 24, 24, 608, 88, 640, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 296, 40, 720, 728,5128, 168, 72, 392,5136,5144,5152,5160, 72, 296, 40, - 5168,5176, 40,5184,5192,5200, 736, 72, 744, 40, 72, 296, 40, 720, 728, 40, - 168, 72, 392, 736, 72, 744, 40, 72, 296, 40,5208, 72,5216,5224,5232,5240, - 40,5248, 72,5256,5264,5272,5280, 40,5288, 72,5296, 40,5304, 288, 288, 288, - 64, 64, 64,5312, 64, 64,5320,5328,5336,5344, 464, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5040, 24,5048, 24,5056, + 48, 48,5064, 48, 712, 24, 24, 24, 24, 24, 24, 24, 352, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, + 24, 24,5072, 24, 24, 24,5080,5088,5096, 24,5104, 24, 24, 24, 24, 24, + 24, 24, 24, 24,5112,5120, 24, 24,5128, 0, 0, 0, 96, 720, 96, 720, + 24, 24, 24, 24, 24, 608, 96, 656, 0, 0, 0, 0, 0, 0, 0, 0, + 72, 296, 40, 728, 736,5136, 176, 72, 392,5144,5152,5160,5168, 72, 296, 40, + 5176,5184, 40,5192,5200,5208, 744, 72, 752, 40, 72, 296, 40, 728, 736, 40, + 176, 72, 392, 744, 72, 752, 40, 72, 296, 40,5216, 72,5224,5232,5240,5248, + 40,5256, 72,5264,5272,5280,5288, 40,5296, 72,5304, 40,5312, 288, 288, 288, + 48, 48, 48,5320, 48, 48,5328,5336,5344,5352, 456, 0, 0, 0, 0, 0, + 56,5360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5352,5360,5368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5376,5384,5392, 96, 96, 96,5400, 0,5408, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 152,5416,5424, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5432, 0, 8, 8,5440,5448, + 5368, 40, 40, 40,5376,5384,5392, 616, 280, 624, 0, 0,5400, 104, 104, 104, + 5408,5416,5424, 104, 104, 104,5432, 0,5440, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 168,5448,5456, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5464, 0, 8, 8,5472,5480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5456, 80, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 680,5464, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120,5472,5480, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5488, 120, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,5496, 704, 0, 0, - 72, 72, 392, 40,5504, 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 384, 88, 88,5512,5520, 0, 0, 0, 0, - 384, 88,5528,5536, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5544, 8,5552,5560,5568,5576,5584,5592,5600, 184,5608, 184, 0, 0, 0,5616, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5488, 88, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 688,5496, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 112,5504,5512, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5520, 112, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,5528, 712, 0, 0, + 72, 72, 392, 40,5536, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 384, 96, 96,5544,5552, 0, 0, 0, 0, + 384, 96,5560,5568, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5576, 8,5584,5592,5600,5608,5616,5624,5632, 200,5640, 200, 0, 0, 0,5648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 216, 24, 24, 24, 24, 24, 24, 352, 584, 400, 400, 400, 24, 272, - 5624, 24, 24, 24, 24, 24, 24, 24, 24, 24, 408, 0, 0, 0,5632, 24, - 5640, 24, 24, 216, 752, 760, 272, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5648, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5656, 280, 280, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, 216, 376, - 216, 24, 24, 24, 416, 264, 24, 24, 416, 24, 408, 216, 760,5664, 0, 0, + 24, 24, 184, 24, 24, 24, 24, 24, 24, 352, 360, 400, 400, 400, 24, 264, + 5656, 24, 24, 24, 24, 24, 24, 24, 24, 24, 360, 0, 0, 0,5664, 24, + 5672, 24, 24, 184,5680, 760, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5688, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5696, 272, 272, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 184, 184, 24, + 184, 24, 24, 24, 408, 328, 24, 24, 408, 24, 768, 184, 760,5704, 0, 0, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 416, 408, 280,5672, 24, 24, 24,5680,5688,5696, 752, - 24, 24, 24, 24, 24, 24, 24, 24, 24,5704, 24, 24, 24, 24, 24,5712, + 24, 24, 24, 24, 24, 408, 768, 272, 24, 24, 24, 24,5712,5720,5728, 584, + 24, 24, 24, 24, 24, 24, 24, 24, 24,5736, 24, 24, 24, 24, 24,5744, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 112, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 112, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 120, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 248, 8, - 8, 8, 8, 8, 8, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 192, 8, + 8, 8, 8, 8, 8, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 176, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 192, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 152, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5720, 0, 136, 136, 136, 136, 136, 136, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, + 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5752, 0, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,5728, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,5760, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, - 24, 24, 24, 24, 24, 24, 24, 24,1104, 48, 48,1112,1104, 48, 48,1112, - 24, 24, 24, 24, 24,1288, 24,1288, 48, 48,1512, 48, 48, 48,1512, 48, - 48, 48, 48, 48, 48, 48, 48,2048, 24, 24, 24, 24,2056,2064, 24, 24, - 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,2072,2080, - 2088,2096, 144, 144,2104, 144, 144, 144, 144, 144, 144, 144,2112, 296, 144, 144, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 2120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120,1520, 592, 592, 592,2128,1520, 592, 592, 592, 592, - 592,2136,2144, 352, 352, 352, 352, 352, 352, 0, 352, 352, 352,2152,2160, 0, - 1528,2168, 56,2176, 56, 56, 56, 56,2184,2192,2200, 56, 56, 56,2208, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,1528, 56, 56, 56, 56, - 496,2216, 496, 496, 496, 496, 496, 496, 496,2224, 56, 56, 56, 56, 56, 56, - 784, 784, 784, 784, 784, 784,2232, 0, 688, 688, 688, 688, 688, 688, 688,2240, - 792, 792, 792, 792, 792,2248, 792,2256,1296,1296,1296,2264, 496,2272, 56, 56, - 56, 56,2280, 56, 56, 56, 56, 56, 56, 56, 56, 56,2288, 56, 56, 56, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240,2296, 240,2304, 240, 240, 240, - 2312,1536,2320,1120,1120,2328,2336,2344,1536,2352,2360,2368,2376,1120,1120,2384, - 2392,1544,2400,1304,1304,2408,2416,2424,1544,2432,2440,2448,2456,1304,2464, 0, - 2472,1552,2480,1312,1312,2488,2496,2504,1552,2512,2520, 0,2528,1312,2536,2544, - 2552,1560,2560,1128,1128,2568,2576,2584,1560,2592,2600,2608,2616,1128,1128, 0, - 2624,1320,1568,2632,2640,1320, 504,2648,1320,1568,2656, 0,2664, 504, 504,2672, - 800,1576,1584, 800, 800,1584, 800,2680,1576,2688,2696,2704,2712, 800,2720, 800, - 1136,1592,1600,1136,1136,1600,2728,2736,1592,2744,2752,2760,2768,1136,2776, 0, - 400,1608,1616, 400, 400, 400, 400, 400,1608,1616,2784, 400,2792, 400, 400, 400, - 2800, 808,1624,2808, 808, 808,2816,2824,1624,2832,2840, 808,2848, 808,2856, 0, - 2864, 512, 512, 512, 512, 512, 512,2872, 512, 512, 512,2880, 0, 0, 0, 0, - 2888,2896, 984, 984,2904, 984, 984,2912,2920,2928, 984,2936, 0, 0, 0, 0, - 224, 224, 224, 224, 224, 224, 224, 224, 224,1328, 224, 224, 224,2944,1328, 224, - 224, 224, 224,1328, 224, 224, 224,1632, 224,1632,2952,2960, 0, 0, 0, 0, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 256, 256, 256, 256,1640,1648, 256, 256, 256, 256, 256,2968, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 816, 280, 816, 160, 160, 160, 160, - 160, 816, 160, 160, 160, 160, 816, 280, 816, 160, 280, 160, 160, 160, 160, 160, - 160, 160, 816, 160, 160, 160, 160, 160, 160, 160, 160,2976, 160, 160, 160,2984, - 160, 160, 160,2992, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,1656,1656, - 1336,1336,1336,3000, 408, 408, 408, 408, 408, 408, 408, 408, 408,3008, 408,3016, - 1664,1664,3024,3032,1672,1672,3040, 0,1680,1680,3048, 0,3056,3064,3072, 0, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,3080, 272,1688, 272,1688, - 3088, 248, 248,3096, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,3104, - 248, 248, 248, 248, 248,3112, 80, 80, 80, 80, 80, 80, 80, 80,3120, 0, - 824, 824, 824,3128, 824,1696, 824,1696,3136, 824,1344,1344,1344,3144,3152, 0, - 520, 520, 520, 520, 520,3160, 520, 520, 520,3168, 520,3176, 272, 272, 272, 272, - 1352,1352,1352,3184, 320, 320, 320, 320, 320, 320, 320,3192, 320, 320, 320,3200, - 320,1704, 320,1704, 320,3208, 104, 104, 104, 104, 104,1712, 104,3216, 0, 0, - 304, 304, 304, 304, 304, 304, 304, 304, 304,3224, 304, 304, 304, 304, 304, 304, - 528, 528, 528, 528, 528, 528, 528, 528, 832, 832, 832, 832, 832, 832,3232,3240, - 600, 600, 600, 600, 600, 600, 600,3248, 600,3256, 840, 840, 840, 840, 840, 840, - 120,3264, 256, 256, 256, 256, 256,3272, 528, 0,3280, 104,3288,3296,3304,3312, - 48, 48, 48, 48,3320,3328, 48, 48, 48, 48, 48,3336,3344,3352, 48,3360, - 48, 48, 48, 48, 48, 48, 48,3368, 104, 104, 104, 104, 104, 104, 104, 104, - 144, 144, 848, 848, 144, 144, 144, 144, 848, 848, 144,3376, 144, 144, 144, 848, - 144, 144, 144, 144, 144, 144,1720, 144,1720, 144,3384,3392, 144, 144,3400,1728, - 24,3408, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 992, 24,3416,3424, - 24, 608, 48,1736, 24, 24, 24, 24, 616, 0, 104, 104, 104, 104,3432, 0, - 24, 24, 24, 24,3440,3448,1288, 24, 24,3456, 24, 24, 48, 48, 48, 48, - 48,3464, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 616, 0, 0, 24,1360, 0, 0, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,1744, 24, - 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, 48, 48, 48, 48, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,3472,3480, - 256, 256, 256, 256,1640,1648, 696, 696, 696, 696, 696, 696, 696,1752,3488,1752, - 160, 160, 280, 0, 280, 280, 280, 280, 280, 280, 280, 280, 120, 120, 120, 120, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 416, 0, 0, 0, 0, - 8, 8, 8,3496, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,3504, 0, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 856, 0, 0, 0, 24, 24, - 3512, 24, 24, 24,3520,3528, 24,3536,3544, 152, 152, 152, 152, 152, 152, 152, - 152, 152,3552,3560,1760, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,3568, - 3576, 536, 536, 536, 536, 536,3584, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16,1144, 24, 24, 536, 536, 536, 536, 24, 24, 24, 24, 416,3592, 184, 184, - 16, 16, 16,1144, 24, 24, 24, 24, 24, 24, 24, 24, 16, 16, 16,3600, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 184, 184, 184, 184, 184,3608, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 24, 24, 24, 24, 24, - 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, 24, 24, 24, 24, - 72,3616, 72, 72, 72, 72, 72, 72,3624, 0, 864, 864, 864, 864, 864, 864, - 176, 176, 176, 176, 176,3632, 0, 0, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 0, - 24, 24, 24, 24,3640, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48,3648, 48, 48, 48, 48, 48, 48, 48, 48, 48,1736, 0, 0,3656, 48, - 1000,1000,1000,1000,1000,3664, 24, 616, 704, 704, 704, 704, 704, 704, 704, 0, - 544, 544, 544, 544, 544, 544, 544, 544,3672,3680, 544,3688, 240, 240, 240, 240, - 1008,1008,1008,1008,1008,3696,1152,1152,1152,1152,3704,3712, 16, 16, 16,3720, - 424, 424, 424, 424, 424, 424, 424, 424, 424,3728, 424,3736, 200, 200, 200,3744, - 624, 624, 624, 624, 624, 624,3752, 0, 624,3760, 624,3768, 200, 200, 200, 200, - 632, 632, 632, 632, 632, 632, 632, 632,3776, 0, 0,3784, 640, 640,3792, 0, - 1368,1368,1368, 0, 280, 280, 48, 48, 48, 48, 48,3800,3808,3816, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 640, 640, 640, 640, 640,3824, 640,3832, - 16, 16, 16, 16,1768, 0, 16, 16,1144,3840, 16, 16, 16, 16, 16,1768, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 856, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1776, 0, 0, 0, 0, - 1784, 0,3848,3856, 352, 352,3864,3872,3880, 352, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56,3888, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 0, 0, 0, 0, 56, 56, - 104, 104, 24, 616, 104,3896, 24, 24, 24, 24,1792, 24, 608, 328,3904, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,3912, - 712, 24, 24, 24,1104, 48, 48,1112,1104, 48, 48,1112,3920, 184,1760, 184, - 184, 184, 184,3928, 16, 16, 16,1144,1376,1376,1376,3936, 608, 608, 0,3944, - 216,3952, 216, 216,3960, 216, 216,3968, 216,1800, 216,1800, 0, 0, 0, 0, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,3976, - 1808, 24, 24, 24, 24, 24,3984, 24, 144, 144, 144, 144, 144, 144, 144, 144, - 144,1728, 24, 872,3992, 0, 0, 0, 0, 0, 24, 24, 24, 24, 24,4000, - 1384,1384,1384,4008, 880, 880, 880, 880, 880, 880,4016, 0,4024, 24, 24, 328, - 1160,1160,1160,1160,4032,4040,1392,1392,1392,4048,1016,1016,1016,1016,1016,4056, - 1400,1400,1400,4064,1024,1024,1024,1024,4072,1024,4080, 0, 0, 0, 0, 0, - 432, 432, 432, 432, 432, 432, 432, 432, 432, 432, 888, 888, 888, 888, 888, 888, - 1168,1168,1168,4088,1168,4096, 648, 648, 648, 648,1816, 648, 648, 648, 648,1816, - 1032,1032,1032,1032,1032, 0, 896, 896, 896, 896, 896, 896,4104,4112,1176,1824, - 1176,1824,4120,1176,1832,1176,1832,4128, 904, 904, 904, 904, 904, 904,4136, 0, - 168, 168, 168, 168, 168, 168,4144, 0, 168, 168,4152, 0, 168, 0, 0, 0, - 4160, 48, 48, 48, 48, 48,4168,1840, 0, 0, 0, 0, 0, 0, 0, 0, - 4176,4184,1184,1184,1184,1184,4192,4200,1408,1408,4208,1408,1192,1192,1192,1192, - 1200,1200,1200,4216,4224,1200, 0, 0, 0, 0, 0, 0,1848,1848,4232,4240, - 1416,1416,1416,4248,1424,1424,1424,4256,1432,1432,1432,4264, 0, 0, 0, 0, - 1208,1208,1208,1208, 440, 440, 440,4272, 440, 440,4280, 440, 440, 440, 440, 440, - 4288,4296,4304,4312,1216,1216,4320,4328,1216,1856,1216,1856,1224,1224,1224,1224, - 1232,1232,1232,1232, 0, 0, 0, 0,1240,1240,1240,1240,1864,4336,1864, 0, - 912, 912, 912, 912, 912, 912,4344,4352,1440,1440,4360,1440,1448,1448,4368,1448, - 1872,1872,4376,4384, 0,4392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 552, 552, 552, 552, 552, 552, 552, 552, 552,4400, 0, 0, 0, 0, 0, 0, - 360, 360, 360, 360, 360, 360,1880, 0, 360, 360, 360, 360, 360, 360,1880,4408, - 920, 920, 920, 920, 920, 0, 920,4416, 928, 928, 928, 928,1888,4424, 928, 928, - 1888,4432, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 56, 56,4440, - 1040,1040,1040,1040,1040,4448,4456, 0,1896, 0, 56,4464, 0, 0, 0,1896, - 1048,1048,1048,1048,1048, 0,1056,1056,1056,1056,1056,4472, 0, 0,1456,1456, - 1456,4480, 0, 0, 0, 0,1464,1464,1464,4488, 0, 0,1904,1904,4496, 0, - 368, 368, 368, 368, 368, 368, 368, 368, 368,1912,4504, 368, 368, 368,1912,4512, - 656, 656, 656, 656, 656, 656, 656, 656,4520,4528,1248,1248,1248,4536,1248,4544, - 664, 664, 664, 664, 664, 664,4552, 664, 664, 0,1256,1256,1256,1256,4560, 0, - 336, 336, 336, 336, 336, 336, 336, 336, 336, 336, 336, 336,4568, 808,4576, 0, - 720, 720,4584, 720, 720, 720, 720, 720,4592, 0, 0, 0, 0, 0, 0, 0, - 4600,4608,1920,4616,1920,4624, 672, 672, 672, 672, 672, 672, 672,4632, 672,4640, - 4648,1928,4656,1936,1936,4664,4672,4680,1928,4688,4696,4704,4712,1944,1944, 0, - 936,4720, 936, 936, 936, 936,1952, 936,4728,4736,1952,4744,4752, 0, 0, 0, - 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384,4760,4768, 0, 0, 0, - 448, 448, 448, 448, 448, 448, 448, 448, 448, 0, 448,4776, 0, 0, 0, 0, - 456, 456, 456, 456, 456, 456,1960, 456, 456, 456, 456,1960, 0, 0, 0, 0, - 560, 560, 560, 560, 560, 560, 560, 560,4784, 0, 560,4792, 248,4800, 0, 0, - 680, 680, 680, 680, 680, 680, 680,1968, 680,1968, 200, 200,4808, 0, 0, 0, - 944, 944, 944,4816, 944,4824, 944, 944,4832, 0, 0, 0, 0, 0, 0, 0, - 728, 728, 728, 728, 728, 728, 728,4840, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 464, 464, 464, 464, 464, 464, 464, 464, 464, 464,4848,4856, - 1976,4864,4872,1264,1264,1264,4880,4888,1976, 0,1264,4896, 0, 0, 0, 0, - 0, 0, 0, 0, 952,1984, 952, 952, 952, 952, 952,1984,4904, 0, 0, 0, - 568, 568, 568, 568, 568, 568, 568, 568, 568, 0, 472, 472, 472, 472, 472, 472, - 472, 472, 472, 472,4912, 0, 80, 80, 736, 736, 736, 736, 736, 736, 736,4920, - 240,4928, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 336, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1064,1064,1064,1064,1992, 0,1064,1992, - 576,4936, 576, 576, 576, 576,4944, 576,4952, 0, 576, 576, 576,4960, 960, 960, - 960, 960,4968, 960, 960,4976,4984, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2000,4992, 968, 968, 968, 968,2000,5000, 968, 0, 968,5008,5016,5024,1272,1272, - 1272,5032,5040,5048,1272,5056, 976, 976, 976, 976, 976,5064, 976,5072, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1472,1472,1472,5080, - 584, 584,5088, 584, 584, 584, 584,5096, 584, 584, 584,5104, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,5112, 0, 504, 504, 504, 504, 504, 504,5120,5128, - 64, 64, 64,5136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,5144,5152, 0, - 64, 64, 64, 64, 64, 64, 64, 64,5160, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376,5168, 0, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,5176, 0, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,5184, - 112, 112, 112, 112, 112, 112, 112, 112,5192, 0, 0, 0, 0, 0, 0, 0, - 744, 744, 744, 744, 744, 744, 744,5200, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 88, 88, 88, 88, 88, 88,5208,1280,1280,1280,5216,1280,5224, 480, 480, - 480, 480, 480, 480, 480, 480, 480,5232, 480,5240,1480,1480,1480,2008,2008, 0, - 344, 344, 344, 344, 344, 344, 344, 344,5248, 0, 344,2016,2016, 344, 344,5256, - 344, 344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 752, 752, 752, 752, 752, 752, 752,5264, - 0, 0, 0, 0, 0, 0, 0, 0, 392, 392, 392, 392, 392, 392, 392, 392, - 392, 392, 392,5272,1072,1072,1072,5280,1072,1072,5288, 0, 0, 0, 0, 0, - 264, 264, 264, 264, 264, 264, 264, 264, 264,5296, 264, 264, 264, 264, 264, 264, - 264,5304, 264, 264, 0, 0, 0, 0, 0, 0, 0, 0,5312, 0,5320, 0, - 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,5328, 0, 0, 0, 0,5336, - 32, 32, 32,5344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,5352, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5360,5368, - 5376, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152,5384, 0,5392, 0, 0, 0,5400, 0,5408, 0, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,5416, - 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288,5424, 288,5432, - 288,5440, 288,5448, 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 872, - 24, 24, 24, 24, 24, 24, 328,2024, 24, 24, 760, 0, 24, 24, 760, 0, - 104, 104, 104, 104, 104,1712, 104, 104,5456, 0, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 328, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 416, 0, - 24, 24, 24, 24, 608, 712, 24, 24, 24, 24, 24, 24,5464,5472, 24,5480, - 5488,5496, 24, 24, 24,5504, 24, 24, 24, 24, 24, 24, 24,1360, 0, 0, - 144, 144, 144, 144, 144, 144, 144, 144, 848, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 24, 24, 328, 0, 24, 24, 328, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 608, 0, 24, 24, 24, 760, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 992, 24, 24, 24, 24, 24, - 24, 24, 24, 992,5512,5520, 24,5528,5536, 24, 24, 24, 24, 24, 24, 24, - 5544,5552, 992, 992, 24, 24, 24,5560,5568,2024,5576, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 416, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24,1744, 24, 24, 24, 24, 24, 24, - 96,5584, 0,5592,5600, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 48, 48,1784,5608,1840, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5616, 312, 312,5624,5632,5640, 120, 120, 120, 120, 120, 120, 120,5648, 0, 0, - 0,5656, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 768, 768, 768, 768, 768,5664, 768,5672, 768,5680, 0, 0, 0, 0, 0, 0, - 0, 0,1488,1488,1488,5688, 0, 0, 776, 776, 776, 776, 776, 776, 776,5696, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1080,1080,1080,1080,1080,5704, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1088,1088,1088,1088,1088,5712, - 0, 0, 0, 0, 0, 0, 0, 0,1096,1096,1096,5720,1096,1096,5728,5736, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 280,5744, 160, 280, - 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 208, 208, 208,5752, 208,5760, 0, 0, 0, 0, 0, - 488, 488, 488, 488, 488, 488, 488, 488, 488,5768, 488,5776, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 712, 24, - 24, 24, 24, 24, 24, 24, 872, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 712, 24, 24, 24, 24, 24, 24, 416, 0, 0, 0, 0, 0, 0, 0, 0, - 5784, 56, 56, 56,1496,5792,1504,5800,5808,5816,1496,5824,1496,1504,1504,5832, - 56,2032, 56,2040,5840,2032, 56,2040, 0, 0, 0, 0, 0, 0,5848, 0, - 24, 24, 24, 24, 24, 328, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 328, 0, 24, 608, 712, 24, 712, 24, 712, 24, 24, 24, 416, 0, - 24, 24, 24, 24, 24, 416, 0, 0, 0, 0, 0, 0,5856, 24, 24, 24, - 5864, 0, 24, 24, 24, 24, 24, 328, 24, 760, 616, 0, 416, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5872, 24, 872, 24, 872, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 616, 24, 328, 760, 0, - 24, 328, 24, 24, 24, 24, 24, 24, 24, 0, 24, 616, 24, 24, 24, 24, - 24, 0, 24, 24, 24, 416, 24, 328, 616, 0, 24, 760, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 0, 24, 416, 24, 872, - 24,5880, 24, 24, 24, 24, 24, 24, 608,5888, 24,5896, 24,1808, 24, 760, - 24, 24,1792, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,1360, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, - 8, 8, 8, 856, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 856, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,5904, 0, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 856, 0, 0, 0, 0, - 8, 8, 8, 856, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 8, 8, 8, 8, 8, 8, 8,5912, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1776, - 5920, 0, 0, 0, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 40, 240, 248, 256, 80, 80, 80, 80, 80, 80, 264, 272, 136, 280, 288, 296, + 152, 152, 304, 152, 312, 320, 328, 336, 344, 352, 88, 360, 368, 376, 384, 392, + 400, 408, 416, 424, 432, 440, 448, 456, 464, 472, 480, 488, 496, 504, 512, 520, + 528, 536, 544, 552, 560, 568, 576, 584, 592, 600, 608, 616, 624, 632, 640, 648, + 200, 200, 656, 664, 16, 16, 16, 16, 672, 680, 688, 696, 704, 712, 720, 728, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 736, 744, 752, 760, 768, 776, + 784, 792, 800, 808, 816, 824, 832, 840, 848, 856, 864, 872, 880, 888, 896, 904, + 912, 920, 928, 936, 944, 952, 960, 136, 80, 80, 80, 80, 968, 976, 984, 992, + 1000,1008,1016,1024,1032,1040,1048, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 1056,1064, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 160, 160, 160, 160, 40, 40, 40, 40, 40, 40, 40, 40, 40,1072, 40, 40, + 1080,1088,1096,1104,1112,1120,1128,1136, 40,1144,1152,1160, 8, 8, 8,1168, + 1176,1184,1192,1200,1208, 16,1216,1224,1232,1240, 40,1248,1256,1264, 40, 40, + 8, 8, 8, 8, 8, 8, 8, 40, 8, 8, 8, 8, 8, 8, 8, 8, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64,1272,1280, 168, 168, 168, 168,1288, 152,1296,1304,1312, 80,1320,1328, + 1336,1344,1352,1360,1368,1376,1384,1392,1400,1408,1416,1424,1432,1440,1448,1456, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,1464,1472, + 0, 0, 0, 0, 8, 8, 8, 8, 8, 208, 8,1480,1488,1496, 88, 88, + 88, 88, 88, 88,1504, 88, 88,1512,1520,1528, 88,1536,1544,1552,1560,1568, + 1576,1584,1592,1600,1608, 216,1616,1624, 0, 0,1632,1640,1648,1656,1664,1672, + 1680,1688,1696,1704,1712,1720,1728,1736, 176, 176, 176, 176,1744,1752,1760, 0, + 1768,1776,1784,1792,1800,1808,1816,1824,1832,1840,1848,1856,1864,1872,1880, 0, + 1888,1896,1904,1912,1920,1928,1936, 0, 0,1944,1952,1960,1968,1976,1984,1992, + 2000,2008,2016,2024,2032,2040,2048,2056,2064,2072,2080,2088,2096,2104,2112,2120, + 2128,2136,2144,2152, 0, 0,2160,2168,2176,2184,2192,2200,2208,2216, 0, 0, + 2224, 0,2232,2240,2248,2256,2264,2272,2280,2288,2296,2304,2312,2320, 0,2328, + 2336,2344,2352, 0,2360,2368,2376,2384, 0, 0, 0,2392,2400,2408,2416,2424, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,2432, 0, + 56, 56, 56, 56, 56,2440,2448, 224, 224,2456,2464, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2472,2480, + 48,2488, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,2496, + 112, 112, 112, 112, 112, 112, 112, 112, 112,2504, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,2512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 120, 120, 120, 120, 120, 120, 120, 120,2520,2528,2536,2544,2552,2560,2568, 0, + 0, 0, 0, 0, 0,2576, 0, 0, 0,2584,2592,2600,2608,2616,2624,2632, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 128, 128, 128, 128, + 128, 128, 128,2640,2648, 0, 32,2656, 72, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 72, 72, 72, 72,2664,2672, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,2680, + 2688, 184, 184, 184,2696,2704, 144, 144, 144, 144, 144,2712, 0, 0, 0, 0, + 2720,2728,2736, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 40, 40, 40,2744, 40, 40, 40, 40, 40, 40,2752,2760,2768,2776, 40,2784, + 40, 40, 40,2792,2800,2808,2816, 40, 216,2824,2832,2840, 40,2848, 0, 0, + 40,2856,2864,2872,2880,2888, 40, 40, 40, 40,2896, 40, 40, 40, 40,2904, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,2912, 0,2920, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80,2928,2936, + 2944,2952,2960, 0,2968,2976, 0, 0, 0, 0,2984,2992, 0, 0, 0, 0, + 0, 0, 0,3000, 0, 0, 0,3008, 0, 0, 0,3016, 0, 0, 0,3024, + 192, 192, 192,3032,3040,3048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,3056,3064, 0,3072, 0, 0, 0,3080,3088,3096,3104, 0, 0, 0, 0, + 3112, 40,3120,3128, 40, 40,3136,3144,3152,3160, 0, 0, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,3168, 40, 40, 40,3176, + 3184,3192,3200,3208, 40, 40, 40, 40, 40,3216, 40,3224, 40, 40,3232,3240, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,3248, 8, 8, 8, 8, + 3256, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 208, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,3264, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 232, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 232, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,3272, 8, 8, + 8,3280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3288, 40, 0, 0, 136, 136, 136, 136, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16, 16, + 24, 24, 24, 24, 24, 24, 24, 24, 40, 40, 40, 40, 40, 40, 40, 40, + 32, 32, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, + 64, 64, 64, 64, 64, 64, 64, 64, 80, 80, 80, 80, 80, 80, 80, 80, + 88, 88, 88, 88, 88, 88, 88, 88, 56, 56, 56, 56, 56, 56, 56, 56, + 72, 72, 72, 72, 72, 72, 72, 72, 96, 96, 96, 96, 96, 96, 96, 96, + 112, 112, 112, 112, 112, 112, 112, 112, 128, 128, 128, 128, 128, 128, 128, 128, + 104, 104, 104, 104, 104, 104, 104, 104, 144, 144, 144, 144, 144, 144, 144, 144, + 120, 120, 120, 120, 120, 120, 120, 120, 152, 152, 152, 152, 152, 152, 152, 152, + 136, 136, 136, 136, 136, 136, 136, 136, 208, 208, 208, 208, 208, 208, 208, 208, + 192, 192, 192, 192, 192, 192, 192, 192, 184, 184, 184, 184, 184, 184, 184, 184, + 168, 168, 168, 168, 168, 168, 168, 168, 224, 224, 224, 224, 224, 224, 224, 224, + 216, 216, 216, 216, 216, 216, 216, 216, 8, 8, 8, 8, 8,1008, 8, 8, + 160, 160, 160, 160, 160, 160, 160, 160, 256, 256, 256, 256, 256, 256, 256, 256, + 8, 8, 8,1008, 0, 0, 0, 0,1120, 56, 56,1128,1120, 56, 56,1128, + 32, 32, 32, 32, 32,1304, 32,1304, 56, 56,1536, 56, 56, 56,1536, 56, + 56, 56, 56, 56, 56, 56, 56,2096, 32, 32, 32, 32,2104,2112, 32, 32, + 120, 120, 120, 120, 120, 120,2120,2128,2136,2144, 160, 160,2152, 160, 160, 160, + 160, 160, 160, 160,2160, 320, 160, 160,2168, 136, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 136,2176, 424, 424, 424,2184, 424, 424, 424, 424, 424, + 424, 424,2192, 376, 376, 376, 376, 376, 376,2200, 376, 376, 376,2208,2216, 0, + 1544,2224, 72,2232, 72, 72, 72, 72,2240,2248,2256, 72, 72, 72,2264, 72, + 72, 72, 72,1544, 72, 72, 72, 72, 520,2272, 520, 520, 520, 520, 520, 520, + 520,2280, 72, 72, 72, 72, 72, 72, 800, 800, 800, 800, 800, 800,2288, 0, + 712, 712, 712, 712, 712, 712, 712,2296, 808, 808, 808, 808, 808,2304, 808,2312, + 1312,1312,1312,2320, 520,2328, 72, 72, 72, 72,2336, 72, 72, 72, 72, 72, + 72, 72, 72, 72,2344, 72, 72, 72, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264,2352, 264,2360, 264, 264, 264,2368,1552,2376,1136,1136,2384,2392,2400, + 1552,2408,2416,2424,2432,1136,1136,2440,2448,1560,2456,1320,1320,2464,2472,2480, + 1560,2488,2496,2504,2512,1320,2520, 0,2528,1568,2536,1328,1328,2544,2552,2560, + 1568,2568,2576, 0,2584,1328,2592,2600,2608,1576,2616,1144,1144,2624,2632,2640, + 1576,2648,2656,2664,2672,1144,1144, 0,2680,1336,1584,2688,2696,1336, 528,2704, + 1336,1584,2712, 0,2720, 528, 528,2728, 816,1592,1600, 816, 816,1600, 816,2736, + 1592,2744,2752,2760,2768, 816,2776, 816,1152,1608,1616,1152,1152,1616,2784,2792, + 1608,2800,2808,2816,2824,1152,2832, 0, 432,1624,1632, 432, 432, 432, 432, 432, + 1624,1632,2840, 432,2848, 432, 432, 432,2856, 824,1640,2864, 824, 824,2872,2880, + 1640,2888,2896, 824,2904, 824,2912, 0,2920, 536, 536, 536, 536, 536, 536,2928, + 536, 536, 536,2936, 0, 0, 0, 0,2944,2952, 992, 992,2960, 992, 992,2968, + 2976,2984, 992,2992, 0, 0, 0, 0, 240, 240, 240, 240, 240, 240, 240, 240, + 240,1344, 240, 240, 240,3000,1344, 240, 240, 240, 240,1344, 240, 240, 240,1648, + 240,1648,3008,3016, 0, 0, 0, 0, 216, 216, 216, 216, 280, 280, 280, 280, + 1656,1664, 280, 280, 280, 280, 280,3024, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 832, 304, 832, 176, 176, 176, 176, 176, 832, 176, 176, 176, 176, 832, 304, + 832, 176, 304, 176, 176, 176, 176, 176, 176, 176, 832, 176, 176, 176, 176, 176, + 176, 176, 176,3032, 176, 176, 176,3040, 176, 176, 176,3048, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248,1672,1672,1352,1352,1352,3056, 440, 440, 440, 440, + 440, 440, 440, 440, 440,3064, 440,3072,1680,1680,3080,3088,1688,1688,3096, 0, + 1696,1696,3104, 0,3112,3120,3128, 0, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296,3136, 296,1704, 296,1704,3144, 272, 272,3152, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272,3160, 272, 272, 272, 272, 272,3168, 96, 96, + 96, 96, 96, 96, 96, 96,3176, 0, 840, 840, 840,3184, 840,1712, 840,1712, + 3192, 840,1360,1360,1360,3200,3208, 0, 544, 544, 544, 544, 544,3216, 544, 544, + 544,3224, 544,3232, 296, 296, 296, 296,1368,1368,1368,3240, 352, 352, 352, 352, + 352, 352, 352,3248, 352, 352, 352,3256, 352,1720, 352,1720, 352,3264, 120, 120, + 120, 120, 120, 120, 120, 120,1728, 0, 328, 328, 328, 328, 328, 328, 328, 328, + 328,3272, 328, 328, 328, 328, 328, 328, 552, 552, 552, 552, 552, 552, 552, 552, + 848, 848, 848, 848, 848, 848,3280,3288, 624, 624, 624, 624, 624, 624, 624,3296, + 624,3304, 856, 856, 856, 856, 856, 856, 136,3312, 280, 280, 280, 280, 280,3320, + 552, 0,3328, 120,3336,3344,3352,3360, 56, 56, 56, 56,3368,3376, 56, 56, + 56, 56, 56,3384,3392,3400, 56,3408, 56, 56, 56, 56, 56, 56, 56,3416, + 160, 160, 864, 864, 160, 160, 160, 160, 864, 864, 160,3424, 160, 160, 160, 864, + 160, 160, 160, 160, 160, 160,1736, 160,1736, 160,3432,3440, 160, 160,3448,1744, + 32,3456, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,1000, 32,3464,3472, + 32, 32, 56, 56, 32, 32, 32, 32, 632, 0, 120, 120, 120, 120,1728, 0, + 32, 32, 32, 32,3480,3488,1304, 32, 32,3496, 32, 32, 56, 56, 56, 56, + 56,3504, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 720, 0, 0, + 32,1376, 0, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,1752, 32, + 344, 344, 344, 344, 344, 344, 344, 344, 344, 344, 344, 344, 56, 56, 56, 56, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,3512,3520, + 280, 280, 280, 280,1656,1664, 728, 728, 728, 728, 728, 728, 728,1760,3528,1760, + 176, 176, 304, 0, 304, 304, 304, 304, 304, 304, 304, 304, 136, 136, 136, 136, + 32, 32, 32, 560, 336, 0, 0, 0, 8, 8, 8,3536, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8,3544, 0, 8, 8,1008, 0, 0, 0, 32, 32, + 3552, 32, 32, 32,3560,3568, 32,3576,3584, 168, 168, 168, 168, 168, 168, 168, + 168, 168,3592,3600,1768, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200,3608, + 3616, 568, 568, 568, 568, 568,3624, 16, 16,1160, 32, 32, 568, 568, 568, 568, + 32, 32, 32, 32, 560,3632, 200, 200, 16, 16, 16,1160, 32, 32, 32, 32, + 32, 32, 32, 32, 16, 16, 16,3640, 32, 32, 200, 200, 200, 200, 200,3648, + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 32, 32, 32, 32, 32, + 80,3656, 80, 80, 80, 80, 80, 80,3664, 0, 872, 872, 872, 872, 872, 872, + 192, 192, 192, 192, 192,3672, 0, 0, 136, 136, 136, 136, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 0, 32, 32, 32, 32,3680, 56, 56, 56, + 56,3688, 56, 56, 56, 56, 56, 56, 56, 56, 56,3696,3704, 0,3712, 56, + 1016,1016,1016,1016,1016,3720, 32, 720, 736, 736, 736, 736, 736, 736, 736, 0, + 576, 576, 576, 576, 576, 576, 576, 576,3728,3736, 576,3744, 264, 264, 264, 264, + 1024,1024,1024,1024,1024,3752,1168,1168,1168,1168,3760,3768, 16, 16, 16,3776, + 448, 448, 448, 448, 448, 448, 448, 448, 448,3784, 448,3792, 216, 216, 216,3800, + 640, 640, 640, 640, 640, 640,3808, 0, 640,3816, 640,3824, 216, 216, 216, 216, + 648, 648, 648, 648, 648, 648, 648, 648,3832, 0, 0,3840, 656, 656,3848, 0, + 1384,1384,1384, 0, 304, 304, 56, 56, 56, 56, 56,3856,3864,3872, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 656, 656, 656, 656, 656,3880, 656,3888, + 16, 16, 16, 16,1776, 0, 16, 16,1160,3896, 16, 16, 16, 16, 16,1776, + 8, 8, 8,1784, 0, 0, 0, 0,1792, 0,3904,3912, 376, 376,3920,3928, + 3936, 376, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,3944, + 72, 72, 0, 0, 0, 0, 72, 72, 120, 120, 32, 720, 120,3952, 32, 32, + 32, 32,1800, 32, 664, 336,3960, 72, 72, 72, 72, 72, 72, 72, 72,3968, + 880, 32, 32, 32,1120, 56, 56,1128,1120, 56, 56,1128,3976, 200,1768, 200, + 200, 200, 200,3984, 16, 16, 16,1160,1392,1392,1392,3992, 664, 664, 0,4000, + 232,4008, 232, 232,4016, 232, 232,4024, 232,1808, 232,1808, 0, 0, 0, 0, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,4032, + 4040, 32, 32, 32, 32, 32,1816, 32, 160,1744, 32, 632,4048, 0, 0, 0, + 0, 0, 32, 32, 32, 32, 32,4056,1400,1400,1400,4064, 888, 888, 888, 888, + 888, 888,4072, 0,1824, 32, 32, 336,1176,1176,1176,1176,4080,4088,1408,1408, + 1408,4096,1032,1032,1032,1032,1032,4104,1416,1416,1416,4112,1040,1040,1040,1040, + 4120,1040,4128, 0, 0, 0, 0, 0, 456, 456, 456, 456, 456, 456, 456, 456, + 456, 456, 896, 896, 896, 896, 896, 896,1184,1184,1184,4136,1184,4144, 672, 672, + 672, 672,1832, 672, 672, 672, 672,1832,1048,1048,1048,1048,1048, 0, 904, 904, + 904, 904, 904, 904,4152,4160,1192,1840,1192,1840,4168,1192,1848,1192,1848,4176, + 912, 912, 912, 912, 912, 912,4184, 0, 184, 184, 184, 184, 184, 184,4192, 0, + 184, 184,4200, 0, 184, 0, 0, 0,4208, 56, 56, 56, 56, 56,4216, 56, + 4224,4232,1200,1200,1200,1200,4240,4248,1424,1424,4256,1424,1208,1208,1208,1208, + 1216,1216,1216,4264,4272,1216, 0, 0, 0, 0, 0, 0,1856,1856,4280,4288, + 1432,1432,1432,4296,1440,1440,1440,4304,1448,1448,1448,4312, 0, 0, 0, 0, + 1224,1224,1224,1224, 464, 464, 464,4320, 464, 464,4328, 464, 464, 464, 464, 464, + 4336,4344,4352,4360,1232,1232,4368,4376,1232,1864,1232,1864,1240,1240,1240,1240, + 1248,1248,1248,1248, 0, 0, 0, 0,1256,1256,1256,1256,1872,4384,1872, 0, + 920, 920, 920, 920, 920, 920,4392,4400,1456,1456,4408,1456,1464,1464,4416,1464, + 1880,1880,4424,4432, 0,4440, 0, 0, 584, 584, 584, 584, 584, 584, 584, 584, + 584,4448, 0, 0, 0, 0, 0, 0, 384, 384, 384, 384, 384, 384,1888, 0, + 384, 384, 384, 384, 384, 384,1888,4456, 928, 928, 928, 928, 928, 0, 928,4464, + 936, 936, 936, 936,1896,4472, 936, 936,1896,4480, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 72, 72, 72,1904,1056,1056,1056,1056,1056,4488,4496, 0, + 4504,1912, 72, 72, 72,1904, 72, 72,1064,1064,1064,1064,1064, 0,1072,1072, + 1072,1072,1072,4512, 0, 0,1472,1472,1472,4520, 0, 0, 0, 0,1480,1480, + 1480,4528, 0, 0,1920,1920,4536, 0, 392, 392, 392, 392, 392, 392, 392, 392, + 392,1928,4544, 392, 392, 392,1928,4552, 680, 680, 680, 680, 680, 680, 680, 680, + 4560,4568,1264,1264,1264,4576,1264,4584, 688, 688, 688, 688, 688, 688,4592, 688, + 688, 0,1272,1272,1272,1272,4600, 0, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360,4608, 824,4616, 0, 744, 744,4624, 744, 744, 744, 744, 744, + 4632, 0, 0, 0, 0, 0, 0, 0,4640,4648,1936,4656,1936,4664, 696, 696, + 696, 696, 696, 696, 696,4672, 696,4680,4688,1944,4696,1952,1952,4704,4712,4720, + 1944,4728,4736,4744,4752,1960,1960, 0, 944,4760, 944, 944, 944, 944,1968, 944, + 4768,4776,1968,4784,4792, 0, 0, 0, 408, 408, 408, 408, 408, 408, 408, 408, + 408, 408, 408,4800,4808, 0, 0, 0, 472, 472, 472, 472, 472, 472, 472, 472, + 472, 0, 472,4816, 0, 0, 0, 0, 480, 480, 480, 480, 480, 480,1976, 480, + 480, 480, 480,1976, 0, 0, 0, 0, 592, 592, 592, 592, 592, 592, 592, 592, + 4824, 0, 592,4832, 272,4840, 0, 0, 704, 704, 704, 704, 704, 704, 704,1984, + 704,1984, 216, 216,4848, 0, 0, 0, 952, 952, 952,4856, 952,4864, 952, 952, + 4872, 0, 0, 0, 0, 0, 0, 0, 752, 752, 752, 752, 752, 752, 752,4880, + 0, 0, 0, 0, 488, 488, 488, 488, 488, 488, 488, 488, 488, 488,4888,4896, + 1992,4904,4912,1280,1280,1280,4920,4928,1992, 0,1280,4936, 0, 0, 0, 0, + 0, 0, 0, 0, 960,2000, 960, 960, 960, 960, 960,2000,4944, 0, 0, 0, + 600, 600, 600, 600, 600, 600, 600, 600, 600, 0, 496, 496, 496, 496, 496, 496, + 496, 496, 496, 496,4952, 0, 96, 96, 760, 760, 760, 760, 760, 760, 760,4960, + 264,4968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 360, 0, 0, 0, + 1080,1080,1080,1080,2008, 0,1080,2008, 608,4976, 608, 608, 608, 608,4984, 608, + 4992, 0, 608, 608, 608,5000, 968, 968, 968, 968,5008, 968, 968,5016,5024, 0, + 2016,5032, 976, 976, 976, 976,2016,5040, 976, 0, 976,5048,5056,5064,1288,1288, + 1288,5072,5080,5088,1288,5096, 984, 984, 984, 984, 984,5104, 984,5112,5120, 0, + 0, 0, 0, 0,1488,1488,1488,5128, 616, 616,5136, 616, 616, 616, 616,5144, + 616, 616, 616,5152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5160, 0, + 528, 528, 528, 528, 528, 528,5168,5176, 64, 64, 64,5184, 0, 0, 0, 0, + 5192, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 256, 256, 256, + 256,5200, 64, 64, 64, 64, 64, 64,5208, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400,5216, 0, + 48, 48,5224, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,5232, + 5240, 0, 0, 0, 0, 0, 0, 0, 768, 768, 768, 768, 768, 768, 768,5248, + 104, 104, 104, 104, 104, 104, 104,5256,1296,1296,1296,5264,1296,5272, 504, 504, + 504, 504, 504, 504, 504, 504, 504,5280, 504,5288,1496,1496,1496,2024,2024, 0, + 368, 368, 368, 368, 368, 368, 368, 368,5296, 0, 368,2032,2032, 368, 368,5304, + 368, 368, 0, 0, 0, 0, 0, 0, 776, 776, 776, 776, 776, 776, 776,5312, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,5320,1088,1088,1088,5328, + 1088,1088,5336, 0, 0, 0, 0, 0, 288, 288, 288, 288, 288, 288, 288, 288, + 288,5344, 288, 288, 288, 288, 288, 288, 288,5352, 288, 288, 0, 0, 0, 0, + 0, 0, 0, 0,5360, 0,2040, 0, 144, 144, 144,5368, 0, 0, 0,5376, + 40, 40, 40, 40,5384, 0, 0, 0, 40, 40, 40, 40, 40, 40,5392, 0, + 88, 88,5400, 0, 88, 88, 88, 88, 88, 88,5408, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,5416,5424,5432, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168,5440,2048,5448, 0, 0, 0,5456, 0,5464,2048, 152, 152, + 152, 152, 152, 152, 152, 152, 152,5472, 312, 312, 312, 312, 312, 312, 312, 312, + 312, 312, 312, 312, 312,5480, 312,5488, 312,5496, 312,5504, 336, 0, 0, 0, + 32, 32, 32, 32, 32, 32, 32, 632, 32, 32, 32, 32, 32, 32, 336,2056, + 32, 32,5512,5520, 32, 32, 32, 560, 120, 120, 120, 120, 120,5528, 120, 120, + 5536, 0, 32, 32, 32, 32, 32, 32, 336, 0, 0, 0, 0, 0, 0, 0, + 32, 32, 32, 32, 32, 32, 560, 0, 32, 32, 32, 32,2064,1824, 32, 32, + 32, 32, 32, 32,2064,5544, 32,5552,5560,5568, 32, 32, 32,5576, 32, 32, + 864, 0, 32,5584, 32, 32, 32, 32, 720, 0, 0, 0, 0, 0, 0, 0, + 32, 32, 336, 0, 32, 32, 336, 0, 32, 32, 664, 0, 32, 32, 32,1504, + 32, 32,1000, 32, 32, 32, 32, 32, 32, 32, 32,1000,5592,5600, 32,5608, + 5616, 32, 32, 32, 32, 32, 32, 32,2072,5624,1000,1000, 32, 32, 32,5632, + 5640,2056,5648, 32, 32, 32, 32, 32, 32, 32, 32, 32, 664, 32, 32, 32, + 32,1752, 32, 32, 32, 32, 32, 32, 112,5656, 0,5664,5672, 112, 0, 0, + 32, 32, 32, 632, 0, 0, 0, 0,5680, 0,1792, 0, 0, 0, 0, 0, + 0,5688, 56, 56, 56, 56,5696, 56,5704, 344, 344,5712,5720,5728, 136, 136, + 136, 136, 136, 136, 136,5736, 0, 0, 0,5744, 0, 0, 0, 0, 0, 0, + 784, 784, 784, 784, 784,5752, 784,5760, 784,5768, 0, 0, 0, 0, 0, 0, + 0, 0,1512,1512,1512,5776, 0, 0, 792, 792, 792, 792, 792, 792, 792,5784, + 0, 0,1096,1096,1096,1096,1096,5792, 0, 0,1104,1104,1104,1104,1104,5800, + 1112,1112,1112,5808,1112,1112,5816,5824, 0, 0, 0, 0, 304,5832, 176, 304, + 5840, 224,5848, 0, 0, 0, 0, 0, 512, 512, 512, 512, 512, 512, 512, 512, + 512,5856, 512,5864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 880, 32, + 32, 32, 32, 32, 32, 32, 632, 0, 880, 32, 32, 32, 32, 32, 32, 560, + 5872, 72, 72, 72,1520,1912,1528,5880,5888,5896,1520,5904,1520,1528,1528,5912, + 72,2080, 72,2088,5920,2080, 72,2088, 0, 0, 0, 0, 0, 0,5928, 0, + 32, 32, 32, 32, 32, 336, 32, 32, 32, 32, 336, 0, 32, 664, 880, 32, + 880, 32, 880, 32, 32, 32, 560, 0, 32, 32, 32, 32, 32, 664, 0, 0, + 0, 0, 0, 0,5936, 32, 32, 32,5944, 0, 32, 32, 32, 32, 32, 336, + 32,1504, 720, 0, 560, 0, 0, 0, 32, 32, 32,5952, 32, 632, 32, 632, + 32, 32, 32, 336, 32, 336, 32, 32, 32, 336, 32, 32, 32, 32, 32, 32, + 32, 0, 32, 720, 32, 32, 32, 32, 32, 0, 32, 32, 32, 560, 32, 336, + 720, 0, 32,1504, 0, 0, 0, 0, 32, 32, 32, 0, 32, 560, 32, 632, + 664,5960, 32,2072, 32,1816, 32,1376, 32, 32,1800, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32,1376, 8, 8, 8, 8, 0, 0, 0, 0, + 8, 8, 8,2040, 8, 8, 8, 8, 8, 8, 8, 8,5968, 0, 8, 8, + 8,5976, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1784, + 5984, 0, 0, 0, 32, 32, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 939, 940, 941, 942, 946, 948, 0, 962, + 969, 970, 971, 976,1001,1002,1003,1008, 0,1033,1040,1041,1042,1043,1047, 0, + 0,1080,1081,1082,1086,1110, 0, 0,1124,1125,1126,1127,1131,1133, 0,1147, + 1154,1155,1156,1161,1187,1188,1189,1193, 0,1219,1226,1227,1228,1229,1233, 0, + 0,1267,1268,1269,1273,1298, 0,1303, 943,1128, 944,1129, 954,1139, 958,1143, + 959,1144, 960,1145, 961,1146, 964,1149, 0, 0, 973,1158, 974,1159, 975,1160, + 983,1168, 978,1163, 988,1173, 990,1175, 991,1176, 993,1178, 994,1179, 0, 0, + 1004,1190,1005,1191,1006,1192,1014,1199,1007, 0, 0, 0,1016,1201,1020,1206, + 0,1022,1208,1025,1211,1023,1209, 0, 0, 0, 0,1032,1218,1037,1223,1035, + 1221, 0, 0, 0,1044,1230,1045,1231,1049,1235, 0, 0,1058,1244,1064,1250, + 1060,1246,1066,1252,1067,1253,1072,1258,1069,1255,1077,1264,1074,1261, 0, 0, + 1083,1270,1084,1271,1085,1272,1088,1275,1089,1276,1096,1283,1103,1290,1111,1299, + 1115,1118,1307,1120,1309,1121,1310, 0,1053,1239, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1093,1280, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 949,1134,1010,1195,1050,1236,1090,1277,1341,1368,1340, + 1367,1342,1369,1339,1366, 0,1320,1347,1418,1419,1323,1350, 0, 0, 992,1177, + 1018,1204,1055,1241,1416,1417,1415,1424,1202, 0, 0, 0, 987,1172, 0, 0, + 1031,1217,1321,1348,1322,1349,1338,1365, 950,1135, 951,1136, 979,1164, 980,1165, + 1011,1196,1012,1197,1051,1237,1052,1238,1061,1247,1062,1248,1091,1278,1092,1279, + 1071,1257,1076,1263, 0, 0, 997,1182, 0, 0, 0, 0, 0, 0, 945,1130, + 982,1167,1337,1364,1335,1362,1046,1232,1422,1423,1113,1301, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 0, 10,1425, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,1314,1427, 5, + 1434,1438,1443, 0,1450, 0,1455,1461,1514, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1446,1458,1468,1476,1480,1486,1517, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1489,1503,1494,1500,1508, 0, 0, 0, 0,1520,1521, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,1526,1528, 0,1525, 0, 0, 0,1522, + 0, 0, 0, 0,1536,1532,1539, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1534, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1556, 0, 0, 0, 0, 0, 0,1548,1550, 0,1547, 0, 0, 0,1567, + 0, 0, 0, 0,1558,1554,1561, 0, 0, 0, 0, 0, 0, 0,1568,1569, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1529,1551, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,1523,1545,1524,1546, 0, 0,1527,1549, + 0, 0,1570,1571,1530,1552,1531,1553, 0, 0,1533,1555,1535,1557,1537,1559, + 0, 0,1572,1573,1544,1566,1538,1560,1540,1562,1541,1563,1542,1564, 0, 0, + 1543,1565, 0, 0, 0, 0, 0, 0, 0, 0,1606,1607,1609,1608,1610, 0, + 0, 0, 0, 0, 0, 0, 0, 0,1613, 0,1611, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1612, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1620, 0, 0, 0, 0, 0, 0, 0,1623, 0, 0,1624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 939, 940, 941, 942, 946, 948, 0, 962, 969, 970, 971, 976,1001,1002,1003,1008, - 0,1033,1040,1041,1042,1043,1047, 0, 0,1080,1081,1082,1086,1110, 0, 0, - 1124,1125,1126,1127,1131,1133, 0,1147,1154,1155,1156,1161,1187,1188,1189,1193, - 0,1219,1226,1227,1228,1229,1233, 0, 0,1267,1268,1269,1273,1298, 0,1303, - 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149, - 0, 0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175, - 991,1176, 993,1178, 994,1179, 0, 0,1004,1190,1005,1191,1006,1192,1014,1199, - 1007, 0, 0, 0,1016,1201,1020,1206, 0,1022,1208,1025,1211,1023,1209, 0, - 0, 0, 0,1032,1218,1037,1223,1035,1221, 0, 0, 0,1044,1230,1045,1231, - 1049,1235, 0, 0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258, - 1069,1255,1077,1264,1074,1261, 0, 0,1083,1270,1084,1271,1085,1272,1088,1275, - 1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310, 0, - 1053,1239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1093, - 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 949,1134,1010, - 1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366, 0,1320,1347, - 1418,1419,1323,1350, 0, 0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424, - 1202, 0, 0, 0, 987,1172, 0, 0,1031,1217,1321,1348,1322,1349,1338,1365, - 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238, - 1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263, 0, 0, 997,1182, - 0, 0, 0, 0, 0, 0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232, - 1422,1423,1113,1301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 9, 0, 10,1425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0,1314,1427, 5,1434,1438,1443, 0,1450, 0,1455,1461, - 1514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1446,1458,1468,1476,1480,1486, - 1517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1489,1503,1494,1500,1508, 0, - 0, 0, 0,1520,1521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1526,1528, 0,1525, 0, 0, 0,1522, 0, 0, 0, 0,1536,1532,1539, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1534, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1556, 0, 0, 0, 0, 0, 0, - 1548,1550, 0,1547, 0, 0, 0,1567, 0, 0, 0, 0,1558,1554,1561, 0, - 0, 0, 0, 0, 0, 0,1568,1569, 0, 0, 0, 0, 0, 0, 0, 0, - 0,1529,1551, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1523,1545,1524,1546, 0, 0,1527,1549, 0, 0,1570,1571,1530,1552,1531,1553, - 0, 0,1533,1555,1535,1557,1537,1559, 0, 0,1572,1573,1544,1566,1538,1560, - 1540,1562,1541,1563,1542,1564, 0, 0,1543,1565, 0, 0, 0, 0, 0, 0, - 0, 0,1606,1607,1609,1608,1610, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1613, 0,1611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1620, 0, 0, 0, 0, 0, 0, - 0,1623, 0, 0,1624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1614,1615,1616,1617,1618,1619,1621,1622, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1628,1629, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1625,1626, 0,1627, - 0, 0, 0,1634, 0, 0,1635, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1630,1631,1632, 0, 0,1633, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1639, 0, 0,1638,1640, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1636,1637, 0, 0, - 0, 0, 0, 0,1641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1642,1644,1643, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1645, 0, 0, 0, 0, 0, 0, 0, - 1646, 0, 0, 0, 0, 0, 0,1648,1649, 0,1647,1650, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1651,1653,1652, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1654, 0,1655,1657,1656, 0, - 0, 0, 0,1659, 0, 0, 0, 0, 0, 0, 0, 0, 0,1660, 0, 0, - 0, 0,1661, 0, 0, 0, 0,1662, 0, 0, 0, 0,1663, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1658, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1664, 0,1665,1673, 0,1674, 0, 0, 0, 0, 0, 0, 0, - 0,1666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1668, 0, 0, 0, 0, 0, 0, 0, 0, 0,1669, 0, 0, - 0, 0,1670, 0, 0, 0, 0,1671, 0, 0, 0, 0,1672, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1667, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1675, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1676, 0,1677, 0,1678, 0,1679, 0,1680, 0, - 0, 0,1681, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1682, 0,1683, 0, 0, - 1684,1685, 0,1686, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153, - 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171, - 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356, - 1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214, - 1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363, - 1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251, - 1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266, - 1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287, - 1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302, - 1119,1308,1122,1311,1123,1312,1186,1260,1293,1305, 0,1394, 0, 0, 0, 0, - 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375, - 1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353, - 1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234, - 1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403, - 1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412, - 1409,1414,1109,1297,1117,1306,1116,1304,1112,1300, 0, 0, 0, 0, 0, 0, - 1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721, - 1477,1478,1729,1731,1730,1732, 0, 0,1435,1436,1733,1735,1734,1736, 0, 0, - 1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757, - 1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776, - 1495,1496,1777,1779,1778,1780, 0, 0,1451,1452,1781,1783,1782,1784, 0, 0, - 1504,1505,1785,1788,1786,1789,1787,1790, 0,1459, 0,1791, 0,1792, 0,1793, - 1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814, - 1467, 21,1475, 22,1479, 23,1485, 24,1493, 27,1499, 28,1507, 29, 0, 0, - 1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728, - 1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764, - 1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821, - 1470,1469,1822,1474,1465, 0,1473,1825,1429,1428,1426, 12,1432, 0, 26, 0, - 0,1315,1823,1484,1466, 0,1483,1829,1433, 13,1437, 14,1441,1826,1827,1828, - 1488,1487,1513, 19, 0, 0,1492,1515,1445,1444,1442, 15, 0,1831,1832,1833, - 1502,1501,1516, 25,1497,1498,1506,1518,1457,1456,1454, 17,1453,1313, 11, 3, - 0, 0,1824,1512,1519, 0,1511,1830,1449, 16,1460, 18,1464, 4, 0, 0, - 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 2, 6, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1834,1835, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1836, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1837,1839,1838, - 0, 0, 0, 0,1840, 0, 0, 0, 0,1841, 0, 0,1842, 0, 0, 0, - 0, 0, 0, 0,1843, 0,1844, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,1845, 0, 0,1846, 0, 0,1847, 0,1848, 0, 0, 0, 0, 0, 0, - 937, 0,1850, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1849, 936, 938, - 1851,1852, 0, 0,1853,1854, 0, 0,1855,1856, 0, 0, 0, 0, 0, 0, - 1857,1858, 0, 0,1861,1862, 0, 0,1863,1864, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1867,1868,1869,1870, - 1859,1860,1865,1866, 0, 0, 0, 0, 0, 0,1871,1872,1873,1874, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 33, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1875, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1877, 0,1878, 0, - 1879, 0,1880, 0,1881, 0,1882, 0,1883, 0,1884, 0,1885, 0,1886, 0, - 1887, 0,1888, 0, 0,1889, 0,1890, 0,1891, 0, 0, 0, 0, 0, 0, - 1892,1893, 0,1894,1895, 0,1896,1897, 0,1898,1899, 0,1900,1901, 0, 0, - 0, 0, 0, 0,1876, 0, 0, 0, 0, 0, 0, 0, 0, 0,1902, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1904, 0,1905, 0, - 1906, 0,1907, 0,1908, 0,1909, 0,1910, 0,1911, 0,1912, 0,1913, 0, - 1914, 0,1915, 0, 0,1916, 0,1917, 0,1918, 0, 0, 0, 0, 0, 0, - 1919,1920, 0,1921,1922, 0,1923,1924, 0,1925,1926, 0,1927,1928, 0, 0, - 0, 0, 0, 0,1903, 0, 0,1929,1930,1931,1932, 0, 0, 0,1933, 0, - 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601, - 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662, - 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168, - 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758, - 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585, - 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259, - 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697, - 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170, - 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330, - 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473, - 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603, - 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411, - 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583, - 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269, - 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510, - 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156, - 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210, 0, 0, - 227, 0, 379, 0, 0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604, 0, - 661, 0, 703, 0, 0, 735, 743, 0, 0, 0, 793, 794, 795, 808, 741, 773, - 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329, - 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548, - 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651, - 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623, 0, 0, - 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243, - 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362, - 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490, - 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586, - 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706, - 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848, - 847, 857, 55, 65, 66, 883, 892, 916, 822, 824, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1586, 0,1605, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1602,1603,1934,1935,1574,1575, - 1576,1577,1579,1580,1581,1583,1584, 0,1585,1587,1588,1589,1591, 0,1592, 0, - 1593,1594, 0,1595,1596, 0,1598,1599,1600,1601,1604,1582,1578,1590,1597, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1936, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,1937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1938, 0,1939, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1940, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1941,1942, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1943,1944, 0, 0, 0, - 0, 0, 0,1945, 0,1946, 0, 0, 0, 0, 0, 0, 0, 0,1947, 0, - 0,1948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1950, 0,1949,1951, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1953,1952, 0,1954, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1955,1956, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1957, 0, 0, 0, 0, 0, 0, 0, - 0,1958,1961,1959,1965,1960,1962,1964,1963, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1967,1966,1968, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1969,1970, - 1971,1972,1973,1974,1975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1976,1977,1978,1980,1979, - 1981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125, 34, 830, 130, 131, - 132, 137, 827, 35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152, 37, - 157, 158, 159, 160, 38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179, - 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195, - 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216, - 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244, - 836, 837, 247, 248, 249, 246, 251, 39, 40, 253, 255, 255, 838, 257, 258, 259, - 261, 839, 262, 263, 301, 264, 41, 266, 270, 272, 271, 841, 274, 842, 277, 276, - 278, 281, 282, 42, 283, 284, 285, 286, 43, 843, 44, 289, 290, 291, 293, 934, - 298, 845, 845, 621, 300, 300, 45, 852, 894, 302, 304, 46, 306, 309, 310, 312, - 316, 48, 47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334, - 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361, - 358, 356, 49, 363, 365, 367, 364, 50, 369, 371, 851, 376, 386, 378, 53, 381, - 52, 51, 140, 141, 387, 382, 614, 78, 388, 389, 390, 394, 392, 856, 54, 399, - 396, 402, 404, 858, 405, 401, 407, 55, 408, 409, 410, 413, 859, 415, 56, 417, - 860, 418, 57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433, - 437, 441, 438, 439, 442, 443, 864, 436, 449, 450, 58, 454, 453, 865, 447, 460, - 866, 867, 461, 466, 465, 464, 59, 467, 470, 469, 472, 828, 475, 868, 478, 870, - 483, 485, 486, 871, 488, 489, 872, 873, 495, 497, 60, 498, 61, 61, 504, 505, - 507, 508, 511, 62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878, 63, 64, - 528, 880, 879, 881, 882, 530, 531, 531, 533, 66, 534, 67, 68, 884, 536, 538, - 541, 69, 885, 549, 886, 887, 556, 559, 70, 561, 562, 563, 888, 889, 889, 567, - 71, 890, 570, 571, 72, 891, 577, 73, 581, 579, 582, 893, 587, 74, 590, 592, - 596, 75, 895, 896, 76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611, - 853, 77, 615, 616, 79, 617, 252, 902, 903, 854, 855, 621, 622, 731, 80, 627, - 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651, - 638, 643, 644, 645, 905, 907, 906, 81, 653, 654, 656, 911, 657, 908, 82, 83, - 909, 910, 84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675, 85, - 677, 678, 86, 681, 682, 912, 685, 686, 87, 689, 36, 913, 914, 88, 89, 696, - 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728, - 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762, 90, - 764, 922, 91, 775, 279, 780, 923, 925, 92, 93, 785, 926, 94, 927, 787, 787, - 789, 928, 792, 95, 796, 797, 798, 800, 96, 929, 802, 804, 806, 97, 98, 807, - 930, 99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935, 0, 0, + 1614,1615,1616,1617,1618,1619,1621,1622, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1628,1629, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1625,1626, 0,1627, 0, 0, 0,1634, 0, 0,1635, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1630,1631,1632, 0, 0,1633, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1639, 0, 0,1638,1640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1636,1637, 0, 0, 0, 0, 0, 0,1641, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1642,1644,1643, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1645, 0, 0, 0, 0, 0, 0, 0,1646, 0, 0, 0, 0, 0, 0,1648, + 1649, 0,1647,1650, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1651,1653,1652, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1654, 0,1655,1657,1656, 0, 0, 0, 0,1659, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1660, 0, 0, 0, 0,1661, 0, 0, 0, 0,1662, + 0, 0, 0, 0,1663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1658, 0, 0, 0, 0, 0, 0, 0, 0, 0,1664, 0,1665,1673, 0, + 1674, 0, 0, 0, 0, 0, 0, 0, 0,1666, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1668, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1669, 0, 0, 0, 0,1670, 0, 0, 0, 0,1671, + 0, 0, 0, 0,1672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1667, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1675, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1676, 0, + 1677, 0,1678, 0,1679, 0,1680, 0, 0, 0,1681, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1682, 0,1683, 0, 0,1684,1685, 0,1686, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 953,1138, 955,1140, 956,1141, 957,1142, + 1324,1351, 963,1148, 965,1150, 968,1153, 966,1151, 967,1152,1378,1380,1379,1381, + 984,1169, 985,1170,1420,1421, 986,1171, 989,1174, 995,1180, 998,1183, 996,1181, + 999,1184,1000,1185,1015,1200,1329,1356,1017,1203,1019,1205,1021,1207,1024,1210, + 1687,1688,1027,1213,1026,1212,1028,1214,1029,1215,1030,1216,1034,1220,1036,1222, + 1039,1225,1038,1224,1334,1361,1336,1363,1382,1384,1383,1385,1056,1242,1057,1243, + 1059,1245,1063,1249,1689,1690,1065,1251,1068,1254,1070,1256,1386,1387,1388,1389, + 1691,1692,1073,1259,1075,1262,1079,1266,1078,1265,1095,1282,1098,1285,1097,1284, + 1390,1391,1392,1393,1099,1286,1100,1287,1101,1288,1102,1289,1105,1292,1104,1291, + 1106,1294,1107,1295,1108,1296,1114,1302,1119,1308,1122,1311,1123,1312,1186,1260, + 1293,1305, 0,1394, 0, 0, 0, 0, 952,1137, 947,1132,1317,1344,1316,1343, + 1319,1346,1318,1345,1693,1695,1371,1375,1370,1374,1373,1377,1372,1376,1694,1696, + 981,1166, 977,1162, 972,1157,1326,1353,1325,1352,1328,1355,1327,1354,1697,1698, + 1009,1194,1013,1198,1054,1240,1048,1234,1331,1358,1330,1357,1333,1360,1332,1359, + 1699,1700,1396,1401,1395,1400,1398,1403,1397,1402,1399,1404,1094,1281,1087,1274, + 1406,1411,1405,1410,1408,1413,1407,1412,1409,1414,1109,1297,1117,1306,1116,1304, + 1112,1300, 0, 0, 0, 0, 0, 0,1471,1472,1701,1705,1702,1706,1703,1707, + 1430,1431,1715,1719,1716,1720,1717,1721,1477,1478,1729,1731,1730,1732, 0, 0, + 1435,1436,1733,1735,1734,1736, 0, 0,1481,1482,1737,1741,1738,1742,1739,1743, + 1439,1440,1751,1755,1752,1756,1753,1757,1490,1491,1765,1768,1766,1769,1767,1770, + 1447,1448,1771,1774,1772,1775,1773,1776,1495,1496,1777,1779,1778,1780, 0, 0, + 1451,1452,1781,1783,1782,1784, 0, 0,1504,1505,1785,1788,1786,1789,1787,1790, + 0,1459, 0,1791, 0,1792, 0,1793,1509,1510,1794,1798,1795,1799,1796,1800, + 1462,1463,1808,1812,1809,1813,1810,1814,1467, 21,1475, 22,1479, 23,1485, 24, + 1493, 27,1499, 28,1507, 29, 0, 0,1704,1708,1709,1710,1711,1712,1713,1714, + 1718,1722,1723,1724,1725,1726,1727,1728,1740,1744,1745,1746,1747,1748,1749,1750, + 1754,1758,1759,1760,1761,1762,1763,1764,1797,1801,1802,1803,1804,1805,1806,1807, + 1811,1815,1816,1817,1818,1819,1820,1821,1470,1469,1822,1474,1465, 0,1473,1825, + 1429,1428,1426, 12,1432, 0, 26, 0, 0,1315,1823,1484,1466, 0,1483,1829, + 1433, 13,1437, 14,1441,1826,1827,1828,1488,1487,1513, 19, 0, 0,1492,1515, + 1445,1444,1442, 15, 0,1831,1832,1833,1502,1501,1516, 25,1497,1498,1506,1518, + 1457,1456,1454, 17,1453,1313, 11, 3, 0, 0,1824,1512,1519, 0,1511,1830, + 1449, 16,1460, 18,1464, 4, 0, 0, 30, 31, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, + 0, 0, 2, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1834,1835, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,1836, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1837,1839,1838, 0, 0, 0, 0,1840, 0, 0, 0, + 0,1841, 0, 0,1842, 0, 0, 0, 0, 0, 0, 0,1843, 0,1844, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1845, 0, 0,1846, 0, 0,1847, + 0,1848, 0, 0, 0, 0, 0, 0, 937, 0,1850, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1849, 936, 938,1851,1852, 0, 0,1853,1854, 0, 0, + 1855,1856, 0, 0, 0, 0, 0, 0,1857,1858, 0, 0,1861,1862, 0, 0, + 1863,1864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1867,1868,1869,1870,1859,1860,1865,1866, 0, 0, 0, 0, + 0, 0,1871,1872,1873,1874, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 32, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1875, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1877, 0,1878, 0,1879, 0,1880, 0,1881, 0,1882, 0, + 1883, 0,1884, 0,1885, 0,1886, 0,1887, 0,1888, 0, 0,1889, 0,1890, + 0,1891, 0, 0, 0, 0, 0, 0,1892,1893, 0,1894,1895, 0,1896,1897, + 0,1898,1899, 0,1900,1901, 0, 0, 0, 0, 0, 0,1876, 0, 0, 0, + 0, 0, 0, 0, 0, 0,1902, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1904, 0,1905, 0,1906, 0,1907, 0,1908, 0,1909, 0, + 1910, 0,1911, 0,1912, 0,1913, 0,1914, 0,1915, 0, 0,1916, 0,1917, + 0,1918, 0, 0, 0, 0, 0, 0,1919,1920, 0,1921,1922, 0,1923,1924, + 0,1925,1926, 0,1927,1928, 0, 0, 0, 0, 0, 0,1903, 0, 0,1929, + 1930,1931,1932, 0, 0, 0,1933, 0, 710, 385, 724, 715, 455, 103, 186, 825, + 825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500, + 649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679, + 293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, + 781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540, + 714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589, + 648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101, + 430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110, + 135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, + 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610, + 726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494, + 113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748, + 774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161, + 395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727, + 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684, + 687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566, + 568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729, + 680, 767, 694, 295, 128, 210, 0, 0, 227, 0, 379, 0, 0, 150, 493, 525, + 544, 551, 552, 556, 783, 576, 604, 0, 661, 0, 703, 0, 0, 735, 743, 0, + 0, 0, 793, 794, 795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213, + 215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458, + 477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591, + 593, 595, 598, 607, 620, 625, 625, 651, 690, 695, 705, 706, 716, 717, 733, 735, + 777, 786, 790, 315, 869, 623, 0, 0, 102, 145, 134, 115, 129, 138, 165, 171, + 207, 202, 206, 212, 227, 231, 240, 243, 250, 254, 294, 296, 303, 308, 319, 325, + 321, 329, 326, 335, 341, 357, 360, 362, 370, 379, 388, 389, 393, 421, 424, 438, + 456, 454, 458, 465, 477, 535, 485, 490, 493, 507, 512, 514, 521, 522, 525, 526, + 528, 533, 532, 541, 565, 569, 574, 586, 591, 597, 607, 637, 647, 674, 691, 693, + 695, 698, 703, 699, 705, 704, 702, 706, 709, 717, 728, 736, 747, 754, 770, 777, + 783, 784, 786, 787, 790, 802, 825, 848, 847, 857, 55, 65, 66, 883, 892, 916, + 822, 824, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1586, 0,1605, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1602,1603,1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584, 0, + 1585,1587,1588,1589,1591, 0,1592, 0,1593,1594, 0,1595,1596, 0,1598,1599, + 1600,1601,1604,1582,1578,1590,1597, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1936, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1937, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1938, 0,1939, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1940, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,1941,1942, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1943,1944, 0, 0, 0, 0, 0, 0,1945, 0,1946, 0, 0, + 0, 0, 0, 0, 0, 0,1947, 0, 0,1948, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1950, 0,1949, + 1951, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1953,1952, 0,1954, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1955,1956, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1957, 0, 0, 0, 0, 0, 0, 0, 0,1958,1961,1959,1965,1960,1962,1964, + 1963, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1967,1966,1968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,1969,1970,1971,1972,1973,1974,1975, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1976,1977,1978,1980,1979,1981, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 106, 104, 107, 826, 114, 118, 119, 121, + 123, 124, 127, 125, 34, 830, 130, 131, 132, 137, 827, 35, 133, 139, 829, 142, + 143, 112, 144, 145, 924, 151, 152, 37, 157, 158, 159, 160, 38, 165, 166, 169, + 171, 172, 173, 174, 176, 177, 178, 179, 181, 182, 182, 182, 833, 468, 184, 185, + 834, 187, 188, 189, 196, 192, 194, 195, 197, 199, 200, 201, 203, 204, 204, 206, + 208, 209, 211, 218, 213, 219, 214, 216, 153, 234, 221, 222, 223, 220, 225, 224, + 230, 835, 235, 236, 237, 238, 239, 244, 836, 837, 247, 248, 249, 246, 251, 39, + 40, 253, 255, 255, 838, 257, 258, 259, 261, 839, 262, 263, 301, 264, 41, 266, + 270, 272, 271, 841, 274, 842, 277, 276, 278, 281, 282, 42, 283, 284, 285, 286, + 43, 843, 44, 289, 290, 291, 293, 934, 298, 845, 845, 621, 300, 300, 45, 852, + 894, 302, 304, 46, 306, 309, 310, 312, 316, 48, 47, 317, 846, 318, 323, 324, + 325, 324, 328, 329, 333, 331, 332, 334, 335, 336, 338, 339, 342, 343, 347, 351, + 849, 350, 348, 352, 354, 359, 850, 361, 358, 356, 49, 363, 365, 367, 364, 50, + 369, 371, 851, 376, 386, 378, 53, 381, 52, 51, 140, 141, 387, 382, 614, 78, + 388, 389, 390, 394, 392, 856, 54, 399, 396, 402, 404, 858, 405, 401, 407, 55, + 408, 409, 410, 413, 859, 415, 56, 417, 860, 418, 57, 419, 422, 424, 425, 861, + 840, 862, 426, 863, 429, 431, 427, 433, 437, 441, 438, 439, 442, 443, 864, 436, + 449, 450, 58, 454, 453, 865, 447, 460, 866, 867, 461, 466, 465, 464, 59, 467, + 470, 469, 472, 828, 475, 868, 478, 870, 483, 485, 486, 871, 488, 489, 872, 873, + 495, 497, 60, 498, 61, 61, 504, 505, 507, 508, 511, 62, 513, 874, 515, 875, + 518, 844, 520, 876, 877, 878, 63, 64, 528, 880, 879, 881, 882, 530, 531, 531, + 533, 66, 534, 67, 68, 884, 536, 538, 541, 69, 885, 549, 886, 887, 556, 559, + 70, 561, 562, 563, 888, 889, 889, 567, 71, 890, 570, 571, 72, 891, 577, 73, + 581, 579, 582, 893, 587, 74, 590, 592, 596, 75, 895, 896, 76, 897, 600, 898, + 602, 605, 607, 899, 900, 609, 901, 611, 853, 77, 615, 616, 79, 617, 252, 902, + 903, 854, 855, 621, 622, 731, 80, 627, 626, 628, 164, 629, 630, 631, 633, 904, + 632, 634, 639, 640, 635, 641, 646, 651, 638, 643, 644, 645, 905, 907, 906, 81, + 653, 654, 656, 911, 657, 908, 82, 83, 909, 910, 84, 664, 665, 666, 667, 669, + 668, 671, 670, 674, 672, 673, 675, 85, 677, 678, 86, 681, 682, 912, 685, 686, + 87, 689, 36, 913, 914, 88, 89, 696, 702, 709, 711, 915, 712, 713, 718, 719, + 917, 831, 721, 720, 723, 832, 725, 728, 918, 919, 739, 742, 744, 920, 745, 753, + 756, 757, 755, 760, 761, 921, 762, 90, 764, 922, 91, 775, 279, 780, 923, 925, + 92, 93, 785, 926, 94, 927, 787, 787, 789, 928, 792, 95, 796, 797, 798, 800, + 96, 929, 802, 804, 806, 97, 98, 807, 930, 99, 931, 932, 933, 814, 100, 816, + 817, 818, 819, 820, 821, 935, 0, 0, }; -static const int16_t _hb_ucd_i16[196]= +static const int32_t _hb_ucd_palette[39]= { - 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 0, 0, -1, 1, -1, 1, - 0, 0, 1, -1, -1, 1, -1, 0, 0, 0, 0, 1, 0, 1, -1, 0, - 0, 0, 0, 2, 0, -2, 0, 0, 0, 1, -1, 1, 2, 0, -2, 0, - -1, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, -16, 3, 3, 3, -3, - -3, -3, 0, 0, 0, 2016, 0, 0, 0, 0, 0, 2527, 1923, 1914, 1918, 0, - 2250, 0, 0, 0, 0, 0, 0, 138, 0, 7, 0, 0, -7, 0, 0, 0, - 1824, 0, 0, 0, 0, 0, 2104, 0, 2108, 2106, 0, 2106, 1316, 0, 0, 0, - -1, -138, 0, 0, 1, -1, 8, 8, 8, 0, 7, 7, 0, 0, -8, -8, - -8, -7, -7, 0, 1, -1, 0, 2,-1316, 1, -1, 0, -1, 3, 1, -1, - -3, 1, -1, 1, -1, 0, 0,-1914,-1918, 0, 0,-1923,-1824, 0, 0, 0, - 0,-2016, 0, 0, 1, -1, 0, 1, 0, 0,-2104, 0, 0, 0, 0,-2106, - -2108,-2106, 0, 0, 1, -1,-2250, 0, 0, 0,-2527, 0, 0, -2, 0, 1, - -1, 0, 1, -1, + -112883, -2527, -2250, -2108, -2106, -2104, -2016, -1923, + -1918, -1914, -1824, -1316, -138, -16, -8, -7, + -3, -2, -1, 0, 1, 2, 3, 7, + 8, 16, 138, 1316, 1824, 1914, 1918, 1923, + 2016, 2104, 2106, 2108, 2250, 2527, 112883, }; static inline uint8_t _hb_ucd_gc (unsigned u) { /* packtab: [2^8,2^5,2^3,2^1] */ - return u<1114110u ? (uint8_t)(_hb_ucd_u8[7912u+((_hb_ucd_u8[2176u+_hb_ucd_u16[((_hb_ucd_u8[((((((u)>>1))>>3))>>5)])<<5)+((((((u)>>1))>>3))&31)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; + return u<1114110u ? (uint8_t)(_hb_ucd_u8[7944u+((_hb_ucd_u8[2176u+_hb_ucd_u16[((_hb_ucd_u8[((((((u)>>1))>>3))>>5)])<<5)+((((((u)>>1))>>3))&31)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; } static inline uint8_t _hb_ucd_ccc (unsigned u) { /* packtab: [2^8,2^4,2^3,2^2] */ - return u<125259u ? (uint8_t)(_hb_ucd_u8[10370u+((_hb_ucd_u8[9270u+((_hb_ucd_u8[8539u+((_hb_ucd_u8[8294u+((((((u)>>2))>>3))>>4)])<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)]) : 0; + return u<125259u ? (uint8_t)(_hb_ucd_u8[10432u+((_hb_ucd_u8[9308u+((_hb_ucd_u8[8577u+((_hb_ucd_u8[8332u+((((((u)>>2))>>3))>>4)])<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)]) : 0; } static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i) { return (a[i>>1]>>((i&1)<<2))&15; } -static inline int16_t _hb_ucd_bmg (unsigned u) +static inline int32_t _hb_ucd_bmg (unsigned u) { - /* packtab: [2^4,2^3,2^3,2^2] */ - return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[11118u+((_hb_ucd_u8[11002u+((_hb_ucd_b4(_hb_ucd_u8+10874u,((((((u)>>2))>>3))>>3)))<<3)+((((((u)>>2))>>3))&7)])<<3)+((((u)>>2))&7)]+((u)&3)]) : 0; + /* packtab: [2^4,2^4,2^3,2^2] palette[39] */ + return u<121617u ? (int32_t)(_hb_ucd_palette[_hb_ucd_u8[11624u+_hb_ucd_u8[11272u+((_hb_ucd_u8[11071u+((_hb_ucd_b4(_hb_ucd_u8+10952u,((((((u)>>2))>>3))>>4)))<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)]+((u)&3)]]) : 0; } static inline uint8_t _hb_ucd_sc (unsigned u) { - /* packtab: [2^8,2^4,2^4,2^3] */ - return u<918000u ? (uint8_t)(_hb_ucd_u8[12639u+_hb_ucd_u16[3296u+((_hb_ucd_u8[11903u+((_hb_ucd_u8[11454u+((((((u)>>3))>>4))>>4)])<<4)+((((((u)>>3))>>4))&15)])<<4)+((((u)>>3))&15)]+((u)&7)]) : 2; + /* packtab: [2^8,2^4,2^3,2^3] */ + return u<918000u ? (uint8_t)(_hb_ucd_u8[12721u+_hb_ucd_u16[4520u+_hb_ucd_u16[3392u+((_hb_ucd_u8[11824u+((((((u)>>3))>>3))>>4)])<<4)+((((((u)>>3))>>3))&15)]+((((u)>>3))&7)]+((u)&7)]) : 2; } static inline uint16_t _hb_ucd_dm (unsigned u) { /* packtab: [2^8,2^5,2^4] */ - return u<195102u ? (uint16_t)(_hb_ucd_u16[7360u+((_hb_ucd_u8[18949u+((_hb_ucd_u8[18567u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; + return u<195102u ? (uint16_t)(_hb_ucd_u16[7816u+((_hb_ucd_u8[19095u+((_hb_ucd_u8[18713u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; } @@ -2736,12 +2768,12 @@ static inline uint16_t _hb_ucd_dm (unsigned u) #include -static const uint8_t _hb_ucd_u8[14763]= +static const uint8_t _hb_ucd_u8[18025]= { 3, 4, 5, 6, 7, 2, 2, 2, 2, 2, 8, 2, 2, 9, 1, 10, - 11, 12, 13, 14, 15, 0, 16, 2, 17, 0, 18, 19, 20, 21, 22, 23, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 24, 25, 26, 2, 27, 28, - 2, 29, 2, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11, 12, 13, 14, 15, 0, 16, 2, 17, 18, 19, 20, 21, 22, 23, 24, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 25, 26, 27, 2, 28, 29, + 2, 30, 2, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2752,1637 +2784,1772 @@ static const uint8_t _hb_ucd_u8[14763]= 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 32, + 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 34, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 2, 23, 24, 25, 2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 22, 1, 23, 24, 25, 1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 5, 38, 39, 40, 41, 42, 3, 43, 5, 44, 45, 46, 47, 48, - 49, 50, 51, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 52, 2, 2, - 53, 2, 2, 2, 54, 2, 55, 56, 57, 58, 59, 60, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 61, 4, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 62, 63, 2, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 2, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 49, 50, 51, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 52, 1, 1, + 53, 1, 1, 1, 54, 1, 55, 56, 57, 58, 59, 60, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 61, 4, 4, 4, 4, 4, 4, 4, 4, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 62, 63, 1, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 1, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 2, 2, 2, 98, 99,100, 0, 0, 0, 0, 0, 0, 0, 0, 0,101, - 2, 2, 2, 2,102, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2,103, 2, 2,104, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,105, 0, 0, 0, 0, 0, 0, 2, 2,106,107, 0,108,109,110, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,111,112, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,113, - 2,114,115, 0, 0, 0, 0, 0, 0, 0, 0, 0,116, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,117, 3,118,119, - 120,121,122,123,124,125,126,127, 3, 3,128, 0, 0, 0, 0,129, - 130,131,132, 0,133,134,135,136,137,138, 0, 0,139,140,141, 0, - 142,143,144,145, 3, 3,146,147,148, 3,149,150, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 2,151, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2,152, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,153, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,154, 2, 2,155, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 2,156, 0, 0, 0, 0, 0, - 2, 2, 2,157, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2,158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 159,160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,161, + 1, 1, 1, 98, 99,100,101, 0, 0, 0, 0, 0, 0, 0, 0,102, + 1, 1, 1, 1,103, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1,104, 1, 1,105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,106, 0, 0, 0, 0, 0, 0, 1, 1,107,108, 0,109,110,111, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,112,113, 1, 1, + 1,114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,115, + 1,116,117, 0, 0, 0, 0, 0, 0, 0, 0, 0,118, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,119, 3,120,121, + 122,123,124,125,126,127,128,129, 3, 3,130,131, 0, 0, 0,132, + 133,134,135, 0,136,137,138,139,140,141, 0, 0,142,143,144, 0, + 145,146,147,148, 3, 3,149,150,151, 3,152,153, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1,154, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1,155, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,156, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,157, 1, 1,158, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,159, 0, 0, 0, 0, 0, + 1, 1, 1,160, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1,161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,162, 0, 0, 0, + 163,164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,165, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, - 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, - 5, 5, 5, 5, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, - 11, 11, 11, 11, 11, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, - 13, 13, 13, 13, 13, 13, 13, 13, 16, 16, 16, 16, 16, 16, 16, 16, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 14, - 1, 1, 1, 1, 14, 1, 1, 1, 18, 18, 18, 18, 18, 18, 18, 18, - 1, 5, 0, 11, 11, 11, 11, 11, 1, 1, 1, 1, 1, 1, 14, 0, - 1, 1, 1, 1, 14, 0, 0, 0, 6, 6, 6, 6, 7, 7, 7, 7, - 1, 1, 1, 1, 1, 14, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 14, 0, 0, 0, 0, - 1, 1, 1, 14, 1, 1, 1, 14, 3, 3, 3, 3, 3, 3, 0, 0, - 28, 28, 28, 28, 28, 28, 28, 28, 11, 11, 11, 11, 11, 1, 1, 1, - 14, 17, 1, 1, 1, 1, 1, 1, 14, 0, 0, 0, 0, 0, 0, 0, - 14, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 0, 0, 0, - 3, 3, 3, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 29, 0, + 5, 5, 5, 5, 5, 5, 5, 5, 9, 9, 9, 9, 9, 9, 9, 9, + 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, + 12, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 0, 0, 0, + 10, 10, 10, 10, 10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, + 1, 1, 1, 1, 1, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 0, + 1, 1, 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 15, 0, 0, 0, + 18, 18, 18, 18, 18, 18, 18, 18, 1, 1, 1, 1, 1, 15, 0, 0, + 1, 5, 0, 11, 11, 11, 11, 11, 1, 1, 1, 1, 1, 1, 15, 0, + 6, 6, 6, 6, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 15, 0, 0, 0, 0, + 1, 1, 1, 15, 1, 1, 1, 15, 28, 28, 28, 28, 28, 28, 28, 28, + 11, 11, 11, 11, 11, 1, 1, 1, 15, 17, 1, 1, 1, 1, 1, 1, + 15, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 29, 0, 1, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 11, 7, 7, 7, 7, 7, 6, 6, 6, 0, 0, 0, 11, 11, 11, 11, 11, 17, 1, 1, 1, 1, 1, 1, 1, - 11, 11, 11, 11, 11, 10, 10, 10, 1, 1, 1, 0, 0, 0, 0, 0, - 5, 46, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 41, 41, 41, 41, - 3, 3, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 0, 0, 12, - 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 49, 10, 10, 10, 10, 10, 10, 10, 7, 6, 6, 6, 6, 6, 6, 6, - 44, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, - 3, 3, 3, 3, 0, 0, 0, 0, 11, 11, 11, 11, 11, 12, 9, 77, - 88, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,102,103,104, - 89, 6, 6, 6, 6, 6, 6, 6, 22, 22, 22, 22, 22, 22, 22, 22, - 26, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 5, 5, 5, 5, 5, + 11, 11, 11, 11, 11, 10, 10, 10, 3, 3, 3, 3, 3, 0, 0, 0, + 5, 45, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 42, 42, 42, 42, + 3, 3, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 29, + 11, 11, 11, 11, 11, 0, 0, 13, 1, 1, 0, 0, 0, 0, 0, 0, + 48, 10, 10, 10, 10, 10, 10, 10, 7, 6, 6, 6, 6, 6, 6, 6, + 54, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 13, 9, 77, 88, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7,104,105,106, 89, 6, 6, 6, 6, 6, 6, 6, + 22, 22, 22, 22, 22, 22, 22, 22, 27, 5, 5, 5, 5, 5, 5, 5, + 1, 1, 1, 5, 5, 5, 5, 5, 25, 0, 0, 0, 0, 0, 0, 0, 5, 20, 1, 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 1, 1, - 11, 11, 11, 11, 11, 12, 12, 12, 1, 1, 1, 1, 14, 1, 1, 0, - 14, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, - 10, 10, 10, 10, 10, 10, 51, 0,115, 1, 1, 1, 1, 1, 1, 1, - 5, 5, 5, 5, 5, 5, 5, 0, 1, 1, 1, 1, 13, 13, 13, 12, - 6, 6, 6, 0, 7, 7, 7, 0, 30, 30, 30, 30, 30, 30, 30, 30, - 3, 3, 3, 3, 3, 29, 0, 0, 3, 3, 3, 3, 3, 3, 3, 29, + 11, 11, 11, 11, 11, 13, 13, 13, 1, 1, 1, 1, 15, 1, 1, 0, + 15, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 15, 1, 1, 1, 1, + 10, 10, 10, 10, 10, 10, 51, 0,117, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 14, 14, 14, 13, 6, 6, 6, 0, 7, 7, 7, 0, + 30, 30, 30, 30, 30, 30, 30, 30, 3, 3, 3, 3, 3, 29, 0, 0, 10, 10, 10, 10, 10, 3, 3, 3, 75, 10, 10, 10, 10, 10, 10, 10, - 3, 3, 3, 29, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, + 3, 3, 3, 29, 0, 0, 0, 0, 6, 8, 8, 8, 8, 8, 8, 8, + 6, 6, 6, 46, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 7, 7, 7, 7, 7, 32, 7, 7, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 51, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 10, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 15, 19, - 1, 1, 1, 1, 1, 1, 1, 34, 1, 1, 1, 1, 1, 1, 1, 5, - 15, 15, 15, 15, 15, 15, 15, 15, 1, 14, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 23, 0, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, - 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, - 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, - 3, 3, 3, 3, 29, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 87, 12,100, 12, 27,101, 76, 12, 6, 6, 6, 6, 6,105,106,135, - 87, 30, 30, 66,107,136,137,108, 50, 10, 89, 12,138,139, 10, 78, - 7, 7, 7, 59, 7, 7, 7, 8, 6, 6, 6, 60, 6, 6, 6, 6, - 8, 8, 8, 8, 21, 21, 21, 21, 21, 21, 21, 21, 6, 8, 8, 8, - 8, 8, 8, 8, 7, 21, 21, 6, 21, 8, 8, 7, 21, 7, 6, 7, - 7, 21, 8, 7, 8, 6, 7, 21, 8, 8, 8, 7, 21, 6, 8, 7, - 21, 7, 21, 21, 8, 67, 8, 6, 1, 1,109, 21,110,109, 21, 21, - 21, 21, 21, 21, 21, 21, 6, 8, 21,110, 8, 7, 8, 8, 8, 8, - 8, 8, 6, 6, 6, 7, 21, 8, 21, 21, 7, 8, 8, 8, 8, 8, - 6, 6, 1, 6, 6, 6, 6, 6, 13, 22, 22, 13, 13, 13, 13, 13, - 13, 22, 22, 22, 22, 22, 22, 22, 13, 13, 68, 22, 22, 22, 68, 68, - 8, 8, 68, 8, 0, 69, 6, 88, 0, 0, 22,140, 7, 32, 32, 7, - 21, 7, 7, 7, 7, 7, 7, 7, 7, 39, 7, 7, 7, 7, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 21, 6, 7, 8, 6, 8, 8, 8, 8, - 6, 6, 8, 90, 21, 8, 21, 7, 8, 43, 5, 5, 79, 8, 8, 8, - 7, 21, 21, 21, 21, 21, 21, 6, 39, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 32, 54, 12, 12, 12, 6, 6, 6, 6,111,141, 44, 70, - 5, 5, 5, 5, 5, 5, 5,142, 71, 36, 5, 71, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 14, 0, 17, 1, 40, 33, 0, 0, 0, 0, 0, - 18, 18, 18, 9, 77, 80, 12, 3, 5, 5, 5, 5, 5, 36,143, 12, - 52, 1, 1, 1, 1, 24, 5, 5, 11, 11, 11, 11, 11, 12, 12, 1, - 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 53, 5, 5, 5,144, 43, - 5, 5, 81, 72, 55, 5, 5, 1, 11, 11, 11, 11, 11, 1, 56, 82, - 12, 12, 12, 12, 12, 12, 12, 73, 24, 1, 1, 1, 1, 1, 1, 1, - 5, 5, 5, 5, 5, 23, 17, 1, 25, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 24, 5, 5, 5, 5, 13, 66, 12, 61, 26, 30, - 1, 1, 1, 5, 5, 72, 5, 5, 5, 5, 72, 5, 72, 5, 5, 0, - 12, 12, 12, 12, 12, 12, 12, 33, 1, 1, 1, 1, 24, 5, 0, 33, - 1, 1, 1, 1,145, 1, 1, 1, 18, 0, 0, 26, 5, 5, 5, 5, - 1, 1, 1, 1, 45, 5, 5, 5, 5, 91, 5, 5, 5, 5, 5, 5, - 1, 1, 1, 1, 1, 20, 25, 15, 19, 5, 5, 5, 20, 15, 19, 15, - 24, 5, 5, 5, 1, 1, 1, 1, 1, 5, 12, 11, 11, 11, 11, 11, - 62, 1, 1, 1, 1, 1, 1, 1, 24, 15, 17, 1, 1, 1, 14, 17, - 14, 14, 0, 1, 1, 0, 25, 15, 19, 5, 23, 35, 37, 35, 19, 14, - 0, 0, 0, 35, 0, 0, 1, 17, 1, 30, 10, 10, 10, 70, 40, 23, - 26, 20, 17, 1, 1, 14, 0, 17, 14, 1, 17, 14, 1, 0, 23, 15, - 19, 23, 0, 26, 23, 26, 5, 0, 26, 0, 0, 0, 17, 1, 14, 14, - 5, 1, 24, 33, 0, 0, 0, 0, 26, 20, 17, 1, 1, 1, 1, 17, - 14, 1, 17, 1, 1, 0, 25, 15, 19, 5, 5, 26, 20, 35, 19, 0, - 80, 0, 0, 0, 17, 5, 5, 5, 26, 15, 17, 1, 1, 1, 14, 17, - 14, 1, 17, 1, 1, 0, 25, 19, 19, 5, 23, 35, 37, 35, 19, 0, - 0, 0, 26, 20, 0, 0, 1, 17, 82, 10, 10, 10, 0, 0, 0, 0, - 0, 25, 17, 1, 1, 14, 0, 1, 14, 1, 1, 0, 17, 14, 14, 1, - 0, 17, 14, 0, 1, 14, 0, 1, 1, 1, 1, 1, 1, 0, 0, 15, - 20, 37, 0, 15, 37, 15, 19, 0, 14, 0, 0, 35, 0, 0, 0, 0, - 10, 63, 3, 3, 70, 29, 0, 0, 20, 15, 25, 1, 1, 1, 14, 1, - 1, 1, 1, 1, 1, 0, 25, 5, 20, 15, 37, 5, 23, 5, 5, 0, - 0, 0, 26, 23, 1, 14, 1, 0, 0, 0, 0, 38, 10, 10, 10, 63, - 24, 15, 53, 1, 1, 1, 14, 1, 1, 1, 17, 1, 1, 0, 25, 19, - 15, 15, 37, 20, 37, 15, 5, 0, 0, 0, 35, 37, 0, 0, 1, 14, - 17, 34, 0, 0, 0, 0, 0, 0, 5, 15, 1, 1, 1, 1, 14, 1, - 1, 1, 1, 1, 1, 24, 25, 15, 19, 5, 23, 15, 37, 15, 19, 56, - 0, 0, 1, 34, 10, 10, 10,112, 10, 10, 10, 10, 63, 1, 1, 1, - 26, 15, 17, 1, 1, 1, 1, 1, 1, 1, 1, 14, 0, 1, 1, 1, - 1, 17, 1, 1, 1, 1, 17, 0, 1, 1, 1, 14, 0, 23, 0, 35, - 15, 5, 23, 23, 15, 15, 15, 15, 0, 15, 33, 0, 0, 0, 0, 0, - 24, 1, 5, 5, 5, 23, 0,113, 1, 1, 1, 72, 5, 5, 5, 36, - 11, 11, 11, 11, 11, 12, 0, 0, 17, 14, 14, 1, 1, 14, 1, 1, + 1, 1, 1, 1, 1, 1, 16, 19, 1, 1, 1, 1, 1, 1, 1, 34, + 1, 1, 1, 1, 1, 1, 1, 5, 16, 16, 16, 16, 16, 16, 16, 16, + 1, 15, 0, 0, 0, 0, 0, 0, 5, 5, 5, 23, 0, 0, 0, 0, + 10, 10, 0, 0, 0, 0, 0, 0, 6, 6, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 7, 7, + 7, 7, 7, 6, 6, 6, 6, 6, 3, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 3, 0, 87, 13,102, 13, 26,103, 76, 13, + 6, 6, 6, 6, 6,107,108,138, 87, 30, 30, 65,109,139,140,110, + 49, 10, 89, 13,141,142, 10, 78, 7, 7, 7, 59, 7, 7, 7, 8, + 6, 6, 6, 60, 6, 6, 6, 6, 8, 8, 8, 8, 21, 21, 21, 21, + 21, 21, 21, 21, 6, 8, 8, 8, 8, 8, 8, 8, 7, 21, 21, 6, + 21, 8, 8, 7, 21, 7, 6, 7, 7, 21, 8, 7, 8, 6, 7, 21, + 8, 8, 8, 7, 21, 6, 8, 7, 21, 7, 21, 21, 8, 66, 8, 6, + 1, 1,111, 21,112,111, 21, 21, 21, 21, 21, 21, 21, 21, 6, 8, + 21,112, 8, 7, 8, 8, 8, 8, 8, 8, 6, 6, 6, 7, 21, 8, + 21, 21, 7, 8, 8, 8, 8, 8, 6, 6, 1, 6, 6, 6, 6, 6, + 14, 22, 22, 14, 14, 14, 14, 14, 14, 22, 22, 22, 22, 22, 22, 22, + 14, 14, 67, 22, 22, 22, 67, 67, 8, 8, 67, 8, 0, 68, 6, 88, + 0, 0, 22,143, 7, 32, 32, 7, 21, 7, 7, 7, 7, 7, 7, 7, + 7, 39, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 21, + 6, 7, 8, 6, 8, 8, 8, 8, 6, 6, 8, 90, 21, 8, 21, 7, + 8, 41, 5, 5, 79, 8, 8, 8, 7, 21, 21, 21, 21, 21, 21, 6, + 39, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 32, 14, 13, 13, 13, + 6, 6, 6, 6,113, 91,144, 69, 5, 5, 5, 5, 5, 5, 5,145, + 70, 36, 5, 70, 5, 0, 0, 0, 1, 1, 1, 1, 1, 15, 0, 17, + 1, 40, 33, 0, 0, 0, 0, 0, 18, 18, 18, 9, 77, 80, 13, 3, + 5, 5, 5, 5, 5, 36,146, 13, 52, 1, 1, 1, 1, 24, 5, 5, + 11, 11, 11, 11, 11, 13, 13, 1, 25, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 53, 5, 5, 5,147, 41, 5, 5, 81, 71, 50, 5, 5, 1, + 11, 11, 11, 11, 11, 1, 55, 72, 13, 13, 13, 13, 13, 13, 13, 73, + 24, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 5, 5, 23, 17, 1, + 1, 1, 1, 1, 1, 24, 5, 5, 5, 5, 14, 65, 13, 82, 27, 30, + 1, 1, 1, 5, 5, 71, 5, 5, 5, 5, 71, 5, 71, 5, 5, 0, + 13, 13, 13, 13, 13, 13, 13, 33, 1, 1, 1, 1, 24, 5, 0, 33, + 1, 1, 1, 1,148, 1, 1, 1, 18, 0, 0, 27, 5, 5, 5, 5, + 1, 1, 1, 1, 44, 5, 5, 5, 5, 92, 5, 5, 5, 5, 5, 5, + 1, 1, 1, 1, 1, 20, 25, 16, 19, 5, 5, 5, 20, 16, 19, 16, + 24, 5, 5, 5, 1, 1, 1, 1, 1, 5, 13, 11, 11, 11, 11, 11, + 61, 1, 1, 1, 1, 1, 1, 1, 24, 16, 17, 1, 1, 1, 15, 17, + 15, 15, 0, 1, 1, 0, 25, 16, 19, 5, 23, 35, 37, 35, 19, 15, + 0, 0, 0, 35, 0, 0, 1, 17, 1, 30, 10, 10, 10, 69, 40, 23, + 27, 20, 17, 1, 1, 15, 0, 17, 15, 1, 17, 15, 1, 0, 23, 16, + 19, 23, 0, 27, 23, 27, 5, 0, 27, 0, 0, 0, 17, 1, 15, 15, + 5, 1, 24, 33, 0, 0, 0, 0, 27, 20, 17, 1, 1, 1, 1, 17, + 15, 1, 17, 1, 1, 0, 25, 16, 19, 5, 5, 27, 20, 35, 19, 0, + 80, 0, 0, 0, 17, 5, 5, 5, 27, 16, 17, 1, 1, 1, 15, 17, + 15, 1, 17, 1, 1, 0, 25, 19, 19, 5, 23, 35, 37, 35, 19, 0, + 0, 27, 5, 20, 0, 0, 1, 17, 72, 10, 10, 10, 0, 0, 0, 0, + 0, 25, 17, 1, 1, 15, 0, 1, 15, 1, 1, 0, 17, 15, 15, 1, + 0, 17, 15, 0, 1, 15, 0, 1, 1, 1, 1, 1, 1, 0, 0, 16, + 20, 37, 0, 16, 37, 16, 19, 0, 15, 0, 0, 35, 0, 0, 0, 0, + 10, 62, 3, 3, 69, 29, 0, 0, 20, 16, 25, 1, 1, 1, 15, 1, + 1, 1, 1, 1, 1, 0, 25, 5, 20, 16, 37, 5, 23, 5, 5, 0, + 0, 0, 27, 23, 1, 15, 1, 0, 0, 0, 0, 38, 10, 10, 10, 62, + 24, 16, 53, 1, 1, 1, 15, 1, 1, 1, 17, 1, 1, 0, 25, 19, + 16, 16, 37, 20, 37, 16, 5, 0, 0, 0, 35, 37, 0, 0, 1, 15, + 17, 34, 0, 0, 0, 0, 0, 0, 5, 16, 1, 1, 1, 1, 15, 1, + 1, 1, 1, 1, 1, 24, 25, 16, 19, 5, 23, 16, 37, 16, 19, 55, + 0, 0, 1, 34, 10, 10, 10,114, 10, 10, 10, 10, 62, 1, 1, 1, + 27, 16, 17, 1, 1, 1, 1, 1, 1, 1, 1, 15, 0, 1, 1, 1, + 1, 17, 1, 1, 1, 1, 17, 0, 1, 1, 1, 15, 0, 23, 0, 35, + 16, 5, 23, 23, 16, 16, 16, 16, 0, 16, 33, 0, 0, 0, 0, 0, + 24, 1, 5, 5, 5, 23, 0,115, 1, 1, 1, 71, 5, 5, 5, 36, + 11, 11, 11, 11, 11, 13, 0, 0, 17, 15, 15, 1, 1, 15, 1, 1, 1, 1, 17, 17, 1, 1, 1, 1, 24, 1, 5, 5, 5, 5, 25, 0, - 1, 1, 14, 61, 5, 5, 5, 23, 11, 11, 11, 11, 11, 0, 1, 1, - 56, 3, 12, 12, 12, 12, 12, 12, 12, 57, 57, 3, 5, 3, 3, 3, - 10, 10, 43, 43, 43, 27, 27, 15, 1, 1, 1, 1, 17, 1, 1, 1, - 26, 5, 5, 5, 5, 5, 5, 20, 5, 5, 36, 5, 1, 1, 24, 5, - 5, 5, 5, 5, 26, 5, 5, 5, 5, 5, 5, 5, 5, 5, 23, 3, - 3, 3, 3, 55, 3, 3, 29, 3, 12, 12, 57, 3, 66, 33, 0, 0, + 1, 1, 15, 82, 5, 5, 5, 23, 11, 11, 11, 11, 11, 0, 1, 1, + 55, 3, 13, 13, 13, 13, 13, 13, 13, 56, 56, 3, 5, 3, 3, 3, + 10, 10, 41, 41, 41, 26, 26, 16, 1, 1, 1, 1, 17, 1, 1, 1, + 27, 5, 5, 5, 5, 5, 5, 20, 5, 5, 36, 5, 1, 1, 24, 5, + 5, 5, 5, 5, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 23, 3, + 3, 3, 3, 50, 3, 3, 29, 3, 13, 13, 56, 3, 65, 33, 0, 0, 1, 1, 1, 1, 1, 34, 19, 5, 20, 5, 5, 5, 19, 20, 19, 25, - 1, 1, 1, 15, 5, 1, 1, 5, 25, 15, 46, 34, 15, 15, 15, 1, - 24, 5, 25, 1, 1, 1, 1, 1, 1, 20, 19, 20, 15, 15, 19, 34, - 11, 11, 11, 11, 11, 15, 19, 3, 7, 7, 7, 39, 0, 0, 39, 0, - 6, 6, 6, 6, 6,111, 69, 6, 1, 1, 1, 14, 14, 1, 1, 0, - 14, 1, 1, 0, 1, 1, 1, 14, 1, 1, 1, 1, 1, 14, 26, 5, - 12, 12, 12, 12,114, 10, 10, 10, 7, 7, 7, 0, 6, 6, 6, 0, - 1, 1, 1, 1, 1, 1, 56, 53,146, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1,147,116, 0, 1, 1, 1, 1, 1, 40, 12, 16, - 148, 1, 1, 1, 14, 0, 0, 0, 1, 5, 20, 0, 0, 0, 0, 17, + 1, 1, 1, 16, 5, 1, 1, 5, 25, 16, 45, 34, 16, 16, 16, 1, + 24, 5, 25, 1, 1, 1, 1, 1, 1, 20, 19, 20, 16, 16, 19, 34, + 11, 11, 11, 11, 11, 16, 19, 3, 7, 7, 7, 39, 0, 0, 39, 0, + 6, 6, 6, 6, 6,113, 68, 6, 1, 1, 1, 15, 15, 1, 1, 0, + 15, 1, 1, 0, 1, 1, 1, 15, 1, 1, 1, 1, 1, 15, 27, 5, + 13, 13, 13, 13,116, 10, 10, 10, 7, 7, 7, 0, 6, 6, 6, 0, + 1, 1, 1, 1, 1, 1, 55, 53,149, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1,150,151, 0, 1, 1, 1, 1, 1, 40, 13, 12, + 152, 1, 1, 1, 15, 0, 0, 0, 1, 5, 20, 0, 0, 0, 0, 17, 1, 5, 83, 33, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 14, 1, 14, 5, 0, 0, 0, 0, 0, 0, - 1, 1, 5, 19, 5, 5, 5, 15, 15, 15, 15, 20, 19, 5, 5, 5, - 5, 5, 12, 62, 12, 80, 24, 0, 10, 10, 10, 10, 10, 0, 0, 0, - 12, 12, 12, 92, 12, 71, 5, 91, 1, 45, 1, 1, 1, 1, 1, 1, - 1, 1, 24, 25, 1, 1, 1, 1, 1, 1, 1, 1, 24, 14, 0, 0, - 5, 20, 15, 19, 20, 15, 0, 0, 15, 20, 15, 15, 19, 5, 0, 0, - 29, 0, 12, 11, 11, 11, 11, 11, 1, 1, 14, 0, 0, 0, 0, 0, - 11, 11, 11, 11, 11, 51, 0, 3, 1, 1, 1, 24, 20, 19, 0, 12, - 1, 1, 34, 20, 5, 5, 5, 23, 20, 20, 19, 5, 5, 5, 20, 15, - 15, 19, 5, 5, 5, 5, 23, 26, 12, 12, 12, 62, 12, 12, 12, 0, - 5, 5, 5, 5, 5, 5, 5, 93, 5, 5, 5, 5, 5, 5, 0, 0, - 5, 5, 46, 1, 1, 1, 1, 1, 1, 1, 20, 5, 5, 20, 20, 15, - 15, 20, 46, 1, 1, 1, 14, 12, 57, 3, 3, 3, 3, 43, 5, 5, - 5, 5, 3, 3, 3, 3, 66, 12, 34, 5, 5, 15, 5, 19, 5, 1, - 1, 1, 1, 20, 5, 15, 19, 19, 5, 15, 0, 0, 0, 0, 12, 12, - 1, 1, 15, 15, 15, 15, 5, 5, 5, 5, 15, 5, 0, 38, 12, 12, - 11, 11, 11, 11, 11, 0, 17, 1, 6, 6, 6, 6, 21, 47, 0, 0, - 7, 7, 7, 7, 7, 32, 39, 7, 12, 12, 12, 12, 0, 0, 0, 0, - 5, 36, 5, 5, 5, 5, 5, 5, 20, 5, 5, 5, 25, 1, 24, 1, - 1, 1, 25, 34, 5, 14, 0, 0, 6, 6, 6, 6, 6, 6, 13, 13, - 13, 13, 13, 13, 13, 69, 6, 6, 6, 6, 6, 6, 69, 6, 6, 6, - 6, 6, 6, 6, 6,117, 13, 13, 8, 8, 8, 6, 6, 6, 6, 8, - 6, 6, 6, 6, 39, 39, 39, 39, 6, 6, 6, 6, 6, 6, 6, 0, - 6, 6, 47, 6, 7, 7, 94,118, 22, 6, 47, 6, 7, 7, 94, 22, - 6, 6, 0, 6, 7, 7,149, 22, 6, 6, 6, 6, 7, 7,150, 22, - 0, 6, 47, 6, 7, 7, 94,151, 74, 74, 74, 74, 74,152, 18, 18, - 84, 84, 84, 12, 58,119, 58,119, 12, 12, 12, 12,153, 18, 18,154, - 12, 12, 12, 12,120,121, 12,122,123, 12, 64, 65, 12, 12, 12, 12, - 12, 77,123, 12, 12, 12, 12,155, 18, 18,156, 18, 18, 18, 18, 18, - 157, 0, 10, 10, 10, 9, 64,158, 10, 10, 10, 10, 10, 9, 64,116, - 13, 13, 13, 13, 13, 13, 61, 0, 30, 0, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 5, 5, 5,159, 79, 93, 79, 93, 5, 5, 5, 5, 5, - 23, 0, 0, 0, 0, 0, 0, 0, 3, 85, 3, 95, 3, 21, 7, 6, - 7, 8, 95, 3, 90, 7, 7, 3, 3, 3, 85, 85, 85, 7, 7,160, - 7, 7, 67, 1,124, 3, 6, 7, 9, 9, 90, 6, 6, 50, 3,125, - 16,161,162, 16,126, 3, 0, 0, 9, 9, 48, 3, 3, 9, 3, 3, - 48, 50, 3, 48, 3, 3, 3, 48, 3, 3, 3, 3, 3, 3, 3, 9, - 3, 48, 48, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, 9, 9, - 3, 3, 3, 3, 27, 27, 3, 3, 9, 3, 3, 3,163,164, 3, 3, - 3, 3, 3, 3, 3, 3, 48, 3, 3, 3, 3, 3, 3, 50, 9, 9, - 9, 9, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, - 9, 3, 3, 3, 3, 3, 3, 3, 10, 10, 10, 10, 10, 10, 3, 3, - 3, 3, 3, 3, 3, 10, 10, 10, 3, 3, 3, 50, 3, 3, 3, 3, - 50, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, - 3, 3, 3, 3, 3, 3, 3, 50, 3, 3, 3, 3, 27, 27, 27, 27, - 27, 27, 27, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, - 9, 9, 64,127, 9, 9, 9, 9, 9, 9, 9, 27, 27, 27, 27, 27, - 9, 64, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,127, 9, 9, 9, - 9, 9, 9, 9, 27, 27, 9, 9, 9, 9, 9, 9, 9, 9, 27, 9, - 9, 9, 48, 50, 9, 9, 48, 3, 3, 3, 0, 3, 3, 3, 3, 3, - 8, 7, 8, 21, 21, 21, 21, 7, 8, 8, 21, 6, 6, 6, 13, 7, - 8, 8,125, 3, 3, 95, 21,165, 5, 8, 0, 0, 38, 12,114, 12, - 6, 6, 6, 42, 0, 0, 42, 0, 1, 1, 1, 1, 0, 0, 0, 54, - 33, 0, 0, 0, 0, 0, 0, 26, 12, 58, 58, 12,120,121, 58, 12, - 12, 12, 12, 76, 12, 92, 58, 12, 58, 27, 27, 27, 27, 12, 12, 62, - 12, 12, 12, 12, 12, 84, 12, 12, 92,166, 12, 12, 12, 12, 12, 12, - 3, 12, 96, 31, 31, 31,167, 0, 3, 3, 3, 3, 3, 44, 3, 3, - 87, 12,168,128, 27, 27, 27, 27, 27, 3, 27, 27, 27, 27,129,169, - 170, 16, 16, 16, 16, 5, 5, 15,130, 13, 13, 3, 16,171, 40, 3, - 1, 1, 1, 14, 26,172,131, 52, 1, 1, 1, 1, 1, 40, 13, 52, + 1, 1, 1, 1, 1, 1, 15, 1, 15, 5, 0, 0, 0, 0, 0, 0, + 1, 1, 5, 19, 5, 5, 5, 16, 16, 16, 16, 20, 19, 5, 5, 5, + 5, 5, 13, 61, 13, 80, 24, 0, 10, 10, 10, 10, 10, 0, 0, 0, + 13, 13, 13, 93, 13, 70, 5, 92, 1, 44, 1, 1, 1, 1, 1, 1, + 1, 1, 24, 25, 1, 1, 1, 1, 1, 1, 1, 1, 24, 15, 0, 0, + 5, 20, 16, 19, 20, 16, 0, 0, 16, 20, 16, 16, 19, 5, 0, 0, + 29, 0, 13, 11, 11, 11, 11, 11, 1, 1, 15, 0, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 51, 0, 3, 1, 1, 1, 24, 20, 19, 0, 13, + 1, 1, 34, 20, 5, 5, 5, 23, 20, 20, 19, 5, 5, 5, 20, 16, + 16, 19, 5, 5, 5, 5, 23, 27, 13, 13, 13, 61, 13, 13, 13, 0, + 5, 5, 5, 5, 5, 5, 5, 94, 5, 5, 45, 1, 1, 1, 1, 1, + 1, 1, 20, 5, 5, 20, 20, 16, 16, 20, 45, 1, 1, 1, 15, 13, + 56, 3, 3, 3, 3, 41, 5, 5, 5, 5, 3, 3, 3, 3, 65, 13, + 34, 5, 5, 16, 5, 19, 5, 1, 1, 1, 1, 20, 5, 16, 19, 19, + 5, 16, 0, 0, 0, 0, 13, 13, 1, 1, 16, 16, 16, 16, 5, 5, + 5, 5, 16, 5, 0, 38, 13, 13, 11, 11, 11, 11, 11, 0, 17, 1, + 6, 6, 6, 6, 21, 46, 0, 0, 7, 7, 7, 7, 7, 32, 39, 7, + 13, 13, 13, 13, 0, 0, 0, 0, 5, 36, 5, 5, 5, 5, 5, 5, + 20, 5, 5, 5, 25, 1, 24, 1, 1, 1, 25, 34, 5, 15, 0, 0, + 6, 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 14, 14, 68, 6, 6, + 6, 6, 6, 6, 68, 6, 6, 6, 6, 6, 6, 6, 6,118, 14, 14, + 8, 8, 8, 6, 6, 6, 6, 8, 6, 6, 6, 6, 39, 39, 39, 39, + 6, 6, 6, 6, 6, 6, 6, 0, 6, 6, 46, 6, 7, 7, 95,119, + 22, 6, 46, 6, 7, 7, 95, 22, 6, 6, 0, 6, 7, 7,120, 22, + 6, 6, 6, 6, 7, 7,153, 22, 0, 6, 46, 6, 7, 7, 95,154, + 74, 74, 74, 74, 74,155, 18, 18, 84, 84, 84, 13, 57,121, 57,121, + 13, 13, 13, 13,156, 18, 18,157, 13, 13, 13, 13,122,123, 13,124, + 125, 13, 63, 64, 13, 13, 13, 13, 13, 77,125, 13, 13, 13, 13,158, + 18, 18,159, 18, 18, 18, 18, 18,160, 0, 10, 10, 10, 9, 63,126, + 10, 10, 10, 10, 10, 9, 63,126, 30, 30,127, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 5,161, 79, 94, 79, 94, 5, 5, 5, 5, 5, + 3, 85, 3, 96, 3, 21, 7, 6, 7, 8, 96, 3, 90, 7, 7, 3, + 3, 3, 85, 85, 85, 7, 7,162, 7, 7, 66, 1,128, 3, 6, 7, + 9, 9, 90, 6, 6, 49, 3,129, 12,163,164, 12,130, 3, 0, 0, + 9, 9, 47, 3, 3, 9, 3, 3, 47, 49, 3, 47, 3, 3, 3, 47, + 3, 3, 3, 3, 3, 3, 3, 9, 3, 47, 47, 3, 3, 3, 3, 3, + 3, 3, 9, 9, 9, 9, 9, 9, 3, 3, 3, 3, 26, 26, 3, 3, + 9, 3, 3, 3,165,166, 3, 3, 3, 3, 3, 3, 3, 3, 47, 3, + 3, 3, 3, 3, 3, 49, 9, 9, 9, 9, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 9, 9, 9, 3, 3, 3, 3, 3, 3, 3, + 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 10, 10, 10, + 3, 3, 3, 49, 3, 3, 3, 3, 49, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 9, 9, 9, 9, 3, 3, 3, 3, 3, 3, 3, 49, + 3, 3, 3, 3, 26, 26, 26, 26, 26, 26, 26, 10, 10, 10, 10, 10, + 10, 10, 3, 3, 3, 3, 3, 3, 9, 9, 63,131, 9, 9, 9, 9, + 9, 9, 9, 26, 26, 26, 26, 26, 9, 63, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31,131, 9, 9, 9, 9, 9, 9, 9, 26, 26, 9, 9, + 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 47, 49, 9, 9, 47, 3, + 3, 3, 0, 3, 3, 3, 3, 3, 8, 7, 8, 21, 21, 21, 21, 7, + 8, 8, 21, 6, 6, 6, 14, 7, 8, 8,129, 3, 3, 96, 21,167, + 5, 8, 0, 0, 38, 13,116, 13, 6, 6, 6, 43, 0, 0, 43, 0, + 1, 1, 1, 1, 0, 0, 0, 58, 33, 0, 0, 0, 0, 0, 0, 27, + 13, 57, 57, 13,122,123, 57, 13, 13, 13, 13, 76, 13, 93, 57, 13, + 57, 26, 26, 26, 26, 13, 13, 61, 13, 13, 13, 13, 13, 84, 13, 13, + 93,168, 13, 13, 13, 13, 13, 13, 3, 13, 97, 31, 31, 31,169, 0, + 13, 26, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 54, 3, 3, + 87, 13,170,132, 26, 26, 26, 26, 26, 3, 26, 26, 26, 26,133,171, + 172, 12, 12, 12, 12, 5, 5, 16, 91, 14, 14, 3, 12,173, 40, 3, + 1, 1, 1, 15, 27,174,134, 52, 1, 1, 1, 1, 1, 40, 14, 52, 0, 0, 17, 1, 1, 1, 1, 1, 3, 10, 10, 3, 3, 3, 3, 3, - 3, 3, 3, 0, 0, 0, 0, 44, 3, 3, 3, 3, 10, 10, 10, 10, - 1, 1, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,132, 12, + 3, 3, 3, 0, 0, 0, 0, 54, 3, 3, 3, 3, 10, 10, 10, 10, + 1, 1, 44, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,135, 13, 11, 11, 11, 11, 11, 1, 0, 0, 8, 8, 8, 8, 8, 8, 8, 24, - 79,173, 5, 5, 5, 5, 5, 62, 8, 8, 8, 8, 8, 8, 13, 5, - 1, 1, 1, 16, 16, 16, 16, 16, 5, 12, 12, 12, 0, 0, 0, 0, - 22, 22, 22,131, 13, 13, 13, 13, 22, 8, 8, 8, 8, 8, 8, 8, - 6, 8, 8, 8, 8, 8, 8, 8, 69, 6, 6, 6, 21, 21, 21, 8, - 8, 8, 8, 8, 68,174, 21, 67, 8, 8, 6, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 7, 7, 8, 7, 7, 8, 8, 8, 8, 8, 8, - 8, 8, 7, 7, 21, 21, 8, 8, 8, 8, 8, 8, 8, 8, 32, 0, - 54, 13,175, 67, 13, 67, 1, 1, 1, 25, 1, 25, 1, 24, 1, 1, - 1, 34, 19, 20, 3, 3, 23, 0, 10, 10, 10, 3, 97, 0, 0, 0, - 1, 1, 12, 12, 0, 0, 0, 0, 15, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 15, 15, 15, 15, 15, 15, 15, 15, 5, 0, 0, 0, 0, 12, - 5, 1, 1, 1, 12, 53, 53, 24, 1, 1, 1, 5, 5, 5, 5, 12, - 1, 1, 1, 24, 5, 5, 5, 5, 5, 15, 0, 0, 0, 0, 0, 38, - 1, 24, 15, 5, 5, 15, 5, 15, 83, 12, 12, 12, 12, 12, 12, 54, - 1, 1, 24, 52, 1, 1, 1, 1, 11, 11, 11, 11, 11, 1, 1, 14, + 79,175, 5, 5, 5, 5, 5, 61, 8, 8, 8, 8, 8, 8, 14, 5, + 1, 1, 1, 12, 12, 12, 12, 12, 5, 13, 13, 13, 0, 0, 0, 0, + 22, 22, 22,134, 14, 14, 14, 14, 22, 8, 8, 8, 8, 8, 8, 8, + 68, 6, 6, 6, 21, 21, 21, 8, 8, 8, 8, 8, 67,176, 21, 66, + 8, 8, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, + 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 21, 21, 8, 8, + 8, 8, 8, 8, 8, 8, 7, 0, 0, 32, 0, 0, 0, 0, 0, 0, + 58, 14,177, 66, 14, 66, 1, 1, 1, 25, 1, 25, 1, 24, 1, 1, + 1, 34, 19, 20, 3, 3, 23, 0, 10, 10, 10, 3, 98, 0, 0, 0, + 1, 1, 13, 13, 0, 0, 0, 0, 16, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 16, 16, 16, 16, 16, 16, 16, 16, 5, 0, 0, 0, 0, 13, + 5, 1, 1, 1, 13, 53, 53, 24, 1, 1, 1, 5, 5, 5, 5, 13, + 1, 1, 1, 24, 5, 5, 5, 5, 5, 16, 0, 0, 0, 0, 0, 38, + 1, 24, 16, 5, 5, 16, 5, 16, 83, 13, 13, 13, 13, 13, 13, 58, + 1, 1, 24, 52, 1, 1, 1, 1, 11, 11, 11, 11, 11, 1, 1, 15, 1, 1, 1, 1, 24, 5, 5, 20, 19, 20, 19, 23, 0, 0, 0, 0, - 1, 24, 1, 1, 1, 1, 20, 0, 11, 11, 11, 11, 11, 0, 12, 12, - 52, 1, 1, 56, 3, 34, 20, 1, 25, 5, 25, 24, 25, 1, 1, 5, - 24, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 45, 12, - 1, 1, 1, 1, 1, 34, 5, 15, 12, 45,176, 23, 0, 0, 0, 0, - 17, 1, 1, 14, 17, 1, 1, 14, 17, 1, 1, 14, 0, 0, 0, 0, - 6, 6, 6, 6, 6,118, 13, 13, 6, 6, 6, 6,117, 22, 0, 0, - 1, 34, 19, 15, 20, 83, 19, 0, 1, 1, 1, 14, 0, 17, 1, 1, - 6, 6, 6, 47, 0, 0, 0, 0, 0, 42, 6, 6, 0, 0, 17, 25, - 1, 1, 1, 1,177, 1, 1, 1, 1, 1, 1, 14, 1, 1, 14, 14, - 1, 17, 14, 1, 1, 1, 1, 1, 1, 22, 22, 22, 22, 22, 22, 22, - 22,107, 3, 3, 3, 3, 3, 3, 3, 82, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 31, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 97, 3, - 12, 12, 12, 96, 65, 0, 0, 0, 76,178,179, 31, 31, 31, 31, 31, - 31, 31, 65, 96, 65, 12,122,180, 12, 33, 12, 12,129, 31, 31, 65, - 12,181, 9, 98, 80, 12, 0, 0, 1, 1, 14, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 14, 73, 38, 12,100, 12, 27,101, 76, 12, - 6, 6, 6, 6, 6,105,106, 64, 65, 27, 12, 1, 1, 1, 1, 1, - 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, - 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 14, 0, - 30,182, 70,183, 50, 9, 48, 29, 0, 0, 0, 0, 73, 18, 3, 0, - 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 1, 1, 14, 1, 17, - 12, 33, 0, 49, 10, 10, 10, 10, 10, 10, 0, 44, 3, 3, 3, 3, - 16, 16,126, 10, 63, 3, 3, 3, 3, 3, 3, 3, 3, 10, 3, 29, - 3, 3, 3, 3, 3, 3, 43, 0,133, 10, 10, 10, 10, 10, 10, 10, + 1, 24, 1, 1, 1, 1, 20, 0, 11, 11, 11, 11, 11, 0, 13, 13, + 52, 1, 1, 55, 3, 34, 20, 1, 25, 5, 25, 24, 25, 1, 1, 5, + 24, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 44, 13, + 1, 1, 1, 1, 1, 34, 5, 16, 13, 44,178, 23, 0, 0, 0, 0, + 17, 1, 1, 15, 17, 1, 1, 15, 17, 1, 1, 15, 0, 0, 0, 0, + 6, 6, 6, 6, 6,119, 14, 14, 6, 6, 6, 6,118, 22, 7, 0, + 1, 34, 19, 16, 20, 83, 19, 0, 1, 1, 1, 15, 0, 17, 1, 1, + 0, 43, 6, 6, 0, 0, 17, 25, 1, 1, 1, 1,179, 1, 1, 1, + 1, 1, 1, 15, 1, 1, 15, 15, 1, 17, 15, 1, 1, 1, 1, 1, + 1, 22, 22, 22, 22, 22, 22, 22, 22,109, 3, 3, 3, 3, 3, 3, + 3, 72, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 31, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 98, 3, 13, 13, 13, 97, 64, 0, 0, 0, + 76,180,181, 31, 31, 31, 31, 31, 31, 31, 64, 97, 64, 13,124,182, + 13, 33, 13, 13,133, 31, 31, 64, 13,183, 9, 99, 80, 13, 0, 0, + 1, 1, 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 15, 73, + 38, 13,102, 13, 26,103, 76, 13, 6, 6, 6, 6, 6,107,108, 63, + 64, 26, 13, 1, 1, 1, 1, 1, 52, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 14, 0, 1, 1, 1, 0, 1, 1, 1, + 0, 1, 1, 1, 0, 1, 15, 0, 30,184, 69,127, 49, 9, 47, 29, + 0, 0, 0, 0, 73, 18, 3, 0, 1, 1, 1, 1, 1, 1, 17, 1, + 1, 1, 1, 1, 1, 15, 1, 17, 13, 33, 0, 48, 10, 10, 10, 10, + 10, 10, 0, 54, 3, 3, 3, 3, 12, 12,130, 10, 62, 3, 3, 3, + 3, 3, 3, 3, 3, 10, 3, 29, 29, 0, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 41, 0,136, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 10, 10, 0, 0, 0, 0, 17, 1, - 128, 1, 1, 1, 1, 99, 0, 0, 1, 1, 1, 5, 5, 23, 0, 0, + 132, 1, 1, 1, 1,100, 0, 0, 1, 1, 1, 5, 5, 23, 0, 0, 1, 1, 1, 1, 1, 1, 1, 38, 1, 1, 0, 0, 1, 1, 1, 1, - 184, 16, 16, 0, 0, 0, 0, 0, 7, 7, 7, 7, 6, 6, 6, 6, + 137, 12, 12, 0, 0, 0, 0, 0, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 0, - 1, 1, 0, 0, 0, 0, 0, 38, 7, 32, 7, 42, 6, 6, 6, 6, - 6, 42, 6, 6, 6, 6, 6, 6, 6, 42, 6, 6, 6, 42, 47, 0, - 13, 13, 13, 54, 13, 13, 13, 13, 61, 13, 13, 13, 13, 61, 0, 0, - 1, 1, 1, 0, 14, 1, 1, 1, 1, 1, 1, 17, 14, 0, 14, 17, - 1, 1, 1, 38, 10, 10, 10, 10, 1, 1, 1, 56, 75, 10, 10, 10, - 0, 0, 0, 49, 10, 10, 10, 10, 1, 14, 1, 0, 0, 49, 10, 10, + 1, 1, 0, 0, 0, 0, 0, 38, 7, 32, 7, 43, 6, 6, 6, 6, + 6, 43, 6, 6, 6, 6, 6, 6, 6, 43, 6, 6, 6, 43, 46, 0, + 14, 14, 14, 58, 14, 14, 14, 14, 82, 14, 14, 14, 14, 14, 14, 14, + 1, 1, 1, 0, 15, 1, 1, 1, 1, 1, 1, 17, 15, 0, 15, 17, + 1, 1, 1, 38, 10, 10, 10, 10, 1, 1, 1, 55, 75, 10, 10, 10, + 0, 0, 0, 48, 10, 10, 10, 10, 1, 15, 1, 0, 0, 48, 10, 10, 1, 1, 1, 10, 10, 10, 0, 38, 1, 1, 1, 1, 1, 0, 0, 38, - 1, 1, 1, 1, 0, 0, 10, 1, 24, 5, 26, 23, 0, 0, 5, 5, - 1, 1, 17, 1, 17, 1, 1, 1, 1, 1, 1, 0, 5, 23, 0, 26, - 12, 12, 12, 12, 33, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 78, - 1, 1, 1, 1, 82, 1, 1, 1, 1, 1, 24, 23, 0, 49, 10, 10, - 12, 12, 12, 33, 0, 0, 0, 0, 1, 1, 1, 0, 38, 12, 12, 12, - 1, 1, 1, 0, 10, 10, 10, 10, 1, 14, 0, 0, 10, 10, 10, 10, - 1, 0, 0, 0, 38, 12, 33, 0, 0, 0, 0, 0, 49, 10, 10, 10, - 7, 32, 0, 0, 0, 0, 0, 0, 6, 47, 0, 0, 0, 10, 10, 10, + 1, 1, 1, 1, 0, 0, 10, 1, 24, 5, 27, 23, 0, 0, 5, 5, + 1, 1, 17, 1, 17, 1, 1, 1, 1, 1, 1, 0, 5, 23, 0, 27, + 13, 13, 13, 13, 33, 0, 0, 0, 1, 1, 1, 1, 1, 1, 86, 78, + 1, 1, 1, 1, 72, 1, 1, 1, 1, 1, 24, 23, 0, 48, 10, 10, + 13, 13, 13, 33, 0, 0, 0, 0, 1, 1, 1, 0, 38, 13, 13, 13, + 1, 1, 1, 0, 10, 10, 10, 10, 1, 15, 0, 0, 10, 10, 10, 10, + 1, 0, 0, 0, 38, 13, 33, 0, 0, 0, 0, 0, 48, 10, 10, 10, + 7, 32, 0, 0, 0, 0, 0, 0, 6, 46, 0, 0, 0, 10, 10, 10, 1, 1, 5, 5, 0, 0, 0, 0, 11, 11, 11, 11, 11, 1, 1, 52, - 7, 7, 7, 0, 26, 5, 5,130, 6, 6, 6, 0, 0, 0, 0, 9, - 10, 10, 10, 10, 10, 10, 10, 51, 1, 1, 1, 1, 1, 26,185, 0, - 0, 1, 45, 1, 0, 0, 0, 0, 57, 3, 3, 3, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 5, 5, 10, 10, 10,112, 0, 0, 0, 0, - 133, 10, 78, 12, 12, 0, 0, 0, 1, 5, 5, 12, 12, 0, 0, 0, - 1, 1, 86, 10, 10, 10, 0, 0, 19, 46, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 5, 5, 5, 5, 5, 5, 5, 36, 12, 12, 12, 0, - 10, 10, 10, 11, 11, 11, 11, 11, 25, 24, 25, 0, 0, 0, 0, 26, - 15, 19, 5, 20, 19, 36,186, 12, 12, 23, 0, 0, 0, 0, 73, 0, - 5, 25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 24, 5, 5, 19, 5, - 5, 5, 23, 11, 11, 11, 11, 11, 12, 12, 34, 46, 0, 0, 0, 0, - 1, 24, 12, 14, 0, 0, 0, 0, 1, 34, 15, 5, 5, 5, 5, 20, - 46, 1, 40, 12, 71, 5, 36, 19, 11, 11, 11, 11, 11, 40, 40, 12, - 10, 10, 51, 0, 0, 0, 0, 0, 5, 15, 20, 5, 12, 12, 12, 25, - 24, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 14, 14, 1, 1, 17, - 1, 1, 1, 1, 1, 1, 1, 17, 1, 1, 1, 1, 40, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 24, 15, 19, 5, 5, 5, 23, 0, 0, - 5, 15, 17, 1, 1, 1, 14, 17, 14, 1, 17, 1, 1, 26, 25, 15, - 20, 15, 37, 35, 37, 35, 15, 0, 14, 0, 0, 35, 0, 0, 17, 1, - 1, 15, 0, 5, 5, 5, 23, 0, 5, 5, 23, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 17, 0, 14, 1, 1, 1, 17, 15, 19, 5, 5, - 23, 37, 35, 35, 15, 37, 15, 20, 25, 25, 12, 38, 33, 0, 0, 0, - 26, 23, 0, 0, 0, 0, 0, 0, 1, 1, 34, 15, 5, 5, 5, 5, - 15, 5, 20, 25, 1, 40, 12, 12, 11, 11, 11, 11, 11, 12, 38, 25, - 15, 19, 5, 5, 20, 20, 15, 19, 20, 5, 1, 53, 0, 0, 0, 0, - 15, 5, 5, 0, 15, 15, 5, 19, 36, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 1, 1, 5, 0, 15, 19, 5, 5, 5, 20, 19, 19, - 36, 12, 14, 0, 0, 0, 0, 0, 12, 12, 12, 12, 12, 12, 33, 0, - 1, 1, 1, 1, 1, 24, 19, 15, 5, 5, 5, 19, 40, 0, 0, 0, - 11, 11, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 14, 26, 19, - 15, 5, 5, 19, 5, 5, 0, 0, 11, 11, 11, 11, 11, 10, 12, 57, - 5, 5, 5, 5, 19, 36, 0, 0, 10, 51, 0, 0, 0, 0, 0, 17, - 1, 1, 1, 14, 17, 0, 1, 1, 1, 1, 17, 14, 1, 1, 1, 1, - 15, 15, 15, 35, 37, 26, 20, 25, 46, 19, 12, 33, 0, 0, 0, 0, - 1, 1, 1, 1, 0, 1, 1, 1, 34, 15, 5, 5, 0, 5, 15, 15, - 25, 53, 37, 0, 0, 0, 0, 0, 24, 5, 5, 5, 5, 25, 1, 1, - 1, 24, 5, 5, 20, 24, 5, 36, 12, 12, 12, 71, 0, 0, 0, 0, - 24, 5, 5, 20, 19, 5, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, - 5, 5, 5, 20, 5, 12, 53, 12, 12, 33, 0, 0, 0, 0, 0, 0, - 12, 12, 12, 12, 12, 0, 0, 0, 20, 5, 20, 20, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 23, 5, 5, 5, 19, - 40, 12, 12, 0, 0, 0, 0, 0, 12, 1, 1, 1, 1, 1, 1, 1, - 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 35, 5, 5, 5, - 20, 5, 19, 23, 0, 0, 0, 0, 1, 1, 1, 14, 1, 17, 1, 1, - 24, 5, 5, 23, 0, 23, 5, 26, 5, 5, 5, 24, 0, 0, 0, 0, - 1, 1, 1, 17, 14, 1, 1, 1, 1, 1, 1, 1, 1, 15, 15, 37, - 5, 35, 19, 19, 14, 0, 0, 0, 1, 1, 1, 1, 45, 1, 0, 0, - 1, 24, 20, 83, 33, 0, 0, 0, 5, 34, 1, 1, 1, 1, 1, 1, - 1, 1, 15, 5, 5, 23, 0, 15, 20, 36, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 23, 0, 0, 10, 10, 63, 3, 3, 3, 70, 30, - 97, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 38, - 16, 16, 16, 16, 16, 16, 16, 99, 12, 12, 33, 0, 0, 0, 0, 0, - 40, 33, 0, 0, 0, 0, 0, 0, 25, 1, 1, 24, 5, 5, 5, 5, - 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 15, 19, 5, - 5, 5, 36, 0, 0, 0, 0, 0, 5, 5, 5, 36, 12, 12, 3, 3, - 13, 13, 57, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 49, 10, 10, - 10, 17, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 17, 1, - 13, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 45,132, 12, - 10, 10, 10, 78, 12, 33, 0, 0, 7, 7, 7, 7, 32, 42, 6, 6, - 6, 6, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 14, 0, 26, - 34, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 0, 26, - 5, 81, 13, 13, 13, 13, 13, 13, 13, 62, 23, 0, 0, 0, 0, 0, - 15, 13, 16, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, - 13, 13, 54, 13, 13, 13, 54, 61, 0, 14, 0, 0, 0, 0, 0, 0, - 1, 14, 17, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 0, 43, 36, 18, 18, 0, 0, 0, 0, 0, 0, - 11, 11, 11, 11, 11, 3, 29, 0, 3, 3, 0, 0, 0, 3, 3, 3, - 98, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 29, 44, 3, 3, 3, - 3, 3,134, 19, 5, 3,134, 15, 15,187, 18, 18, 18, 91, 5, 5, - 5, 55, 43, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 5, 5, 3, - 3, 5, 55, 0, 0, 0, 0, 0, 6, 6, 47, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 32, 7, 0, 32, 39, 32, 39, 7, 32, 7, - 7, 7, 7, 6, 6, 42, 42, 6, 6, 6, 42, 6, 6, 6, 6, 6, - 6, 6, 7, 39, 7, 32, 39, 7, 7, 7, 32, 7, 7, 7, 32, 6, - 6, 6, 6, 6, 7, 39, 7, 32, 7, 7, 32, 32, 0, 7, 7, 7, - 32, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 7, 7, 7, 7, - 59, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 60, 6, 6, - 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 59, 6, 6, - 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 59, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, - 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, 8, 0, 11, - 5, 5, 5, 55, 3, 43, 5, 5, 5, 5, 5, 5, 5, 5, 55, 3, - 3, 3, 43, 3, 3, 3, 3, 3, 3, 3, 55, 66, 12, 12, 0, 0, - 0, 0, 0, 0, 0, 26, 5, 5, 6, 6, 6, 6, 6,124, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 47, 0, 0, 42, 6, 6, 47, 0, 0, - 5, 5, 5, 23, 5, 5, 5, 5, 5, 5, 5, 5, 23, 26, 5, 5, - 5, 26, 23, 5, 5, 23, 0, 0, 13, 13, 13, 13, 13, 13, 13, 0, - 0, 0, 0, 0, 0, 0, 0, 26, 5, 5, 5, 81, 13, 13, 13, 0, - 11, 11, 11, 11, 11, 0, 0, 56, 1, 1, 1, 1, 1, 1, 1, 23, - 1, 1, 1, 1, 1, 1, 5, 5, 11, 11, 11, 11, 11, 0, 0,113, - 1, 1, 1, 1, 1, 45, 5, 5,188, 11, 11, 11, 11,189, 0, 38, - 1, 24, 1, 25, 1, 1, 1, 5, 1, 1, 24, 0, 0, 0, 0, 45, - 1, 1, 1, 14, 1, 1, 17, 14, 1, 1, 14, 49, 10, 10, 10, 10, + 7, 7, 7, 0, 27, 5, 5, 91, 6, 6, 6, 0, 0, 0, 0, 9, + 10, 10, 10, 10, 10, 10, 10, 51, 1, 1, 1, 1, 1, 27,185, 0, + 0, 1, 44, 1,120,186, 5, 5, 56, 3, 3, 3, 72, 1, 1, 1, + 10, 10, 10,114, 0, 0, 0, 0,136, 10, 78, 13, 13, 0, 0, 0, + 1, 5, 5, 13, 13, 0, 0, 0, 1, 1, 86, 10, 10, 10, 0, 0, + 19, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 5, + 5, 5, 5, 36, 13, 13, 13, 0, 10, 10, 10, 11, 11, 11, 11, 11, + 25, 24, 25, 0, 0, 0, 0, 27, 16, 19, 5, 20, 19, 36,187, 13, + 13, 23, 0, 0, 0, 0, 73, 0, 5, 25, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 24, 5, 5, 19, 5, 5, 5, 23, 11, 11, 11, 11, 11, + 13, 13, 34, 45, 0, 0, 0, 0, 1, 24, 13, 15, 0, 0, 0, 0, + 1, 34, 16, 5, 5, 5, 5, 20, 45, 1, 40, 13, 70, 5, 36, 19, + 11, 11, 11, 11, 11, 40, 40, 13, 10, 10, 51, 0, 0, 0, 0, 0, + 5, 16, 20, 5, 13, 13, 13, 25, 24, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 15, 15, 1, 1, 17, 1, 1, 1, 1, 1, 1, 1, 17, + 1, 1, 1, 1, 40, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 24, + 16, 19, 5, 5, 5, 23, 0, 0, 5, 16, 17, 1, 1, 1, 15, 17, + 15, 1, 17, 1, 1, 27, 25, 16, 20, 16, 37, 35, 37, 35, 16, 0, + 15, 0, 0, 35, 0, 0, 17, 1, 1, 16, 0, 5, 5, 5, 23, 0, + 5, 5, 23, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 17, 0, 15, + 1, 1, 1, 17, 16, 19, 5, 5, 23, 37, 35, 35, 16, 37, 16, 20, + 25, 25, 13, 38, 33, 0, 0, 0, 27, 23, 0, 0, 0, 0, 0, 0, + 1, 1, 34, 16, 5, 5, 5, 5, 16, 5, 20, 25, 1, 40, 13, 13, + 11, 11, 11, 11, 11, 13, 38, 25, 16, 19, 5, 5, 20, 20, 16, 19, + 20, 5, 1, 53, 0, 0, 0, 0, 16, 5, 5, 0, 16, 16, 5, 19, + 36, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 1, 1, 5, 0, + 16, 19, 5, 5, 5, 20, 19, 19, 36, 13, 15, 0, 0, 0, 0, 0, + 13, 13, 13, 13, 13, 13, 33, 0, 1, 1, 1, 1, 1, 24, 19, 16, + 5, 5, 5, 19, 40, 0, 0, 0, 11, 11, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 15, 27, 19, 16, 5, 5, 19, 5, 5, 0, 0, + 11, 11, 11, 11, 11, 10, 13, 56, 5, 5, 5, 5, 19, 36, 0, 0, + 10, 51, 0, 0, 0, 0, 0, 17, 1, 1, 1, 15, 17, 0, 1, 1, + 1, 1, 17, 15, 1, 1, 1, 1, 16, 16, 16, 35, 37, 27, 20, 25, + 45, 19, 13, 33, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, + 34, 16, 5, 5, 0, 5, 16, 16, 25, 53, 37, 0, 0, 0, 0, 0, + 24, 5, 5, 5, 5, 25, 1, 1, 1, 24, 5, 5, 20, 24, 5, 36, + 13, 13, 13, 70, 0, 0, 0, 0, 24, 5, 5, 20, 19, 5, 1, 1, + 1, 1, 1, 1, 1, 5, 5, 5, 5, 5, 5, 20, 5, 13, 53, 13, + 13, 33, 0, 0, 0, 0, 0, 0, 13, 13, 13, 13, 13, 15, 0, 0, + 20, 5, 20, 20, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 5, 23, 5, 5, 5, 19, 40, 13, 13, 0, 0, 0, 0, 0, + 13, 1, 1, 1, 1, 1, 1, 1, 0, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 35, 5, 5, 5, 20, 5, 19, 23, 0, 0, 0, 0, + 1, 1, 1, 15, 1, 17, 1, 1, 24, 5, 5, 23, 0, 23, 5, 27, + 5, 5, 5, 24, 0, 0, 0, 0, 1, 1, 1, 17, 15, 1, 1, 1, + 1, 1, 1, 1, 1, 16, 16, 37, 5, 35, 19, 19, 15, 0, 0, 0, + 1, 1, 1, 1, 44, 1, 0, 0, 1, 24, 20, 83, 33, 0, 0, 0, + 5, 34, 1, 1, 1, 1, 1, 1, 1, 1, 16, 5, 5, 23, 0, 16, + 20, 36, 13, 13, 13, 13, 13, 13, 11, 11, 11, 11, 11, 23, 0, 0, + 10, 10, 62, 3, 3, 3, 69, 30, 98, 3, 3, 3, 3, 3, 3, 3, + 3, 0, 0, 0, 0, 0, 0, 38, 13, 13,137, 12, 12, 12, 12, 12, + 12, 12, 12,100, 0, 0, 0, 0, 40, 33, 0, 0, 0, 0, 0, 0, + 25, 1, 1, 24, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 16, 19, 5, 5, 5, 36, 0, 0, 0, 0, 0, + 5, 5, 5, 36, 13, 13, 3, 3, 14, 14, 56, 0, 0, 0, 0, 0, + 11, 11, 11, 11, 11, 48, 10, 10, 10, 17, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 0, 17, 1, 14, 52, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 44,135, 13, 10, 10, 10, 78, 13, 33, 0, 0, + 7, 7, 7, 7, 32, 43, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 15, 0, 27, 34, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 0, 0, 0, 27, 5, 81, 14, 14, 14, 14, 14, 14, + 14, 61, 23, 0, 0, 0, 0, 0, 16, 14, 12,100, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 17, 14, 14, 58, 14, 14, 14, 58, 82, + 0, 15, 0, 0, 0, 0, 0, 0, 1, 15, 17, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 15, 0, 0, 0, 1, 1, 1, 1, 1, 0, 41, 36, + 18, 18, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 3, 29, 0, + 3, 3, 0, 0, 0, 3, 3, 3, 29, 3, 29, 0, 0, 0,188, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 5, 5, 5, 5, 5, 5, 5, 0, + 3, 3, 3, 41, 50, 3, 3, 3, 3, 3,101, 19, 5, 3,101, 16, + 16,189, 18, 18, 18, 92, 5, 5, 5, 50, 41, 5, 5, 5, 3, 3, + 3, 3, 3, 3, 3, 5, 5, 3, 3, 5, 50, 0, 0, 0, 0, 0, + 16,190, 3, 3, 3, 41, 50,101, 16, 0, 0, 0, 0, 0, 0, 0, + 6, 6, 46, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 32, 7, + 0, 32, 39, 32, 39, 7, 32, 7, 7, 7, 7, 6, 6, 43, 43, 6, + 6, 6, 43, 6, 6, 6, 6, 6, 6, 6, 7, 39, 7, 32, 39, 7, + 7, 7, 32, 7, 7, 7, 32, 6, 6, 6, 6, 6, 7, 39, 7, 32, + 7, 7, 32, 32, 0, 7, 7, 7, 32, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 46, 7, 7, 7, 7, 59, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 59, 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, + 7, 7, 59, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 60, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 59, + 6, 6, 6, 6, 60, 6, 6, 6, 7, 7, 7, 7, 59, 6, 6, 6, + 6, 60, 6, 6, 6, 8, 0, 11, 5, 5, 5, 50, 3, 41, 5, 5, + 5, 5, 5, 5, 5, 5, 50, 3, 3, 3, 41, 3, 3, 3, 3, 3, + 3, 3, 50, 65, 13, 13, 0, 0, 0, 0, 0, 0, 0, 27, 5, 5, + 9, 9, 9, 9, 9, 9, 99, 0, 6, 6, 6, 6, 6,128, 6, 6, + 8, 6, 6, 6, 8, 8, 21, 6, 21, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 58, 14, + 5, 5, 5, 23, 5, 5, 5, 5, 5, 5, 5, 5, 23, 27, 5, 5, + 5, 27, 23, 5, 5, 23, 0, 0, 14, 14, 14, 14, 14, 14, 14, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 5, 5, 5, 81, 14, 14, 14, 0, + 11, 11, 11, 11, 11, 0, 0, 55, 1, 1, 1, 1, 1, 1, 1, 23, + 1, 1, 1, 1, 1, 1, 5, 5, 11, 11, 11, 11, 11, 0, 0,115, + 1, 1, 1, 1, 1, 44, 5, 5,191, 11, 11, 11, 11,192, 0, 38, + 1, 24, 1, 25, 1, 1, 1, 5, 1, 1, 24, 0, 0, 0, 0, 44, + 1, 1, 1, 15, 1, 1, 17, 15, 1, 1, 15, 48, 10, 10, 10, 10, 6, 6, 5, 5, 5, 81, 0, 0, 10, 10, 10, 10, 10, 10, 75, 10, - 190, 10, 51, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 75, + 193, 10, 51, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 75, 10, 10, 10, 10, 10, 10, 10, 0, 1, 1, 17, 1, 1, 1, 1, 1, - 17, 14, 14, 17, 17, 1, 1, 1, 1, 14, 1, 1, 17, 17, 0, 0, - 0, 14, 0, 17, 17, 17, 17, 1, 17, 14, 14, 17, 17, 17, 17, 17, - 17, 14, 14, 17, 1, 14, 1, 1, 1, 14, 1, 1, 17, 1, 14, 14, + 17, 15, 15, 17, 17, 1, 1, 1, 1, 15, 1, 1, 17, 17, 0, 0, + 0, 15, 0, 17, 17, 17, 17, 1, 17, 15, 15, 17, 17, 17, 17, 17, + 17, 15, 15, 17, 1, 15, 1, 1, 1, 15, 1, 1, 17, 1, 15, 15, 1, 1, 1, 1, 1, 17, 1, 1, 17, 1, 17, 1, 1, 17, 1, 1, - 9, 0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 63, 3, + 9, 0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 62, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 29, 0, 0, 0, 0, 0, 0, - 3, 3, 3, 3, 3,108, 22, 22, 3, 3, 3, 3, 29, 0, 3, 3, - 9, 9, 9, 9, 98, 0, 0, 0, 3, 3, 3, 3, 3, 29, 0, 3, - 3, 3, 3, 29, 29, 0, 44, 3, 3, 3, 3, 3, 3, 3, 29, 44, - 3, 3, 3, 3, 3, 29, 0, 44, 3, 29, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 29, 0, 0, 0, 3, 3, 3, 3, 3,110, 22, 22, + 3, 3, 3, 3, 3, 0, 3, 3, 9, 9, 9, 9, 99, 0, 0, 0, + 3, 3, 3, 29, 29, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 54, + 3, 3, 3, 3, 3, 3, 0, 54, 3, 29, 3, 3, 3, 3, 3, 3, 11, 11, 11, 11, 11, 29, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 7, 7, 3, 3, 26, 26, 4, 4, 12, 12, 5, 5, 9, 9, 9, 5, 25, 25, 15, 15, 13, 13, - 21, 21, 6, 6, 7, 2, 10, 10, 14, 14, 2, 7, 1, 1, 10, 12, - 12, 10, 5, 9, 24, 24, 12, 2, 7, 12, 12, 7, 2, 12, 22, 18, + 14, 14, 21, 21, 6, 6, 7, 2, 10, 10, 2, 7, 1, 1, 10, 12, + 12, 10, 5, 9, 24, 24, 12, 2, 7, 12, 12, 7, 22, 18, 2, 12, 0, 0, 26, 2, 23, 23, 18, 22, 9, 2, 21, 2, 7, 10, 2, 10, - 12, 21, 10, 2, 2, 21, 2, 9, 7, 21, 8, 8, 2, 5, 26, 12, - 2, 26, 7, 6, 10, 7, 5, 2, 25, 26, 2, 15, 26, 25, 15, 2, - 6, 7, 21, 7, 2, 6, 12, 26, 7, 26, 21, 26, 20, 19, 9, 25, - 5, 25, 6, 2, 21, 6, 15, 26, 25, 22, 18, 21, 26, 21, 5, 7, - 6, 24, 6, 5, 26, 23, 21, 12, 6, 12, 2, 1, 29, 29, 26, 15, - 21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12, 6, 26, 7, 10, 21, - 17, 17, 9, 26, 7, 15, 29, 21, 21, 9, 24, 5, 25, 9, 1, 12, - 17, 21, 11, 12, 8, 24, 26, 9, 21, 22, 23, 26, 25, 2, 14, 2, - 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, 5, 22, 25, 18, 24, 26, - 26, 24, 9, 8, 8, 5, 5, 21, 15, 7, 2, 23, 21, 15, 17, 7, - 18, 2, 5, 6, 5, 24, 22, 20, 21, 20, 19, 21, 21, 16, 16, 21, - 7, 5, 5, 26, 14, 15, 18, 25, 7, 14, 17, 22, 17, 6, 24, 6, - 6, 21, 12, 15, 26, 10, 25, 0, 7, 20, 25, 1, 24, 15, 7, 19, - 9, 21, 17, 2, 17, 12, 1, 21, 12, 1, 24, 7, 29, 7, 7, 22, - 14, 7, 2, 24, 9, 24, 24, 2, 29, 1, 27, 28, 1, 29, 21, 29, - 1, 2, 15, 6, 18, 6, 12, 11, 26, 5, 14, 9, 5, 14, 26, 22, - 18, 26, 5, 12, 22, 21, 18, 17, 26, 6, 18, 18, 26, 14, 14, 6, - 12, 24, 11, 21, 24, 9, 6, 9, 6, 10, 7, 25, 17, 16, 16, 22, - 16, 16, 25, 17, 25, 24, 23, 2, 21, 14, 12, 17, 21, 1, 10, 1, - 7, 13, 13, 2, 23, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 10, 11, 12, 13, 0, 14, 0, 0, 0, 0, 0, 15, 0, 16, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 20, 0, 21, 22, 23, 0, 0, 0, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 36, 0, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, - 0, 0, 0, 0, 0, 0, 41, 42, 43, 44, 45, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 9, 0, 0, - 0, 10, 11, 12, 13, 0, 14, 15, 16, 0, 17, 18, 19, 20, 21, 1, - 22, 1, 23, 1, 2, 1, 2, 1, 2, 0, 2, 1, 24, 1, 2, 25, - 2, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, 36, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 38, - 0, 0, 39, 0, 0, 40, 0, 41, 0, 0, 0, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 0, 0, 51, 0, 0, 0, 52, 0, 0, 0, 53, 0, - 0, 0, 0, 0, 0, 0, 54, 0, 3, 0, 55, 56, 0, 57, 0, 0, - 0, 0, 0, 0, 58, 59, 60, 0, 0, 0, 0, 61, 0, 0, 62, 63, - 64, 4, 65, 0, 0, 66, 67, 0, 0, 0, 68, 0, 0, 0, 0, 69, - 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 71, 0, 0, 0, 72, 0, 73, 0, 0, 74, 0, 0, 75, 0, - 0, 0, 0, 0, 0, 0, 0, 76, 77, 0, 0, 0, 0, 78, 79, 0, - 80, 81, 0, 0, 82, 5, 0, 83, 4, 0, 84, 85, 0, 0, 86, 87, - 88, 0, 89, 0, 90, 0, 91, 0, 0, 3, 92, 3, 0, 93, 0, 94, - 0, 0, 0, 5, 0, 0, 0, 95, 96, 0, 97, 98, 99,100, 0, 0, - 0, 0, 0, 3, 0, 0, 0, 0,101,102, 0, 0, 0, 0, 0, 0, - 103, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, 0, 0,105, 6, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,106, 0, 0,107, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,108,109, 0, 0,110, 0, 0, 0, - 0, 0, 0,111, 0,112, 0, 6, 0, 0, 0, 0, 0,113,114, 0, - 0, 0, 0, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0,117, 0, - 0, 0, 0, 0, 0, 0,118, 0,119, 0, 0, 0, 0, 0, 0, 0, - 2, 1, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 11, 0, 0, 0, - 14, 0, 0, 0, 16, 3, 17, 18, 19, 20, 21, 22, 0, 23, 0, 0, - 0, 0, 24, 25, 26, 27, 0, 0, 0, 0, 28, 0, 0, 29, 30, 0, - 31, 0, 32, 33, 0, 0, 34, 0, 35, 36, 0, 0, 0, 0, 0, 37, - 38, 0, 39, 40, 0, 0, 41, 0, 0, 0, 42, 0, 0, 43, 44, 45, - 46, 1, 47, 0, 0, 1, 0, 0, 7, 1, 48, 0, 0, 0, 0, 0, - 49, 50, 0, 0, 0, 0, 0, 0, 51, 52, 0, 0, 0, 0, 0, 0, - 53, 54, 0, 0, 0, 0, 55, 0, 56, 0, 0, 0, 57, 58, 0, 0, - 0, 59, 0, 0, 0, 0, 0, 0, 60, 12, 0, 0, 0, 0, 61, 0, - 0, 0, 62, 0, 5, 0, 63, 0, 0, 0, 0, 64, 0, 0, 0, 0, - 65, 0, 66, 0, 0, 0, 0, 6, 67, 0, 0, 0, 68, 69, 70, 71, - 0, 0, 0, 0, 72, 5, 0, 73, 74, 0, 0, 75, 0, 0, 0, 76, - 77, 0, 0, 0, 78, 0, 79, 80, 81, 82, 83, 3, 84, 0, 85, 86, - 87, 0, 0, 8, 9, 0, 0, 3, 3, 0, 0, 88, 0, 0, 89, 0, - 0, 0, 0, 8, 90, 0, 91, 0, 0, 0, 0, 0, 9, 10, 0, 92, - 0, 5, 0, 3, 9, 0, 0, 93, 0, 0, 94, 0, 0, 6, 0, 0, - 0, 0, 0, 0, 95, 96, 0, 0, 10, 0, 0, 1, 0, 0, 97, 0, - 0, 0, 0, 98, 0, 0, 0, 0, 12, 0, 0, 13, 0, 0, 0, 0, - 99,100, 0, 0,101, 0, 0,102, 0, 0, 0,103, 0, 0, 0,104, - 0, 0, 0,105, 0, 0, 0, 0,106,107, 13, 0, 0,108, 0, 0, - 0, 10, 0, 0,109,110, 0, 0,111,112, 0, 0, 0, 0, 0, 0, - 113, 0, 0,114, 0, 0, 0, 0,115, 1, 0,116,117,118, 6, 0, - 0,119, 7, 0, 0,120, 0, 0, 0,121, 0, 0, 0, 0, 0, 0, - 122, 0, 0,123, 0, 0, 0, 0,124, 11, 0, 0, 0, 0, 0, 6, - 0, 0, 0, 0, 5, 15, 0, 0, 0, 0,125, 0, 0,126, 0, 0, - 0, 0, 15, 0, 0,127, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, - 128, 0, 0, 0,129, 0,130, 0, 0, 0, 0,131,132,133, 0,134, - 0,135, 0, 0, 0,136,137,138, 0, 8, 0, 0, 0, 0, 0, 7, - 0, 0, 0,139, 0, 0, 0,140, 0, 0, 0,141, 0, 0, 0,142, - 143, 0,144, 0, 0,145, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, - 0, 9, 1, 1, 1, 1, 0, 0, 0, 2, 0, 3, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 19, 0, 0, 0, 6, 11, 0, 0, 0, 0, 14, - 0, 0, 15, 0, 0, 0, 0, 0, 0, 17, 29, 0, 0, 0, 0, 0, - 31, 0, 0, 2, 0, 0, 1, 12, 0, 0, 1, 49, 50, 5, 51, 52, - 53, 5, 5, 22, 32, 23, 1, 54, 24, 55, 16, 33, 56, 57, 58, 1, - 1, 1, 6, 1, 0, 0, 59, 7, 60, 1, 34, 5, 7, 61, 62, 63, - 64, 65, 66, 67, 0, 0, 1, 1, 68, 0, 0, 0, 69, 70, 71, 35, - 1, 25, 72, 0, 0, 0, 0, 8, 1, 26, 16, 26, 73, 27, 74, 0, - 0, 0, 36, 25, 75, 37, 7, 37, 76, 0, 0, 0, 6, 1, 7, 0, - 0, 17, 0, 8, 38, 1, 1, 13, 13, 11, 0, 0, 39, 0, 0, 6, - 18, 1, 0, 0, 8, 16, 5, 1, 1, 1, 77, 7, 36, 18, 78, 7, - 35, 1, 79, 10, 0, 0, 0, 80, 0, 0, 0, 0, 2, 3, 0, 0, - 14, 0, 0, 0, 81, 0, 0, 0, 82, 0, 0, 0, 83, 0, 0, 0, - 84, 0, 0, 0, 40, 0, 0, 85, 86, 0, 87, 88, 89, 90, 91, 92, - 0, 0, 0, 93, 0, 0, 0, 15, 28, 0, 0, 0, 0, 13, 0, 41, - 0, 0, 14, 0, 0, 20, 0, 0, 94, 0, 0, 0, 95, 0, 0, 6, - 29, 0, 0, 13, 1, 96, 1, 18, 33, 97, 25, 23, 7, 1, 1, 1, - 1, 27, 1, 7, 98, 0, 0, 9, 0, 0, 0, 0, 6, 23, 1, 0, - 0, 0, 0, 0, 30, 0, 0, 21, 0, 0, 30, 0, 0, 0, 0, 15, - 0, 0, 12, 32, 24, 5, 99, 22, 42, 17, 0, 10, 11, 0, 7, 1, - 7,100,101, 1, 1, 1, 1,102,103,104,105, 1,106, 10, 20,107, - 108, 5, 10, 0, 0, 0, 0, 0,109,110, 0, 0,111, 0, 0, 1, - 1, 11, 0, 0, 0, 8, 0, 0, 0, 3, 0, 0, 43, 40, 2, 0, - 0, 0, 44,112, 10, 8, 20, 0, 0, 0, 0, 0, 0,113, 1, 16, - 5, 24, 0, 8, 12, 0, 0, 0, 0,114, 0, 0,115, 2, 0,116, - 0, 0, 0, 1, 0, 0, 0, 0, 13, 11, 0, 0, 6, 10, 0, 0, - 45, 39, 0, 45, 16, 18, 46, 27, 0, 0, 3, 0, 0, 2, 12, 0, - 0, 0, 2, 3, 0, 0, 3, 0, 21, 0, 0, 31, 0, 0, 0, 0, - 117, 0, 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, 0, 0, - 0, 30, 14, 21, 0, 0, 47, 0, 0, 0, 9, 0, 0, 0, 0, 47, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 28, 0, 0, 4, 0, 21, 41, - 0, 0, 28, 0, 0, 0, 22, 42, 0, 0,118, 0, 0, 0, 0, 0, - 0,119, 0,120,121,122,123, 0, 43, 5, 48, 13, 34, 0, 0, 0, - 8, 11, 8, 10, 0, 0, 1, 12, 1, 1, 1, 1, 26, 1, 38, 44, - 12, 0, 0, 0, 0, 1, 0, 0, 0,124, 0, 0, 0, 46, 6, 19, - 0, 8, 0, 20, 0, 0, 5, 48, 0, 0, 0, 1,125, 0, 0, 0, - 0,230,230,230,230, 0, 0, 0, 9, 9, 0, 0, 0, 0, 9, 0, - 0,220,220,220,220, 0, 0, 0,230,230,230,220,230, 0, 0,230, - 230, 7, 0, 0, 0,230, 0, 0, 0,230,230, 0, 0,230,230,230, - 0, 0,230,230,230, 0, 0, 9, 0, 0, 0, 0, 7,230,230,230, - 220, 0,220, 0, 0,230,220,220,220, 0, 0,230, 0, 0,230, 0, - 0, 0, 0, 7, 0, 1, 1, 1, 1,220,230,230,230,220,220,230, - 230,220,230,230,220,230, 0, 0,230,230,220, 0, 0, 0, 9, 9, - 0,220, 0, 0, 0, 0, 0, 9, 9, 0, 9, 7, 0, 1,220,220, - 220,220,220,220,230,230,230,220,220,230,220,220,230,230,220,230, - 230,220,230,220,230,230,230, 0,230, 0,220,220,220,220,220, 0, - 0, 9, 9, 0, 0, 1, 0, 0, 0, 0, 0, 0,220,230, 0,230, - 230, 0, 0,220,220, 0, 0,230,220, 0, 0, 9, 7,220,220,220, - 0,230,232,220,220,220,220,232,216,220,202,202,220,220,220,220, - 202,202,220,220,220,230,240,230,220,230,220,220, 0,232,220,220, - 230,233,234,234,233,234,234,233,230, 0,220,230,230,230,230,222, - 220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, - 20, 21, 22, 0, 23, 0, 24, 25, 0,230,220, 0, 18, 30, 31, 32, - 0, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35, 0, 0, - 0,230, 0,220,230, 0, 36, 0, 0,220,220,230,220,220,230,230, - 0,230,230, 0,220, 27, 28, 29,230, 0,230,220,230, 0, 84, 91, - 0,103,103, 9, 0,107,107,107,107,118,118, 9, 0,122,122,122, - 122, 0,220, 0,220, 0,216, 0, 0, 0,129,130, 0,132, 0, 0, - 0, 0, 0,130,130,130,130, 0, 0,130, 0,230,230, 9, 0,230, - 230, 0, 0,220, 0, 0,228, 0, 0, 0,222,230,220,230, 0, 0, - 220,230,220, 0,220,230,230,230,234,230, 0, 1, 1,230,234,214, - 220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,230, - 220,230,230, 1, 1, 1, 1, 1,230, 0, 1, 1,230,220,230, 1, - 1, 0, 0,218,228,232,222,224,224, 0, 8, 8, 0,220, 0, 0, - 230, 0, 0, 26, 0, 0,220, 0,230,230, 1,220, 0, 0,230,220, - 0, 0, 7, 9, 0, 6, 6, 0, 0, 0, 0, 1, 0, 0,216,216, - 1, 1, 1, 0, 0, 0,226,216,216,216,216,216, 0,232,232,220, - 230,230,230, 7, 0, 1, 0, 0, 32, 0, 48, 0, 0, 84, 96,135, - 144, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,176, 0, 0, 0, 0, 0, 0, 0, 0, 8, 16, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 40, - 0, 0, 0, 0, 0, 48, 56, 64, 0, 0, 0, 0, 0, 72, 80, 88, - 96,104, 0, 0, 0, 0, 0, 0, 0, 0,112, 0,120, 0, 0, 0, - 0, 0, 0,128,136,144,152,160,168, 0, 0, 0,176,184,192, 0, - 0, 0, 0, 0, 0,200, 0, 0, 0, 0, 0, 0, 0, 0,208, 0, - 0,216,224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 36, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, - 64, 0, 68, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 72, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 20, 0, 0, 0, 0, - 0, 0, 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 76, 80, 84, 88, - 0, 0, 12, 92, 96, 28, 0,100,104, 4, 4, 4,108, 44,112,116, - 120, 4,124, 0,128,132, 4, 4, 48,136,140, 0, 32, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 0, 0, 4, 48, 0, 52,144, 20,148,152, - 4, 0, 0,156,160,164,168,172, 4, 0,176, 56, 60,180, 32, 0, - 16,184, 56, 0, 0, 0, 0, 0, 52, 12, 12, 0, 0, 0, 0, 12, - 0, 0,188, 8, 8, 8, 8,192,196, 8, 8, 8, 8,200,204,208, - 212, 60, 44, 0, 0, 0, 0, 0, 0, 0,216, 28,220, 0, 12, 4, - 16, 0, 0, 0, 0,224,228, 0, 0, 0, 0, 0, 4,232, 32, 0, - 0, 0, 0, 0, 0, 0,236, 12, 0, 0, 0, 0, 16, 0, 36, 0, - 0, 0, 24, 0, 0, 0,240,244, 0, 0, 0, 0, 2, 2, 2, 2, - 4, 4, 4, 4, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 6, 8, - 0, 10, 12, 0, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 14, 16, - 6, 8, 0, 0, 4, 8, 0, 0, 2, 2, 2, 0, 0, 6, 4, 8, - 2, 0, 2, 0, 0, 0, 0, 6, 0, 20, 0, 0, 0, 22, 0, 0, - 0, 6, 8, 0, 24, 26, 28, 0, 0, 0, 30, 0, 0, 0, 0, 32, - 34, 36, 38, 0, 0, 40, 42, 0, 0, 0, 18, 0, 0, 0, 2, 2, - 2, 2, 0, 2, 2, 2, 0, 6, 44, 0, 0, 0, 0, 2, 0, 46, - 48, 50, 0, 0, 52, 0, 0, 0, 6, 4, 54, 0, 2, 0, 0, 2, - 2, 56, 58, 60, 0, 62, 64, 18, 2, 10, 12, 0, 0, 0, 66, 8, - 0, 2, 2, 2, 0, 6, 4, 4, 4, 4, 68, 2, 70, 4, 4, 4, - 8, 72, 0, 0, 74, 76, 2, 0, 78, 0, 0, 0, 4, 8, 2, 0, - 0, 0, 80, 0, 6, 4, 4, 4, 4, 8, 0, 2, 2, 2, 2, 6, - 4, 4, 4, 8, 0, 0, 0, 82, 0, 84, 86, 0, 0, 0, 2, 88, - 0, 0, 0, 90, 6, 8, 2, 0, 0, 0, 6, 4, 4, 4, 8, 0, - 2, 0, 2, 2, 6, 4, 4, 8, 0, 10, 12, 6, 8, 2, 0, 0, - 4, 5, 6, 7, 8, 9, 10, 1, 1, 11, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 12, 13, 2, 2, 2, 2, 14, 0, 0, 0, 0, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 0, 0, 25, 26, 3, 3, - 3, 27, 0, 0, 0, 28, 29, 30, 0, 31, 32, 33, 34, 35, 36, 37, + 12, 21, 10, 2, 2, 21, 2, 9, 7, 21, 26, 12, 8, 8, 2, 5, + 7, 6, 10, 7, 5, 2, 25, 26, 2, 15, 26, 25, 12, 26, 15, 2, + 6, 7, 21, 7, 2, 26, 7, 26, 21, 26, 20, 19, 2, 6, 9, 25, + 5, 25, 21, 6, 15, 26, 25, 22, 18, 21, 26, 21, 5, 7, 6, 24, + 6, 5, 26, 23, 21, 12, 6, 12, 26, 7, 2, 1, 29, 29, 26, 15, + 21, 17, 25, 21, 15, 21, 11, 11, 21, 23, 12, 6, 6, 2, 10, 21, + 17, 17, 9, 26, 7, 15, 29, 21, 21, 9, 24, 5, 25, 9, 17, 6, + 1, 12, 17, 21, 11, 12, 8, 24, 26, 9, 21, 22, 23, 26, 25, 2, + 14, 2, 26, 10, 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, 5, 22, + 25, 18, 24, 26, 26, 24, 9, 8, 8, 5, 5, 21, 15, 7, 2, 23, + 21, 15, 17, 7, 5, 6, 5, 24, 2, 24, 22, 20, 21, 20, 19, 21, + 21, 16, 16, 21, 18, 6, 23, 2, 7, 5, 5, 26, 14, 15, 18, 25, + 7, 14, 17, 22, 24, 6, 6, 21, 12, 15, 21, 14, 25, 0, 7, 20, + 25, 1, 24, 15, 7, 19, 9, 21, 6, 26, 17, 12, 1, 21, 12, 1, + 24, 7, 29, 7, 7, 22, 18, 2, 14, 7, 9, 24, 24, 2, 29, 1, + 27, 28, 1, 29, 21, 29, 1, 2, 15, 6, 12, 11, 26, 5, 14, 9, + 5, 14, 26, 22, 18, 26, 5, 12, 22, 21, 18, 17, 26, 6, 18, 18, + 26, 14, 14, 6, 12, 24, 11, 21, 24, 9, 6, 9, 6, 10, 7, 25, + 17, 16, 16, 22, 16, 16, 25, 17, 25, 24, 12, 17, 24, 12, 21, 1, + 2, 25, 10, 1, 10, 26, 7, 13, 13, 2, 23, 15, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 0, 14, 0, 0, 0, + 0, 0, 15, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, + 18, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, 22, 23, 0, 0, + 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, + 0, 36, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, 41, 42, 43, 44, + 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, + 0, 0, 0, 9, 0, 0, 0, 10, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 18, 19, 20, 21, 1, 22, 1, 23, 1, 2, 1, 2, 1, 2, 0, + 2, 1, 24, 1, 2, 25, 2, 0, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, + 0, 0, 0, 0, 0, 38, 0, 0, 39, 0, 0, 40, 0, 41, 0, 0, + 0, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 0, 51, 0, 0, 0, + 52, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 3, 0, + 55, 56, 0, 57, 0, 0, 0, 0, 0, 0, 58, 59, 60, 0, 0, 0, + 0, 61, 0, 0, 62, 63, 64, 4, 65, 0, 0, 66, 67, 0, 0, 0, + 68, 0, 0, 0, 0, 69, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 72, 0, 73, 0, + 0, 74, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 76, 77, 0, + 0, 0, 0, 78, 79, 0, 80, 81, 0, 0, 82, 5, 0, 83, 4, 0, + 84, 85, 0, 0, 86, 87, 88, 0, 89, 0, 90, 0, 91, 0, 0, 3, + 92, 3, 0, 93, 0, 94, 0, 0, 0, 5, 0, 0, 0, 95, 96, 0, + 97, 98, 99,100, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,101,102, + 0, 0, 0, 0, 0, 0,103, 0, 0, 0, 0, 0, 0,104, 0, 0, + 0, 0, 0, 0,105, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 106, 0, 0,107, 0, 0, 0, 0, 0, 0, 0, 0, 0,108,109,110, + 0, 0,111,112, 0, 0, 0, 0, 0,113, 0,114, 0, 6, 0, 0, + 0, 0, 0,115,116, 0, 0, 0, 0, 0, 0, 0,117, 0, 0, 0, + 118, 0, 0, 0,119, 0, 0, 0, 0, 0, 0, 0,120, 0,121, 0, + 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 4, 0, + 0, 0, 11, 0, 0, 0, 15, 0, 0, 0, 17, 3, 18, 19, 20, 21, + 22, 23, 0, 24, 0, 0, 0, 0, 25, 26, 27, 28, 0, 0, 0, 0, + 29, 0, 0, 30, 31, 0, 32, 0, 33, 34, 0, 0, 35, 0, 36, 37, + 0, 0, 0, 0, 0, 38, 39, 0, 40, 41, 0, 0, 42, 0, 0, 0, + 43, 0, 0, 44, 45, 46, 47, 1, 48, 0, 0, 1, 0, 0, 7, 1, + 49, 0, 0, 0, 0, 0, 50, 51, 0, 0, 0, 0, 0, 0, 52, 53, + 0, 0, 0, 0, 0, 0, 54, 55, 0, 0, 0, 0, 56, 0, 57, 0, + 0, 0, 58, 59, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 61, 12, + 0, 0, 0, 0, 62, 0, 0, 0, 63, 0, 5, 0, 64, 0, 0, 0, + 0, 65, 0, 0, 0, 0, 66, 0, 67, 0, 0, 0, 0, 6, 68, 0, + 0, 0, 69, 70, 71, 72, 13, 0, 0, 0, 73, 5, 0, 74, 75, 0, + 0, 76, 0, 0, 0, 77, 78, 0, 0, 0, 79, 0, 80, 81, 82, 83, + 84, 3, 85, 0, 86, 87, 13, 0, 0, 8, 9, 0, 0, 3, 3, 0, + 0, 88, 0, 0, 89, 0, 0, 0, 0, 8, 90, 0, 91, 0, 0, 0, + 0, 0, 9, 10, 0, 92, 0, 5, 0, 3, 9, 0, 0, 93, 0, 0, + 94, 0, 0, 6, 0, 0, 0, 0, 0, 0, 95, 96, 0, 0, 10, 0, + 0, 1, 0, 0, 97, 0, 0, 0, 0, 98, 0, 0, 0, 0, 12, 0, + 0, 14, 0, 0, 0, 0, 99,100, 0, 0,101, 0, 0,102, 0, 0, + 0,103, 0, 0, 0,104, 0, 0, 0,105, 0,106, 0, 0,107,108, + 14, 0, 0,109, 0, 0, 0, 10, 0, 0,110,111, 0, 0,112,113, + 0, 0, 0, 0, 0, 0,114, 0, 0,115, 0, 0, 0, 0,116, 1, + 0,117,118,119, 6, 0, 0,120, 7, 0, 0,121, 0, 0, 0,122, + 0, 0, 0, 0, 0, 0,123, 0, 0,124, 0, 0, 0, 0,125, 11, + 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 5, 16, 0, 0, 0, 0, + 126, 0, 0,127, 0, 0, 0, 0, 16, 0, 0,128, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0,129, 0, 0, 0,130, 0,131, 0, 0, 0, + 0,132, 0, 0, 0,133,134,135, 0,136, 0,137,138, 0, 0,139, + 0, 0, 0,140,141,142, 0, 8, 0, 0, 0, 0, 0, 7, 0, 0, + 0,143, 0, 0, 0,144, 0, 0, 0,145, 0, 0, 0,146,147, 0, + 148, 0, 0,149, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 9, + 1, 1, 1, 1, 0, 0, 0, 2, 0, 3, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 21, 0, 0, 0, 5, 11, 0, 0, 0, 0, 14, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 23, 0, 0, 0, + 0, 0, 35, 0, 0, 2, 0, 0, 1, 12, 0, 0, 1, 49, 50, 6, + 51, 52, 53, 6, 6, 25, 36, 26, 1, 54, 17, 55, 16, 27, 56, 57, + 58, 1, 1, 1, 5, 1, 0, 0, 59, 7, 60, 1, 18, 6, 7, 61, + 62, 63, 64, 65, 66, 67, 68, 0, 1, 1, 69, 0, 0, 0, 70, 71, + 72, 37, 1, 28, 73, 0, 0, 0, 0, 8, 1, 29, 16, 29, 74, 38, + 75, 0, 0, 0, 30, 28, 76, 31, 7, 31, 77, 0, 0, 0, 5, 1, + 7, 0, 0, 19, 0, 8, 39, 1, 1, 13, 13, 11, 0, 0, 40, 0, + 0, 5, 20, 1, 0, 0, 8, 16, 6, 1, 1, 1, 78, 7, 30, 20, + 79, 7, 37, 1, 80, 10, 0, 0, 0, 81, 0, 0, 0, 0, 2, 3, + 0, 0, 14, 0, 0, 0, 82, 0, 0, 0, 83, 0, 0, 0, 84, 0, + 0, 0, 85, 0, 0, 0, 41, 0, 0, 86, 87, 0, 88, 89, 90, 91, + 92, 93, 0, 0, 0, 94, 0, 0, 0, 15, 32, 0, 0, 0, 0, 13, + 0, 42, 0, 0, 14, 0, 0, 22, 0, 0, 95, 0, 0, 0, 96, 0, + 0, 5, 23, 0, 0, 13, 1, 97, 1, 20, 27, 98, 28, 26, 7, 1, + 1, 1, 1, 30, 1, 7, 99, 18, 0, 9, 0, 0, 0, 0, 5, 26, + 1, 0, 0, 0, 0, 0, 33, 0, 0, 24, 0, 0, 33, 0, 0, 0, + 0, 15, 0, 0, 12, 36, 17, 6,100, 25, 43, 19, 0, 10, 11, 0, + 7, 1, 7,101,102, 1, 1, 1, 1,103,104,105,106, 1,107, 10, + 22,108,109, 6, 0, 0,110,111, 0, 0,112, 0, 0, 1, 1, 11, + 0, 0, 0, 8, 0, 0, 0, 3, 0, 0, 34, 41, 2, 0, 0, 0, + 44,113, 10, 8, 22, 0, 0, 0, 0, 0, 0,114, 1, 16, 6, 17, + 0, 8, 12, 0, 0, 0, 0,115, 0, 0,116, 2, 0,117, 0, 0, + 0, 1, 0, 0, 0, 0, 13, 11, 0, 0, 5, 10, 0, 0, 5, 17, + 27, 31, 18, 40, 0,118, 16, 20, 45, 38, 0, 0, 3, 0, 0, 2, + 12, 0, 0, 0, 2, 3, 0, 0, 3, 0, 24, 0, 0, 35, 0, 0, + 0, 0,119, 0, 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, + 0, 0, 0, 33, 14, 24, 0, 0, 46, 0, 0, 0, 9, 0, 0, 0, + 0, 46, 0, 0, 0, 0, 2, 0, 0, 0, 0, 32, 0, 0, 4, 0, + 24, 42, 0, 0, 32, 0, 0, 0, 25, 43, 0, 0,120, 0, 0, 0, + 0, 0, 0,121, 0, 34, 23, 0, 0,122,123,124, 47, 0, 34, 6, + 48, 13, 18, 0, 0, 0, 8, 11, 8, 10, 0, 0, 47, 0,125,126, + 127, 0, 0, 0, 1, 12, 1, 1, 1, 1, 29, 1, 39, 44, 12, 0, + 0, 0, 0, 1, 0, 0, 0,128, 0, 0, 0, 45, 5, 21, 0, 8, + 0, 22, 0, 0, 6, 48, 0, 0, 0, 1,129, 0, 0, 0, 0,230, + 230,230,230, 0, 0, 0, 9, 9, 0, 0, 0, 0, 9, 0, 0, 0, + 0, 0,230,220,220,220,220,230,230,220,230, 0, 0,230,230, 7, + 0, 0, 0,230, 0, 0, 0,230,230, 0, 0,230,230,230, 0, 0, + 230,230,230, 0, 0, 9, 0, 0, 0, 0, 7,230,230,230,220,220, + 220,230,230,230,230,220,220, 0,220, 0, 0,230,220,220,220, 0, + 0,230, 0, 0,230, 0, 0,220, 0, 0, 0, 0, 0, 7, 0, 1, + 1, 1, 1,220,230,230,230,220,220,220,230,220,230,230,220,230, + 0, 0,230,230,220,230,230,220,230,220,230, 0, 9, 9, 0, 0, + 0, 9, 9, 0, 0, 0,220, 0, 9, 7, 0, 1,220,220,220,230, + 220,220,230,230,220, 0, 0,230,230, 0,230, 0,220,220,220,220, + 220, 0, 0, 9, 9, 0, 0, 1, 0, 0, 0,230, 0,230,230, 0, + 0,230,220, 0, 0, 9, 7,216,216,216, 0,220,220,220, 0,230, + 232,220,220,220,220,232,216,220,202,202,220,220,220,220,202,202, + 220,220,220,230,240,230,220,230,220,220, 0,232,220,220,230,233, + 234,234,233,234,234,233,230, 0,220,230,230,230,230,222,220,230, + 222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, + 22, 0, 23, 0, 24, 25, 0,230,220, 0, 18, 10, 21, 0, 0, 30, + 31, 32, 0, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35, + 0, 0, 0,230, 0,220,230, 0, 36, 0, 0,220,220,230,220,220, + 230,230, 0,230,230, 0,220, 27, 28, 29,230, 0,230,220,230, 0, + 84, 91, 0,103,103, 9, 0,107,107,107,107,118,118, 9, 0,122, + 122,122,122, 0,220, 0,220, 0,216, 0, 0, 0,129,130, 0,132, + 0, 0, 0, 0, 0,130,130,130,130, 0, 0,130, 0,230,230, 9, + 0,230,230, 0, 0,220, 0, 0,228, 0, 0, 0,222,230,220,230, + 0, 0,220,230,220, 0,220,230,230,230,234,230, 0, 1, 1,230, + 234,214,220,202,230,230,230,230,230,232,228,228,220,218,230,233, + 220,230,220,230,230, 1, 1, 1, 1, 1,230, 0, 1, 1,230,220, + 230, 1, 1, 0, 0,218,228,232,222,224,224, 0, 8, 8, 0,220, + 0, 0,230, 0, 0, 26, 0, 0,220, 0,230,230, 1,220, 0, 0, + 230,220, 0, 0, 0,220,220, 0, 7, 9, 0, 6, 6, 0, 0, 0, + 0, 1, 0, 0,216,216, 1, 1, 1, 0, 0, 0,226,216,216, 0, + 0, 0, 1, 1, 0, 0,216,216,216, 0, 0,232,232,220,230,230, + 230, 7, 0, 1, 32, 48, 0, 84,118, 8, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 8, 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 32, 0, 0, 40, + 48, 0, 0, 56, 64, 72, 0, 0, 0, 0, 0, 0, 0, 80, 88, 0, + 0, 0, 96,104,112, 0,120, 0, 0, 0, 0,128, 0, 0, 0,136, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0,152, 0, 0, + 0, 0, 0, 0, 0,160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 16, 0, 12, 0, 12, 0, 0, 40, 44, 0, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 20, 56, 0, 0, 24, 24, 0, 0, 0, 0, 0, 0, 0, 60, 64, + 68, 28, 72, 76, 80, 84, 88, 92, 96,100,104,108,112,116,120, 0, + 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32,124, 0, 0, + 0, 0,128,132,136, 0,140,144,148,152,156,160, 8,164, 0, 0, + 168,172, 0, 0, 36,176, 4, 4,180, 4, 4,184,188,192, 0, 0, + 0, 0, 0, 0, 0,196,200, 28,204, 0, 0,208,212, 0, 32,216, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,220, 36, 0, 8, 16, + 0, 12, 0,224,228, 0,232,236, 0, 0, 0, 0, 0, 0, 12, 12, + 12, 12, 0, 0, 8, 0, 0, 0, 32, 36, 0, 0, 0, 44, 0, 0, + 28, 0, 0, 0, 0, 28, 0, 0, 0, 8, 0, 0, 4, 4, 0, 8, + 0, 0, 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 16, 8, 0, 0, + 24, 48, 0, 28, 0, 0, 0, 0, 60, 64, 0, 68, 0, 72, 76, 80, + 0, 0, 84, 88, 0, 92, 16, 8, 0, 0, 0, 4, 4, 16, 4, 4, + 4, 4, 4, 4, 4, 24, 20, 0, 96, 0, 16,100,104, 0, 4, 4, + 108, 0, 0, 0, 40,112, 8, 16, 4, 4, 4, 4, 4, 8,116,120, + 124,128, 0, 0, 4, 0, 4, 8, 0, 0, 24, 20,132, 36, 0, 28, + 0,136, 16, 4, 4, 4, 24, 12, 12,140,144, 12,148, 0,152, 8, + 4, 4, 0, 0,156, 0, 8, 8, 0, 24, 20, 8, 4, 0, 0,160, + 8, 8, 0, 0, 24, 20, 0, 8, 0, 8, 0, 0, 40, 12, 20, 16, + 4,164, 12, 20, 0,168,172,176, 0,180, 0, 24, 20, 0, 0, 0, + 0,184, 16, 8, 28, 8, 4, 4, 8, 0, 0, 40, 12, 48, 16, 0, + 0, 0, 8, 4, 4, 0, 0, 0, 40, 20, 0, 0, 32,188,192, 0, + 0, 0, 24, 20, 8, 0,196, 0, 0, 0, 19, 19, 19, 19, 20, 18, + 20, 18, 20, 18, 19, 19, 18, 20, 18, 20, 19, 19, 20, 18, 18, 20, + 18, 19, 19, 19, 19, 20, 19, 20, 18, 19, 19, 19, 19, 21, 19, 17, + 19, 19, 19, 20, 18, 20, 21, 19, 17, 19, 18, 19, 19, 19, 19, 19, + 19, 25, 19, 19, 19, 13, 22, 22, 22, 16, 16, 16, 19, 19, 19, 32, + 19, 19, 19, 38, 19, 37, 31, 29, 30, 19, 36, 19, 19, 19, 19, 19, + 19, 26, 19, 23, 19, 19, 15, 19, 19, 19, 28, 19, 19, 19, 19, 19, + 33, 19, 35, 34, 19, 34, 27, 19, 19, 19, 18, 12, 19, 19, 20, 18, + 24, 24, 24, 19, 23, 23, 19, 19, 14, 14, 14, 15, 15, 19, 20, 18, + 19, 21, 11, 20, 18, 19, 18, 22, 20, 18, 16, 20, 18, 20, 18, 19, + 19, 9, 8, 19, 19, 7, 10, 19, 19, 19, 19, 6, 19, 19, 20, 18, + 19, 20, 19, 19, 5, 19, 19, 19, 19, 4, 3, 4, 19, 19, 20, 18, + 2, 19, 19, 19, 1, 19, 19, 17, 19, 20, 18, 19, 20, 18, 0, 19, + 19, 19, 4, 5, 6, 7, 8, 1, 1, 1, 1, 1, 9, 2, 2, 10, + 0, 11, 12, 13, 14, 15, 16, 0, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 28, 29, 1, + 30, 31, 1, 32, 1, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, + 3, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 15, 10, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 2, 31, 32, 11, 11, 33, 34, 35, 36, 37, 38, 39, + 40, 10, 41, 42, 43, 6, 6, 44, 6, 6, 6, 45, 6, 6, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 38, 1, 1, 39, 1, 40, 1, 1, 1, 41, 0, 42, - 1, 1, 43, 1, 1, 1, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 20, 21, 8, 8, 8, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 2, 2, 51, 52, 53, 54, 9, 9, 9, 9, 9, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 8, 8, 70, - 71, 72, 73, 74, 75, 5, 5, 5, 5, 76, 5, 5, 5, 5, 5, 5, - 5, 15, 15, 5, 5, 5, 5, 77, 5, 78, 79, 80, 81, 82, 83, 1, - 84, 85, 86, 87, 88, 89, 90, 91, 5, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 92, 1, 1, 1, - 1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 93, 16, 16, 94, 95, 96, - 97, 98, 99,100,101,102,103,104,105, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 106, 0, 0, 1, 1,107,108,109, 13, 13, 13,110,111,112,113,114, - 115,116,117,118,119, 0,120,121,122,123,124,125,126, 17, 17,127, - 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,153,154, 0,155,156,157,158, - 0,159,160,161,162,163,164,165,166,167,168,169,170, 0,171,172, - 173, 7, 7, 7, 7, 7, 7, 7,174,175, 7,176, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 177, 4, 4, 4, 4, 4, 4, 4, 4,178, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4,179, 11, 11, 11, 11,180, 0, 0, - 0, 0, 0,181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 12, 12, 12, 12,182,183,184,185, 0, 0,186, 0,187,188,189, - 190, 3, 3, 3, 3, 3, 3, 14, 14, 14,191,192,193, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 194,195,196,197, 18, 18,198, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,199,200, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,201, 5, 5, 5,202,203, - 204, 5,205,206,207,208,209,210, 0,211,212,213, 5, 5,214, 5, - 215, 10, 10, 10, 10, 10,216, 0, 0, 0, 0, 0, 0, 0, 0,217, - 0,218,219,220, 0, 0,221, 0, 0, 0,222, 0,223, 0,224, 0, - 225,226,227,228, 0, 0, 0, 0, 0,229,230,231, 0,232,233, 0, - 0,234,235, 5,236,237, 0, 5, 5, 5, 5, 5, 5, 5,238, 5, - 239,240,241, 5, 5,242,243, 5,244, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,245, 1, - 1,246, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,247, 1, - 1, 1, 1, 1, 1, 1, 1, 1,248, 1, 1, 1, 1,249, 0, 0, - 0, 1, 1, 1, 1,250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1,251, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1,252, 0, 0, 0, 0, 0, 0, - 0,253, 0, 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 2, 2, 2, 13, 13, 13, 13, 12, 12, 12, 12, 0, 0, 0, - 0,136,136,136,136, 80, 80, 80, 80, 19, 19, 19, 19, 3, 3, 3, - 3, 63, 63, 63, 63, 39, 39, 39, 39, 28, 28, 28, 28,131,131,131, - 131, 79, 79, 79, 79, 1, 1, 1, 1,127,127,127,127, 6, 6, 6, - 6,155,155,155,155, 9, 9, 9, 9, 30, 30, 30, 30,139,139,139, - 139, 15, 15, 15, 15,110,110,110,110, 77, 77, 77, 77, 17, 17, 17, - 17, 27, 27, 27, 27, 33, 33, 33, 33,113,113,113,113, 49, 49, 49, - 49, 25, 25, 25, 25, 29, 29, 29, 29, 7, 7, 7, 7, 8, 8, 8, - 8, 32, 32, 32, 32, 99, 99, 99, 99, 31, 31, 31, 31,105,105,105, - 105, 55, 55, 55, 55, 62, 62, 62, 62, 56, 56, 56, 56, 91, 91, 91, - 91,119,119,119,119, 14, 14, 14, 14, 94, 94, 94, 94, 20, 20, 20, - 20,100,100,100,100,130,130,130,130,157,157,157,157,137,137,137, - 137, 97, 97, 97, 97,123,123,123,123,133,133,133,133,146,146,146, - 146, 84, 84, 84, 84,159,159,159,159,132,132,132,132, 4, 4, 4, - 4, 36, 36, 36, 36, 24, 24, 24, 24, 30, 30, 30, 2, 35, 35, 35, - 35, 40, 40, 40, 40,124,124,124,124,125,125,125,125,140,140,140, - 140, 37, 37, 37, 37, 58, 58, 58, 58, 0, 0, 2, 2, 75, 75, 75, - 75, 68, 68, 68, 68,114,114,114,114,163,163,163,163, 22, 22, 22, - 22, 23, 23, 23, 23, 76, 76, 76, 76, 0, 0, 0, 2, 26, 26, 26, - 26, 87, 87, 87, 87,135,135,135,135, 89, 89, 89, 89,141,141,141, - 141, 70, 70, 70, 70, 92, 92, 92, 92, 96, 96, 96, 96, 5, 5, 5, - 5, 18, 18, 18, 18, 48, 48, 48, 48, 85, 85, 85, 85,109,109,109, - 109,102,102,102,102,151,151,151,151, 16, 16, 16, 16, 0, 2, 2, - 2,165,165,165,165,108,108,108,108,171,171,171,171,142,142,142, - 142,150,150,150,150,134,134,134,134,138,138,138,138, 64, 64, 64, - 64, 90, 90, 90, 90, 21, 21, 21, 21, 93, 93, 93, 93, 61, 61, 61, - 61, 65, 65, 65, 65, 78, 78, 78, 78,126,126,126,126,154,154,154, - 154,121,121,121,121,166,166,166,166,167,167,167,167,152,152,152, - 152, 10, 10, 10, 10, 2, 0, 0, 0,104,104,104,104,170,170,170, - 170, 57, 57, 57, 57,107,107,107,107,175,175,175,175, 38, 38, 38, - 38, 73, 73, 73, 73, 86, 86, 86, 86, 67, 67, 67, 67, 59, 59, 59, - 59, 51, 51, 51, 51,161,161,161,161,144,144,144,144,143,143,143, - 143,172,172,172,172,174,174,174,174, 60, 60, 60, 60, 69, 69, 69, - 69, 47, 47, 47, 47,112,112,112,112,118,118,118,118,106,106,106, - 106,156,156,156,156,147,147,147,147,148,148,148,148,169,169,169, - 169,164,164,164,164,168,168,168,168, 11, 11, 11, 11, 74, 74, 74, - 74, 42, 42, 42, 42, 50, 50, 50, 50,116,116,116,116,111,111,111, - 111,115,115,115,115, 52, 52, 52, 52, 13, 13, 2, 2,120,120,120, - 120, 98, 98, 98, 98, 88, 88, 88, 88,117,117,117,117,101,101,101, - 101,103,103,103,103, 19, 19, 19, 0, 95, 95, 95, 95, 30, 30, 2, - 2, 34, 34, 34, 34, 54, 54, 54, 54, 0, 2, 0, 0, 71, 71, 71, - 71, 53, 53, 53, 53, 81, 81, 81, 81, 66, 66, 66, 66, 83, 83, 83, - 83,153,153,153,153,160,160,160,160, 2, 2, 22, 22, 30, 2, 30, - 30, 9, 9, 2, 2, 2, 2, 0, 0, 41, 41, 41, 41, 72, 72, 72, - 72,173,173,173,173, 82, 82, 82, 82,158,158,158,158,129,129,129, - 129,145,145,145,145, 2, 3, 3, 3, 23, 2, 23, 23, 16, 2, 16, - 16, 2, 2, 2, 0, 45, 45, 45, 45, 44, 44, 44, 44, 43, 43, 43, - 43,128,128,128,128,122,122,122,122,149,149,149,149, 0, 19, 19, - 19, 0, 0, 19, 0, 9, 2, 9, 9, 5, 2, 2, 5, 2, 10, 10, - 10, 10, 10, 2, 10, 2, 21, 21, 21, 21, 2, 2, 21, 22, 22, 22, - 2, 22, 22, 2, 2, 20, 2, 20, 20, 2, 30, 30, 30, 12, 12, 12, - 2, 19, 19, 19, 2, 2, 2, 12, 12,161,161, 2,161, 3, 3, 3, - 2,107, 2, 2,107, 2, 3, 2, 3, 19, 0, 0, 0, 2, 2, 9, - 9, 9, 9, 9, 2, 2, 4, 4, 4, 2, 11, 11, 11, 11, 11, 11, - 2, 11, 2, 11, 11, 10, 10, 2, 2, 22, 2, 22, 22, 2, 2, 2, - 22, 23, 23, 2, 2, 2, 36, 36, 36, 2, 2, 36, 36, 2, 25, 25, - 25, 46, 46, 46, 46, 31, 31, 2, 2, 91, 91, 2, 2, 1, 0, 0, - 0, 1, 1, 0, 0, 0, 17, 17, 17, 49, 49, 49, 2,161,161,161, - 2, 2,107,107,107,107, 2, 2, 2,171,171, 2,171, 0, 0, 2, - 0, 2, 3, 3, 2, 3, 2, 2, 3, 4, 4, 4, 2, 2, 14, 14, - 14, 14, 14, 14, 2, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, - 0, 37, 37, 37, 2, 3, 3, 2, 2, 2, 2, 2, 3, 2, 2, 5, - 5, 5, 5, 5, 2, 2, 2, 2, 11, 11, 2, 2, 11, 11, 11, 2, - 2, 10, 2, 10, 10, 21, 2, 21, 21, 21, 21, 2, 2, 22, 2, 2, - 2, 2, 16, 16, 16, 16, 16, 2, 2, 36, 36, 36, 2, 36, 2, 2, - 2, 18, 18, 18, 2, 18, 18, 2, 2, 25, 2, 25, 25, 8, 8, 2, - 8, 2, 8, 2, 2, 29, 29, 2, 2, 46, 2, 46, 46, 32, 2, 2, - 2, 1, 1, 2, 2, 1, 1, 1, 0, 19, 19, 9, 9, 2, 9, 2, - 9, 0, 0, 0, 19, 19, 2, 2, 2, 0, 0, 19, 19, 2, 2, 2, - 61, 15, 15, 15, 2, 17, 17, 17, 0, 2, 19, 19, 19, 75, 75, 2, - 2, 12, 2, 2, 2, 68, 68, 2, 2, 87, 87, 2, 2, 49, 49, 2, - 2, 50, 50, 2, 2, 2, 57, 57, 57, 57, 2, 2, 2,112,112,112, - 2, 2,122,122,122,130,130,130, 2,165,165, 2, 2,156,156, 2, - 2, 2, 2, 3, 3, 94, 94, 2, 2,129,129, 2,129,107, 2,107, - 107,123,123, 2, 2,102,102, 2, 2,126,126,126, 2,154,154,154, - 2, 2, 2,150,150,169,169, 2, 2,138,138,138, 2,138,138, 2, - 138,143,143, 2,143,163,163,163, 2,103,103, 2, 2,119,119, 2, - 119, 2, 2, 2, 99, 13, 13, 13, 2,136,136,136, 2,105, 2, 2, - 2, 0, 0, 0, 1, 56, 56, 56, 2,151,151, 2, 2, 3, 3, 2, - 3, 0, 0, 26, 26, 0, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, - 0, 9, 9, 2, 9, 9, 9, 55, 55, 6, 1, 1, 6, 2, 2, 2, - 14, 14, 2, 2, 2, 3, 3, 3, 1, 1, 1, 3, 3, 1, 3, 3, - 3, 37, 37, 2, 37, 2, 37, 37, 37, 38, 38, 2, 2, 64, 64, 64, - 2, 2, 64, 64, 64, 90, 90, 2, 2, 90, 90, 90, 2, 2, 2, 95, - 2, 3, 3, 0, 3, 7, 1, 1, 1, 1, 7, 7, 7, 0, 0, 7, - 7, 2, 5, 5, 5, 5, 2, 5, 5, 5, 2, 5, 2, 5, 5, 2, - 2, 2, 2, 2, 5, 5, 5, 2, 5, 2, 11, 11, 2, 2, 11, 2, - 2, 11, 2, 11, 2, 2, 2, 11, 11, 10, 2, 2, 2, 2, 2, 10, - 10, 21, 21, 2, 21, 2, 2, 21, 21, 2, 22, 22, 22, 2, 22, 22, - 2, 2, 23, 23, 2, 23, 23, 23, 2, 2, 2, 23, 23, 2, 2, 2, - 23, 2, 16, 16, 2, 16, 16, 16, 2, 2, 2, 16, 16, 2, 2, 20, - 20, 36, 36, 2, 36, 2, 36, 2, 2, 2, 2, 36, 2, 2, 2, 2, - 36, 36, 2, 36, 2, 2, 24, 24, 24, 24, 24, 24, 2, 2, 18, 18, - 2, 18, 2, 18, 18, 2, 18, 2, 18, 18, 2, 18, 2, 25, 2, 2, - 2, 25, 0, 0, 0, 0, 25, 25, 2, 8, 8, 8, 0, 30, 2, 2, - 2, 34, 2, 2, 2, 35, 35, 35, 0, 0, 0, 35, 35, 35, 2, 2, - 2, 45, 45, 2, 2, 2, 2, 2, 45, 44, 0, 0, 2, 32, 32, 0, - 0, 32, 0, 32, 32, 32, 32, 2, 2, 32, 32, 32, 2, 28, 28, 2, - 2, 48, 48, 48, 2, 48, 2, 2, 2, 52, 52, 2, 2, 52, 2, 2, - 2, 58, 58, 2, 2, 58, 58, 58, 2, 2, 2, 58, 58, 2, 2, 54, - 54, 91, 91, 91, 2, 91, 2, 2, 91, 62, 2, 62, 62, 2, 2, 2, - 70, 70, 70, 2, 2, 2, 70, 70, 70, 6, 6, 6, 2, 8, 8, 8, - 2, 2, 8, 8, 8, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, - 2, 9, 9, 9, 6, 19, 9, 9, 9, 9, 9, 19, 19, 9, 9, 9, - 19, 6, 19, 19, 19, 19, 19, 19, 9, 2, 9, 9, 9, 0, 19, 2, - 2, 1, 2, 2, 2, 0, 0, 9, 0, 2, 55, 55, 55, 61, 2, 2, - 2, 13, 13, 2, 13, 0, 13, 0, 13, 0, 13, 13, 13, 13, 13, 1, - 1, 1, 1, 12, 12, 2, 15, 15, 15, 2, 1, 1, 0, 0, 15, 15, - 15, 2, 26, 26, 26, 2, 12, 12, 12, 12, 12, 12, 0, 39, 2, 2, - 2, 39, 39, 39, 2, 60, 2, 2, 2, 2, 2, 75, 75, 69, 69, 0, - 69, 2, 2, 2, 74, 84, 84, 2, 0, 84, 84, 2, 2, 2, 2, 84, - 84, 33, 33, 33, 2, 68, 68, 68, 2, 92, 92, 92, 2, 2, 2, 2, - 92, 87, 87, 87, 2, 19, 9, 19, 19, 19, 19, 0, 0, 2, 2, 2, - 12, 2, 2, 2, 4, 14, 2, 14, 2, 14, 14, 2, 14, 14, 2, 14, - 14, 3, 3, 0, 0, 1, 1, 6, 6, 3, 2, 3, 3, 3, 2, 2, - 0, 0, 0, 17, 17, 17, 17, 0, 0, 2, 49, 49, 49, 49, 49, 2, - 49, 9, 2, 2, 2, 0, 1, 2, 2, 71, 2, 2, 2, 67, 2, 2, - 2, 2, 42, 42, 42, 41, 41, 41, 2,118,118,118, 2, 53, 53, 2, - 53, 59, 59, 2, 2, 2, 2, 2,104,161, 2, 2, 2,110,110,110, - 2,110,110, 2, 2, 19, 19, 2, 19, 19, 2, 19, 19, 47, 47, 2, - 2, 47, 2, 47, 47, 47, 47, 2, 47, 47, 2, 2, 2, 47, 2, 2, - 47, 81, 81, 2, 81,116,116,116, 2, 2, 2, 2,116,128,128,128, - 2,128,128, 2, 2, 2, 2, 2,128, 2, 2, 2, 66, 72, 72, 2, - 2, 2, 2, 2, 72,173,173, 2, 2, 2, 2, 97, 97, 2, 57, 57, - 2, 57, 57, 2, 2, 57, 57, 57, 2, 2, 2, 2, 57, 2, 2, 2, - 112, 78, 78, 2, 2, 2, 78, 78, 78, 83, 83, 2, 2, 82, 82, 82, - 2,122,122, 2, 2,122, 2, 2, 2, 89, 2, 2, 2, 2, 2,130, - 130,144,144, 2, 2, 2,165,165,165, 2, 2,165,165,156,156, 2, - 156, 3, 2, 2, 2,148,148, 2, 2,158,158, 2, 2,149,149,149, - 2, 2, 2, 94, 94, 2, 2, 2, 94, 85, 85, 85, 2, 2, 85, 2, - 2,101, 2, 2, 2,101,101, 2, 2, 96, 2, 96, 96,111,111,111, - 2,108,108, 2,108,108,108, 2, 2,129,129,129, 2,129, 2,129, - 129,129,129, 2, 2,109,109,109, 2,109,109, 2, 2,107,107, 2, - 1,107,107, 2, 2, 2, 2, 2,107, 2, 2,107,107, 2, 2,171, - 2,171, 2,171, 2, 2,171, 2,171,171,171,171, 2,171, 2, 2, - 2, 2,171,171, 2, 2,137,137,137,137,137, 2, 2,124,124, 2, - 2,114, 2, 2, 2,114,114, 2, 2, 2,126,126,126,125,125,125, - 2, 2, 2, 2,125, 2,154, 2, 2, 2,154,154, 2,154,154, 2, - 154,154, 2, 2,154,154,154, 2, 2,150, 2, 2, 2,140,140,140, - 2,121, 2, 2, 2, 7, 7, 2, 2,133, 2,133,133,133,133,133, - 2,133,133, 2, 2,133, 2, 2, 2, 2, 2,134,134, 2,134,134, - 134,134,134,134, 2, 2, 2,138, 2,138,138, 2, 2,143, 2,143, - 143,143,143,143, 2,143, 2, 2, 2,143,143, 2, 2,175,175, 2, - 2,145, 2, 2, 2,163, 2,163,163, 2, 2,163,163, 86, 2, 2, - 2, 63, 63, 2, 2, 63, 63, 63, 2, 63, 2, 2, 2,157,157,157, - 2, 80, 80, 2, 2, 80, 80, 80, 2,127,127,127, 2,166,166, 2, - 2, 79, 2, 2, 2,115,115,115, 2,115,115, 2, 2, 2, 2,115, - 115,159,159,159, 2,159,159, 2, 2,119,119, 2, 2, 2,119,119, - 119,167,167, 2, 2,146,146,146, 2,172, 2, 2,172, 99, 99, 99, - 2,136,139, 13, 13,155, 2, 2, 2,155,155, 2, 2, 2, 2, 2, - 155, 2, 17, 17, 17, 2, 17, 17, 2, 17, 15, 15, 15, 17, 17, 17, - 2, 2, 2, 15, 2, 2, 17, 2, 2,105,105,105, 2,105,105, 2, - 2, 1, 1, 1, 2, 0, 1, 1, 1, 0, 0, 1, 1, 2, 2, 0, - 2, 2, 0, 0, 2, 0, 2, 0, 2, 2, 2, 2,131, 2,131,131, - 131, 56, 2, 2, 56, 56, 56, 2, 56, 56, 2, 56, 56, 6, 6, 2, - 2, 2, 2, 2, 6,151, 2, 2, 2, 2, 2,151,151,160,160,160, - 2,152,152, 2, 2, 2, 2, 2,152,164,164, 2, 2,168,168,168, - 2, 2, 2, 2,168,174,174,174, 2,174,174, 2, 2, 2, 2,174, - 174, 2, 30, 30, 2,113, 2, 2,113,113,113,113, 2,132,132, 2, - 2, 2, 2,132,132, 2, 2, 3, 2, 3, 2, 3, 2, 15, 0, 0, - 2, 0, 2, 2, 0, 13, 2, 2, 2, 2, 0, 2, 2, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 10, 0, 11, 12, 13, 0, - 0, 0, 14, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, - 0, 0, 0, 0, 0, 19, 20, 21, 0, 22, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 1, 1, 7, 7, 7, 7, 56, 57, 58, 59, 60, 61, 62, 63, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100,101,102, 8, 8, 8,103, 8,104,105, 0, 0, 0, 0, 0, 0, + 0, 0,106, 5, 5, 5, 5,107, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5,108, 12, 12,109, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,110, 0, 0, 0, 0, 0, 0, 13, 13,111,112, 0, + 113,114,115, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,116,117, + 118, 9, 9, 9,119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,120,121,122,123, 0, 0, 0, 0, 0, 0, 0, 0, 0,124, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,125, + 6,126,127,128,129,130,131,132,133,134,135, 14, 14,136,137, 0, + 0, 0,138,139,140,141, 0,142,143,144,145,146,147, 0, 0,148, + 149,150, 0,151,152,153, 6, 6, 6,154,155,156, 6,157,158, 0, + 0, 0, 0, 1, 1, 1, 1, 1, 1,159, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,160, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1,161, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,162, 1, + 1,163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,164, 0, 0, + 0, 0, 0, 1, 1, 1,165, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1,166, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,167, + 0, 0, 0,168,169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 13, 13, + 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12,178,178,178,178,178, + 178,178,178, 0, 0, 0, 0, 0, 0, 0, 0,136,136,136,136,136, + 136,136,136, 80, 80, 80, 80, 80, 80, 80, 80, 19, 19, 19, 19, 19, + 19, 19, 19, 63, 63, 63, 63, 63, 63, 63, 63, 3, 3, 3, 3, 3, + 3, 3, 3, 39, 39, 39, 39, 39, 39, 39, 39,176,176,176,176,176, + 176,176,176, 28, 28, 28, 28, 28, 28, 28, 28, 79, 79, 79, 79, 79, + 79, 79, 79,131,131,131,131,131,131,131,131, 1, 1, 1, 1, 1, + 1, 1, 1,127,127,127,127,127,127,127,127, 6, 6, 6, 6, 6, + 6, 6, 6,155,155,155,155,155,155,155,155,139,139,139,139,139, + 139,139,139, 9, 9, 9, 9, 9, 9, 9, 9, 15, 15, 15, 15, 15, + 15, 15, 15, 30, 30, 30, 30, 30, 30, 30, 30,110,110,110,110,110, + 110,110,110, 77, 77, 77, 77, 77, 77, 77, 77, 17, 17, 17, 17, 17, + 17, 17, 17, 27, 27, 27, 27, 27, 27, 27, 27, 33, 33, 33, 33, 33, + 33, 33, 33,113,113,113,113,113,113,113,113, 49, 49, 49, 49, 49, + 49, 49, 49, 25, 25, 25, 25, 25, 25, 25, 25, 29, 29, 29, 29, 29, + 29, 29, 29,177,177,177,177,177,177,177,177, 7, 7, 7, 7, 7, + 7, 7, 7, 32, 32, 32, 32, 32, 32, 32, 32, 8, 8, 8, 8, 8, + 8, 8, 8, 99, 99, 99, 99, 99, 99, 99, 99, 31, 31, 31, 31, 31, + 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 2,105,105,105,105,105, + 105,105,105, 55, 55, 55, 55, 55, 55, 55, 55, 62, 62, 62, 62, 62, + 62, 62, 62, 0, 0, 0, 0, 2, 2, 2, 2, 56, 56, 56, 56, 56, + 56, 56, 56, 91, 91, 91, 91, 91, 91, 91, 91,100,100,100,100,100, + 100,100,100,119,119,119,119,119,119,119,119, 14, 14, 14, 14, 14, + 14, 14, 14,130,130,130,130,130,130,130,130, 94, 94, 94, 94, 94, + 94, 94, 94,157,157,157,157,157,157,157,157,137,137,137,137,137, + 137,137,137,146,146,146,146,146,146,146,146, 4, 4, 4, 4, 4, + 4, 4, 4, 20, 20, 20, 20, 20, 20, 20, 20, 35, 35, 35, 35, 35, + 35, 35, 35, 84, 84, 84, 84, 84, 84, 84, 84, 40, 40, 40, 40, 40, + 40, 40, 40, 97, 97, 97, 97, 97, 97, 97, 97,124,124,124,124,124, + 124,124,124,123,123,123,123,123,123,123,123,125,125,125,125,125, + 125,125,125,140,140,140,140,140,140,140,140,159,159,159,159,159, + 159,159,159,132,132,132,132,132,132,132,132, 37, 37, 37, 37, 37, + 37, 37, 37, 22, 22, 22, 22, 22, 22, 22, 22, 24, 24, 24, 24, 24, + 24, 24, 24, 58, 58, 58, 58, 58, 58, 58, 58, 76, 76, 76, 76, 76, + 76, 76, 76, 0, 0, 0, 0, 0, 0, 2, 2, 26, 26, 26, 26, 26, + 26, 26, 26, 75, 75, 75, 75, 75, 75, 75, 75, 89, 89, 89, 89, 89, + 89, 89, 89,114,114,114,114,114,114,114,114,141,141,141,141,141, + 141,141,141,133,133,133,133,133,133,133,133,163,163,163,163,163, + 163,163,163, 70, 70, 70, 70, 70, 70, 70, 70, 0, 0, 0, 0, 0, + 2, 2, 2, 68, 68, 68, 68, 68, 68, 68, 68, 92, 92, 92, 92, 92, + 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 0, 0, 0, 0, 0, + 0, 0, 2,135,135,135,135,135,135,135,135, 85, 85, 85, 85, 85, + 85, 85, 85, 96, 96, 96, 96, 96, 96, 96, 96,109,109,109,109,109, + 109,109,109,102,102,102,102,102,102,102,102, 64, 64, 64, 64, 64, + 64, 64, 64, 0, 0, 2, 2, 2, 2, 2, 2, 61, 61, 61, 61, 61, + 61, 61, 61, 65, 65, 65, 65, 65, 65, 65, 65,108,108,108,108,108, + 108,108,108,142,142,142,142,142,142,142,142,121,121,121,121,121, + 121,121,121,166,166,166,166,166,166,166,166,167,167,167,167,167, + 167,167,167,151,151,151,151,151,151,151,151,152,152,152,152,152, + 152,152,152, 38, 38, 38, 38, 38, 38, 38, 38, 90, 90, 90, 90, 90, + 90, 90, 90, 23, 23, 23, 23, 23, 23, 23, 23, 36, 36, 36, 36, 36, + 36, 36, 36, 30, 2, 30, 30, 30, 30, 2, 2, 48, 48, 48, 48, 48, + 48, 48, 48, 93, 93, 93, 93, 93, 93, 93, 93, 73, 73, 73, 73, 73, + 73, 73, 73, 9, 9, 9, 9, 9, 9, 2, 2, 86, 86, 86, 86, 86, + 86, 86, 86, 2, 0, 0, 0, 0, 0, 0, 0, 67, 67, 67, 67, 67, + 67, 67, 67, 51, 51, 51, 51, 51, 51, 51, 51,104,104,104,104,104, + 104,104,104,170,170,170,170,170,170,170,170, 78, 78, 78, 78, 78, + 78, 78, 78,144,144,144,144,144,144,144,144,165,165,165,165,165, + 165,165,165,171,171,171,171,171,171,171,171,126,126,126,126,126, + 126,126,126,150,150,150,150,150,150,150,150,134,134,134,134,134, + 134,134,134,138,138,138,138,138,138,138,138,175,175,175,175,175, + 175,175,175, 18, 18, 18, 18, 18, 18, 18, 18, 0, 0, 0, 0, 0, + 2, 0, 0, 13, 13, 13, 13, 13, 13, 2, 2, 60, 60, 60, 60, 60, + 60, 60, 60, 69, 69, 69, 69, 69, 69, 69, 69,118,118,118,118,118, + 118,118,118, 59, 59, 59, 59, 59, 59, 59, 59,106,106,106,106,106, + 106,106,106,156,156,156,156,156,156,156,156,147,147,147,147,147, + 147,147,147,148,148,148,148,148,148,148,148,169,169,169,169,169, + 169,169,169,172,172,172,172,172,172,172,172,164,164,164,164,164, + 164,164,164,168,168,168,168,168,168,168,168,174,174,174,174,174, + 174,174,174, 0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, 0, + 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 21, 21, 21, 21, 21, + 21, 21, 21, 16, 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, + 12, 12, 2, 74, 74, 74, 74, 74, 74, 74, 74, 42, 42, 42, 42, 42, + 42, 42, 42, 50, 50, 50, 50, 50, 50, 50, 50,161,161,161,161,161, + 161,161,161, 47, 47, 47, 47, 47, 47, 47, 47,120,120,120,120,120, + 120,120,120,116,116,116,116,116,116,116,116, 98, 98, 98, 98, 98, + 98, 98, 98, 57, 57, 57, 57, 57, 57, 57, 57, 88, 88, 88, 88, 88, + 88, 88, 88,117,117,117,117,117,117,117,117,112,112,112,112,112, + 112,112,112,101,101,101,101,101,101,101,101,111,111,111,111,111, + 111,111,111,154,154,154,154,154,154,154,154,143,143,143,143,143, + 143,143,143,115,115,115,115,115,115,115,115, 0, 0, 19, 0, 0, + 0, 0, 0, 95, 95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 11, 11, + 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 22, 22, 22, 2, 2, + 2, 22, 22, 2, 25, 25, 25, 25, 25, 25, 25, 34, 34, 34, 34, 34, + 34, 34, 34, 52, 52, 52, 52, 52, 52, 52, 52, 54, 54, 54, 54, 54, + 54, 54, 54, 0, 0, 0, 2, 2, 2, 2, 2, 2, 30, 30, 30, 30, + 30, 30, 2, 2, 2, 12, 12, 12, 12, 12, 12, 71, 71, 71, 71, 71, + 71, 71, 71, 41, 41, 41, 41, 41, 41, 41, 41, 53, 53, 53, 53, 53, + 53, 53, 53, 81, 81, 81, 81, 81, 81, 81, 81, 66, 66, 66, 66, 66, + 66, 66, 66, 72, 72, 72, 72, 72, 72, 72, 72,173,173,173,173,173, + 173,173,173, 83, 83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, + 82, 82, 82,158,158,158,158,158,158,158,158,153,153,153,153,153, + 153,153,153,145,145,145,145,145,145,145,145,103,103,103,103,103, + 103,103,103, 0, 2, 2, 2, 2, 2, 2, 2,160,160,160,160,160, + 160,160,160, 2, 3, 3, 2, 3, 2, 2, 3, 3, 3, 3, 2, 3, + 3, 3, 3, 19, 19, 19, 19, 19, 19, 19, 0, 3, 3, 3, 3, 3, + 0, 3, 3, 5, 5, 5, 5, 5, 2, 2, 5, 11, 11, 11, 2, 2, + 2, 2, 11, 10, 10, 10, 10, 10, 10, 2, 10, 21, 21, 21, 21, 21, + 2, 2, 21, 22, 2, 22, 22, 22, 22, 2, 2, 23, 23, 23, 23, 23, + 2, 23, 23, 23, 2, 23, 23, 23, 23, 23, 23, 16, 16, 16, 16, 16, + 2, 16, 16, 16, 2, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 20, + 2, 20, 20, 20, 2, 20, 20, 20, 20, 20, 20, 36, 36, 36, 36, 36, + 36, 36, 2, 25, 25, 25, 25, 25, 2, 25, 25, 8, 8, 8, 8, 8, + 8, 2, 8, 2, 2, 2, 2, 2, 8, 2, 2, 29, 29, 29, 29, 29, + 29, 2, 2, 45, 45, 45, 45, 45, 45, 45, 45, 44, 44, 44, 44, 44, + 44, 44, 44, 43, 43, 43, 43, 43, 43, 43, 43, 31, 31, 2, 2, 2, + 2, 2, 2, 48, 48, 48, 48, 2, 2, 2, 2, 91, 91, 2, 2, 2, + 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 9, 9, + 2, 9, 9, 9, 9, 9, 9, 9, 9, 9, 2, 0, 0, 0, 0, 2, + 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 61, 0, 17, 17, 17, 17, + 17, 17, 17, 12, 12, 12, 12, 2, 2, 2, 2, 13, 13, 2, 2, 2, + 2, 2, 2, 19, 19, 19, 19, 19, 19, 19, 2, 0, 0, 0, 2, 0, + 0, 0, 0, 49, 49, 49, 49, 49, 49, 2, 2, 0, 0, 0, 0, 2, + 2, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0,135,135,135,135, 2, + 2, 2, 2,161,161,161, 2,161,161,161,161,161,161, 2,161,161, + 161,161,161,128,128,128,128,128,128,128,128, 57, 2, 2, 2, 2, + 2, 2, 2,112,112,112,112,112,112,112, 2,122,122,122,122,122, + 122,122,122,130,130,130, 2, 2, 2, 2, 2,165,165,165,165,165, + 165, 2, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, + 3, 3, 3,149,149,149,149,149,149,149,149, 94, 94, 94, 94, 94, + 94, 2, 2,129,129,129,129,129,129,129,129,107,107,107,107,107, + 2, 2,107,107,107,107,107,107,107,107,107,107,107,107,107,107, + 2, 2, 2,171,171,171,171,171,171, 2,171,123,123,123,123,123, + 123, 2, 2,102,102, 2, 2, 2, 2, 2, 2,154,154,154,154,154, + 154,154, 2, 2, 2,150,150,150,150,150,150,169,169, 2, 2, 2, + 2, 2, 2,138,138,138,138,138,138,138, 2,103,103,103,103,103, + 103, 2, 2,119,119, 2,119,119,119,119,119, 13, 13, 13, 13, 13, + 13, 13, 2, 17, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 2, 0, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, + 2, 2, 2, 19, 0, 0, 0, 0, 0, 0, 0, 19, 19, 19, 19, 19, + 0, 0, 0, 0, 0, 26, 26, 0, 0, 0, 0, 9, 9, 9, 9, 0, + 9, 9, 9, 2, 2, 9, 9, 9, 9, 0, 9, 2, 2, 2, 2, 9, + 0, 9, 0, 9, 9, 9, 2, 9, 2, 9, 9, 9, 9, 2, 9, 9, + 9, 9, 9, 9, 9, 55, 55, 55, 55, 55, 55, 6, 6, 6, 6, 6, + 1, 1, 6, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 2, 2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 2, 2, 2, + 2, 2, 2, 14, 14, 14, 2, 2, 2, 2, 14, 14, 14, 14, 14, 14, + 2, 2, 2, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0, 3, + 3, 3, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 3, + 3, 3, 3, 37, 37, 37, 37, 37, 37, 2, 37, 37, 37, 37, 2, 2, + 37, 37, 37, 38, 38, 2, 2, 2, 2, 2, 2, 64, 64, 64, 2, 2, + 64, 64, 64, 90, 90, 90, 90, 90, 90, 2, 2, 90, 90, 90, 90, 90, + 90, 90, 2, 95, 95, 95, 95, 2, 2, 95, 2, 37, 37, 37, 2, 2, + 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 3, 3, 3, 0, 3, 3, + 3, 3, 3, 7, 1, 1, 1, 1, 7, 7, 7, 7, 7, 7, 7, 0, + 0, 7, 7, 5, 5, 5, 5, 2, 5, 5, 5, 5, 2, 2, 5, 5, + 5, 5, 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, 2, 5, 2, 2, + 2, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, 5, 2, 2, 5, 5, + 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, 2, 5, + 5, 2, 5, 5, 5, 5, 5, 2, 2, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 2, 2, 11, 11, 11, 2, 11, 11, 11, 11, 2, 2, 11, 11, + 11, 11, 11, 11, 2, 11, 11, 11, 11, 11, 11, 11, 2, 11, 11, 2, + 11, 11, 2, 11, 11, 2, 2, 11, 2, 11, 11, 11, 2, 2, 11, 11, + 11, 2, 2, 2, 11, 2, 2, 2, 2, 2, 2, 2, 11, 11, 11, 11, + 2, 11, 2, 2, 2, 2, 2, 2, 2, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 2, 2, 10, 10, 10, 2, 10, 10, 10, 10, 10, 2, 10, 10, + 10, 10, 10, 10, 2, 10, 10, 10, 10, 10, 10, 10, 2, 10, 10, 2, + 10, 10, 10, 10, 10, 2, 2, 10, 10, 10, 10, 10, 10, 2, 10, 10, + 10, 2, 2, 10, 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, 2, + 2, 10, 10, 10, 10, 2, 2, 2, 2, 2, 2, 2, 10, 10, 10, 10, + 10, 10, 10, 2, 21, 21, 21, 2, 21, 21, 21, 21, 2, 2, 21, 21, + 21, 21, 21, 21, 2, 21, 21, 21, 21, 21, 21, 21, 2, 21, 21, 2, + 21, 21, 21, 21, 21, 2, 2, 21, 21, 21, 21, 21, 2, 2, 21, 21, + 21, 2, 2, 2, 2, 2, 21, 21, 21, 21, 21, 2, 2, 2, 2, 21, + 21, 2, 21, 21, 21, 21, 21, 2, 2, 21, 21, 2, 2, 22, 22, 2, + 22, 22, 22, 2, 22, 22, 2, 22, 2, 22, 22, 2, 2, 2, 22, 22, + 2, 2, 2, 22, 22, 2, 2, 2, 2, 22, 22, 22, 2, 2, 2, 2, + 2, 2, 22, 2, 2, 2, 2, 2, 2, 22, 22, 22, 22, 22, 2, 2, + 2, 2, 2, 23, 23, 2, 2, 23, 23, 23, 23, 23, 2, 23, 23, 23, + 23, 2, 2, 2, 2, 2, 2, 2, 23, 23, 2, 23, 23, 23, 2, 23, + 23, 2, 2, 23, 23, 23, 23, 2, 2, 23, 23, 2, 2, 2, 2, 2, + 2, 2, 23, 16, 16, 16, 16, 2, 16, 16, 16, 16, 16, 2, 2, 16, + 16, 16, 16, 16, 2, 16, 16, 16, 16, 2, 2, 2, 2, 2, 2, 2, + 16, 16, 2, 2, 2, 2, 2, 16, 16, 16, 2, 16, 16, 16, 16, 2, + 2, 16, 16, 2, 16, 16, 16, 2, 2, 2, 2, 2, 2, 2, 2, 20, + 20, 20, 20, 20, 20, 20, 20, 2, 2, 20, 20, 2, 36, 36, 36, 2, + 36, 36, 36, 2, 2, 36, 36, 36, 36, 36, 36, 36, 36, 2, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 2, 36, 2, 2, 2, 2, 36, 2, 2, + 2, 2, 36, 36, 36, 36, 36, 36, 2, 36, 2, 2, 2, 2, 2, 2, + 2, 36, 36, 2, 2, 36, 36, 36, 2, 2, 2, 2, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 2, 2, 2, 2, 0, 24, 24, 24, 24, 2, + 2, 2, 2, 2, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, 2, 18, + 18, 18, 18, 18, 18, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, 18, + 18, 2, 2, 18, 18, 18, 18, 18, 2, 18, 2, 18, 18, 18, 18, 18, + 18, 18, 2, 18, 18, 2, 2, 18, 18, 18, 18, 25, 25, 25, 25, 25, + 2, 2, 2, 25, 25, 25, 25, 25, 0, 0, 0, 0, 25, 25, 2, 2, + 2, 2, 2, 8, 8, 8, 0, 8, 8, 8, 8, 30, 30, 30, 2, 2, + 30, 30, 30, 30, 30, 30, 30, 30, 2, 2, 2, 30, 30, 2, 2, 2, + 2, 2, 2, 34, 34, 34, 34, 34, 2, 2, 2, 35, 35, 35, 0, 0, + 0, 35, 35, 35, 2, 2, 2, 2, 2, 2, 2, 45, 45, 45, 45, 45, + 45, 2, 2, 2, 2, 2, 2, 2, 2, 2, 45, 44, 44, 44, 44, 44, + 0, 0, 2, 43, 43, 43, 43, 2, 2, 2, 2, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 2, 46, 46, 46, 2, 46, 46, 2, + 2, 2, 2, 31, 31, 31, 31, 31, 31, 2, 2, 32, 32, 0, 0, 32, + 0, 32, 32, 32, 32, 2, 2, 2, 2, 2, 2, 32, 2, 2, 2, 2, + 2, 2, 2, 32, 32, 32, 2, 2, 2, 2, 2, 28, 28, 28, 28, 28, + 28, 2, 2, 48, 48, 48, 48, 48, 48, 48, 2, 48, 2, 2, 2, 48, + 48, 48, 48, 52, 52, 52, 52, 52, 52, 2, 2, 52, 52, 52, 52, 52, + 2, 2, 2, 58, 58, 58, 58, 2, 2, 2, 2, 58, 58, 2, 2, 2, + 2, 2, 2, 58, 58, 58, 2, 2, 2, 58, 58, 54, 54, 54, 54, 2, + 2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 2, 91, 91, 91, 91, 91, + 2, 2, 91, 91, 91, 91, 91, 91, 91, 2, 2, 62, 62, 62, 62, 62, + 2, 62, 62, 93, 93, 93, 93, 2, 2, 2, 2, 2, 2, 2, 2, 93, + 93, 93, 93, 2, 2, 2, 70, 70, 70, 70, 70, 70, 70, 2, 2, 2, + 70, 70, 70, 6, 6, 6, 2, 2, 2, 2, 2, 8, 8, 8, 2, 2, + 8, 8, 8, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, + 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 1, 1, 0, 2, 2, 2, 2, 2, 19, 19, 19, 19, 19, + 19, 9, 9, 9, 9, 9, 6, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 9, 9, 9, 9, 9, 19, 19, 19, 19, 9, 9, 9, 9, 9, 19, 19, + 19, 19, 19, 6, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 9, 2, 9, 2, 9, 2, 9, 2, 9, 9, 9, 9, 9, 2, + 2, 9, 9, 9, 9, 9, 9, 2, 9, 9, 9, 2, 2, 9, 9, 9, + 2, 9, 9, 0, 0, 0, 0, 1, 1, 0, 0, 0, 19, 2, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 19, 0, 0, 0, 2, 2, 2, 2, 55, 55, 55, 55, 2, + 2, 2, 2, 2, 55, 55, 55, 55, 55, 55, 55, 61, 2, 2, 2, 2, + 2, 2, 2, 13, 13, 2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 2, + 2, 2, 2, 0, 0, 0, 0, 0, 13, 0, 13, 0, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 1, 1, 1, 1, 12, 12, 13, 13, 13, 13, 0, + 0, 0, 0, 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 2, 2, 1, 1, 0, 0, 15, 15, 15, 17, 17, 17, 0, 0, + 17, 17, 17, 2, 2, 2, 2, 2, 26, 26, 26, 2, 12, 12, 12, 12, + 12, 12, 12, 2, 2, 2, 2, 2, 2, 2, 0, 12, 12, 12, 12, 12, + 12, 12, 0, 17, 17, 17, 17, 17, 17, 17, 0, 39, 39, 39, 39, 39, + 2, 2, 2, 39, 39, 39, 39, 39, 39, 39, 2, 77, 77, 77, 77, 2, + 2, 2, 2, 0, 0, 19, 19, 19, 19, 19, 19, 0, 0, 0, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 2, 2, 2, 2, 19, 2, 2, + 2, 2, 2, 2, 19, 19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, + 2, 2, 2, 75, 75, 75, 75, 75, 75, 2, 2, 2, 2, 2, 2, 2, + 2, 75, 75, 75, 75, 2, 2, 2, 2, 2, 2, 69, 69, 69, 69, 69, + 69, 0, 69, 74, 74, 74, 74, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 74, 12, 12, 12, 12, 12, 2, 2, 2, 84, 84, 84, 84, 84, + 84, 2, 0, 84, 84, 2, 2, 2, 2, 84, 84, 33, 33, 33, 33, 33, + 33, 33, 2, 68, 68, 68, 68, 68, 68, 68, 2, 68, 68, 68, 68, 68, + 68, 2, 2, 68, 68, 2, 2, 68, 68, 68, 68, 92, 92, 92, 2, 2, + 2, 2, 2, 2, 2, 2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, + 87, 87, 2, 19, 19, 19, 0, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 9, 19, 19, 19, 19, 0, 0, 19, 19, 2, 2, 87, 87, 87, 87, 87, + 87, 2, 2, 87, 87, 2, 2, 2, 2, 2, 2, 2, 2, 2, 12, 12, + 12, 12, 12, 2, 2, 2, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 2, 14, 14, 14, 14, 14, + 2, 14, 2, 14, 14, 2, 14, 14, 2, 14, 14, 3, 3, 3, 3, 3, + 3, 0, 0, 1, 1, 1, 1, 1, 1, 6, 6, 3, 3, 3, 3, 3, + 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, + 0, 17, 17, 17, 17, 17, 17, 17, 17, 0, 0, 2, 2, 12, 12, 12, + 2, 2, 2, 2, 0, 0, 0, 0, 0, 2, 2, 49, 49, 49, 49, 2, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 2, 49, 49, 49, 2, 49, + 49, 2, 49, 49, 49, 49, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, + 2, 2, 0, 9, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, + 1, 2, 2, 71, 71, 71, 71, 71, 2, 2, 2, 67, 2, 2, 2, 2, + 2, 2, 2, 42, 42, 42, 42, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 42, 42, 42, 41, 41, 41, 2, 2, 2, 2, 2,118,118,118, 2, 2, + 2, 2, 2, 53, 53, 53, 53, 53, 53, 2, 53, 59, 59, 59, 59, 2, + 2, 2, 2, 59, 59, 59, 59, 59, 59, 2, 2, 50, 50, 50, 50, 50, + 50, 2, 2, 50, 50, 2, 2, 2, 2, 2, 2,104,104,104,104, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,104,161,161,161, 2,161, + 161, 2,161,161,161, 2,161,161, 2, 2, 2,170,170,170,170, 2, + 2, 2, 2,110,110,110,110,110,110,110, 2,110,110,110,110,110, + 110, 2, 2, 19, 19, 19, 19, 19, 19, 2, 19, 19, 2, 19, 19, 19, + 19, 19, 19, 47, 47, 47, 47, 47, 47, 2, 2, 47, 2, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 2, 47, 47, 2, 2, 2, 47, + 2, 2, 47, 81, 81, 81, 81, 81, 81, 2, 81,116,116,116,116,116, + 116,116, 2, 2, 2, 2, 2, 2, 2, 2,116,128,128,128, 2,128, + 128, 2, 2, 2, 2, 2,128,128,128,128,128, 66, 66, 66, 66, 2, + 2, 2, 66, 72, 72, 2, 2, 2, 2, 2, 72,173,173, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 97, 97, 97, 97, 2, 2, 97, 97, 97, + 97, 97, 97, 57, 57, 57, 57, 2, 57, 57, 2, 2, 2, 2, 2, 57, + 57, 57, 57, 57, 57, 57, 57, 2, 57, 57, 57, 2, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 2, 2, 57, 57, 57, 2, 2, + 2, 2, 57, 2, 2, 2,112,112,112,112,112, 78, 78, 78, 78, 78, + 78, 2, 2, 2, 78, 78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, + 83, 2, 2, 82, 82, 82, 2, 2, 2, 2, 2,122,122, 2, 2, 2, + 2, 2, 2, 2,122,122,122,122, 2, 2, 2, 2,122,122,122,122, + 122,122,122, 89, 2, 2, 2, 2, 2, 2, 2, 2, 2,130,130,130, + 130,130,130,144,144, 2, 2, 2, 2, 2, 2, 2,165,165,165,165, + 165,165,165, 2, 2, 2, 2, 2, 2,165,165,156,156, 2,156,156, + 156, 2, 2,156,156, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, + 3, 3, 3,148,148, 2, 2, 2, 2, 2, 2,158,158, 2, 2, 2, + 2, 2, 2,153,153,153,153, 2, 2, 2, 2,149,149,149,149,149, + 149,149, 2, 2, 2, 94, 94, 94, 94, 94, 94, 2, 2, 2, 2, 2, + 2, 2, 94, 85, 85, 85, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 85, 2, 2,101, 2, 2, 2, 2, 2, 2, 2,101,101, 2, 2, 2, + 2, 2, 2, 96, 96, 96, 96, 96, 2, 96, 96,111,111,111,111,111, + 111,111, 2, 2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 2, 2, 2,108,108, 2,108,108,108,108,108,108,108, 2, 2, 2, + 2, 2, 2,129,129,129,129,129,129,129, 2,129, 2,129,129,129, + 129, 2,129,129,129,129,129,129,129, 2,129,129,129, 2, 2, 2, + 2, 2, 2,109,109,109, 2, 2, 2, 2, 2,109,109, 2, 2, 2, + 2, 2, 2,107,107,107,107, 2,107,107,107,107, 2, 2,107,107, + 107,107,107,107, 2,107,107,107,107,107,107,107, 2,107,107, 2, + 107,107,107,107,107, 2, 1,107,107,107,107,107, 2, 2,107,107, + 107, 2, 2,107, 2, 2, 2, 2, 2, 2,107, 2, 2, 2, 2, 2, + 107,107,107,107,107,107,107, 2, 2,107,107,171,171, 2,171, 2, + 2,171, 2,171, 2,171, 2, 2,171, 2,171,171,171,171, 2,171, + 171,171,171,171, 2, 2, 2, 2, 2, 2, 2, 2,171,171, 2, 2, + 2, 2, 2,137,137,137,137, 2,137,137,137,137,137, 2, 2, 2, + 2, 2, 2,124,124, 2, 2, 2, 2, 2, 2,114,114,114,114,114, + 2, 2, 2,114,114, 2, 2, 2, 2, 2, 2, 32, 32, 32, 32, 32, + 2, 2, 2, 33, 33, 33, 33, 2, 2, 2, 2,126,126,126, 2, 2, + 126,126,126,126,126,126,126, 2, 2, 2, 2,126,126,126,126,126, + 126,126, 2,142,142,142,142, 2, 2, 2, 2,125,125,125, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,125, 2,154, 2, 2,154, + 154,154,154,154,154,154,154, 2,154,154, 2,154,154,154,154,154, + 154, 2,154,154, 2, 2,154,154,154,154,154,154,154, 2, 2, 2, + 2, 2, 2,150,150,150,150,150, 2, 2, 2,140,140,140, 2, 2, + 2, 2, 2,121, 2, 2, 2, 2, 2, 2, 2, 7, 7, 7, 2, 2, + 2, 2, 2,133, 2,133,133,133,133,133,133,133,133,133,133,133, + 133,133, 2,133,133,133,133,133,133, 2, 2,133,133,133,133,133, + 2, 2, 2, 2, 2,134,134,134,134,134,134, 2,134,134,134,134, + 134,134,134,134,134,134,134,134,134,134, 2,138,138, 2,138,138, + 138,138,138, 2, 2,138, 2,138,138, 2,138,138,138, 2, 2, 2, + 2, 2, 2,143,143,143,143,143,143, 2,143,143, 2,143,143,143, + 143,143,143,143,143,143,143,143,143,143, 2,143,143, 2,143,143, + 143,143,143,143, 2, 2, 2, 2, 2, 2, 2,143,143, 2, 2, 2, + 2, 2, 2,175,175,175,175, 2, 2, 2, 2,175,175, 2, 2, 2, + 2, 2, 2, 5, 5, 2, 2, 2, 2, 2, 2,145, 2, 2, 2, 2, + 2, 2, 2,163, 2,163,163,163,163,163,163,163,163,163, 2, 2, + 2,163,163,163,163,163, 2, 2, 2, 2, 2, 86, 2, 2, 2, 2, + 2, 2, 2, 22, 22, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 22, 63, 63, 2, 2, 2, 2, 2, 2, 63, 63, 63, 63, 2, + 2, 2, 2,177,177,177,177, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 2,157,157,157, 2, 2, 2, 2, 2, 80, 80, 80, 80, 80, + 80, 2, 2, 80, 80, 80, 2, 2, 2, 2, 2,127,127,127,127,127, + 127,127, 2,166,166, 2, 2, 2, 2, 2, 2, 79, 2, 2, 2, 2, + 2, 2, 2,115,115,115,115,115,115,115, 2,115,115, 2, 2, 2, + 2,115,115,159,159,159,159,159,159,159, 2,159,159, 2, 2, 2, + 2, 2, 2,119,119,119,119,119,119, 2, 2, 2, 2, 2, 2, 2, + 119,119,119,167,167, 2, 2, 2, 2, 2, 2,146,146,146, 2, 2, + 2, 2, 2,172, 2, 2,172,172,172,172,172,172,172,172,172, 2, + 2, 2, 2, 99, 99, 99, 2, 2, 2, 2, 99, 2, 2, 2, 2, 2, + 2, 2, 99,136,139, 13, 13,155, 2, 2, 2,155,155,155, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,155,136, 2, 2, 2, 2, + 2, 2, 2,136,136,136, 2, 2, 2, 2, 2,176,176, 2, 2, 2, + 2, 2, 2,176,176,176, 2, 2, 2, 2, 2, 17, 17, 17, 17, 2, + 17, 17, 17, 17, 17, 17, 17, 2, 17, 17, 2, 17, 15, 15, 15, 15, + 15, 15, 15, 17, 17, 17, 15, 17, 17, 17, 17, 2, 2, 15, 2, 2, + 2, 2, 2, 15, 15, 15, 2, 2, 17, 2, 2, 2, 2, 2, 2, 17, + 17, 17, 17,139,139,139,139, 2, 2, 2, 2,105,105,105, 2, 2, + 2, 2, 2,105,105,105,105,105, 2, 2, 2,105, 2, 2, 2, 2, + 2, 2, 2,105,105, 2, 2,105,105,105,105, 0, 2, 0, 0, 0, + 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, + 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, + 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 2, 2, 0, 2, 2, + 0, 0, 2, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 2, + 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, + 2, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0,131,131,131,131, 2, + 2, 2, 2, 2, 2, 2,131,131,131,131,131, 2,131,131,131,131, + 131,131,131, 19, 19, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 19, 19, 19, 19, 19, 19, 9, 9, 19, 19, 19, 56, 56, 56, 56, 56, + 56, 56, 2, 56, 2, 2, 56, 56, 56, 56, 56, 56, 56, 2, 56, 56, + 2, 56, 56, 56, 56, 56, 2, 2, 2, 2, 2, 6, 6, 6, 6, 6, + 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6,151,151,151,151,151, + 2, 2, 2,151,151,151,151,151,151, 2, 2,151,151, 2, 2, 2, + 2,151,151,160,160,160,160,160,160,160, 2,152,152, 2, 2, 2, + 2, 2,152,164,164, 2, 2, 2, 2, 2, 2,168,168,168, 2, 2, + 2, 2,168,174,174,174,174,174,174,174, 2,174,174,174,174,174, + 174, 2, 2, 2, 2, 2, 2, 2, 2,174,174, 30, 30, 30, 30, 2, + 30, 30, 2,113,113,113,113,113, 2, 2,113,113,113,113,113,113, + 113,113, 2,132,132,132,132, 2, 2, 2, 2,132,132, 2, 2, 2, + 2,132,132, 3, 3, 3, 3, 2, 3, 3, 3, 2, 3, 2, 3, 2, + 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 2, 3, 2, + 3, 3, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, + 2, 3, 2, 2, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 15, 0, 0, 2, 2, + 2, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, + 0, 0, 0, 13, 2, 2, 2, 2, 2, 2, 2, 13, 13, 13, 2, 2, + 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 0, 0, 0, 0, 10, 0, 11, 12, 13, 0, 0, 0, + 14, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, 0, 0, + 0, 0, 0, 19, 20, 21, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, + 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 0, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, + 24, 25, 26, 27, 28, 29, 30, 0, 0, 31, 32, 0, 33, 0, 34, 0, + 35, 0, 0, 0, 0, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 45, 0, + 0, 0, 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, 48, 0, 49, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 0, + 0, 0, 52, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, + 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, + 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 59, 60, + 61, 62, 63, 64, 65, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 0, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, - 0, 0, 24, 25, 26, 27, 28, 29, 30, 0, 0, 31, 32, 0, 33, 0, - 34, 0, 35, 0, 0, 0, 0, 36, 37, 38, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, - 45, 0, 0, 0, 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, 48, 0, - 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, - 51, 0, 0, 0, 52, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, - 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 56, - 0, 0, 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, - 59, 60, 61, 62, 63, 64, 65, 0, 0, 0, 0, 0, 0, 66, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 68, 0, 69, 70, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99,100,101,102,103, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, + 0, 0,105,106, 0,107, 0, 0, 0,108, 0,109, 0,110, 0,111, + 112,113, 0,114, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118,119,120, + 121, 0,122,123,124,125,126, 0,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 68, 0, 69, 70, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,104, 0, 0, - 0, 0, 0, 0,105,106, 0,107, 0, 0, 0,108, 0,109, 0,110, - 0,111,112,113, 0,114, 0, 0, 0,115, 0, 0, 0,116, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,128,129,130,131,132,133,134, + 135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150, + 151,152,153,154,155,156,157, 0, 0, 0,158,159,160,161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,117, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118, - 119,120,121, 0,122,123,124,125,126, 0,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,129,130,131,132, - 133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148, - 149,150,151,152,153,154,155,156,157, 0, 0, 0,158,159,160,161, + 0, 0, 0, 0, 0,162, 0,163, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,164,165, 0, 0, 0, 0, 0, 0, 0,166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,167, 0, 0, + 0,168,169, 0, 0,170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,162, 0,163, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,164,165, 0, 0, 0, 0, 0, 0, 0,166, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,167, - 0, 0, 0,168,169, 0, 0,170, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,171, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,172, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,173, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,174, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,176,177, + 0, 0, 0, 0,178,179, 0, 0, 0,180,181,182,183,184,185,186, + 187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202, + 203,204,205,206,207,208,209,210,211,212,213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 176,177, 0, 0, 0, 0,178,179, 0, 0, 0,180,181,182,183,184, - 185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200, - 201,202,203,204,205,206,207,208,209,210,211,212,213, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -static const uint16_t _hb_ucd_u16[10877]= +static const uint16_t _hb_ucd_u16[9777]= { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 224, 224, 768, 424, 432, 440, 448, 776, 224, 224, 784, 792, 72, 800, 40, 808, - 48, 48, 48, 816, 824, 48, 48, 832, 840, 848, 856, 864, 872, 880, 48, 888, - 48, 48, 48, 896, 904, 40, 40, 40, 40, 912, 40, 96, 920, 928, 936, 456, - 64, 64, 64, 64, 64, 64, 64, 944, 952, 960, 968, 40, 976, 984, 48, 992, - 72, 72, 72, 40, 40, 40, 48, 48,1000, 48, 48, 48,1008, 48, 48, 48, - 48, 48, 48,1016, 72,1024, 40, 40,1032, 464, 64,1040,1048, 8,1056,1064, - 1072,1080, 8, 8,1088, 64,1096,1104, 8, 8, 8, 8, 8,1112,1120,1128, - 1136,1144, 8, 64,1152, 8, 8, 8, 8, 8, 472,1160, 232, 8,1168,1176, - 8,1184,1192,1200, 8,1208, 176, 8,1216,1224, 8, 8,1232, 64,1240, 64, - 480, 8, 8,1248,1256,1264,1272,1280,1288, 240, 128,1296,1304,1312, 144,1320, - 1328, 240, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 248, 144,1392, - 1400, 240, 128,1408,1416,1424, 144,1432,1440,1448,1456,1464,1472,1480, 304,1488, - 1496, 256, 128,1504,1512,1520, 144,1528,1536, 256, 128,1544,1552,1560, 144,1568, - 1576, 256, 8,1584,1592,1600, 144,1608,1616,1624, 8,1632,1640,1648, 304,1656, + 232, 232, 776, 416, 424, 432, 440, 784, 232, 232, 792, 800, 72, 808, 40, 816, + 64, 64, 64, 824, 832, 64, 64, 840, 848, 856, 864, 872, 880, 888, 64, 896, + 64, 64, 64, 904, 912, 40, 40, 40, 40, 920, 40, 104, 928, 936, 944, 448, + 48, 48, 48, 48, 48, 48, 48, 952, 960, 968, 976, 40, 984, 992, 64,1000, + 72, 72, 72, 40, 40, 40, 64, 64,1008, 64, 64, 64,1016, 64, 64, 64, + 64, 64, 64,1024, 72,1032, 40, 40,1040, 456, 48,1048,1056, 8,1064,1072, + 1080,1088, 8, 8,1096, 48,1104,1112, 8, 8, 8, 8, 8,1120,1128,1136, + 1144,1152, 8, 48,1160, 8, 8, 8, 8, 8, 464, 472, 240, 8,1168,1176, + 8,1184,1192,1200, 8,1208, 152, 8,1216,1224, 8, 8,1232, 48,1240, 48, + 480, 8, 8,1248,1256,1264,1272,1280,1288, 248, 128,1296,1304,1312, 160,1320, + 1328, 248, 128,1336,1344,1352, 304,1360,1368, 488, 128,1376,1384, 192, 160,1392, + 1400, 248, 128,1408,1416,1424, 160,1432,1440,1448,1456,1464,1472,1480, 304,1488, + 1496, 256, 128,1504,1512,1520, 160,1528,1536, 256, 128,1544,1552,1560, 160,1568, + 1576, 256, 8,1584,1592,1600, 160,1608,1616,1624, 8,1632,1640,1648, 304,1656, 312, 8, 8,1664,1672,1680, 0, 0,1688, 8,1696,1704,1712,1720, 0, 0, - 1728,1736, 320,1744,1752, 8, 152,1760,1768,1776, 64,1784,1792,1800, 0, 0, + 1728,1736, 320,1744,1752, 8, 168,1760,1768,1776, 48,1784,1792,1800, 0, 0, 8, 8,1808,1816, 496,1824,1832,1840,1848,1856, 72, 72,1864, 40, 40,1872, 8, 8, 8, 8, 504,1880, 8, 8, 504, 8, 8,1888, 512, 520, 8, 8, - 8, 512, 8, 8, 8,1896,1904, 528, 8, 264, 72, 72, 72, 72, 72,1912, + 8, 512, 8, 8, 8,1896,1904, 528, 8, 328, 72, 72, 72, 72, 72,1912, 536, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1920, 8,1928,1936, 8, 8, 8, 8,1944,1952, - 8,1960, 8,1968, 8,1976,1984,1992, 8, 8, 8,2000,2008,2016, 80,2024, - 2032, 80, 8, 8,2040, 8, 8, 160,2048, 8,2056, 8, 8, 8, 8, 328, - 8, 120,2064,2072,2080, 8, 112,2088, 8, 8, 184, 8, 192,2096, 24, 24, - 8,2104, 8, 8, 8,2112,2120,2128, 80, 80,2136,2144, 64, 544,2152, 0, - 2160, 8, 8,2168,2176, 496,2184,2192, 336, 8,2200, 232, 8, 8,2208,2216, - 8, 8,2224,2232,2240, 232, 8, 552,2248, 72, 72,2256,2264,2272,2280,2288, - 40, 40,2296, 96, 96, 96,2304,2312, 40,2320, 96, 96, 64, 64, 64, 64, - 48, 48, 48, 48, 48, 48, 48, 48, 48,2328, 48, 48, 48, 48, 48, 48, - 168, 560, 168, 168, 560,2336, 168,2344, 344, 344, 344,2352,2360,2368,2376,2384, - 2392,2400,2408,2416,2424,2432,2440,2448,2456,2464, 568, 568,2472,2480,2488,2496, - 2504,2512,2520,2528,2536, 88, 104, 104,2544,2552,2560, 24,2568,2576, 24,2584, - 2592, 24,2600, 24, 24, 24, 24,2608, 24,2616, 56,2624, 24,2632,2640, 24, - 24, 24, 264, 0, 576, 0, 88, 88, 88,2648, 24, 24, 24, 24,2656, 88, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,2664,2672, 24, 24,2680, - 24, 24, 24, 24, 24, 24,2688, 24, 24, 24, 24, 24, 24, 24, 24, 24, - 24, 24, 24, 24, 24, 24,2696,2704, 88,2712, 24, 24,2720, 56,2728, 56, - 56, 56, 56, 56, 56, 56, 56, 56,2736,2744, 56, 56, 56,2752, 56,2760, - 24, 24, 24, 56,2768, 24, 24,2776, 24, 24, 24, 24, 24, 24, 24, 24, - 72, 72, 72, 40, 40, 40,2784,2792, 48, 48, 48, 48, 48, 48,2800,2808, - 40, 40,2816, 8, 8, 8,2824,2832, 8, 200, 208, 208, 208, 208, 64, 64, - 2840,2848,2856,2864,2872,2880, 0, 0, 24,2888, 24, 24, 24, 24, 24, 352, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 272, 0, 24, - 2896,2904,2912,2920, 312, 8, 8, 8, 8,2928, 536, 8, 8, 8, 8,2936, - 2944, 8, 8, 312, 8, 8, 8, 8, 120,2952, 8, 8, 24, 24,2960, 8, - 24, 584, 592, 24,2968, 600, 24, 24, 592, 24, 24, 600, 24, 24, 24, 24, + 8,1960, 8,1968, 8,1976,1984,1992, 8, 8, 8,2000,2008,2016, 88,2024, + 2032, 88, 8, 8,2040, 8, 8, 136,2048, 8,2056, 8, 8, 8, 8, 544, + 8, 112,2064,2072,2080, 8, 120,2088, 8, 8, 200, 8, 208,2096, 24, 24, + 8,2104, 8, 8, 8,2112,2120,2128, 88, 88,2136,2144, 48, 48, 48, 552, + 2152, 8, 8,2160,2168, 496,2176,2184, 336, 8,2192, 240, 8, 8,2200,2208, + 8, 8,2216,2224,2232, 240, 8, 560,2240, 72, 72,2248,2256,2264,2272,2280, + 40, 40,2288, 104, 104, 104,2296,2304, 40,2312, 104, 104, 48, 48, 48, 48, + 64, 64, 64, 64, 64, 64, 64, 64, 64,2320, 64, 64, 64, 64, 64, 64, + 176, 568, 176, 176, 568,2328, 176,2336, 344, 344, 344,2344,2352,2360,2368,2376, + 2384,2392,2400,2408,2416,2424,2432,2440,2448, 104, 576, 576,2456,2464,2472, 552, + 2480,2488,2496,2504,2512, 96, 80, 80,2520,2528,2536, 24,2544,2552, 24,2560, + 2568, 24,2576, 24, 24, 24, 24,2584, 24,2592, 56,2600, 24,2608,2616, 24, + 24, 24, 328, 0, 584, 0, 96, 96, 96,2624, 24, 24, 24, 24,2632, 96, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,2640,2648, 24, 24,2656, + 24, 24, 24, 24, 24, 24,2664, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24,2672,2680, 96,2688, 24, 24,2696, 56,2704, 56, + 56, 56, 56, 56, 56, 56, 56, 56,2712,2720, 56, 56, 56,2728, 56,2736, + 24, 24, 24, 56,2744, 24, 24,2752, 24, 24, 24, 24, 24, 24, 24, 24, + 72, 72, 72, 40, 40, 40,2760,2768, 64, 64, 64, 64, 64, 64,2776,2784, + 40, 40,2792, 8, 8, 8,2800,2808, 8, 216, 224, 224, 224, 224, 48, 48, + 2816,2824,2832,2840,2848,2856,2864, 0, 24,2872, 24, 24, 24, 24, 24, 352, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, 0, 24, + 2880,2888,2896,2904, 312, 8, 8, 8, 8,2912, 536, 8, 8, 8, 8,2920, + 2928, 8, 8, 312, 8, 8, 8, 8, 112,2936, 8, 8, 24, 24,2944, 8, + 24, 360, 592, 24,2952, 600, 24, 24, 592, 24, 24, 600, 24, 24, 24, 24, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, - 8,2976, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 152, 24, 24, 24, 608, 8, 8, 552, - 2984, 8,2992, 0, 48, 48,3000,3008, 48,3016, 8, 8, 8, 8,3024,3032, - 456,3040,3048,3056, 48, 48, 48,3064,3072,3080,3088,3096,3104,3112, 0,3120, - 3128, 8,3136,3144, 8, 8, 8,3152,3160, 8, 8,3168,3176, 80, 64,3184, - 232, 8,3192, 8,3200,3208, 8, 152, 480, 8, 8,3216,3224, 360,3232,3240, - 8, 8,3248,3256,3264,3272, 8,3280, 8, 8, 8,3288,3296,3304,3312,3320, - 3328,3336, 208, 40, 40,3344,3352, 40, 40, 40, 40, 40, 8, 8,3360, 80, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 368, 8,3368, 8, 8, 184, - 8, 8, 8, 8, 8, 8, 112, 8, 8, 8, 8, 8, 8, 192, 0, 0, - 3376,3384,3392,3400,3408, 8, 8, 8, 8, 8, 8,3416,3424,3432, 8, 8, - 8, 8, 8,3440, 24, 8, 8, 8, 8,3448, 8, 8,3456, 0, 0,3464, - 64,3472, 64,3480,3488,3496,3504,3512, 8, 8, 8, 8, 8, 8, 8,3520, - 3528, 424, 432, 440, 448,3536,3544,3552, 8,3560, 8, 120,3568,3576,3584,3592, - 3600, 8, 520,3608, 112, 112, 0, 0, 8, 8, 8, 8, 8, 8, 8, 176, - 3616, 88, 88,3624, 104, 104, 104,3632,3640, 280, 376, 0, 0, 24, 24,3648, - 0, 0, 0, 0, 0, 0, 0, 0, 8, 152, 8, 8, 8, 248,3656,3664, - 8, 8,3672, 8,3680, 8, 8,3688, 8,3696, 8, 8,3704,3712, 0, 0, - 72, 72,3720, 40, 40, 8, 8, 8, 8, 112, 80, 72, 72,3728, 40,3736, - 8, 8, 616, 8, 8, 8,3744, 624, 624,3752,3760,3768, 8, 8, 8, 368, - 8, 8, 8, 200, 8, 328, 616, 0,3776, 96, 96,3784, 0, 0, 0, 0, - 3792, 8, 8,3800, 8,3808, 8,3816, 8, 120,3824, 0, 0, 0, 8,3832, - 8,3840, 8,3848, 8, 192, 0, 0, 8, 8, 8,3856, 88, 632, 88, 88, - 3864,3872, 8,3880, 640,3888, 8,3896, 8, 648, 0, 0,3904, 8,3912,3920, - 8, 8, 8,3928, 8,3936, 8,3944, 8,3952,3960, 0, 0, 0, 0, 0, - 8, 8, 8, 8, 160, 0, 0, 0, 72, 72, 72,3968, 40, 40, 40,3976, - 8, 8,3984, 80,3992, 72,4000, 40,4008, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 88,4016, 8, 8,4024, 656,4032,4040, 0,4048, - 8, 648,4056, 8, 472,4064, 0, 8,4072, 0, 0, 8,4080, 0, 8, 200, - 4088, 8, 8,4096,4104, 632,4112,4120, 336, 8, 8,4128,4136, 8, 160, 80, - 4144, 8,4152,4160,4168, 8, 8,4176, 336, 8, 8,4184,4192,4200, 384,4208, - 8, 488, 664,4216,4224, 0, 0, 0,4232,4240,4248, 8, 8,4256,4264, 80, - 4272, 240, 128,4280,4288,4296,4304,4312,4320, 8, 8,4328,4336,4344,4352, 0, - 8, 8, 8,4360,4368,4376, 656, 0, 8, 8, 8,4384,4392, 80, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 672,4400,4408,4416, 0, 0, - 8, 8, 8,4424,4432, 80,4440, 0, 8, 8,4448,4456, 80, 288,4464, 0, - 8,4472,4480,4488, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 664,4496, 0, 0, 0, 0, 0, 0, 72, 72, 40, 40, 320,4504, - 4512,4520, 8,4528,4536, 80, 0, 0, 0, 0,4544, 8, 8,4552,4560, 0, - 4568, 8, 8,4576,4584,4592, 8, 8,4600,4608,4616, 8, 8, 8, 8, 160, - 4624, 0, 0, 0, 0, 0,4632, 0, 0, 0, 0, 0, 8, 8,4640, 80, - 128, 8, 672,4648,4656, 320, 528,4664, 8,4672,4680,4688, 0, 0, 0, 0, - 4696, 8, 8,4704,4712, 80,4720, 8,4728,4736, 80, 8, 8,4744, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,4752, - 4760, 256, 8,4768,4776,4784, 0, 0, 0, 0, 0, 248, 88,4792,4800,4808, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 192, 0, 0, 0, 0, 0, 0, - 104, 104, 104, 104, 104, 104,4816,4824, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8,4832, - 8, 8, 8, 136,4840,4848, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 176, - 8, 8, 8, 8, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 680,4856, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 8, 160, 8, 120, 360, 8, 8, 8, 8, 120, 80, 8, 112,4864, - 8, 8, 8,4872,4880,4888,4896,4904, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,4912, 8,4920, 80, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 72, 72, 40, 40, 88,4928, 72,4936, 40,4944, 0, 0, - 8, 8, 8, 8,4952,4960, 688, 688,4968,4976, 0, 0, 0, 0,4984,4992, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 328, 0,5000, - 8, 120, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 696, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5008, - 8, 8, 696,5016, 0,5024,5032, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 184, - 8, 8, 8, 8, 8, 8, 176, 152, 160,5040,5048, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5056, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5064, 24, 376, 24,5072, - 64, 64, 544, 64, 704, 24, 24, 24, 24, 24, 24, 24, 352, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 272, - 24, 24,5080, 24, 24, 24,5088,5096,5104, 24,5112, 24, 24, 24, 576, 0, - 24, 24, 24, 24,5120, 0, 0, 0, 0, 0, 0, 0, 88, 712, 88, 712, - 24, 24, 24, 24, 24, 608, 88, 640, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 296, 40, 720, 728,5128, 168, 72, 392,5136,5144,5152,5160, 72, 296, 40, - 5168,5176, 40,5184,5192,5200, 736, 72, 744, 40, 72, 296, 40, 720, 728, 40, - 168, 72, 392, 736, 72, 744, 40, 72, 296, 40,5208, 72,5216,5224,5232,5240, - 40,5248, 72,5256,5264,5272,5280, 40,5288, 72,5296, 40,5304, 288, 288, 288, - 64, 64, 64,5312, 64, 64,5320,5328,5336,5344, 464, 0, 0, 0, 0, 0, - 5352,5360,5368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5376,5384,5392, 96, 96, 96,5400, 0,5408, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 152,5416,5424, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5432, 0, 8, 8,5440,5448, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5456, 80, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 680,5464, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120,5472,5480, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5488, 120, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,5496, 704, 0, 0, - 72, 72, 392, 40,5504, 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 384, 88, 88,5512,5520, 0, 0, 0, 0, - 384, 88,5528,5536, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5544, 8,5552,5560,5568,5576,5584,5592,5600, 184,5608, 184, 0, 0, 0,5616, - 24, 24, 216, 24, 24, 24, 24, 24, 24, 352, 584, 400, 400, 400, 24, 272, - 5624, 24, 24, 24, 24, 24, 24, 24, 24, 24, 408, 0, 0, 0,5632, 24, - 5640, 24, 24, 216, 752, 760, 272, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5648, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5656, 280, 280, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, 216, 376, - 216, 24, 24, 24, 416, 264, 24, 24, 416, 24, 408, 216, 760,5664, 0, 0, - 24, 24, 24, 24, 24, 416, 408, 280,5672, 24, 24, 24,5680,5688,5696, 752, - 24, 24, 24, 24, 24, 24, 24, 24, 24,5704, 24, 24, 24, 24, 24,5712, + 8,2960, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 168, 24, 24, 24, 608, 8, 8, 560, + 2968, 8,2976, 0, 64, 64,2984,2992, 64,3000, 8, 8, 8, 8,3008,3016, + 448,3024,3032, 616, 64, 64, 64,3040,3048,3056,3064,3072,3080,3088,3096,3104, + 3112, 8,3120,3128, 8, 8, 8,3136,3144, 8, 8,3152,3160, 88, 48,3168, + 240, 8,3176, 8,3184,3192, 8, 168, 480, 8, 8,3200,3208, 368,3216,3224, + 8, 8,3232,3240,3248,3256, 8,3264, 8, 8, 8,3272,3280,3288,3296,3304, + 3312,3320, 224, 40, 40,3328,3336, 40, 40, 40, 40, 40, 8, 8,3344, 88, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 376, 8,3352, 8, 8, 200, + 8, 8, 8, 8, 8, 8, 120, 8, 8, 8, 8, 8, 8, 208, 0, 0, + 624,3360,3368,3376,3384, 8, 8, 8, 8, 8, 8,3392,3400,3408, 8, 8, + 8, 8, 8,3416, 24, 8, 8, 8, 8,3424, 8, 8,3432, 0, 0,3440, + 48,3448, 48,3456,3464,3472,3480,3488, 8, 8, 8, 8, 8, 8, 8,3496, + 3504, 416, 424, 432, 440,3512,3520,3528, 8,3536, 8, 112,3544,3552,3560,3568, + 3576, 8, 520,3584, 120, 120, 0, 0, 8, 8, 8, 8, 8, 8, 8, 152, + 3592, 96, 96,3600, 80, 80, 80,3608,3616, 272,3624, 0, 0, 24, 24,3632, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 168, 8, 8, 8, 192,3640,3648, + 8, 8,3656, 8,3664, 8, 8,3672, 8,3680, 8, 8,3688,3696, 0, 0, + 72, 72,3704, 40, 40, 8, 8, 8, 8, 120, 88, 72, 72,3712, 40,3720, + 8, 8, 632, 8, 8, 8,3728, 640, 640,3736,3744,3752, 8, 8, 8, 376, + 8, 8, 8, 216, 8, 544, 632, 0,3760, 104, 104,3768, 0, 0, 0, 0, + 3776, 8, 8,3784, 8,3792, 8,3800, 8, 112,3808, 0, 0, 0, 8,3816, + 8,3824, 8,3832, 8, 208, 0, 0, 8, 8, 8,3840, 96, 648, 96, 96, + 3848,3856, 8,3864, 656,3872, 8,3880, 8, 664, 0, 0,3888, 8,3896,3904, + 8, 8, 8,3912, 8,3920, 8,3928, 8,3936,3944, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 136, 0, 0, 0, 72, 72, 72,3952, 40, 40, 40,3960, + 8, 8,3968, 88,3976, 72,3984, 40,3992, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 96,4000, 8, 8,4008, 280,4016,4024, 112, 48, + 8, 664,4032, 8, 464,4040, 0, 8,4048, 0, 0, 8,4056, 0, 8, 216, + 4064, 8, 8,4072,4080, 648,4088,4096, 336, 8, 8,4104,4112, 8, 136, 88, + 4120, 8,4128,4136,4144, 8, 8,4152, 336, 8, 8,4160,4168,4176, 384,4184, + 8, 488, 672,4192,4200, 0, 0, 0,4208,4216,4224, 8, 8,4232,4240, 88, + 4248, 248, 128,4256,4264,4272,4280,4288,4296, 8, 8,4304,4312,4320,4328, 0, + 8, 8, 8,4336,4344,4352, 280, 0, 8, 8, 8,4360,4368, 88, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 680,4376,4384,4392, 0, 0, + 8, 8, 8,4400,4408, 88,4416, 0, 8, 8,4424,4432, 88, 288,4440, 0, + 8,4448,4456,4464, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 672,4472, 0, 0, 0, 0, 0, 0, 72, 72, 40, 40, 320,4480, + 4488,4496, 8,4504,4512, 88, 0, 0, 0, 0,4520, 8, 8,4528,4536, 0, + 4544, 8, 8,4552,4560,4568, 8, 8,4576,4584,4592, 8, 8, 8, 8, 136, + 4600, 0, 0, 0, 0, 0,4608, 0, 0, 0, 0, 0, 8, 8,4616, 88, + 128, 8, 680,4624,4632, 320, 528,4640, 8,4648,4656,4664, 0, 0, 0, 0, + 4672, 8, 8,4680,4688, 88,4696, 8,4704,4712, 88, 8, 8,4720, 88, 472, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,4728, + 4736, 256, 8,4744,4752,4760, 0, 0, 0, 0, 0, 192, 96,4768,4776,4784, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 208, 0, 0, 0, 0, 0, 0, + 80, 80, 80, 80, 80, 80, 80,4792, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 376, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80,4800, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8,4808, + 8, 8, 8, 144,4816,4824, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 152, + 8, 8, 8, 8, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 688,4832, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 136, 8, 112, 368, 8, 8, 8, 8, 112, 88, 8, 120,4840, + 8, 8, 8,4848,4856,4864,4872,4880, 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,4888, 8,4896, 88, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 72, 72, 40, 40, 96,4904, 72,4912, 40,4920, 0, 0, + 8, 8, 8, 8,4928,4936, 696, 696,4944,4952, 0, 0, 0, 0,4960,4968, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 152, 0,4976, + 8, 8, 192, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 704, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 280, 8, 8, 8, 704, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,4984, + 8, 8, 136,4992, 0,5000,5008, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 200, + 8, 8, 8, 8, 8, 8, 152, 168, 136,5016,5024, 0, 0, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5032, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5040, 24,5048, 24,5056, + 48, 48,5064, 48, 712, 24, 24, 24, 24, 24, 24, 24, 352, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 264, + 24, 24,5072, 24, 24, 24,5080,5088,5096, 24,5104, 24, 24, 24, 24, 24, + 24, 24, 24, 24,5112,5120, 24, 24,5128, 0, 0, 0, 96, 720, 96, 720, + 24, 24, 24, 24, 24, 608, 96, 656, 0, 0, 0, 0, 0, 0, 0, 0, + 72, 296, 40, 728, 736,5136, 176, 72, 392,5144,5152,5160,5168, 72, 296, 40, + 5176,5184, 40,5192,5200,5208, 744, 72, 752, 40, 72, 296, 40, 728, 736, 40, + 176, 72, 392, 744, 72, 752, 40, 72, 296, 40,5216, 72,5224,5232,5240,5248, + 40,5256, 72,5264,5272,5280,5288, 40,5296, 72,5304, 40,5312, 288, 288, 288, + 48, 48, 48,5320, 48, 48,5328,5336,5344,5352, 456, 0, 0, 0, 0, 0, + 56,5360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5368, 40, 40, 40,5376,5384,5392, 616, 280, 624, 0, 0,5400, 104, 104, 104, + 5408,5416,5424, 104, 104, 104,5432, 0,5440, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 168,5448,5456, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5464, 0, 8, 8,5472,5480, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,5488, 88, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 688,5496, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 112,5504,5512, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,5520, 112, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,5528, 712, 0, 0, + 72, 72, 392, 40,5536, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 384, 96, 96,5544,5552, 0, 0, 0, 0, + 384, 96,5560,5568, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5576, 8,5584,5592,5600,5608,5616,5624,5632, 200,5640, 200, 0, 0, 0,5648, + 24, 24, 184, 24, 24, 24, 24, 24, 24, 352, 360, 400, 400, 400, 24, 264, + 5656, 24, 24, 24, 24, 24, 24, 24, 24, 24, 360, 0, 0, 0,5664, 24, + 5672, 24, 24, 184,5680, 760, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5688, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,5696, 272, 272, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 184, 184, 24, + 184, 24, 24, 24, 408, 328, 24, 24, 408, 24, 768, 184, 760,5704, 0, 0, + 24, 24, 24, 24, 24, 408, 768, 272, 24, 24, 24, 24,5712,5720,5728, 584, + 24, 24, 24, 24, 24, 24, 24, 24, 24,5736, 24, 24, 24, 24, 24,5744, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 8, 112, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 112, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 248, 8, - 8, 8, 8, 8, 8, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 8, 8, 8, 176, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 192, 0, 0, 0, 0, 0, 0, 0, 0, - 5720, 0, 136, 136, 136, 136, 136, 136, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,5728, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 120, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 192, 8, + 8, 8, 8, 8, 8, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 152, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 208, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5752, 0, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,5760, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, - 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16, 16, - 20, 20, 20, 20, 20, 20, 20, 20, 12, 12, 12, 12, 12, 12, 12, 12, - 24, 24, 24, 24, 24, 24, 24, 24, 28, 28, 28, 28, 28, 28, 28, 28, - 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 40, 40, 40, - 48, 48, 48, 48, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, - 44, 44, 44, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 36, - 64, 64, 64, 64, 64, 64, 64, 64, 92, 92, 92, 92, 92, 92, 92, 92, - 84, 84, 84, 84, 84, 84, 84, 84, 80, 80, 80, 80, 80, 80, 80, 80, - 68, 68, 68, 68, 68, 68, 68, 68, 56, 56, 56, 56, 56, 56, 56, 56, - 12, 12, 12, 12, 228, 232, 228, 232, 12, 12, 468, 468, 32, 472, 32, 472, - 32, 32, 32, 692, 12, 12, 696, 12, 56, 56, 56, 56, 56, 56, 56, 700, - 704, 72, 708, 72, 72, 72, 712, 72, 60, 60, 60, 60, 60, 60, 60, 60, - 716, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 720, 308, 724, 308, 308, - 728, 732, 236, 236, 736, 236, 740, 744, 748, 752, 36, 36, 756, 760, 36, 764, - 36, 36, 36, 36, 36, 768, 36, 36, 772, 312, 312, 312, 776, 36, 36, 36, - 316, 316, 316, 780, 320, 320, 320, 784, 476, 476, 788, 792, 796, 800, 804, 36, - 36, 808, 36, 36, 36, 36, 812, 36, 112, 112, 112, 112, 112, 816, 820, 112, - 824, 828, 832, 836, 840, 844, 848, 852, 856, 860, 864, 868, 872, 876, 880, 884, - 888, 892, 896, 900, 904, 908, 912, 916, 920, 924, 928, 932, 936, 940, 944, 948, - 952, 956, 960, 964, 968, 972, 976, 980, 984, 988, 992, 996,1000,1004,1008,1012, - 1016,1020,1024,1028,1032,1036,1040,1044,1048,1052, 324, 324,1056,1060,1064, 324, - 1068,1072,1076,1080,1084,1088,1092,1096,1100, 328, 328,1104, 328,1108, 0, 0, - 1112,1116,1120,1124,1128,1132, 0, 0, 128, 128, 128, 128, 480, 128,1136,1140, - 128, 480, 128, 484, 484,1144, 0, 0, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 96, 116, 116, 488, 116, 116,1148, 88, 88, 88, 88, 492,1152, 88, 88, - 492, 88, 88,1156, 496,1160, 88, 88, 88, 496, 88, 88, 88,1164, 88,1168, - 88,1172, 108, 108, 108, 108, 108,1176,1180,1184, 240, 240, 240, 240,1188,1192, - 1196,1200,1204,1208,1212,1216,1220,1224, 132, 132, 132, 132, 132,1228, 500, 500, - 1232,1236, 136, 136, 136, 136, 136,1240, 136, 136,1244, 40, 40, 40, 40,1248, - 1252,1256, 504, 504,1260,1264,1268,1272, 332, 332,1276, 332,1280,1284, 132, 132, - 1288,1292, 244, 244, 244,1296, 244,1300, 508, 508,1304, 56, 56, 512,1308, 0, - 140, 140, 140, 140,1312, 140, 140, 140, 248, 248, 248, 248, 336, 336, 336,1316, - 340, 340, 340,1320,1324, 344, 344, 344,1328, 116, 116,1332,1336,1340,1344,1348, - 32, 32,1352, 32, 32,1356,1360,1364, 32, 32, 32,1368, 56, 56, 56, 56, - 72, 516, 72, 72, 516,1372, 72,1376, 72, 72, 72, 520, 520,1380, 72,1384, - 1388, 12, 12, 12, 12, 12, 524,1392, 528, 532, 12, 12, 348, 56, 56,1396, - 12, 12,1400,1404,1408, 12, 32, 32,1412, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 176, 0, 352, 0, 12, 12, 12, 12, 12, 12, 12, 12, 12,1416, - 148, 148, 148, 148, 148, 148, 32, 32, 144, 144, 144, 144, 144, 144, 144,1420, - 116, 116, 488, 356, 356, 356,1424,1428, 88,1432, 180, 180, 180, 180, 60, 60, - 12, 12, 12, 12, 12, 184, 0, 0, 4,1436, 4, 4, 4, 4, 4,1440, - 4, 4, 4, 4, 4,1444, 0, 12,1448, 12,1452,1456,1460, 76, 76, 76, - 76,1464, 536, 100, 100, 100, 100,1468,1472, 252, 252,1476, 8, 8, 8, 8, - 360, 12, 252, 252, 12, 12,1480, 100, 8, 360, 12, 12, 12, 12, 8,1484, - 12, 12, 12, 12, 12, 100, 100,1488, 100, 100, 100, 100, 100,1492, 12, 12, - 4, 4, 4, 4, 12, 12, 12, 12,1496, 24, 24, 24,1500, 364, 364, 364, - 84, 84,1504, 0, 60, 60, 60, 60, 60, 60, 44, 44, 44, 44, 44,1508, - 12, 12,1512, 32, 32, 32, 32, 32,1516, 32, 32, 32, 32, 532, 0,1520, - 540, 540,1524, 176, 368, 368, 368,1528, 256, 256, 256, 256,1532,1536, 112, 112, - 544, 544,1540, 548, 548,1544, 8,1548, 260, 260, 260, 260,1552,1556, 96,1560, - 372, 372, 372,1564,1568,1572, 96, 96, 264, 264, 264, 264,1576,1580, 376,1584, - 1588,1592, 180, 32, 32,1596,1600, 108, 108, 108, 108, 108, 376, 376,1604,1608, - 8, 8,1612, 8,1616, 8, 8,1620, 4, 4, 4, 4, 4, 4, 188, 4, - 4, 4, 4, 4, 4, 552, 0, 0,1624,1628, 236,1632,1636, 36, 36, 36, - 36, 36, 36,1640, 36, 36, 36, 36, 36, 36, 36, 36, 36, 0, 0, 36, - 56, 176,1644, 12, 12, 556,1648,1652, 36, 36, 36, 36, 36, 36, 36,1656, - 152, 12, 228, 232, 228, 232,1660, 536, 100,1664, 8, 360,1668,1672,1676,1680, - 1684, 120,1688,1692, 560, 560, 0, 0, 120, 120, 120, 120, 120, 120, 120,1696, - 1700, 12, 12,1704, 72, 72, 72, 72,1708, 192,1712, 0, 0, 12, 12,1716, - 1720,1724, 380, 380, 380,1728,1732, 156, 564, 564,1736,1740,1744, 568, 568,1748, - 1752,1756, 572, 572,1760,1764, 0, 0, 196, 196, 196, 196, 196, 384, 384, 384, - 1768,1772,1776, 388, 388,1780, 388,1784, 576, 576,1788, 392, 392, 392,1792, 580, - 580,1796,1800,1804, 396, 396, 396,1808, 80, 80, 80,1812, 80,1816,1820, 0, - 1824, 32, 32,1828, 0, 0, 0, 0,1832, 584, 584,1836,1840,1844, 588, 588, - 1848,1852,1856, 0, 0, 0,1860,1864,1868,1872,1876,1880,1884,1888, 0, 0, - 592, 592, 268,1892, 268,1896, 268, 268,1900,1904,1908,1912, 596, 596, 600, 600, - 604, 604, 0, 0, 608, 608,1916,1920, 400, 400, 400,1924,1928,1932,1936,1940, - 1944,1948,1952, 0, 0, 0, 0, 0, 272, 272, 272, 272,1956, 0, 0, 0, - 160, 160, 160,1960, 160, 160, 160,1964, 612, 612,1968,1972, 404, 404,1976, 404, - 1980, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36,1984, - 616, 616,1988,1992,1996,2000, 0,2004, 620, 620,2008, 624, 624,2012, 0,2016, - 2020, 0, 0,2024,2028, 0,2032,2036, 200, 200, 200, 200,2040,2044, 200,2048, - 276, 276, 276, 276,2052,2056,2060,2064, 408, 408, 408,2068,2072, 628, 628,2076, - 164, 164, 164, 164, 164, 164,2080,2084, 412,2088, 412, 412,2092, 0, 0, 0, - 2096,2100,2104, 416, 416, 416,2108,2112,2116,2120,2124,2128,2132,2136,2140,2144, - 2148, 632, 632,2152,2156,2160,2164, 0, 204, 204, 204, 204, 204,2168,2172, 0, - 280, 280, 280, 280,2176,2180, 0, 0, 284, 284, 284,2184, 284,2188, 0, 0, - 288, 288, 288, 288,2192,2196,2200, 0, 420, 420, 420, 636, 636, 96,2204, 0, - 640,2208,2212, 640,2216, 0, 0, 0, 424, 424, 424,2220, 0, 0, 0, 0, - 0, 0, 208, 208, 208, 208, 208,2224,2228,2232,2236,2240,2244,2248, 0, 0, - 0, 0, 644, 648, 648, 644,2252, 0, 292, 292, 292, 292,2256, 212, 212, 212, - 212, 212,2260, 40, 428, 428, 428,2264,2268, 0, 0, 0, 0, 0,2272, 0, - 0, 0, 0, 0, 652, 652,2276,2280,2284, 432, 432,2288,2292, 432,2296, 656, - 656,2300,2304,2308, 0, 0, 0, 0,2312, 660, 660,2316,2320,2324,2328,2332, - 2336,2340,2344, 664, 664,2348,2352, 0, 0, 0, 0, 0, 0, 0,2356,2360, - 436,2364, 436,2368, 436,2372, 0, 0, 0, 0, 0,2376, 440, 440, 440,2380, - 28,2384, 0, 0, 0, 0, 0, 0, 28, 28, 28, 28, 28, 28,2388,2392, - 28, 28, 28, 28,2396, 0, 0, 0, 0, 168, 168, 168, 168, 168, 168,2400, - 20, 20, 20, 20, 20,2404, 20, 20, 20, 20, 20, 20, 20, 20, 20,2408, - 52, 52, 52, 52,2412, 0, 0, 0, 444, 444, 444,2416, 0, 0, 0, 0, - 44, 44, 44,2420,2424,2428,2432, 296, 296, 296, 296,2436,2440,2444,2448,2452, - 216, 216, 216, 216,2456,2460,2464,2468, 216, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 448, 448, 448,2472, 0, 0, 0, 0, 220, 220, 220, 220, - 220,2476, 668,2480, 668,2484, 0, 0, 124, 124, 124, 124,2488, 124, 124, 124, - 2492, 124, 0, 0, 0, 0,2496,2500, 64, 64, 64, 64, 64,2504, 0,2508, - 16,2512, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16,2516, - 0, 0, 0, 0, 0, 0, 0,2520,2524, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,2528,2532, 0,2536,2540, 68, - 68, 68, 68, 68, 68, 68, 68,2544, 172, 172, 172, 172, 172, 172,2548,2552, - 2556,2560, 224, 0, 0, 0, 0, 0, 12, 12, 12, 12, 12, 12, 12, 192, - 12, 12, 12,2564, 12, 452, 12, 452, 56, 56, 512, 56,2568, 12, 12, 12, - 12, 12, 12, 12, 224, 0, 0, 0, 12, 12, 12, 12, 12, 12, 12, 456, - 12, 12,2572, 12, 12, 12,2576,2580,2584, 12,2588, 12, 12, 12, 352, 0, - 72, 72, 72, 72,2592, 0, 0, 0, 0, 0, 0, 0, 12, 224, 12, 224, - 12, 12, 12, 12, 12,2596, 12, 300, 12, 12, 12, 12, 12, 524, 12, 12, - 12,2600,2604,2608,2612, 12, 12, 12,2616,2620, 12,2624,2628,2632, 12, 12, - 12, 12,2636, 12, 12, 12, 12, 12, 12, 12, 12, 12,2640, 12, 12, 12, - 2644,2648,2652, 0, 0, 0, 0, 0, 32,2656,2660, 0, 0, 0, 0, 0, - 2664,2668,2672, 60, 60, 60,2676, 0,2680, 0, 0, 0, 0, 0, 0, 0, - 672, 672,2684,2688,2692, 0, 0, 0, 0,2696,2700, 0, 460, 460, 460,2704, - 0, 0, 0, 0, 0, 676, 676,2708, 0, 0, 0, 0, 0, 680, 680,2712, - 0, 0, 0, 0, 684,2716, 684,2720, 0, 0, 0, 0, 0, 0,2724,2728, - 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,2732,2736, 0, 0, - 304, 304, 304, 304,2740,2744, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, - 12, 12, 12,2748, 0, 0, 0, 0, 152, 12, 12, 184, 0, 0, 0, 0, - 2752, 36,2756,2760,2764,2768,2772,2776,2780, 688,2784, 688, 0, 0, 0,2788, - 12, 12, 156, 12, 12, 12, 12, 12, 12, 224, 528, 152, 152, 152, 12, 456, - 12, 12, 184, 0, 0, 0,2792, 12,2796, 12, 12, 156, 300, 348, 456, 0, - 12, 12, 12, 12, 12,2800, 192, 192, 12, 12, 12, 12, 12, 176, 156, 452, - 156, 12, 12, 12, 464, 176, 12, 12, 464, 12, 184, 156, 348, 300, 0, 0, - 12, 12, 12, 12, 12, 464, 184, 192,2804, 12, 12, 12,2808,2812,2816, 300, - 12, 556, 12, 12, 12, 12, 12, 352, 4, 4, 4, 4, 4, 4, 0, 0, - 4, 188, 4, 4, 4, 4, 4, 4, 4, 4, 188, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4,2820, 4, 4, 4, 4, 4, 4, 188, 0, 0, - 4, 188, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4,2824, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 552,2828, 0, 12, 12, 12, 12, 12, 12, - 0, 0, 0, 0, 4, 4, 4, 4, 8, 8, 8, 8, 12, 12, 12, 12, - 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36, 32, 32, 32, 32, - 24, 24, 24, 24, 28, 28, 28, 28, 40, 40, 40, 40, 48, 48, 48, 48, - 44, 44, 44, 44, 56, 56, 56, 56, 52, 52, 52, 52, 60, 60, 60, 60, - 64, 64, 64, 64, 76, 76, 76, 76, 68, 68, 68, 68, 80, 80, 80, 80, - 84, 84, 84, 84, 88, 88, 88, 88, 72, 72, 72, 72, 96, 96, 96, 96, - 100, 100, 100, 100, 92, 92, 92, 92, 104, 104, 104, 104, 116, 116, 116, 116, - 120, 120, 120, 120, 124, 124, 124, 124, 108, 108, 108, 108, 132, 132, 132, 132, - 112, 112, 112, 112, 136, 136, 136, 136, 128, 128, 128, 128, 148, 148, 148, 148, - 144, 144, 144, 144, 152, 152, 152, 152, 452, 12, 12, 12, 12, 12, 12, 0, - 180, 180, 180, 180, 176, 176, 176, 176, 184, 184, 184, 184, 140, 140, 140, 140, - 12, 12, 264, 0, 72, 232, 72, 232, 12, 12, 12, 264, 4, 4, 4, 600, - 12, 12, 12, 364, 240, 240, 240, 240, 168, 168, 168, 168, 188, 188, 188, 188, - 248, 248, 248, 248, 252, 252, 252, 252, 160, 160, 160, 160, 204, 204, 204, 204, - 12, 0, 0, 0, 764, 24, 24, 24, 24, 24, 628, 12, 164, 164, 164, 164, - 236, 236, 236, 236, 156, 156, 156, 156, 292, 292, 292, 292, 300, 300, 300, 300, - 268, 268, 268, 268, 208, 208, 208, 208, 324, 324, 324, 324, 192, 192, 192, 192, - 312, 312, 312, 312, 344, 344, 344, 344, 244, 244, 244, 244, 196, 196, 196, 196, - 276, 276, 276, 276, 316, 316, 316, 316, 212, 212, 212, 212, 12, 12, 364, 0, - 216, 216, 216, 216, 220, 220, 220, 220, 256, 256, 256, 256, 476, 476, 476, 476, - 396, 396, 396, 396, 172, 172, 172, 172, 228, 228, 228, 228, 260, 260, 260, 260, - 408, 408, 408, 408, 320, 320, 320, 320, 480, 480, 480, 480, 264, 0, 0, 0, - 12, 12, 296, 0, 412, 412, 412, 412, 8, 8, 8, 812, 484, 484, 484, 484, - 416, 416, 416, 416, 272, 272, 272, 272, 304, 304, 304, 304, 488, 488, 488, 488, - 496, 496, 496, 496, 308, 308, 308, 308, 456, 456, 456, 456, 460, 460, 460, 460, - 420, 420, 420, 420, 368, 368, 368, 368, 328, 328, 328, 328, 372, 372, 372, 372, - 348, 348, 348, 348, 352, 352, 352, 352, 380, 380, 380, 380, 432, 432, 432, 432, - 200, 200, 200, 200, 280, 280, 280, 280, 284, 284, 284, 284, 436, 436, 436, 436, - 440, 440, 440, 440, 364, 0, 0, 0, 12, 264, 0, 0, 444, 444, 444, 444, - 12, 12, 0, 0, 12, 12, 768, 12, 24, 628, 24, 24, 400, 400, 400, 400, - 112, 112, 892, 112, 112, 112, 112,1048, 124,1052, 0,1056, 72, 72, 684, 636, - 684, 636, 72, 72, 136, 136, 900, 0, 340, 340, 340, 0, 156, 156, 904, 0, - 52, 52, 52,1072, 68, 688, 68, 688, 68, 772, 68, 68, 12, 648, 12, 12, - 12, 12, 12, 296, 24, 24, 24,1092, 916, 92, 92, 92, 520, 520, 520, 520, - 524, 524, 524, 524, 572, 572, 572, 572, 4, 4, 600, 0, 296, 12, 12, 12, - 108, 108, 108,1132, 576, 576, 576, 576, 536, 536, 536, 536, 492, 492, 492, 492, - 540, 540, 540, 540, 500, 500, 924, 500, 528, 528, 528, 528, 604, 604, 604, 604, - 608, 608, 608, 608, 464, 464,1144, 0, 612, 612, 612, 612, 616, 616, 616, 616, - 532, 532, 532, 532, 504, 504, 504, 504, 544, 544, 544, 544, 548, 548, 548, 548, - 552, 552, 552, 552, 588, 588, 588, 588, 376, 376, 376, 376, 352, 352,1188, 0, - 424, 424, 424, 424, 384, 384,1200, 384, 384, 384, 384, 384, 556, 556, 556, 556, - 388, 388, 388, 388, 392, 392, 392, 392, 472, 472, 472, 472, 512, 512, 512, 512, - 356, 356, 356, 356, 560, 560, 560, 560, 564, 564, 564, 564, 516, 516, 516, 516, - 28, 28, 28, 0, 24, 24, 840, 12, 24, 840,1264, 12, 68,1268, 844,1272, - 0,1276, 848, 772,1280, 68, 68, 68,1284, 144, 144, 144, 60,1288, 60, 60, - 852, 220, 220, 220, 220, 952, 852, 220, 220, 220, 952, 852, 956, 164, 164, 164, - 164, 164, 0, 0, 164, 164, 960,1292, 164,1296, 0, 0, 28, 964, 28, 968, - 28, 28, 972, 972, 968, 28,1300, 52, 52,1304, 28, 28,1308, 28, 28, 28, - 28, 28, 28, 964, 256, 256, 256,1312, 256, 256, 976,1316,1320, 0, 0, 0, - 396, 396,1324,1328, 400, 400, 400,1332, 400, 400, 400,1336, 632, 632, 632, 632, - 632, 632, 632,1340, 256, 256, 976, 0, 980, 984, 28, 28,1344, 28, 28, 28, - 1348,1352, 120, 120, 120,1356, 120, 120, 332,1360, 332, 776, 776, 332, 332, 332, - 332, 332,1364, 332,1368, 988,1372, 332, 332, 776, 776, 992, 0,1376, 0,1380, - 332, 988, 332, 332, 332, 332, 332, 992, 856, 856, 860, 996,1000, 568, 568, 568, - 568, 568, 864, 568, 864,1384,1004, 864, 860, 996,1000,1004,1388, 0, 856,1392, - 0,1396, 568, 568, 568, 860, 0, 0, 780, 780, 448, 784, 784, 448, 448, 448, - 448, 448,1008, 448,1008, 780, 868, 448, 448, 784, 784, 868,1400, 0, 0, 0, - 448,1404, 448, 448, 868, 0, 780, 448, 788, 788, 404, 792, 792, 404, 404, 404, - 404, 404,1012, 404,1012, 788,1016, 404, 404, 792, 792,1016, 0, 788, 0,1408, - 404,1412, 404, 404, 404, 404, 0, 0, 680,1416, 796, 680, 872, 800,1420, 872, - 876,1020, 796, 680, 284, 284, 800, 680, 796, 680, 872, 800,1020, 876, 0, 0, - 0, 680, 284, 284, 284, 284, 796, 0, 288, 288, 288, 728, 728, 288, 288, 288, - 288, 288, 728, 288, 288, 288, 880, 288, 288, 728, 728, 880, 0,1424,1428, 880, - 288,1432, 288, 288, 0,1436, 288, 288, 360, 360, 360, 732, 732, 360, 360, 360, - 360, 360, 732, 360, 360,1024,1028, 360, 360, 732, 732,1028, 0,1440, 0,1444, - 360,1448, 360, 360,1024, 0, 0, 0, 172, 172, 172, 804, 804, 172, 172, 172, - 172, 804, 804, 172, 0, 172, 172, 172, 172,1452, 172, 172, 884, 884, 224, 224, - 224,1032, 888, 224, 224, 224, 224, 224,1456, 224, 224,1460, 224,1032,1464,1468, - 224,1472, 224, 224, 0, 888, 224, 224, 888,1036, 0, 0,1476, 228, 228, 228, - 228, 228,1480, 736, 228, 228, 228, 0,1484,1488,1040, 336, 336, 336, 336, 336, - 336,1492, 336, 336, 336, 336, 336,1044, 336,1496, 336,1040, 336, 336,1044, 336, - 112, 112, 112,1500, 892, 112, 112, 112, 112,1504,1508, 0, 124, 124,1512, 124, - 72, 232, 684, 636, 684, 636, 72, 232, 72, 232, 72, 72, 72, 72, 232, 808, - 72, 72, 72,1516, 72, 72, 636, 0, 116,1060, 116,1060, 640, 640, 640, 640, - 640, 640, 640,1520, 236, 236,1524,1528, 236, 236,1532, 0, 740, 740, 740, 740, - 740,1536, 0,1540, 744, 744, 744, 744, 744,1544, 0, 0, 748, 748, 748, 748, - 748, 0, 0, 0, 896, 896, 896,1064,1064, 0, 0, 0, 136, 136, 136, 900, - 1548,1552, 128, 128, 128, 128,1556, 0, 128, 128,1068, 0, 128, 128,1560, 0, - 40,1564, 0, 0, 340, 340, 340, 340, 340, 340, 340,1568,1572, 340, 340, 340, - 596, 596, 596, 596, 596, 596, 596,1576, 596,1580, 0, 0, 260, 260, 260, 0, - 260, 260,1584, 0, 260, 260,1588,1592, 644, 644, 644, 644, 644, 644, 644,1596, - 156, 156, 156,1600, 156, 156, 156,1604, 156, 156, 156, 904, 52, 52, 52, 0, - 148, 148, 148,1608, 408, 0, 0, 408, 320, 320,1612, 320, 320, 320,1616,1620, - 60, 60,1624, 0, 124, 124,1628,1632, 292, 292, 0, 0,1076, 52, 52, 52, - 1636, 52, 908,1640, 12, 908,1644, 0, 24,1080,1648, 24, 24, 24, 24,1652, - 1656,1080,1660, 24, 24, 24,1664, 24, 24, 24, 24,1668, 68, 68,1084,1084, - 68, 68, 68, 688, 68, 844, 68,1672, 844, 772, 68, 848, 12, 12, 12, 912, - 1676, 12, 12,1088,1680, 0, 0, 0, 12,1684,1096, 12, 768, 12, 12, 12, - 12, 12, 12, 768, 24, 24, 840, 0, 12, 692, 12, 12, 144, 0,1688, 144, - 412, 412, 0,1100,1692, 0, 0,1100, 72, 232, 0, 0, 4, 4,1696, 4, - 4, 0, 0, 0, 4, 600, 0, 0, 12,1700, 12, 12,1704, 4,1708,1712, - 12, 12, 4, 12,1716, 80, 80, 80, 80,1104,1720,1724, 92, 92,1108, 916, - 0,1728, 300, 300,1732, 8, 8, 8, 12, 264, 0, 736, 8, 8, 8,1736, - 92, 92, 92,1108, 92, 92, 12, 12, 36, 36, 36,1740, 36,1744, 0, 0, - 88, 88, 88, 0, 48, 48, 0, 0,1096, 24, 24, 24, 24, 24,1088, 24, - 1112, 24, 24, 24, 520, 520, 520,1748, 416, 416, 0, 0, 268,1116, 0,1752, - 268, 268,1116, 0, 524, 524, 524,1756, 572, 0, 0,1760, 8, 8, 8,1120, - 208, 208, 208,1764, 208, 208,1768,1772, 100, 100, 100,1776, 272,1780, 0, 0, - 272, 272, 272,1124, 272, 272,1124, 272,1784, 0, 0, 0, 0, 0,1788, 324, - 304,1792, 0, 0, 808, 232, 808, 232, 808, 232, 0, 0, 24, 24, 628, 24, - 24,1796,1800, 0, 304, 304, 304,1128, 304, 304,1128, 0, 8, 0, 0, 0, - 8, 812,1804, 8, 8, 8, 8, 0, 24, 816, 0, 0,1808, 220, 0, 956, - 164, 960, 164,1812,1816,1820, 164, 164, 28, 28, 28,1824, 52, 52, 52,1828, - 12, 296, 12, 0, 28,1832, 28, 28, 28, 28, 28,1836, 12,1840, 92, 92, - 92, 92, 92,1844, 820, 8, 820, 8, 820, 8, 820,1120, 12, 296, 12, 296, - 0, 0, 452, 264, 108, 108, 108,1848, 108, 920, 108, 108, 108, 108, 920,1852, - 108, 108, 920, 0, 296, 736, 12, 12, 12, 736, 12, 12, 68, 68, 68, 848, - 1856, 0, 0, 0, 12, 12, 12,1860, 652, 652, 652, 652, 652, 652, 652,1864, - 1868, 0, 0, 0, 908, 12, 12, 12, 576, 0, 0,1872, 696, 696, 696, 696, - 696, 696,1876, 0, 536, 536,1880, 0, 656, 656, 656, 656, 656, 656, 656,1884, - 492, 0, 492, 492, 492,1888, 0, 0, 580, 580, 580, 580, 580, 580, 580,1136, - 580, 580,1136, 0, 308, 0, 308, 308, 308, 308, 308, 0, 540, 540, 0, 0, - 456, 0, 0,1892, 924, 824, 500, 500, 824, 500, 500, 500, 824, 500, 824,1896, - 460, 0, 0, 0, 84,1900, 0, 0, 84,1904, 0, 0, 84, 84, 0, 0, - 24,1908, 24, 24,1912, 24, 816, 0, 528,1916,1920, 528, 528,1924,1928,1932, - 660, 660, 660, 660, 660,1936, 660, 660, 584, 584, 584, 584, 584, 584, 584,1940, - 0,1944, 584, 584, 752, 752, 752, 752,1948,1952,1956, 752, 664, 664, 664, 664, - 664, 664, 664,1960, 700, 700, 700, 700, 700, 700,1964,1968, 704, 704, 704, 704, - 704, 704,1972, 0, 192, 192, 0, 192,1976, 192, 192, 192, 464,1980, 0, 464, - 464,1140,1140, 464, 464, 464, 464, 464, 464,1984,1988,1992, 532,1148,1996, 532, - 532,1148, 0, 0, 420,2000,2004, 420, 668, 668, 668, 668, 668,2008, 668, 668, - 708, 708, 708, 708,2012, 0, 708, 708, 756, 756, 756, 756,2016, 0,1152,2020, - 0, 0,1152, 756, 312, 312,2024, 0,1156, 0, 0, 0,1156, 0,2028, 180, - 504, 504, 0, 0, 504, 504,2032, 0, 368,1160,2036, 368, 368,1160, 0,2040, - 28, 28, 28, 828, 544, 544,2044,1164,1164, 0, 0, 0,1168, 28, 0, 0, - 28, 28,2048, 0, 0, 0,1168, 28, 548, 548, 0, 0, 552, 552,2052, 0, - 712, 712, 712, 712, 712, 712,2056, 0, 672, 672, 672, 672, 672, 672, 672, 0, - 760, 760, 760, 760, 760,2060, 0, 0, 168, 168, 168,1172,2064, 168, 168, 168, - 168,1172, 0,2068,2072, 0, 0,2076, 620, 620, 620, 620, 620, 620,2080, 0, - 620, 620,2084, 0, 328,2088, 328, 328, 328, 328, 0, 0, 588,2092, 0, 0, - 884, 224, 224, 224, 224,1036, 0, 0,2096, 372, 372, 372,2100, 0, 0, 0, - 716,2104,2108,1176, 716, 716, 716,1176, 716, 716,2112, 0, 348, 348,2116, 0, - 348, 348,2120, 0, 468, 928, 468, 832, 832, 468, 468, 468, 468, 468,1180, 468, - 1180, 928,2124, 468, 468, 832, 832,2128, 932,2132, 0, 928, 468,2136, 468, 932, - 468, 932, 0, 0, 376, 376, 936,2140, 376, 936, 376, 376,2144,2148,2152, 376, - 376, 936,2156, 0,2160, 0, 0, 0, 188, 188, 188,2164,2168, 0, 0, 0, - 244, 244, 0, 0, 244, 244,2172, 0, 196,1184, 196, 196, 196, 196, 196,1184, - 276,2176, 0, 0, 276, 276,2180, 0, 128, 128, 128,1068, 100, 0, 0, 0, - 424, 424,1192,2184, 424, 424, 424, 0, 424,1192, 0, 0, 380, 380, 380, 0, - 2188, 0, 0,2192, 428,1196,2196, 428, 428,2200, 428, 428, 428, 428, 428, 428, - 428,2204,2208, 428, 428,1196, 0, 0, 428, 428,2212, 0, 384,2216, 0, 0, - 316, 316, 0, 0,2220, 0, 0, 0, 432, 432,2224, 0, 120, 120,2228, 0, - 176, 176, 0, 0,1204, 0, 0, 0, 556, 556,1204, 0, 200, 200,2232, 200, - 200,2236, 200, 200, 200,2240, 0, 0, 200, 200, 200,2244,2248, 388, 388, 388, - 388, 388,2252, 388, 388,2256, 0, 0, 392,1208,1212, 392, 392,1208,2260,1212, - 392, 392, 0, 0, 392, 392,2264, 0, 508,1216,2268, 508, 508, 508, 508, 508, - 508, 508, 508,2272,1216, 508,2276, 0, 508, 508,2280, 0, 472, 472, 472, 0, - 472, 472,2284, 0, 720, 720, 720, 720, 720, 720,2288, 0,2292, 280, 280, 280, - 280, 280,1220,2296, 280, 280,1220, 0,2300, 0, 0, 0, 800, 0, 0, 876, - 32, 32,2304, 0, 32, 32, 32,2308, 32,2312, 0, 0, 32, 0, 0, 0, - 2316, 0, 0, 0, 20,2320, 0, 0, 20, 20,2324, 0, 56,2328, 0, 0, - 436, 436,2332, 0, 48, 48,2336, 0, 592, 592, 592, 592, 592, 592, 592,2340, - 592, 592,2344,2348, 212, 212, 212,2352, 212, 212,2356, 0, 624, 624, 624, 624, - 624, 624, 624,1224, 624,1224, 0, 0, 160,2360, 0, 0, 160, 160,1228, 160, - 1228, 160, 160, 160, 160, 160, 0,2364, 440, 440,2368, 0, 204, 204,2372, 0, - 512, 512,2376, 512, 512, 0, 0, 0, 132, 132,2380,1232, 132, 132, 0,1232, - 2384,2388, 0, 0, 4,1236, 0, 0, 64,2392, 0, 0, 0, 0, 0,2396, - 16, 16, 16,1240,1240, 0, 0, 0, 92,2400, 92,2404,2408, 80, 80, 80, - 2412, 0, 0, 0,2416, 0, 0, 0,1104,2420, 0, 0, 0, 92, 0, 0, - 76, 76, 76, 0, 140, 140,2424, 0, 140, 140, 140,1244, 140, 140,1244, 0, - 140, 140,2428, 140, 12, 0, 692, 12, 52,2432, 0, 0, 12, 296, 452, 12, - 12,1248, 912, 12, 12, 12,1248, 52,1076,2436, 52, 12, 12, 12,2440, 912, - 68, 688, 0, 0, 12, 296, 0, 0, 12, 12, 12, 648,2444,2448, 452, 648, - 12, 12, 940, 452, 12, 452, 12, 12, 12, 940, 296, 452, 12, 648, 12, 648, - 12, 12, 940, 296, 12,2452, 692, 12, 648, 12, 12, 12, 12, 264, 12, 12, - 12, 12, 12, 692, 44, 44, 44, 0, 0, 0,2456, 44,2460, 44, 44, 44, - 24, 24, 24, 816, 0,1112, 816, 0, 152,1252, 152, 152, 152, 152,2464, 152, - 2468,2472,1252, 0, 60, 60, 60,2476, 0, 0, 0,2480, 356, 356, 356,2484, - 356, 356, 356,1256, 356, 356,1256,2488, 676, 676, 676, 676, 676, 676, 676,2492, - 444, 444,2496,2500, 560, 560,2504, 0, 564, 564,2508,2512, 516, 516, 516,2516, - 516,2520, 0,2524, 72, 232, 72,2528, 72, 72, 72, 232, 104,2532, 104, 104, - 104,2536, 0, 0, 216, 216, 216, 0, 216, 216,2540,2544, 12, 364, 0, 0, - 28, 724, 28, 28, 944, 948, 724, 28, 828, 28, 836, 0,2548, 984, 836, 724, - 944, 948, 836, 836, 944, 948, 828, 28, 828, 28, 724,2552, 28, 28,1260, 28, - 724, 724,1260, 28, 980, 0, 0, 0, 0, 692, 12, 12,2556, 0, 0, 0, - 12, 12, 364, 12, 12, 12, 296, 692, 12, 296, 364, 452, 12, 12, 12,2560, - 12, 12, 296, 736,2564, 0, 0, 0, 4, 4,1236, 0,2568, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 939, 940, 941, - 942, 946, 948, 0, 962, 969, 970, 971, 976,1001,1002,1003,1008, 0,1033,1040, - 1041,1042,1043,1047, 0, 0,1080,1081,1082,1086,1110, 0, 0,1124,1125,1126, - 1127,1131,1133, 0,1147,1154,1155,1156,1161,1187,1188,1189,1193, 0,1219,1226, - 1227,1228,1229,1233, 0, 0,1267,1268,1269,1273,1298, 0,1303, 943,1128, 944, - 1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149, 0, 0, 973, - 1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175, 991,1176, 993, - 1178, 994,1179, 0, 0,1004,1190,1005,1191,1006,1192,1014,1199,1007, 0, 0, - 0,1016,1201,1020,1206, 0,1022,1208,1025,1211,1023,1209, 0, 0, 0, 0, - 1032,1218,1037,1223,1035,1221, 0, 0, 0,1044,1230,1045,1231,1049,1235, 0, - 0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,1069,1255,1077, - 1264,1074,1261, 0, 0,1083,1270,1084,1271,1085,1272,1088,1275,1089,1276,1096, - 1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310, 0,1053,1239, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1093,1280, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 949,1134,1010,1195,1050,1236, - 1090,1277,1341,1368,1340,1367,1342,1369,1339,1366, 0,1320,1347,1418,1419,1323, - 1350, 0, 0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,1202, 0, 0, - 0, 987,1172, 0, 0,1031,1217,1321,1348,1322,1349,1338,1365, 950,1135, 951, - 1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,1061,1247,1062, - 1248,1091,1278,1092,1279,1071,1257,1076,1263, 0, 0, 997,1182, 0, 0, 0, - 0, 0, 0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,1422,1423,1113, - 1301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 0, - 10,1425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0,1314,1427, 5,1434,1438,1443, 0,1450, 0,1455,1461,1514, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1446,1458,1468,1476,1480,1486,1517, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1489,1503,1494,1500,1508, 0, 0, 0, 0, - 1520,1521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1526,1528, 0, - 1525, 0, 0, 0,1522, 0, 0, 0, 0,1536,1532,1539, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1534, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1556, 0, 0, 0, 0, 0, 0,1548,1550, 0, - 1547, 0, 0, 0,1567, 0, 0, 0, 0,1558,1554,1561, 0, 0, 0, 0, - 0, 0, 0,1568,1569, 0, 0, 0, 0, 0, 0, 0, 0, 0,1529,1551, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1523,1545,1524, - 1546, 0, 0,1527,1549, 0, 0,1570,1571,1530,1552,1531,1553, 0, 0,1533, - 1555,1535,1557,1537,1559, 0, 0,1572,1573,1544,1566,1538,1560,1540,1562,1541, - 1563,1542,1564, 0, 0,1543,1565, 0, 0, 0, 0, 0, 0, 0, 0,1606, - 1607,1609,1608,1610, 0, 0, 0, 0, 0, 0, 0, 0, 0,1613, 0,1611, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1620, 0, 0, 0, 0, 0, 0, 0,1623, 0, - 0,1624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1614,1615,1616,1617,1618,1619,1621,1622, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1628,1629, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1625,1626, 0,1627, 0, 0, 0, - 1634, 0, 0,1635, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1630,1631,1632, 0, 0,1633, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1639, 0, 0,1638,1640, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1636,1637, 0, 0, 0, 0, 0, - 0,1641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1642,1644,1643, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1645, 0, 0, 0, 0, 0, 0, 0,1646, 0, 0, - 0, 0, 0, 0,1648,1649, 0,1647,1650, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1651,1653,1652, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1654, 0,1655,1657,1656, 0, 0, 0, 0, - 1659, 0, 0, 0, 0, 0, 0, 0, 0, 0,1660, 0, 0, 0, 0,1661, - 0, 0, 0, 0,1662, 0, 0, 0, 0,1663, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1658, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1664, 0,1665,1673, 0,1674, 0, 0, 0, 0, 0, 0, 0, 0,1666, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1668, 0, 0, 0, 0, 0, 0, 0, 0, 0,1669, 0, 0, 0, 0,1670, - 0, 0, 0, 0,1671, 0, 0, 0, 0,1672, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1667, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1675, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1676, 0,1677, 0,1678, 0,1679, 0,1680, 0, 0, 0,1681, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1682, 0,1683, 0, 0,1684,1685, 0, - 1686, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 953,1138, 955, - 1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153, 966,1151, 967, - 1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171, 989,1174, 995, - 1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,1017,1203,1019, - 1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,1029,1215,1030, - 1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,1382,1384,1383, - 1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,1068,1254,1070, - 1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,1078,1265,1095, - 1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,1101,1288,1102, - 1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,1119,1308,1122, - 1311,1123,1312,1186,1260,1293,1305, 0,1394, 0, 0, 0, 0, 952,1137, 947, - 1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,1370,1374,1373, - 1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,1325,1352,1328, - 1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,1331,1358,1330, - 1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,1397,1402,1399, - 1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,1409,1414,1109, - 1297,1117,1306,1116,1304,1112,1300, 0, 0, 0, 0, 0, 0,1471,1472,1701, - 1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,1477,1478,1729, - 1731,1730,1732, 0, 0,1435,1436,1733,1735,1734,1736, 0, 0,1481,1482,1737, - 1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,1490,1491,1765, - 1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,1495,1496,1777, - 1779,1778,1780, 0, 0,1451,1452,1781,1783,1782,1784, 0, 0,1504,1505,1785, - 1788,1786,1789,1787,1790, 0,1459, 0,1791, 0,1792, 0,1793,1509,1510,1794, - 1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,1467, 21,1475, - 22,1479, 23,1485, 24,1493, 27,1499, 28,1507, 29, 0, 0,1704,1708,1709, - 1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,1740,1744,1745, - 1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,1797,1801,1802, - 1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,1470,1469,1822, - 1474,1465, 0,1473,1825,1429,1428,1426, 12,1432, 0, 26, 0, 0,1315,1823, - 1484,1466, 0,1483,1829,1433, 13,1437, 14,1441,1826,1827,1828,1488,1487,1513, - 19, 0, 0,1492,1515,1445,1444,1442, 15, 0,1831,1832,1833,1502,1501,1516, - 25,1497,1498,1506,1518,1457,1456,1454, 17,1453,1313, 11, 3, 0, 0,1824, - 1512,1519, 0,1511,1830,1449, 16,1460, 18,1464, 4, 0, 0, 30, 31, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 20, 0, 0, 0, 2, 6, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1834,1835, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1836, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1837,1839,1838, 0, 0, 0, - 0,1840, 0, 0, 0, 0,1841, 0, 0,1842, 0, 0, 0, 0, 0, 0, - 0,1843, 0,1844, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1845, 0, - 0,1846, 0, 0,1847, 0,1848, 0, 0, 0, 0, 0, 0, 937, 0,1850, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1849, 936, 938,1851,1852, 0, - 0,1853,1854, 0, 0,1855,1856, 0, 0, 0, 0, 0, 0,1857,1858, 0, - 0,1861,1862, 0, 0,1863,1864, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1867,1868,1869,1870,1859,1860,1865, - 1866, 0, 0, 0, 0, 0, 0,1871,1872,1873,1874, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 32, 33, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1875, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1877, 0,1878, 0,1879, 0,1880, - 0,1881, 0,1882, 0,1883, 0,1884, 0,1885, 0,1886, 0,1887, 0,1888, - 0, 0,1889, 0,1890, 0,1891, 0, 0, 0, 0, 0, 0,1892,1893, 0, - 1894,1895, 0,1896,1897, 0,1898,1899, 0,1900,1901, 0, 0, 0, 0, 0, - 0,1876, 0, 0, 0, 0, 0, 0, 0, 0, 0,1902, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1904, 0,1905, 0,1906, 0,1907, - 0,1908, 0,1909, 0,1910, 0,1911, 0,1912, 0,1913, 0,1914, 0,1915, - 0, 0,1916, 0,1917, 0,1918, 0, 0, 0, 0, 0, 0,1919,1920, 0, - 1921,1922, 0,1923,1924, 0,1925,1926, 0,1927,1928, 0, 0, 0, 0, 0, - 0,1903, 0, 0,1929,1930,1931,1932, 0, 0, 0,1933, 0, 710, 385, 724, - 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688, - 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462, - 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481, - 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233, - 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167, - 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518, - 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428, - 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297, - 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, - 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292, - 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778, - 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655, - 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340, - 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, - 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805, - 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346, - 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210, 0, 0, 227, 0, 379, - 0, 0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604, 0, 661, 0, 703, - 0, 0, 735, 743, 0, 0, 0, 793, 794, 795, 808, 741, 773, 118, 127, 130, - 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375, - 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554, - 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651, 690, 695, 705, - 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623, 0, 0, 102, 145, 134, - 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243, 250, 254, 294, - 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362, 370, 379, 388, - 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490, 493, 507, 512, - 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586, 591, 597, 607, - 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706, 709, 717, 728, - 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848, 847, 857, 55, - 65, 66, 883, 892, 916, 822, 824, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1586, 0,1605, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1602,1603,1934,1935,1574,1575,1576,1577,1579, - 1580,1581,1583,1584, 0,1585,1587,1588,1589,1591, 0,1592, 0,1593,1594, 0, - 1595,1596, 0,1598,1599,1600,1601,1604,1582,1578,1590,1597, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1936, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,1937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1938, 0,1939, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1940, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1941,1942, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1943,1944, 0, 0, 0, 0, 0, 0, - 1945, 0,1946, 0, 0, 0, 0, 0, 0, 0, 0,1947, 0, 0,1948, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,1950, 0,1949,1951, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1953,1952, 0,1954, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,1955,1956, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1957, 0, 0, 0, 0, 0, 0, 0, 0,1958,1961, - 1959,1965,1960,1962,1964,1963, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1967,1966,1968, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1969,1970,1971,1972,1973, - 1974,1975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1976,1977,1978,1980,1979,1981, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 106, 104, 107, - 826, 114, 118, 119, 121, 123, 124, 127, 125, 34, 830, 130, 131, 132, 137, 827, - 35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152, 37, 157, 158, 159, - 160, 38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179, 181, 182, 182, - 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195, 197, 199, 200, - 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216, 153, 234, 221, - 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244, 836, 837, 247, - 248, 249, 246, 251, 39, 40, 253, 255, 255, 838, 257, 258, 259, 261, 839, 262, - 263, 301, 264, 41, 266, 270, 272, 271, 841, 274, 842, 277, 276, 278, 281, 282, - 42, 283, 284, 285, 286, 43, 843, 44, 289, 290, 291, 293, 934, 298, 845, 845, - 621, 300, 300, 45, 852, 894, 302, 304, 46, 306, 309, 310, 312, 316, 48, 47, - 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334, 335, 336, 338, - 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361, 358, 356, 49, - 363, 365, 367, 364, 50, 369, 371, 851, 376, 386, 378, 53, 381, 52, 51, 140, - 141, 387, 382, 614, 78, 388, 389, 390, 394, 392, 856, 54, 399, 396, 402, 404, - 858, 405, 401, 407, 55, 408, 409, 410, 413, 859, 415, 56, 417, 860, 418, 57, - 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433, 437, 441, 438, - 439, 442, 443, 864, 436, 449, 450, 58, 454, 453, 865, 447, 460, 866, 867, 461, - 466, 465, 464, 59, 467, 470, 469, 472, 828, 475, 868, 478, 870, 483, 485, 486, - 871, 488, 489, 872, 873, 495, 497, 60, 498, 61, 61, 504, 505, 507, 508, 511, - 62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878, 63, 64, 528, 880, 879, - 881, 882, 530, 531, 531, 533, 66, 534, 67, 68, 884, 536, 538, 541, 69, 885, - 549, 886, 887, 556, 559, 70, 561, 562, 563, 888, 889, 889, 567, 71, 890, 570, - 571, 72, 891, 577, 73, 581, 579, 582, 893, 587, 74, 590, 592, 596, 75, 895, - 896, 76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611, 853, 77, 615, - 616, 79, 617, 252, 902, 903, 854, 855, 621, 622, 731, 80, 627, 626, 628, 164, - 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651, 638, 643, 644, - 645, 905, 907, 906, 81, 653, 654, 656, 911, 657, 908, 82, 83, 909, 910, 84, - 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675, 85, 677, 678, 86, - 681, 682, 912, 685, 686, 87, 689, 36, 913, 914, 88, 89, 696, 702, 709, 711, - 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728, 918, 919, 739, - 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762, 90, 764, 922, 91, - 775, 279, 780, 923, 925, 92, 93, 785, 926, 94, 927, 787, 787, 789, 928, 792, - 95, 796, 797, 798, 800, 96, 929, 802, 804, 806, 97, 98, 807, 930, 99, 931, - 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935, 0, 0, + 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, + 20, 20, 20, 20, 20, 20, 20, 20, 24, 24, 24, 24, 24, 24, 24, 24, + 16, 16, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32, + 28, 28, 28, 28, 28, 28, 28, 28, 40, 40, 40, 40, 40, 40, 40, 40, + 36, 36, 36, 36, 36, 36, 36, 36, 48, 48, 48, 48, 48, 48, 48, 48, + 60, 60, 60, 60, 60, 60, 60, 60, 56, 56, 56, 56, 56, 56, 56, 56, + 52, 52, 52, 52, 52, 52, 52, 52, 16, 16, 112, 112, 16, 324, 184, 184, + 36, 36, 36, 36, 36, 328, 16, 332, 64, 64, 64, 336, 340, 344, 96, 348, + 72, 72, 72, 72, 352, 72, 72, 72, 72, 356, 360, 364, 368, 372, 376, 380, + 384, 44, 388, 392, 44, 44, 396, 44, 400, 404, 408, 44, 412, 416, 420, 424, + 428, 432, 436, 440, 444, 44, 44, 448, 124, 124, 452, 456, 460, 464, 468, 472, + 476, 480, 484, 488, 492, 496, 500, 504, 508, 512, 516, 520, 524, 528, 532, 536, + 540, 544, 548, 552, 556, 560, 564, 568, 572, 576, 580, 584, 588, 592, 596, 600, + 604, 608, 612, 0, 616, 620, 624, 0, 188, 188, 628, 632, 636, 640, 644, 0, + 100, 100, 100, 100, 100, 192, 648, 652, 108, 108, 656, 108, 660, 664, 668, 108, + 672, 108, 676, 680, 684, 116, 116, 688, 48, 48, 48, 48, 692, 196, 196, 696, + 700, 704, 708, 712, 128, 128, 716, 720, 724, 132, 132, 728, 132, 732, 48, 736, + 740, 744, 748, 752, 756, 760, 764, 128, 768, 772, 776, 780, 784, 788, 64, 200, + 136, 136, 792, 136, 204, 204, 796, 800, 804, 808, 812, 816, 820, 824, 828, 832, + 36, 836, 840, 844, 36, 848, 64, 64, 852, 96, 856, 860, 96, 864, 868, 872, + 876, 16, 16, 880, 884, 16, 888, 200, 16, 892, 896, 36, 900, 16, 16, 16, + 16, 904, 908, 16, 16, 16, 16, 16, 92, 92, 92, 92, 92, 92, 92, 92, + 16, 16, 16, 912, 16, 16, 16, 16, 140, 140, 140, 36, 144, 144, 144, 916, + 192, 920, 924, 928, 932, 208, 208, 72, 16, 16, 148, 152, 936, 4, 4, 940, + 4, 4, 4, 4, 4, 4, 944, 212, 948, 952, 956, 80, 960, 964, 156, 968, + 972, 976, 8, 8, 980, 984, 16, 988, 216, 16, 16, 992, 16, 16, 996,1000, + 156, 156,1004, 16, 16, 16, 16, 16, 4, 4, 4, 4, 4, 4, 16, 16, + 32, 32, 32, 32,1008, 32,1012,1016, 84, 84, 84, 84, 84, 84, 84, 84, + 84,1020, 72, 72, 72, 56, 56,1024, 16,1028, 36, 36,1032, 36,1036,1040, + 1044,1048,1052,1056, 220, 220,1060, 124,1064,1068,1072,1076, 224, 224,1080,1084, + 1088,1092,1096, 100, 228, 228,1100,1104,1108,1112,1116,1120, 116, 116,1124,1128, + 8, 8, 8, 8, 8,1132,1136,1140, 4, 4, 4, 232, 4, 4, 236, 0, + 1144,1148,1152, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44,1156, 44, 44, 44, 44,1160,1164,1168,1172, 240,1176, 44, 44, 44,1180, + 244, 112, 112,1184,1188, 216,1192,1196,1200,1204,1208, 0, 160, 160, 160,1212, + 1216,1220, 96, 96,1224,1228, 212,1232, 0, 0, 0, 0,1236,1240,1244,1248, + 1252,1256,1260,1264,1268,1272,1276, 0, 248, 248,1280,1284,1288,1292,1296,1300, + 1304,1308,1312,1316,1320,1324,1328,1332, 88, 88, 88, 88, 88, 88, 88, 88, + 88,1336,1340,1344,1348,1352, 0, 0,1356,1360,1364,1368,1372,1376, 0,1380, + 1384,1388,1392, 0,1396,1400,1404,1408,1412,1416,1420,1424,1428, 0,1432,1436, + 1440,1444,1448,1452,1456,1460, 0, 0, 252, 252,1464, 0, 256,1468, 256,1472, + 1476,1480,1484,1488,1492, 0, 0, 0, 0, 0, 0,1496,1500,1504,1508,1512, + 1516,1520,1524,1528,1532,1536,1540,1544, 260, 260,1548,1552, 264, 264,1556,1560, + 1564,1568,1572,1576, 164, 164, 164,1580,1584,1588,1592, 0,1596,1600,1604,1608, + 1612,1616,1620,1624,1628,1632,1636,1640, 268, 268,1644,1648, 272, 272,1652, 0, + 0, 0, 0, 0,1656,1660,1664, 0, 276, 276,1668,1672,1676,1680,1684,1688, + 1692,1696,1700, 0, 0, 0, 0, 0,1704,1708, 0, 0, 0, 280, 280,1712, + 1716,1720,1724, 0, 0,1728,1732,1736, 284, 284,1740, 288, 288,1744,1748,1752, + 1756, 0, 0,1760, 0, 0,1764,1768,1772,1776,1780,1784,1788,1792, 0, 0, + 1796,1800,1804,1808,1812,1816,1820,1824, 0, 0, 0, 0, 0, 0, 0,1828, + 1832,1836,1840, 0, 0,1844,1848,1852, 28, 28, 28, 28,1856, 0, 0, 0, + 28, 28,1860, 28, 28,1864, 120, 120, 120, 120,1868, 28,1872, 0, 0, 0, + 0, 0, 0, 0,1876, 292, 292,1880, 24, 24,1884, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24,1888, 60, 60,1892, 0, 0, 0, 0, 0, + 1896,1900, 0, 0, 0, 0, 0, 0, 56,1904,1908,1912,1916,1920,1924,1928, + 296, 296,1932,1936,1940, 0, 0, 0, 0, 0,1944,1948, 0, 0, 0, 0, + 0, 0, 300, 300,1952,1956,1960, 0, 168, 168,1964, 168,1968, 0, 0,1972, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,1976,1980, + 20,1984, 0, 0, 20, 20, 20,1988, 40, 40, 40, 40,1992, 40,1996, 0, + 0, 0, 0, 0, 0, 0, 0,2000,2004, 80, 80, 80, 80, 80, 80, 80, + 80,2008,2012,2016, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,2020, + 172, 172, 172,2024,2028, 152, 0, 0, 16, 16, 16, 16, 16, 16, 16, 304, + 16, 16, 16, 16, 16,2032,2036, 148, 64,2040,2044, 16, 16, 16, 152, 0, + 16, 16, 16, 16, 16, 16, 16, 308, 16,2048, 16,2052,2056,2060, 16, 16, + 96, 96,2064, 16,2068, 0, 176, 176, 16, 16,2072,2076, 0, 0, 0, 0, + 16, 16,2080, 16,2084,2088,2092, 16,2096,2100,2104, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16,2108, 16, 16, 16, 16, 16, 16, 16, 16,2112, 16, + 52, 52, 52, 52,2116,2120, 0, 0, 304, 0, 0, 0, 0, 0, 0, 0, + 36, 36, 36, 36,2124, 0,2128,2132,2136,2140, 72,2144,2148, 0, 0, 0, + 2152,2156,2160, 0, 0, 0, 0, 0, 0, 0, 0, 0,2164,2168,2172,2176, + 0, 0, 0, 0, 0, 0,2180,2184, 0, 0, 0, 0, 0, 0,2188,2192, + 0, 0, 0, 0, 0, 0,2196,2200, 0, 0, 0, 0, 0, 0, 0,2204, + 104, 104, 104, 104, 104, 104,2208, 0, 312, 312,2212, 0, 0, 0, 0, 0, + 0, 0, 0,2216, 16,2220, 0, 0, 244, 148, 0, 0, 0, 0, 0, 0, + 2224,2228,2232,2236,2240,2244, 0,2248, 16, 180, 16, 16, 176,2252,2256, 308, + 16, 16, 16, 16, 16,2260, 0,2264,2268, 316,2272,2276, 0, 0, 0, 0, + 16, 16, 16, 16, 16, 16,2280,2284, 16, 16, 16, 16, 16, 16, 316, 180, + 180, 16,2288, 16,2292,2296,2300, 0, 16, 16,2304,2308, 16, 16,2312,2316, + 16, 16, 16, 16, 240, 16, 16,2320, 4, 4, 4, 4, 4, 4, 4, 0, + 2324, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 232, 4, 4, + 4, 4, 4, 4, 4, 4, 4,2328, 4, 4, 320, 0, 0, 0, 0, 0, + 320, 0, 0, 0, 0, 0, 0, 0, 4, 4,2332, 4, 4, 4, 4, 4, + 4, 4, 4, 236, 0, 0, 0, 0, 12, 12, 0, 0, 0, 0, 0, 0, + 2336, 16, 16, 16, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, + 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 16, 24, 24, 24, 24, + 32, 32, 32, 32, 40, 40, 40, 40, 48, 48, 48, 48, 64, 64, 64, 64, + 80, 80, 80, 80, 56, 56, 56, 56, 88, 88, 88, 88, 72, 72, 72, 72, + 96, 96, 96, 96, 112, 112, 112, 112, 104, 104, 104, 104, 128, 128, 128, 128, + 120, 120, 120, 120, 144, 144, 144, 144, 136, 136, 136, 136, 152, 152, 152, 152, + 168, 168, 168, 168, 192, 192, 192, 192, 184, 184, 184, 184, 208, 208, 208, 208, + 160, 160, 160, 160, 216, 216, 216, 216, 224, 224, 224, 224, 176, 176, 176, 176, + 1120, 56, 56,1128, 248, 248, 248, 248, 256, 256, 256, 256, 264, 264, 264, 264, + 296, 296, 296, 296, 272, 272, 272, 272, 328, 328, 328, 328, 344, 344, 344, 344, + 320, 320, 320, 320, 32, 32, 32, 560, 336, 0, 0, 0, 200, 200, 200, 200, + 232, 232, 232, 232, 360, 360, 360, 360, 288, 288, 288, 288, 312, 312, 312, 312, + 32, 32, 336, 0, 32, 336, 32, 32, 56, 56,1536, 56, 240, 240, 240, 240, + 280, 280, 280, 280, 440, 440, 440, 440, 120, 120,1728, 0, 552, 552, 552, 552, + 304, 304, 304, 304, 0, 0, 32, 32, 16, 16, 16,1160, 576, 576, 576, 576, + 448, 448, 448, 448, 648, 648, 648, 648, 8,1008, 8, 8, 8, 8, 8,1784, + 32, 32,1800, 32, 880, 32, 32, 32, 456, 456, 456, 456, 584, 584, 584, 584, + 384, 384, 384, 384, 392, 392, 392, 392, 680, 680, 680, 680, 408, 408, 408, 408, + 472, 472, 472, 472, 592, 592, 592, 592, 488, 488, 488, 488, 600, 600, 600, 600, + 496, 496, 496, 496, 400, 400, 400, 400, 368, 368, 368, 368, 416, 416, 416, 416, + 32, 32, 32, 632, 32, 32, 560, 0, 512, 512, 512, 512, 32, 32, 32, 336, + 8, 8, 8,1008, 32,1304, 32,1304, 56, 56, 56,2096,2104,2112, 32, 32, + 120, 120,2120,2128,2136,2144, 160, 160,2152, 160, 160, 160,2160, 320, 160, 160, + 2168, 136, 136, 136, 136, 136,2176, 424, 424, 424,2184, 424, 424, 424, 424, 424, + 424, 424,2192, 376, 376, 376, 376, 376, 376,2200, 376, 376, 376,2208,2216, 0, + 1544,2224, 72,2232,2240,2248,2256, 72, 72, 72,2264, 72, 72, 72, 72,1544, + 520,2272, 520, 520, 520, 520, 520, 520, 520,2280, 72, 72, 800, 800, 800, 800, + 800, 800,2288, 0, 712, 712, 712, 712, 712, 712, 712,2296, 808, 808, 808, 808, + 808,2304, 808,2312,1312,1312,1312,2320, 520,2328, 72, 72, 72, 72,2336, 72, + 2344, 72, 72, 72, 264, 264,2352, 264,2360, 264, 264, 264,2368,1552,2376,1136, + 1136,2384,2392,2400,1552,2408,2416,2424,2432,1136,1136,2440,2448,1560,2456,1320, + 1320,2464,2472,2480,1560,2488,2496,2504,2512,1320,2520, 0,2528,1568,2536,1328, + 1328,2544,2552,2560,1568,2568,2576, 0,2584,1328,2592,2600,2608,1576,2616,1144, + 1144,2624,2632,2640,1576,2648,2656,2664,2672,1144,1144, 0,2680,1336,1584,2688, + 2696,1336, 528,2704,1336,1584,2712, 0,2720, 528, 528,2728, 816,1592,1600, 816, + 816,1600, 816,2736,1592,2744,2752,2760,2768, 816,2776, 816,1152,1608,1616,1152, + 1152,1616,2784,2792,1608,2800,2808,2816,2824,1152,2832, 0, 432,1624,1632, 432, + 432, 432, 432, 432,1624,1632,2840, 432,2848, 432, 432, 432,2856, 824,1640,2864, + 824, 824,2872,2880,1640,2888,2896, 824,2904, 824,2912, 0,2920, 536, 536, 536, + 536, 536, 536,2928, 536, 536, 536,2936,2944,2952, 992, 992,2960, 992, 992,2968, + 2976,2984, 992,2992, 240,1344, 240, 240, 240,3000,1344, 240, 240, 240, 240,1344, + 240, 240, 240,1648, 240,1648,3008,3016,1656,1664, 280, 280, 280, 280, 280,3024, + 176, 832, 304, 832, 176, 832, 176, 176, 176, 176, 832, 304, 832, 176, 304, 176, + 176, 176, 832, 176, 176, 176, 176,3032, 176, 176, 176,3040, 176, 176, 176,3048, + 248, 248,1672,1672,1352,1352,1352,3056, 440,3064, 440,3072,1680,1680,3080,3088, + 1688,1688,3096, 0,1696,1696,3104, 0,3112,3120,3128, 0, 296, 296, 296,3136, + 296,1704, 296,1704,3144, 272, 272,3152, 272, 272, 272,3160, 272,3168, 96, 96, + 96, 96,3176, 0, 840, 840, 840,3184, 840,1712, 840,1712,3192, 840,1360,1360, + 1360,3200,3208, 0, 544, 544, 544, 544, 544,3216, 544, 544, 544,3224, 544,3232, + 1368,1368,1368,3240, 352, 352, 352, 352, 352, 352, 352,3248, 352, 352, 352,3256, + 352,1720, 352,1720, 352,3264, 120, 120, 328,3272, 328, 328, 848, 848, 848, 848, + 848, 848,3280,3288, 624, 624, 624, 624, 624, 624, 624,3296, 624,3304, 856, 856, + 856, 856, 856, 856, 136,3312, 280, 280, 280, 280, 280,3320, 552, 0,3328, 120, + 3336,3344,3352,3360,3368,3376, 56, 56, 56, 56, 56,3384,3392,3400, 56,3408, + 56, 56, 56,3416, 160, 160, 864, 864, 864, 864, 160,3424, 160, 160, 160, 864, + 160, 160,1736, 160,1736, 160,3432,3440, 160, 160,3448,1744, 32,3456, 32, 32, + 1000, 32,3464,3472, 32, 32, 56, 56, 632, 0, 120, 120,3480,3488,1304, 32, + 32,3496, 32, 32, 56,3504, 32, 32, 32, 720, 0, 0, 32,1376, 0, 0, + 32, 32,1752, 32, 320, 320,3512,3520,1656,1664, 728, 728, 728, 728, 728, 728, + 728,1760,3528,1760, 176, 176, 304, 0, 8, 8, 8,3536, 8, 8,3544, 0, + 8, 8,1008, 0,3552, 32, 32, 32,3560,3568, 32,3576,3584, 168, 168, 168, + 168, 168,3592,3600,1768, 200, 200, 200, 200, 200, 200,3608,3616, 568, 568, 568, + 568, 568,3624, 16, 16,1160, 32, 32, 568, 568, 568, 568, 560,3632, 200, 200, + 16, 16, 16,3640, 32, 32, 200, 200, 200, 200, 200,3648, 200, 200, 200, 32, + 80,3656, 80, 80,3664, 0, 872, 872, 872, 872, 872, 872, 192,3672, 0, 0, + 104, 104, 104, 0,3680, 56, 56, 56, 56,3688, 56, 56, 56, 56, 56,3696, + 3704, 0,3712, 56,1016,1016,1016,1016,1016,3720, 32, 720, 736, 736, 736, 736, + 736, 736, 736, 0,3728,3736, 576,3744,1024,1024,1024,1024,1024,3752,1168,1168, + 1168,1168,3760,3768, 16, 16, 16,3776, 448,3784, 448,3792, 216, 216, 216,3800, + 640, 640, 640, 640, 640, 640,3808, 0, 640,3816, 640,3824,3832, 0, 0,3840, + 656, 656,3848, 0,1384,1384,1384, 0, 304, 304, 56, 56, 56, 56, 56,3856, + 3864,3872, 248, 248, 656, 656, 656, 656, 656,3880, 656,3888,1776, 0, 16, 16, + 1160,3896, 16, 16, 16, 16, 16,1776,1792, 0,3904,3912, 376, 376,3920,3928, + 3936, 376, 72, 72, 72, 72, 72,3944, 72, 72, 0, 0, 0, 0, 72, 72, + 120, 120, 32, 720, 120,3952, 32, 32, 664, 336,3960, 72, 72, 72, 72,3968, + 3976, 200,1768, 200, 200, 200, 200,3984,1392,1392,1392,3992, 664, 664, 0,4000, + 232,4008, 232, 232,4016, 232, 232,4024, 232,1808, 232,1808, 232, 232, 232,4032, + 4040, 32, 32, 32, 32, 32,1816, 32, 160,1744, 32, 632,4048, 0, 0, 0, + 32, 32, 32,4056,1400,1400,1400,4064, 888, 888, 888, 888, 888, 888,4072, 0, + 1824, 32, 32, 336,1176,1176,1176,1176,4080,4088,1408,1408,1408,4096,1032,1032, + 1032,1032,1032,4104,1416,1416,1416,4112,1040,1040,1040,1040,4120,1040,4128, 0, + 456, 456, 896, 896, 896, 896, 896, 896,1184,1184,1184,4136,1184,4144, 672, 672, + 672, 672,1832, 672, 672, 672, 672,1832,1048,1048,1048,1048,1048, 0, 904, 904, + 904, 904, 904, 904,4152,4160,1192,1840,1192,1840,4168,1192,1848,1192,1848,4176, + 912, 912, 912, 912, 912, 912,4184, 0, 184, 184,4192, 0, 184, 184,4200, 0, + 184, 0, 0, 0,4208, 56, 56, 56, 56, 56,4216, 56,4224,4232,1200,1200, + 1200,1200,4240,4248,1424,1424,4256,1424,1208,1208,1208,1208,1216,1216,1216,4264, + 4272,1216, 0, 0,1856,1856,4280,4288,1432,1432,1432,4296,1440,1440,1440,4304, + 1448,1448,1448,4312,1224,1224,1224,1224, 464, 464, 464,4320, 464, 464,4328, 464, + 464, 464, 464, 464,4336,4344,4352,4360,1232,1232,4368,4376,1232,1864,1232,1864, + 1240,1240,1240,1240,1248,1248,1248,1248,1256,1256,1256,1256,1872,4384,1872, 0, + 920, 920, 920, 920, 920, 920,4392,4400,1456,1456,4408,1456,1464,1464,4416,1464, + 1880,1880,4424,4432, 0,4440, 0, 0, 584,4448, 0, 0, 384, 384,1888, 0, + 384, 384,1888,4456, 928, 928, 928, 928, 928, 0, 928,4464, 936, 936, 936, 936, + 1896,4472, 936, 936,1896,4480, 0, 0, 72, 72, 72,1904,1056,1056,1056,1056, + 1056,4488,4496, 0,4504,1912, 72, 72, 72,1904, 72, 72,1064,1064,1064,1064, + 1064, 0,1072,1072,1072,1072,1072,4512, 0, 0,1472,1472,1472,4520, 0, 0, + 0, 0,1480,1480,1480,4528, 0, 0,1920,1920,4536, 0, 392,1928,4544, 392, + 392, 392,1928,4552,4560,4568,1264,1264,1264,4576,1264,4584, 688, 688, 688, 688, + 688, 688,4592, 688, 688, 0,1272,1272,1272,1272,4600, 0,4608, 824,4616, 0, + 744, 744,4624, 744, 744, 744, 744, 744,4632, 0, 0, 0,4640,4648,1936,4656, + 1936,4664, 696, 696, 696, 696, 696, 696, 696,4672, 696,4680,4688,1944,4696,1952, + 1952,4704,4712,4720,1944,4728,4736,4744,4752,1960,1960, 0, 944,4760, 944, 944, + 944, 944,1968, 944,4768,4776,1968,4784,4792, 0, 0, 0, 408, 408, 408,4800, + 4808, 0, 0, 0, 472, 0, 472,4816, 480, 480, 480, 480, 480, 480,1976, 480, + 480, 480, 480,1976,4824, 0, 592,4832, 272,4840, 0, 0, 704, 704, 704, 704, + 704, 704, 704,1984, 704,1984, 216, 216,4848, 0, 0, 0, 952, 952, 952,4856, + 952,4864, 952, 952,4872, 0, 0, 0, 752, 752, 752, 752, 752, 752, 752,4880, + 488, 488,4888,4896,1992,4904,4912,1280,1280,1280,4920,4928,1992, 0,1280,4936, + 960,2000, 960, 960, 960, 960, 960,2000,4944, 0, 0, 0, 600, 0, 496, 496, + 4952, 0, 96, 96, 760, 760, 760, 760, 760, 760, 760,4960, 264,4968, 0, 0, + 360, 0, 0, 0,1080,1080,1080,1080,2008, 0,1080,2008, 608,4976, 608, 608, + 608, 608,4984, 608,4992, 0, 608, 608, 608,5000, 968, 968, 968, 968,5008, 968, + 968,5016,5024, 0,2016,5032, 976, 976, 976, 976,2016,5040, 976, 0, 976,5048, + 5056,5064,1288,1288,1288,5072,5080,5088,1288,5096, 984, 984, 984, 984, 984,5104, + 984,5112,5120, 0,1488,1488,1488,5128, 616, 616,5136, 616, 616, 616, 616,5144, + 616, 616, 616,5152, 0, 0,5160, 0, 528, 528, 528, 528, 528, 528,5168,5176, + 64, 64, 64,5184,5192, 0, 64, 64, 64, 256, 256, 256, 256,5200, 64, 64, + 5208, 0, 0, 0, 0, 0, 400, 400, 400, 400,5216, 0, 48, 48,5224, 0, + 48, 48, 48,5232,5240, 0, 0, 0, 768, 768, 768, 768, 768, 768, 768,5248, + 104, 104, 104,5256,1296,1296,1296,5264,1296,5272, 504, 504, 504, 504, 504, 504, + 504, 504, 504,5280, 504,5288,1496,1496,1496,2024,2024, 0,5296, 0, 368,2032, + 2032, 368, 368,5304, 368, 368, 0, 0, 776, 776, 776, 776, 776, 776, 776,5312, + 416, 416, 416,5320,1088,1088,1088,5328,1088,1088,5336, 0, 288,5344, 288, 288, + 288,5352, 288, 288,5360, 0,2040, 0, 144, 144, 144,5368, 0, 0, 0,5376, + 5384, 0, 0, 0, 40, 40,5392, 0, 88, 88,5400, 0, 88, 88,5408, 0, + 0, 0,5416,5424,5432, 168, 168, 168,5440,2048,5448, 0, 0, 0,5456, 0, + 5464,2048, 152, 152, 152, 152, 152,5472, 312,5480, 312,5488, 312,5496, 312,5504, + 32, 32, 336,2056, 32, 32,5512,5520, 120,5528, 120, 120,5536, 0, 32, 32, + 2064,1824, 32, 32,2064,5544, 32,5552,5560,5568, 32, 32, 32,5576, 32, 32, + 864, 0, 32,5584, 720, 0, 0, 0, 32, 32, 664, 0, 32, 32, 32,1504, + 32, 32,1000, 32, 32, 32, 32,1000,5592,5600, 32,5608,5616, 32, 32, 32, + 2072,5624,1000,1000, 32, 32, 32,5632,5640,2056,5648, 32, 664, 32, 32, 32, + 32,1752, 32, 32, 112,5656, 0,5664,5672, 112, 0, 0,5680, 0,1792, 0, + 0,5688, 56, 56, 56, 56,5696, 56,5704, 344, 344,5712,5720,5728, 136, 136, + 136,5736, 0, 0, 0,5744, 0, 0, 784, 784, 784, 784, 784,5752, 784,5760, + 784,5768, 0, 0, 0, 0,1512,1512,1512,5776, 0, 0, 792, 792, 792, 792, + 792, 792, 792,5784, 0, 0,1096,1096,1096,1096,1096,5792, 0, 0,1104,1104, + 1104,1104,1104,5800,1112,1112,1112,5808,1112,1112,5816,5824, 304,5832, 176, 304, + 5840, 224,5848, 0, 512,5856, 512,5864, 0, 0, 880, 32, 32, 32, 632, 0, + 5872, 72, 72, 72,1520,1912,1528,5880,5888,5896,1520,5904,1520,1528,1528,5912, + 72,2080, 72,2088,5920,2080, 72,2088, 0, 0,5928, 0, 32, 664, 880, 32, + 880, 32, 880, 32, 32, 664, 0, 0,5936, 32, 32, 32,5944, 0, 32, 32, + 32,1504, 720, 0, 560, 0, 0, 0, 32, 32, 32,5952, 32, 632, 32, 632, + 32, 0, 32, 720, 32, 0, 32, 32, 32, 560, 32, 336, 720, 0, 32,1504, + 32, 32, 32, 0, 32, 560, 32, 632, 664,5960, 32,2072, 32,1816, 32,1376, + 32, 32, 32,1376, 8, 8, 8,2040,5968, 0, 8, 8, 8,5976, 8, 8, + 5984, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 939, 940, 941, 942, 946, 948, 0, 962, 969, 970, 971, 976,1001,1002,1003, + 1008, 0,1033,1040,1041,1042,1043,1047, 0, 0,1080,1081,1082,1086,1110, 0, + 0,1124,1125,1126,1127,1131,1133, 0,1147,1154,1155,1156,1161,1187,1188,1189, + 1193, 0,1219,1226,1227,1228,1229,1233, 0, 0,1267,1268,1269,1273,1298, 0, + 1303, 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964, + 1149, 0, 0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990, + 1175, 991,1176, 993,1178, 994,1179, 0, 0,1004,1190,1005,1191,1006,1192,1014, + 1199,1007, 0, 0, 0,1016,1201,1020,1206, 0,1022,1208,1025,1211,1023,1209, + 0, 0, 0, 0,1032,1218,1037,1223,1035,1221, 0, 0, 0,1044,1230,1045, + 1231,1049,1235, 0, 0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072, + 1258,1069,1255,1077,1264,1074,1261, 0, 0,1083,1270,1084,1271,1085,1272,1088, + 1275,1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310, + 0,1053,1239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1093,1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 949,1134, + 1010,1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366, 0,1320, + 1347,1418,1419,1323,1350, 0, 0, 992,1177,1018,1204,1055,1241,1416,1417,1415, + 1424,1202, 0, 0, 0, 987,1172, 0, 0,1031,1217,1321,1348,1322,1349,1338, + 1365, 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052, + 1238,1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263, 0, 0, 997, + 1182, 0, 0, 0, 0, 0, 0, 945,1130, 982,1167,1337,1364,1335,1362,1046, + 1232,1422,1423,1113,1301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 8, 9, 0, 10,1425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0,1314,1427, 5,1434,1438,1443, 0,1450, 0,1455, + 1461,1514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1446,1458,1468,1476,1480, + 1486,1517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1489,1503,1494,1500,1508, + 0, 0, 0, 0,1520,1521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1526,1528, 0,1525, 0, 0, 0,1522, 0, 0, 0, 0,1536,1532,1539, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1534, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1556, 0, 0, 0, 0, 0, + 0,1548,1550, 0,1547, 0, 0, 0,1567, 0, 0, 0, 0,1558,1554,1561, + 0, 0, 0, 0, 0, 0, 0,1568,1569, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1529,1551, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1523,1545,1524,1546, 0, 0,1527,1549, 0, 0,1570,1571,1530,1552,1531, + 1553, 0, 0,1533,1555,1535,1557,1537,1559, 0, 0,1572,1573,1544,1566,1538, + 1560,1540,1562,1541,1563,1542,1564, 0, 0,1543,1565, 0, 0, 0, 0, 0, + 0, 0, 0,1606,1607,1609,1608,1610, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1613, 0,1611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1620, 0, 0, 0, 0, 0, + 0, 0,1623, 0, 0,1624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1614,1615,1616,1617,1618,1619,1621, + 1622, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1628,1629, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1625,1626, 0, + 1627, 0, 0, 0,1634, 0, 0,1635, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1630,1631,1632, 0, 0,1633, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1639, 0, 0,1638,1640, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1636,1637, 0, + 0, 0, 0, 0, 0,1641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1642,1644,1643, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1645, 0, 0, 0, 0, 0, 0, + 0,1646, 0, 0, 0, 0, 0, 0,1648,1649, 0,1647,1650, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1651,1653,1652, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1654, 0,1655,1657,1656, + 0, 0, 0, 0,1659, 0, 0, 0, 0, 0, 0, 0, 0, 0,1660, 0, + 0, 0, 0,1661, 0, 0, 0, 0,1662, 0, 0, 0, 0,1663, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1658, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1664, 0,1665,1673, 0,1674, 0, 0, 0, 0, 0, 0, + 0, 0,1666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1668, 0, 0, 0, 0, 0, 0, 0, 0, 0,1669, 0, + 0, 0, 0,1670, 0, 0, 0, 0,1671, 0, 0, 0, 0,1672, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1667, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1675, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1676, 0,1677, 0,1678, 0,1679, 0,1680, + 0, 0, 0,1681, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1682, 0,1683, 0, + 0,1684,1685, 0,1686, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968, + 1153, 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986, + 1171, 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329, + 1356,1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028, + 1214,1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336, + 1363,1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065, + 1251,1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079, + 1266,1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100, + 1287,1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114, + 1302,1119,1308,1122,1311,1123,1312,1186,1260,1293,1305, 0,1394, 0, 0, 0, + 0, 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371, + 1375,1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326, + 1353,1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048, + 1234,1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398, + 1403,1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407, + 1412,1409,1414,1109,1297,1117,1306,1116,1304,1112,1300, 0, 0, 0, 0, 0, + 0,1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717, + 1721,1477,1478,1729,1731,1730,1732, 0, 0,1435,1436,1733,1735,1734,1736, 0, + 0,1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753, + 1757,1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773, + 1776,1495,1496,1777,1779,1778,1780, 0, 0,1451,1452,1781,1783,1782,1784, 0, + 0,1504,1505,1785,1788,1786,1789,1787,1790, 0,1459, 0,1791, 0,1792, 0, + 1793,1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810, + 1814,1467, 21,1475, 22,1479, 23,1485, 24,1493, 27,1499, 28,1507, 29, 0, + 0,1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727, + 1728,1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763, + 1764,1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820, + 1821,1470,1469,1822,1474,1465, 0,1473,1825,1429,1428,1426, 12,1432, 0, 26, + 0, 0,1315,1823,1484,1466, 0,1483,1829,1433, 13,1437, 14,1441,1826,1827, + 1828,1488,1487,1513, 19, 0, 0,1492,1515,1445,1444,1442, 15, 0,1831,1832, + 1833,1502,1501,1516, 25,1497,1498,1506,1518,1457,1456,1454, 17,1453,1313, 11, + 3, 0, 0,1824,1512,1519, 0,1511,1830,1449, 16,1460, 18,1464, 4, 0, + 0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 2, 6, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1834,1835, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1836, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1837,1839, + 1838, 0, 0, 0, 0,1840, 0, 0, 0, 0,1841, 0, 0,1842, 0, 0, + 0, 0, 0, 0, 0,1843, 0,1844, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1845, 0, 0,1846, 0, 0,1847, 0,1848, 0, 0, 0, 0, 0, + 0, 937, 0,1850, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1849, 936, + 938,1851,1852, 0, 0,1853,1854, 0, 0,1855,1856, 0, 0, 0, 0, 0, + 0,1857,1858, 0, 0,1861,1862, 0, 0,1863,1864, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1867,1868,1869, + 1870,1859,1860,1865,1866, 0, 0, 0, 0, 0, 0,1871,1872,1873,1874, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1875, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1877, 0,1878, + 0,1879, 0,1880, 0,1881, 0,1882, 0,1883, 0,1884, 0,1885, 0,1886, + 0,1887, 0,1888, 0, 0,1889, 0,1890, 0,1891, 0, 0, 0, 0, 0, + 0,1892,1893, 0,1894,1895, 0,1896,1897, 0,1898,1899, 0,1900,1901, 0, + 0, 0, 0, 0, 0,1876, 0, 0, 0, 0, 0, 0, 0, 0, 0,1902, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1904, 0,1905, + 0,1906, 0,1907, 0,1908, 0,1909, 0,1910, 0,1911, 0,1912, 0,1913, + 0,1914, 0,1915, 0, 0,1916, 0,1917, 0,1918, 0, 0, 0, 0, 0, + 0,1919,1920, 0,1921,1922, 0,1923,1924, 0,1925,1926, 0,1927,1928, 0, + 0, 0, 0, 0, 0,1903, 0, 0,1929,1930,1931,1932, 0, 0, 0,1933, + 0, 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, + 601, 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, + 662, 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, + 168, 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, + 758, 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, + 585, 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, + 259, 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, + 697, 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, + 170, 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, + 330, 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, + 473, 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, + 603, 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, + 411, 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, + 583, 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, + 269, 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, + 510, 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, + 156, 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210, 0, + 0, 227, 0, 379, 0, 0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604, + 0, 661, 0, 703, 0, 0, 735, 743, 0, 0, 0, 793, 794, 795, 808, 741, + 773, 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, + 329, 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, + 548, 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, + 651, 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623, 0, + 0, 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, + 243, 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, + 362, 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, + 490, 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, + 586, 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, + 706, 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, + 848, 847, 857, 55, 65, 66, 883, 892, 916, 822, 824, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1586, 0, + 1605, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1602,1603,1934,1935,1574, + 1575,1576,1577,1579,1580,1581,1583,1584, 0,1585,1587,1588,1589,1591, 0,1592, + 0,1593,1594, 0,1595,1596, 0,1598,1599,1600,1601,1604,1582,1578,1590,1597, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1936, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1938, 0,1939, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1940, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1941, + 1942, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1943,1944, 0, 0, + 0, 0, 0, 0,1945, 0,1946, 0, 0, 0, 0, 0, 0, 0, 0,1947, + 0, 0,1948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,1950, 0,1949,1951, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1953,1952, 0,1954, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1955,1956, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1957, 0, 0, 0, 0, 0, 0, + 0, 0,1958,1961,1959,1965,1960,1962,1964,1963, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1967,1966,1968, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1969, + 1970,1971,1972,1973,1974,1975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1976,1977,1978,1980, + 1979,1981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125, 34, 830, 130, + 131, 132, 137, 827, 35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152, + 37, 157, 158, 159, 160, 38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, + 179, 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, + 195, 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, + 216, 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, + 244, 836, 837, 247, 248, 249, 246, 251, 39, 40, 253, 255, 255, 838, 257, 258, + 259, 261, 839, 262, 263, 301, 264, 41, 266, 270, 272, 271, 841, 274, 842, 277, + 276, 278, 281, 282, 42, 283, 284, 285, 286, 43, 843, 44, 289, 290, 291, 293, + 934, 298, 845, 845, 621, 300, 300, 45, 852, 894, 302, 304, 46, 306, 309, 310, + 312, 316, 48, 47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, + 334, 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, + 361, 358, 356, 49, 363, 365, 367, 364, 50, 369, 371, 851, 376, 386, 378, 53, + 381, 52, 51, 140, 141, 387, 382, 614, 78, 388, 389, 390, 394, 392, 856, 54, + 399, 396, 402, 404, 858, 405, 401, 407, 55, 408, 409, 410, 413, 859, 415, 56, + 417, 860, 418, 57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, + 433, 437, 441, 438, 439, 442, 443, 864, 436, 449, 450, 58, 454, 453, 865, 447, + 460, 866, 867, 461, 466, 465, 464, 59, 467, 470, 469, 472, 828, 475, 868, 478, + 870, 483, 485, 486, 871, 488, 489, 872, 873, 495, 497, 60, 498, 61, 61, 504, + 505, 507, 508, 511, 62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878, 63, + 64, 528, 880, 879, 881, 882, 530, 531, 531, 533, 66, 534, 67, 68, 884, 536, + 538, 541, 69, 885, 549, 886, 887, 556, 559, 70, 561, 562, 563, 888, 889, 889, + 567, 71, 890, 570, 571, 72, 891, 577, 73, 581, 579, 582, 893, 587, 74, 590, + 592, 596, 75, 895, 896, 76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, + 611, 853, 77, 615, 616, 79, 617, 252, 902, 903, 854, 855, 621, 622, 731, 80, + 627, 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, + 651, 638, 643, 644, 645, 905, 907, 906, 81, 653, 654, 656, 911, 657, 908, 82, + 83, 909, 910, 84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675, + 85, 677, 678, 86, 681, 682, 912, 685, 686, 87, 689, 36, 913, 914, 88, 89, + 696, 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, + 728, 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762, + 90, 764, 922, 91, 775, 279, 780, 923, 925, 92, 93, 785, 926, 94, 927, 787, + 787, 789, 928, 792, 95, 796, 797, 798, 800, 96, 929, 802, 804, 806, 97, 98, + 807, 930, 99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935, 0, + 0, }; -static const int16_t _hb_ucd_i16[92]= +static const int32_t _hb_ucd_palette[39]= { - 0, 0, 1, -1, -1, 1, 0, 1, -1, 0, 0, 2, 0, -2, 2, 0, - -2, 0, -7, 0, 0, 16, 0, -16, 3, 3, 3, -3, -3, -3, 0, 2016, - 0, 2527, 1923, 1914, 1918, 0, 2250, 0, 0, 138, 0, 7, 1824, 0, 2104, 0, - 2108, 2106, 0, 2106, 1316, 0, -1, -138, 8, 8, 8, 0, 7, 7, -8, -8, - -8, -7,-1316, 1, -1, 3, -3, 1, 0,-1914,-1918, 0, 0,-1923,-1824, 0, - 0,-2016,-2104, 0, 0,-2106,-2108,-2106,-2250, 0,-2527, 0, + -112883, -2527, -2250, -2108, -2106, -2104, -2016, -1923, + -1918, -1914, -1824, -1316, -138, -16, -8, -7, + -3, -2, -1, 0, 1, 2, 3, 7, + 8, 16, 138, 1316, 1824, 1914, 1918, 1923, + 2016, 2104, 2106, 2108, 2250, 2527, 112883, }; static inline uint8_t _hb_ucd_gc (unsigned u) { /* packtab: [2^8,2^4,2^4,2^3,2^1] */ - return u<1114110u ? (uint8_t)(_hb_ucd_u8[6536u+((_hb_ucd_u8[800u+_hb_ucd_u16[((_hb_ucd_u8[272u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>4))>>4)])<<4)+((((((((u)>>1))>>3))>>4))&15)])<<4)+((((((u)>>1))>>3))&15)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; + return u<1114110u ? (uint8_t)(_hb_ucd_u8[6600u+((_hb_ucd_u8[832u+_hb_ucd_u16[((_hb_ucd_u8[272u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>4))>>4)])<<4)+((((((((u)>>1))>>3))>>4))&15)])<<4)+((((((u)>>1))>>3))&15)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; } static inline uint8_t _hb_ucd_ccc (unsigned u) { /* packtab: [2^8,2^3,2^2,2^2,2^2] */ - return u<125259u ? (uint8_t)(_hb_ucd_u8[8589u+((_hb_ucd_u8[8006u+((_hb_ucd_u8[7529u+((_hb_ucd_u8[7163u+((_hb_ucd_u8[6918u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0; + return u<125259u ? (uint8_t)(_hb_ucd_u8[8683u+((_hb_ucd_u8[8084u+((_hb_ucd_u8[7599u+((_hb_ucd_u8[7233u+((_hb_ucd_u8[6988u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0; } static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i) { return (a[i>>1]>>((i&1)<<2))&15; } -static inline int16_t _hb_ucd_bmg (unsigned u) +static inline int32_t _hb_ucd_bmg (unsigned u) { - /* packtab: [2^4,2^3,2^3,2^2,2^1] */ - return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[9480u+_hb_ucd_u8[9251u+_hb_ucd_u8[9157u+((_hb_ucd_b4(_hb_ucd_u8+9093u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)]+((((((u)>>1))>>2))&7)]+((((u)>>1))&3)]+((u)&1)]) : 0; + /* packtab: [2^4,2^3,2^3,2^2,2^2] palette[39] */ + return u<121617u ? (int32_t)(_hb_ucd_palette[_hb_ucd_u8[9754u+_hb_ucd_u8[9514u+_hb_ucd_u8[9350u+_hb_ucd_u8[9263u+((_hb_ucd_b4(_hb_ucd_u8+9203u,((((((((u)>>2))>>2))>>3))>>3)))<<3)+((((((((u)>>2))>>2))>>3))&7)]+((((((u)>>2))>>2))&7)]+((((u)>>2))&3)]+((u)&3)]]) : 0; } static inline uint8_t _hb_ucd_sc (unsigned u) { - /* packtab: [2^8,2^4,2^3,2^2,2^2] */ - return u<918000u ? (uint8_t)(_hb_ucd_u8[10913u+_hb_ucd_u16[4624u+_hb_ucd_u16[2592u+((_hb_ucd_u8[10177u+((_hb_ucd_u8[9728u+((((((((u)>>2))>>2))>>3))>>4)])<<4)+((((((((u)>>2))>>2))>>3))&15)])<<3)+((((((u)>>2))>>2))&7)]+((((u)>>2))&3)]+((u)&3)]) : 2; + /* packtab: [2^8,2^4,2^3,2^2,2^3] */ + return u<918000u ? (uint8_t)(_hb_ucd_u8[10755u+_hb_ucd_u16[4016u+_hb_ucd_u16[2656u+((_hb_ucd_u8[10179u+((_hb_ucd_u8[9954u+((((((((u)>>3))>>2))>>3))>>4)])<<4)+((((((((u)>>3))>>2))>>3))&15)])<<3)+((((((u)>>3))>>2))&7)]+((((u)>>3))&3)]+((u)&7)]) : 2; } static inline uint16_t _hb_ucd_dm (unsigned u) { /* packtab: [2^8,2^5,2^4] */ - return u<195102u ? (uint16_t)(_hb_ucd_u16[7453u+((_hb_ucd_u8[13867u+((_hb_ucd_u8[13485u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; + return u<195102u ? (uint16_t)(_hb_ucd_u16[6353u+((_hb_ucd_u8[17129u+((_hb_ucd_u8[16747u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; } @@ -4390,16 +4557,16 @@ static inline uint16_t _hb_ucd_dm (unsigned u) #include -static const uint8_t _hb_ucd_u8[13905]= +static const uint8_t _hb_ucd_u8[14455]= { - 4, 5, 6, 7, 8, 9, 10, 2, 2, 11, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 12, 13, 2, 2, 2, 2, 2, 14, 1, 1, 1, 15, - 16, 17, 18, 19, 20, 21, 22, 2, 3, 0, 0, 0, 23, 24, 2, 2, - 2, 25, 0, 0, 0, 26, 27, 28, 0, 29, 30, 31, 32, 33, 34, 35, + 5, 6, 7, 8, 9, 10, 11, 2, 2, 12, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 13, 14, 2, 2, 2, 2, 2, 15, 1, 1, 1, 16, + 17, 18, 19, 20, 21, 22, 23, 2, 3, 0, 0, 0, 24, 25, 2, 2, + 2, 2, 26, 0, 0, 27, 28, 29, 0, 30, 31, 32, 33, 34, 35, 36, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 0, 36, - 2, 2, 2, 2, 2, 2, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 0, 37, + 2, 2, 2, 2, 2, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4427,1202 +4594,1286 @@ static const uint8_t _hb_ucd_u8[13905]= 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 2, 2, 2, 2, 45, 46, 47, 2, 2, 2, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 5, 5, 72, 73, 8, 74, 3, 75, 76, 3, 77, 78, - 3, 3, 5, 79, 5, 5, 80, 3, 81, 82, 83, 84, 85, 3, 3, 3, - 86, 87, 2, 88, 89, 90, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 91, 2, 2, 2, 2, - 92, 2, 2, 2, 2, 2, 2, 2, 2, 93, 2, 2, 94, 95, 96, 97, - 98, 99,100,101,102,103,104,105, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 1, 1, 1, 1, 46, 47, 48, 1, 1, 1, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 5, 5, 73, 74, 8, 75, 3, 76, 77, 3, 78, 79, + 3, 3, 5, 80, 5, 5, 81, 3, 82, 83, 84, 85, 86, 3, 3, 3, + 87, 88, 1, 89, 90, 91, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 92, 1, 1, 1, 1, + 93, 1, 1, 1, 1, 1, 1, 1, 1, 94, 1, 1, 95, 96, 97, 98, + 99,100,101,102,103,104,105,106, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 2, 2, 2, 2,106,107, 2, 2,108,109,110,111,112,113, - 2, 2,114,115, 0,116,117,118,119,120,121,122, 2, 2, 2, 9, - 123,124,125,126,127,128,129,130, 2,131,132,133, 6,134,135,136, - 137,138,139,140,141,142,143,144,145,146, 0,147,148,149,150, 0, - 151,152,153,154,155,156,157,158,159,160,161,162, 0,163,164,165, - 2, 2, 2, 2, 2, 2, 2, 2,166, 2, 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,167, - 2, 2, 2, 2, 2, 2, 2, 2,168, 2, 2, 2, 2, 2, 2, 2, - 0, 0,169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2,170,171,172, 2, 0, 0,173, 0,174,175,176,177, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, + 2, 2, 1, 1, 1, 1,107,108, 1, 1,109,110,111,112,113,114, + 1, 1,115,116, 0,117,118,119,120,121,122,123, 1, 1, 1, 9, + 124,125,126,127,128,129,130,131, 1,132,133,134, 10,135,136,137, + 138,139,140,141,142,143,144,145,146,147, 0,148,149,150,151, 0, + 152,153,154,155,156,157,158,159,160,161,162,163, 0,164,165,166, + 1, 1, 1, 1, 1, 1, 1, 1,167, 1,168, 6, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,169, + 1, 1, 1, 1, 1, 1, 1, 1,170, 1, 1, 1, 1, 1, 1, 1, + 0, 0,171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1,172,173,174, 1, 0, 0,175, 0,176,177,178,179, + 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2,178, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 3, 10, 3, 3, 3,179,180, 3, - 3, 3,181,182,183, 6, 8, 0,184,185,186,187,188,189,190,191, - 3, 3, 3, 3,192,193, 0, 0, 0, 0, 0, 0, 0, 0,194, 0, - 195, 7,196, 0, 0,197, 0, 0, 0,198, 0,199, 0,200, 0, 2, - 2,201,202, 0, 0, 0, 0, 0, 6,203,204, 0, 2,205, 0, 0, - 3, 3,206, 3, 3, 0, 3,207, 3, 3, 3, 3, 3, 3, 3, 3, - 3,208, 3, 3, 3, 3, 3, 10, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, - 209, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1,180, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 11, 3, 3, 3,181,182, 3, + 3, 3,183,184,185,186, 8, 0,187,188,189,190,191,192,193,194, + 3, 3, 3, 3,195,196, 5, 0, 0, 0, 0, 0, 0, 0,197,198, + 199, 7,200, 0, 0,201, 0, 0, 0,202, 0,203, 0,204, 0, 1, + 1,205,206, 0, 0, 0, 0, 0, 10,207,208, 0, 1,209, 0, 0, + 3, 3,210, 3, 3, 0, 3,211, 3, 3, 3, 3, 3, 3, 3, 3, + 3,212, 3, 3, 3, 3, 3, 11, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 213, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 11, 11, 11, 11, 11, 11, 11, 11, - 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, - 9, 9, 9, 9, 9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 13, - 10, 10, 10, 10, 10, 10, 10, 10, 15, 15, 15, 15, 15, 15, 15, 15, + 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 7, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11, 11, 11, 11, + 14, 14, 14, 14, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, + 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 16, 16, 16, 16, 6, 6, 6, 6, 8, 8, 8, 8, - 9, 9, 9, 9, 9, 1, 1, 1, 1, 4, 4, 9, 9, 9, 9, 9, - 25, 25, 25, 25, 25, 25, 25, 25, 14, 14, 14, 14, 14, 14, 14, 14, + 15, 15, 15, 15, 15, 15, 15, 15, 10, 10, 10, 10, 10, 1, 1, 1, + 1, 4, 4, 10, 10, 10, 10, 10, 25, 25, 25, 25, 25, 25, 25, 25, 8, 8, 8, 8, 8, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, - 1, 1, 1, 4, 4, 4, 4, 4, 4, 14, 30, 1, 1, 1, 1, 1, - 9, 9, 9, 9, 9, 10, 10, 10, 9, 9, 9, 9, 9, 7, 7, 7, - 8, 8, 8, 8, 6, 6, 6, 6, 1, 4, 4, 4, 4, 4, 4, 4, - 4, 30, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 32, 32, 32, 32, - 24, 24, 24, 24, 24, 24, 24, 24, 9, 9, 9, 9, 9, 9, 9, 10, - 1, 1, 1, 1, 1, 1, 1, 29, 21, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 1, 1, 29, 10, 10, 10, 29, 10, 10, 10, 10, 10, 10, 10, - 1, 1, 1, 1, 1, 1, 1, 4, 6, 6, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 6, 6, 6, 6, 8, 8, - 8, 8, 8, 6, 6, 6, 6, 6, 9, 9, 9, 9, 9, 10, 11, 65, - 73, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 86, 87, 88, - 74, 6, 6, 6, 6, 6, 6, 6, 20, 20, 20, 20, 20, 20, 20, 20, - 19, 8, 8, 8, 8, 8, 8, 8, 22, 1, 1, 1, 1, 1, 1, 1, - 21, 1, 1, 1, 1, 1, 1, 1, 4, 17, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 22, 14, 4, 17, 30, 1, 1, 1, 1, 1, + 22, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, + 4, 15, 29, 1, 1, 1, 1, 1, 10, 10, 10, 10, 10, 12, 12, 12, + 10, 10, 10, 10, 10, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 6, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 29, 1, 1, 1, 1, 1, 1, + 6, 6, 6, 6, 33, 33, 33, 33, 24, 24, 24, 24, 24, 24, 24, 24, + 10, 10, 10, 10, 10, 10, 10, 12, 1, 1, 1, 1, 1, 1, 1, 28, + 20, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 28, 12, 12, 12, + 28, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 4, + 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, + 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 6, 6, 6, 6, 6, + 10, 10, 10, 10, 10, 12, 9, 66, 73, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 89, 90, 91, 74, 6, 6, 6, 6, 6, 6, 6, + 21, 21, 21, 21, 21, 21, 21, 21, 19, 8, 8, 8, 8, 8, 8, 8, + 20, 1, 1, 1, 1, 1, 1, 1, 4, 17, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 22, 15, 4, 17, 29, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 22, 18, 4, 22, 1, 1, 1, 1, 1, 1, - 14, 14, 14, 9, 9, 9, 9, 9, 1, 1, 1, 1, 1, 21, 22, 14, - 10, 10, 10, 10, 60, 7, 7, 7,100, 1, 1, 1, 1, 1, 1, 1, - 14, 18, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 13, 13, 13, 10, - 20, 6, 6, 6, 8, 8, 79, 20, 6, 6, 6, 6, 8, 8,103, 20, - 26, 26, 26, 26, 26, 26, 26, 26, 7, 7, 7, 7, 7, 3, 3, 3, - 63, 7, 7, 7, 7, 7, 7, 7, 1, 1, 34, 1, 1, 1, 1, 1, - 1, 1, 1, 46, 7, 7, 7, 7, 1, 1, 1, 1, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 1, 46, 7, 1, 1, 1, 1, 7, 7, 7, 7, - 1, 1, 1, 1, 1, 1, 14, 18, 1, 1, 1, 1, 1, 1, 1, 21, - 1, 1, 1, 1, 1, 1, 1, 27, 9, 9, 9, 9, 9, 3, 3, 3, - 72, 10, 84, 10, 23, 85, 64, 10, 6, 6, 6, 6, 6, 89, 90,119, - 72, 24, 24, 47, 91,120,121, 92, 36, 7, 74, 10,122,123, 7, 54, - 8, 8, 8, 48, 8, 8, 8, 12, 6, 6, 6, 49, 6, 6, 6, 6, - 12, 12, 12, 12, 19, 19, 19, 19, 19, 19, 19, 19, 6, 12, 12, 12, - 12, 12, 12, 12, 8, 19, 19, 6, 19, 12, 12, 8, 19, 8, 6, 8, - 8, 19, 12, 8, 12, 6, 8, 19, 12, 12, 12, 8, 19, 6, 12, 8, - 19, 8, 19, 19, 12, 50, 12, 6, 1, 1, 93, 19, 94, 93, 19, 19, - 19, 19, 19, 19, 19, 19, 6, 12, 19, 94, 12, 8, 12, 12, 12, 12, - 12, 12, 6, 6, 6, 8, 19, 12, 19, 19, 8, 12, 12, 12, 12, 12, - 6, 6, 1, 6, 6, 6, 6, 6, 13, 20, 20, 13, 13, 13, 13, 13, - 13, 20, 20, 20, 20, 20, 20, 20, 13, 13, 55, 20, 20, 20, 55, 55, - 12, 12, 55, 12, 6, 56, 6, 73, 20, 20, 20,124, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 19, - 6, 8, 12, 6, 12, 12, 12, 12, 6, 6, 12, 75, 19, 12, 19, 8, - 12, 33, 4, 4, 66, 12, 12, 12, 8, 19, 19, 19, 19, 19, 19, 6, - 8, 8, 8, 8, 95, 10, 10, 10, 6, 6, 6, 6, 76, 26,125, 57, - 126, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,127, - 37, 31, 4, 37, 4, 4, 4, 4, 1, 29, 10, 10, 10, 10, 10, 10, - 15, 15, 15, 11, 65, 67, 10, 3, 4, 4, 4, 4, 4, 31,128, 10, - 38, 1, 1, 1, 1, 21, 4, 4, 9, 9, 9, 9, 9, 10, 10, 1, - 1, 1, 39, 4, 4, 4, 96, 33, 4, 4, 68, 51, 40, 4, 4, 1, - 9, 9, 9, 9, 9, 1, 41, 58, 10, 10, 10, 10, 10, 10, 10, 97, - 4, 4, 4, 4, 4, 4, 22, 1, 1, 1, 1, 1, 1, 21, 4, 4, - 4, 4, 13, 47, 10, 13, 51, 24, 1, 1, 1, 4, 4, 51, 4, 4, - 4, 4, 51, 4, 51, 4, 4, 4, 1, 1, 1, 1, 21, 4, 4, 10, - 1, 1, 1, 1,129, 1, 1, 1, 15, 15, 15, 69, 4, 4, 4, 4, - 1, 1, 1, 1, 34, 4, 4, 4, 4, 69, 4, 4, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 17, 22, 14, 18, 4, 4, 4, 17, 14, 18, 14, - 21, 4, 4, 4, 1, 1, 1, 1, 1, 4, 10, 9, 9, 9, 9, 9, - 42, 1, 1, 1, 1, 1, 1, 1, 21, 14, 30, 1, 1, 1, 1, 1, - 18, 4, 4, 17, 14, 14, 18, 1, 1, 1, 1, 27, 14, 14, 1, 1, - 1, 24, 7, 7, 7, 57, 29, 4, 1, 1, 1, 1, 1, 1, 4, 14, - 18, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 22, 1, 1, 1, - 1, 1, 1, 9, 9, 9, 9, 9, 4, 1, 21, 10, 10, 10, 10, 10, - 18, 4, 4, 4, 17, 14, 18, 4, 67, 24, 24, 24,130, 4, 4, 4, - 18, 4, 4, 17, 14, 14, 18, 4, 4, 4, 4, 17, 14, 14, 1, 1, - 58, 7, 7, 7, 7, 7, 7, 7, 1, 1, 1, 1, 1, 1, 1, 14, - 17, 14, 14, 14, 14, 14, 18, 4, 1, 1, 1, 27, 14, 14, 14, 14, - 7, 43, 3, 3, 57, 3, 3, 3, 17, 14, 22, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 22, 4, 17, 14, 14, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 1, 1, 1, 1, 9, 9, 9, 98, 7, 7, 7, 43, - 21, 14, 39, 1, 1, 1, 1, 1, 14, 14, 14, 17, 14, 14, 4, 4, - 4, 4, 17, 14, 14, 14, 1, 1, 99, 27, 14, 14, 14, 14, 14, 14, - 4, 14, 1, 1, 1, 1, 1, 1, 18, 4, 4, 14, 14, 14, 18, 41, - 3, 3, 1, 27, 7, 7, 7, 59, 7, 7, 7, 7, 43, 1, 1, 1, - 1, 1, 1, 1, 1, 4, 4, 17, 14, 4, 4, 4, 14, 14, 14, 14, - 9, 14, 10, 10, 10, 10, 10, 10, 21, 1, 4, 4, 4, 4, 4,131, - 1, 1, 1, 51, 4, 4, 4, 31, 21, 1, 4, 4, 4, 4, 22, 1, - 1, 1, 1, 13, 4, 4, 4, 4, 9, 9, 9, 9, 9, 9, 1, 1, - 41, 3, 10, 10, 10, 10, 10, 10, 10, 44, 44, 3, 4, 3, 3, 3, - 7, 7, 33, 33, 33, 23, 23, 14, 21, 4, 4, 4, 4, 4, 4, 17, - 4, 4, 31, 4, 1, 1, 21, 4, 4, 4, 4, 4, 4, 4, 4, 3, - 3, 3, 3, 40, 3, 3, 3, 3, 10, 10, 44, 3, 47, 10, 10, 10, - 1, 1, 1, 1, 1, 27, 18, 4, 17, 4, 4, 4, 18, 17, 18, 22, - 1, 1, 1, 14, 4, 1, 1, 4, 22, 14, 30, 27, 14, 14, 14, 1, - 21, 4, 22, 1, 1, 1, 1, 1, 1, 17, 18, 17, 14, 14, 18, 27, - 9, 9, 9, 9, 9, 14, 18, 3, 6, 6, 6, 6, 6, 76, 56, 6, - 1, 1, 1, 1, 1, 1, 21, 4, 1, 1, 1, 1, 1, 1, 41, 39, - 132, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,133, 70, 70, - 1, 1, 1, 1, 1, 29, 10, 16,134, 1, 1, 1, 1, 1, 1, 1, - 1, 4, 17, 14, 14, 14, 14, 30, 1, 4, 61, 10, 10, 10, 10, 10, - 1, 1, 4, 18, 4, 4, 4, 14, 14, 14, 14, 17, 18, 4, 4, 4, - 4, 4, 10, 42, 10, 67, 21, 4, 10, 10, 10, 77, 10, 37, 4, 69, - 1, 34, 1, 1, 1, 1, 1, 1, 1, 1, 21, 22, 1, 1, 1, 1, - 1, 1, 1, 1, 21, 1, 1, 1, 4, 17, 14, 18, 17, 14, 14, 14, - 14, 17, 14, 14, 18, 4, 4, 4, 3, 3, 10, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 7, 7, 3, 1, 1, 1, 21, 17, 18, 4, 10, - 1, 1, 27, 17, 4, 4, 4, 4, 17, 17, 18, 4, 4, 4, 17, 14, - 10, 10, 10, 42, 10, 10, 10, 10, 4, 4, 4, 4, 4, 4, 4, 78, - 4, 4, 30, 1, 1, 1, 1, 1, 1, 1, 17, 4, 4, 17, 17, 14, - 14, 17, 30, 1, 1, 1, 1, 10, 44, 3, 3, 3, 3, 33, 4, 4, - 4, 4, 3, 3, 3, 3, 47, 10, 27, 4, 4, 14, 4, 18, 4, 1, - 1, 1, 1, 17, 4, 14, 18, 18, 4, 14, 14, 14, 14, 14, 10, 10, - 1, 1, 14, 14, 14, 14, 4, 4, 4, 4, 14, 4, 4, 31, 10, 10, - 9, 9, 9, 9, 9, 9, 99, 1, 6, 6, 6, 6, 19, 6, 6, 6, - 4, 31, 4, 4, 4, 4, 4, 4, 17, 4, 4, 4, 22, 1, 21, 1, - 1, 1, 22, 27, 4, 1, 1, 1, 6, 6, 6, 6, 6, 6, 13, 13, - 13, 13, 13, 13, 13, 56, 6, 6, 6, 6, 6, 6, 56, 6, 6, 6, - 6, 6, 6, 6, 6,101, 13, 13, 12, 12, 12, 6, 6, 6, 6, 12, - 6, 6, 6, 6, 19, 8, 8, 8, 6, 6, 6, 6, 8, 8, 79,102, - 62, 62, 62, 62, 62,135, 15, 15, 26, 26, 26, 10, 45,104, 45,104, - 10, 10, 10, 10,136, 15, 15,137, 10, 10, 10, 10,105,106, 10,107, - 108, 10, 52, 53, 10, 10, 10, 10, 10, 65,108, 10, 10, 10, 10,138, - 139, 13, 7, 7, 7, 11, 52,140, 7, 7, 7, 7, 7, 11, 52, 70, - 4, 4, 4, 4, 4, 4,141, 66, 78, 66, 78, 4, 4, 4, 4, 4, - 3, 71, 3, 80, 3, 19, 8, 6, 8, 12, 80, 3, 75, 8, 8, 3, - 3, 3, 71, 71, 71, 8, 8,142, 8, 8, 50, 1,109, 3, 6, 8, - 11, 11, 75, 6, 6, 36, 3,110, 16,143,144, 16,111, 3, 3, 3, - 11, 11, 35, 3, 3, 11, 3, 3, 35, 36, 3, 35, 3, 3, 3, 35, - 3, 3, 3, 3, 3, 3, 3, 11, 3, 35, 35, 3, 3, 3, 3, 3, - 3, 3, 11, 11, 11, 11, 11, 11, 3, 3, 3, 3, 23, 23, 3, 3, - 11, 3, 3, 3,145,146, 3, 3, 3, 3, 3, 3, 3, 3, 35, 3, - 3, 3, 3, 3, 3, 36, 11, 11, 11, 11, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 11, 11, 11, 3, 3, 3, 3, 3, 3, 3, - 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, - 3, 3, 3, 36, 3, 3, 3, 3, 36, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 11, 11, 11, 11, 3, 3, 3, 3, 3, 3, 3, 36, - 3, 3, 3, 3, 23, 23, 23, 23, 23, 23, 23, 7, 7, 7, 7, 7, - 7, 7, 3, 3, 3, 3, 3, 3, 11, 11, 52,112, 11, 11, 11, 11, - 11, 11, 11, 23, 23, 23, 23, 23, 11, 52, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28,112, 11, 11, 11, 11, 11, 11, 11, 23, 23, 11, 11, - 11, 11, 11, 11, 11, 11, 23, 11, 11, 11, 35, 36, 11, 11, 35, 3, - 12, 8, 12, 19, 19, 19, 19, 8, 12, 12, 19, 6, 6, 6, 13, 8, - 12, 12,110, 3, 3, 80, 19,147, 4, 12, 6, 6, 76, 10, 60, 10, - 1, 1, 1, 1, 1, 1, 1, 34, 10, 10, 10, 10, 10, 10, 10, 37, - 10, 45, 45, 10,105,106, 45, 10, 10, 10, 10, 64, 10, 77, 45, 10, - 45, 23, 23, 23, 23, 10, 10, 42, 10, 10, 10, 10, 10, 26, 10, 10, - 77,148, 10, 10, 10, 10, 10, 10, 3, 10, 81, 28, 28, 28,149, 26, - 72, 10,150,113, 23, 23, 23, 23, 23, 3, 23, 23, 23, 23,114, 70, - 151, 16, 16, 16, 16, 4, 4, 14,115, 13, 13, 3, 16,152, 29, 3, - 58, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 21,153,116, 38, - 1, 1, 1, 1, 1, 29, 13, 38, 3, 7, 7, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 7, 7, 7, 7, 1, 1, 1, 1, 1, 1,117, 10, - 12, 12, 12, 12, 12, 12, 12, 21, 66,154, 4, 4, 4, 4, 4, 42, - 12, 12, 12, 12, 12, 12, 13, 4, 1, 1, 1, 16, 16, 16, 16, 16, - 4, 10, 10, 10, 10, 10, 10, 10, 20, 20, 20,116, 13, 13, 13, 13, - 20, 12, 12, 12, 12, 12, 12, 12, 6, 12, 12, 12, 12, 12, 12, 12, - 56, 6, 6, 6, 19, 19, 19, 12, 12, 12, 12, 12, 55,155, 19, 50, - 12, 12, 6, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 8, 8, 12, - 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 8, 8, 19, 19, 12, 12, - 12, 12, 12, 12, 12, 12, 8, 8, 95, 13,156, 50, 13, 50, 1, 1, - 1, 22, 1, 22, 1, 21, 1, 1, 1, 27, 18, 17, 3, 3, 4, 4, - 7, 7, 7, 3, 82, 3, 3, 3, 1, 1, 10, 10, 10, 10, 10, 10, - 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 14, 14, 14, 14, 14, - 14, 14, 4, 4, 4, 4, 4, 10, 4, 1, 1, 1, 10, 39, 39, 21, - 1, 1, 1, 4, 4, 4, 4, 10, 1, 1, 1, 21, 4, 4, 4, 4, - 4, 14, 14, 14, 14, 14, 14, 61, 1, 21, 14, 4, 4, 14, 4, 14, - 61, 10, 10, 10, 10, 10, 10, 42, 1, 1, 21, 38, 1, 1, 1, 1, - 1, 1, 1, 1, 21, 4, 4, 17, 18, 17, 18, 4, 4, 4, 4, 4, - 1, 21, 1, 1, 1, 1, 17, 14, 9, 9, 9, 9, 9, 9, 10, 10, - 38, 1, 1, 41, 3, 27, 17, 1, 22, 4, 22, 21, 22, 1, 1, 4, - 1, 1, 1, 1, 1, 1, 34, 10, 1, 1, 1, 1, 1, 27, 4, 14, - 10, 34,157, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6,102, 13, 13, - 6, 6, 6, 6,101, 20, 20, 20, 1, 27, 18, 14, 17, 61, 18, 4, - 6, 6, 6, 6, 6, 6, 50, 22, 1, 1, 1, 1,158, 1, 1, 1, - 1, 20, 20, 20, 20, 20, 20, 20, 20, 91, 3, 3, 3, 3, 3, 3, - 3, 58, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, - 1, 1, 1, 1, 1, 1, 82, 3, 10, 10, 10, 81, 53, 10, 10, 10, - 64,159,160, 28, 28, 28, 28, 28, 28, 28, 53, 81, 53, 10,107,161, - 10, 10, 10, 10,114, 28, 28, 53, 10,162, 11, 11, 67, 10, 10, 10, - 1, 1, 1, 1, 1, 1, 1,163, 10, 10, 84, 10, 23, 85, 64, 10, - 6, 6, 6, 6, 6, 89, 90, 52, 53, 23, 10, 1, 1, 1, 1, 1, - 38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, - 24,164, 57, 24, 36, 11, 35, 3, 3, 3, 3, 3,165, 15, 3, 3, - 10, 10, 10, 60, 7, 7, 7, 7, 7, 7, 7, 43, 3, 3, 3, 3, - 16, 16,111, 7, 43, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 3, - 3, 3, 3, 3, 3, 3, 33, 4, 83, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 59, 1,113, 1, 1, 1, 1, 16, 16, 16, - 166, 16, 16, 16, 16, 16, 16, 16, 8, 8, 8, 12, 6, 6, 6, 6, - 1, 1, 1, 29, 7, 7, 7, 7, 1, 1, 1, 41, 63, 7, 7, 7, - 1, 1, 1, 1, 1, 46, 7, 7, 1, 1, 1, 7, 7, 7, 7, 54, - 1, 1, 1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 46, 54, - 1, 1, 1, 1, 58, 1, 1, 1, 1, 1, 21, 4, 4, 83, 7, 7, - 6, 6, 6, 6, 6, 7, 7, 7, 1, 1, 4, 4, 4, 4, 4, 4, - 9, 9, 9, 9, 9, 1, 1, 38, 8, 8, 8, 8,167, 4, 4,115, - 6, 6, 6, 6, 6, 6, 6, 11, 1, 1, 1, 1, 1, 21,168, 26, - 44, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, - 7, 7, 7, 59, 1, 1, 1, 1, 83, 7, 54, 10, 10, 10, 10, 10, - 1, 4, 4, 10, 10, 10, 10, 10, 1, 1, 46, 7, 7, 7, 7, 7, - 18, 30, 1, 1, 1, 1, 1, 1, 4, 4, 4, 31, 10, 10, 10, 10, - 10, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 9, 9, 9, 9, - 22, 21, 22, 1, 1, 1, 1, 21, 14, 18, 4, 17, 18, 31, 97, 10, - 10, 4, 4, 4, 4, 4, 96, 15, 1, 1, 1, 21, 4, 4, 18, 4, - 4, 4, 4, 9, 9, 9, 9, 9, 10, 10, 27, 30, 1, 1, 1, 1, - 1, 21, 10, 1, 1, 1, 1, 1, 1, 27, 14, 4, 4, 4, 4, 17, - 30, 1, 29, 10, 37, 4, 31, 18, 9, 9, 9, 9, 9, 29, 29, 10, - 60, 7, 7, 7, 7, 7, 7, 7, 4, 14, 17, 4, 10, 10, 10, 22, - 17, 14, 14, 14, 14, 14, 14, 14, 1, 1, 1, 27, 14, 14, 30, 1, - 1, 14, 14, 4, 4, 4, 4, 4, 1, 1, 1, 1, 14, 18, 4, 4, - 4, 14, 14, 14, 14, 14, 14, 17, 22, 22, 10, 10, 10, 10, 10, 10, - 37, 4, 4, 4, 4, 4, 4, 4, 1, 1, 27, 14, 4, 4, 4, 4, - 14, 4, 17, 22, 1, 29, 10, 10, 9, 9, 9, 9, 9, 10, 10, 22, - 14, 18, 4, 4, 17, 17, 14, 18, 17, 4, 1, 39, 1, 1, 1, 1, - 14, 4, 4, 4, 14, 14, 4, 18, 31, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 1, 1, 4, 4, 14, 18, 4, 4, 4, 17, 18, 18, - 31, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 21, 18, 14, - 4, 4, 4, 18, 29, 10, 10, 10, 1, 1, 1, 1, 1, 1, 21, 18, - 14, 4, 4, 18, 4, 4, 4, 4, 9, 9, 9, 9, 9, 7, 10, 44, - 4, 4, 4, 4, 18, 31, 10, 10, 7, 7, 7, 7, 7, 7, 7, 59, - 14, 14, 14, 14, 14, 18, 17, 22, 30, 18, 10, 10, 10, 10, 10, 10, - 27, 14, 4, 4, 4, 4, 14, 14, 22, 39, 14, 14, 14, 14, 14, 14, - 21, 4, 4, 4, 4, 22, 1, 1, 1, 21, 4, 4, 17, 21, 4, 31, - 10, 10, 10, 37, 4, 4, 4, 4, 21, 4, 4, 17, 18, 4, 1, 1, - 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 17, 4, 10, 39, 10, - 17, 4, 17, 17, 14, 14, 14, 14, 4, 4, 4, 4, 4, 4, 4, 18, - 10, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 17, 4, 4, 4, - 17, 4, 18, 4, 4, 4, 4, 4, 4, 4, 4, 21, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 14, 14, 14, 4, 17, 18, 18, 1, 1, 1, 1, - 1, 1, 1, 1, 34, 1, 1, 1, 1, 21, 17, 61, 10, 10, 10, 10, - 4, 27, 1, 1, 1, 1, 1, 1, 1, 1, 14, 4, 4, 4, 4, 14, - 17, 31, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 4, 4, 4, - 7, 7, 43, 3, 3, 3, 57, 24, 82, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 47, 22, 1, 1, 21, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 14, 18, 4, 4, 4, 31, 10, 10, 10, 10, 10, - 4, 4, 4, 31, 10, 10, 3, 3, 13, 13, 44, 3, 3, 3, 3, 3, - 9, 9, 9, 9, 9,169, 7, 7, 7, 59, 1, 1, 1, 1, 1, 1, - 13, 38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 34,117, 10, - 7, 7, 7, 54, 10, 10, 10, 10, 8, 8, 8, 8, 8, 12, 6, 6, - 27, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 18, - 4, 68, 13, 13, 13, 13, 13, 13, 13, 42, 4, 4, 4, 4, 4, 4, - 14, 13, 16, 16, 16, 16, 16, 16, 1, 1, 1, 1, 1, 1, 33, 31, - 3, 3,118, 18, 4, 3,118, 14, 14,170, 15, 15, 15, 69, 4, 4, - 4, 40, 33, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 4, 4, 3, - 3, 4, 40, 3, 3, 3, 3, 3, 48, 6, 6, 6, 6, 6, 6, 6, + 15, 15, 15, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 20, 22, 15, + 12, 12, 12, 12, 61, 7, 7, 7,102, 1, 1, 1, 1, 1, 1, 1, + 15, 18, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 13, 13, 13, 12, + 21, 6, 6, 6, 8, 8, 81, 21, 6, 6, 6, 6, 8, 8,104, 21, + 7, 7, 7, 7, 7, 3, 3, 3, 64, 7, 7, 7, 7, 7, 7, 7, + 6, 11, 11, 11, 11, 11, 11, 11, 1, 1, 1, 46, 7, 7, 7, 7, + 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 46, 7, + 1, 1, 1, 1, 7, 7, 7, 7, 1, 1, 1, 1, 1, 1, 15, 18, + 1, 1, 1, 1, 1, 1, 1, 20, 1, 1, 1, 1, 1, 1, 1, 26, + 10, 10, 10, 10, 10, 3, 3, 3, 72, 12, 87, 12, 23, 88, 65, 12, + 6, 6, 6, 6, 6, 92, 93,120, 72, 24, 24, 47, 94,121,122, 95, + 35, 7, 74, 12,123,124, 7, 56, 8, 8, 8, 48, 8, 8, 8, 11, + 6, 6, 6, 49, 6, 6, 6, 6, 11, 11, 11, 11, 19, 19, 19, 19, + 19, 19, 19, 19, 6, 11, 11, 11, 11, 11, 11, 11, 8, 19, 19, 6, + 19, 11, 11, 8, 19, 8, 6, 8, 8, 19, 11, 8, 11, 6, 8, 19, + 11, 11, 11, 8, 19, 6, 11, 8, 19, 8, 19, 19, 11, 50, 11, 6, + 1, 1, 96, 19, 97, 96, 19, 19, 19, 19, 19, 19, 19, 19, 6, 11, + 19, 97, 11, 8, 11, 11, 11, 11, 11, 11, 6, 6, 6, 8, 19, 11, + 19, 19, 8, 11, 11, 11, 11, 11, 6, 6, 1, 6, 6, 6, 6, 6, + 13, 21, 21, 13, 13, 13, 13, 13, 13, 21, 21, 21, 21, 21, 21, 21, + 13, 13, 57, 21, 21, 21, 57, 57, 11, 11, 57, 11, 6, 58, 6, 73, + 21, 21, 21,125, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 19, 6, 8, 11, 6, 11, 11, 11, 11, + 6, 6, 11, 75, 19, 11, 19, 8, 11, 32, 4, 4, 67, 11, 11, 11, + 8, 19, 19, 19, 19, 19, 19, 6, 8, 8, 8, 8, 13, 12, 12, 12, + 6, 6, 6, 6, 76, 77,126, 59,127, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4,128, 38, 30, 4, 38, 4, 4, 4, 4, + 1, 28, 12, 12, 12, 12, 12, 12, 16, 16, 16, 9, 66, 68, 12, 3, + 4, 4, 4, 4, 4, 30,129, 12, 39, 1, 1, 1, 1, 20, 4, 4, + 10, 10, 10, 10, 10, 12, 12, 1, 1, 1, 40, 4, 4, 4, 98, 32, + 4, 4, 69, 51, 37, 4, 4, 1, 10, 10, 10, 10, 10, 1, 41, 52, + 12, 12, 12, 12, 12, 12, 12, 99, 4, 4, 4, 4, 4, 4, 22, 1, + 1, 1, 1, 1, 1, 20, 4, 4, 4, 4, 13, 47, 12, 13, 51, 24, + 1, 1, 1, 4, 4, 51, 4, 4, 4, 4, 51, 4, 51, 4, 4, 4, + 1, 1, 1, 1, 20, 4, 4, 12, 1, 1, 1, 1,130, 1, 1, 1, + 16, 16, 16, 70, 4, 4, 4, 4, 1, 1, 1, 1, 34, 4, 4, 4, + 4, 70, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 17, 22, 15, + 18, 4, 4, 4, 17, 15, 18, 15, 20, 4, 4, 4, 1, 1, 1, 1, + 1, 4, 12, 10, 10, 10, 10, 10, 42, 1, 1, 1, 1, 1, 1, 1, + 20, 15, 29, 1, 1, 1, 1, 1, 18, 4, 4, 17, 15, 15, 18, 1, + 1, 1, 1, 26, 15, 15, 1, 1, 1, 24, 7, 7, 7, 59, 28, 4, + 1, 1, 1, 1, 1, 1, 4, 15, 18, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 22, 1, 1, 1, 1, 1, 1, 10, 10, 10, 10, 10, + 4, 1, 20, 12, 12, 12, 12, 12, 18, 4, 4, 4, 17, 15, 18, 4, + 68, 24, 24, 24,131, 4, 4, 4, 18, 4, 4, 17, 15, 15, 18, 4, + 4, 4, 4, 17, 15, 15, 1, 1, 52, 7, 7, 7, 7, 7, 7, 7, + 1, 1, 1, 1, 1, 1, 1, 15, 17, 15, 15, 15, 15, 15, 18, 4, + 1, 1, 1, 26, 15, 15, 15, 15, 7, 43, 3, 3, 59, 3, 3, 3, + 17, 15, 22, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 22, 4, + 17, 15, 15, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, + 10, 10, 10,100, 7, 7, 7, 43, 20, 15, 40, 1, 1, 1, 1, 1, + 15, 15, 15, 17, 15, 15, 4, 4, 4, 4, 17, 15, 15, 15, 1, 1, + 101, 26, 15, 15, 15, 15, 15, 15, 4, 15, 1, 1, 1, 1, 1, 1, + 18, 4, 4, 15, 15, 15, 18, 41, 3, 3, 1, 26, 7, 7, 7, 60, + 7, 7, 7, 7, 43, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 17, + 15, 4, 4, 4, 15, 15, 15, 15, 10, 15, 12, 12, 12, 12, 12, 12, + 20, 1, 4, 4, 4, 4, 4,132, 1, 1, 1, 51, 4, 4, 4, 30, + 20, 1, 4, 4, 4, 4, 22, 1, 1, 1, 1, 13, 4, 4, 4, 4, + 10, 10, 10, 10, 10, 10, 1, 1, 41, 3, 12, 12, 12, 12, 12, 12, + 12, 44, 44, 3, 4, 3, 3, 3, 7, 7, 32, 32, 32, 23, 23, 15, + 20, 4, 4, 4, 4, 4, 4, 17, 4, 4, 30, 4, 1, 1, 20, 4, + 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 37, 3, 3, 3, 3, + 12, 12, 44, 3, 47, 12, 12, 12, 1, 1, 1, 1, 1, 26, 18, 4, + 17, 4, 4, 4, 18, 17, 18, 22, 1, 1, 1, 15, 4, 1, 1, 4, + 22, 15, 29, 26, 15, 15, 15, 1, 20, 4, 22, 1, 1, 1, 1, 1, + 1, 17, 18, 17, 15, 15, 18, 26, 10, 10, 10, 10, 10, 15, 18, 3, + 6, 6, 6, 6, 6, 76, 58, 6, 1, 1, 1, 1, 1, 1, 20, 4, + 1, 1, 1, 1, 1, 1, 41, 40,133, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1,134, 31, 31, 1, 1, 1, 1, 1, 28, 12, 14, + 135, 1, 1, 1, 1, 1, 1, 1, 1, 4, 17, 15, 15, 15, 15, 29, + 1, 4, 62, 12, 12, 12, 12, 12, 1, 1, 4, 18, 4, 4, 4, 15, + 15, 15, 15, 17, 18, 4, 4, 4, 4, 4, 12, 42, 12, 68, 20, 4, + 12, 12, 12, 78, 12, 38, 4, 70, 1, 34, 1, 1, 1, 1, 1, 1, + 1, 1, 20, 22, 1, 1, 1, 1, 1, 1, 1, 1, 20, 1, 1, 1, + 4, 17, 15, 18, 17, 15, 15, 15, 15, 17, 15, 15, 18, 4, 4, 4, + 3, 3, 12, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 7, 7, 3, + 1, 1, 1, 20, 17, 18, 4, 12, 1, 1, 26, 17, 4, 4, 4, 4, + 17, 17, 18, 4, 4, 4, 17, 15, 12, 12, 12, 42, 12, 12, 12, 12, + 4, 4, 4, 4, 4, 4, 4, 79, 4, 4, 29, 1, 1, 1, 1, 1, + 1, 1, 17, 4, 4, 17, 17, 15, 15, 17, 29, 1, 1, 1, 1, 12, + 44, 3, 3, 3, 3, 32, 4, 4, 4, 4, 3, 3, 3, 3, 47, 12, + 26, 4, 4, 15, 4, 18, 4, 1, 1, 1, 1, 17, 4, 15, 18, 18, + 4, 15, 15, 15, 15, 15, 12, 12, 1, 1, 15, 15, 15, 15, 4, 4, + 4, 4, 15, 4, 4, 30, 12, 12, 10, 10, 10, 10, 10, 10,101, 1, + 6, 6, 6, 6, 19, 6, 6, 6, 4, 30, 4, 4, 4, 4, 4, 4, + 17, 4, 4, 4, 22, 1, 20, 1, 1, 1, 22, 26, 4, 1, 1, 1, + 6, 6, 6, 6, 6, 6, 13, 13, 13, 13, 13, 13, 13, 58, 6, 6, + 6, 6, 6, 6, 58, 6, 6, 6, 6, 6, 6, 6, 6, 80, 13, 13, + 11, 11, 11, 6, 6, 6, 6, 11, 6, 6, 6, 6, 19, 8, 8, 8, + 6, 6, 6, 6, 8, 8, 81,103, 63, 63, 63, 63, 63,136, 16, 16, + 53, 53, 53, 12, 45,105, 45,105, 12, 12, 12, 12,137, 16, 16,138, + 12, 12, 12, 12,106,107, 12,108,109, 12, 54, 55, 12, 12, 12, 12, + 12, 66,109, 12, 12, 12, 12,139,140, 13, 7, 7, 7, 9, 54,110, + 7, 7, 7, 7, 7, 9, 54,110, 4, 4, 4, 4, 4, 4,141, 67, + 79, 67, 79, 4, 4, 4, 4, 4, 3, 71, 3, 82, 3, 19, 8, 6, + 8, 11, 82, 3, 75, 8, 8, 3, 3, 3, 71, 71, 71, 8, 8,142, + 8, 8, 50, 1,111, 3, 6, 8, 9, 9, 75, 6, 6, 35, 3,112, + 14,143,144, 14,113, 3, 3, 3, 9, 9, 36, 3, 3, 9, 3, 3, + 36, 35, 3, 36, 3, 3, 3, 36, 3, 3, 3, 3, 3, 3, 3, 9, + 3, 36, 36, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, 9, 9, + 3, 3, 3, 3, 23, 23, 3, 3, 9, 3, 3, 3,145,146, 3, 3, + 3, 3, 3, 3, 3, 3, 36, 3, 3, 3, 3, 3, 3, 35, 9, 9, + 9, 9, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, + 9, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 3, 3, + 3, 3, 3, 3, 3, 7, 7, 7, 3, 3, 3, 35, 3, 3, 3, 3, + 35, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 9, 9, 9, 9, + 3, 3, 3, 3, 3, 3, 3, 35, 3, 3, 3, 3, 23, 23, 23, 23, + 23, 23, 23, 7, 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, 3, 3, + 9, 9, 54,114, 9, 9, 9, 9, 9, 9, 9, 23, 23, 23, 23, 23, + 9, 54, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,114, 9, 9, 9, + 9, 9, 9, 9, 23, 23, 9, 9, 9, 9, 9, 9, 9, 9, 23, 9, + 9, 9, 36, 35, 9, 9, 36, 3, 11, 8, 11, 19, 19, 19, 19, 8, + 11, 11, 19, 6, 6, 6, 13, 8, 11, 11,112, 3, 3, 82, 19,147, + 4, 11, 6, 6, 76, 12, 61, 12, 1, 1, 1, 1, 1, 1, 1, 34, + 12, 12, 12, 12, 12, 12, 12, 38, 12, 45, 45, 12,106,107, 45, 12, + 12, 12, 12, 65, 12, 78, 45, 12, 45, 23, 23, 23, 23, 12, 12, 42, + 12, 12, 12, 12, 12, 53, 12, 12, 78,148, 12, 12, 12, 12, 12, 12, + 3, 12, 83, 27, 27, 27,149, 53, 12, 23, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 72, 12,150,115, 23, 23, 23, 23, + 23, 3, 23, 23, 23, 23,116, 31,151, 14, 14, 14, 14, 4, 4, 15, + 77, 13, 13, 3, 14,152, 28, 3, 52, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 20,153,117, 39, 1, 1, 1, 1, 1, 28, 13, 39, + 3, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, + 1, 1, 34, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,118, 12, + 11, 11, 11, 11, 11, 11, 11, 20, 67,154, 4, 4, 4, 4, 4, 42, + 11, 11, 11, 11, 11, 11, 13, 4, 1, 1, 1, 14, 14, 14, 14, 14, + 4, 12, 12, 12, 12, 12, 12, 12, 21, 21, 21,117, 13, 13, 13, 13, + 21, 11, 11, 11, 11, 11, 11, 11, 58, 6, 6, 6, 19, 19, 19, 11, + 11, 11, 11, 11, 57,155, 19, 50, 11, 11, 6, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 8, 8, 11, 8, 8, 11, 11, 11, 11, 11, 11, + 11, 11, 8, 8, 19, 19, 11, 11, 11, 11, 11, 11, 11, 11, 8, 8, + 156, 13,157, 50, 13, 50, 1, 1, 1, 22, 1, 22, 1, 20, 1, 1, + 1, 26, 18, 17, 3, 3, 4, 4, 7, 7, 7, 3, 84, 3, 3, 3, + 1, 1, 12, 12, 12, 12, 12, 12, 15, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 15, 15, 15, 15, 15, 15, 15, 15, 4, 4, 4, 4, 4, 12, + 4, 1, 1, 1, 12, 40, 40, 20, 1, 1, 1, 4, 4, 4, 4, 12, + 1, 1, 1, 20, 4, 4, 4, 4, 4, 15, 15, 15, 15, 15, 15, 62, + 1, 20, 15, 4, 4, 15, 4, 15, 62, 12, 12, 12, 12, 12, 12, 42, + 1, 1, 20, 39, 1, 1, 1, 1, 1, 1, 1, 1, 20, 4, 4, 17, + 18, 17, 18, 4, 4, 4, 4, 4, 1, 20, 1, 1, 1, 1, 17, 15, + 10, 10, 10, 10, 10, 10, 12, 12, 39, 1, 1, 41, 3, 26, 17, 1, + 22, 4, 22, 20, 22, 1, 1, 4, 1, 1, 1, 1, 1, 1, 34, 12, + 1, 1, 1, 1, 1, 26, 4, 15, 12, 34,158, 4, 4, 4, 4, 4, + 6, 6, 6, 6, 6,103, 13, 13, 6, 6, 6, 6, 80, 21, 8, 8, + 1, 26, 18, 15, 17, 62, 18, 4, 6, 6, 6, 6, 6, 6, 50, 22, + 1, 1, 1, 1,159, 1, 1, 1, 1, 21, 21, 21, 21, 21, 21, 21, + 21, 94, 3, 3, 3, 3, 3, 3, 3, 52, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 27, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 84, 3, + 12, 12, 12, 83, 55, 12, 12, 12, 65,160,161, 27, 27, 27, 27, 27, + 27, 27, 55, 83, 55, 12,108,162, 12, 12, 12, 12,116, 27, 27, 55, + 12,163, 9, 9, 68, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1,164, + 12, 12, 87, 12, 23, 88, 65, 12, 6, 6, 6, 6, 6, 92, 93, 54, + 55, 23, 12, 1, 1, 1, 1, 1, 39, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 13, 24,165, 59, 24, 35, 9, 36, 3, + 3, 3, 3, 3,166, 16, 3, 3, 12, 12, 12, 61, 7, 7, 7, 7, + 7, 7, 7, 43, 3, 3, 3, 3, 14, 14,113, 7, 43, 3, 3, 3, + 3, 3, 3, 3, 3, 7, 3, 3, 3, 3, 3, 3, 3, 3, 32, 4, + 85, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 60, 1, + 115, 1, 1, 1, 1, 14, 14, 14,119, 14, 14, 14, 14, 14, 14, 14, + 8, 8, 8, 11, 6, 6, 6, 6, 1, 1, 1, 28, 7, 7, 7, 7, + 1, 1, 1, 41, 64, 7, 7, 7, 1, 1, 1, 1, 1, 46, 7, 7, + 1, 1, 1, 7, 7, 7, 7, 56, 1, 1, 1, 1, 1, 1, 7, 1, + 1, 1, 1, 1, 1, 1, 46, 56, 1, 1, 1, 1, 52, 1, 1, 1, + 1, 1, 20, 4, 4, 85, 7, 7, 6, 6, 6, 6, 6, 7, 7, 7, + 1, 1, 4, 4, 4, 4, 4, 4, 10, 10, 10, 10, 10, 1, 1, 39, + 8, 8, 8, 8,167, 4, 4, 77, 6, 6, 6, 6, 6, 6, 6, 9, + 1, 1, 1, 1, 1, 20,168, 53, 1, 1, 34, 1,169,170, 4, 4, + 44, 3, 3, 3, 52, 1, 1, 1, 7, 7, 7, 60, 1, 1, 1, 1, + 85, 7, 56, 12, 12, 12, 12, 12, 1, 4, 4, 12, 12, 12, 12, 12, + 1, 1, 46, 7, 7, 7, 7, 7, 18, 29, 1, 1, 1, 1, 1, 1, + 4, 4, 4, 30, 12, 12, 12, 12, 12, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 10, 10, 10, 10, 10, 22, 20, 22, 1, 1, 1, 1, 20, + 15, 18, 4, 17, 18, 30, 99, 12, 12, 4, 4, 4, 4, 4, 98, 16, + 1, 1, 1, 20, 4, 4, 18, 4, 4, 4, 4, 10, 10, 10, 10, 10, + 12, 12, 26, 29, 1, 1, 1, 1, 1, 20, 12, 1, 1, 1, 1, 1, + 1, 26, 15, 4, 4, 4, 4, 17, 29, 1, 28, 12, 38, 4, 30, 18, + 10, 10, 10, 10, 10, 28, 28, 12, 61, 7, 7, 7, 7, 7, 7, 7, + 4, 15, 17, 4, 12, 12, 12, 22, 17, 15, 15, 15, 15, 15, 15, 15, + 1, 1, 1, 26, 15, 15, 29, 1, 1, 15, 15, 4, 4, 4, 4, 4, + 1, 1, 1, 1, 15, 18, 4, 4, 4, 15, 15, 15, 15, 15, 15, 17, + 22, 22, 12, 12, 12, 12, 12, 12, 38, 4, 4, 4, 4, 4, 4, 4, + 1, 1, 26, 15, 4, 4, 4, 4, 15, 4, 17, 22, 1, 28, 12, 12, + 10, 10, 10, 10, 10, 12, 12, 22, 15, 18, 4, 4, 17, 17, 15, 18, + 17, 4, 1, 40, 1, 1, 1, 1, 15, 4, 4, 4, 15, 15, 4, 18, + 30, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 4, 4, + 15, 18, 4, 4, 4, 17, 18, 18, 30, 12, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 20, 18, 15, 4, 4, 4, 18, 28, 12, 12, 12, + 1, 1, 1, 1, 1, 1, 20, 18, 15, 4, 4, 18, 4, 4, 4, 4, + 10, 10, 10, 10, 10, 7, 12, 44, 4, 4, 4, 4, 18, 30, 12, 12, + 7, 7, 7, 7, 7, 7, 7, 60, 15, 15, 15, 15, 15, 18, 17, 22, + 29, 18, 12, 12, 12, 12, 12, 12, 26, 15, 4, 4, 4, 4, 15, 15, + 22, 40, 15, 15, 15, 15, 15, 15, 20, 4, 4, 4, 4, 22, 1, 1, + 1, 20, 4, 4, 17, 20, 4, 30, 12, 12, 12, 38, 4, 4, 4, 4, + 20, 4, 4, 17, 18, 4, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, + 4, 4, 4, 17, 4, 12, 40, 12, 12, 12, 12, 12, 12, 1, 1, 1, + 17, 4, 17, 17, 15, 15, 15, 15, 4, 4, 4, 4, 4, 4, 4, 18, + 12, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 17, 4, 4, 4, + 17, 4, 18, 4, 4, 4, 4, 4, 4, 4, 4, 20, 4, 4, 4, 4, + 1, 1, 1, 1, 1, 15, 15, 15, 4, 17, 18, 18, 1, 1, 1, 1, + 1, 1, 1, 1, 34, 1, 1, 1, 1, 20, 17, 62, 12, 12, 12, 12, + 4, 26, 1, 1, 1, 1, 1, 1, 1, 1, 15, 4, 4, 4, 4, 15, + 17, 30, 12, 12, 12, 12, 12, 12, 10, 10, 10, 10, 10, 4, 4, 4, + 7, 7, 43, 3, 3, 3, 59, 24, 84, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 47, 12, 12,119, 14, 14, 14, 14, 14, + 22, 1, 1, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, 15, 18, 4, + 4, 4, 30, 12, 12, 12, 12, 12, 4, 4, 4, 30, 12, 12, 3, 3, + 13, 13, 44, 3, 3, 3, 3, 3, 10, 10, 10, 10, 10,171, 7, 7, + 7, 60, 1, 1, 1, 1, 1, 1, 13, 39, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 34,118, 12, 7, 7, 7, 56, 12, 12, 12, 12, + 8, 8, 8, 8, 8, 11, 6, 6, 26, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 18, 4, 69, 13, 13, 13, 13, 13, 13, + 13, 42, 4, 4, 4, 4, 4, 4, 15, 13, 14, 14, 14, 14, 14, 14, + 1, 1, 1, 1, 1, 1, 32, 30, 3, 3, 3, 3, 3, 3, 35, 9, + 3, 3, 3, 32, 37, 3, 3, 3, 3, 3, 86, 18, 4, 3, 86, 15, + 15,172, 16, 16, 16, 70, 4, 4, 4, 37, 32, 4, 4, 4, 3, 3, + 3, 3, 3, 3, 3, 4, 4, 3, 3, 4, 37, 3, 3, 3, 3, 3, + 15,173, 3, 3, 3, 32, 37, 86, 48, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 49, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 48, 6, 6, 6, 6, 49, 6, 6, 6, 8, 8, 8, 8, 48, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 49, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 48, 6, 6, 6, 6, 49, 6, 6, 6, 8, 8, 8, 8, 48, 6, 6, 6, - 6, 49, 6, 6, 6, 12, 6, 9, 4, 4, 4, 40, 3, 33, 4, 4, - 4, 4, 4, 4, 4, 4, 40, 3, 3, 3, 33, 3, 3, 3, 3, 3, - 3, 3, 40, 47, 10, 10, 10, 10, 10, 10, 10, 10, 10, 37, 4, 4, - 6, 6, 6, 6, 6,109, 6, 6, 4, 4, 4, 68, 13, 13, 13, 13, - 9, 9, 9, 9, 9, 9, 9, 41, 1, 1, 1, 1, 1, 1, 4, 4, - 9, 9, 9, 9, 9, 9, 9,171, 1, 1, 1, 1, 1, 34, 4, 4, - 172, 9, 9, 9, 9, 9, 9, 98, 1, 21, 1, 22, 1, 1, 1, 4, - 1, 1, 21, 4, 4, 4, 4, 34, 6, 6, 4, 4, 4, 68, 13, 13, - 7, 7, 7, 7, 7, 7, 63, 7,173, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 63, 7, 7, 7, 7, 7, 7, 43, 3, - 3, 3, 3, 3, 3, 92, 20, 20, 2, 2, 7, 7, 3, 3, 26, 26, - 12, 12, 4, 4, 5, 5, 15, 15, 9, 9, 13, 13, 21, 21, 25, 25, - 9, 5, 6, 6, 10, 10, 1, 1, 14, 14, 12, 10, 10, 12, 5, 9, - 24, 24, 7, 12, 12, 7, 22, 18, 23, 23, 0, 0, 17, 17, 7, 10, - 18, 22, 7, 21, 10, 7, 12, 21, 8, 8, 26, 12, 7, 6, 25, 26, - 26, 25, 21, 12, 6, 7, 21, 7, 12, 26, 7, 26, 21, 6, 15, 26, + 6, 49, 6, 6, 6, 11, 6, 10, 4, 4, 4, 37, 3, 32, 4, 4, + 4, 4, 4, 4, 4, 4, 37, 3, 3, 3, 32, 3, 3, 3, 3, 3, + 3, 3, 37, 47, 12, 12, 12, 12, 12, 12, 12, 12, 12, 38, 4, 4, + 6, 6, 6, 6, 6,111, 6, 6, 11, 6, 6, 6, 11, 11, 19, 6, + 19, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 11, 11, 11, 11, + 6, 6, 6, 6, 6, 6, 80, 13, 4, 4, 4, 69, 13, 13, 13, 13, + 10, 10, 10, 10, 10, 10, 10, 41, 1, 1, 1, 1, 1, 1, 4, 4, + 10, 10, 10, 10, 10, 10, 10,174, 1, 1, 1, 1, 1, 34, 4, 4, + 175, 10, 10, 10, 10, 10, 10,100, 1, 20, 1, 22, 1, 1, 1, 4, + 1, 1, 20, 4, 4, 4, 4, 34, 6, 6, 4, 4, 4, 69, 13, 13, + 7, 7, 7, 7, 7, 7, 64, 7,176, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 64, 7, 7, 7, 7, 7, 7, 43, 3, + 3, 3, 3, 3, 3, 95, 21, 21, 2, 2, 7, 7, 3, 3, 26, 26, + 12, 12, 4, 4, 5, 5, 15, 15, 9, 9, 25, 25, 13, 13, 9, 5, + 21, 21, 6, 6, 14, 14, 10, 10, 1, 1, 12, 10, 10, 12, 5, 9, + 7, 12, 24, 24, 12, 7, 22, 18, 23, 23, 0, 0, 7, 10, 18, 22, + 7, 21, 10, 7, 12, 21, 18, 18, 26, 12, 8, 8, 7, 6, 26, 25, + 25, 26, 12, 26, 21, 12, 6, 7, 21, 7, 7, 26, 21, 6, 15, 26, 21, 26, 20, 19, 7, 15, 26, 21, 9, 25, 5, 25, 5, 7, 6, 12, - 25, 22, 18, 21, 15, 21, 6, 24, 6, 5, 26, 23, 26, 7, 15, 7, - 21, 15, 10, 21, 29, 29, 26, 15, 21, 17, 25, 21, 11, 11, 21, 23, - 12, 6, 1, 12, 18, 18, 9, 26, 29, 21, 21, 9, 24, 5, 25, 9, - 5, 21, 17, 21, 11, 12, 8, 24, 26, 9, 21, 22, 23, 26, 12, 15, - 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, 5, 22, 25, 18, 24, 26, - 26, 24, 9, 8, 8, 5, 9, 6, 12, 1, 21, 1, 13, 21, 13, 7, - 17, 7, 5, 6, 5, 24, 9, 24, 22, 20, 21, 20, 19, 21, 21, 16, - 16, 21, 7, 5, 5, 26, 14, 15, 18, 25, 7, 14, 17, 22, 17, 6, - 24, 6, 6, 21, 26, 10, 25, 0, 7, 20, 25, 1, 24, 15, 7, 19, - 9, 21, 17, 26, 23, 12, 17, 12, 1, 21, 24, 7, 23, 7, 12, 23, - 29, 7, 7, 22, 14, 7, 29, 1, 27, 28, 1, 29, 21, 29, 15, 6, - 18, 6, 12, 11, 26, 5, 14, 9, 5, 14, 26, 22, 18, 26, 5, 12, + 26, 7, 17, 17, 25, 22, 18, 21, 15, 21, 6, 24, 6, 5, 26, 23, + 15, 7, 21, 15, 10, 21, 29, 29, 26, 15, 21, 17, 25, 21, 11, 11, + 21, 23, 12, 6, 1, 12, 9, 26, 29, 21, 21, 9, 24, 5, 25, 9, + 5, 21, 17, 6, 17, 21, 11, 12, 5, 6, 8, 24, 26, 9, 21, 22, + 23, 26, 12, 15, 26, 10, 23, 21, 21, 25, 9, 22, 21, 18, 24, 16, + 5, 22, 25, 18, 24, 26, 26, 24, 9, 8, 8, 5, 12, 1, 21, 1, + 13, 21, 13, 7, 17, 7, 5, 24, 9, 24, 22, 20, 21, 20, 19, 21, + 21, 16, 16, 21, 18, 6, 7, 5, 5, 26, 14, 15, 18, 25, 7, 14, + 17, 22, 24, 6, 6, 21, 21, 14, 25, 0, 7, 20, 25, 1, 24, 15, + 7, 19, 9, 21, 6, 26, 23, 12, 17, 12, 1, 21, 24, 7, 23, 7, + 12, 23, 29, 7, 7, 22, 14, 7, 29, 1, 27, 28, 1, 29, 21, 29, + 15, 6, 12, 11, 26, 5, 14, 9, 5, 14, 26, 22, 18, 26, 5, 12, 22, 21, 18, 17, 26, 6, 26, 14, 14, 6, 12, 24, 11, 21, 24, 9, - 6, 9, 6, 10, 7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 7, 1, - 25, 24, 26, 1, 21, 14, 9, 12, 12, 17, 13, 15, 10, 1, 13, 23, - 7, 13, 23, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, - 11, 12, 13, 0, 14, 0, 0, 0, 0, 0, 15, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 20, 0, 21, 22, 23, 0, 0, 0, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 0, 36, 0, 37, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, - 0, 0, 0, 0, 41, 42, 43, 44, 45, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 9, 0, 0, 0, 10, - 11, 12, 13, 0, 14, 15, 16, 0, 17, 18, 19, 20, 21, 1, 22, 1, - 23, 1, 2, 1, 2, 1, 2, 0, 2, 1, 24, 1, 2, 25, 2, 0, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, 36, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 39, 0, 0, 40, 0, 41, 0, 0, 0, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 0, 0, 51, 0, 0, 0, 52, 0, 0, 0, 53, 0, 0, 0, - 0, 0, 0, 0, 54, 0, 3, 0, 55, 56, 0, 57, 0, 0, 0, 0, - 0, 0, 58, 59, 60, 0, 0, 0, 0, 61, 0, 0, 62, 63, 64, 4, - 65, 0, 0, 66, 67, 0, 0, 0, 68, 0, 0, 0, 0, 69, 0, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 0, 0, 72, 0, 73, 0, 0, 74, 0, 0, 75, 0, 0, 0, - 0, 0, 0, 0, 0, 76, 77, 0, 0, 0, 0, 78, 79, 0, 80, 81, - 0, 0, 82, 5, 0, 83, 4, 0, 84, 85, 0, 0, 86, 87, 88, 0, - 89, 0, 90, 0, 91, 0, 0, 3, 92, 3, 0, 93, 0, 94, 0, 0, - 0, 5, 0, 0, 0, 95, 96, 0, 97, 98, 99,100, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 0,101,102, 0, 0, 0, 0, 0, 0,103, 0, - 0, 0, 0, 0, 0,104, 0, 0, 0, 0, 0, 0,105, 6, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,106, 0, 0,107, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,108,109, 0, 0,110, 0, 0, 0, 0, 0, - 0,111, 0,112, 0, 6, 0, 0, 0, 0, 0,113,114, 0, 0, 0, - 0, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0,117, 0, 0, 0, - 0, 0, 0, 0,118, 0,119, 0, 0, 0, 0, 0, 0, 0, 2, 1, - 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 11, 0, 0, 0, 14, 0, - 0, 0, 16, 3, 17, 18, 19, 20, 21, 22, 0, 23, 0, 0, 0, 0, - 24, 25, 26, 27, 0, 0, 0, 0, 28, 0, 0, 29, 30, 0, 31, 0, - 32, 33, 0, 0, 34, 0, 35, 36, 0, 0, 0, 0, 0, 37, 38, 0, - 39, 40, 0, 0, 41, 0, 0, 0, 42, 0, 0, 43, 44, 45, 46, 1, - 47, 0, 0, 1, 0, 0, 7, 1, 48, 0, 0, 0, 0, 0, 49, 50, - 0, 0, 0, 0, 0, 0, 51, 52, 0, 0, 0, 0, 0, 0, 53, 54, - 0, 0, 0, 0, 55, 0, 56, 0, 0, 0, 57, 58, 0, 0, 0, 59, - 0, 0, 0, 0, 0, 0, 60, 12, 0, 0, 0, 0, 61, 0, 0, 0, - 62, 0, 5, 0, 63, 0, 0, 0, 0, 64, 0, 0, 0, 0, 65, 0, - 66, 0, 0, 0, 0, 6, 67, 0, 0, 0, 68, 69, 70, 71, 0, 0, - 0, 0, 72, 5, 0, 73, 74, 0, 0, 75, 0, 0, 0, 76, 77, 0, - 0, 0, 78, 0, 79, 80, 81, 82, 83, 3, 84, 0, 85, 86, 87, 0, - 0, 8, 9, 0, 0, 3, 3, 0, 0, 88, 0, 0, 89, 0, 0, 0, - 0, 8, 90, 0, 91, 0, 0, 0, 0, 0, 9, 10, 0, 92, 0, 5, - 0, 3, 9, 0, 0, 93, 0, 0, 94, 0, 0, 6, 0, 0, 0, 0, - 0, 0, 95, 96, 0, 0, 10, 0, 0, 1, 0, 0, 97, 0, 0, 0, - 0, 98, 0, 0, 0, 0, 12, 0, 0, 13, 0, 0, 0, 0, 99,100, - 0, 0,101, 0, 0,102, 0, 0, 0,103, 0, 0, 0,104, 0, 0, - 0,105, 0, 0, 0, 0,106,107, 13, 0, 0,108, 0, 0, 0, 10, - 0, 0,109,110, 0, 0,111,112, 0, 0, 0, 0, 0, 0,113, 0, - 0,114, 0, 0, 0, 0,115, 1, 0,116,117,118, 6, 0, 0,119, - 7, 0, 0,120, 0, 0, 0,121, 0, 0, 0, 0, 0, 0,122, 0, - 0,123, 0, 0, 0, 0,124, 11, 0, 0, 0, 0, 0, 6, 0, 0, - 0, 0, 5, 15, 0, 0, 0, 0,125, 0, 0,126, 0, 0, 0, 0, - 15, 0, 0,127, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0,128, 0, - 0, 0,129, 0,130, 0, 0, 0, 0,131,132,133, 0,134, 0,135, - 0, 0, 0,136,137,138, 0, 8, 0, 0, 0, 0, 0, 7, 0, 0, - 0,139, 0, 0, 0,140, 0, 0, 0,141, 0, 0, 0,142,143, 0, - 144, 0, 0,145, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 9, - 1, 1, 1, 1, 0, 0, 0, 2, 0, 3, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 19, 0, 0, 0, 6, 11, 0, 0, 0, 0, 14, 0, 0, - 15, 0, 0, 0, 0, 0, 0, 17, 29, 0, 0, 0, 0, 0, 31, 0, - 0, 2, 0, 0, 1, 12, 0, 0, 1, 49, 50, 5, 51, 52, 53, 5, - 5, 22, 32, 23, 1, 54, 24, 55, 16, 33, 56, 57, 58, 1, 1, 1, - 6, 1, 0, 0, 59, 7, 60, 1, 34, 5, 7, 61, 62, 63, 64, 65, - 66, 67, 0, 0, 1, 1, 68, 0, 0, 0, 69, 70, 71, 35, 1, 25, - 72, 0, 0, 0, 0, 8, 1, 26, 16, 26, 73, 27, 74, 0, 0, 0, - 36, 25, 75, 37, 7, 37, 76, 0, 0, 0, 6, 1, 7, 0, 0, 17, - 0, 8, 38, 1, 1, 13, 13, 11, 0, 0, 39, 0, 0, 6, 18, 1, - 0, 0, 8, 16, 5, 1, 1, 1, 77, 7, 36, 18, 78, 7, 35, 1, - 79, 10, 0, 0, 0, 80, 0, 0, 0, 0, 2, 3, 0, 0, 14, 0, - 0, 0, 81, 0, 0, 0, 82, 0, 0, 0, 83, 0, 0, 0, 84, 0, - 0, 0, 40, 0, 0, 85, 86, 0, 87, 88, 89, 90, 91, 92, 0, 0, - 0, 93, 0, 0, 0, 15, 28, 0, 0, 0, 0, 13, 0, 41, 0, 0, - 14, 0, 0, 20, 0, 0, 94, 0, 0, 0, 95, 0, 0, 6, 29, 0, - 0, 13, 1, 96, 1, 18, 33, 97, 25, 23, 7, 1, 1, 1, 1, 27, - 1, 7, 98, 0, 0, 9, 0, 0, 0, 0, 6, 23, 1, 0, 0, 0, - 0, 0, 30, 0, 0, 21, 0, 0, 30, 0, 0, 0, 0, 15, 0, 0, - 12, 32, 24, 5, 99, 22, 42, 17, 0, 10, 11, 0, 7, 1, 7,100, - 101, 1, 1, 1, 1,102,103,104,105, 1,106, 10, 20,107,108, 5, - 10, 0, 0, 0, 0, 0,109,110, 0, 0,111, 0, 0, 1, 1, 11, - 0, 0, 0, 8, 0, 0, 0, 3, 0, 0, 43, 40, 2, 0, 0, 0, - 44,112, 10, 8, 20, 0, 0, 0, 0, 0, 0,113, 1, 16, 5, 24, - 0, 8, 12, 0, 0, 0, 0,114, 0, 0,115, 2, 0,116, 0, 0, - 0, 1, 0, 0, 0, 0, 13, 11, 0, 0, 6, 10, 0, 0, 45, 39, - 0, 45, 16, 18, 46, 27, 0, 0, 3, 0, 0, 2, 12, 0, 0, 0, - 2, 3, 0, 0, 3, 0, 21, 0, 0, 31, 0, 0, 0, 0,117, 0, - 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, 0, 0, 0, 30, - 14, 21, 0, 0, 47, 0, 0, 0, 9, 0, 0, 0, 0, 47, 0, 0, - 0, 0, 2, 0, 0, 0, 0, 28, 0, 0, 4, 0, 21, 41, 0, 0, - 28, 0, 0, 0, 22, 42, 0, 0,118, 0, 0, 0, 0, 0, 0,119, - 0,120,121,122,123, 0, 43, 5, 48, 13, 34, 0, 0, 0, 8, 11, - 8, 10, 0, 0, 1, 12, 1, 1, 1, 1, 26, 1, 38, 44, 12, 0, - 0, 0, 0, 1, 0, 0, 0,124, 0, 0, 0, 46, 6, 19, 0, 8, - 0, 20, 0, 0, 5, 48, 0, 0, 0, 1,125, 0, 0, 0, 0,230, - 230,230,230, 0, 0, 0, 9, 9, 0, 0, 0, 0, 9, 0, 0,220, - 220,220,220, 0, 0, 0,230,230,230,220,230, 0, 0,230,230, 7, - 0, 0, 0,230, 0, 0, 0,230,230, 0, 0,230,230,230, 0, 0, - 230,230,230, 0, 0, 9, 0, 0, 0, 0, 7,230,230,230,220, 0, - 220, 0, 0,230,220,220,220, 0, 0,230, 0, 0,230, 0, 0, 0, - 0, 7, 0, 1, 1, 1, 1,220,230,230,230,220,220,230,230,220, - 230,230,220,230, 0, 0,230,230,220, 0, 0, 0, 9, 9, 0,220, - 0, 0, 0, 0, 0, 9, 9, 0, 9, 7, 0, 1,220,220,220,220, - 220,220,230,230,230,220,220,230,220,220,230,230,220,230,230,220, - 230,220,230,230,230, 0,230, 0,220,220,220,220,220, 0, 0, 9, - 9, 0, 0, 1, 0, 0, 0, 0, 0, 0,220,230, 0,230,230, 0, - 0,220,220, 0, 0,230,220, 0, 0, 9, 7,220,220,220, 0,230, - 232,220,220,220,220,232,216,220,202,202,220,220,220,220,202,202, - 220,220,220,230,240,230,220,230,220,220, 0,232,220,220,230,233, - 234,234,233,234,234,233,230, 0,220,230,230,230,230,222,220,230, - 222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, - 22, 0, 23, 0, 24, 25, 0,230,220, 0, 18, 30, 31, 32, 0, 0, - 0, 0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35, 0, 0, 0,230, - 0,220,230, 0, 36, 0, 0,220,220,230,220,220,230,230, 0,230, - 230, 0,220, 27, 28, 29,230, 0,230,220,230, 0, 84, 91, 0,103, - 103, 9, 0,107,107,107,107,118,118, 9, 0,122,122,122,122, 0, - 220, 0,220, 0,216, 0, 0, 0,129,130, 0,132, 0, 0, 0, 0, - 0,130,130,130,130, 0, 0,130, 0,230,230, 9, 0,230,230, 0, - 0,220, 0, 0,228, 0, 0, 0,222,230,220,230, 0, 0,220,230, - 220, 0,220,230,230,230,234,230, 0, 1, 1,230,234,214,220,202, - 230,230,230,230,230,232,228,228,220,218,230,233,220,230,220,230, - 230, 1, 1, 1, 1, 1,230, 0, 1, 1,230,220,230, 1, 1, 0, - 0,218,228,232,222,224,224, 0, 8, 8, 0,220, 0, 0,230, 0, - 0, 26, 0, 0,220, 0,230,230, 1,220, 0, 0,230,220, 0, 0, - 7, 9, 0, 6, 6, 0, 0, 0, 0, 1, 0, 0,216,216, 1, 1, - 1, 0, 0, 0,226,216,216,216,216,216, 0,232,232,220,230,230, - 230, 7, 0, 1, 0, 0, 32, 0, 48, 0, 0, 84, 96,135,144, 10, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,176, 0, 0, 0, 0, 0, 0, 0, 0, 8, 16, 24, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 48, 56, 64, 0, 0, 0, 0, 0, 72, 80, 88, 96,104, - 0, 0, 0, 0, 0, 0, 0, 0,112, 0,120, 0, 0, 0, 0, 0, - 0,128,136,144,152,160,168, 0, 0, 0,176,184,192, 0, 0, 0, - 0, 0, 0,200, 0, 0, 0, 0, 0, 0, 0, 0,208, 0, 0,216, - 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, - 36, 0, 0, 0, 24, 0, 0, 0, 24, 0, 0, 0, 0, 0, 64, 0, - 68, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 72, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 40, 20, 0, 0, 0, 0, 0, 0, - 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 76, 80, 84, 88, 0, 0, - 12, 92, 96, 28, 0,100,104, 4, 4, 4,108, 44,112,116,120, 4, - 124, 0,128,132, 4, 4, 48,136,140, 0, 32, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 0, 0, 4, 48, 0, 52,144, 20,148,152, 4, 0, - 0,156,160,164,168,172, 4, 0,176, 56, 60,180, 32, 0, 16,184, - 56, 0, 0, 0, 0, 0, 52, 12, 12, 0, 0, 0, 0, 12, 0, 0, - 188, 8, 8, 8, 8,192,196, 8, 8, 8, 8,200,204,208,212, 60, - 44, 0, 0, 0, 0, 0, 0, 0,216, 28,220, 0, 12, 4, 16, 0, - 0, 0, 0,224,228, 0, 0, 0, 0, 0, 4,232, 32, 0, 0, 0, - 0, 0, 0, 0,236, 12, 0, 0, 0, 0, 16, 0, 36, 0, 0, 0, - 24, 0, 0, 0,240,244, 0, 0, 0, 0, 2, 2, 2, 2, 4, 4, - 4, 4, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 6, 8, 0, 10, - 12, 0, 0, 2, 2, 0, 2, 2, 0, 0, 0, 0, 14, 16, 6, 8, - 0, 0, 4, 8, 0, 0, 2, 2, 2, 0, 0, 6, 4, 8, 2, 0, - 2, 0, 0, 0, 0, 6, 0, 20, 0, 0, 0, 22, 0, 0, 0, 6, - 8, 0, 24, 26, 28, 0, 0, 0, 30, 0, 0, 0, 0, 32, 34, 36, - 38, 0, 0, 40, 42, 0, 0, 0, 18, 0, 0, 0, 2, 2, 2, 2, - 0, 2, 2, 2, 0, 6, 44, 0, 0, 0, 0, 2, 0, 46, 48, 50, - 0, 0, 52, 0, 0, 0, 6, 4, 54, 0, 2, 0, 0, 2, 2, 56, - 58, 60, 0, 62, 64, 18, 2, 10, 12, 0, 0, 0, 66, 8, 0, 2, - 2, 2, 0, 6, 4, 4, 4, 4, 68, 2, 70, 4, 4, 4, 8, 72, - 0, 0, 74, 76, 2, 0, 78, 0, 0, 0, 4, 8, 2, 0, 0, 0, - 80, 0, 6, 4, 4, 4, 4, 8, 0, 2, 2, 2, 2, 6, 4, 4, - 4, 8, 0, 0, 0, 82, 0, 84, 86, 0, 0, 0, 2, 88, 0, 0, - 0, 90, 6, 8, 2, 0, 0, 0, 6, 4, 4, 4, 8, 0, 2, 0, - 2, 2, 6, 4, 4, 8, 0, 10, 12, 6, 8, 2, 0, 0, 50, 84, - 118,152, 17,161, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 5, 16, 17, 18, 1, 1, 1, 1, 1, 1, 19, 1, + 9, 6, 6, 9, 6, 10, 7, 25, 17, 16, 16, 22, 16, 16, 25, 17, + 7, 1, 25, 24, 26, 1, 9, 12, 12, 17, 7, 24, 24, 12, 13, 15, + 10, 1, 10, 26, 13, 23, 7, 13, 23, 15, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 0, 10, 11, 12, 13, 0, 14, 0, 0, 0, 0, 0, + 15, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, 22, 23, 0, 0, 0, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 36, + 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 39, 40, 0, 0, 0, 0, 0, 0, 41, 42, 43, 44, 45, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, + 0, 9, 0, 0, 0, 10, 11, 12, 13, 0, 14, 15, 16, 0, 17, 18, + 19, 20, 21, 1, 22, 1, 23, 1, 2, 1, 2, 1, 2, 0, 2, 1, + 24, 1, 2, 25, 2, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, + 0, 0, 0, 38, 0, 0, 39, 0, 0, 40, 0, 41, 0, 0, 0, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 0, 0, 51, 0, 0, 0, 52, 0, + 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 3, 0, 55, 56, + 0, 57, 0, 0, 0, 0, 0, 0, 58, 59, 60, 0, 0, 0, 0, 61, + 0, 0, 62, 63, 64, 4, 65, 0, 0, 66, 67, 0, 0, 0, 68, 0, + 0, 0, 0, 69, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 72, 0, 73, 0, 0, 74, + 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 76, 77, 0, 0, 0, + 0, 78, 79, 0, 80, 81, 0, 0, 82, 5, 0, 83, 4, 0, 84, 85, + 0, 0, 86, 87, 88, 0, 89, 0, 90, 0, 91, 0, 0, 3, 92, 3, + 0, 93, 0, 94, 0, 0, 0, 5, 0, 0, 0, 95, 96, 0, 97, 98, + 99,100, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,101,102, 0, 0, + 0, 0, 0, 0,103, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, + 0, 0,105, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,106, 0, + 0,107, 0, 0, 0, 0, 0, 0, 0, 0, 0,108,109,110, 0, 0, + 111,112, 0, 0, 0, 0, 0,113, 0,114, 0, 6, 0, 0, 0, 0, + 0,115,116, 0, 0, 0, 0, 0, 0, 0,117, 0, 0, 0,118, 0, + 0, 0,119, 0, 0, 0, 0, 0, 0, 0,120, 0,121, 0, 0, 0, + 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, + 11, 0, 0, 0, 15, 0, 0, 0, 17, 3, 18, 19, 20, 21, 22, 23, + 0, 24, 0, 0, 0, 0, 25, 26, 27, 28, 0, 0, 0, 0, 29, 0, + 0, 30, 31, 0, 32, 0, 33, 34, 0, 0, 35, 0, 36, 37, 0, 0, + 0, 0, 0, 38, 39, 0, 40, 41, 0, 0, 42, 0, 0, 0, 43, 0, + 0, 44, 45, 46, 47, 1, 48, 0, 0, 1, 0, 0, 7, 1, 49, 0, + 0, 0, 0, 0, 50, 51, 0, 0, 0, 0, 0, 0, 52, 53, 0, 0, + 0, 0, 0, 0, 54, 55, 0, 0, 0, 0, 56, 0, 57, 0, 0, 0, + 58, 59, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 61, 12, 0, 0, + 0, 0, 62, 0, 0, 0, 63, 0, 5, 0, 64, 0, 0, 0, 0, 65, + 0, 0, 0, 0, 66, 0, 67, 0, 0, 0, 0, 6, 68, 0, 0, 0, + 69, 70, 71, 72, 13, 0, 0, 0, 73, 5, 0, 74, 75, 0, 0, 76, + 0, 0, 0, 77, 78, 0, 0, 0, 79, 0, 80, 81, 82, 83, 84, 3, + 85, 0, 86, 87, 13, 0, 0, 8, 9, 0, 0, 3, 3, 0, 0, 88, + 0, 0, 89, 0, 0, 0, 0, 8, 90, 0, 91, 0, 0, 0, 0, 0, + 9, 10, 0, 92, 0, 5, 0, 3, 9, 0, 0, 93, 0, 0, 94, 0, + 0, 6, 0, 0, 0, 0, 0, 0, 95, 96, 0, 0, 10, 0, 0, 1, + 0, 0, 97, 0, 0, 0, 0, 98, 0, 0, 0, 0, 12, 0, 0, 14, + 0, 0, 0, 0, 99,100, 0, 0,101, 0, 0,102, 0, 0, 0,103, + 0, 0, 0,104, 0, 0, 0,105, 0,106, 0, 0,107,108, 14, 0, + 0,109, 0, 0, 0, 10, 0, 0,110,111, 0, 0,112,113, 0, 0, + 0, 0, 0, 0,114, 0, 0,115, 0, 0, 0, 0,116, 1, 0,117, + 118,119, 6, 0, 0,120, 7, 0, 0,121, 0, 0, 0,122, 0, 0, + 0, 0, 0, 0,123, 0, 0,124, 0, 0, 0, 0,125, 11, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 0, 5, 16, 0, 0, 0, 0,126, 0, + 0,127, 0, 0, 0, 0, 16, 0, 0,128, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0,129, 0, 0, 0,130, 0,131, 0, 0, 0, 0,132, + 0, 0, 0,133,134,135, 0,136, 0,137,138, 0, 0,139, 0, 0, + 0,140,141,142, 0, 8, 0, 0, 0, 0, 0, 7, 0, 0, 0,143, + 0, 0, 0,144, 0, 0, 0,145, 0, 0, 0,146,147, 0,148, 0, + 0,149, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 9, 1, 1, + 1, 1, 0, 0, 0, 2, 0, 3, 0, 0, 3, 0, 0, 0, 0, 0, + 0, 21, 0, 0, 0, 5, 11, 0, 0, 0, 0, 14, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 23, 0, 0, 0, 0, 0, + 35, 0, 0, 2, 0, 0, 1, 12, 0, 0, 1, 49, 50, 6, 51, 52, + 53, 6, 6, 25, 36, 26, 1, 54, 17, 55, 16, 27, 56, 57, 58, 1, + 1, 1, 5, 1, 0, 0, 59, 7, 60, 1, 18, 6, 7, 61, 62, 63, + 64, 65, 66, 67, 68, 0, 1, 1, 69, 0, 0, 0, 70, 71, 72, 37, + 1, 28, 73, 0, 0, 0, 0, 8, 1, 29, 16, 29, 74, 38, 75, 0, + 0, 0, 30, 28, 76, 31, 7, 31, 77, 0, 0, 0, 5, 1, 7, 0, + 0, 19, 0, 8, 39, 1, 1, 13, 13, 11, 0, 0, 40, 0, 0, 5, + 20, 1, 0, 0, 8, 16, 6, 1, 1, 1, 78, 7, 30, 20, 79, 7, + 37, 1, 80, 10, 0, 0, 0, 81, 0, 0, 0, 0, 2, 3, 0, 0, + 14, 0, 0, 0, 82, 0, 0, 0, 83, 0, 0, 0, 84, 0, 0, 0, + 85, 0, 0, 0, 41, 0, 0, 86, 87, 0, 88, 89, 90, 91, 92, 93, + 0, 0, 0, 94, 0, 0, 0, 15, 32, 0, 0, 0, 0, 13, 0, 42, + 0, 0, 14, 0, 0, 22, 0, 0, 95, 0, 0, 0, 96, 0, 0, 5, + 23, 0, 0, 13, 1, 97, 1, 20, 27, 98, 28, 26, 7, 1, 1, 1, + 1, 30, 1, 7, 99, 18, 0, 9, 0, 0, 0, 0, 5, 26, 1, 0, + 0, 0, 0, 0, 33, 0, 0, 24, 0, 0, 33, 0, 0, 0, 0, 15, + 0, 0, 12, 36, 17, 6,100, 25, 43, 19, 0, 10, 11, 0, 7, 1, + 7,101,102, 1, 1, 1, 1,103,104,105,106, 1,107, 10, 22,108, + 109, 6, 0, 0,110,111, 0, 0,112, 0, 0, 1, 1, 11, 0, 0, + 0, 8, 0, 0, 0, 3, 0, 0, 34, 41, 2, 0, 0, 0, 44,113, + 10, 8, 22, 0, 0, 0, 0, 0, 0,114, 1, 16, 6, 17, 0, 8, + 12, 0, 0, 0, 0,115, 0, 0,116, 2, 0,117, 0, 0, 0, 1, + 0, 0, 0, 0, 13, 11, 0, 0, 5, 10, 0, 0, 5, 17, 27, 31, + 18, 40, 0,118, 16, 20, 45, 38, 0, 0, 3, 0, 0, 2, 12, 0, + 0, 0, 2, 3, 0, 0, 3, 0, 24, 0, 0, 35, 0, 0, 0, 0, + 119, 0, 0, 0, 15, 9, 0, 8, 1, 10, 1, 10, 0, 0, 0, 0, + 0, 33, 14, 24, 0, 0, 46, 0, 0, 0, 9, 0, 0, 0, 0, 46, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 32, 0, 0, 4, 0, 24, 42, + 0, 0, 32, 0, 0, 0, 25, 43, 0, 0,120, 0, 0, 0, 0, 0, + 0,121, 0, 34, 23, 0, 0,122,123,124, 47, 0, 34, 6, 48, 13, + 18, 0, 0, 0, 8, 11, 8, 10, 0, 0, 47, 0,125,126,127, 0, + 0, 0, 1, 12, 1, 1, 1, 1, 29, 1, 39, 44, 12, 0, 0, 0, + 0, 1, 0, 0, 0,128, 0, 0, 0, 45, 5, 21, 0, 8, 0, 22, + 0, 0, 6, 48, 0, 0, 0, 1,129, 0, 0, 0, 0,230,230,230, + 230, 0, 0, 0, 9, 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, + 230,220,220,220,220,230,230,220,230, 0, 0,230,230, 7, 0, 0, + 0,230, 0, 0, 0,230,230, 0, 0,230,230,230, 0, 0,230,230, + 230, 0, 0, 9, 0, 0, 0, 0, 7,230,230,230,220,220,220,230, + 230,230,230,220,220, 0,220, 0, 0,230,220,220,220, 0, 0,230, + 0, 0,230, 0, 0,220, 0, 0, 0, 0, 0, 7, 0, 1, 1, 1, + 1,220,230,230,230,220,220,220,230,220,230,230,220,230, 0, 0, + 230,230,220,230,230,220,230,220,230, 0, 9, 9, 0, 0, 0, 9, + 9, 0, 0, 0,220, 0, 9, 7, 0, 1,220,220,220,230,220,220, + 230,230,220, 0, 0,230,230, 0,230, 0,220,220,220,220,220, 0, + 0, 9, 9, 0, 0, 1, 0, 0, 0,230, 0,230,230, 0, 0,230, + 220, 0, 0, 9, 7,216,216,216, 0,220,220,220, 0,230,232,220, + 220,220,220,232,216,220,202,202,220,220,220,220,202,202,220,220, + 220,230,240,230,220,230,220,220, 0,232,220,220,230,233,234,234, + 233,234,234,233,230, 0,220,230,230,230,230,222,220,230,222,228, + 230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 0, + 23, 0, 24, 25, 0,230,220, 0, 18, 10, 21, 0, 0, 30, 31, 32, + 0, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34,230, 35, 0, 0, + 0,230, 0,220,230, 0, 36, 0, 0,220,220,230,220,220,230,230, + 0,230,230, 0,220, 27, 28, 29,230, 0,230,220,230, 0, 84, 91, + 0,103,103, 9, 0,107,107,107,107,118,118, 9, 0,122,122,122, + 122, 0,220, 0,220, 0,216, 0, 0, 0,129,130, 0,132, 0, 0, + 0, 0, 0,130,130,130,130, 0, 0,130, 0,230,230, 9, 0,230, + 230, 0, 0,220, 0, 0,228, 0, 0, 0,222,230,220,230, 0, 0, + 220,230,220, 0,220,230,230,230,234,230, 0, 1, 1,230,234,214, + 220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,230, + 220,230,230, 1, 1, 1, 1, 1,230, 0, 1, 1,230,220,230, 1, + 1, 0, 0,218,228,232,222,224,224, 0, 8, 8, 0,220, 0, 0, + 230, 0, 0, 26, 0, 0,220, 0,230,230, 1,220, 0, 0,230,220, + 0, 0, 0,220,220, 0, 7, 9, 0, 6, 6, 0, 0, 0, 0, 1, + 0, 0,216,216, 1, 1, 1, 0, 0, 0,226,216,216, 0, 0, 0, + 1, 1, 0, 0,216,216,216, 0, 0,232,232,220,230,230,230, 7, + 0, 1, 32, 48, 0, 84,118, 8, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 32, 0, 0, 40, 48, 0, + 0, 56, 64, 72, 0, 0, 0, 0, 0, 0, 0, 80, 88, 0, 0, 0, + 96,104,112, 0,120, 0, 0, 0, 0,128, 0, 0, 0,136, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0,152, 0, 0, 0, 0, + 0, 0, 0,160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 16, + 0, 12, 0, 12, 0, 0, 40, 44, 0, 0, 0, 0, 0, 0, 0, 48, + 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, + 56, 0, 0, 24, 24, 0, 0, 0, 0, 0, 0, 0, 60, 64, 68, 28, + 72, 76, 80, 84, 88, 92, 96,100,104,108,112,116,120, 0, 20, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32,124, 0, 0, 0, 0, + 128,132,136, 0,140,144,148,152,156,160, 8,164, 0, 0,168,172, + 0, 0, 36,176, 4, 4,180, 4, 4,184,188,192, 0, 0, 0, 0, + 0, 0, 0,196,200, 28,204, 0, 0,208,212, 0, 32,216, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,220, 36, 0, 8, 16, 0, 12, + 0,224,228, 0,232,236, 0, 0, 0, 0, 0, 0, 12, 12, 12, 12, + 0, 0, 8, 0, 0, 0, 32, 36, 0, 0, 0, 44, 0, 0, 28, 0, + 0, 0, 0, 28, 0, 0, 0, 8, 0, 0, 4, 4, 0, 8, 0, 0, + 0, 0, 52, 0, 0, 0, 56, 0, 0, 0, 16, 8, 0, 0, 24, 48, + 0, 28, 0, 0, 0, 0, 60, 64, 0, 68, 0, 72, 76, 80, 0, 0, + 84, 88, 0, 92, 16, 8, 0, 0, 0, 4, 4, 16, 4, 4, 4, 4, + 4, 4, 4, 24, 20, 0, 96, 0, 16,100,104, 0, 4, 4,108, 0, + 0, 0, 40,112, 8, 16, 4, 4, 4, 4, 4, 8,116,120,124,128, + 0, 0, 4, 0, 4, 8, 0, 0, 24, 20,132, 36, 0, 28, 0,136, + 16, 4, 4, 4, 24, 12, 12,140,144, 12,148, 0,152, 8, 4, 4, + 0, 0,156, 0, 8, 8, 0, 24, 20, 8, 4, 0, 0,160, 8, 8, + 0, 0, 24, 20, 0, 8, 0, 8, 0, 0, 40, 12, 20, 16, 4,164, + 12, 20, 0,168,172,176, 0,180, 0, 24, 20, 0, 0, 0, 0,184, + 16, 8, 28, 8, 4, 4, 8, 0, 0, 40, 12, 48, 16, 0, 0, 0, + 8, 4, 4, 0, 0, 0, 40, 20, 0, 0, 32,188,192, 0, 0, 0, + 24, 20, 8, 0,196, 0, 0, 0, 19, 19, 19, 19, 20, 18, 20, 18, + 20, 18, 19, 19, 18, 20, 18, 20, 19, 19, 20, 18, 18, 20, 18, 19, + 19, 19, 19, 20, 19, 20, 18, 19, 19, 19, 19, 21, 19, 17, 19, 19, + 19, 20, 18, 20, 21, 19, 17, 19, 18, 19, 19, 19, 19, 19, 19, 25, + 19, 19, 19, 13, 22, 22, 22, 16, 16, 16, 19, 19, 19, 32, 19, 19, + 19, 38, 19, 37, 31, 29, 30, 19, 36, 19, 19, 19, 19, 19, 19, 26, + 19, 23, 19, 19, 15, 19, 19, 19, 28, 19, 19, 19, 19, 19, 33, 19, + 35, 34, 19, 34, 27, 19, 19, 19, 18, 12, 19, 19, 20, 18, 24, 24, + 24, 19, 23, 23, 19, 19, 14, 14, 14, 15, 15, 19, 20, 18, 19, 21, + 11, 20, 18, 19, 18, 22, 20, 18, 16, 20, 18, 20, 18, 19, 19, 9, + 8, 19, 19, 7, 10, 19, 19, 19, 19, 6, 19, 19, 20, 18, 19, 20, + 19, 19, 5, 19, 19, 19, 19, 4, 3, 4, 19, 19, 20, 18, 2, 19, + 19, 19, 1, 19, 19, 17, 19, 20, 18, 19, 20, 18, 0, 19, 19, 19, + 6, 7, 8, 9, 10, 11, 12, 1, 1, 13, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 14, 15, 2, 2, 2, 2, 2, 0, 0, 0, 0, 16, + 17, 18, 19, 20, 21, 22, 5, 5, 23, 0, 0, 0, 24, 25, 4, 4, + 4, 26, 27, 0, 0, 28, 29, 30, 0, 31, 32, 33, 34, 35, 36, 37, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 20, 21, 22, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 0, 35, 4, 4, 4, 4, 4, 36, 0, 0, 0, - 0, 0, 0, 37, 0, 38, 39, 3, 3, 3, 3, 3, 3, 40, 41, 0, - 0, 0, 0, 0, 0, 0, 42, 43, 0, 0, 44, 0, 0, 0, 45, 46, - 5, 47, 48, 49, 50, 51, 52, 53, 5, 5, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 6, 0, 0, 6, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 54, 0, 0, 55, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, - 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 1, 1, 1, 1, 1, 0, 0, 0, 26, 27, 8, 8, 8, - 28, 29, 30, 19, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 2, 2, 13, - 13, 13, 56, 11, 11, 11, 11, 11, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 8, 8, 16, 16, 72, 73, 74, 75, 3, - 3, 3, 3, 20, 20, 3, 3, 3, 3, 3, 3, 76, 77, 78, 79, 3, - 1, 1, 80, 81, 82, 83, 84, 85, 86, 87, 3, 1, 1, 1, 88, 1, - 1, 1, 1, 7, 7, 7, 7, 7, 7, 7, 7, 7, 89, 21, 21, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101, 0, 0, 1, 1, 1, - 1,102, 9, 9, 9,103, 9,104,105,106,107, 22, 22,108,109, 0, - 110,111,112,113,114,115,116, 17, 17, 17, 8,117,118,119,120,121, - 122,123,124,125,126,127,128, 9,129,130,131,132,133,134,135,136, - 137,138,139,140,141, 0,142,143,144,145, 0,146,147,148,149,150, - 151,152,153,154,155,156,157, 0,158,159,160, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,161, 12, 12, 12, 12, 12, 0, 0, 0, 0, 0,162, 0, 0, - 0, 0, 0, 14, 14, 14, 14,163,164, 23, 23, 0, 0,165, 0,166, - 167,168,169, 4, 4, 4, 4, 4, 4, 15, 15, 15, 15, 4, 4, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,170,171,172,173, 18, 18, - 18, 0, 0,174,175, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, - 3,176, 3, 3, 3,177,178, 16, 3, 3, 0, 10, 10, 10, 10, 10, - 10, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0,179, 19,180, 0, 0, - 181, 0, 0, 0,182, 0,183, 0,184, 0, 13, 24, 24,185, 0, 0, - 0, 0, 0, 3, 3, 3, 0, 9, 9, 0, 0, 3, 3, 3, 3,186, - 0, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 25, 25, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, - 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 8, - 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 7, - 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 10, - 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 16, - 16, 16, 16, 16, 16, 16, 16, 12, 12, 12, 12, 12, 12, 12, 12, 13, - 13, 13, 13, 13, 13, 13, 13, 18, 18, 18, 18, 18, 18, 18, 18, 17, - 17, 17, 17, 17, 17, 17, 17, 20, 20, 20, 20, 20, 20, 20, 20, 19, - 19, 19, 19, 19, 19, 19, 19, 15, 15, 15, 15, 15, 15, 15, 15, 25, - 25, 25, 25, 25, 25, 25, 25, 23, 23, 23, 23, 23, 23, 23, 23, 26, - 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 28, - 28, 28, 28, 28, 28, 28, 28, 14, 14, 14, 14, 14, 14, 14, 14, 3, - 3, 3, 3,118,119,118,119, 3, 3,156,156, 7,157, 7,157, 7, - 7, 7,158, 3, 3,180, 3, 14, 14, 14, 14, 14, 14, 14,181,182, - 17, 17, 17, 17, 17,183, 17,184, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15,185,100,100,100,100,100,186, 40, 40, 40, 40, 40, 40,187, - 188, 6, 6,189,190, 6,191, 6, 6, 6, 6, 6,192, 6, 6, 85, - 85, 85, 85, 85, 6, 6, 6,120,120,120,120,121,121,121,121,122, - 122,122,122,159,159, 85, 6, 6, 6, 6, 6, 6, 6,193, 6, 30, - 30, 30, 30, 30,194,195, 30, 45, 45, 45, 45, 45, 45, 45, 45, 46, - 46, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 48, - 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 49, - 49, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51, - 51, 51, 51, 51, 51, 51, 51, 41, 41, 41, 41, 41, 41, 41, 41, 81, - 81, 81,196, 81, 81, 81, 81, 52, 52, 52, 52, 52, 52, 52, 52, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,197, 29, 29, 24, - 24, 24, 24, 24, 24, 24, 24, 24, 24, 35, 35, 35, 35, 35,198, 12, - 12, 36, 36, 36, 36, 36, 36,160,160,101,101,101,101,199,101,161, - 161,200,201,162,162,163,163, 37, 37, 37, 37, 37, 37, 37, 37,202, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 11, 11, 11, 11, 11,102, - 102,102,102,102,140,140,140, 86, 86, 86, 86, 86, 86, 37, 37,164, - 164, 42, 42, 42, 42, 42, 42, 42, 42, 42, 14, 14, 14, 14, 14, 53, - 53, 53, 53, 53, 53, 53, 53,103,103,103,103,123,123,123,123,104, - 104,104,104,104,141,141,141, 15, 35, 35, 35,103,203,204,205, 7, - 7,206, 7, 7,207,208,209, 7, 7, 7,210, 14, 14, 14, 14,211, - 3, 3, 3, 3, 3, 3,212, 3, 7, 3, 3, 3, 14, 14, 14, 3, - 3,213,214,215, 3, 7, 7,158, 3, 3, 3, 3, 3, 3, 3, 43, - 43, 43, 43, 43, 43, 7, 7, 54, 54, 54, 54, 54, 54, 54, 54, 35, - 35, 35,105,105,105,105,105, 12, 12, 12, 12, 12, 12, 15, 15, 1, - 1, 1, 1, 1, 1, 1, 3,216, 3,217,218,219, 22, 22, 22, 22, - 220,165, 21, 21, 21, 21,221,106,106,106,222, 2, 2, 2, 2, 2, - 3,106,106, 3, 3, 3, 21, 2, 2, 3, 3, 3, 3, 2,223, 3, - 3, 3, 3, 3, 21, 21,224, 21, 21, 21, 21, 21,225, 3, 3, 1, - 1, 1, 1, 3, 3, 3, 3, 9, 9, 9, 9, 9, 82, 82, 82, 23, - 23, 23, 23, 15, 15, 15, 15, 15, 15, 13, 13, 13, 13, 13, 13, 3, - 3,226, 7, 7, 7, 7, 7,227, 7, 7, 7, 7, 7, 7, 7,142, - 142,142, 3,124,124,124,124, 87, 87, 87, 87, 87, 87, 30, 30,166, - 166,228,143,143,143, 2, 2,107,107,107,107,229,107, 24, 24, 88, - 88, 88, 88, 88, 88, 24, 24, 89, 89, 89, 89, 89, 89, 90, 90, 12, - 12, 12, 7, 7,230,231, 36, 36, 36, 36, 36, 90, 90, 90, 90, 7, - 232, 40, 40, 40, 6, 6, 6, 6, 6, 6,233, 6, 6, 6, 6, 14, - 3,234, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6,235, 3, - 3,118,119,118,119,236,165, 21,237, 2, 2, 2, 2, 3, 3, 3, - 3, 3, 3, 17, 17, 17, 17, 17, 3, 17, 17, 17, 3, 3,238,167, - 167,125,125,125,125,239, 3,144,144,144,168,168,145,145,145,169, - 169, 91, 91, 91, 91, 91, 91,108,108,108,108,108,146,146,146,147, - 147,147,109,109,109,109,109,148,148,148,126,126,126,126,110,110, - 110,110,110,127,127,127,127,128,128,128,128,170,170,171,171, 92, - 92, 92, 92, 92, 92,172,172,173,173,174,174,129,129,129,129,175, - 175, 93, 93, 93, 93, 93, 93, 94, 94, 94, 94, 94, 94,176,176,130, - 130,130,130,131,131,131,131,132,132,132,132,177,177,178,178, 55, - 55, 55, 55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 57, - 57, 57, 57, 57, 57, 57, 57,133,133,133,133, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34,134,134,134,134,240, 6, 6, 6,149, - 149,149,135,135,135,135,136,136,136,136,150,150,150,179,179, 58, - 58, 58, 58, 58, 58, 58, 58,111,111,111,111,111,151,151,151,112, - 112,112,112,112,152,152,152, 59, 59, 59, 59, 59, 59,241, 41, 60, - 60, 60, 60, 60, 60, 60, 60,153,153,153,113,113,113,113,113, 83, - 83, 83,242, 83, 83, 83, 83, 61, 61, 61, 61, 61, 61, 61, 61, 62, - 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63, 64, - 64, 64, 64, 64, 64, 64, 64, 95, 95, 95, 95, 95, 95, 33, 33,114, - 114,114,114,114, 24, 24, 24, 65, 65, 65, 65, 65, 65, 65, 65, 66, - 66, 66, 66, 66, 66, 66, 66, 67, 67, 67, 67, 67, 67, 67, 67, 68, - 68, 68, 68, 68, 68, 68, 68, 69, 69, 69, 69, 69, 69, 69, 69,115, - 115,115,115,115, 96, 96, 96, 96, 96, 96, 11,137,137,137,137, 30, - 30, 30, 30, 30, 30, 59, 59, 70, 70, 70, 70, 70, 70, 70, 70, 84, - 84, 84, 84, 84, 84, 84, 44, 44, 44, 44, 44, 44, 44, 44, 44, 97, - 97, 97, 97, 97, 97,116,116,116,116,116,117,117,117,117,117, 71, - 71, 71, 71, 71, 71, 71, 71, 72, 72, 72, 72, 72, 72, 72, 72, 82, - 82, 82, 82, 32, 32, 32, 32, 73, 73, 73, 73, 73, 73, 73, 73, 74, - 74, 74, 74, 74, 74, 74, 74, 13, 13, 13, 13,154,154,154, 98, 98, - 98, 98, 98, 98,155,155,155, 75, 75, 75, 75, 75, 75, 75, 75, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 99, 99, 99, 99, 99, 99, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,243, 1, 21, - 21, 21, 21, 21, 21, 21, 21,244, 22, 22, 22, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 22, 22, 22, 21,245, 22,246, 21, 19, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 3, 3, 3, 3, 3, 3, 14, - 14, 14, 14, 14, 3, 3, 3, 3, 3, 3, 3, 3, 3,247,248,249, - 3,250, 3, 3, 3, 3, 3, 43, 43, 43, 15, 15, 15, 15, 15, 76, - 76, 76, 76, 76, 76, 76, 76,138,138,138,138,139,139,139,139, 77, - 77, 77, 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, - 79, 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80,251, - 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 1, 1, 1, 1, 2, - 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, - 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 10, - 10, 10, 10, 11, 11, 11, 11, 13, 13, 13, 13, 14, 14, 14, 14, 12, - 12, 12, 12, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 18, - 18, 18, 18, 21, 21, 21, 21, 22, 22, 22, 22, 19, 19, 19, 19, 20, - 20, 20, 20, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, - 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, - 30, 30, 30, 31, 31, 31, 31, 33, 33, 33, 33, 32, 32, 32, 32, 34, - 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37, 38, - 38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40, 41, 41, 41, 41, 42, - 42, 42, 42, 43, 43, 43, 43, 44, 44, 44, 44, 46, 46, 46, 46, 47, - 47, 47, 47, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, - 51, 51, 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 45, - 45, 45, 45, 55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, - 58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 61, 61, 61, 61, 62, - 62, 62, 62, 63, 63, 63, 63, 64, 64, 64, 64, 65, 65, 65, 65, 66, - 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, 68, 69, 69, 69, 69, 70, - 70, 70, 70, 71, 71, 71, 71, 72, 72, 72, 72, 73, 73, 73, 73, 74, - 74, 74, 74, 75, 75, 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, 78, - 78, 78, 78, 79, 79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 83, - 83, 83, 83, 82, 82, 82, 82, 84, 84, 84, 84, 86, 86, 86, 86, 87, - 87, 87, 87, 88, 88, 88, 88, 89, 89, 89, 89, 90, 90, 90, 90, 91, - 91, 91, 91, 92, 92, 92, 92, 93, 93, 93, 93, 94, 94, 94, 94, 95, - 95, 95, 95, 96, 96, 96, 96, 97, 97, 97, 97, 98, 98, 98, 98, 99, - 99, 99, 99,100,100,100,100, 85, 85, 85, 85,102,102,102,102,103, - 103,103,103,104,104,104,104,105,105,105,105,106,106,106,106,107, - 107,107,107,101,101,101,101,108,108,108,108,109,109,109,109,110, - 110,110,110,111,111,111,111,112,112,112,112,113,113,113,113,114, - 114,114,114,115,115,115,115,116,116,116,116,117,117,117,117,175, - 7, 7, 7, 7, 7,174, 3,118,118,118,118,119,119,119,119,120, - 120,120,120,121,121,121,121,122,122,122,122,123,123,123,123,124, - 124,124,124,125,125,125,125,126,126,126,126,127,127,127,127,128, - 128,128,128,129,129,129,129,130,130,130,130,131,131,131,131,132, - 132,132,132,133,133,133,133,134,134,134,134,135,135,135,135,136, - 136,136,136,137,137,137,137,138,138,138,138,139,139,139,139,140, - 140,140,140,141,141,141,141,142,142,142,142,143,143,143,143,144, - 144,144,144,145,145,145,145,146,146,146,146,147,147,147,147,148, - 148,148,148,149,149,149,149,150,150,150,150,151,151,151,151,152, - 152,152,152,153,153,153,153, 3, 3,177, 3, 7,174, 7, 7, 7, - 7,179, 3,155,155,155,155,156,156,156,156,157,157,157,157,158, - 158,158,158,159,159,159,159,160,160,160,160,182, 19, 19, 19,154, - 154,154,154,161,161,161,161,162,162,162,162,163,163,163,163,164, - 164,164,164,165,165,165,165,166,166,166,166,167,167,167,167,168, - 168,168,168,169,169,169,169,170,170,170,170,171,171,171,171,172, - 172,172,172,173,173,173,173, 7,179,194, 3, 17,195, 17,196, 17, - 197, 17, 17,198, 45, 45, 45, 15,199, 15, 15,200, 85, 85, 85,183, - 40, 40, 40, 6,184, 6,185, 6, 6,180,180,185, 6,201, 12, 12, - 202, 6, 6,203, 6, 6, 6, 6, 6, 6,184,204, 6, 6, 6,205, - 206, 30, 30, 30,207, 30, 30, 81, 81, 81,208, 29,209,210, 29, 35, - 35,211, 35,102,102,212,213,176,176,176,176,176,214, 3, 3,215, - 216, 32, 32,186, 12, 12, 12,217, 12,181,218, 3,181,178, 3, 7, - 187,219, 7, 7, 7, 7,220,221,187,222, 7, 7, 7,223, 7, 7, - 7, 7,224, 3, 3, 3,178,175, 3, 3,188, 3,225,189, 3,177, - 3, 3, 3, 3, 3, 3,177, 3,226, 3, 3,227, 1,228,229, 3, - 3, 1, 3,190, 20, 20, 20, 20, 20,230,190, 19, 19,191,182,231, - 2, 2, 2, 2, 2, 2,232, 19, 19, 19,191, 19, 19, 3, 3,189, - 7, 7, 7, 7, 7,188, 7,154,154,154,233,101,101,101,234, 7, - 7,174, 7, 7,235,236, 3,237, 85, 85,183, 6, 6, 6,238, 12, - 12, 12,239, 6, 6, 6,180, 3,240, 19, 19, 19, 19, 19,241, 3, - 3, 3,192,181, 3, 3, 3,242, 6, 6, 6,243, 41, 41, 41, 82, - 82,244, 82,245, 18, 18, 18,246, 20, 20, 20,247, 20, 20, 20, 20, - 248, 19, 19, 3,193,178, 3, 3, 3,193, 12,186,192, 12, 3, 3, - 3,249,178,250, 3, 3, 3, 2, 2, 2, 2, 13, 13, 13, 13, 12, - 12, 12, 12, 0, 0, 0, 0,136,136,136,136, 80, 80, 80, 80, 3, - 3, 3, 3, 19, 19, 19, 19, 63, 63, 63, 63, 39, 39, 39, 39,131, - 131,131,131, 28, 28, 28, 28, 1, 1, 1, 1, 30, 30, 30, 30, 79, - 79, 79, 79, 6, 6, 6, 6,127,127,127,127, 9, 9, 9, 9,155, - 155,155,155, 17, 17, 17, 17, 15, 15, 15, 15,139,139,139,139,110, - 110,110,110, 77, 77, 77, 77, 33, 33, 33, 33, 27, 27, 27, 27, 49, - 49, 49, 49,119,119,119,119,113,113,113,113, 25, 25, 25, 25, 7, - 7, 7, 7, 99, 99, 99, 99, 32, 32, 32, 32, 22, 22, 22, 22,165, - 165,165,165, 8, 8, 8, 8, 29, 29, 29, 29, 31, 31, 31, 31,146, - 146,146,146,105,105,105,105, 14, 14, 14, 14, 36, 36, 36, 36, 91, - 91, 91, 91, 56, 56, 56, 56,134,134,134,134, 55, 55, 55, 55, 5, - 5, 5, 5, 11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 23, - 23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 18, 18, 18, 18, 62, - 62, 62, 62,122,122,122,122, 89, 89, 89, 89,130,130,130,130, 94, - 94, 94, 94,100,100,100,100,108,108,108,108,171,171,171,171,137, - 137,137,137,124,124,124,124,123,123,123,123,126,126,126,126,142, - 142,142,142,125,125,125,125,154,154,154,154,150,150,150,150,169, - 169,169,169,145,145,145,145,163,163,163,163,157,157,157,157,166, - 166,166,166,167,167,167,167,151,151,151,151,164,164,164,164,168, - 168,168,168,174,174,174,174,132,132,132,132, 24, 24, 24, 24,107, - 107,107,107, 86, 86, 86, 86,133,133,133,133, 4, 4, 4, 4, 37, - 37, 37, 37, 58, 58, 58, 58, 75, 75, 75, 75, 68, 68, 68, 68, 92, - 92, 92, 92, 87, 87, 87, 87, 59, 59, 59, 59,116,116,116,116, 97, - 97, 97, 97, 57, 57, 57, 57,114,114,114,114,140,140,140,140,138, - 138,138,138,159,159,159,159,172,172,172,172, 84, 84, 84, 84, 35, - 35, 35, 35, 48, 48, 48, 48, 76, 76, 76, 76, 70, 70, 70, 70, 61, - 61, 61, 61, 26, 26, 26, 26, 40, 40, 40, 40,135,135,135,135,161, - 161,161,161, 85, 85, 85, 85, 96, 96, 96, 96,109,109,109,109,102, - 102,102,102,141,141,141,141,143,143,143,143,175,175,175,175, 38, - 38, 38, 38, 64, 64, 64, 64, 90, 90, 90, 90, 93, 93, 93, 93, 65, - 65, 65, 65, 67, 67, 67, 67,104,104,104,104,170,170,170,170, 47, - 47, 47, 47,173,173,173,173,117,117,117,117,112,112,112,112, 78, - 78, 78, 78,144,144,144,144,156,156,156,156,148,148,148,148,158, - 158,158,158,121,121,121,121,160,160,160,160,152,152,152,152, 52, - 52, 52, 52, 73, 73, 73, 73, 60, 60, 60, 60, 74, 74, 74, 74, 42, - 42, 42, 42,118,118,118,118, 51, 51, 51, 51, 50, 50, 50, 50,106, - 106,106,106,147,147,147,147,153,153,153,153,101,101,101,101,111, - 111,111,111,129,129,129,129,115,115,115,115,103,103,103,103, 69, - 69, 69, 69, 95, 95, 95, 95, 34, 34, 34, 34, 45, 45, 45, 45, 43, - 43, 43, 43, 46, 46, 46, 46, 54, 54, 54, 54, 71, 71, 71, 71, 41, - 41, 41, 41, 53, 53, 53, 53, 81, 81, 81, 81,120,120,120,120,128, - 128,128,128, 66, 66, 66, 66, 72, 72, 72, 72, 98, 98, 98, 98, 88, - 88, 88, 88, 83, 83, 83, 83, 82, 82, 82, 82,149,149,149,149, 19, - 19, 19, 0, 0, 19, 19, 19, 44, 44, 44, 44, 0, 0, 19, 0, 1, - 1, 0, 0, 19, 0, 0, 0, 3, 3, 3, 0, 1, 0, 0, 0, 0, - 17, 17, 17, 4, 14, 14, 14, 3, 0, 3, 3, 0, 3, 3, 3, 1, - 1, 1, 0, 19, 19, 9, 9, 0, 0, 0, 19, 0, 0, 19, 19, 0, - 15, 15, 15, 17, 17, 17, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, - 0, 26, 26, 0, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, 0, 9, - 9, 55, 55, 6, 1, 1, 6, 6, 4, 4, 4, 3, 3, 3, 1, 1, - 1, 3, 3, 1, 3, 3, 3, 3, 3, 0, 3, 7, 1, 1, 1, 1, - 7, 7, 7, 0, 0, 7, 7, 24, 24, 24, 0, 25, 0, 0, 0, 0, - 25, 25, 25, 8, 8, 8, 0, 35, 35, 35, 0, 0, 0, 35, 35, 44, - 0, 0, 0, 32, 32, 0, 0, 32, 0, 32, 32, 1, 0, 1, 1, 0, - 1, 0, 0, 9, 9, 9, 6, 19, 9, 9, 9, 9, 9, 19, 19, 9, - 9, 9, 19, 6, 19, 19, 19, 19, 19, 19, 9, 0, 0, 9, 0, 0, - 13, 0, 13, 0, 13, 13, 13, 13, 13, 1, 1, 1, 1, 12, 12, 15, - 1, 1, 0, 26, 12, 12, 12, 12, 12, 12, 0, 69, 69, 0, 69, 84, - 84, 84, 0, 19, 9, 19, 19, 19, 19, 0, 0, 19, 19, 19, 4, 3, - 3, 0, 0, 1, 1, 6, 6, 0, 0, 17, 17, 17, 17, 0, 0,156, - 156, 3, 3,100, 36, 36, 36,107,107,107, 1,136,139, 13, 13, 17, - 15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17, 0, 0, 1, 1, 15, - 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, - 10, 0, 11, 12, 13, 0, 0, 0, 14, 0, 0, 15, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - 17, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 19, 20, 21, 0, 22, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 23, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, - 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 23, 0, 0, 24, 25, 26, 27, 28, 29, 30, 0, - 0, 31, 32, 0, 33, 0, 34, 0, 35, 0, 0, 0, 0, 36, 37, 38, - 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 42, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 43, 44, 0, 45, 0, 0, 0, 0, 0, 0, 46, 47, 0, - 0, 0, 0, 0, 48, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 50, 51, 0, 0, 0, 52, 0, 0, 53, 0, 0, - 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, - 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 57, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 58, 59, 60, 61, 62, 63, 64, 65, 0, 0, 0, - 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 67, 68, 0, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101, - 102,103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,104, 0, 0, 0, 0, 0, 0,105,106, 0,107, 0, 0, - 0,108, 0,109, 0,110, 0,111,112,113, 0,114, 0, 0, 0,115, - 0, 0, 0,116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,117, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,118,119,120,121, 0,122,123,124,125,126, 0, - 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 38, 0, 39, + 1, 1, 1, 1, 1, 1, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 41, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142, - 143,144,145,146,147,148,149,150,151,152,153,154,155,156,157, 0, - 0, 0,158,159,160,161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,162, 0,163, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,164,165, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 28, 29, 10, 10, 10, 30, 31, 32, 20, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 2, 2, 15, 15, 15, 58, 13, 13, 13, 13, 13, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 10, 10, 21, + 21, 74, 75, 76, 77, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 22, 22, 4, 4, 4, 4, 4, 4, 78, 79, 80, 81, 4, 1, 1, + 82, 83, 84, 85, 86, 87, 88, 89, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 90, 1, 1, 1, + 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 91, 23, 23, 92, 93, 94, + 95, 96, 97, 98, 99,100,101,102,103, 2, 2, 2, 2, 2, 2, 2, + 2, 0, 0, 1, 1, 1, 1,104, 11, 11, 11,105, 11,106,107,108, + 109, 24, 24,110,111, 0,112,113,114,115,116,117,118, 18, 18, 18, + 10,119,120,121,122,123,124,125,126,127,128,129,130, 11,131,132, + 133,134,135,136,137,138,139,140,141,142,143, 0,144,145,146,147, + 0,148,149,150,151,152,153,154,155,156,157,158,159, 0,160,161, + 162, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,163,164, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 165, 6, 6, 6, 6, 6, 6, 6, 6, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0,166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 16, 16, 16, 16,167,168, 25, 25, 0, 0,169, 0,170,171,172, + 173, 5, 5, 5, 5, 5, 5, 17, 17, 17, 17, 5, 5, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 174,175,176,177, 19, 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,178,179, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4,180, + 4, 4, 4,181,182,183, 4, 4, 0, 4, 4, 4, 4, 4, 4, 4, + 4, 12, 12, 12, 12, 12, 12, 4, 0, 0, 0, 0, 0, 0, 0, 10, + 184,185, 20,186, 0, 0,187, 0, 0, 0,188, 0,189, 0,190, 0, + 15, 26, 26,191, 0, 0, 0, 0, 0, 4, 4, 4, 0, 11, 11, 0, + 0, 4, 4, 4, 4,192, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, + 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, + 6, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10, 10, 10, + 10, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, + 12, 13, 13, 13, 13, 13, 13, 13, 13, 15, 15, 15, 15, 15, 15, 15, + 15, 16, 16, 16, 16, 16, 16, 16, 16, 18, 18, 18, 18, 18, 18, 18, + 18, 14, 14, 14, 14, 14, 14, 14, 14, 17, 17, 17, 17, 17, 17, 17, + 17, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, + 19, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 23, 23, 23, + 23, 25, 25, 25, 25, 25, 25, 25, 25, 22, 22, 22, 22, 22, 22, 22, + 22, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, + 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, + 29, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, + 31, 21, 21, 21, 21, 21, 21, 21, 21, 33, 33, 33, 33, 33, 33, 33, + 33, 32, 32, 32, 32, 32, 32, 32, 32, 35, 35, 35, 35, 35, 35, 35, + 35, 36, 36, 36, 36, 36, 36, 36, 36, 38, 38, 38, 38, 38, 38, 38, + 38, 40, 40, 40, 40, 40, 40, 40, 40, 34, 34, 34, 34, 34, 34, 34, + 34, 41, 41, 41, 41, 41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, + 42,178, 7, 7, 7, 7, 7,177, 4, 43, 43, 43, 43, 43, 43, 43, + 43, 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50, 50, 50, 50, 50, + 50, 51, 51, 51, 51, 51, 51, 51, 51, 52, 52, 52, 52, 52, 52, 52, + 52, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54, 54, + 54, 55, 55, 55, 55, 55, 55, 55, 55, 44, 44, 44, 44, 44, 44, 44, + 44, 56, 56, 56, 56, 56, 56, 56, 56, 37, 37, 37, 37, 37, 37, 37, + 37, 46, 46, 46, 46, 46, 46, 46, 46, 57, 57, 57, 57, 57, 57, 57, + 57, 47, 47, 47, 47, 47, 47, 47, 47, 49, 49, 49, 49, 49, 49, 49, + 49, 58, 58, 58, 58, 58, 58, 58, 58, 59, 59, 59, 59, 59, 59, 59, + 59, 60, 60, 60, 60, 60, 60, 60, 60, 61, 61, 61, 61, 61, 61, 61, + 61, 62, 62, 62, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, + 63, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65, 65, 65, 65, + 65, 66, 66, 66, 66, 66, 66, 66, 66, 67, 67, 67, 67, 67, 67, 67, + 67, 68, 68, 68, 68, 68, 68, 68, 68, 69, 69, 69, 69, 69, 69, 69, + 69, 70, 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, 71, + 71, 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, 73, 73, 73, 73, 73, + 73, 48, 48, 48, 48, 48, 48, 48, 48, 74, 74, 74, 74, 74, 74, 74, + 74, 75, 75, 75, 75, 75, 75, 75, 75, 39, 39, 39, 39, 39, 39, 39, + 39, 76, 76, 76, 76, 76, 76, 76, 76, 77, 77, 77, 77, 77, 77, 77, + 77, 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, 79, 79, 79, 79, 79, + 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 81, 81, 81, + 81, 82, 82, 82, 82, 82, 82, 82, 82, 83, 83, 83, 83, 83, 83, 83, + 83, 84, 84, 84, 84, 84, 84, 84, 84, 90, 90, 90, 90, 90, 90, 90, + 90, 86, 86, 86, 86, 86, 86, 86, 86, 91, 91, 91, 91, 91, 91, 91, + 91, 92, 92, 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, 93, 93, + 93, 94, 94, 94, 94, 94, 94, 94, 94, 95, 95, 95, 95, 95, 95, 95, + 95, 96, 96, 96, 96, 96, 96, 96, 96, 97, 97, 97, 97, 97, 97, 97, + 97, 98, 98, 98, 98, 98, 98, 98, 98, 85, 85, 85, 85, 85, 85, 85, + 85, 99, 99, 99, 99, 99, 99, 99, 99, 87, 87, 87, 87, 87, 87, 87, + 87,101,101,101,101,101,101,101,101,103,103,103,103,103,103,103, + 103, 7, 7, 7, 7, 7,177, 7, 7, 88, 88, 88, 88, 88, 88, 88, + 88, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 8, 8, 8, + 8,120,120,120,120,120,120,120,120,121,121,121,121,121,121,121, + 121,122,122,122,122,122,122,122,122,105,105,105,105,105,105,105, + 105,106,106,106,106,106,106,106,106,107,107,107,107,107,107,107, + 107,123,123,123,123,123,123,123,123,108,108,108,108,108,108,108, + 108,109,109,109,109,109,109,109,109,110,110,110,110,110,110,110, + 110, 4, 4, 4, 4, 21, 21, 21, 21,124,124,124,124,124,124,124, + 124,104,104,104,104,104,104,104,104, 14, 14, 14, 14, 4, 4, 4, + 4, 19, 19, 19, 19, 4, 4, 4, 4,125,125,125,125,125,125,125, + 125,111,111,111,111,111,111,111,111,112,112,112,112,112,112,112, + 112,113,113,113,113,113,113,113,113,127,127,127,127,127,127,127, + 127,128,128,128,128,128,128,128,128,129,129,129,129,129,129,129, + 129,130,130,130,130,130,130,130,130,131,131,131,131,131,131,131, + 131,132,132,132,132,132,132,132,132,133,133,133,133,133,133,133, + 133,134,134,134,134,134,134,134,134,114,114,114,114,114,114,114, + 114,115,115,115,115,115,115,115,115,116,116,116,116,116,116,116, + 116,117,117,117,117,117,117,117,117,118,118,118,118,118,118,118, + 118,100,100,100,100,100,100,100,100,137,137,137,137,137,137,137, + 137,119,119,119,119,119,119,119,119,102,102,102,102,102,102,102, + 102,139,139,139,139,139,139,139,139,140,140,140,140,140,140,140, + 140, 4, 4,181, 4, 4, 4,181, 4, 7, 7, 7, 7, 7, 7,184, + 4, 7,184,198, 4, 4, 4, 4, 4, 14, 14, 14, 14, 19,199, 19, + 200, 19,201, 19, 19, 19, 19, 19, 19,202, 49, 49, 49, 19, 19, 19, + 19, 17,203, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,204, 88, 88, + 88, 88, 88, 88, 88,187, 43, 43, 43, 8,188, 8,189, 8, 8,185, + 185,189, 8,205, 14, 14,206, 8, 8, 8, 8, 8, 8,207, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8,188,158,158,158,158,158,158,158, + 158,208, 8, 8, 8, 8, 8, 8, 8, 32, 32, 32, 32,209,210, 32, + 32, 32,211, 32, 32, 32, 32, 32, 32, 84, 84, 84, 84, 84, 84, 84, + 212, 31, 31, 31, 31, 31,213,214, 31, 37, 37, 37, 37, 37, 37,215, + 37,159,159,159,159,159,159,159,159,105,105,216,217,105,105,105, + 105,160,160,160,160,160,160,160,160,179,179,179,179,179,218, 4, + 4,161,161,161,161,161,161,161,161,162,162,162,162,162,162,162, + 162,219,220, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 13, 13, 13, + 13,106,106,106,106,141,141,141,141,141,141,141,141,141,141,141, + 141,163,163,163,163,163,163,163,163, 46, 46, 46, 46, 14, 14, 14, + 14,108,108,108,108,142,142,142,142,142,142,142,142,142,142,142, + 142, 17, 17, 17, 17, 37, 37, 37, 37,107,107,107,107,190, 14, 14, + 14,221, 14,180,222, 4,180,182, 4, 7,191,223, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7,224,225,191,226, 7, 7, 7,227, + 7, 7, 7, 7, 7, 7, 7, 7,192, 4, 4, 4,182, 4, 4, 4, + 4, 4, 4, 4, 4,178, 4, 4,193, 4, 4, 4, 4, 7, 7, 7, + 7, 4, 4, 4, 4, 14, 14, 14, 14, 4,228,194, 4,181, 4, 4, + 4, 4, 4, 4,181, 4, 4, 4, 4, 7, 7,184, 4, 4, 4, 4, + 4, 37, 37, 37, 37,109,109,109,109, 1, 1, 1, 1, 4, 4, 4, + 4, 4,229, 4, 4, 4, 4, 4, 4,230, 1,231,232, 4, 4, 1, + 4,195, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,233, + 195,186, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,196, + 186,110,110,110,110,234, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, + 4, 2, 2, 2, 2, 2, 2, 2,235, 21, 21, 21, 21, 21, 21, 21, + 196, 21, 21, 21, 21, 21, 21, 4, 4, 10, 10, 10, 10, 86, 86, 86, + 86,194, 7, 7, 7, 7, 7, 7, 7, 7, 7,193, 7, 7, 7, 7, + 7,143,143,143,143,143,143,143,143,143,143,143,143, 4, 4, 4, + 4,157,157,157,157,157,157,157,157,157,157,157,236,144,144,144, + 144,144,144,144,144,144,144,144,144,104,104,104,237,104,104,104, + 104, 15, 15, 15, 15, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,177, + 7, 7,238,239, 7, 38, 38, 38, 38, 7, 7, 7, 7,240, 88, 88, + 187, 43, 43, 43, 43, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 241, 14, 14, 14,242, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8,185, 4,243, 21, 21,186, 21, 21, + 21, 21, 21, 21, 21, 21, 21, 21,244, 4, 4, 4, 4, 4, 4, 4, + 197,164,164,164,164,164,164,164,164,180, 4, 4, 4, 4, 4, 4, + 4,145,145,145,145,145,145,145,145,145,145,145,145,165,165,165, + 165,165,165,165,165,146,146,146,146,146,146,146,146,146,146,146, + 146,166,166,166,166,166,166,166,166,111,111,111,111,147,147,147, + 147,147,147,147,147,147,147,147,147,148,148,148,148,148,148,148, + 148,148,148,148,148,112,112,112,112,149,149,149,149,149,149,149, + 149,149,149,149,149,126,126,126,126,126,126,126,126,126,126,126, + 126,126,126,126,126,113,113,113,113,167,167,167,167,167,167,167, + 167,168,168,168,168,168,168,168,168,169,169,169,169,169,169,169, + 169,170,170,170,170,170,170,170,170,171,171,171,171,171,171,171, + 171,172,172,172,172,172,172,172,172,173,173,173,173,173,173,173, + 173,174,174,174,174,174,174,174,174,175,175,175,175,175,175,175, + 175,245, 8, 8, 8, 8, 8, 8, 8,150,150,150,150,150,150,150, + 150,150,150,150,150,135,135,135,135,135,135,135,135,135,135,135, + 135,135,135,135,135,136,136,136,136,136,136,136,136,136,136,136, + 136,136,136,136,136,151,151,151,151,151,151,151,151,151,151,151, + 151,176,176,176,176,176,176,176,176,114,114,114,114,152,152,152, + 152,152,152,152,152,152,152,152,152,115,115,115,115,153,153,153, + 153,153,153,153,153,153,153,153,153,246, 44, 44, 44, 44, 44, 44, + 44,154,154,154,154,154,154,154,154,154,154,154,154,116,116,116, + 116, 85, 85, 85, 85, 85, 85,247, 85,117,117,117,117, 26, 26, 26, + 26,118,118,118,118,100,100,100,100,100,100,100,100, 13, 13, 13, + 13, 87, 87, 87, 87, 48, 48, 48, 48,119,119,119,119,138,138,138, + 138,138,138,138,138,138,138,138,138,138,138,138,138, 45, 45, 45, + 45, 9, 9, 39, 39, 39, 39, 39, 39, 39, 39, 39, 9, 9, 9, 9, + 9,155,155,155,155,155,155,155,155,155,155,155,155,102,102,102, + 102,102,102,102,102,156,156,156,156,156,156,156,156,156,156,156, + 156,248, 20, 20, 20, 1, 1, 1, 1,249, 22, 22, 22, 22, 22, 22, + 22,250, 21, 21, 21,251, 22, 22, 22, 22, 22, 22, 22, 22,252, 21, + 21, 21, 21, 21, 21, 23, 23, 23, 23, 4,183,180, 4, 4, 4, 4, + 4, 4,183,182, 4, 4, 4,183, 14,190,197, 14, 4, 4, 4, 4, + 4, 4, 4,253,182, 4, 4, 4, 4, 19, 19, 19, 19, 4, 4,183, + 180, 7, 7, 7, 7,192,254, 7, 7, 47, 47, 47, 47, 17, 17, 17, + 17,255, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 13, 13, 13, + 13, 12, 12, 12, 12,178,178,178,178, 0, 0, 0, 0,136,136,136, + 136, 80, 80, 80, 80, 19, 19, 19, 19, 3, 3, 3, 3, 63, 63, 63, + 63, 39, 39, 39, 39,176,176,176,176,131,131,131,131, 28, 28, 28, + 28, 1, 1, 1, 1, 30, 30, 30, 30, 79, 79, 79, 79, 6, 6, 6, + 6,127,127,127,127, 9, 9, 9, 9,155,155,155,155, 17, 17, 17, + 17, 15, 15, 15, 15,139,139,139,139,110,110,110,110, 77, 77, 77, + 77, 33, 33, 33, 33, 27, 27, 27, 27, 49, 49, 49, 49,119,119,119, + 119,113,113,113,113, 25, 25, 25, 25, 7, 7, 7, 7, 99, 99, 99, + 99, 32, 32, 32, 32, 22, 22, 22, 22,165,165,165,165, 8, 8, 8, + 8, 29, 29, 29, 29,177,177,177,177, 31, 31, 31, 31,146,146,146, + 146,105,105,105,105, 14, 14, 14, 14, 36, 36, 36, 36, 5, 5, 5, + 5, 91, 91, 91, 91, 56, 56, 56, 56,134,134,134,134, 55, 55, 55, + 55, 11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 23, 23, 23, + 23, 16, 16, 16, 16, 20, 20, 20, 20, 18, 18, 18, 18, 62, 62, 62, + 62,122,122,122,122, 89, 89, 89, 89,130,130,130,130, 94, 94, 94, + 94,100,100,100,100,108,108,108,108,171,171,171,171,137,137,137, + 137,124,124,124,124,123,123,123,123,126,126,126,126,142,142,142, + 142,125,125,125,125,154,154,154,154,150,150,150,150,169,169,169, + 169,145,145,145,145,163,163,163,163,157,157,157,157,166,166,166, + 166,167,167,167,167,151,151,151,151,164,164,164,164,168,168,168, + 168,174,174,174,174,132,132,132,132, 24, 24, 24, 24,107,107,107, + 107, 86, 86, 86, 86,133,133,133,133, 4, 4, 4, 4, 37, 37, 37, + 37, 58, 58, 58, 58, 75, 75, 75, 75, 68, 68, 68, 68, 92, 92, 92, + 92, 87, 87, 87, 87, 59, 59, 59, 59,116,116,116,116, 97, 97, 97, + 97, 57, 57, 57, 57,114,114,114,114,140,140,140,140,138,138,138, + 138,159,159,159,159,172,172,172,172, 84, 84, 84, 84, 35, 35, 35, + 35, 48, 48, 48, 48, 76, 76, 76, 76, 70, 70, 70, 70, 61, 61, 61, + 61, 26, 26, 26, 26, 40, 40, 40, 40,135,135,135,135,161,161,161, + 161, 85, 85, 85, 85, 96, 96, 96, 96,109,109,109,109,102,102,102, + 102,141,141,141,141,143,143,143,143, 38, 38, 38, 38, 64, 64, 64, + 64, 90, 90, 90, 90, 93, 93, 93, 93, 65, 65, 65, 65, 67, 67, 67, + 67,104,104,104,104,170,170,170,170, 47, 47, 47, 47,173,173,173, + 173,117,117,117,117,112,112,112,112, 78, 78, 78, 78,144,144,144, + 144,156,156,156,156,148,148,148,148,158,158,158,158,121,121,121, + 121,175,175,175,175,160,160,160,160,152,152,152,152, 52, 52, 52, + 52, 73, 73, 73, 73, 60, 60, 60, 60, 74, 74, 74, 74, 42, 42, 42, + 42,118,118,118,118, 51, 51, 51, 51, 50, 50, 50, 50,106,106,106, + 106,147,147,147,147,153,153,153,153,101,101,101,101,111,111,111, + 111,129,129,129,129,115,115,115,115,103,103,103,103, 69, 69, 69, + 69, 95, 95, 95, 95, 34, 34, 34, 34, 45, 45, 45, 45, 43, 43, 43, + 43, 46, 46, 46, 46, 54, 54, 54, 54, 71, 71, 71, 71, 41, 41, 41, + 41, 53, 53, 53, 53, 81, 81, 81, 81,120,120,120,120,128,128,128, + 128, 66, 66, 66, 66, 72, 72, 72, 72, 98, 98, 98, 98, 88, 88, 88, + 88, 83, 83, 83, 83, 82, 82, 82, 82,149,149,149,149, 19, 19, 19, + 0, 0, 19, 19, 19, 44, 44, 44, 44, 1, 0, 0, 0, 0, 0, 19, + 0, 1, 1, 0, 0, 0, 0, 0, 1, 19, 0, 0, 0, 3, 3, 3, + 0, 0, 17, 17, 17, 4, 14, 14, 14, 3, 0, 3, 3, 0, 3, 3, + 3, 1, 1, 1, 0, 19, 19, 9, 9, 19, 19, 19, 9, 0, 0, 0, + 19, 0, 0, 19, 19, 0, 15, 15, 15, 17, 17, 17, 0, 0, 1, 1, + 1, 0, 0, 26, 26, 0, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, + 0, 9, 9, 55, 55, 6, 1, 1, 6, 6, 4, 4, 4, 3, 3, 3, + 1, 1, 1, 3, 3, 1, 3, 3, 3, 3, 3, 0, 3, 7, 1, 1, + 1, 1, 7, 7, 7, 0, 0, 7, 7, 24, 24, 24, 0, 25, 0, 0, + 0, 0, 25, 25, 25, 8, 8, 8, 0, 35, 35, 35, 0, 0, 0, 35, + 35, 44, 0, 0, 0, 32, 32, 0, 0, 32, 0, 32, 32, 1, 0, 1, + 1, 0, 1, 0, 0, 9, 9, 9, 6, 19, 9, 9, 9, 9, 9, 19, + 19, 9, 9, 9, 19, 6, 19, 19, 19, 0, 0, 9, 0, 0, 13, 0, + 13, 0, 13, 13, 13, 13, 13, 1, 1, 1, 1, 12, 12, 15, 1, 1, + 0, 26, 12, 12, 12, 12, 12, 12, 0, 69, 69, 0, 69, 84, 84, 84, + 0, 19, 9, 19, 19, 19, 19, 0, 0, 19, 19, 19, 4, 3, 3, 0, + 0, 1, 1, 6, 6, 0, 0, 17, 17, 17, 17, 0, 0,156,156, 3, + 3,100, 36, 36, 36,107,107,107, 1,136,139, 13, 13, 17, 15, 15, + 15, 17, 17, 17, 15, 17, 17, 15, 15, 15, 17, 17, 17, 0, 0, 1, + 1, 9, 19, 19, 19, 15, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 0, 0, 0, 0, 10, 0, 11, 12, 13, 0, 0, 0, 14, 0, + 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, 0, 0, 0, 0, + 0, 19, 20, 21, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, + 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 24, 25, + 26, 27, 28, 29, 30, 0, 0, 31, 32, 0, 33, 0, 34, 0, 35, 0, + 0, 0, 0, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, 0, 45, 0, 0, 0, + 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, 48, 0, 49, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 0, 0, 0, + 52, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, + 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, + 0, 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 59, 60, 61, 62, + 63, 64, 65, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 67, 68, 0, 69, 70, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99,100,101,102,103, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,104, 0, 0, 0, 0, 0, 0, + 105,106, 0,107, 0, 0, 0,108, 0,109, 0,110, 0,111,112,113, + 0,114, 0, 0, 0,115, 0, 0, 0,116, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118,119,120,121, 0, + 122,123,124,125,126, 0,127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,167, 0, 0, 0,168,169, 0, 0,170, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,171, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,172, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,128,129,130,131,132,133,134,135,136, + 137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152, + 153,154,155,156,157, 0, 0, 0,158,159,160,161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,162, 0,163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 164,165, 0, 0, 0, 0, 0, 0, 0,166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0,175, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,167, 0, 0, 0,168, + 169, 0, 0,170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,176,177, 0, 0, 0, 0,178,179, 0, 0, - 0,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194, - 195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210, - 211,212,213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,175, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,176,177, 0, 0, + 0, 0,178,179, 0, 0, 0,180,181,182,183,184,185,186,187,188, + 189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204, + 205,206,207,208,209,210,211,212,213, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, }; -static const uint16_t _hb_ucd_u16[5104]= +static const uint16_t _hb_ucd_u16[5908]= { - 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, - 8, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, 24, 24, 24, 24, - 32, 32, 32, 32, 32, 32, 32, 32, 64, 64, 64, 64, 64, 64, 64, 64, - 56, 56, 56, 56, 56, 56, 56, 56, 40, 40, 40, 40, 40, 40, 40, 40, - 24, 24, 24, 24, 24, 24, 56, 56, 96, 96, 96, 96, 96, 96, 96, 96, - 24, 24, 24, 24, 24, 24, 24, 592, 152, 152, 600, 336, 344, 352, 360, 608, - 152, 152, 616, 624, 72, 632, 48, 640, 80, 80, 80, 648, 656, 80, 80, 664, - 672, 680, 688, 696, 704, 712, 80, 720, 80, 80, 80, 728, 736, 48, 48, 48, - 48, 744, 48, 96, 752, 760, 768, 368, 40, 40, 40, 40, 40, 40, 40, 776, - 784, 376, 792, 48, 800, 808, 80, 816, 72, 72, 72, 48, 48, 48, 80, 80, - 824, 80, 80, 80, 832, 80, 80, 80, 80, 80, 80, 376, 72, 840, 48, 48, - 848, 856, 40, 864, 872, 8, 8, 880, 888, 896, 8, 8, 904, 40, 912, 384, - 8, 8, 8, 8, 8, 920, 928, 936, 944, 392, 8, 40, 952, 8, 8, 8, - 8, 8, 184, 384, 136, 8, 960, 968, 8, 976, 984, 104, 8, 992, 8, 8, - 1000,1008, 8, 8,1016, 40,1024, 40, 400, 8, 8,1032,1040,1048,1056,1064, - 1072, 8, 8, 408,1080,1088, 144,1096, 416, 8, 8,1104,1112,1120,1128,1136, - 416, 8, 8, 408,1144, 8, 144,1152, 192, 8, 8, 424,1160,1168, 144,1176, - 432, 8, 8,1184,1192,1200, 440,1208,1216, 8, 8,1224,1232,1240, 144,1248, - 1256, 8, 8, 424,1264,1272, 144,1280,1288, 8, 8, 448,1296,1304, 144,1312, - 192, 8, 8, 8,1320,1328, 440,1336, 8, 8, 8,1344,1352, 200, 104, 104, - 8, 8, 8,1360,1368,1376, 8, 8,1384,1392, 208,1400, 8, 8, 8,1408, - 1416, 40, 40,1424,1432,1440, 104, 104, 8, 8,1448,1456, 200,1464,1472,1480, - 1488,1496, 72, 72, 72, 48, 48,1504, 8, 8, 8, 8, 8,1512, 456, 56, - 8, 24, 72, 72, 72, 72, 72, 216, 464, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8,1520, 8,1528,1536, 8, 8, 8, 8,1544,1552, - 8,1560, 8,1568, 8, 224, 8, 224, 8, 8, 8,1576,1584,1592, 88, 56, - 1600, 88, 8, 8,1608, 8, 8, 8,1616, 8,1624, 8, 8, 8, 8, 8, - 8, 8,1632,1640,1648, 8, 8, 8, 8, 8, 8, 8, 8,1656, 24, 24, - 8,1664, 8, 8, 8,1672,1680, 472, 88, 88,1688,1696, 40, 40, 40, 40, - 1704, 8, 8,1712,1720, 200,1728,1736, 232, 8,1744, 136, 8, 8,1752,1760, - 8, 8,1768,1776,1784, 136, 8, 480,1792, 72, 72, 72, 104,1800,1808,1816, - 48, 48,1824, 96, 96, 96,1832,1840, 48,1848, 96, 96, 40, 40, 40, 40, - 80, 80, 80, 80, 80, 80, 80, 80, 80,1856, 80, 80, 80, 80, 80, 80, - 128, 128, 128, 128, 128,1864, 128, 48, 240, 240, 240,1872, 488, 496, 496, 488, - 1880,1888,1896,1904,1912,1920, 112,1928,1936, 96, 248, 248, 248,1944,1952, 40, - 1960,1968,1976,1984,1992, 56, 120, 120,2000,2008,2016, 24,2024,2032, 24,2040, - 2048, 24,2056, 24, 24, 24, 24,2064, 24,2072, 64,2080, 24,2088,2096, 24, - 56,2104, 24, 24, 24, 24,2112, 56, 24, 24, 24,2120,2128, 24, 24,2136, - 24, 24, 24, 24, 24, 24,2144, 24, 24, 24, 24, 24, 24, 24,2152,2160, - 56,2168, 24, 24,2176, 64,2184, 64,2192,2200, 64, 64, 64,2208, 64,2216, - 24, 24, 24, 64,2224, 24, 24, 24, 72, 72, 72, 48, 48, 48,2232,2240, - 80, 80, 80, 80, 80, 80,2248,2256, 48, 48, 48, 8, 8, 8,2264,2272, - 8, 8, 8, 8, 8, 8, 40, 40,2280,2288,2296,2304,2312,2320, 504, 504, - 2328,2336,2344,2352,2360, 8, 8, 8, 8,2368, 464, 8, 8, 8, 8,2376, - 8,2384, 8, 8, 24, 24, 24, 8, 24, 24, 512, 24,2392, 520, 24, 24, - 512, 24, 24, 520, 24, 24, 24, 24, 8, 8, 8, 8, 24, 24, 24, 24, - 8, 528, 8, 8, 8, 8, 8, 8, 8, 24, 24, 24, 24, 8, 8, 480, - 2400, 8, 136, 8, 80, 80,2408,2416, 80,2424, 8, 8, 8, 8,2432,2440, - 368,2448,2456,2464, 80, 80, 80,2472,2480,2488,2496,2504,2512,2520, 72,2528, - 2536, 8,2544,2552, 8, 8, 8,2560,2568, 8, 8,2576,2584, 88, 40,2592, - 136, 8,2600, 8,2608,2616, 8, 8, 400, 8, 8,2624,2632, 256,2640, 136, - 8, 8,2648,2656,2664,2672, 8,2680, 8, 8, 8,2688, 392,2696,2704,2712, - 8, 8, 8, 48, 48,2720,2728, 48, 48, 48, 48, 48, 8, 8,2736, 88, - 48,2744,2752, 8, 8, 8, 8, 8, 8, 8, 8,2760,2768,2776, 8, 8, - 8, 8, 8,2784, 24, 8, 8, 8, 8,2792, 8, 8,2800, 24, 24,2808, - 40,2816, 40,2824,2832,2840,2848, 8, 8, 8, 8, 8, 8, 8, 8,2856, - 2864, 336, 344, 352, 360,2872,2880,2888, 8,2896, 8, 8, 8, 8,2904,2912, - 2920, 56, 56,2928, 120, 120, 120,2936,2944, 24, 24, 24, 24, 24, 24,2952, - 8, 8, 8, 8, 8, 8,2960, 56, 8, 8,2968, 8,2976, 8, 8, 184, - 8, 264, 8, 8, 8,2984, 120, 120, 72, 72, 216, 48, 48, 8, 8, 8, - 8, 8, 88, 72, 72, 216, 48, 48, 8, 8, 8, 8, 8, 8, 264, 72, - 72,2992, 48, 48, 8, 8, 8, 8, 8, 8, 8, 8, 8,3000, 8,3008, - 8, 8, 536, 56, 56, 56, 8,3016, 8,3024, 8, 264, 8, 8, 8, 8, - 8, 8, 8,3032, 56, 56, 56, 56, 272, 8, 8, 544, 56, 104, 8,3040, - 8, 552, 56, 56,3048, 8,3056, 104, 8, 8, 8, 280, 8, 560, 8, 560, - 8, 280, 456, 56, 56, 56, 56, 56, 72, 72, 72, 72, 48, 48, 48,3064, - 8, 8,3072, 88,3080, 72,3088, 48,3096, 64, 64, 64, 64, 64, 64, 64, - 8, 8,3104, 8, 528,3112, 24,3120, 8, 552,3128, 8, 184,3136, 104, 8, - 3144, 104, 104, 8,3152, 56, 8, 8,3160, 8, 8, 544,3168,3176,3184,3192, - 232, 8, 8,3200,3208, 8, 8, 88, 432, 8,3216,3224,3232, 8, 8,3240, - 232, 8, 8,3248,3256,3264,3272, 56, 8, 8, 568,3280, 272, 40, 40, 40, - 8, 8, 280, 8, 8, 576, 472, 88, 192, 8, 8, 448,3288,3296,3304, 40, - 8, 8, 8,3312,3320,3328,3336, 40, 8, 8, 8,3344,3352,3360, 8, 8, - 8, 8, 8,3368,3376, 88, 88, 88, 8, 8, 584,3384,3392,3400, 40, 40, - 8, 8, 8,3408,3416, 88, 104, 104, 8, 8,3424,3432, 88, 88, 88, 88, - 8,3440,3448,3456, 8, 8, 8, 8, 8, 8, 568,3464, 104, 104, 104, 104, - 72, 72, 72, 72, 48, 48, 208,3472, 8, 8, 8,3480,3488, 88, 88, 88, - 8, 8, 8, 8, 8,3496,3504, 160,3512, 8, 8,3520,3528,3536, 8, 8, - 3544,3552, 104, 8, 8, 8, 8, 8, 104, 104, 104, 104, 104, 104,3560, 160, - 8, 8, 8, 8, 8, 8, 288, 88, 8, 8, 584,3568, 288, 208, 56,3576, - 8, 224,3584,3592, 40, 40, 40, 40, 8, 8, 8, 272,3600, 88, 8, 8, - 3608,3616, 88, 8, 8,3624, 88, 88, 8, 8, 8, 8, 8, 8, 8,3632, - 3640, 8, 8,3648,3656,3664, 40, 40, 8, 8, 8, 8, 56,3672,3680,3688, - 120, 120, 120, 120, 120, 120, 120, 104, 8, 8, 8, 8, 8, 8, 8, 288, - 8, 8, 8, 112,3696, 40, 8, 8, 8, 296,3704, 88, 88, 88, 88, 88, - 8, 8, 8, 8, 8, 8, 256, 8, 8, 8, 8, 8, 88, 8, 8,3712, - 8, 8, 8,3720,3728,3736,3744, 8, 96, 96, 96, 96,3752, 8,3760, 88, - 72, 72, 72, 72, 72, 72, 48, 48, 56,3768, 72,3776, 48, 48, 48, 48, - 8, 8, 8, 8, 576,3784, 160, 160,3792,3800, 96, 96, 96, 96,3808,3816, - 8,3824, 112, 112, 112, 112, 112, 112, 24, 24, 24, 24, 24, 24, 24, 64, - 40, 40, 40, 40, 40, 24, 24, 24, 24, 24, 24, 24, 24, 24,3832,3840, - 3848, 24,3856, 24, 24, 24, 24, 24, 24, 24, 24, 24,3864, 24, 24, 24, - 72, 168, 48, 304, 312, 48, 128, 72, 176, 320, 72, 328, 48, 72, 168, 48, - 304, 312, 48, 128, 72, 176, 320, 72, 328, 48, 72, 168, 48, 304, 312, 48, - 128, 72, 176, 320, 72, 328, 48, 72, 168, 48, 128, 72,3872,3880,3888,3896, - 48,3904, 72,3912,3920,3928,3936, 48,3944, 72,3952, 48,3960, 88, 88, 88, - 40, 40, 40,3968, 40, 40,3976,3984,3992,4000, 40, 40, 40, 40, 40, 40, - 4008, 48, 48, 48, 48, 48, 48, 48, 40, 40, 40, 96, 96, 96, 96, 96, - 8, 8, 8,4016,4024, 24, 24, 24, 8, 8, 296, 40, 8, 8,4032,4040, - 8, 8, 8, 8, 8, 8,4048, 88, 8, 8, 8, 8, 8, 8, 296,4056, - 8, 8, 8, 8, 8, 8,4064,4072, 8, 8, 8, 8, 536, 40, 40, 40, - 72, 72, 176, 48,4080, 256, 104, 104, 56, 56,4088,4096, 56, 56, 56, 56, - 56, 56,4104, 56, 56, 56, 56, 56, 8, 8, 8, 8, 8, 8, 8, 64, - 4112, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,4120, - 24, 24, 24, 24, 24, 64, 64, 64, 112, 112, 112, 112, 112, 112, 112, 112, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, + 16, 16, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 24, + 32, 32, 32, 32, 32, 32, 32, 32, 56, 56, 56, 56, 56, 56, 56, 56, + 88, 88, 88, 88, 88, 88, 88, 88, 40, 40, 40, 40, 40, 40, 40, 40, + 24, 24, 24, 24, 24, 24, 64, 64, 96, 96, 96, 96, 96, 96, 96, 96, + 64, 64, 64, 64, 64, 64, 64, 64, 24, 24, 24, 24, 24, 24, 24, 584, + 160, 160, 592, 344, 352, 360, 368, 600, 160, 160, 608, 616, 72, 624, 48, 632, + 80, 80, 80, 640, 648, 80, 80, 656, 664, 672, 680, 688, 696, 704, 80, 712, + 80, 80, 80, 720, 728, 48, 48, 48, 48, 736, 48, 96, 744, 752, 760, 376, + 40, 40, 40, 40, 40, 40, 40, 768, 776, 384, 784, 48, 792, 800, 80, 808, + 72, 72, 72, 48, 48, 48, 80, 80, 816, 80, 80, 80, 824, 80, 80, 80, + 80, 80, 80, 384, 72, 832, 48, 48, 840, 848, 40, 856, 864, 8, 8, 872, + 880, 888, 8, 8, 896, 40, 904, 184, 8, 8, 8, 8, 8, 912, 920, 928, + 936, 392, 8, 40, 944, 8, 8, 8, 8, 8, 192, 184, 144, 8, 952, 960, + 8, 968, 976, 112, 8, 984, 8, 8, 992,1000, 8, 8,1008, 40,1016, 40, + 400, 8, 8,1024,1032,1040,1048,1056,1064, 8, 8, 408,1072,1080, 152,1088, + 416, 8, 8,1096,1104,1112,1120,1128, 416, 8, 8, 408,1136, 8, 152,1144, + 200, 8, 8, 424,1152,1160, 152,1168, 432, 8, 8,1176,1184,1192, 440,1200, + 1208, 8, 8,1216,1224,1232, 152,1240,1248, 8, 8, 424,1256,1264, 152,1272, + 1280, 8, 8, 448,1288,1296, 152,1304, 200, 8, 8, 8,1312,1320, 440,1328, + 8, 8, 8,1336,1344, 208, 112, 112, 8, 8, 8,1352,1360,1368, 8, 8, + 1376,1384, 216,1392, 8, 8, 8,1400,1408, 40, 40,1416,1424,1432, 112, 112, + 8, 8,1440,1448, 208,1456,1464,1472,1480,1488, 72, 72, 72, 48, 48,1496, + 8, 8, 8, 8, 8,1504, 456, 64, 8, 24, 72, 72, 72, 72, 72, 224, + 464, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,1512, 8, + 1520,1528, 8, 8, 8, 8,1536,1544, 8,1552, 8,1560, 8, 232, 8, 232, + 8, 8, 8,1568,1576,1584, 104, 64,1592, 104, 8, 8,1600, 8, 8, 8, + 1608, 8,1616, 8, 8, 8, 8, 8, 8, 8,1624,1632,1640, 8, 8, 8, + 8, 8, 8, 8, 8,1648, 24, 24, 8,1656, 8, 8, 8,1664,1672, 472, + 104, 104,1680,1688, 40, 40, 40, 40,1696, 8, 8,1704,1712, 208,1720,1728, + 240, 8,1736, 144, 8, 8,1744,1752, 8, 8,1760,1768,1776, 144, 8, 480, + 1784, 72, 72, 72, 112,1792,1800,1808, 48, 48,1816, 96, 96, 96,1824,1832, + 48,1840, 96, 96, 40, 40, 40, 40, 80, 80, 80, 80, 80, 80, 80, 80, + 80,1848, 80, 80, 80, 80, 80, 80, 128, 128, 128, 128, 128,1856, 128, 48, + 248, 248, 248,1864, 488, 496, 496, 488,1872,1880,1888,1896,1904,1912, 120,1920, + 1928, 96, 256, 256, 256,1936,1944, 40,1952,1960,1968,1976,1984, 64, 88, 88, + 1992,2000,2008, 24,2016,2024, 24,2032,2040, 24,2048, 24, 24, 24, 24,2056, + 24,2064, 56,2072, 24,2080,2088, 24, 64,2096, 24, 24, 24, 24,2104, 64, + 24, 24, 24,2112,2120, 24, 24,2128, 24, 24, 24, 24, 24, 24,2136, 24, + 24, 24, 24, 24, 24, 24,2144,2152, 64,2160, 24, 24,2168, 56,2176, 56, + 2184,2192, 56, 56, 56,2200, 56,2208, 24, 24, 24, 56,2216, 24, 24, 24, + 72, 72, 72, 48, 48, 48,2224,2232, 80, 80, 80, 80, 80, 80,2240,2248, + 48, 48, 48, 8, 8, 8,2256,2264, 8, 8, 8, 8, 8, 8, 40, 40, + 2272,2280,2288,2296,2304,2312,2320,2328,2336,2344,2352,2360,2368, 8, 8, 8, + 8,2376, 464, 8, 8, 8, 8,2384, 8,2392, 8, 8, 24, 24, 24, 8, + 24, 24, 504, 24,2400, 512, 24, 24, 504, 24, 24, 512, 24, 24, 24, 24, + 8, 8, 8, 8, 24, 24, 24, 24, 8,2408, 8, 8, 8, 8, 8, 8, + 8, 24, 24, 24, 24, 8, 8, 480,2416, 8, 144, 8, 80, 80,2424,2432, + 80,2440, 8, 8, 8, 8,2448,2456, 376,2464,2472, 520, 80, 80, 80,2480, + 2488,2496,2504,2512,2520,2528, 72,2536,2544, 8,2552,2560, 8, 8, 8,2568, + 2576, 8, 8,2584,2592, 104, 40,2600, 144, 8,2608, 8,2616,2624, 8, 8, + 400, 8, 8,2632,2640, 264,2648, 144, 8, 8,2656,2664,2672,2680, 8,2688, + 8, 8, 8,2696, 392,2704,2712,2720, 8, 8, 8, 48, 48,2728,2736, 48, + 48, 48, 48, 48, 8, 8,2744, 104, 48,2752,2760, 8, 8, 8, 8, 8, + 8, 8, 8,2768,2776,2784, 8, 8, 8, 8, 8,2792, 24, 8, 8, 8, + 8,2800, 8, 8,2808, 24, 24,2816, 40,2824, 40,2832,2840,2848,2856, 8, + 8, 8, 8, 8, 8, 8, 8,2864,2872, 344, 352, 360, 368,2880,2888,2896, + 8,2904, 8, 8, 8, 8,2912,2920,2928, 64, 64,2936, 88, 88, 88,2944, + 2952, 24, 24, 24, 24, 24, 24,2960, 8, 8, 8, 8, 8, 8,2968, 64, + 8, 8,2976, 8,2984, 8, 8, 192, 8, 272, 8, 8, 8,2992, 88, 88, + 72, 72, 224, 48, 48, 8, 8, 8, 8, 8, 104, 72, 72, 224, 48, 48, + 8, 8, 8, 8, 8, 8, 272, 72, 72,3000, 48, 48, 8, 8, 8, 8, + 8, 8, 8, 8, 8,3008, 8,3016, 8, 8, 528, 64, 64, 64, 8,3024, + 8,3032, 8, 272, 8, 8, 8, 8, 8, 8, 8,3040, 64, 64, 64, 64, + 280, 8, 8, 536, 64, 112, 8,3048, 8, 544, 64, 64,3056, 8,3064, 112, + 8, 8, 8, 288, 8, 552, 8, 552, 8, 288, 456, 64, 64, 64, 64, 64, + 72, 72, 72, 72, 48, 48, 48,3072, 8, 8,3080, 104,3088, 72,3096, 48, + 3104, 56, 56, 56, 56, 56, 56, 56, 8, 8,3112, 8,3120,3128, 8, 40, + 8, 544,3136, 8, 192,3144, 112, 8,3152, 112, 112, 8,3160, 64, 8, 8, + 3168, 8, 8, 536,3176,3184,3192,3200, 240, 8, 8,3208,3216, 8, 8, 104, + 432, 8,3224,3232,3240, 8, 8,3248, 240, 8, 8,3256,3264,3272,3280, 64, + 8, 8, 560,3288, 280, 40, 40, 40, 8, 8, 288, 8, 8, 568, 472, 104, + 200, 8, 8, 448,3296,3304,3312, 40, 8, 8, 8,3320,3328,3336,3344, 40, + 8, 8, 8,3352,3360,3368, 8, 8, 8, 8, 8,3376,3384, 104, 104, 104, + 8, 8, 576,3392,3400,3408, 40, 40, 8, 8, 8,3416,3424, 104, 112, 112, + 8, 8,3432,3440, 104, 104, 104, 104, 8,3448,3456,3464, 8, 8, 8, 8, + 8, 8, 560,3472, 112, 112, 112, 112, 72, 72, 72, 72, 48, 48, 216,3480, + 8, 8, 8,3488,3496, 104, 104, 104, 8, 8, 8, 8, 8,3504,3512, 136, + 3520, 8, 8,3528,3536,3544, 8, 8,3552,3560, 112, 8, 8, 8, 8, 8, + 3568, 8, 8, 8, 8, 8,3576, 136, 8, 8, 8, 8, 8, 8, 296, 104, + 8, 8, 576,3584, 296, 216, 64,3592, 8, 232,3600,3608, 40, 40, 40, 40, + 8, 8, 8, 280,3616, 104, 8, 8,3624,3632, 104, 8, 8,3640, 104, 184, + 8, 8, 8, 8, 8, 8, 8,3648,3656, 8, 8,3664,3672,3680, 40, 40, + 8, 8, 8, 8, 64,3688,3696,3704, 88, 88, 88, 88, 88, 88, 88,3712, + 8, 8, 8, 8, 8, 88, 88, 88, 8, 8, 8, 8, 8, 8, 8, 296, + 8, 8, 8, 120,3720, 40, 8, 8, 8, 304,3728, 104, 104, 104, 104, 104, + 8, 8, 8, 8, 8, 8, 264, 8, 8, 8, 8, 8, 104, 8, 8,3736, + 8, 8, 8,3744,3752,3760,3768, 8, 96, 96, 96, 96,3776, 8,3784, 104, + 72, 72, 72, 72, 72, 72, 48, 48, 64,3792, 72,3800, 48, 48, 48, 48, + 8, 8, 8, 8, 568,3808, 136, 136,3816,3824, 96, 96, 96, 96,3832,3840, + 8,3848, 120, 120, 120, 120, 120, 120, 24, 24, 24, 24, 24,3856, 24, 56, + 40, 40, 40, 40, 40, 24, 24, 24, 24, 24,3864, 24, 24, 24,3872,3880, + 3888, 24,3896, 24, 24, 24, 24, 24, 24, 24, 24, 24,3904,3912, 24, 24, + 136, 136, 136, 136, 64, 64, 64, 64, 72, 168, 48, 312, 320, 48, 128, 72, + 176, 328, 72, 336, 48, 72, 168, 48, 312, 320, 48, 128, 72, 176, 328, 72, + 336, 48, 72, 168, 48, 312, 320, 48, 128, 72, 176, 328, 72, 336, 48, 72, + 168, 48, 128, 72,3920,3928,3936,3944, 48,3952, 72,3960,3968,3976,3984, 48, + 3992, 72,4000, 48,4008, 104, 104, 104, 40, 40, 40,4016, 40, 40,4024,4032, + 4040,4048, 40, 40, 40, 40, 40, 40,4056, 48, 48, 48,4064,4072,4080, 520, + 8, 48, 48, 48,4088, 96, 96, 96, 40, 40, 40, 96, 96, 96, 96, 96, + 8, 8, 8,4096,4104, 24, 24, 24, 8, 8, 304, 40, 8, 8,4112,4120, + 8, 8, 8, 8, 8, 8,4128, 104, 8, 8, 8, 8, 8, 8, 304,4136, + 8, 8, 8, 8, 8, 8,4144,4152, 8, 8, 8, 8, 528, 40, 40, 40, + 72, 72, 176, 48,4160, 264, 112, 112, 64, 64,4168,4176, 64, 64, 64, 64, + 64, 64,4184, 64, 64, 64, 64, 64, 8, 8, 8, 8, 8, 8, 8, 56, + 4192, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,4200, + 24, 24, 24, 24, 24, 56, 56, 56, 120, 120, 120, 120, 120, 120, 120, 120, + 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 16, 24, 24, 24, 24, + 32, 32, 32, 32, 40, 40, 40, 40, 48, 48, 48, 48, 56, 56, 56, 56, + 80, 80, 80, 80, 88, 88, 88, 88, 72, 72, 72, 72, 64, 64, 64, 64, + 96, 96, 96, 96, 104, 104, 104, 104, 128, 128, 128, 128, 112, 112, 112, 112, + 120, 120, 120, 120, 152, 152, 152, 152, 168, 168, 168, 168, 176, 176, 176, 176, + 144, 144, 144, 144, 160, 160, 160, 160, 208, 208, 208, 208, 184, 184, 184, 184, + 216, 216, 216, 216, 224, 224, 224, 224, 232, 232, 232, 232, 136, 136, 136, 136, + 32, 32, 328, 328, 32,1144, 808, 808, 72,1152, 32,1160, 136, 136, 136,1168, + 1176, 160, 160,1184,1192, 144, 144, 144, 144,1200, 816, 816,1208, 336, 336, 336, + 1216, 64,1224,1232, 64, 64,1240, 64, 824, 824, 832, 64, 840, 840, 848, 848, + 856, 856,1248, 832, 64, 64, 64,1256, 264, 264,1264,1272, 344, 344, 344, 344, + 352, 352, 352, 352, 360, 360, 360, 360, 368, 368, 368, 368, 272, 272, 272, 272, + 376, 376, 376, 376, 384, 384, 384, 384, 392, 392, 392, 392, 400, 400, 400, 400, + 680,1280, 680, 680, 408, 408, 408, 408, 240, 240, 240, 240, 240, 240,1288, 240, + 200, 200, 200, 200, 200, 416, 416,1296, 112, 288, 288, 288,1304, 864, 864,1312, + 1320,1328,1336,1344, 296, 296, 296, 296,1352, 304, 304, 304, 304,1360, 104, 104, + 872, 872,1368,1376, 688, 688, 688, 296,1384, 424, 424, 424, 424,1392, 136, 136, + 432, 432, 432, 432, 880, 880, 888, 888, 896, 896,1400,1408,1416, 416,1424,1432, + 72,1440,1448,1456, 72,1464, 136, 136,1472, 32, 32,1480,1488, 32,1496, 136, + 32,1504,1512, 72,1520, 32, 32, 32, 440, 440, 440, 72, 448, 448, 448, 448, + 416,1528, 904, 904, 112, 112, 112, 144, 8, 8, 8,1536,1544,1552,1560, 192, + 1568,1576, 248,1584, 912,1592, 16, 16,1600, 912, 32, 920, 16, 32, 32,1608, + 32, 32, 920,1616, 248, 248,1624, 32, 8, 8, 32, 32, 80, 80,1632, 696, + 184, 184, 144, 144, 144, 120, 120, 120, 32,1640, 72, 72,1648, 72, 72, 72, + 1656,1664, 928, 928, 704, 704, 704, 264,1672,1680,1688, 16, 936, 936,1696, 200, + 712, 712, 712, 200, 720, 720, 720, 728, 112,1704,1712,1720, 288, 288, 728, 728, + 1728, 336,1736, 64, 64,1744, 64, 64, 944,1752, 32,1760, 64, 64, 64,1768, + 32, 328, 328,1776,1784, 16, 16, 32, 32, 32, 160, 160, 952, 160, 952,1792, + 1800, 960, 960,1808,1816,1824,1832,1840,1848, 736, 736, 736, 968, 968,1856,1864, + 1872,1880, 976, 976,1888,1896,1904,1912, 984, 984, 992, 992,1000,1000,1920,1928, + 744, 744, 744,1936,1944,1952,1008,1008,1960, 752, 752, 752, 760, 760, 760,1968, + 1016,1016,1024,1024,1032,1032,1976,1984, 456, 456, 456, 456, 464, 464, 464, 464, + 472, 472, 472, 472,1040,1040, 280, 280, 280, 280, 280, 280,1048,1048,1992, 64, + 2000,2008,2016,2024,2032,2040,2048,2056, 480, 480, 480, 480,1056,1056,2064,2072, + 1064,1064,2080,2088, 488, 488, 488,2096, 496, 496, 496, 496,2104,2112,1072,1072, + 768,2120, 768, 768, 504, 504, 504, 504, 512, 512, 512, 512, 520, 520, 520, 520, + 528, 528, 528, 528, 776, 776, 776, 304,1080,1080,2128, 200, 536, 536, 536, 536, + 544, 544, 544, 544, 552, 552, 552, 552, 560, 560, 560, 560, 568, 568, 568, 568, + 1088,1088,2136,1096,1096,2144,1104,1104, 264, 264, 264, 488, 576, 576, 576, 576, + 784, 784, 784,2152, 584, 584, 584, 584, 792, 792, 792,1112,1112,2160,2168,2176, + 592, 592, 592, 592, 600, 600, 600, 600, 696, 696, 272, 272, 56,2184, 608, 608, + 608, 608,2192, 56, 616, 616, 616, 616, 624, 624, 624, 624, 120, 120,2200,2208, + 1120,1120,2216,2224, 632, 632, 632, 632, 312, 312, 312, 312, 312, 800, 800, 800, + 256, 256, 256, 256, 256, 256, 256,2232, 248, 248, 248, 248,2240, 192, 192, 192, + 192, 192, 192, 192, 192,2248,2256,2264, 320, 320, 320, 320, 320, 32, 32, 32, + 136, 136, 944, 32, 32,2272, 32,2280,2288,2296, 32, 32, 160, 160,2304, 32, + 72, 72, 72,2312, 440,2320, 144, 144, 640, 640, 640, 640,1128,1128,1136,1136, + 648, 648, 648, 648, 656, 656, 656, 656, 664, 664, 664, 664, 672, 672, 672, 672, + 2328, 32, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 939, 940, 941, 942, 946, 948, 0, 962, 969, 970, 971, 976, + 1001,1002,1003,1008, 0,1033,1040,1041,1042,1043,1047, 0, 0,1080,1081,1082, + 1086,1110, 0, 0,1124,1125,1126,1127,1131,1133, 0,1147,1154,1155,1156,1161, + 1187,1188,1189,1193, 0,1219,1226,1227,1228,1229,1233, 0, 0,1267,1268,1269, + 1273,1298, 0,1303, 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, + 961,1146, 964,1149, 0, 0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, + 988,1173, 990,1175, 991,1176, 993,1178, 994,1179, 0, 0,1004,1190,1005,1191, + 1006,1192,1014,1199,1007, 0, 0, 0,1016,1201,1020,1206, 0,1022,1208,1025, + 1211,1023,1209, 0, 0, 0, 0,1032,1218,1037,1223,1035,1221, 0, 0, 0, + 1044,1230,1045,1231,1049,1235, 0, 0,1058,1244,1064,1250,1060,1246,1066,1252, + 1067,1253,1072,1258,1069,1255,1077,1264,1074,1261, 0, 0,1083,1270,1084,1271, + 1085,1272,1088,1275,1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120, + 1309,1121,1310, 0,1053,1239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,1093,1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 949,1134,1010,1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339, + 1366, 0,1320,1347,1418,1419,1323,1350, 0, 0, 992,1177,1018,1204,1055,1241, + 1416,1417,1415,1424,1202, 0, 0, 0, 987,1172, 0, 0,1031,1217,1321,1348, + 1322,1349,1338,1365, 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197, + 1051,1237,1052,1238,1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263, + 0, 0, 997,1182, 0, 0, 0, 0, 0, 0, 945,1130, 982,1167,1337,1364, + 1335,1362,1046,1232,1422,1423,1113,1301, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 8, 9, 0, 10,1425, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0,1314,1427, 5,1434,1438,1443, 0, + 1450, 0,1455,1461,1514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1446,1458, + 1468,1476,1480,1486,1517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1489,1503, + 1494,1500,1508, 0, 0, 0, 0,1520,1521, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1526,1528, 0,1525, 0, 0, 0,1522, 0, 0, 0, 0, + 1536,1532,1539, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1534, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1556, 0, 0, + 0, 0, 0, 0,1548,1550, 0,1547, 0, 0, 0,1567, 0, 0, 0, 0, + 1558,1554,1561, 0, 0, 0, 0, 0, 0, 0,1568,1569, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1529,1551, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1523,1545,1524,1546, 0, 0,1527,1549, 0, 0,1570,1571, + 1530,1552,1531,1553, 0, 0,1533,1555,1535,1557,1537,1559, 0, 0,1572,1573, + 1544,1566,1538,1560,1540,1562,1541,1563,1542,1564, 0, 0,1543,1565, 0, 0, + 0, 0, 0, 0, 0, 0,1606,1607,1609,1608,1610, 0, 0, 0, 0, 0, + 0, 0, 0, 0,1613, 0,1611, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1612, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1620, 0, 0, + 0, 0, 0, 0, 0,1623, 0, 0,1624, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1614,1615,1616,1617, + 1618,1619,1621,1622, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1628, + 1629, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1625,1626, 0,1627, 0, 0, 0,1634, 0, 0,1635, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1630,1631,1632, + 0, 0,1633, 0, 0, 0, 0, 0, 0, 0, 0, 0,1639, 0, 0,1638, + 1640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1636,1637, 0, 0, 0, 0, 0, 0,1641, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1642,1644, + 1643, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1645, 0, 0, 0, + 0, 0, 0, 0,1646, 0, 0, 0, 0, 0, 0,1648,1649, 0,1647,1650, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1651,1653, + 1652, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1654, 0, + 1655,1657,1656, 0, 0, 0, 0,1659, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1660, 0, 0, 0, 0,1661, 0, 0, 0, 0,1662, 0, 0, 0, 0, + 1663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1658, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1664, 0,1665,1673, 0,1674, 0, 0, 0, + 0, 0, 0, 0, 0,1666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,1668, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1669, 0, 0, 0, 0,1670, 0, 0, 0, 0,1671, 0, 0, 0, 0, + 1672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1667, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1675, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1676, 0,1677, 0,1678, 0, + 1679, 0,1680, 0, 0, 0,1681, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1682, + 0,1683, 0, 0,1684,1685, 0,1686, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, + 965,1150, 968,1153, 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170, + 1420,1421, 986,1171, 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185, + 1015,1200,1329,1356,1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213, + 1026,1212,1028,1214,1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224, + 1334,1361,1336,1363,1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249, + 1689,1690,1065,1251,1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259, + 1075,1262,1079,1266,1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393, + 1099,1286,1100,1287,1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295, + 1108,1296,1114,1302,1119,1308,1122,1311,1123,1312,1186,1260,1293,1305, 0,1394, + 0, 0, 0, 0, 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345, + 1693,1695,1371,1375,1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, + 972,1157,1326,1353,1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198, + 1054,1240,1048,1234,1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401, + 1395,1400,1398,1403,1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410, + 1408,1413,1407,1412,1409,1414,1109,1297,1117,1306,1116,1304,1112,1300, 0, 0, + 0, 0, 0, 0,1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719, + 1716,1720,1717,1721,1477,1478,1729,1731,1730,1732, 0, 0,1435,1436,1733,1735, + 1734,1736, 0, 0,1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755, + 1752,1756,1753,1757,1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774, + 1772,1775,1773,1776,1495,1496,1777,1779,1778,1780, 0, 0,1451,1452,1781,1783, + 1782,1784, 0, 0,1504,1505,1785,1788,1786,1789,1787,1790, 0,1459, 0,1791, + 0,1792, 0,1793,1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812, + 1809,1813,1810,1814,1467, 21,1475, 22,1479, 23,1485, 24,1493, 27,1499, 28, + 1507, 29, 0, 0,1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724, + 1725,1726,1727,1728,1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760, + 1761,1762,1763,1764,1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817, + 1818,1819,1820,1821,1470,1469,1822,1474,1465, 0,1473,1825,1429,1428,1426, 12, + 1432, 0, 26, 0, 0,1315,1823,1484,1466, 0,1483,1829,1433, 13,1437, 14, + 1441,1826,1827,1828,1488,1487,1513, 19, 0, 0,1492,1515,1445,1444,1442, 15, + 0,1831,1832,1833,1502,1501,1516, 25,1497,1498,1506,1518,1457,1456,1454, 17, + 1453,1313, 11, 3, 0, 0,1824,1512,1519, 0,1511,1830,1449, 16,1460, 18, + 1464, 4, 0, 0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 2, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1834,1835, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1836, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1837,1839,1838, 0, 0, 0, 0,1840, 0, 0, 0, 0,1841, 0, 0, + 1842, 0, 0, 0, 0, 0, 0, 0,1843, 0,1844, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,1845, 0, 0,1846, 0, 0,1847, 0,1848, 0, 0, + 0, 0, 0, 0, 937, 0,1850, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1849, 936, 938,1851,1852, 0, 0,1853,1854, 0, 0,1855,1856, 0, 0, + 0, 0, 0, 0,1857,1858, 0, 0,1861,1862, 0, 0,1863,1864, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1867,1868,1869,1870,1859,1860,1865,1866, 0, 0, 0, 0, 0, 0,1871,1872, + 1873,1874, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 33, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1875, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1877, 0,1878, 0,1879, 0,1880, 0,1881, 0,1882, 0,1883, 0,1884, 0, + 1885, 0,1886, 0,1887, 0,1888, 0, 0,1889, 0,1890, 0,1891, 0, 0, + 0, 0, 0, 0,1892,1893, 0,1894,1895, 0,1896,1897, 0,1898,1899, 0, + 1900,1901, 0, 0, 0, 0, 0, 0,1876, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1902, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1904, 0,1905, 0,1906, 0,1907, 0,1908, 0,1909, 0,1910, 0,1911, 0, + 1912, 0,1913, 0,1914, 0,1915, 0, 0,1916, 0,1917, 0,1918, 0, 0, + 0, 0, 0, 0,1919,1920, 0,1921,1922, 0,1923,1924, 0,1925,1926, 0, + 1927,1928, 0, 0, 0, 0, 0, 0,1903, 0, 0,1929,1930,1931,1932, 0, + 0, 0,1933, 0, 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, + 241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, + 180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, + 740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, + 553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, + 412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, + 411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, + 228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, + 624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, + 420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, + 154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, + 314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, + 260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, + 502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, + 771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, + 452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, + 707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, + 128, 210, 0, 0, 227, 0, 379, 0, 0, 150, 493, 525, 544, 551, 552, 556, + 783, 576, 604, 0, 661, 0, 703, 0, 0, 735, 743, 0, 0, 0, 793, 794, + 795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, + 270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, + 545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, + 620, 625, 625, 651, 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, + 869, 623, 0, 0, 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, + 227, 231, 240, 243, 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, + 341, 357, 360, 362, 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, + 477, 535, 485, 490, 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, + 565, 569, 574, 586, 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, + 705, 704, 702, 706, 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, + 790, 802, 825, 848, 847, 857, 55, 65, 66, 883, 892, 916, 822, 824, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,1586, 0,1605, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1602,1603, + 1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584, 0,1585,1587,1588,1589, + 1591, 0,1592, 0,1593,1594, 0,1595,1596, 0,1598,1599,1600,1601,1604,1582, + 1578,1590,1597, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1936, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,1937, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1938, 0, + 1939, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1940, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,1941,1942, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1943, + 1944, 0, 0, 0, 0, 0, 0,1945, 0,1946, 0, 0, 0, 0, 0, 0, + 0, 0,1947, 0, 0,1948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,1950, 0,1949,1951, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1953, + 1952, 0,1954, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1955,1956, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1957, 0, 0, 0, + 0, 0, 0, 0, 0,1958,1961,1959,1965,1960,1962,1964,1963, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1967,1966,1968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 939, 940, 941, 942, 946, 948, 0, 962, 969, 970, 971, 976,1001,1002,1003,1008, - 0,1033,1040,1041,1042,1043,1047, 0, 0,1080,1081,1082,1086,1110, 0, 0, - 1124,1125,1126,1127,1131,1133, 0,1147,1154,1155,1156,1161,1187,1188,1189,1193, - 0,1219,1226,1227,1228,1229,1233, 0, 0,1267,1268,1269,1273,1298, 0,1303, - 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149, - 0, 0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175, - 991,1176, 993,1178, 994,1179, 0, 0,1004,1190,1005,1191,1006,1192,1014,1199, - 1007, 0, 0, 0,1016,1201,1020,1206, 0,1022,1208,1025,1211,1023,1209, 0, - 0, 0, 0,1032,1218,1037,1223,1035,1221, 0, 0, 0,1044,1230,1045,1231, - 1049,1235, 0, 0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258, - 1069,1255,1077,1264,1074,1261, 0, 0,1083,1270,1084,1271,1085,1272,1088,1275, - 1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310, 0, - 1053,1239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1093, - 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 949,1134,1010, - 1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366, 0,1320,1347, - 1418,1419,1323,1350, 0, 0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424, - 1202, 0, 0, 0, 987,1172, 0, 0,1031,1217,1321,1348,1322,1349,1338,1365, - 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238, - 1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263, 0, 0, 997,1182, - 0, 0, 0, 0, 0, 0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232, - 1422,1423,1113,1301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 9, 0, 10,1425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0,1314,1427, 5,1434,1438,1443, 0,1450, 0,1455,1461, - 1514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1446,1458,1468,1476,1480,1486, - 1517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1489,1503,1494,1500,1508, 0, - 0, 0, 0,1520,1521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1526,1528, 0,1525, 0, 0, 0,1522, 0, 0, 0, 0,1536,1532,1539, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1534, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1556, 0, 0, 0, 0, 0, 0, - 1548,1550, 0,1547, 0, 0, 0,1567, 0, 0, 0, 0,1558,1554,1561, 0, - 0, 0, 0, 0, 0, 0,1568,1569, 0, 0, 0, 0, 0, 0, 0, 0, - 0,1529,1551, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1523,1545,1524,1546, 0, 0,1527,1549, 0, 0,1570,1571,1530,1552,1531,1553, - 0, 0,1533,1555,1535,1557,1537,1559, 0, 0,1572,1573,1544,1566,1538,1560, - 1540,1562,1541,1563,1542,1564, 0, 0,1543,1565, 0, 0, 0, 0, 0, 0, - 0, 0,1606,1607,1609,1608,1610, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1613, 0,1611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1620, 0, 0, 0, 0, 0, 0, - 0,1623, 0, 0,1624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1614,1615,1616,1617,1618,1619,1621,1622, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1628,1629, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1625,1626, 0,1627, - 0, 0, 0,1634, 0, 0,1635, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1630,1631,1632, 0, 0,1633, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1639, 0, 0,1638,1640, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1636,1637, 0, 0, - 0, 0, 0, 0,1641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1642,1644,1643, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1645, 0, 0, 0, 0, 0, 0, 0, - 1646, 0, 0, 0, 0, 0, 0,1648,1649, 0,1647,1650, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1651,1653,1652, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1654, 0,1655,1657,1656, 0, - 0, 0, 0,1659, 0, 0, 0, 0, 0, 0, 0, 0, 0,1660, 0, 0, - 0, 0,1661, 0, 0, 0, 0,1662, 0, 0, 0, 0,1663, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1658, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1664, 0,1665,1673, 0,1674, 0, 0, 0, 0, 0, 0, 0, - 0,1666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,1668, 0, 0, 0, 0, 0, 0, 0, 0, 0,1669, 0, 0, - 0, 0,1670, 0, 0, 0, 0,1671, 0, 0, 0, 0,1672, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1667, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1675, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0,1676, 0,1677, 0,1678, 0,1679, 0,1680, 0, - 0, 0,1681, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1682, 0,1683, 0, 0, - 1684,1685, 0,1686, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153, - 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171, - 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356, - 1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214, - 1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363, - 1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251, - 1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266, - 1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287, - 1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302, - 1119,1308,1122,1311,1123,1312,1186,1260,1293,1305, 0,1394, 0, 0, 0, 0, - 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375, - 1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353, - 1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234, - 1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403, - 1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412, - 1409,1414,1109,1297,1117,1306,1116,1304,1112,1300, 0, 0, 0, 0, 0, 0, - 1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721, - 1477,1478,1729,1731,1730,1732, 0, 0,1435,1436,1733,1735,1734,1736, 0, 0, - 1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757, - 1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776, - 1495,1496,1777,1779,1778,1780, 0, 0,1451,1452,1781,1783,1782,1784, 0, 0, - 1504,1505,1785,1788,1786,1789,1787,1790, 0,1459, 0,1791, 0,1792, 0,1793, - 1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814, - 1467, 21,1475, 22,1479, 23,1485, 24,1493, 27,1499, 28,1507, 29, 0, 0, - 1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728, - 1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764, - 1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821, - 1470,1469,1822,1474,1465, 0,1473,1825,1429,1428,1426, 12,1432, 0, 26, 0, - 0,1315,1823,1484,1466, 0,1483,1829,1433, 13,1437, 14,1441,1826,1827,1828, - 1488,1487,1513, 19, 0, 0,1492,1515,1445,1444,1442, 15, 0,1831,1832,1833, - 1502,1501,1516, 25,1497,1498,1506,1518,1457,1456,1454, 17,1453,1313, 11, 3, - 0, 0,1824,1512,1519, 0,1511,1830,1449, 16,1460, 18,1464, 4, 0, 0, - 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 2, 6, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1834,1835, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1836, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1837,1839,1838, - 0, 0, 0, 0,1840, 0, 0, 0, 0,1841, 0, 0,1842, 0, 0, 0, - 0, 0, 0, 0,1843, 0,1844, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0,1845, 0, 0,1846, 0, 0,1847, 0,1848, 0, 0, 0, 0, 0, 0, - 937, 0,1850, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1849, 936, 938, - 1851,1852, 0, 0,1853,1854, 0, 0,1855,1856, 0, 0, 0, 0, 0, 0, - 1857,1858, 0, 0,1861,1862, 0, 0,1863,1864, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1867,1868,1869,1870, - 1859,1860,1865,1866, 0, 0, 0, 0, 0, 0,1871,1872,1873,1874, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 33, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1875, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1877, 0,1878, 0, - 1879, 0,1880, 0,1881, 0,1882, 0,1883, 0,1884, 0,1885, 0,1886, 0, - 1887, 0,1888, 0, 0,1889, 0,1890, 0,1891, 0, 0, 0, 0, 0, 0, - 1892,1893, 0,1894,1895, 0,1896,1897, 0,1898,1899, 0,1900,1901, 0, 0, - 0, 0, 0, 0,1876, 0, 0, 0, 0, 0, 0, 0, 0, 0,1902, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1904, 0,1905, 0, - 1906, 0,1907, 0,1908, 0,1909, 0,1910, 0,1911, 0,1912, 0,1913, 0, - 1914, 0,1915, 0, 0,1916, 0,1917, 0,1918, 0, 0, 0, 0, 0, 0, - 1919,1920, 0,1921,1922, 0,1923,1924, 0,1925,1926, 0,1927,1928, 0, 0, - 0, 0, 0, 0,1903, 0, 0,1929,1930,1931,1932, 0, 0, 0,1933, 0, - 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601, - 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662, - 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168, - 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758, - 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585, - 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259, - 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697, - 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170, - 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330, - 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473, - 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603, - 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411, - 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583, - 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269, - 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510, - 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156, - 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210, 0, 0, - 227, 0, 379, 0, 0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604, 0, - 661, 0, 703, 0, 0, 735, 743, 0, 0, 0, 793, 794, 795, 808, 741, 773, - 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329, - 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548, - 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651, - 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623, 0, 0, - 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243, - 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362, - 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490, - 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586, - 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706, - 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848, - 847, 857, 55, 65, 66, 883, 892, 916, 822, 824, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1586, 0,1605, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1602,1603,1934,1935,1574,1575, - 1576,1577,1579,1580,1581,1583,1584, 0,1585,1587,1588,1589,1591, 0,1592, 0, - 1593,1594, 0,1595,1596, 0,1598,1599,1600,1601,1604,1582,1578,1590,1597, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,1936, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0,1937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1938, 0,1939, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1940, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1941,1942, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1943,1944, 0, 0, 0, - 0, 0, 0,1945, 0,1946, 0, 0, 0, 0, 0, 0, 0, 0,1947, 0, - 0,1948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,1950, 0,1949,1951, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1953,1952, 0,1954, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1955,1956, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1957, 0, 0, 0, 0, 0, 0, 0, - 0,1958,1961,1959,1965,1960,1962,1964,1963, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,1967,1966,1968, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1969,1970, - 1971,1972,1973,1974,1975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1976,1977,1978,1980,1979, - 1981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125, 34, 830, 130, 131, - 132, 137, 827, 35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152, 37, - 157, 158, 159, 160, 38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179, - 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195, - 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216, - 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244, - 836, 837, 247, 248, 249, 246, 251, 39, 40, 253, 255, 255, 838, 257, 258, 259, - 261, 839, 262, 263, 301, 264, 41, 266, 270, 272, 271, 841, 274, 842, 277, 276, - 278, 281, 282, 42, 283, 284, 285, 286, 43, 843, 44, 289, 290, 291, 293, 934, - 298, 845, 845, 621, 300, 300, 45, 852, 894, 302, 304, 46, 306, 309, 310, 312, - 316, 48, 47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334, - 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361, - 358, 356, 49, 363, 365, 367, 364, 50, 369, 371, 851, 376, 386, 378, 53, 381, - 52, 51, 140, 141, 387, 382, 614, 78, 388, 389, 390, 394, 392, 856, 54, 399, - 396, 402, 404, 858, 405, 401, 407, 55, 408, 409, 410, 413, 859, 415, 56, 417, - 860, 418, 57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433, - 437, 441, 438, 439, 442, 443, 864, 436, 449, 450, 58, 454, 453, 865, 447, 460, - 866, 867, 461, 466, 465, 464, 59, 467, 470, 469, 472, 828, 475, 868, 478, 870, - 483, 485, 486, 871, 488, 489, 872, 873, 495, 497, 60, 498, 61, 61, 504, 505, - 507, 508, 511, 62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878, 63, 64, - 528, 880, 879, 881, 882, 530, 531, 531, 533, 66, 534, 67, 68, 884, 536, 538, - 541, 69, 885, 549, 886, 887, 556, 559, 70, 561, 562, 563, 888, 889, 889, 567, - 71, 890, 570, 571, 72, 891, 577, 73, 581, 579, 582, 893, 587, 74, 590, 592, - 596, 75, 895, 896, 76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611, - 853, 77, 615, 616, 79, 617, 252, 902, 903, 854, 855, 621, 622, 731, 80, 627, - 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651, - 638, 643, 644, 645, 905, 907, 906, 81, 653, 654, 656, 911, 657, 908, 82, 83, - 909, 910, 84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675, 85, - 677, 678, 86, 681, 682, 912, 685, 686, 87, 689, 36, 913, 914, 88, 89, 696, - 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728, - 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762, 90, - 764, 922, 91, 775, 279, 780, 923, 925, 92, 93, 785, 926, 94, 927, 787, 787, - 789, 928, 792, 95, 796, 797, 798, 800, 96, 929, 802, 804, 806, 97, 98, 807, - 930, 99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935, 0, 0, + 0, 0,1969,1970,1971,1972,1973,1974,1975, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1976, + 1977,1978,1980,1979,1981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125, + 34, 830, 130, 131, 132, 137, 827, 35, 133, 139, 829, 142, 143, 112, 144, 145, + 924, 151, 152, 37, 157, 158, 159, 160, 38, 165, 166, 169, 171, 172, 173, 174, + 176, 177, 178, 179, 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, + 196, 192, 194, 195, 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, + 213, 219, 214, 216, 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, + 237, 238, 239, 244, 836, 837, 247, 248, 249, 246, 251, 39, 40, 253, 255, 255, + 838, 257, 258, 259, 261, 839, 262, 263, 301, 264, 41, 266, 270, 272, 271, 841, + 274, 842, 277, 276, 278, 281, 282, 42, 283, 284, 285, 286, 43, 843, 44, 289, + 290, 291, 293, 934, 298, 845, 845, 621, 300, 300, 45, 852, 894, 302, 304, 46, + 306, 309, 310, 312, 316, 48, 47, 317, 846, 318, 323, 324, 325, 324, 328, 329, + 333, 331, 332, 334, 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, + 354, 359, 850, 361, 358, 356, 49, 363, 365, 367, 364, 50, 369, 371, 851, 376, + 386, 378, 53, 381, 52, 51, 140, 141, 387, 382, 614, 78, 388, 389, 390, 394, + 392, 856, 54, 399, 396, 402, 404, 858, 405, 401, 407, 55, 408, 409, 410, 413, + 859, 415, 56, 417, 860, 418, 57, 419, 422, 424, 425, 861, 840, 862, 426, 863, + 429, 431, 427, 433, 437, 441, 438, 439, 442, 443, 864, 436, 449, 450, 58, 454, + 453, 865, 447, 460, 866, 867, 461, 466, 465, 464, 59, 467, 470, 469, 472, 828, + 475, 868, 478, 870, 483, 485, 486, 871, 488, 489, 872, 873, 495, 497, 60, 498, + 61, 61, 504, 505, 507, 508, 511, 62, 513, 874, 515, 875, 518, 844, 520, 876, + 877, 878, 63, 64, 528, 880, 879, 881, 882, 530, 531, 531, 533, 66, 534, 67, + 68, 884, 536, 538, 541, 69, 885, 549, 886, 887, 556, 559, 70, 561, 562, 563, + 888, 889, 889, 567, 71, 890, 570, 571, 72, 891, 577, 73, 581, 579, 582, 893, + 587, 74, 590, 592, 596, 75, 895, 896, 76, 897, 600, 898, 602, 605, 607, 899, + 900, 609, 901, 611, 853, 77, 615, 616, 79, 617, 252, 902, 903, 854, 855, 621, + 622, 731, 80, 627, 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, + 635, 641, 646, 651, 638, 643, 644, 645, 905, 907, 906, 81, 653, 654, 656, 911, + 657, 908, 82, 83, 909, 910, 84, 664, 665, 666, 667, 669, 668, 671, 670, 674, + 672, 673, 675, 85, 677, 678, 86, 681, 682, 912, 685, 686, 87, 689, 36, 913, + 914, 88, 89, 696, 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, + 723, 832, 725, 728, 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, + 761, 921, 762, 90, 764, 922, 91, 775, 279, 780, 923, 925, 92, 93, 785, 926, + 94, 927, 787, 787, 789, 928, 792, 95, 796, 797, 798, 800, 96, 929, 802, 804, + 806, 97, 98, 807, 930, 99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, + 821, 935, 0, 0, }; -static const int16_t _hb_ucd_i16[92]= +static const int32_t _hb_ucd_palette[39]= { - 0, 0, 1, -1, -1, 1, 0, 1, -1, 0, 0, 2, 0, -2, 2, 0, - -2, 0, -7, 0, 0, 16, 0, -16, 3, 3, 3, -3, -3, -3, 0, 2016, - 0, 2527, 1923, 1914, 1918, 0, 2250, 0, 0, 138, 0, 7, 1824, 0, 2104, 0, - 2108, 2106, 0, 2106, 1316, 0, -1, -138, 8, 8, 8, 0, 7, 7, -8, -8, - -8, -7,-1316, 1, -1, 3, -3, 1, 0,-1914,-1918, 0, 0,-1923,-1824, 0, - 0,-2016,-2104, 0, 0,-2106,-2108,-2106,-2250, 0,-2527, 0, + -112883, -2527, -2250, -2108, -2106, -2104, -2016, -1923, + -1918, -1914, -1824, -1316, -138, -16, -8, -7, + -3, -2, -1, 0, 1, 2, 3, 7, + 8, 16, 138, 1316, 1824, 1914, 1918, 1923, + 2016, 2104, 2106, 2108, 2250, 2527, 112883, }; static inline uint8_t _hb_ucd_gc (unsigned u) { /* packtab: [2^8,2^4,2^3,2^3,2^1] */ - return u<1114112u ? (uint8_t)(_hb_ucd_u8[5288u+((_hb_ucd_u8[1160u+_hb_ucd_u16[((_hb_ucd_u8[544u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>3))>>4)])<<4)+((((((((u)>>1))>>3))>>3))&15)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; + return u<1114112u ? (uint8_t)(_hb_ucd_u8[5368u+((_hb_ucd_u8[1160u+_hb_ucd_u16[((_hb_ucd_u8[544u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>3))>>4)])<<4)+((((((((u)>>1))>>3))>>3))&15)])<<3)+((((((u)>>1))>>3))&7)]+((((u)>>1))&7)])<<1)+((u)&1)]) : 2; } static inline uint8_t _hb_ucd_ccc (unsigned u) { /* packtab: [2^8,2^3,2^2,2^2,2^2] */ - return u<125259u ? (uint8_t)(_hb_ucd_u8[7307u+((_hb_ucd_u8[6724u+((_hb_ucd_u8[6247u+((_hb_ucd_u8[5881u+((_hb_ucd_u8[5636u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0; + return u<125259u ? (uint8_t)(_hb_ucd_u8[7417u+((_hb_ucd_u8[6818u+((_hb_ucd_u8[6333u+((_hb_ucd_u8[5967u+((_hb_ucd_u8[5722u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 0; } static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i) { return (a[i>>1]>>((i&1)<<2))&15; } -static inline int16_t _hb_ucd_bmg (unsigned u) +static inline int32_t _hb_ucd_bmg (unsigned u) { - /* packtab: [2^4,2^3,2^3,2^2,2^1] */ - return u<65380u ? (int16_t)(_hb_ucd_i16[_hb_ucd_u8[8198u+_hb_ucd_u8[7969u+_hb_ucd_u8[7875u+((_hb_ucd_b4(_hb_ucd_u8+7811u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)]+((((((u)>>1))>>2))&7)]+((((u)>>1))&3)]+((u)&1)]) : 0; + /* packtab: [2^4,2^3,2^3,2^2,2^2] palette[39] */ + return u<121617u ? (int32_t)(_hb_ucd_palette[_hb_ucd_u8[8488u+_hb_ucd_u8[8248u+_hb_ucd_u8[8084u+_hb_ucd_u8[7997u+((_hb_ucd_b4(_hb_ucd_u8+7937u,((((((((u)>>2))>>2))>>3))>>3)))<<3)+((((((((u)>>2))>>2))>>3))&7)]+((((((u)>>2))>>2))&7)]+((((u)>>2))&3)]+((u)&3)]]) : 0; } static inline uint8_t _hb_ucd_sc (unsigned u) { - /* packtab: [2^4,2^4,2^3,2^3,2^2,2^2] */ - return u<918016u ? (uint8_t)(_hb_ucd_u8[11623u+((_hb_ucd_u8[10615u+((_hb_ucd_u8[9119u+((_hb_ucd_u8[8675u+((_hb_ucd_u8[8475u+((_hb_ucd_b4(_hb_ucd_u8+8446u,((((((((((u)>>2))>>2))>>3))>>3))>>4)))<<4)+((((((((((u)>>2))>>2))>>3))>>3))&15)])<<3)+((((((((u)>>2))>>2))>>3))&7)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)]) : 2; + /* packtab: [2^8,2^4,2^2,2^3,2^2] */ + return u<918016u ? (uint8_t)(_hb_ucd_u8[12153u+((_hb_ucd_u8[9817u+_hb_ucd_u16[1712u+((_hb_ucd_u8[9137u+((_hb_ucd_u8[8688u+((((((((u)>>2))>>3))>>2))>>4)])<<4)+((((((((u)>>2))>>3))>>2))&15)])<<2)+((((((u)>>2))>>3))&3)]+((((u)>>2))&7)])<<2)+((u)&3)]) : 2; } static inline uint16_t _hb_ucd_dm (unsigned u) { /* packtab: [2^8,2^5,2^4] */ - return u<195102u ? (uint16_t)(_hb_ucd_u16[1680u+((_hb_ucd_u8[13009u+((_hb_ucd_u8[12627u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; + return u<195102u ? (uint16_t)(_hb_ucd_u16[2484u+((_hb_ucd_u8[13559u+((_hb_ucd_u8[13177u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)]) : 0; } diff --git a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh index 7200952547a1..7027c3cbbe22 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh @@ -7,13 +7,13 @@ * on file with this header: * * # emoji-data.txt - * # Date: 2025-07-25, 17:54:31 GMT - * # © 2025 Unicode®, Inc. + * # Date: 2026-01-30, 22:30:17 GMT + * # © 2026 Unicode®, Inc. * # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. * # For terms of use and license, see https://www.unicode.org/terms_of_use.html * # * # Emoji Data for UTS #51 - * # Version: 17.0 + * # Version: 18.0.0 * # * # For documentation and usage, see https://www.unicode.org/reports/tr51 */ @@ -55,14 +55,14 @@ static const uint8_t _hb_emoji_u8[624]= 0, 0, 0, 0, 0, 0, 1, 32, 0, 0,128, 2, 0, 0, 0, 0, 16, 0, 0, 0, 0,240, 0, 0, 0, 0,240,255, 0,128, 1, 0, 1,128, 1, 0, 0, 0,192,255, 0, 0, 0, 0, 0, 0, 3,192, - 0, 64,254, 7, 0,192,255,255,255,255,255,255, 63, 0, 0, 0, + 0, 64,254, 7, 0,128,255,255,255,255,255,255, 63, 0, 0, 0, 254,255, 0, 4, 0,128,252,247, 0,254,255,255,192,255,255,255, 255,255,255,255,243,255,255,255,255,255,207,206,255,255,255,255, 255,255,255,255,255,255,185, 7,255,255,255,255,255,255,255,191, 255,255,255,255,255,255,255, 63, 0,126,255,255,255,128,249, 7, 128, 60, 97, 0, 48, 1, 6, 16, 28, 0, 14,112, 10,129, 8,252, 255,255, 0, 0, 0, 0, 0, 0, 63,248,231,255, 63,250,249,255, - 0, 0, 0,252,255,255,255,255, 0,240, 0, 0, 0, 0, 0, 0, + 0, 0, 0,240,255,255, 1, 0, 0,240, 0, 0, 0, 0, 0, 0, 0,255, 0,252, 0, 0, 0, 0, 0,255, 0, 0, 0,192, 0,240, 252,255, 0,254,255,255,255,255, 0,240,255,255,255,255,255,247, 191,255,255,255,255,255,255,255, 0, 0, 0,255, 0,192,255,255, diff --git a/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh index 9e6f89365fef..660507f18a9e 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh @@ -176,7 +176,7 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE case 0x03: return unlikely (ch == 0x034Fu); case 0x06: return unlikely (ch == 0x061Cu); case 0x17: return hb_in_range (ch, 0x17B4u, 0x17B5u); - case 0x18: return hb_in_range (ch, 0x180Bu, 0x180Eu); + case 0x18: return hb_in_range (ch, 0x180Bu, 0x180Fu); case 0x20: return hb_in_ranges (ch, 0x200Bu, 0x200Fu, 0x202Au, 0x202Eu, 0x2060u, 0x206Fu); diff --git a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh index b0aa842bb232..e4e6a2931af2 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh @@ -139,18 +139,23 @@ struct hb_vector_t } HB_ALWAYS_INLINE_VECTOR_ALLOCS void extend (array_t o, bool exact=false) - { - alloc (length + o.length, exact); - if (unlikely (in_error ())) return; - copy_array (o); - } + { extend (c_array_t (o), exact); } HB_ALWAYS_INLINE_VECTOR_ALLOCS void extend (c_array_t o, bool exact=false) { + /* o may point into our own storage, eg. v.extend (v.as_array ()). + * alloc() may move that storage, so find o again afterwards. */ + bool aliased = o.length && in_storage (*o.arrayZ); + unsigned offset = aliased ? o.arrayZ - arrayZ : 0; alloc (length + o.length, exact); if (unlikely (in_error ())) return; + if (unlikely (aliased)) + o = {arrayZ + offset, o.length}; copy_array (o); } + HB_ALWAYS_INLINE_VECTOR_ALLOCS + void extend (const hb_vector_t &o, bool exact=false) + { extend (o.as_array (), exact); } public: int allocated = 0; /* < 0 means allocation failed. */ @@ -231,6 +236,8 @@ struct hb_vector_t hb_vector_t& operator = (const hb_vector_t &o) { + if (this == &o) return *this; + reset (); alloc_exact (o.length); if (unlikely (in_error ())) return *this; @@ -272,7 +279,7 @@ struct hb_vector_t const Type& tail () const { return (*this)[length - 1]; } explicit operator bool () const { return length; } - size_t get_size () const { return length * item_size; } + size_t get_size () const { return hb_unsigned_mul_saturate (length, item_size); } /* Sink interface. */ template @@ -316,11 +323,26 @@ struct hb_vector_t HB_ALWAYS_INLINE_VECTOR_ALLOCS Type *push (Args&&... args) { - if (unlikely ((int) length >= allocated && !alloc (length + 1))) - // If push failed to allocate then don't copy v, since this may cause - // the created copy to leak memory since we won't have stored a - // reference to it. - return std::addressof (Crap (Type)); + if (unlikely ((int) length >= allocated)) + { + if (unlikely (in_error ())) + return std::addressof (Crap (Type)); + + /* An argument may live in our own storage, eg. v.push (v[i]). + * alloc() frees that storage, so copy it out first. */ + if (unlikely (in_storage (args...))) + { + Type copy (std::forward (args)...); + if (unlikely (!alloc (length + 1))) + return std::addressof (Crap (Type)); + return push_has_room (std::move (copy)); + } + if (unlikely (!alloc (length + 1))) + // If push failed to allocate then don't copy v, since this may cause + // the created copy to leak memory since we won't have stored a + // reference to it. + return std::addressof (Crap (Type)); + } return push_has_room (std::forward (args)...); } @@ -339,6 +361,16 @@ struct hb_vector_t return new (p) Type (std::forward (args)...); } + bool in_storage () const { return false; } + template + bool in_storage (const T &v, const Ts &...vs) const + { + uintptr_t p = (uintptr_t) std::addressof (v); + return (arrayZ && + (uintptr_t) arrayZ <= p && p < (uintptr_t) (arrayZ + length)) || + in_storage (vs...); + } + bool is_owned () const { return allocated != 0 && allocated != -1; @@ -635,7 +667,9 @@ struct hb_vector_t HB_ALWAYS_INLINE_VECTOR_ALLOCS bool resize_full (int size_, bool initialize, bool exact) { - unsigned int size = size_ < 0 ? 0u : (unsigned int) size_; + if (unlikely (size_ < 0)) + return false; + unsigned int size = (unsigned int) size_; if (!alloc (size, exact)) return false; diff --git a/src/java.desktop/share/native/libharfbuzz/hb-version.h b/src/java.desktop/share/native/libharfbuzz/hb-version.h index 7ab4a82fd85a..9bb79e82a4e5 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb-version.h +++ b/src/java.desktop/share/native/libharfbuzz/hb-version.h @@ -41,13 +41,13 @@ HB_BEGIN_DECLS * * The major component of the library version available at compile-time. */ -#define HB_VERSION_MAJOR 14 +#define HB_VERSION_MAJOR 15 /** * HB_VERSION_MINOR: * * The minor component of the library version available at compile-time. */ -#define HB_VERSION_MINOR 2 +#define HB_VERSION_MINOR 0 /** * HB_VERSION_MICRO: * @@ -60,7 +60,7 @@ HB_BEGIN_DECLS * * A string literal containing the library version available at compile-time. */ -#define HB_VERSION_STRING "14.2.0" +#define HB_VERSION_STRING "15.0.0" /** * HB_VERSION_ATLEAST: diff --git a/src/java.desktop/share/native/libharfbuzz/hb.hh b/src/java.desktop/share/native/libharfbuzz/hb.hh index 25565c0caa1c..969a3b836ef3 100644 --- a/src/java.desktop/share/native/libharfbuzz/hb.hh +++ b/src/java.desktop/share/native/libharfbuzz/hb.hh @@ -151,6 +151,7 @@ #pragma GCC diagnostic ignored "-Wrange-loop-analysis" // https://github.com/harfbuzz/harfbuzz/issues/2834 #pragma GCC diagnostic ignored "-Wstrict-aliasing" #pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wunused-template" #pragma GCC diagnostic ignored "-Wc++11-compat" // only gcc raises it #endif @@ -159,7 +160,6 @@ #include "hb-config.hh" -#include "hb-limits.hh" /* @@ -203,6 +203,7 @@ #define HB_OT_H_IN #include "hb-aat.h" #define HB_AAT_H_IN +#define HB_SUBSET_H_IN #include #include @@ -279,7 +280,7 @@ #if defined(__GNUC__) && (__GNUC__ >= 4) || (__clang__) #define HB_UNUSED __attribute__((unused)) #elif defined(_MSC_VER) /* https://github.com/harfbuzz/harfbuzz/issues/635 */ -#define HB_UNUSED __pragma(warning(suppress: 4100 4101)) +#define HB_UNUSED __pragma(warning(suppress: 4100 4101 4189)) #else #define HB_UNUSED #endif @@ -327,6 +328,14 @@ #endif #endif +#ifndef HB_NEVER_INLINE +#if defined(_MSC_VER) +#define HB_NEVER_INLINE __declspec(noinline) +#else +#define HB_NEVER_INLINE __attribute__((noinline)) +#endif +#endif + #ifndef HB_HOT #define HB_HOT __attribute__((hot)) #endif @@ -375,16 +384,13 @@ # define HB_NODISCARD #endif -/* https://github.com/harfbuzz/harfbuzz/issues/1852 */ -#if defined(__clang__) && !(defined(_AIX) && (defined(__IBMCPP__) || defined(__ibmxl__))) -/* Disable certain sanitizer errors. */ -/* https://github.com/harfbuzz/harfbuzz/issues/1247 */ -#define HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW __attribute__((no_sanitize("signed-integer-overflow"))) +/* Like HB_NODISCARD but can be used on structs */ +#if __cplusplus >= 201703L +# define HB_NODISCARD_STRUCT [[nodiscard]] #else -#define HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW +# define HB_NODISCARD_STRUCT #endif - #ifdef _WIN32 /* We need Windows Vista for both Uniscribe backend and for * MemoryBarrier. We don't support compiling on Windows XP, @@ -557,6 +563,7 @@ extern "C" void hb_free_impl(void *ptr); /* Headers we include for everyone. Keep topologically sorted by dependency. * They express dependency amongst themselves, but no other file should include * them directly.*/ +#include "hb-limits.hh" #include "hb-cplusplus.hh" #include "hb-meta.hh" #include "hb-mutex.hh" From 8844eb7f6d1bddea038df82791304ddd191ea2ab Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Thu, 5 Nov 2026 06:24:31 +0000 Subject: [PATCH 006/110] 8386573: Test "java/awt/PrintJob/PrintProgressBarTest.java" failed after clicking the Print button, and the test terminated with RuntimeException: Test FAILED: ClassCastException Reviewed-by: prr, jdv --- .../com/apple/laf/AquaProgressBarUI.java | 76 ++++++++++++++----- .../swing/plaf/basic/BasicProgressBarUI.java | 3 +- .../plaf/windows/WindowsProgressBarUI.java | 29 ++++--- .../awt/PrintJob/PrintProgressBarTest.java | 57 ++++++++++---- 4 files changed, 116 insertions(+), 49 deletions(-) diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java index 58aee090712e..d22d0e072b7e 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java @@ -26,6 +26,7 @@ package com.apple.laf; import java.awt.*; +import java.awt.image.BufferedImage; import java.awt.event.*; import java.awt.geom.AffineTransform; import java.beans.*; @@ -187,24 +188,66 @@ static double checkValue(final double value) { } protected void paint(final Graphics g) { - // this is questionable. We may want the insets to mean something different. final Insets i = progressBar.getInsets(); - final int width = progressBar.getWidth() - (i.right + i.left); - final int height = progressBar.getHeight() - (i.bottom + i.top); + final int componentWidth = progressBar.getWidth(); + final int componentHeight = progressBar.getHeight(); + final int width = componentWidth - (i.right + i.left); + final int height = componentHeight - (i.bottom + i.top); + + Graphics2D g2; + BufferedImage image = null; + + if (g instanceof Graphics2D) { + g2 = (Graphics2D) g; + } else { + image = new BufferedImage(componentWidth, componentHeight, + BufferedImage.TYPE_INT_RGB); + g2 = image.createGraphics(); + g2.setColor(progressBar.getBackground()); + g2.fillRect(0, 0, componentWidth, componentHeight); + } - Graphics2D g2 = (Graphics2D) g; final AffineTransform savedAT = g2.getTransform(); if (!progressBar.getComponentOrientation().isLeftToRight()) { //Scale operation: Flips component about pivot //Translate operation: Moves component back into original position g2.scale(-1, 1); - g2.translate(-progressBar.getWidth(), 0); + g2.translate(-componentWidth, 0); } - painter.paint(g, progressBar, i.left, i.top, width, height); - + painter.paint(g2, progressBar, i.left, i.top, width, height); g2.setTransform(savedAT); - if (progressBar.isStringPainted() && !progressBar.isIndeterminate()) { - paintString(g, i.left, i.top, width, height); + + if (image != null) { + if (!isHorizontal()) { + final boolean paintText = progressBar.isStringPainted() + && !progressBar.isIndeterminate(); + final Graphics2D printerGraphics = SwingUtilities2.getGraphics2D(g); + if (paintText && printerGraphics == null) { + paintString(g2, i.left, i.top, width, height); + } + g2.dispose(); + g.drawImage(image, 0, 0, null); + if (paintText && printerGraphics != null) { + final Graphics2D textGraphics = (Graphics2D) printerGraphics.create(); + try { + paintString(textGraphics, i.left, i.top, width, height); + } finally{ + textGraphics.dispose(); + } + } + } else { + g.drawImage(image, 0, 0, null); + g2.dispose(); + if (progressBar.isStringPainted() && !progressBar.isIndeterminate()) { + paintString(g, i.left, i.top, width, height); + } + } + } else if (progressBar.isStringPainted() && !progressBar.isIndeterminate()) { + BufferedImage stringImage = new BufferedImage(componentWidth, componentHeight, BufferedImage.TYPE_INT_ARGB); + Graphics2D stringGraphics = stringImage.createGraphics(); + paintString(stringGraphics, i.left, i.top, width, height); + stringGraphics.dispose(); + g.drawImage(stringImage, 0, 0, null); } } @@ -215,18 +258,17 @@ protected State getState(final JComponent c) { } protected void paintString(final Graphics g, final int x, final int y, final int width, final int height) { - if (!(g instanceof Graphics2D)) return; - final Graphics2D g2 = (Graphics2D)g; final String progressString = progressBar.getString(); - g2.setFont(progressBar.getFont()); - final Point renderLocation = getStringPlacement(g2, progressString, x, y, width, height); - final Rectangle oldClip = g2.getClipBounds(); + g.setFont(progressBar.getFont()); + final Point renderLocation = getStringPlacement(g, progressString, x, y, width, height); + final Rectangle oldClip = g.getClipBounds(); if (isHorizontal()) { - g2.setColor(selectionForeground); - SwingUtilities2.drawString(progressBar, g2, progressString, renderLocation.x, renderLocation.y); + g.setColor(selectionForeground); + SwingUtilities2.drawString(progressBar, g, progressString, renderLocation.x, renderLocation.y); } else { // VERTICAL + Graphics2D g2 = (Graphics2D) g; // We rotate it -90 degrees, then translate it down since we are going to be bottom up. final AffineTransform savedAT = g2.getTransform(); g2.transform(AffineTransform.getRotateInstance(0.0f - (Math.PI / 2.0f), 0, 0)); @@ -240,7 +282,7 @@ protected void paintString(final Graphics g, final int x, final int y, final int g2.setTransform(savedAT); } - g2.setClip(oldClip); + g.setClip(oldClip); } /** diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java index 6f58fd9cdb61..47dbca4b29d9 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java @@ -773,7 +773,8 @@ protected void paintDeterminate(Graphics g, JComponent c) { } else { g.drawRect(b.left, b.top, barRectWidth, barRectHeight); if (cellSpacing == 0 && amountFull > 0) { - g.fillRect(barRectWidth + b.left, b.top, amountFull, barRectHeight); + g.fillRect(b.left + barRectWidth - amountFull, + b.top, amountFull, barRectHeight); } else { for (int i = 0; i < barRectWidth; i += cellLength + cellSpacing) { g.fillRect( barRectWidth + b.left + i, b.top, diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java index 873dae49edbd..b57515e4377e 100644 --- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java +++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java @@ -183,30 +183,29 @@ protected void paintDeterminate(Graphics g, JComponent c) { } } else { if (g instanceof Graphics2D) { - g2d.drawLine(2 + barRectWidth, - barRectHeight / 2 + 1, - 2 + barRectWidth - (amountFull - 2), - barRectHeight / 2 + 1); + g2d.drawLine(progressBar.getWidth(), + progressBar.getHeight() / 2, + progressBar.getWidth() - amountFull, + progressBar.getHeight() / 2); } else { - g.drawRect(2 + barRectWidth, barRectHeight + 1, - barRectWidth, barRectHeight + 1); - g.fillRect(2 + barRectWidth, barRectHeight + 1, - amountFull, barRectHeight + 1); + g.drawRect(0, 0, barRectWidth, barRectHeight); + g.fillRect(barRectWidth - amountFull, 0, amountFull, barRectHeight); } } paintString(g, 0, 0, (int)(barRectWidth / scaleX), (int)(barRectHeight / scaleY), amountFull, null); } else { if (g instanceof Graphics2D) { - g2d.drawLine(barRectWidth / 2 + 1, barRectHeight + 1, - barRectWidth / 2 + 1, barRectHeight + 1 - amountFull + 2); + int drawWidth = progressBar.getWidth(); + int drawHeight = progressBar.getHeight(); + g2d.drawLine(drawWidth / 2, drawHeight - 1, + drawWidth / 2, drawHeight - amountFull); + paintString(g, 0, 0, drawWidth, drawHeight, amountFull, null); } else { - g.drawRect(barRectWidth + 1, barRectHeight + 1, - barRectWidth + 1, barRectHeight + 1); - g.fillRect(barRectWidth + 1, barRectHeight + 1, - barRectWidth + 1, amountFull); + g.drawRect(0, 0, barRectWidth, barRectHeight); + g.fillRect(0, barRectHeight - amountFull, barRectWidth, amountFull); + paintString(g, 2, 2, barRectWidth, barRectHeight, amountFull, null); } - paintString(g, 2, 2, barRectWidth, barRectHeight, amountFull, null); } } else { diff --git a/test/jdk/java/awt/PrintJob/PrintProgressBarTest.java b/test/jdk/java/awt/PrintJob/PrintProgressBarTest.java index 3ddcb539bcbf..dc900e86fd9b 100644 --- a/test/jdk/java/awt/PrintJob/PrintProgressBarTest.java +++ b/test/jdk/java/awt/PrintJob/PrintProgressBarTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 6328248 + * @bug 6328248 8386573 * @summary JProgessBar should be printed on paper with PrintJob * @key printer * @library /java/awt/regtesthelpers @@ -31,30 +31,34 @@ * @run main/manual PrintProgressBarTest */ +import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JProgressBar; -import javax.swing.SwingConstants; import java.awt.Graphics; import java.awt.BorderLayout; -import java.awt.FlowLayout; +import java.awt.ComponentOrientation; +import java.awt.GridLayout; import java.awt.PrintJob; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Properties; public class PrintProgressBarTest { + private static final String INSTRUCTIONS = """ - This test shows a frame with a progressbar and a "Print" button. + This test shows a frame with 2 horizontal progressbars + with LTR and RTL orientation respectively and 1 vertical progressbar + and a "Print" button. 1. Click the 'Print' button on the frame 2. Select a printer/pdf-printer in the print dialog and proceed - If the progressbar is printed along with progress string + If the progressbars are printed along with progress string test PASSED else FAILED. """; + public static void main(String[] args) throws Exception { PassFailJFrame.builder() .instructions(INSTRUCTIONS) @@ -65,15 +69,35 @@ public static void main(String[] args) throws Exception { } private static JFrame createTestUI() { - JPanel panel = new JPanel(new FlowLayout()); - JProgressBar bar = new JProgressBar(); - bar.setOpaque(true); - bar.setStringPainted(true); - bar.setValue(50); - panel.add("Center", bar); + JPanel mainPanel = new JPanel(new GridLayout(1, 2, 10, 10)); + JPanel leftPanel = new JPanel(new GridLayout(2, 1, 10, 10)); + JProgressBar ltrBar = new JProgressBar(JProgressBar.HORIZONTAL); + ltrBar.setOpaque(true); + ltrBar.setStringPainted(true); + ltrBar.setValue(50); + ltrBar.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT); + + JProgressBar rtlBar = new JProgressBar(JProgressBar.HORIZONTAL); + rtlBar.setOpaque(true); + rtlBar.setStringPainted(true); + rtlBar.setValue(50); + rtlBar.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); + + leftPanel.add(ltrBar); + leftPanel.add(rtlBar); + + JProgressBar vertBar = new JProgressBar(JProgressBar.VERTICAL); + vertBar.setOpaque(true); + vertBar.setStringPainted(true); + vertBar.setValue(50); + mainPanel.add(leftPanel); + mainPanel.add(vertBar); JFrame frame = new JFrame("Print Progressbar"); - frame.setContentPane(panel); + frame.setSize(450, 300); + frame.setLayout(new BorderLayout(10, 10)); + frame.add(mainPanel, BorderLayout.CENTER); + JButton b = new JButton("Print"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ev) { @@ -82,7 +106,8 @@ public void actionPerformed(ActionEvent ev) { if (pj != null) { try { Graphics g = pj.getGraphics(); - panel.printAll(g); + g.translate(20, 20); + mainPanel.printAll(g); g.dispose(); pj.end(); } catch (ClassCastException cce) { @@ -94,8 +119,8 @@ public void actionPerformed(ActionEvent ev) { } }); - frame.setSize(200, 150); - frame.add(b); + frame.add(b, BorderLayout.SOUTH); + ((JPanel)frame.getContentPane()).setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); return frame; } From de392f132a716eaa251b186b51d171dacec98925 Mon Sep 17 00:00:00 2001 From: Yasumasa Suenaga Date: Thu, 5 Nov 2026 08:08:57 +0000 Subject: [PATCH 007/110] 8395705: Remove support for GXL heap dumps Reviewed-by: kevinw, cjplummer --- .../classes/sun/jvm/hotspot/tools/JMap.java | 31 +- .../jvm/hotspot/utilities/HeapGXLWriter.java | 419 ------------------ 2 files changed, 2 insertions(+), 448 deletions(-) delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java index 4c80ecd6c4ed..811a1226cffc 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,8 +60,6 @@ protected void printFlagsUsage() { System.out.println(" \tIf gz specified, the heap dump is written in gzipped format"); System.out.println(" \tusing the given compression level."); System.err.println(" \t1 (recommended) is the fastest, 9 the strongest compression."); - System.out.println(" -heap:format=x[,file=] \tTo dump java heap in GXL format."); - System.out.println(" \tPlease be aware that \"gz\" option is not valid for heap dump in GXL format."); System.out.println(" -histo\tTo print histogram of java object heap."); System.out.println(" -clstats\tTo print class loader statistics."); System.out.println(" -finalizerinfo\tTo print information on objects awaiting finalization."); @@ -73,7 +71,7 @@ protected void printFlagsUsage() { public static final int MODE_CLSTATS = 2; public static final int MODE_PMAP = 3; public static final int MODE_HEAP_GRAPH_HPROF_BIN = 4; - public static final int MODE_HEAP_GRAPH_GXL = 5; + public static final int MODE_HEAP_GRAPH_GXL = 5; // retired public static final int MODE_FINALIZERINFO = 6; private static String dumpfile = "heap.bin"; @@ -103,10 +101,6 @@ public void run() { writeHeapHprofBin(dumpfile, gzLevel); return; - case MODE_HEAP_GRAPH_GXL: - writeHeapGXL(dumpfile); - return; - case MODE_FINALIZERINFO: tool = new FinalizerInfo(); break; @@ -143,8 +137,6 @@ public static void main(String[] args) { if (keyValue[0].equals("format")) { if (keyValue[1].equals("b")) { mode = MODE_HEAP_GRAPH_HPROF_BIN; - } else if (keyValue[1].equals("x")) { - mode = MODE_HEAP_GRAPH_GXL; } else { System.err.println("unknown heap format:" + keyValue[0]); @@ -158,10 +150,6 @@ public static void main(String[] args) { } dumpfile = keyValue[1]; } else if (keyValue[0].equals("gz")) { - if (mode == MODE_HEAP_GRAPH_GXL) { - System.err.println("\"gz\" option is not compatible with heap dump in GXL format"); - System.exit(1); - } if (keyValue.length == 1) { System.err.println("Argument is expected for \"gz\""); System.exit(1); @@ -225,20 +213,5 @@ public boolean writeHeapHprofBin() { return writeHeapHprofBin("heap.bin", -1); } - private boolean writeHeapGXL(String fileName) { - try { - HeapGraphWriter hgw = new HeapGXLWriter(); - hgw.write(fileName); - System.out.println("heap written to " + fileName); - return true; - } catch (IOException exp) { - throw new RuntimeException(exp); - } - } - - public boolean writeHeapGXL() { - return writeHeapGXL("heap.xml"); - } - private int mode; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java deleted file mode 100644 index 35c155a8f3a0..000000000000 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java +++ /dev/null @@ -1,419 +0,0 @@ -/* - * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.jvm.hotspot.utilities; - -import java.io.*; -import java.util.*; -import sun.jvm.hotspot.oops.*; -import sun.jvm.hotspot.runtime.*; - -/** - *

This class writes Java heap in Graph eXchange Language (GXL) - * format. GXL is an open standard for serializing arbitrary graphs in - * XML syntax.

- * - *

A GXL document contains one or more graphs. A graph contains - * nodes and edges. Both nodes and edges can have attributes. graphs, - * nodes, edges and attributes are represented by XML elements graph, - * node, edge and attr respectively. Attributes can be typed. GXL - * supports locator, bool, int, float, bool, string, enum as well as - * set, seq, bag, tup types. Nodes must have a XML attribute 'id' that - * is unique id of the node in the GXL document. Edges must have - * 'from' and 'to' XML attributes that are ids of from and to nodes.

- * - *

Java heap to GXL document mapping:

- *
    - *
  • Java object - GXL node. - *
  • Java primitive field - GXL attribute (type mapping below). - *
  • Java reference field - GXL edge from referee to referent node. - *
  • Java primitive array - GXL node with seq type attribute. - *
  • Java char array - GXL node with one attribute of string type. - *
  • Java object array - GXL node and 'length' edges. - *
- * - *

Java primitive to GXL type mapping:

- *
    - *
  • Java byte, int, short, long - GXL int attribute - *
  • Java float, double - GXL float attribute - *
  • Java boolean - GXL bool attribute - *
  • Java char - GXL string attribute - *
- * - * Exact Java primitive type code is written in 'kind' attribute of - * 'attr' element. Type code is specified in JVM spec. second edition - * section 4.3.2 (Field Descriptor). - * - * @see GXL - * @see GXL DTD - */ - -public class HeapGXLWriter extends AbstractHeapGraphWriter { - public void write(String fileName) throws IOException { - out = new PrintWriter(new BufferedWriter(new FileWriter(fileName))); - super.write(); - if (out.checkError()) { - throw new IOException(); - } - out.flush(); - } - - protected void writeHeapHeader() throws IOException { - // XML processing instruction - out.print(""); - - out.println(""); - out.println(""); - - // document properties - writeAttribute("creation-date", "string", new Date().toString()); - - // write VM info - writeVMInfo(); - - // emit a node for null - out.print(""); - } - - protected void writeObjectHeader(Oop oop) throws IOException { - refFields = new ArrayList<>(); - isArray = oop.isArray(); - - // generate an edge for instanceof relation - // between object node and it's class node. - writeEdge(oop, oop.getKlass().getJavaMirror(), "instanceof"); - - out.print(""); - } - - protected void writeObjectFooter(Oop oop) throws IOException { - out.println(""); - - // write the reference fields as edges - for (Iterator itr = refFields.iterator(); itr.hasNext();) { - OopField field = (OopField) itr.next(); - Oop ref = field.getValue(oop); - - String name = field.getID().getName(); - if (isArray) { - // for arrays elements we use element pattern - name = "element" + name; - } else { - name = identifierToXMLName(name); - } - writeEdge(oop, ref, name); - } - refFields = null; - } - - @Override - protected void writeObjectArray(ObjArray array, Deque flatObjects) throws IOException { - // TODO: flatObject should be handled. - writeObjectHeader(array); - writeArrayLength(array); - writeObjectFields(array); - writeObjectFooter(array); - } - - protected void writePrimitiveArray(TypeArray array) - throws IOException { - writeObjectHeader(array); - // write array length - writeArrayLength(array); - // write array elements - out.println("\t"); - TypeArrayKlass klass = (TypeArrayKlass) array.getKlass(); - if (klass.getElementType() == TypeArrayKlass.T_CHAR) { - // char[] special treatment -- write it as string - out.print("\t"); - out.print(escapeXMLChars(OopUtilities.charArrayToString(array))); - out.println(""); - } else { - out.println("\t"); - writeObjectFields(array); - out.println("\t"); - } - out.println("\t"); - writeObjectFooter(array); - } - - @Override - protected void writeClass(Instance instance, Deque flatObjects) throws IOException { - // TODO: flatObject should be handled. - writeObjectHeader(instance); - Klass reflectedType = java_lang_Class.asKlass(instance); - boolean isInstanceKlass = (reflectedType instanceof InstanceKlass); - // reflectedType is null for primitive types (int.class etc). - if (reflectedType != null) { - Symbol name = reflectedType.getName(); - if (name != null) { - // write class name as an attribute - writeAttribute("class-name", "string", name.asString()); - } - if (isInstanceKlass) { - // write object-size as an attribute - long sizeInBytes = reflectedType.getLayoutHelper(); - writeAttribute("object-size", "int", - Long.toString(sizeInBytes)); - // write static fields of this class. - writeObjectFields((InstanceKlass)reflectedType); - } - } - out.println(""); - - // write edges for super class and direct interfaces - if (reflectedType != null) { - Klass superType = reflectedType.getSuper(); - Oop superMirror = (superType == null)? - null : superType.getJavaMirror(); - writeEdge(instance, superMirror, "extends"); - if (isInstanceKlass) { - // write edges for directly implemented interfaces - InstanceKlass ik = (InstanceKlass) reflectedType; - KlassArray interfaces = ik.getLocalInterfaces(); - final int len = interfaces.length(); - for (int i = 0; i < len; i++) { - Klass k = interfaces.getAt(i); - writeEdge(instance, k.getJavaMirror(), "implements"); - } - - // write loader - Oop loader = ik.getClassLoader(); - writeEdge(instance, loader, "loaded-by"); - - // write signers NYI - // Oop signers = ik.getJavaMirror().getSigners(); - writeEdge(instance, null, "signed-by"); - - // write protection domain NYI - // Oop protectionDomain = ik.getJavaMirror().getProtectionDomain(); - writeEdge(instance, null, "protection-domain"); - - // write edges for static reference fields from this class - for (Iterator itr = refFields.iterator(); itr.hasNext();) { - OopField field = (OopField) itr.next(); - Oop ref = field.getValue(reflectedType); - String name = field.getID().getName(); - writeEdge(instance, ref, identifierToXMLName(name)); - } - } - } - refFields = null; - } - - protected void writeReferenceField(Oop oop, OopField field) - throws IOException { - refFields.add(field); - } - - protected void writeByteField(Oop oop, ByteField field) - throws IOException { - writeField(field, "int", "B", Byte.toString(field.getValue(oop))); - } - - protected void writeCharField(Oop oop, CharField field) - throws IOException { - writeField(field, "string", "C", - escapeXMLChars(Character.toString(field.getValue(oop)))); - } - - protected void writeBooleanField(Oop oop, BooleanField field) - throws IOException { - writeField(field, "bool", "Z", Boolean.toString(field.getValue(oop))); - } - - protected void writeShortField(Oop oop, ShortField field) - throws IOException { - writeField(field, "int", "S", Short.toString(field.getValue(oop))); - } - - protected void writeIntField(Oop oop, IntField field) - throws IOException { - writeField(field, "int", "I", Integer.toString(field.getValue(oop))); - } - - protected void writeLongField(Oop oop, LongField field) - throws IOException { - writeField(field, "int", "J", Long.toString(field.getValue(oop))); - } - - protected void writeFloatField(Oop oop, FloatField field) - throws IOException { - writeField(field, "float", "F", Float.toString(field.getValue(oop))); - } - - protected void writeDoubleField(Oop oop, DoubleField field) - throws IOException { - writeField(field, "float", "D", Double.toString(field.getValue(oop))); - } - - protected void writeHeapFooter() throws IOException { - out.println(""); - out.println(""); - } - - @Override - protected int calculateOopDumpRecordSize(Oop oop) throws IOException { - return 0; - } - - //-- Internals only below this point - - // Java identifier to XML NMTOKEN type string - private static String identifierToXMLName(String name) { - // for now, just replace '$' with '_' - return name.replace('$', '_'); - } - - // escapes XML meta-characters and illegal characters - private static String escapeXMLChars(String s) { - // FIXME: is there a better way or API? - StringBuilder result = null; - for(int i = 0, max = s.length(), delta = 0; i < max; i++) { - char c = s.charAt(i); - String replacement = null; - if (c == '&') { - replacement = "&"; - } else if (c == '<') { - replacement = "<"; - } else if (c == '>') { - replacement = ">"; - } else if (c == '"') { - replacement = """; - } else if (c == '\'') { - replacement = "'"; - } else if (c < '\u0020' || (c > '\ud7ff' && c < '\ue000') || - c == '\ufffe' || c == '\uffff') { - // These are illegal in XML -- put these in a CDATA section. - // Refer to section 2.2 Characters in XML specification at - // http://www.w3.org/TR/2004/REC-xml-20040204/ - replacement = ""; - } - - if (replacement != null) { - if (result == null) { - result = new StringBuilder(s); - } - result.replace(i + delta, i + delta + 1, replacement); - delta += (replacement.length() - 1); - } - } - if (result == null) { - return s; - } - return result.toString(); - } - - private static String getID(Oop oop) { - // address as unique id for node -- prefixed by "ID_". - if (oop == null) { - return "ID_NULL"; - } else { - return "ID_" + oop.getHandle().toString(); - } - } - - private void writeArrayLength(Array array) throws IOException { - writeAttribute("length", "int", - Integer.toString((int) array.getLength())); - } - - private void writeAttribute(String name, String type, String value) { - out.print("\t<"); - out.print(type); - out.print('>'); - out.print(value); - out.print(""); - } - - private void writeEdge(Oop from, Oop to, String name) throws IOException { - out.print(""); - writeAttribute("name", "string", name); - out.println(""); - } - - private void writeField(Field field, String type, String kind, - String value) throws IOException { - // 'type' is GXL type of the attribute - // 'kind' is Java type code ("B", "C", "Z", "S", "I", "J", "F", "D") - if (isArray) { - out.print('\t'); - } else { - out.print("\t"); - } - out.print('<'); - out.print(type); - out.print('>'); - out.print(value); - out.print("'); - if (isArray) { - out.println(); - } else { - out.println(""); - } - } - - private void writeVMInfo() throws IOException { - VM vm = VM.getVM(); - writeAttribute("vm-version", "string", vm.getVMRelease()); - writeAttribute("vm-type", "string", - (vm.isClientCompiler())? "client" : - ((vm.isServerCompiler())? "server" : "core")); - writeAttribute("os", "string", vm.getOS()); - writeAttribute("cpu", "string", vm.getCPU()); - writeAttribute("pointer-size", "string", - Integer.toString((int)vm.getOopSize() * 8)); - } - - // XML encoding that we'll use - private static final String ENCODING = "UTF-8"; - - // reference fields of currently visited object - private List refFields; - // are we writing an array now? - private boolean isArray; - private PrintWriter out; -} From 6afc7838fc60f1ef25c24f69749bbb3a8c3f7fba Mon Sep 17 00:00:00 2001 From: Marc Chevalier Date: Thu, 5 Nov 2026 08:55:09 +0000 Subject: [PATCH 008/110] 8374495: C2: Endlessly creating new AddL/SubL nodes in IGVN leading to compilation bailout Reviewed-by: thartmann, chagedorn --- src/hotspot/share/opto/addnode.cpp | 59 +++++----- src/hotspot/share/opto/castnode.cpp | 7 +- src/hotspot/share/opto/convertnode.cpp | 7 +- src/hotspot/share/opto/loopopts.cpp | 10 +- src/hotspot/share/opto/phaseX.cpp | 17 ++- src/hotspot/share/opto/phaseX.hpp | 18 ++- .../igvn/AddIdealMakesNodeNumberExplode.java | 77 +++++++++++++ ...AddIdealMakesNodeNumberExplodeParsing.java | 106 ++++++++++++++++++ 8 files changed, 246 insertions(+), 55 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplode.java create mode 100644 test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplodeParsing.java diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp index 4a6659db8794..72b4a8ea7cb2 100644 --- a/src/hotspot/share/opto/addnode.cpp +++ b/src/hotspot/share/opto/addnode.cpp @@ -127,11 +127,12 @@ static bool commute(PhaseGVN* phase, Node* add) { return false; } -//------------------------------Idealize--------------------------------------- -// If we get here, we assume we are associative! -Node *AddNode::Ideal(PhaseGVN *phase, bool can_reshape) { - const Type *t1 = phase->type(in(1)); - const Type *t2 = phase->type(in(2)); +// If we get here, we assume '+' is +// - associative: (a + b) + c = a + (b + c) +// - commutative: a + b = b + a +Node* AddNode::Ideal(PhaseGVN* phase, bool can_reshape) { + const Type* t1 = phase->type(in(1)); + const Type* t2 = phase->type(in(2)); bool con_left = t1->singleton(); bool con_right = t2->singleton(); @@ -294,30 +295,30 @@ Node* AddNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) { // Convert "(a-b)+(c-d)" into "(a+c)-(b+d)" if (op2 == Op_Sub(bt)) { // Check for dead cycle: d = (a-b)+(c-d) - assert( in1->in(2) != this && in2->in(2) != this, - "dead loop in AddINode::Ideal" ); - Node* sub = SubNode::make(nullptr, nullptr, bt); - Node* sub_in1; - PhaseIterGVN* igvn = phase->is_IterGVN(); - // During IGVN, if both inputs of the new AddNode are a tree of SubNodes, this same transformation will be applied - // to every node of the tree. Calling transform() causes the transformation to be applied recursively, once per - // tree node whether some subtrees are identical or not. Pushing to the IGVN worklist instead, causes the transform - // to be applied once per unique subtrees (because all uses of a subtree are updated with the result of the - // transformation). In case of a large tree, this can make a difference in compilation time. - if (igvn != nullptr) { - sub_in1 = igvn->register_new_node_with_optimizer(AddNode::make(in1->in(1), in2->in(1), bt)); - } else { - sub_in1 = phase->transform(AddNode::make(in1->in(1), in2->in(1), bt)); - } - Node* sub_in2; - if (igvn != nullptr) { - sub_in2 = igvn->register_new_node_with_optimizer(AddNode::make(in1->in(2), in2->in(2), bt)); - } else { - sub_in2 = phase->transform(AddNode::make(in1->in(2), in2->in(2), bt)); + assert(in1->in(2) != this && in2->in(2) != this, "dead loop in AddINode::Ideal"); + + // This transformation can create 3 nodes out of the current one. It also lays a good structure + // for the same rule to apply again. Even if termination is guaranteed, in some cases, we can + // create an exponential amount of nodes before simplifying them. To avoid that, let's leave this + // job to IGVN, where we delay the recursive transformations, hoping we can common the new nodes + // with existing ones, containing the explosion. This is likely if the expression has a small + // number of leaves, that is expression DAG in the IR is rather narrow (not like a tree whose width + // blows up with depth). + if (can_reshape == false) { + phase->record_for_igvn(this); + return nullptr; } - sub->init_req(1, sub_in1); - sub->init_req(2, sub_in2); - return sub; + PhaseIterGVN* igvn = phase->is_IterGVN(); + assert(igvn != nullptr, "should be IGVN now"); + + // sub_in1 and sub_in2 can be transformed again into an explosive amount of nodes. To avoid that, + // we make them available for eager commoning with sub_in1 and sub_in2 created by the AddNode::IdealIL + // of other Add nodes, similar enough to `this`. + Node* sub_in1 = AddNode::make(in1->in(1), in2->in(1), bt); + sub_in1 = igvn->find_node_or_register_new_node_with_optimizer(sub_in1); + Node* sub_in2 = AddNode::make(in1->in(2), in2->in(2), bt); + sub_in2 = igvn->find_node_or_register_new_node_with_optimizer(sub_in2); + return SubNode::make(sub_in1, sub_in2, bt); } // Convert "(a-b)+(b+c)" into "(a+c)" if (op2 == Op_Add(bt) && in1->in(2) == in2->in(1)) { @@ -343,7 +344,7 @@ Node* AddNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) { return AddNode::make(phase->transform(SubNode::make(in1, in2->in(2), bt)), in2->in(1), bt); } - // Associative + // Distributivity of * over + (also uses commutativity of *) if (op1 == Op_Mul(bt) && op2 == Op_Mul(bt)) { Node* add_in1 = nullptr; Node* add_in2 = nullptr; diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp index 8c8308cacb61..4ed2fe54b4d9 100644 --- a/src/hotspot/share/opto/castnode.cpp +++ b/src/hotspot/share/opto/castnode.cpp @@ -296,12 +296,7 @@ CastLLNode* CastLLNode::make_with(Node* parent, const TypeInteger* type, const D Node* ConstraintCastNode::find_or_make_integer_cast(PhaseIterGVN* igvn, Node* parent, const TypeInteger* type, const DependencyType& dependency) const { Node* n = make_with(parent, type, dependency); - Node* existing = igvn->hash_find_insert(n); - if (existing != nullptr) { - n->destruct(igvn); - return existing; - } - return igvn->register_new_node_with_optimizer(n); + return igvn->find_node_or_register_new_node_with_optimizer(n); } Node *CastIINode::Ideal(PhaseGVN *phase, bool can_reshape) { diff --git a/src/hotspot/share/opto/convertnode.cpp b/src/hotspot/share/opto/convertnode.cpp index 9c8e394d500b..94d7a5afc659 100644 --- a/src/hotspot/share/opto/convertnode.cpp +++ b/src/hotspot/share/opto/convertnode.cpp @@ -724,12 +724,7 @@ static bool compute_updates_ranges(const TypeInteger* tx, const TypeInteger* ty, static Node* find_or_make_convI2L(PhaseIterGVN* igvn, Node* parent, const TypeLong* type) { Node* n = new ConvI2LNode(parent, type); - Node* existing = igvn->hash_find_insert(n); - if (existing != nullptr) { - n->destruct(igvn); - return existing; - } - return igvn->register_new_node_with_optimizer(n); + return igvn->find_node_or_register_new_node_with_optimizer(n); } #endif diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp index 74bbf7f84738..431eeb7a592e 100644 --- a/src/hotspot/share/opto/loopopts.cpp +++ b/src/hotspot/share/opto/loopopts.cpp @@ -1540,27 +1540,25 @@ bool PhaseIdealLoop::flat_array_element_type_check(Node *n) { cast_clone->set_req(0, ctrl); cast_clone->set_req(1, in); register_new_node(cast_clone, ctrl); - const Type* tcast = cast_clone->Value(&_igvn); - _igvn.set_type(cast_clone, tcast); - cast_clone->as_Type()->set_type(tcast); + _igvn.set_type_and_raise_bottom_type(cast_clone, cast_clone->Value(&_igvn)); in = cast_clone; } Node* addr_clone = addr->clone(); addr_clone->set_req(AddPNode::Base, in); addr_clone->set_req(AddPNode::Address, in); register_new_node(addr_clone, ctrl); - _igvn.set_type(addr_clone, addr_clone->Value(&_igvn)); + _igvn.set_type_and_raise_bottom_type(addr_clone, addr_clone->Value(&_igvn)); Node* klassptr_clone = klassptr->clone(); klassptr_clone->set_req(2, addr_clone); register_new_node(klassptr_clone, ctrl); - _igvn.set_type(klassptr_clone, klassptr_clone->Value(&_igvn)); + _igvn.set_type_and_raise_bottom_type(klassptr_clone, klassptr_clone->Value(&_igvn)); if (klassptr != n->in(1)) { Node* decode = n->in(1); assert(decode->is_DecodeNarrowPtr(), "inconsistent subgraph"); Node* decode_clone = decode->clone(); decode_clone->set_req(1, klassptr_clone); register_new_node(decode_clone, ctrl); - _igvn.set_type(decode_clone, decode_clone->Value(&_igvn)); + _igvn.set_type_and_raise_bottom_type(decode_clone, decode_clone->Value(&_igvn)); klassptr_clone = decode_clone; } phi->set_req(i, klassptr_clone); diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp index fb388efdaf2b..26b127bb54a0 100644 --- a/src/hotspot/share/opto/phaseX.cpp +++ b/src/hotspot/share/opto/phaseX.cpp @@ -734,9 +734,7 @@ Node* PhaseGVN::transform(Node* n) { set_progress(); } #endif - set_type(k, t); - // If k is a TypeNode, capture any more-precise type permanently into Node - k->raise_bottom_type(t); + set_type_and_raise_bottom_type(k, t); } if (t->singleton() && !k->is_Con()) { @@ -1959,6 +1957,15 @@ Node* PhaseIterGVN::register_new_node_with_optimizer(Node* n, Node* orig) { return n; } +Node* PhaseIterGVN::find_node_or_register_new_node_with_optimizer(Node* n) { + Node* existing = hash_find_insert(n); + if (existing != nullptr) { + n->destruct(this); + return existing; + } + return register_new_node_with_optimizer(n); +} + //------------------------------transform-------------------------------------- // Non-recursive: idealize Node 'n' with respect to its inputs and its value Node *PhaseIterGVN::transform( Node *n ) { @@ -2159,9 +2166,7 @@ Node *PhaseIterGVN::transform_old(Node* n) { if (type_or_null(k) != t) { NOT_PRODUCT(inc_new_values();) set_progress(); - set_type(k, t); - // If k is a TypeNode, capture any more-precise type permanently into Node - k->raise_bottom_type(t); + set_type_and_raise_bottom_type(k, t); // Move users of node to worklist add_users_to_worklist(k); } diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp index 5ac0bde26956..97f2fe540e27 100644 --- a/src/hotspot/share/opto/phaseX.hpp +++ b/src/hotspot/share/opto/phaseX.hpp @@ -316,10 +316,17 @@ class PhaseValues : public PhaseTransform { return _types.fast_lookup(n->_idx); } // Record a type for a node. - void set_type(const Node* n, const Type *t) { + void set_type(const Node* n, const Type* t) { assert(t != nullptr, "type must not be null"); _types.map(n->_idx, t); } + void set_type_and_raise_bottom_type(Node* n, const Type* t) { + assert(t != nullptr, "type must not be null"); + set_type(n, t); + // If k is a TypeNode (or anything that contains its own type), + // capture any more-precise type permanently into Node + n->raise_bottom_type(t); + } void clear_type(const Node* n) { if (n->_idx < _types.Size()) { _types.map(n->_idx, nullptr); @@ -475,7 +482,7 @@ class PhaseIterGVN : public PhaseGVN { DEBUG_ONLY(uint _num_processed;) // Running count for trace_PhaseIterGVN_verbose // Idealize old Node 'n' with respect to its inputs and its value - virtual Node *transform_old( Node *a_node ); + virtual Node* transform_old(Node* a_node); bool can_kill(Node* n) const; @@ -578,6 +585,13 @@ class PhaseIterGVN : public PhaseGVN { // Optional 'orig' is an earlier version of this node. // It is significant only for debugging and profiling. Node* register_new_node_with_optimizer(Node* n, Node* orig = nullptr); + // Same as before, but also add to the hash table of node, so they are available + // to be commoned even in their non-ideal form. It is useful if we may create + // the same node multiple time, and transforming them would lead to even more nodes. + // It also cannot be the default strategy as it confuses loops. In particular, loops + // optimization often clone loops and modify nodes right away, so it is both useless + // and forbidden to put these new nodes in the hash table. + Node* find_node_or_register_new_node_with_optimizer(Node* n); // Origin of a dead node, describing why it is dying. // Speculative: a temporarily created node that was never part of the graph diff --git a/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplode.java b/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplode.java new file mode 100644 index 000000000000..b95fb0142556 --- /dev/null +++ b/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplode.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package compiler.igvn; + +/** + * @test + * @bug 8374495 + * @summary Transformation (a-b)+(c-d) -> (a+c)-(b+d) in AddNode::IdealIL can apply iteratively and + * result in an explosion in node creation. Reusing nodes mitigates that. + * @run main/othervm -XX:+UnlockDiagnosticVMOptions + * -XX:+IgnoreUnrecognizedVMOptions + * -XX:+AbortVMOnCompilationFailure + * -XX:CompileCommand=compileonly,${test.main.class}::test + * -XX:-TieredCompilation + * -Xbatch + * -XX:+StressLoopPeeling + * ${test.main.class} + * @run main ${test.main.class} + */ +// This reproduces almost always. But if it is not reliable enough for your taste, +// you can add -XX:RepeatCompilation=10 during investigation. With that, I've never +// seen it fail to fail. + +public class AddIdealMakesNodeNumberExplode { + long lFld; + byte byFld; + + void main() { + for (int i = 0; i < 10000; i++) { + testIndirection(); + test(); + } + } + + // Variation: Indirectly call test(). + void testIndirection() { + test(); + } + + void test() { + int x = byFld; + int y = 2; + for (int i = 0; i < 5; i++) { + for (int j = 1; j < 7; ++j) { + lFld = y; + for (int k = 1; k < 2; k++) { + lFld -= x; + } + y -= (int) lFld; + switch (i % 2) { + case 0: + lFld += y; + } + } + } + } +} diff --git a/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplodeParsing.java b/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplodeParsing.java new file mode 100644 index 000000000000..accb572ba811 --- /dev/null +++ b/test/hotspot/jtreg/compiler/igvn/AddIdealMakesNodeNumberExplodeParsing.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package compiler.igvn; + +/** + * @test + * @bug 8374495 + * @summary Transformation (a-b)+(c-d) -> (a+c)-(b+d) in AddNode::IdealIL can apply iteratively and + * result in an explosion in node creation. Reusing nodes mitigates that. + * @run main/othervm -XX:+UnlockDiagnosticVMOptions + * -XX:+AbortVMOnCompilationFailure + * -Xbatch + * ${test.main.class} + * @run main ${test.main.class} + */ + +public class AddIdealMakesNodeNumberExplodeParsing { + public static void main(String[] args) { + for (int i = 0; i < 10_000; i++) { + test(i, 2*i, 3*i); + } + } + + static int test(int i1, int i2, int i3) { + int s1 = i1 - i2; + int s2 = i3 - s1; // i3 - (i1 - i2) = i3 - i1 + i2 + + int s3 = s2 - i2; // (i3 - i1 + i2) - i2 = i3 - i1 + int s4 = s2 - s3; // (i3 - i1 + i2) - (i3 - i1) = i2 + + int s5 = s4 - i2; // i2 - i2 = 0 + int s6 = s4 - s5; // i2 - 0 = i2 + + int s7 = s6 - i2; // i2 - i2 = 0 + int s8 = s6 - s7; // i2 - 0 = i2 + + int s9 = s8 - i2; // i2 - i2 = 0 + int s10 = s8 - s9; // i2 - 0 = i2 + + int s11 = s10 - i2; // ... + int s12 = s10 - s11; // ... + + int s13 = s12 - i2; + int s14 = s12 - s13; + + int s15 = s14 - i2; + int s16 = s14 - s15; + + int s17 = s16 - i2; + int s18 = s16 - s17; + + int s19 = s18 - i2; + int s20 = s18 - s19; + + int s21 = s20 - i2; + int s22 = s20 - s21; + + int s23 = s22 - i2; + int s24 = s22 - s23; + + int s25 = s24 - i2; + int s26 = s24 - s25; + + int s27 = s26 - i2; + int s28 = s26 - s27; + + int s29 = s28 - i2; + int s30 = s28 - s29; + + int s31 = s30 - i2; + int s32 = s30 - s31; + + int s33 = s32 - i2; // ... + int s34 = s32 - s33; // ... + + int s35 = s34 - i2; // = 0 + int s36 = s34 - s35; // = i2 + + int s37 = s36 - i2; // = 0 + + int a1 = s36 + s36; // i2 + i2 + int a2 = s37 + s37; // 0 + 0 = 0 + + return a1 * a2; // (i2 + i2) * 0 = 0 + } +} From 31684556e38664ce2db9ad3b22291e61903e310d Mon Sep 17 00:00:00 2001 From: Jatin Bhateja Date: Thu, 5 Nov 2026 09:11:00 +0000 Subject: [PATCH 009/110] 8396171: C2: segfault while adding node to IGVN worklist Reviewed-by: chagedorn, thartmann --- src/hotspot/share/opto/node.hpp | 5 + src/hotspot/share/opto/phaseX.cpp | 13 ++- .../igvn/TestVectorReassociationIGVN.java | 92 +++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/igvn/TestVectorReassociationIGVN.java diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp index 3e0d5601214f..97c8af5c49b2 100644 --- a/src/hotspot/share/opto/node.hpp +++ b/src/hotspot/share/opto/node.hpp @@ -1320,6 +1320,11 @@ class Node { // Some nodes have specific Ideal subgraph transformations only if they are // unique users of specific nodes. Such nodes should be put on IGVN worklist // for the transformations to happen. + // + // Returning true also makes that notification reachable from + // remove_globally_dead_node(), which clears inputs through replace_edge() + // and set_req_X() while the dead node is only partly disconnected. Code + // reached from here must accept null required inputs. bool has_special_unique_user() const; // Some nodes can be processed when one of its outputs is disconnected diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp index 26b127bb54a0..6beb99f3bb3d 100644 --- a/src/hotspot/share/opto/phaseX.cpp +++ b/src/hotspot/share/opto/phaseX.cpp @@ -2968,8 +2968,17 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_ if (VectorNode::is_associative_and_commutative_vector_operation(use_op) && !use->as_Vector()->is_predicated_vector()) { add_users_to_worklist_if(worklist, use, [use_op](Node* u) { - return u->Opcode() == use_op && !u->as_Vector()->is_predicated_vector() && - (u->in(1)->Opcode() == Op_Replicate || u->in(2)->Opcode() == Op_Replicate); + if (u->Opcode() != use_op || u->as_Vector()->is_predicated_vector()) { + return false; + } + // Reached from remove_globally_dead_node() -> replace_edge() -> + // set_req_X() after clearing one input leaves the shared input with a + // single user and has_special_unique_user() is true. 'u' is still being + // disconnected, so a required input may already be null. + Node* in1 = u->in(1); + Node* in2 = u->in(2); + return (in1 != nullptr && in1->Opcode() == Op_Replicate) || + (in2 != nullptr && in2->Opcode() == Op_Replicate); }); } diff --git a/test/hotspot/jtreg/compiler/igvn/TestVectorReassociationIGVN.java b/test/hotspot/jtreg/compiler/igvn/TestVectorReassociationIGVN.java new file mode 100644 index 000000000000..90e11d0f4d57 --- /dev/null +++ b/test/hotspot/jtreg/compiler/igvn/TestVectorReassociationIGVN.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.igvn; + +/* + * @test id=reduced1 + * @bug 8396171 + * @summary C2: segfault while adding node to IGVN worklist. + * @requires vm.cpu.features ~= ".*avx.*" + * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:UseAVX=2 + * -XX:CompileCommand=compileonly,compiler.igvn.TestReduced1::test + * ${test.main.class} + */ + +/* + * @test id=reduced2 + * @bug 8396171 + * @summary C2: segfault while adding node to IGVN worklist. + * @run main/othervm -Xbatch -XX:-TieredCompilation + * -XX:CompileCommand=compileonly,compiler.igvn.TestReduced2::test + * ${test.main.class} + */ + +public class TestVectorReassociationIGVN { + public static void main(String[] args) { + TestReduced1.run(); + TestReduced2.run(); + } +} + +class TestReduced1 extends TestVectorReassociationIGVN { + static void run() { + for (int i = 0; i < 10_000; i++) { + test(); + } + } + + static void test() { + long arr[] = new long[74]; + for (int i = 6; i < 67; i++) { + for (int j = 1; j < 5; ++j) { + arr[i] ^= j; + arr[j] -= 1.234; + } + } + } +} + +class TestReduced2 extends TestVectorReassociationIGVN { + static void run() { + for (int i = 0; i < 10; i++) { + test(); + } + } + + static void test() { + int i5 = -89; + long l2 = -8L; + long lArr[] = new long[400]; + for (int i = 0; i < 400; i++) { + lArr[i] = 189L; + } + for (int i12 = 6; i12 < 367; i12++) { + i5 += i12; + for (int i14 = 1; i14 < 5; ++i14) { + lArr[i12 - 1] ^= i14; + lArr[i14] -= l2; + } + } + } +} From 9d7642fcef5585432053959a074d180db0eb48e7 Mon Sep 17 00:00:00 2001 From: Martin Doerr Date: Thu, 5 Nov 2026 09:45:41 +0000 Subject: [PATCH 010/110] 8396560: [Valhalla] Restrict TestNullnessPropagation to little-endian platforms Reviewed-by: jvernee, amitkumar --- test/hotspot/jtreg/TEST.ROOT | 1 + .../valuetypes/TestNullnessPropagation.java | 3 ++- test/jtreg-ext/requires/VMProps.java | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT index 58de4871f8c7..213e4ca8f92e 100644 --- a/test/hotspot/jtreg/TEST.ROOT +++ b/test/hotspot/jtreg/TEST.ROOT @@ -61,6 +61,7 @@ requires.properties= \ java.enablePreview \ vm.simpleArch \ vm.bits \ + vm.endian \ vm.flightRecorder \ vm.gc.G1 \ vm.gc.Serial \ diff --git a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestNullnessPropagation.java b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestNullnessPropagation.java index f018a182cf49..5b697ae0b915 100644 --- a/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestNullnessPropagation.java +++ b/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestNullnessPropagation.java @@ -31,7 +31,8 @@ /* * @test - * @bug 8395611 + * @bug 8395611 8396195 + * @requires vm.endian == "little" * @summary Test nullness propagation during parsing * @library /test/lib / * @enablePreview diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 491f25bfdcec..a658b20fa6a8 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -102,6 +102,7 @@ public Map call() { map.put("vm.flavor", this::vmFlavor); map.put("vm.compMode", this::vmCompMode); map.put("vm.bits", this::vmBits); + map.put("vm.endian", this::vmEndian); map.put("vm.flightRecorder", this::vmFlightRecorder); map.put("vm.simpleArch", this::vmArch); map.put("vm.debug", this::vmDebug); @@ -231,6 +232,18 @@ protected String vmBits() { } } + /** + * @return VM endianness, the value of the "sun.cpu.endian" property. + */ + protected String vmEndian() { + String endian = System.getProperty("sun.cpu.endian"); + if (endian != null) { + return endian; + } else { + return errorWithMessage("Can't get 'sun.cpu.endian' property"); + } + } + /** * @return "true" if Flight Recorder is enabled, "false" if is disabled. */ From 0680a79d2be7add059a2903d517e8c4bf56088e4 Mon Sep 17 00:00:00 2001 From: Quan Anh Mai Date: Thu, 5 Nov 2026 13:14:24 +0000 Subject: [PATCH 011/110] 8396024: C2: assert(res == nullptr) failed: unexpected memory producer in MachNode::verify_adr_type Reviewed-by: kvn, thartmann --- src/hotspot/share/opto/machnode.cpp | 27 ++++--- .../compiler/c2/TestVerifyMachAdrType.java | 80 +++++++++++++++++++ 2 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestVerifyMachAdrType.java diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp index 28fdd5076ffe..e4fc97f33d36 100644 --- a/src/hotspot/share/opto/machnode.cpp +++ b/src/hotspot/share/opto/machnode.cpp @@ -33,6 +33,7 @@ #include "opto/opcodes.hpp" #include "opto/output.hpp" #include "opto/regalloc.hpp" +#include "opto/type.hpp" #include "utilities/vmError.hpp" //============================================================================= @@ -361,11 +362,15 @@ const TypePtr* MachNode::out_adr_type_impl() const { if (const TypePtr* res = _out_adr_type; res != TYPE_PTR_SENTINAL) { #ifdef ASSERT - if (produce_memory) { - assert(res != nullptr, "must declare an out_adr_type"); - verify_adr_type(res, compute_adr_type_from_inputs()); - } else { - assert(res == nullptr, "unexpected memory producer"); + // Should not crash when printing the graph, or when another VM error has been reported + if (!Node::in_dump() && !VMError::is_error_reported()) { + if (produce_memory) { + assert(res != nullptr, "must declare an out_adr_type"); + verify_adr_type(res, compute_adr_type_from_inputs()); + } else { + // We don't know whether the node actually produces memory, because the memory output Proj + // may be dead if the following node is a Halt + } } #endif // ASSERT return res; @@ -378,7 +383,12 @@ const TypePtr* MachNode::out_adr_type_impl() const { const TypePtr* MachNode::in_adr_type_impl() const { if (const TypePtr* res = _in_adr_type; res != TYPE_PTR_SENTINAL) { - DEBUG_ONLY(verify_adr_type(res, compute_adr_type_from_inputs())); +#ifdef ASSERT + // Should not crash when printing the graph, or when another VM error has been reported + if (!Node::in_dump() && !VMError::is_error_reported()) { + verify_adr_type(res, compute_adr_type_from_inputs()); + } +#endif // ASSERT return res; } else { return compute_adr_type_from_inputs(); @@ -387,10 +397,7 @@ const TypePtr* MachNode::in_adr_type_impl() const { void MachNode::verify_adr_type(const TypePtr* declared, const TypePtr* verify) const { #ifdef ASSERT - if (Node::in_dump() || VMError::is_error_reported()) { - return; - } - + assert(!Node::in_dump() && !VMError::is_error_reported(), "should not verify"); if (verify == nullptr) { return; } diff --git a/test/hotspot/jtreg/compiler/c2/TestVerifyMachAdrType.java b/test/hotspot/jtreg/compiler/c2/TestVerifyMachAdrType.java new file mode 100644 index 000000000000..e13a45ec700c --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestVerifyMachAdrType.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package compiler.c2; + +import compiler.whitebox.CompilerWhiteBoxTest; +import java.util.ArrayList; +import java.util.Arrays; +import jdk.test.whitebox.WhiteBox; + +/* + * @test + * bug 8396024 + * @summary A node whose memory Proj is unused should still be considered a memory producer by + * MachNode::out_adr_type_impl. + * @requires vm.compiler2.enabled + * @library /test/lib / + * @build jdk.test.whitebox.WhiteBox + * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI + * -Xcomp -XX:-TieredCompilation -XX:CompileOnly=${test.main.class}$Test::* + * ${test.main.class} + */ +public class TestVerifyMachAdrType { + private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox(); + + public static void main(String[] args) throws NoSuchMethodException { + var testMethod = Test.class.getDeclaredMethod("test"); + var runner = new Thread(Test::test); + runner.setDaemon(true); + runner.start(); + while (WHITE_BOX.getMethodCompilationLevel(testMethod, true) != CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION) { + Thread.yield(); + } + } + + private static class Test { + ArrayList unused = new ArrayList<>(Arrays.asList()); + int[] empty = {}; + + public static void test() { + int i = 0; + do { + new Test(); + long l = 0; + do { + l++; + } while (l < 32); + float f = 0.0F; + new Test().fun1(1.0000880971554 <= -f ? 2097152 : -67108864); + } while (i < 60); + } + + void fun0(Boolean arg_0) {} + + void fun1(Integer arg_0) { + new Test(); + fun0(true); + } + } +} From 8073b51f4827b66ef056952a5f0a152aee09a92e Mon Sep 17 00:00:00 2001 From: Artur Barashev Date: Thu, 5 Nov 2026 14:55:39 +0000 Subject: [PATCH 012/110] 8394608: java.security.cert.PKIXParameters#setDate cannot be used to reset the date to null Reviewed-by: djelinski, hchao --- .../java/security/cert/PKIXParameters.java | 7 +- .../cert/PKIXParameters/SetGetDate.java | 79 +++++++++++++++++++ 2 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 test/jdk/java/security/cert/PKIXParameters/SetGetDate.java diff --git a/src/java.base/share/classes/java/security/cert/PKIXParameters.java b/src/java.base/share/classes/java/security/cert/PKIXParameters.java index 4d2a2b2aaef9..a04871e9768a 100644 --- a/src/java.base/share/classes/java/security/cert/PKIXParameters.java +++ b/src/java.base/share/classes/java/security/cert/PKIXParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -509,10 +509,7 @@ public Date getDate() { * @see #getDate */ public void setDate(Date date) { - if (date != null) - this.date = (Date) date.clone(); - else - date = null; + this.date = date != null ? (Date) date.clone() : null; } /** diff --git a/test/jdk/java/security/cert/PKIXParameters/SetGetDate.java b/test/jdk/java/security/cert/PKIXParameters/SetGetDate.java new file mode 100644 index 000000000000..9ceb82b7092c --- /dev/null +++ b/test/jdk/java/security/cert/PKIXParameters/SetGetDate.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import static jdk.test.lib.Asserts.assertEquals; +import static jdk.test.lib.Asserts.assertNull; + +import java.security.KeyPairGenerator; +import java.security.cert.PKIXBuilderParameters; +import java.security.cert.PKIXParameters; +import java.security.cert.TrustAnchor; +import java.util.Date; +import java.util.Set; + +/* + * @test + * @bug 8394608 + * @summary Check PKIXParameters date set/get/reset + * @library /test/lib + */ + +public class SetGetDate { + + public static void main(String[] args) throws Exception { + Set anchors = Set.of(new TrustAnchor( + "CN=Test CA", + KeyPairGenerator.getInstance("EC") + .generateKeyPair().getPublic(), + null)); + + checkDate(new PKIXParameters(anchors)); + checkDate(new PKIXBuilderParameters(anchors, null)); + } + + private static void checkDate(PKIXParameters params) { + assertNull(params.getDate(), "Default date must be null"); + + for (long time : new long[]{0L, 86400000L}) { + Date expected = new Date(time); + Date supplied = new Date(time); + + params.setDate(supplied); + assertEquals(expected, params.getDate(), + "setDate() must preserve the supplied value"); + + supplied.setTime(time + 1000L); + assertEquals(expected, params.getDate(), + "setDate() must copy its argument"); + + Date returned = params.getDate(); + returned.setTime(time + 2000L); + assertEquals(expected, params.getDate(), + "getDate() must return a copy"); + + params.setDate(null); + assertNull(params.getDate(), + "setDate(null) must clear the previous date"); + } + } +} From ba5b83438ea90d4017560d63c0634fd31022379b Mon Sep 17 00:00:00 2001 From: William Kemper Date: Thu, 5 Nov 2026 15:54:04 +0000 Subject: [PATCH 013/110] 8396413: Shenandoah: WhiteBox fullGC may not promote everything Reviewed-by: pfontanilla, kdnilsen, ruili --- .../heuristics/shenandoahGenerationalHeuristics.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp index c941d024e2ff..618e87a3becb 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp @@ -519,14 +519,8 @@ void ShenandoahGenerationalHeuristics::adjust_evacuation_budgets(ShenandoahGener if (add_regions_to_young > 0) { assert(excess_old >= add_regions_to_young * region_size_bytes, "Cannot xfer more than excess old"); if (heap->age_census()->is_always_tenure()) { - // Cap excess_old at one min-PLAB per worker so this much stays in old's promotion reserve - // instead of being transferred to young. - const size_t min_plab_total = heap->plab_min_size() * HeapWordSize * heap->workers()->max_workers(); - if (excess_old > min_plab_total) { - excess_old = min_plab_total; - // Avoid underflowing excess_old when we subtract below. - add_regions_to_young = 0; - } + // Keep all excess old for promotions, give nothing back to young when we are expected to promote everything. + add_regions_to_young = 0; } excess_old -= add_regions_to_young * region_size_bytes; log_debug(gc, ergo)("Before start of evacuation, total_promotion reserve is young_advance_promoted_reserve: %zu " From a0323236b7962b5976a653000e8a02f55344ed1b Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Thu, 5 Nov 2026 16:21:06 +0000 Subject: [PATCH 014/110] 8395992: G1: Invalid combinations of ParallelGCThread and ConcGCThreads cause VM failure Reviewed-by: ayang, eosterlund --- src/hotspot/share/gc/g1/g1Arguments.cpp | 6 ++ ...TestConcParallelGCThreadsCombinations.java | 79 +++++++++++++++++++ .../jtreg/gc/g1/TestMarkStackSizes.java | 4 +- 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 test/hotspot/jtreg/gc/g1/TestConcParallelGCThreadsCombinations.java diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp index 87d394743273..92ba1a803cb6 100644 --- a/src/hotspot/share/gc/g1/g1Arguments.cpp +++ b/src/hotspot/share/gc/g1/g1Arguments.cpp @@ -202,6 +202,12 @@ void G1Arguments::initialize() { uint marking_thread_num = scale_concurrent_worker_threads(ParallelGCThreads); FLAG_SET_ERGO(ConcGCThreads, marking_thread_num); } + // G1 does not support more marking threads than parallel worker threads. + if (ConcGCThreads > ParallelGCThreads) { + vm_exit_during_initialization(err_msg("G1 expects ConcGCThreads (%u) <= ParallelGCThreads (%u), " + "verify the values of -XX:ParallelGCThreads and -XX:ConcGCThreads", + ConcGCThreads, ParallelGCThreads)); + } if (FLAG_IS_DEFAULT(GCTimeRatio) || GCTimeRatio == 0) { // In G1, we want the default GC overhead goal to be higher than diff --git a/test/hotspot/jtreg/gc/g1/TestConcParallelGCThreadsCombinations.java b/test/hotspot/jtreg/gc/g1/TestConcParallelGCThreadsCombinations.java new file mode 100644 index 000000000000..81808658dbff --- /dev/null +++ b/test/hotspot/jtreg/gc/g1/TestConcParallelGCThreadsCombinations.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package gc.g1; + +/* + * @test + * @bug 8395992 + * @requires vm.gc.G1 + * @summary Test valid and invalid combinations of ConcGCThreads and ParallelGCThreads and the expected error message when invalid. + * @library /test/lib + * @modules java.base/jdk.internal.misc + * @run driver gc.g1.TestConcParallelGCThreadsCombinations + */ + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +public class TestConcParallelGCThreadsCombinations { + + public static void runTest(int concGCThreads, int parallelGCThreads, boolean expectSuccess) throws Exception { + final String[] arguments = { + "-XX:+UseG1GC", + "-Xmx10M", + "-XX:ConcGCThreads=" + concGCThreads, + "-XX:ParallelGCThreads=" + parallelGCThreads, + GCTest.class.getName() + }; + + OutputAnalyzer output = ProcessTools.executeLimitedTestJava(arguments); + + System.out.println(output.getStdout()); + + if (expectSuccess) { + output.shouldHaveExitValue(0); + } else { + output.shouldNotHaveExitValue(0); + + String pattern = "G1 expects ConcGCThreads (" + concGCThreads + ") <= ParallelGCThreads (" + parallelGCThreads + "), " + + "verify the values of -XX:ParallelGCThreads and -XX:ConcGCThreads"; + if (output.getStdout().indexOf(pattern) == -1) { + throw new RuntimeException("Could not find expected error message."); + } + } + } + + public static void main(String[] args) throws Exception { + runTest(0, 1, true); + runTest(1, 2, true); + runTest(2, 1, false); + } + + static class GCTest { + public static void main(String [] args) { + // Nothing to do. + } + } + +} diff --git a/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java b/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java index 260c1d3804f3..cd87e62c8360 100644 --- a/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java +++ b/test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception { runTest(true, "-XX:ConcGCThreads=3", "-XX:ParallelGCThreads=3"); runTest(true, "-XX:ConcGCThreads=0", "-XX:ParallelGCThreads=3"); - runTest(true, "-XX:ConcGCThreads=4", "-XX:ParallelGCThreads=3"); + runTest(false, "-XX:ConcGCThreads=4", "-XX:ParallelGCThreads=3"); // With that high ParallelGCThreads the default ergonomics would calculate // a mark stack size higher than maximum mark stack size. From 61d7effba7bc5c689a48335963f0304a942d5b99 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Thu, 5 Nov 2026 16:21:31 +0000 Subject: [PATCH 015/110] 8392940: G1: Card set memory usage logging can show wrong values Reviewed-by: ayang, eosterlund --- src/hotspot/share/gc/g1/g1CardSetMemory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp index 95a32bae7668..dc9f6620c62b 100644 --- a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp +++ b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp @@ -55,12 +55,12 @@ void G1CardSetAllocator::drop_all() { size_t G1CardSetAllocator::mem_size() const { return sizeof(*this) + num_segments() * sizeof(Segment) + - _arena.num_total_slots() * _arena.slot_size(); + (size_t)_arena.num_total_slots() * _arena.slot_size(); } size_t G1CardSetAllocator::unused_mem_size() const { - uint num_unused_slots = (_arena.num_total_slots() - _arena.num_allocated_slots()) + - (uint)_free_slots_list.free_count(); + size_t num_unused_slots = (_arena.num_total_slots() - _arena.num_allocated_slots()) + + _free_slots_list.free_count(); return num_unused_slots * _arena.slot_size(); } From 13f1727ee5ef6b1cf12c46228242432c33949b8b Mon Sep 17 00:00:00 2001 From: Jayathirth D V Date: Thu, 5 Nov 2026 17:07:02 +0000 Subject: [PATCH 016/110] 8394183: TIFF ImageReader throws ArrayIndexOutOfBoundsException for truncated LZW strips Reviewed-by: azvegint, kizune, prr --- .../plugins/tiff/TIFFLZWDecompressor.java | 7 +- .../plugins/tiff/TIFFTruncatedLZWTest.java | 84 +++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 test/jdk/javax/imageio/plugins/tiff/TIFFTruncatedLZWTest.java diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java index dcf5b2a7f71d..9352a9c8775f 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,6 +132,11 @@ public void decodeRaw(byte[] b, public int decode(byte[] sdata, int srcOffset, byte[] ddata, int dstOffset) throws IOException { + // TIFF spec requires at least 9 bit ClearCode & 9 bit EOI code + // in a LZW strip. + if (sdata.length < 3) { + throw new IIOException("Invalid LZW compressed strip/tile data"); + } if (sdata[0] == (byte)0x00 && sdata[1] == (byte)0x01) { throw new IIOException ("TIFF 5.0-style LZW compression is not supported!"); diff --git a/test/jdk/javax/imageio/plugins/tiff/TIFFTruncatedLZWTest.java b/test/jdk/javax/imageio/plugins/tiff/TIFFTruncatedLZWTest.java new file mode 100644 index 000000000000..2e8ce960b4ad --- /dev/null +++ b/test/jdk/javax/imageio/plugins/tiff/TIFFTruncatedLZWTest.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8394183 + * @summary Ensure that we throw IIOException while reading TIFF + image using LZW compression and truncated strip data + * @run main TIFFTruncatedLZWTest + */ + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.Iterator; +import java.util.Objects; +import javax.imageio.IIOException; +import javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.stream.ImageInputStream; + +public class TIFFTruncatedLZWTest { + static boolean testFailed = true; + public static void main(String[] args) throws Exception { + var b = ByteBuffer.allocate(75).order(ByteOrder.LITTLE_ENDIAN); + b.putShort((short) 0x4949).putShort((short) 42).putInt(8) + .putShort((short) 5); + for (int[] t : new int[][] { + {256,4,1}, // width + {257,4,1}, // height + {259,3,5}, // Use LZW compression + {273,4,74}, // StripOffset + {279,4,1} // StripByteCount value 1 + }) { + b.putShort((short) t[0]).putShort((short) t[1]) + .putInt(1).putInt(t[2]); + } + Iterator readers = + ImageIO.getImageReadersByFormatName("TIFF"); + if (!readers.hasNext()) { + throw new IOException("No TIFF reader available"); + } + + ImageReader reader = readers.next(); + try (ImageInputStream input = ImageIO.createImageInputStream( + new ByteArrayInputStream(b.array()))) { + reader.setInput(input); + reader.read(0); // first image in the TIFF + } catch (IIOException e) { + if (Objects.equals(e.getMessage(), "Invalid LZW" + + " compressed strip/tile data")) { + testFailed = false; + } + } finally { + reader.dispose(); + } + + if (testFailed) { + throw new RuntimeException("Test didn't" + + " throw expected IIOException"); + } + } +} From 5482bbbf63473c28bfb14a5dca59935da55651e9 Mon Sep 17 00:00:00 2001 From: Justin Lu Date: Thu, 5 Nov 2026 17:25:35 +0000 Subject: [PATCH 017/110] 8396063: Reevaluate CachedRowSetWriter key columns during updateResolvedConflictToDB Reviewed-by: lancea --- .../rowset/internal/CachedRowSetWriter.java | 113 +++++++----------- 1 file changed, 43 insertions(+), 70 deletions(-) diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java index 119c9d22165e..49d518acb524 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java @@ -1265,18 +1265,12 @@ private void buildKeyDesc(CachedRowSet crs) throws SQLException { * @throws SQLException if a database access error occurs */ private String buildWhereClause(ResultSet rs) throws SQLException { - return buildWhereClause(rs, callerMd, params, keyCols); - } - - // Allows `updateResolvedConflictToDB` to provide its own metadata, key cols, and populate its params - private String buildWhereClause(ResultSet rs, ResultSetMetaData metaData, Object[] params, int[] keyCols) - throws SQLException { StringBuilder whereClause = new StringBuilder("WHERE "); for (int i = 0; i < keyCols.length; i++) { if (i > 0) { whereClause.append("AND "); } - whereClause.append(metaData.getColumnName(keyCols[i])); + whereClause.append(callerMd.getColumnName(keyCols[i])); params[i] = rs.getObject(keyCols[i]); if (rs.wasNull()) { whereClause.append(" IS NULL "); @@ -1288,73 +1282,52 @@ private String buildWhereClause(ResultSet rs, ResultSetMetaData metaData, Object } void updateResolvedConflictToDB(CachedRowSet crs, Connection con) throws SQLException { - //String updateExe = ; - PreparedStatement pStmt ; - String strExec =" "; - String strUpdate = "UPDATE "; - int icolCount = crs.getMetaData().getColumnCount(); - int keyColumns[] = crs.getKeyColumns(); - Object param[]; - String strSet=""; - - if (keyColumns == null || keyColumns.length == 0) { - keyColumns = new int[icolCount]; - for (int i = 0; i < keyColumns.length; ) { - keyColumns[i] = ++i; - } - } - param = new Object[keyColumns.length]; + int icolCount = crs.getMetaData().getColumnCount(); + StringBuilder strSet = new StringBuilder(); + String strUpdate = "UPDATE " + buildTableName(con.getMetaData(), + crs.getMetaData().getCatalogName(1), + crs.getMetaData().getSchemaName(1), + crs.getTableName()); + + // changed or updated values will become part of set clause here + strUpdate += "SET "; + boolean first = true; - strUpdate = "UPDATE " + buildTableName(con.getMetaData(), - crs.getMetaData().getCatalogName(1), - crs.getMetaData().getSchemaName(1), - crs.getTableName()); + for (int i = 1; i <= icolCount; i++) { + if (crs.columnUpdated(i)) { + strSet.append(first ? "" : ", "); + strSet.append(crs.getMetaData().getColumnName(i)); + strSet.append(" = ? "); + first = false; + } + } - // changed or updated values will become part of - // set clause here - strUpdate += "SET "; + // keycols will become part of where clause + strUpdate += strSet.toString(); + strUpdate += buildWhereClause(crs); + try (PreparedStatement pStmt = con.prepareStatement(strUpdate)) { + int idx = 0; + for (int i = 0; i < icolCount; i++) { + if (crs.columnUpdated(i + 1)) { + Object obj = crs.getObject(i + 1); + if (obj != null) { + pStmt.setObject(++idx, obj); + } else { + pStmt.setNull(i + 1, crs.getMetaData().getColumnType(i + 1)); + } + } + } - boolean first = true; + // Set the key cols for after WHERE =? clause + for (int i = 0; i < keyCols.length; i++) { + if (params[i] != null) { + pStmt.setObject(++idx, params[i]); + } + } - for (int i=1; i<=icolCount;i++) { - if (crs.columnUpdated(i)) { - if (first == false) { - strSet += ", "; - } - strSet += crs.getMetaData().getColumnName(i); - strSet += " = ? "; - first = false; - } //end if - } //end for - - // keycols will become part of where clause - strUpdate += strSet; - - strUpdate += buildWhereClause(crs, crs.getMetaData(), param, keyColumns); - - pStmt = con.prepareStatement(strUpdate); - - int idx =0; - for (int i = 0; i < icolCount; i++) { - if(crs.columnUpdated(i+1)) { - Object obj = crs.getObject(i+1); - if (obj != null) { - pStmt.setObject(++idx, obj); - } else { - pStmt.setNull(i + 1,crs.getMetaData().getColumnType(i + 1)); - } //end if ..else - } //end if crs.column... - } //end for - - // Set the key cols for after WHERE =? clause - for (int i = 0; i < keyColumns.length; i++) { - if (param[i] != null) { - pStmt.setObject(++idx, param[i]); - } - } - - int id = pStmt.executeUpdate(); - } + pStmt.executeUpdate(); + } + } /** From dba05e0a3774323919ee218ff038d47580caa595 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Thu, 5 Nov 2026 17:37:50 +0000 Subject: [PATCH 018/110] 8396681: Test runtime/cds/DeterministicDump.java fails with mismatched _value_field_info_array Reviewed-by: stefank, iveresov --- src/hotspot/share/oops/layoutKind.hpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/oops/layoutKind.hpp b/src/hotspot/share/oops/layoutKind.hpp index 54c3c10ed1a4..8f03d1390a8d 100644 --- a/src/hotspot/share/oops/layoutKind.hpp +++ b/src/hotspot/share/oops/layoutKind.hpp @@ -167,11 +167,20 @@ class FlatLayoutSlot { // This is only set when a flat layout is present. FlatLayout _flat_layout; - // This bool is set when the flat layout is not present. - // - // Its value is used to determine if this slot should be considered - // initialized - bool _initialized_non_flat; + struct { + // This bool is set when the flat layout is not present. + // + // Its value is used to determine if this slot should be considered + // initialized + bool _initialized_non_flat; + + // Paddings to ensure deterministic content in AOT cache. They prevent + // the C++ compiler from potentially inserting random values in unused gaps. + static_assert(sizeof(FlatLayout) == 4); + bool _padding1; + bool _padding2; + bool _padding3; + }; }; public: @@ -179,7 +188,8 @@ class FlatLayoutSlot { : _flat_layout(flat_layout) {} explicit FlatLayoutSlot(bool initialized_non_flat = false) - : _initialized_non_flat(initialized_non_flat) {} + : _initialized_non_flat(initialized_non_flat), + _padding1(0), _padding2(0), _padding3(0) {} // Get the FlatLayout. The external has_flat_layout discriminator is used to // catch when code tries to fetch layout without having a flat layout. From d4d72b0a353b2280f9a566af611668911ce2c02d Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Thu, 5 Nov 2026 18:20:46 +0000 Subject: [PATCH 019/110] 8390238: [leyden] Enable AOT code caching with Valhalla Co-authored-by: Andrew Dinn Reviewed-by: heidinga, iklam, adinn --- .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp | 17 +- .../cpu/aarch64/macroAssembler_aarch64.cpp | 26 +- src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp | 17 +- src/hotspot/cpu/x86/macroAssembler_x86.cpp | 26 +- src/hotspot/share/c1/c1_Compilation.cpp | 1 + src/hotspot/share/c1/c1_GraphBuilder.cpp | 14 +- src/hotspot/share/c1/c1_GraphBuilder.hpp | 1 + src/hotspot/share/cds/aotCacheAccess.hpp | 1 - src/hotspot/share/cds/filemap.hpp | 1 + src/hotspot/share/cds/finalImageRecipes.cpp | 30 ++- src/hotspot/share/cds/finalImageRecipes.hpp | 4 +- src/hotspot/share/ci/ciEnv.cpp | 3 +- src/hotspot/share/ci/ciEnv.hpp | 1 + src/hotspot/share/ci/ciValueKlass.cpp | 6 + src/hotspot/share/ci/ciValueKlass.hpp | 1 + src/hotspot/share/code/aotCodeCache.cpp | 131 ++++++++- src/hotspot/share/code/aotCodeCache.hpp | 9 +- src/hotspot/share/opto/memnode.cpp | 4 +- src/hotspot/share/opto/output.cpp | 21 ++ src/hotspot/share/opto/output.hpp | 3 + src/hotspot/share/opto/valuetypenode.cpp | 8 + src/hotspot/share/runtime/sharedRuntime.cpp | 7 + src/hotspot/share/runtime/sharedRuntime.hpp | 2 + .../cds/appcds/aotCode/AOTCodeTest.java | 4 +- .../appcds/aotCode/TestAOTLocalDateTime.java | 252 ++++++++++++++++++ test/jtreg-ext/requires/VMProps.java | 1 - 26 files changed, 556 insertions(+), 35 deletions(-) create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp index 6c9a21a5cb13..827535633fd5 100644 --- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp @@ -491,7 +491,22 @@ void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) { if (vk->can_be_returned_as_fields()) { address unpack_handler = vk->unpack_handler(); assert(unpack_handler != nullptr, "must be"); - __ far_call(RuntimeAddress(unpack_handler)); +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + // in AOT compiled code call the unpack handler indirectly + // via the klass. The handler's blob does not currently get + // saved to the archive. So, a direct call to the handler + // address cannot be injected into a caller that is saved + // and restored. + __ mov_metadata(rscratch1, vk->constant_encoding()); + __ ldr(rscratch1, Address(rscratch1, ValueKlass::adr_members_offset())); + __ ldr(rscratch1, Address(rscratch1, ValueKlass::unpack_handler_offset())); + __ blr(rscratch1); + } else +#endif + { + __ far_call(RuntimeAddress(unpack_handler)); + } } } else if (return_type->is_instance_klass() && (!return_type->is_loaded() || StressCallingConvention)) { Label skip; diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp index 0f8217978c45..49ba595ba6da 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp @@ -7125,7 +7125,14 @@ int MacroAssembler::store_value_type_fields_to_buf(ciValueKlass* vk, bool from_i if (vk != nullptr) { // Called from C1, where the return type is statically known. - movptr(klass, (intptr_t)vk->get_ValueKlass()); +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + mov_metadata(klass, vk->constant_encoding()); + } else +#endif + { + movptr(klass, (intptr_t)vk->get_ValueKlass()); + } jint lh = vk->layout_helper(); assert(lh != Klass::_lh_neutral_value, "value class in return type must have been resolved"); if (UseTLAB && !Klass::layout_helper_needs_slow_path(lh)) { @@ -7164,7 +7171,22 @@ int MacroAssembler::store_value_type_fields_to_buf(ciValueKlass* vk, bool from_i } // 3. Initialize its fields with a value class specific handler if (vk != nullptr) { - far_call(RuntimeAddress(vk->pack_handler())); // no need for call info as this will not safepoint. +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + // in AOT compiled code call the pack handler indirectly via + // the klass. The handler's blob does not currently get saved + // to the archive. So, a direct call to the handler address + // cannot be injected into a caller that is saved and + // restored. + mov_metadata(tmp1, vk->constant_encoding()); + ldr(tmp1, Address(tmp1, ValueKlass::adr_members_offset())); + ldr(tmp1, Address(tmp1, ValueKlass::pack_handler_offset())); + blr(tmp1); + } else +#endif + { + far_call(RuntimeAddress(vk->pack_handler())); // no need for call info as this will not safepoint. + } } else { ldr(tmp1, Address(klass, ValueKlass::adr_members_offset())); ldr(tmp1, Address(tmp1, ValueKlass::pack_handler_offset())); diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp index bd3755b96a21..7cf0f934ede3 100644 --- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp @@ -482,7 +482,22 @@ void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) { if (vk->can_be_returned_as_fields()) { address unpack_handler = vk->unpack_handler(); assert(unpack_handler != nullptr, "must be"); - __ call(RuntimeAddress(unpack_handler)); +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + // in AOT compiled code call the unpack handler indirectly + // via the klass. The handler's blob does not currently get + // saved to the archive. So, a direct call to the handler + // address cannot be injected into a caller that is saved + // and restored. + __ mov_metadata(rdi, vk->constant_encoding()); + __ movptr(rdi, Address(rdi, ValueKlass::adr_members_offset())); + __ movptr(rdi, Address(rdi, ValueKlass::unpack_handler_offset())); + __ call(rdi); + } else +#endif + { + __ call(RuntimeAddress(unpack_handler)); + } } } else if (return_type->is_instance_klass() && (!return_type->is_loaded() || StressCallingConvention)) { Label skip; diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp index 7c7d3e502a7b..f6e274ab09ea 100644 --- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp @@ -6030,7 +6030,14 @@ int MacroAssembler::store_value_type_fields_to_buf(ciValueKlass* vk, bool from_i mov(rscratch1, rax); // save rax for slow_case since *_allocate may corrupt it when allocation failed if (vk != nullptr) { // Called from C1, where the return type is statically known. - movptr(rbx, (intptr_t)vk->get_ValueKlass()); +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + mov_metadata(rbx, vk->constant_encoding()); + } else +#endif + { + movptr(rbx, (intptr_t)vk->get_ValueKlass()); + } jint lh = vk->layout_helper(); assert(lh != Klass::_lh_neutral_value, "value class in return type must have been resolved"); if (UseTLAB && !Klass::layout_helper_needs_slow_path(lh)) { @@ -6072,7 +6079,22 @@ int MacroAssembler::store_value_type_fields_to_buf(ciValueKlass* vk, bool from_i } // 3. Initialize its fields with a value class specific handler if (vk != nullptr) { - call(RuntimeAddress(vk->pack_handler())); // no need for call info as this will not safepoint. +#if INCLUDE_CDS + if (AOTCodeCache::is_on_for_dump()) { + // in AOT compiled code call the pack handler indirectly via + // the klass. The handler's blob does not currently get saved + // to the archive. So, a direct call to the handler address + // cannot be injected into a caller that is saved and + // restored. + mov_metadata(rbx, vk->constant_encoding()); + movptr(rbx, Address(rbx, ValueKlass::adr_members_offset())); + movptr(rbx, Address(rbx, ValueKlass::pack_handler_offset())); + call(rbx); + } else +#endif + { + call(RuntimeAddress(vk->pack_handler())); // no need for call info as this will not safepoint. + } } else { movptr(rbx, Address(klass, ValueKlass::adr_members_offset())); movptr(rbx, Address(rbx, ValueKlass::pack_handler_offset())); diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp index 10f506f5526f..0f62f39d5647 100644 --- a/src/hotspot/share/c1/c1_Compilation.cpp +++ b/src/hotspot/share/c1/c1_Compilation.cpp @@ -425,6 +425,7 @@ void Compilation::install_code(int frame_size) { debug_info_recorder()->_oopmaps, exception_handler_table(), implicit_exception_table(), + nullptr, // java_callees compiler(), false, // has_clinit_barriers false, // for_preload diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp index 873fb0d8f726..5e46b52ad594 100644 --- a/src/hotspot/share/c1/c1_GraphBuilder.cpp +++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp @@ -44,6 +44,7 @@ #include "interpreter/bytecode.hpp" #include "jfr/jfrEvents.hpp" #include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" #include "runtime/arguments.hpp" #include "runtime/sharedRuntime.hpp" #include "utilities/checkedCast.hpp" @@ -1838,6 +1839,17 @@ void GraphBuilder::copy_value_content(ciValueKlass* vk, Value src, int src_off, } } +Value GraphBuilder::load_null_reset_value(ciValueKlass* vk) { + if (compilation()->env()->is_aot_compile()) { + // Null-reset value is stored in the class mirror. + Value mirror = append(new Constant(new InstanceConstant(vk->java_mirror()))); // Creates oop relocation + Value offset = append(new Constant(new LongConstant(vk->get_null_reset_value_offset()))); + return append(new UnsafeGet(T_OBJECT, mirror, offset, /*is_volatile*/false,/*is_raw*/false)); + } else { + return append(new Constant(new ObjectConstant(vk->get_null_reset_value().as_object()))); + } +} + void GraphBuilder::access_field(Bytecodes::Code code) { bool will_link; ciField* field = stream()->get_field(will_link); @@ -2168,7 +2180,7 @@ void GraphBuilder::access_field(Bytecodes::Code code) { // Store the subfields when field is a nullable non-atomic field Value object_null = append(new Constant(objectNull)); - Value null_reset_value = append(new Constant(new ObjectConstant(value_klass->get_null_reset_value().as_object()))); + Value null_reset_value = load_null_reset_value(value_klass); Value src = append(new IfOp(val, Instruction::neq, object_null, val, null_reset_value, state_before, false)); copy_value_content(value_klass, src, value_klass->payload_offset(), obj, offset, state_before, null_checks); assert(!null_checks.needs_src && !null_checks.needs_dst, "null checks should have been emitted"); diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp index e6cb358fc901..96696e89a090 100644 --- a/src/hotspot/share/c1/c1_GraphBuilder.hpp +++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp @@ -306,6 +306,7 @@ class GraphBuilder { void copy_value_content(ciValueKlass* vk, Value src, int src_off, Value dest, int dest_off, ValueStack* state_before, CopyNullChecks& null_checks, ciField* enclosing_field = nullptr); + Value load_null_reset_value(ciValueKlass* vk); // stack/code manipulation helpers Instruction* append_with_bci(Instruction* instr, int bci); diff --git a/src/hotspot/share/cds/aotCacheAccess.hpp b/src/hotspot/share/cds/aotCacheAccess.hpp index 1b26a81cd1e8..3912cca3148d 100644 --- a/src/hotspot/share/cds/aotCacheAccess.hpp +++ b/src/hotspot/share/cds/aotCacheAccess.hpp @@ -118,7 +118,6 @@ class AOTCacheAccess : AllStatic { static bool map_aot_code_region(ReservedSpace rs) NOT_CDS_RETURN_(false); static void unmap_aot_code_region() NOT_CDS_RETURN; - static bool is_aot_code_region_empty() NOT_CDS_RETURN_(true); template diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp index 56d5a11bf0a5..f3cc4fe517b4 100644 --- a/src/hotspot/share/cds/filemap.hpp +++ b/src/hotspot/share/cds/filemap.hpp @@ -112,6 +112,7 @@ class FileMapRegion: private CDSFileMapRegion { f(UseNullableAtomicValueFlattening) \ f(UseNullableNonAtomicValueFlattening) \ f(FlatteningBudget) \ + f(FlatArrayElementMaxOops) \ f(RestrictReservedStack) \ f(DiagnoseSyncOnValueBasedClasses) diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp index b5114e6f581f..3c2727e276d8 100644 --- a/src/hotspot/share/cds/finalImageRecipes.cpp +++ b/src/hotspot/share/cds/finalImageRecipes.cpp @@ -182,11 +182,9 @@ void FinalImageRecipes::apply_recipes_for_constantpool(JavaThread* current) { } void FinalImageRecipes::load_all_classes(TRAPS) { - assert(CDSConfig::is_dumping_final_static_archive(), "sanity"); Handle class_loader(THREAD, SystemDictionary::java_system_loader()); for (int i = 0; i < _all_klasses->length(); i++) { Klass* k = _all_klasses->at(i); - int flags = _flags->at(i); if (k->is_instance_klass()) { InstanceKlass* ik = InstanceKlass::cast(k); if (ik->defined_by_other_loaders()) { @@ -201,8 +199,32 @@ void FinalImageRecipes::load_all_classes(TRAPS) { AOTMetaspace::unrecoverable_writing_error(); } assert(ik->is_loaded(), "must be"); + } + } + } +} + +void FinalImageRecipes::link_all_classes(TRAPS) { + for (int i = 0; i < _all_klasses->length(); i++) { + Klass* k = _all_klasses->at(i); + if (k->is_instance_klass()) { + InstanceKlass* ik = InstanceKlass::cast(k); + if (!ik->defined_by_other_loaders() && !ik->is_hidden()) { + assert(ik->is_loaded(), "must be"); ik->link_class(CHECK); + } + } + } +} +void FinalImageRecipes::initialize_all_safe_classes(TRAPS) { + for (int i = 0; i < _all_klasses->length(); i++) { + Klass* k = _all_klasses->at(i); + int flags = _flags->at(i); + if (k->is_instance_klass()) { + InstanceKlass* ik = InstanceKlass::cast(k); + if (!ik->defined_by_other_loaders() && !ik->is_hidden()) { + assert(ik->is_linked(), "must be"); if (ik->has_aot_safe_initializer() && (flags & WAS_INITED) != 0) { assert(ik->class_loader() == nullptr, "supported only for boot classes for now"); ResourceMark rm(THREAD); @@ -237,8 +259,12 @@ void FinalImageRecipes::apply_recipes(TRAPS) { _final_image_recipes = nullptr; } +// Follow the same class processing phases as during production run void FinalImageRecipes::apply_recipes_impl(TRAPS) { + assert(CDSConfig::is_dumping_final_static_archive(), "sanity"); load_all_classes(CHECK); + link_all_classes(CHECK); + initialize_all_safe_classes(CHECK); apply_recipes_for_constantpool(THREAD); } diff --git a/src/hotspot/share/cds/finalImageRecipes.hpp b/src/hotspot/share/cds/finalImageRecipes.hpp index 8c6038c2ab4a..f665534b9c9a 100644 --- a/src/hotspot/share/cds/finalImageRecipes.hpp +++ b/src/hotspot/share/cds/finalImageRecipes.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,6 +67,8 @@ class FinalImageRecipes { // Called when dumping final image void apply_recipes_impl(TRAPS); void load_all_classes(TRAPS); + void link_all_classes(TRAPS); + void initialize_all_safe_classes(TRAPS); void apply_recipes_for_constantpool(JavaThread* current); public: diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index 4b649c5dd482..a83a7b11bcaa 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -1204,6 +1204,7 @@ void ciEnv::register_method(ciMethod* target, OopMapSet* oop_map_set, ExceptionHandlerTable* handler_table, ImplicitExceptionTable* inc_table, + GrowableArray* java_callees, AbstractCompiler* compiler, bool has_clinit_barriers, bool for_aot_preload, @@ -1289,7 +1290,7 @@ void ciEnv::register_method(ciMethod* target, log.print_cr("%s", ss.freeze()); } #endif - AOTCodeEntry* aot_code_entry = AOTCodeCache::store_nmethod(nm, compiler, for_aot_preload); + AOTCodeEntry* aot_code_entry = AOTCodeCache::store_nmethod(nm, java_callees, compiler, for_aot_preload); if (aot_code_entry != nullptr) { aot_code_entry->set_has_vectors(debug_info()->has_vectors()); nm->set_aot_code_entry(aot_code_entry); diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp index 40633ddfb159..8d2da710f433 100644 --- a/src/hotspot/share/ci/ciEnv.hpp +++ b/src/hotspot/share/ci/ciEnv.hpp @@ -413,6 +413,7 @@ class ciEnv : StackObj { OopMapSet* oop_map_set, ExceptionHandlerTable* handler_table, ImplicitExceptionTable* inc_table, + GrowableArray* java_callees, AbstractCompiler* compiler, bool has_clinit_barriers, bool for_aot_preload, diff --git a/src/hotspot/share/ci/ciValueKlass.cpp b/src/hotspot/share/ci/ciValueKlass.cpp index df27b679b1a6..6adc20a09828 100644 --- a/src/hotspot/share/ci/ciValueKlass.cpp +++ b/src/hotspot/share/ci/ciValueKlass.cpp @@ -165,6 +165,12 @@ ciConstant ciValueKlass::get_null_reset_value() { return ciConstant(T_OBJECT, CURRENT_ENV->get_object(null_reset_value)); } +int ciValueKlass::get_null_reset_value_offset() { + VM_ENTRY_MARK + ValueKlass* vk = get_ValueKlass(); + return vk->null_reset_value_offset(); +} + ArrayDescription ciValueKlass::array_description_of_array_properties(const ArrayProperties& requested_properties) { GUARDED_VM_ENTRY(return ObjArrayKlass::array_layout_selection(get_ValueKlass(), requested_properties);) } diff --git a/src/hotspot/share/ci/ciValueKlass.hpp b/src/hotspot/share/ci/ciValueKlass.hpp index 14085afbb7d2..a3d4ac8fb494 100644 --- a/src/hotspot/share/ci/ciValueKlass.hpp +++ b/src/hotspot/share/ci/ciValueKlass.hpp @@ -83,6 +83,7 @@ class ciValueKlass : public ciInstanceKlass { int field_map_offset() const; ciConstant get_field_map() const; ciConstant get_null_reset_value(); + int get_null_reset_value_offset(); ArrayDescription array_description_of_array_properties(const ArrayProperties&); }; diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp index b2cd01c83ad1..10bf9fcbe82e 100644 --- a/src/hotspot/share/code/aotCodeCache.cpp +++ b/src/hotspot/share/code/aotCodeCache.cpp @@ -243,12 +243,6 @@ void AOTCodeCache::enable_caching() { load_info_log().print_cr("AOT Code Cache is not supported on this platform"); disable_caching(); #else - if (Arguments::is_valhalla_enabled()) { - // Disable AOT code caching when Valhalla is enabled. - load_info_log().print_cr("AOT Code Caching is not supported with Valhalla"); - disable_caching(); - return; - } FLAG_SET_ERGO_IF_DEFAULT(AOTCodeCaching, true); FLAG_SET_ERGO_IF_DEFAULT(AOTStubCaching, true); FLAG_SET_ERGO_IF_DEFAULT(AOTAdapterCaching, true); @@ -307,11 +301,6 @@ void AOTCodeCache::initialize() { } assert(!FLAG_IS_DEFAULT(AOTCache), "AOTCache should be specified"); - if (VerifyOops && ValueTypePassFieldsAsArgs) { - load_info_log().print_cr("AOT Adapter Caching is not supported with VerifyOops + ValueTypePassFieldsAsArgs."); - FLAG_SET_ERGO(AOTAdapterCaching, false); - } - bool is_dumping = false; bool is_using = false; if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) { @@ -2632,7 +2621,8 @@ void AOTCodeCache::publish_stub_addresses(CodeBlob &code_blob, BlobId blob_id, A } } -AOTCodeEntry* AOTCodeCache::store_nmethod(nmethod* nm, AbstractCompiler* compiler, bool for_preload) { +AOTCodeEntry* AOTCodeCache::store_nmethod(nmethod* nm, GrowableArray* java_callees, + AbstractCompiler* compiler, bool for_preload) { if (!is_dumping_code()) { return nullptr; } @@ -2652,7 +2642,7 @@ AOTCodeEntry* AOTCodeCache::store_nmethod(nmethod* nm, AbstractCompiler* compile assert(comp_level == CompLevel_simple || comp_level == CompLevel_limited_profile || comp_level == CompLevel_full_optimization, "must be"); TraceTime t1("Total time to store AOT code", &_t_totalStore, enable_timers(), false); - AOTCodeEntry* entry = cache->write_nmethod(nm, for_preload); + AOTCodeEntry* entry = cache->write_nmethod(nm, java_callees, for_preload); { ResourceMark rm; const char* name = nm->method()->name_and_sig_as_C_string(); @@ -2665,7 +2655,7 @@ AOTCodeEntry* AOTCodeCache::store_nmethod(nmethod* nm, AbstractCompiler* compile return entry; } -AOTCodeEntry* AOTCodeCache::write_nmethod(nmethod* nm, bool for_preload) { +AOTCodeEntry* AOTCodeCache::write_nmethod(nmethod* nm, GrowableArray* java_callees, bool for_preload) { assert(!nm->has_clinit_barriers() || (ClassInitBarrierMode > 0), "sanity"); _compile_id = nm->compile_id(); _comp_level = nm->comp_level(); @@ -2739,6 +2729,39 @@ AOTCodeEntry* AOTCodeCache::write_nmethod(nmethod* nm, bool for_preload) { } } + if (ValueTypePassFieldsAsArgs) { + // Record method fingerprint to match it on load. + if (!write_fingerprint(method)) { + if (lookup_failed() && !failed()) { + // Skip this method and reposition file + set_write_position(entry_position); + } + return nullptr; + } + // Record not inlined Java callee fingerprints + int callee_cnt = java_callees == nullptr ? 0 : java_callees->length(); + if (!write_int(callee_cnt)) { + return nullptr; + } + for (int i = 0; i < callee_cnt; i++) { + Method* m = java_callees->at(i)->get_Method(); + if (!write_method(m)) { + if (lookup_failed() && !failed()) { + // Skip this method and reposition file + set_write_position(entry_position); + } + return nullptr; + } + if (!write_fingerprint(m)) { + if (lookup_failed() && !failed()) { + // Skip this method and reposition file + set_write_position(entry_position); + } + return nullptr; + } + } + } // ValueTypePassFieldsAsArgs + // Write nmethod's code blob if (!align_write()) { return nullptr; @@ -2871,6 +2894,7 @@ bool AOTCodeCache::load_nmethod(ciEnv* env, ciMethod* target, int entry_bci, Abs // Cached nmethod layout // - id (encoded Method*) // - name of method +// - method's adapter fingerprint // - copy of nmethod // - relocation_size // - relocations @@ -2921,6 +2945,39 @@ bool AOTCodeReader::compile_nmethod(ciEnv* env, ciMethod* target, AbstractCompil log_info(aot, codecache, nmethod)("%d (A%s%d) '%s' AOT nmethod id: " UINT32_FORMAT_X_0 "%s: %sloading from AOT Code Cache", compile_id(), (preload ? "P" : ""), comp_level(), target_name, id, (clinit_brs ? ", has clinit barriers" : ""), (preload ? "pre" : "")); + + if (ValueTypePassFieldsAsArgs) { + // Verify recorded method fingerprint. + if (!verify_fingerprint(method())) { + return false; + } + // Verify recorded not inlined Java callee fingerprints + int callee_cnt; + if (!read_int(&callee_cnt)) { + return false; + } + if (callee_cnt < 0) { + set_lookup_failed("Damaged AOT code: negative callee count"); + return false; + } + for (int i = 0; i < callee_cnt; i++) { + DataKind kind; + if (!read_kind(&kind)) { + return false; + } + if (kind != DataKind::Method) { + set_lookup_failed("Invalid DataKind when Method is expected"); + return false; + } + Method* m = read_method(); + if (m == nullptr) { + return false; + } + if (!verify_fingerprint(m)) { + return false; + } + } + } // ValueTypePassFieldsAsArgs } if (!align_read_position(DATA_ALIGNMENT)) { @@ -3601,6 +3658,52 @@ Metadata* AOTCodeReader::read_metadata(JavaThread* thread) { return m; } +bool AOTCodeCache::write_fingerprint(Method* method) { + if (method->adapter() == nullptr) { + ResourceMark rm; + log_debug(aot, codecache, metadata)("%d (A%d): Method is missing adapter: %s", + compile_id(), comp_level(), method->name_and_sig_as_C_string()); + set_lookup_failed(); + return false; + } + AdapterFingerPrint* fp = method->adapter()->fingerprint(); + int sz = BytesPerWord * method->adapter()->fingerprint_size(); + if (!write_int(sz)) { + return false; + } + if (!align_write_bytes(BytesPerWord)) { + return false; + } + if (!write_bytes((address)fp, sz)) { + return false; + } + return true; +} + +bool AOTCodeReader::verify_fingerprint(Method* method) { + int fp_size = BytesPerWord * method->adapter()->fingerprint_size(); + int archived_fp_size; + if (!read_int(&archived_fp_size)) { + return false; + } + if (archived_fp_size != fp_size) { + set_lookup_failed("Cached method's adapter fingerprint size is different from the expected"); + return false; // Skip this nmethod + } + if (!align_read_position(BytesPerWord)) { + return false; + } + AdapterFingerPrint* archived_fp; + if (!get_set_read_position((address*)&archived_fp, (uint)fp_size)) { + return false; + } + if (!method->adapter()->fingerprint_equals(archived_fp)) { + set_lookup_failed("Cached method's adapter fingerprint is different from the expected"); + return false; // Skip this nmethod + } + return true; +} + bool AOTCodeCache::write_method(Method* method) { ResourceMark rm; // To method's name printing if (AOTCacheAccess::can_generate_aot_code(method)) { diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp index 9f4bf9be6ff3..99cacf81d7c6 100644 --- a/src/hotspot/share/code/aotCodeCache.hpp +++ b/src/hotspot/share/code/aotCodeCache.hpp @@ -712,7 +712,7 @@ class AOTCodeCache : public CHeapObj { private: // Here should be version and other verification fields enum { - AOT_CODE_VERSION = 2 // Bump this number in releases where Header layout changes + AOT_CODE_VERSION = 3 // Bump this number in releases where Header layout changes }; uint _version; // AOT code version (should match when reading code cache) uint _cache_size; // cache size in bytes @@ -972,6 +972,7 @@ class AOTCodeCache : public CHeapObj { bool write_klass(Klass* klass); bool write_method(Method* method); + bool write_fingerprint(Method* method); bool write_relocations(CodeBlob& code_blob, RelocIterator& iter, bool assert_for_unknown_external_address, @@ -1008,7 +1009,7 @@ class AOTCodeCache : public CHeapObj { const char* name, AOTStubData* stub_data) NOT_CDS_RETURN_(nullptr); - AOTCodeEntry* write_nmethod(nmethod* nm, bool for_preload); + AOTCodeEntry* write_nmethod(nmethod* nm, GrowableArray* java_callees, bool for_preload); public: // save and restore API for adapters @@ -1029,7 +1030,8 @@ class AOTCodeCache : public CHeapObj { static CodeBlob* load_multi_stub_blob(BlobId id, AOTStubData* stub_data) NOT_CDS_RETURN_(nullptr); // save and restore API nmethods - static AOTCodeEntry* store_nmethod(nmethod* nm, AbstractCompiler* compiler, bool for_preload) NOT_CDS_RETURN_(nullptr); + static AOTCodeEntry* store_nmethod(nmethod* nm, GrowableArray* java_callees, + AbstractCompiler* compiler, bool for_preload) NOT_CDS_RETURN_(nullptr); static bool load_nmethod(ciEnv* env, ciMethod* target, int entry_bci, AbstractCompiler* compiler) NOT_CDS_RETURN_(false); @@ -1188,6 +1190,7 @@ class AOTCodeReader { Klass* read_klass(JavaThread* thread); Method* read_method(); + bool verify_fingerprint(Method* method); oop read_oop(JavaThread* thread); Metadata* read_metadata(JavaThread* thread); diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp index e0a5ba29e2ef..0eb59a0acff6 100644 --- a/src/hotspot/share/opto/memnode.cpp +++ b/src/hotspot/share/opto/memnode.cpp @@ -2420,8 +2420,8 @@ const Type* LoadNode::Value(PhaseGVN* phase) const { const TypeInstPtr* tinst = tp->is_instptr(); BasicType bt = value_basic_type(); - // Fold loads of the field map - if (tinst != nullptr) { + // Fold the field map loads only when stable folding is enabled + if (FoldStableValues && tinst != nullptr) { ciInstanceKlass* ik = tinst->instance_klass(); int offset = tinst->offset(); if (ik == phase->C->env()->Class_klass()) { diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp index feab5c02eb4a..dee27e41a3d6 100644 --- a/src/hotspot/share/opto/output.cpp +++ b/src/hotspot/share/opto/output.cpp @@ -223,6 +223,7 @@ PhaseOutput::PhaseOutput() _node_bundling_limit(0), _node_bundling_base(nullptr), _orig_pc_slot_offset_in_bytes(0), + _java_callees(nullptr), _buf_sizes(), _block(nullptr), _index(0) { @@ -1509,6 +1510,13 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) { uint* jmp_rule = NEW_RESOURCE_ARRAY(uint,nblocks); #endif +#if INCLUDE_CDS + VectorSet callee_visited; + if (C->is_aot_compile() && ValueTypePassFieldsAsArgs) { + _java_callees = new(C->comp_arena()) GrowableArray(C->comp_arena(), 8, 0, nullptr); + } +#endif + // Create an array of unused labels, one for each basic block, if printing is enabled #if defined(SUPPORT_OPTO_ASSEMBLY) int* node_offsets = nullptr; @@ -1596,6 +1604,18 @@ void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) { current_offset = masm->offset(); } +#if INCLUDE_CDS + // Record callees for AOT code when Valhalla is enabled + // to cache their fingerprint which are verified when + // AOT code is loaded in production run. + if (C->is_aot_compile() && ValueTypePassFieldsAsArgs && + mach->is_MachCallJava() && mach->as_MachCallJava()->_method != nullptr) { + ciMethod* m = mach->as_MachCallJava()->_method; + if (!callee_visited.test_set(m->ident())) { + _java_callees->append(m); + } + } +#endif // align the instruction if necessary int padding = mach->compute_padding(current_offset); // Make sure safepoint node for polling is distinct from a call's @@ -3372,6 +3392,7 @@ void PhaseOutput::install_code(ciMethod* target, _oop_map_set, &_handler_table, inc_table(), + _java_callees, compiler, C->has_clinit_barriers(), C->for_aot_preload(), diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp index e63a7b03842b..3f4e3b283485 100644 --- a/src/hotspot/share/opto/output.hpp +++ b/src/hotspot/share/opto/output.hpp @@ -94,6 +94,9 @@ class PhaseOutput : public Phase { ConstantTable _constant_table; // The constant table for this compilation unit. + // List of not inlined Java callees + GrowableArray* _java_callees; + BufferSizingData _buf_sizes; Block* _block; uint _index; diff --git a/src/hotspot/share/opto/valuetypenode.cpp b/src/hotspot/share/opto/valuetypenode.cpp index eeb39aff9ec4..e8503aa505ce 100644 --- a/src/hotspot/share/opto/valuetypenode.cpp +++ b/src/hotspot/share/opto/valuetypenode.cpp @@ -1804,6 +1804,14 @@ Node* ValueTypeNode::is_loaded(PhaseGVN* phase, ciValueKlass* vk, Node* base, in Node* ValueTypeNode::tagged_klass(ciValueKlass* vk, PhaseGVN& gvn) { const TypeKlassPtr* tk = TypeKlassPtr::make(vk); +#if INCLUDE_CDS + if (gvn.C->is_aot_compile()) { + // Keep klass as metadata to make it relocatable for AOT code. + Node* k_con = gvn.makecon(tk); + Node* bits = gvn.transform(new CastP2XNode(nullptr, k_con)); + return gvn.transform(new OrLNode(bits, gvn.longcon(1))); + } +#endif intptr_t bits = tk->get_con(); set_nth_bit(bits, 0); return gvn.longcon((jlong)bits); diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp index 410df7464df3..6294d9c7307d 100644 --- a/src/hotspot/share/runtime/sharedRuntime.cpp +++ b/src/hotspot/share/runtime/sharedRuntime.cpp @@ -3623,6 +3623,13 @@ AdapterHandlerEntry::~AdapterHandlerEntry() { FreeHeap(this); } +int AdapterHandlerEntry::fingerprint_size() const { + return fingerprint()->size(); +} + +bool AdapterHandlerEntry::fingerprint_equals(AdapterFingerPrint* fp) const { + return fingerprint()->equals(fp); +} #ifdef ASSERT // Capture the code before relocation so that it can be compared diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp index 1ac70317edea..dcb7c57b0d85 100644 --- a/src/hotspot/share/runtime/sharedRuntime.hpp +++ b/src/hotspot/share/runtime/sharedRuntime.hpp @@ -874,6 +874,8 @@ class AdapterHandlerEntry : public MetaspaceObj { uint id() const { return _id; } AdapterFingerPrint* fingerprint() const { return _fingerprint; } + int fingerprint_size() const; + bool fingerprint_equals(AdapterFingerPrint* fp) const; #ifdef ASSERT // Used to verify that code generated for shared adapters is equivalent diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeTest.java index 2ff084d2c6ea..c78b173e194e 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeTest.java @@ -188,9 +188,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception out.shouldMatch("aot,codecache,exit.*\\s+AOT code cache size: [1-9]\\d+ bytes"); } else if (runMode == RunMode.PRODUCTION) { out.shouldMatch("aot,codecache,init.*\\s+Loaded [1-9]\\d+ AOT code entries from AOT Code Cache"); - if (!withVerifyOops) { // Adapters are not cached for VerifyOops+Valhalla - out.shouldMatch("aot,codecache,stubs.*\\s+Loaded blob.*kind=Adapter.*"); - } + out.shouldMatch("aot,codecache,stubs.*\\s+Loaded blob.*kind=Adapter.*"); out.shouldMatch("aot,codecache,stubs.*\\s+Loaded blob.*kind=SharedBlob.*"); out.shouldMatch("aot,codecache,stubs.*\\s+Loaded blob.*kind=C1Blob.*"); } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java new file mode 100644 index 000000000000..2461281a3779 --- /dev/null +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java @@ -0,0 +1,252 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test id=g1 + * @requires vm.gc.G1 + * @bug 8392086 + * @summary Test AOT compilation for Valhalla + * @requires vm.flagless + * @requires vm.cds.supports.aot.code.caching + * @requires vm.compiler1.enabled & vm.compiler2.enabled + * @library /test/lib /test/setup_aot + * @enablePreview + * @build ${test.main.class} + * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * TestLocalDateTime + * @run driver/timeout=480 ${test.main.class} G1 + */ + +/** + * @test id=parallel + * @requires vm.gc.Parallel + * @requires vm.flagless + * @requires vm.cds.supports.aot.code.caching + * @requires vm.compiler1.enabled & vm.compiler2.enabled + * @library /test/lib /test/setup_aot + * @enablePreview + * @build ${test.main.class} + * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * TestLocalDateTime + * @run driver/timeout=480 ${test.main.class} Parallel + */ + +/** + * @test id=serial + * @requires vm.gc.Serial + * @requires vm.flagless + * @requires vm.cds.supports.aot.code.caching + * @requires vm.compiler1.enabled & vm.compiler2.enabled + * @library /test/lib /test/setup_aot + * @enablePreview + * @build ${test.main.class} + * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * TestLocalDateTime + * @run driver/timeout=480 ${test.main.class} Serial + */ + +/** + * @test id=shenandoah + * @requires vm.gc.Shenandoah + * @requires vm.flagless + * @requires vm.cds.supports.aot.code.caching + * @requires vm.compiler1.enabled & vm.compiler2.enabled + * @library /test/lib /test/setup_aot + * @enablePreview + * @build ${test.main.class} + * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * TestLocalDateTime + * @run driver/timeout=480 ${test.main.class} Shenandoah + */ + +/** + * @test id=Z + * @requires vm.gc.Z + * @requires vm.flagless + * @requires vm.cds.supports.aot.code.caching + * @requires vm.compiler1.enabled & vm.compiler2.enabled + * @library /test/lib /test/setup_aot + * @enablePreview + * @build ${test.main.class} + * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * TestLocalDateTime + * @run driver/timeout=480 ${test.main.class} Z + */ + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +import jdk.test.lib.cds.CDSAppTester; +import jdk.test.lib.process.OutputAnalyzer; + +public class TestAOTLocalDateTime { + + public static void main(String... args) throws Exception { + if (args.length == 0) { + throw new RuntimeException("Expected GC name"); + } + if (args[0].equals("Z")) { + return; // JDK-8392746 + } + Tester t; + t = new Tester("C2", 4, "java.time.LocalDate::create", args[0], false); + t.run(new String[] {"AOT", "--two-step-training"}); + t = new Tester("C1", 2, "java.time.LocalDateTime::", args[0], false); + t.run(new String[] {"AOT", "--two-step-training"}); + + if (System.getProperty("jdk.debug", "").contains("debug")) { + // Run with VerifyOops which is only supported in debug VM + t = new Tester("C2", 4, "java.time.LocalDate::create", args[0], true); + t.run(new String[] {"AOT", "--two-step-training"}); + t = new Tester("C1", 2, "java.time.LocalDateTime::", args[0], true); + t.run(new String[] {"AOT", "--two-step-training"}); + } + } + + static class Tester extends CDSAppTester { + private String gcName; + private boolean withVerifyOops; + private String compName; + private String methodName; + private int compTier; + private int compCount; + + public Tester(String comp, int tier, String method, String gc, boolean verifyOops) { + super("TestAOTLocalDateTime"); + gcName = gc; + withVerifyOops = verifyOops; + compName = comp; + methodName = method; + compTier = tier; + compCount = tier / 2; // 2 for C2 and 1 for C1 only + } + + public List getGCArgs() { + List args = new ArrayList(); + args.add("-Xmx100M"); + if (withVerifyOops) { + args.add("-XX:+VerifyOops"); + } + switch (gcName) { + case "G1": + case "Parallel": + case "Serial": + case "Shenandoah": + case "Z": + args.add("-XX:+Use" + gcName + "GC"); + return args; + default: + throw new RuntimeException("Unexpected GC name " + gcName); + } + } + + @Override + public String classpath(RunMode runMode) { + return "app.jar"; + } + + @Override + public String[] vmArgs(RunMode runMode) { + List args = getGCArgs(); + args.addAll(List.of("--enable-preview", + "-Xbatch", + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+AbortVMOnAOTCodeFailure", + "-XX:CICompilerCount=" + compCount, + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=" + compTier, + "-XX:+PrintCompilation", + "-XX:CompileCommand=quiet", + "-XX:CompileCommand=compileonly," + methodName, + "-XX:CompileCommand=exclude," + methodName + ",1", // exclude Tier 1 compilation + "-XX:CompileCommand=dontinline,*::makeLocalDateTime")); + // Add flags for logs + args.addAll(List.of("-Xlog:aot+codecache+nmethod=debug", + "-Xlog:aot+codecache+init=debug", + "-Xlog:aot+codecache+exit=debug")); + + if (runMode == RunMode.ASSEMBLY) { + args.addAll(List.of("-Xlog:aot+codecache+oops=debug", + "-Xlog:aot+codecache+metadata=debug")); + } + return args.toArray(new String[args.size()]); + } + + @Override + public String[] appCommandLine(RunMode runMode) { + return new String[] { "TestLocalDateTime" }; + } + + @Override + public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception { + if (runMode == RunMode.ASSEMBLY) { + if (compTier == 4) { + out.shouldMatch("aot,codecache,nmethod.*\\(A4\\).*LocalDate.*create.*wrote to AOT Code Cache"); + } + if (compTier == 2) { + out.shouldMatch("aot,codecache,nmethod.*\\(A2\\).*LocalDateTime.*.*wrote to AOT Code Cache"); + } + out.shouldMatch("aot,codecache,exit.*\\s+AOT code cache size: [1-9]\\d+ bytes"); + } else if (runMode == RunMode.PRODUCTION) { + if (compTier == 4) { + out.shouldMatch("aot,codecache,nmethod.*\\(A4\\).*LocalDate.*create.*Loaded nmethod from AOT Code Cache"); + } + /* In production run VM may request Tier 2 compilation before + * TrainingReplayThread can process class init dependencies. + * As result normal JIT Tier2 compilation may happen before + * A2 code load is requested. And with presence of JIT code + * AOT code is not requested for this methodi any more. + */ + /* + if (compTier == 2) { + out.shouldMatch("aot,codecache,nmethod.*\\(A2\\).*LocalDateTime.*.*Loaded nmethod from AOT Code Cache"); + } + */ + out.shouldMatch("aot,codecache,init.*\\s+Loaded [1-9]\\d+ AOT code entries from AOT Code Cache"); + out.shouldContain("Result: 1970-01-02T03:46:39"); + } + out.shouldHaveExitValue(0); + } + } +} + +class TestLocalDateTime { + public static void main(String... args) { + LocalDateTime localDateTime = makeLocalDateTime(0); + for (int i = 0; i < 100000; i++) { + localDateTime = makeLocalDateTime(i); + } + System.out.println("Result: " + localDateTime); + } + + public static LocalDateTime makeLocalDateTime(int i) { + int sec = i % 60; + int min = (i / 60) % 60; + int hour = (i / (60 * 60)) % 24; + int day = ((i / (60 * 60 * 24)) % 31) + 1; + return LocalDateTime.of(1970, 1, day, hour, min, sec); + } +} diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index a658b20fa6a8..ce43ea762f23 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -520,7 +520,6 @@ protected String vmCDSSupportsAOTClassLinking() { */ protected String vmCDSSupportsAOTCodeCaching() { if ("true".equals(vmCDSSupportsAOTClassLinking()) && - !"true".equals(isPreviewEnabled()) && !"zero".equals(vmFlavor()) && (Platform.isX64() || Platform.isAArch64() || Platform.isRISCV64())) { return "true"; From 3a2affdfc68ddc702ae32460615b6a9dc8e8a4f1 Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Fri, 6 Nov 2026 03:15:44 +0000 Subject: [PATCH 020/110] 8392810: RISC-V: Support for Zacas/Zabha atomics C++ HotSpot code Reviewed-by: ayang, fyang --- src/hotspot/cpu/riscv/vm_version_riscv.cpp | 8 ++ src/hotspot/cpu/riscv/vm_version_riscv.hpp | 12 +++ .../linux_riscv/atomicAccess_linux_riscv.hpp | 90 ++++++++++++++++++- 3 files changed, 109 insertions(+), 1 deletion(-) diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp index a5a52e6763d0..6d3ca9130055 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp @@ -53,6 +53,7 @@ static constexpr bool toolchain_uses_psabi_atomics() { uint32_t VM_Version::_initial_vector_length = 0; bool VM_Version::_use_zalasr_atomics = false; +VM_Version::AtomicCasMode VM_Version::_atomic_cas_mode = AtomicCasMode::BASELINE; #define DEF_RV_EXT_FEATURE(PRETTY, LINUX_BIT, FSTRING, FLAGF) \ VM_Version::ext_##PRETTY##RVExtFeatureValue VM_Version::ext_##PRETTY; @@ -207,6 +208,13 @@ void VM_Version::common_initialize() { // adjustment above has settled. See the comment on _use_zalasr_atomics in // vm_version_riscv.hpp. _use_zalasr_atomics = UseZalasr; + if (UseZacas && UseZabha) { + _atomic_cas_mode = AtomicCasMode::ZACAS_ZABHA; + } else if (UseZacas) { + _atomic_cas_mode = AtomicCasMode::ZACAS; + } else { + _atomic_cas_mode = AtomicCasMode::BASELINE; + } if (UseZbb) { if (FLAG_IS_DEFAULT(UsePopCountInstruction)) { diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp index 6f0f5cba6a3e..ebb15737bd72 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp @@ -40,6 +40,14 @@ class stringStream; class VM_Version : public Abstract_VM_Version { friend RiscvHwprobe; + + public: + enum class AtomicCasMode : uint8_t { + BASELINE, + ZACAS, + ZACAS_ZABHA + }; + private: // JEDEC encoded as ((bank - 1) << 7) | (0x7f & JEDEC) @@ -520,6 +528,9 @@ class VM_Version : public Abstract_VM_Version { // atomics mapping. This flag is false by default and is latched to the final // UseZalasr value after all validation completes. static bool _use_zalasr_atomics; + // Keep native CAS on the baseline ISA until CPU feature initialization + // completes, then latch the final Zacas/Zabha configuration. + static AtomicCasMode _atomic_cas_mode; static void common_initialize(); @@ -535,6 +546,7 @@ class VM_Version : public Abstract_VM_Version { static uint32_t initial_vector_length() { return _initial_vector_length; } static bool use_zalasr_atomics() { return _use_zalasr_atomics; } + static AtomicCasMode atomic_cas_mode() { return _atomic_cas_mode; } constexpr static bool supports_stack_watermark_barrier() { return true; } diff --git a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp index 9af91d3d5c72..9afe3e2f74b6 100644 --- a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp +++ b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp @@ -32,7 +32,7 @@ // Note that memory_order_conservative requires a strong two-way barrier. // For 32- and 64-bit add and xchg that barrier is provided by an explicit -// AMO with .aqrl. Cmpxchg still uses explicit full barriers. +// AMO with .aqrl. Cmpxchg needs explicit barriers, including on failure. #if defined(__clang_major__) #define FULL_COMPILER_ATOMIC_SUPPORT @@ -79,6 +79,72 @@ inline D AtomicAccess::PlatformAdd::fetch_then_add(D volatile* dest, return old_value; } +// aqrl encodes [aq, rl]: 0b00 relaxed, 0b10 acquire, 0b01 release, 0b11 acquire-release. +static constexpr int riscv_amo_aqrl(atomic_memory_order order) { + switch (order) { + case memory_order_relaxed: + return 0b00; + case memory_order_acquire: + return 0b10; + case memory_order_release: + return 0b01; + case memory_order_acq_rel: + case memory_order_seq_cst: + case memory_order_conservative: + return 0b11; + default: + ShouldNotReachHere(); + } +} + +// Use .insn so baseline builds do not require assembler support for Zacas/Zabha. +// .insn r opcode, funct3, funct7, rd, rs1, rs2. +// opcode: 0x2f selects the AMO instruction group. +// funct3: 0b000 for byte, 0b010 for word, 0b011 for doubleword. +// funct7: (AMOCAS funct5 0b00101 << 2) | aqrl = 0x14 | aqrl. +// rd: expected value in, observed value out; rs1: address; rs2: replacement. +template +inline T riscv_amocas(T volatile* dest, T compare_value, T exchange_value) { + static_assert(byte_size == sizeof(T)); + static_assert(byte_size == 1 || byte_size == 4 || byte_size == 8); + constexpr int width = byte_size == 1 ? 0 : byte_size == 4 ? 2 : 3; + constexpr int aqrl = riscv_amo_aqrl(order); + + if constexpr (order == memory_order_seq_cst || order == memory_order_conservative) { + // Failed AMOCAS has no release semantics, even with .rl. + FULL_MEM_BARRIER; + } + + uint64_t old_value = (uint64_t)compare_value; + __asm__ __volatile__ (".insn r 0x2f, %3, %4, %0, %1, %2" + : "+r" (old_value) + : "r" (dest), "r" ((uint64_t)exchange_value), + "i" (width), "i" (0x14 | aqrl) + : "memory"); + return (T)old_value; +} + +template +inline T riscv_amocas(T volatile* dest, T compare_value, T exchange_value, + atomic_memory_order order) { + switch (order) { + case memory_order_relaxed: + return riscv_amocas(dest, compare_value, exchange_value); + case memory_order_acquire: + return riscv_amocas(dest, compare_value, exchange_value); + case memory_order_release: + return riscv_amocas(dest, compare_value, exchange_value); + case memory_order_acq_rel: + return riscv_amocas(dest, compare_value, exchange_value); + case memory_order_seq_cst: + return riscv_amocas(dest, compare_value, exchange_value); + case memory_order_conservative: + return riscv_amocas(dest, compare_value, exchange_value); + default: + ShouldNotReachHere(); + } +} + #ifndef FULL_COMPILER_ATOMIC_SUPPORT template<> template @@ -88,6 +154,11 @@ inline T AtomicAccess::PlatformCmpxchg<1>::operator()(T volatile* dest __attribu atomic_memory_order order) const { static_assert(1 == sizeof(T)); + const VM_Version::AtomicCasMode cas_mode = VM_Version::atomic_cas_mode(); + if (cas_mode == VM_Version::AtomicCasMode::ZACAS_ZABHA) { + return riscv_amocas<1>(dest, compare_value, exchange_value, order); + } + if (order != memory_order_relaxed) { FULL_MEM_BARRIER; } @@ -139,6 +210,11 @@ inline T AtomicAccess::PlatformCmpxchg<4>::operator()(T volatile* dest __attribu atomic_memory_order order) const { static_assert(4 == sizeof(T)); + const VM_Version::AtomicCasMode cas_mode = VM_Version::atomic_cas_mode(); + if (cas_mode != VM_Version::AtomicCasMode::BASELINE) { + return riscv_amocas<4>(dest, compare_value, exchange_value, order); + } + int32_t old_value; uint64_t rc_temp; @@ -206,6 +282,18 @@ inline T AtomicAccess::PlatformCmpxchg::operator()(T volatile* dest _ #endif static_assert(byte_size == sizeof(T)); + if constexpr (byte_size == 1) { + const VM_Version::AtomicCasMode cas_mode = VM_Version::atomic_cas_mode(); + if (cas_mode == VM_Version::AtomicCasMode::ZACAS_ZABHA) { + return riscv_amocas<1>(dest, compare_value, exchange_value, order); + } + } else if constexpr (byte_size == 4 || byte_size == 8) { + const VM_Version::AtomicCasMode cas_mode = VM_Version::atomic_cas_mode(); + if (cas_mode != VM_Version::AtomicCasMode::BASELINE) { + return riscv_amocas(dest, compare_value, exchange_value, order); + } + } + if (order != memory_order_relaxed) { FULL_MEM_BARRIER; } From 7e94da336f62873842bbf71706b171c8c965a184 Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Fri, 6 Nov 2026 07:11:56 +0000 Subject: [PATCH 021/110] 8391898: RISC-V: Use vwsll.vi for vector gather/scatter index scaling Co-authored-by: Dingli Zhang Reviewed-by: fyang, gli, ayang --- src/hotspot/cpu/riscv/assembler_riscv.hpp | 3 + src/hotspot/cpu/riscv/riscv_v.ad | 128 +++++++++++++--------- 2 files changed, 77 insertions(+), 54 deletions(-) diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp index 73173e297907..be258f14b120 100644 --- a/src/hotspot/cpu/riscv/assembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp @@ -2214,6 +2214,9 @@ enum VectorMask { INSN(vnsra_wi, 0b1010111, 0b011, 0b101101); INSN(vnsrl_wi, 0b1010111, 0b011, 0b101100); + // Vector Widening Shift Left Logical (Zvbb) Extension + INSN(vwsll_vi, 0b1010111, 0b011, 0b110101); + #undef INSN #define INSN(NAME, op, funct3, funct6) \ diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad index 03a0989daacf..d78d941bc511 100644 --- a/src/hotspot/cpu/riscv/riscv_v.ad +++ b/src/hotspot/cpu/riscv/riscv_v.ad @@ -47,6 +47,54 @@ source %{ } } + static void gatherScatter32(C2_MacroAssembler* masm, bool is_store, + VectorRegister reg, VectorRegister idx, VectorRegister offsets, + BasicType bt, Register base, uint vector_length, + Assembler::VectorMask vm = Assembler::unmasked) { + assert(type2aelembytes(bt) == 4, "32-bit vector elements required"); + // Scale indices by 4 to obtain byte offsets for 32-bit elements. + const uint shift = 2; + __ vsetvli_helper(bt, vector_length); + __ vsll_vi(offsets, idx, shift); + + if (is_store) { + __ vsuxei32_v(reg, base, offsets, vm); + } else { + if (vm == Assembler::v0_t) { + __ vmv_v_i(reg, 0); + } + __ vluxei32_v(reg, base, offsets, vm); + } + } + + static void gatherScatter64(C2_MacroAssembler* masm, bool is_store, + VectorRegister reg, VectorRegister idx, VectorRegister offsets, + BasicType bt, Register base, uint vector_length, + Assembler::VectorMask vm = Assembler::unmasked) { + assert(type2aelembytes(bt) == 8, "64-bit vector elements required"); + // Scale indices by 8 to obtain byte offsets for 64-bit elements. + const uint shift = 3; + if (UseZvbb) { + __ vsetvli_helper(T_INT, vector_length, Assembler::mf2); + __ vwsll_vi(offsets, idx, shift); + // Indexed accesses use SEW for data width; e64,m1 preserves VLMAX. + __ vsetvli_helper(bt, vector_length); + } else { + __ vsetvli_helper(bt, vector_length); + __ vzext_vf2(offsets, idx); + __ vsll_vi(offsets, offsets, shift); + } + + if (is_store) { + __ vsuxei64_v(reg, base, offsets, vm); + } else { + if (vm == Assembler::v0_t) { + __ vmv_v_i(reg, 0); + } + __ vluxei64_v(reg, base, offsets, vm); + } + } + // test_predicate selects the mask reduction; cmpcode selects the outer eq/ne condition. static void vectorTestCMove(C2_MacroAssembler* masm, int cmpcode, Register dst, Register src, VectorRegister mask, BasicType bt, uint vector_length, BoolTest::mask test_predicate) { @@ -5723,12 +5771,10 @@ instruct gather_loadS(vReg dst, indirect mem, vReg idx) %{ effect(TEMP_DEF dst); format %{ "gather_loadS $dst, $mem, $idx" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this)); - __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg), (int)sew); - __ vluxei32_v(as_VectorRegister($dst$$reg), as_Register($mem$$base), - as_VectorRegister($dst$$reg)); + VectorRegister dst_reg = as_VectorRegister($dst$$reg); + gatherScatter32(masm, false, dst_reg, as_VectorRegister($idx$$reg), dst_reg, + Matcher::vector_element_basic_type(this), as_Register($mem$$base), + Matcher::vector_length(this)); %} ins_pipe(pipe_slow); %} @@ -5739,13 +5785,10 @@ instruct gather_loadD(vReg dst, indirect mem, vReg idx) %{ effect(TEMP_DEF dst); format %{ "gather_loadD $dst, $mem, $idx" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this)); - __ vzext_vf2(as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg)); - __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), (int)sew); - __ vluxei64_v(as_VectorRegister($dst$$reg), as_Register($mem$$base), - as_VectorRegister($dst$$reg)); + VectorRegister dst_reg = as_VectorRegister($dst$$reg); + gatherScatter64(masm, false, dst_reg, as_VectorRegister($idx$$reg), dst_reg, + Matcher::vector_element_basic_type(this), as_Register($mem$$base), + Matcher::vector_length(this)); %} ins_pipe(pipe_slow); %} @@ -5756,13 +5799,9 @@ instruct gather_loadS_masked(vReg dst, indirect mem, vReg idx, vRegMask_V0 v0, v effect(TEMP_DEF dst, TEMP tmp); format %{ "gather_loadS_masked $dst, $mem, $idx, $v0\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg), (int)sew); - __ vmv_v_i(as_VectorRegister($dst$$reg), 0); - __ vluxei32_v(as_VectorRegister($dst$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg), Assembler::v0_t); + gatherScatter32(masm, false, as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this), + as_Register($mem$$base), Matcher::vector_length(this), Assembler::v0_t); %} ins_pipe(pipe_slow); %} @@ -5773,14 +5812,9 @@ instruct gather_loadD_masked(vReg dst, indirect mem, vReg idx, vRegMask_V0 v0, v effect(TEMP_DEF dst, TEMP tmp); format %{ "gather_loadD_masked $dst, $mem, $idx, $v0\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this)); - __ vzext_vf2(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($tmp$$reg), (int)sew); - __ vmv_v_i(as_VectorRegister($dst$$reg), 0); - __ vluxei64_v(as_VectorRegister($dst$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg), Assembler::v0_t); + gatherScatter64(masm, false, as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this), + as_Register($mem$$base), Matcher::vector_length(this), Assembler::v0_t); %} ins_pipe(pipe_slow); %} @@ -5793,12 +5827,9 @@ instruct scatter_storeS(indirect mem, vReg src, vReg idx, vReg tmp) %{ effect(TEMP tmp); format %{ "scatter_storeS $mem, $idx, $src\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this, $src); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this, $src)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg), (int)sew); - __ vsuxei32_v(as_VectorRegister($src$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg)); + gatherScatter32(masm, true, as_VectorRegister($src$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this, $src), + as_Register($mem$$base), Matcher::vector_length(this, $src)); %} ins_pipe(pipe_slow); %} @@ -5809,13 +5840,9 @@ instruct scatter_storeD(indirect mem, vReg src, vReg idx, vReg tmp) %{ effect(TEMP tmp); format %{ "scatter_storeD $mem, $idx, $src\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this, $src); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this, $src)); - __ vzext_vf2(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($tmp$$reg), (int)sew); - __ vsuxei64_v(as_VectorRegister($src$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg)); + gatherScatter64(masm, true, as_VectorRegister($src$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this, $src), + as_Register($mem$$base), Matcher::vector_length(this, $src)); %} ins_pipe(pipe_slow); %} @@ -5826,12 +5853,9 @@ instruct scatter_storeS_masked(indirect mem, vReg src, vReg idx, vRegMask_V0 v0, effect(TEMP tmp); format %{ "scatter_storeS_masked $mem, $idx, $src, $v0\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this, $src); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this, $src)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg), (int)sew); - __ vsuxei32_v(as_VectorRegister($src$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg), Assembler::v0_t); + gatherScatter32(masm, true, as_VectorRegister($src$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this, $src), + as_Register($mem$$base), Matcher::vector_length(this, $src), Assembler::v0_t); %} ins_pipe(pipe_slow); %} @@ -5842,13 +5866,9 @@ instruct scatter_storeD_masked(indirect mem, vReg src, vReg idx, vRegMask_V0 v0, effect(TEMP tmp); format %{ "scatter_storeD_masked $mem, $idx, $src, $v0\t# KILL $tmp" %} ins_encode %{ - BasicType bt = Matcher::vector_element_basic_type(this, $src); - Assembler::SEW sew = Assembler::elemtype_to_sew(bt); - __ vsetvli_helper(bt, Matcher::vector_length(this, $src)); - __ vzext_vf2(as_VectorRegister($tmp$$reg), as_VectorRegister($idx$$reg)); - __ vsll_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($tmp$$reg), (int)sew); - __ vsuxei64_v(as_VectorRegister($src$$reg), as_Register($mem$$base), - as_VectorRegister($tmp$$reg), Assembler::v0_t); + gatherScatter64(masm, true, as_VectorRegister($src$$reg), as_VectorRegister($idx$$reg), + as_VectorRegister($tmp$$reg), Matcher::vector_element_basic_type(this, $src), + as_Register($mem$$base), Matcher::vector_length(this, $src), Assembler::v0_t); %} ins_pipe(pipe_slow); %} From 593a1216f3fcef692f6796d3d647a56aabc5e225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= Date: Fri, 6 Nov 2026 09:17:36 +0000 Subject: [PATCH 022/110] 8391362: C2: Test compiler/igvn/TestMaskedStoreIdealization.java fails IR verification Reviewed-by: kvn, qamai --- .../jtreg/compiler/igvn/TestMaskedStoreIdealization.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/igvn/TestMaskedStoreIdealization.java b/test/hotspot/jtreg/compiler/igvn/TestMaskedStoreIdealization.java index 58cab1b61519..8ef17077c7e5 100644 --- a/test/hotspot/jtreg/compiler/igvn/TestMaskedStoreIdealization.java +++ b/test/hotspot/jtreg/compiler/igvn/TestMaskedStoreIdealization.java @@ -189,7 +189,8 @@ TemplateToken generate() { let("boxedTy", vec.elementType.boxedTypeName()), let("species", vec.speciesName), " VectorMask<#boxedTy> mask = VectorMask.fromLong(#species, ", - testCaseRandom.nextInt(0, 10) == 0 ? testCaseRandom.nextLong() : "-1 - (1 << #idx)", + testCaseRandom.nextInt(0, 10) == 0 ? testCaseRandom.nextLong() : "-1", // All bits or random mask. + " & ~(1 << #idx)", // Regardless of the mask, we must clear the idx bit. Otherwise, IR-verification fails. ");\n" )); From acad8bef5ed6591dd7a2ab9054af5e1e1cf0e924 Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Fri, 6 Nov 2026 10:33:23 +0000 Subject: [PATCH 023/110] 8396523: JFR: Incorrect byte count recorded for RandomAccessFile::readLine Reviewed-by: alanb, vyazici --- .../classes/java/io/RandomAccessFile.java | 69 +++++----- .../jdk/internal/event/FileReadEvent.java | 16 ++- test/jdk/jdk/jfr/event/io/IOEvent.java | 18 ++- .../io/TestRandomAccessFileReadLine.java | 124 ++++++++++++++++++ 4 files changed, 184 insertions(+), 43 deletions(-) create mode 100644 test/jdk/jdk/jfr/event/io/TestRandomAccessFileReadLine.java diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java index a7aa3ea358bd..62a2afe5e45b 100644 --- a/src/java.base/share/classes/java/io/RandomAccessFile.java +++ b/src/java.base/share/classes/java/io/RandomAccessFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1030,43 +1030,50 @@ public final double readDouble() throws IOException { */ public final String readLine() throws IOException { - if (jfrTracing && FileReadEvent.enabled()) { - long bytesRead = 0; - long start = FileReadEvent.timestamp(); - try { - String result = implReadLine(); - bytesRead = result == null ? 0 : result.length(); - return result; - } finally { - FileReadEvent.offer(start, path, bytesRead); - } - } - return implReadLine(); - } - - private final String implReadLine() throws IOException { StringBuilder input = new StringBuilder(); int c = -1; boolean eol = false; - - while (!eol) { - switch (c = read0()) { - case -1, '\n' -> eol = true; - case '\r' -> { - eol = true; - long cur = getFilePointer(); - if ((read0()) != '\n') { - seek(cur); + long bytesRead = 0; + long start = 0; + if (jfrTracing && FileReadEvent.enabled()) { + start = FileReadEvent.timestamp(); + } + boolean endOfFile = false; + try { + while (!eol) { + c = read0(); + if (c == -1) { + endOfFile = true; + } else { + bytesRead++; + } + switch (c) { + case -1, '\n' -> eol = true; + case '\r' -> { + eol = true; + long cur = getFilePointer(); + int d = read0(); + if (d == -1) { + endOfFile = true; + } else { + bytesRead++; + } + if (d != '\n') { + seek(cur); + } } + default -> input.append((char) c); } - default -> input.append((char) c); + } + if ((c == -1) && (input.length() == 0)) { + return null; + } + return input.toString(); + } finally { + if (start != 0) { + FileReadEvent.offer(start, path, bytesRead, endOfFile); } } - - if ((c == -1) && (input.length() == 0)) { - return null; - } - return input.toString(); } /** diff --git a/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java b/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java index 77b2568802e8..797a5166ad4d 100644 --- a/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java +++ b/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,15 +60,21 @@ public static boolean shouldThrottleCommit(long duration, long end) { * * @param start the start time * @param path the path - * @param bytesRead the number of bytes that were read, or -1 if the end of the file was reached + * @param bytesRead the number of bytes that were read, or a negative value if the end of the file was reached */ public static void offer(long start, String path, long bytesRead) { + if (bytesRead < 0) { + offer(start, path, 0, true); + } else { + offer(start, path, bytesRead, false); + } + } + + public static void offer(long start, String path, long bytesRead, boolean endOfFile) { long end = timestamp(); long duration = end - start; if (shouldThrottleCommit(duration, end)) { - boolean endOfFile = bytesRead < 0; - long bytes = endOfFile ? 0 : bytesRead; - commit(start, duration, path, bytes, endOfFile); + commit(start, duration, path, bytesRead, endOfFile); } } diff --git a/test/jdk/jdk/jfr/event/io/IOEvent.java b/test/jdk/jdk/jfr/event/io/IOEvent.java index a8392e4d35a2..8f91c6cbf830 100644 --- a/test/jdk/jdk/jfr/event/io/IOEvent.java +++ b/test/jdk/jdk/jfr/event/io/IOEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -120,12 +120,7 @@ public static IOEvent createFileForceEvent(File file) { return new IOEvent(Thread.currentThread().getName(), EventType.FileForce, 0, address, false); } - public static IOEvent createFileReadEvent(long size, File file) { - boolean endOfStream = false; - if (size < 0) { - endOfStream = true; - size = 0; - } + public static IOEvent createFileReadEvent(long size, File file, boolean endOfStream) { String address = null; try { address = file.getCanonicalPath(); @@ -135,6 +130,15 @@ public static IOEvent createFileReadEvent(long size, File file) { return new IOEvent(Thread.currentThread().getName(), EventType.FileRead, size, address, endOfStream); } + public static IOEvent createFileReadEvent(long size, File file) { + boolean endOfStream = false; + if (size < 0) { + endOfStream = true; + size = 0; + } + return createFileReadEvent(size, file, endOfStream); + } + public static IOEvent createFileWriteEvent(long size, File file) { if (size < 0) { size = 0; diff --git a/test/jdk/jdk/jfr/event/io/TestRandomAccessFileReadLine.java b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileReadLine.java new file mode 100644 index 000000000000..8351e9645033 --- /dev/null +++ b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileReadLine.java @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.jfr.event.io; + +import java.io.RandomAccessFile; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +import jdk.jfr.Recording; +import jdk.jfr.consumer.RecordedEvent; +import jdk.test.lib.jfr.Events; + +/* + * @test + * @bug 8396523 + * @requires vm.flagless + * @requires vm.hasJFR + * @library /test/lib /test/jdk + * @run main/othervm ${test.main.class} + */ +public class TestRandomAccessFileReadLine { + + public static void main(String[] args) throws Throwable { + List linesEnabled = test(true); + List linesDisabled = test(false); + System.out.println("Enabled : " + linesEnabled); + System.out.println("Disabled: " + linesDisabled); + if (!linesEnabled.equals(linesDisabled)) { + throw new Exception("Expected same result from RandomAccessFile::readLine with or without JFR"); + } + } + + public static List test(boolean enabled) throws Throwable { + System.out.print("Testing with jdk.FileRead "); + System.out.println(enabled ? "enabled" : "disabled"); + List expectedEvents = new ArrayList<>(); + List lines = new ArrayList<>(); + try (Recording r = new Recording()) { + if (enabled) { + r.enable("jdk.FileRead").withoutThreshold(); + } + r.start(); + // readLine() reads to the first: + // - '\r\n' + // - '\r' + // - '\n' + // - EOF + // regardless of the operating system. + + // Reads: EOF + lines.add(read(expectedEvents, "", 0, true)); + + // Reads: '\n' + lines.add(read(expectedEvents, "\n", 1, false)); + + // Reads: '\r' EOF + lines.add(read(expectedEvents, "\r", 1, true)); + + // Reads: '\r' '\n' + lines.add(read(expectedEvents, "\r\n", 2, false)); + + // Reads: 'c' 'a' 't' EOF + lines.add(read(expectedEvents, "cat", 3, true)); + + // Reads: 'd' 'o' 'g' '\n' + lines.add(read(expectedEvents, "dog\n", 4, false)); + + // Reads: 'a' 'n' 't' '\r' EOF + lines.add(read(expectedEvents, "ant\r", 4, true)); + + // Reads: 'c' 'o' 'w' '\r' '\n' + lines.add(read(expectedEvents, "cow\r\n", 5, false)); + + // Reads: 'e' 'l' 'k' '\r' 'f' + lines.add(read(expectedEvents, "elk\rfox", 5, false)); + r.stop(); + if (enabled) { + List events = Events.fromRecording(r); + IOHelper.verifyEqualsInOrder(events, expectedEvents); + } + } + return lines; + } + + private static String read(List expectedEvents, + String content, + long expectedBytes, + boolean expectedEOF) throws Throwable { + Path path = Path.of("temp.txt"); + String line; + try (RandomAccessFile raf = new RandomAccessFile(path.toFile(), "rw")) { + raf.writeBytes(content); + raf.seek(0); + line = raf.readLine() + " file position: " + raf.getFilePointer(); + var event = IOEvent.createFileReadEvent(expectedBytes, path.toFile(), expectedEOF); + expectedEvents.add(event); + } + Files.delete(path); + return line; + } +} From fd5111243f600f33a4b126cc609c62fe96984d04 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Fri, 6 Nov 2026 10:35:55 +0000 Subject: [PATCH 024/110] 8396676: Set parkBlocker when parking until a file descriptor is ready Reviewed-by: vyazici --- .../classes/sun/nio/ch/EPollSelectorImpl.java | 6 +- .../sun/nio/ch/KQueueSelectorImpl.java | 6 +- .../sun/nio/ch/DatagramChannelImpl.java | 4 +- .../classes/sun/nio/ch/NioSocketImpl.java | 4 +- .../share/classes/sun/nio/ch/Poller.java | 58 +++++++----- .../share/classes/sun/nio/ch/SelChImpl.java | 4 +- .../java/net/vthread/BlockingSocketOps.java | 94 ++++++++++++++++--- .../channels/vthread/BlockingChannelOps.java | 86 +++++++++++++---- 8 files changed, 193 insertions(+), 69 deletions(-) diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java index 14f4e87448b3..0dd89cde98df 100644 --- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java +++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -143,7 +143,7 @@ private int untimedPoll(boolean block) throws IOException { int numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0); if (block) { while (numEntries == 0 && !Thread.currentThread().isInterrupted()) { - Poller.pollSelector(epfd, 0); + Poller.pollSelector(this, epfd, 0); numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0); } } @@ -163,7 +163,7 @@ private int timedPoll(long nanos) throws IOException { // timeout break; } - Poller.pollSelector(epfd, remainingNanos); + Poller.pollSelector(this, epfd, remainingNanos); numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, 0); } return numEntries; diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java index b1a781d71446..73d619c14892 100644 --- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java +++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -147,7 +147,7 @@ private int untimedPoll(boolean block) throws IOException { int numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0); if (block) { while (numEntries == 0 && !Thread.currentThread().isInterrupted()) { - Poller.pollSelector(kqfd, 0); + Poller.pollSelector(this, kqfd, 0); numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0); } } @@ -167,7 +167,7 @@ private int timedPoll(long nanos) throws IOException { // timeout break; } - Poller.pollSelector(kqfd, remainingNanos); + Poller.pollSelector(this, kqfd, remainingNanos); numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, 0); } return numEntries; diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java index f5002e8b7164..1c09bdff95d4 100644 --- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java +++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -476,7 +476,7 @@ public final Set> supportedOptions() { public void park(int event, long nanos) throws IOException { Thread thread = Thread.currentThread(); if (thread.isVirtual()) { - Poller.poll(getFDVal(), event, nanos, this::isOpen); + Poller.poll(this, getFDVal(), event, nanos, this::isOpen); // DatagramSocket throws when virtual thread interrupted if (!interruptible && thread.isInterrupted()) { throw new InterruptedIOException(); diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java index 58b3bc7aabad..96c9a1ea12be 100644 --- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java +++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -166,7 +166,7 @@ private void ensureOpenAndConnected() throws SocketException { private void park(FileDescriptor fd, int event, long nanos) throws IOException { Thread t = Thread.currentThread(); if (t.isVirtual()) { - Poller.poll(fdVal(fd), event, nanos, this::isOpen); + Poller.poll(this, fdVal(fd), event, nanos, this::isOpen); if (t.isInterrupted()) { throw new InterruptedIOException(); } diff --git a/src/java.base/share/classes/sun/nio/ch/Poller.java b/src/java.base/share/classes/sun/nio/ch/Poller.java index 523630600716..0c43c2860b23 100644 --- a/src/java.base/share/classes/sun/nio/ch/Poller.java +++ b/src/java.base/share/classes/sun/nio/ch/Poller.java @@ -214,22 +214,25 @@ final void polled(int fdVal) { /** * Parks the current thread until a file descriptor is ready for the given op. + * @param blocker the object that the thread is polling * @param fdVal the file descriptor * @param event POLLIN or POLLOUT * @param nanos the waiting time or 0 to wait indefinitely * @param isOpen supplies a boolean to indicate if the enclosing object is open */ - public static void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException { - POLLER_GROUP.poll(fdVal, event, nanos, isOpen); + public static void poll(Object blocker, int fdVal, int event, long nanos, + BooleanSupplier isOpen) throws IOException { + POLLER_GROUP.poll(blocker, fdVal, event, nanos, isOpen); } /** * Parks the current thread until a Selector's file descriptor is ready. + * @param blocker the object that the thread is polling * @param fdVal the Selector's file descriptor * @param nanos the waiting time or 0 to wait indefinitely */ - public static void pollSelector(int fdVal, long nanos) throws IOException { - POLLER_GROUP.pollSelector(fdVal, nanos); + public static void pollSelector(Object blocker, int fdVal, long nanos) throws IOException { + POLLER_GROUP.pollSelector(blocker, fdVal, nanos); } /** @@ -242,14 +245,15 @@ public static void stopPoll(Thread thread) { /** * Parks the current thread until a file descriptor is ready. */ - private void poll(int fdVal, long nanos, BooleanSupplier isOpen) throws IOException { + private void poll(Object blocker, int fdVal, long nanos, + BooleanSupplier isOpen) throws IOException { startPoll(fdVal); try { if (isOpen.getAsBoolean() && !isShutdown()) { if (nanos > 0) { - LockSupport.parkNanos(nanos); + LockSupport.parkNanos(blocker, nanos); } else { - LockSupport.park(); + LockSupport.park(blocker); } } } finally { @@ -319,7 +323,7 @@ private void subPollerLoop(Poller masterPoller) { int polled = 0; while (!isShutdown()) { if (polled == 0) { - masterPoller.poll(fdVal(), 0, () -> true); // park + masterPoller.poll(this, fdVal(), 0, () -> true); // park } else { Thread.yield(); } @@ -365,13 +369,14 @@ final PollerProvider provider() { /** * Parks the current thread until a file descriptor is ready for the given op. */ - abstract void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException; + abstract void poll(Object blocker, int fdVal, int event, long nanos, + BooleanSupplier isOpen) throws IOException; /** * Parks the current thread until a Selector's file descriptor is ready. */ - void pollSelector(int fdVal, long nanos) throws IOException { - poll(fdVal, Net.POLLIN, nanos, () -> true); + void pollSelector(Object blocker, int fdVal, long nanos) throws IOException { + poll(blocker, fdVal, Net.POLLIN, nanos, () -> true); } /** @@ -473,18 +478,19 @@ private Poller writePoller(int fdVal) { } @Override - void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException { + void poll(Object blocker, int fdVal, int event, long nanos, + BooleanSupplier isOpen) throws IOException { if (event == Net.POLLIN) { - readPoller(fdVal).poll(fdVal, nanos, isOpen); + readPoller(fdVal).poll(blocker, fdVal, nanos, isOpen); } else { Poller writePoller = writePoller(fdVal); if (writePoller != null) { - writePoller.poll(fdVal, nanos, isOpen); + writePoller.poll(blocker, fdVal, nanos, isOpen); } else { // random delay in [50ms, 120ms) int max = ThreadLocalRandom.current().nextInt(50_000_000, 120_000_000); long delay = (nanos > 0) ? Math.min(nanos, max) : max; - LockSupport.parkNanos(delay); + LockSupport.parkNanos(blocker, delay); } } } @@ -574,16 +580,17 @@ private Poller writePoller(int fdVal) { } @Override - void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException { + void poll(Object blocker, int fdVal, int event, long nanos, + BooleanSupplier isOpen) throws IOException { Poller poller = (event == Net.POLLIN) ? readPoller(fdVal) : writePoller(fdVal); - poller.poll(fdVal, nanos, isOpen); + poller.poll(blocker, fdVal, nanos, isOpen); } @Override - void pollSelector(int fdVal, long nanos) throws IOException { - masterPoller.poll(fdVal, nanos, () -> true); + void pollSelector(Object blocker, int fdVal, long nanos) throws IOException { + masterPoller.poll(blocker, fdVal, nanos, () -> true); } @Override @@ -702,26 +709,27 @@ private Poller readPoller() throws IOException { } @Override - void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException { + void poll(Object blocker, int fdVal, int event, long nanos, + BooleanSupplier isOpen) throws IOException { // for POLLIN, get the read poller for this carrier if (event == Net.POLLIN && Thread.currentThread().isVirtual() && ContinuationSupport.isSupported()) { - readPoller().poll(fdVal, nanos, isOpen); + readPoller().poll(blocker, fdVal, nanos, isOpen); return; } // -XX:-VMContinuations or POLLIN from platform thread does master poller if (event == Net.POLLIN) { - masterPoller.poll(fdVal, nanos, isOpen); + masterPoller.poll(blocker, fdVal, nanos, isOpen); } else { - writePoller(fdVal).poll(fdVal, nanos, isOpen); + writePoller(fdVal).poll(blocker, fdVal, nanos, isOpen); } } @Override - void pollSelector(int fdVal, long nanos) throws IOException { - masterPoller.poll(fdVal, nanos, () -> true); + void pollSelector(Object blocker, int fdVal, long nanos) throws IOException { + masterPoller.poll(blocker, fdVal, nanos, () -> true); } /** diff --git a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java index 5abe4d41ac07..45d1a0345a8c 100644 --- a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java +++ b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -85,7 +85,7 @@ public interface SelChImpl extends Channel { */ default void park(int event, long nanos) throws IOException { if (Thread.currentThread().isVirtual()) { - Poller.poll(getFDVal(), event, nanos, this::isOpen); + Poller.poll(this, getFDVal(), event, nanos, this::isOpen); } else { long millis; if (nanos <= 0) { diff --git a/test/jdk/java/net/vthread/BlockingSocketOps.java b/test/jdk/java/net/vthread/BlockingSocketOps.java index 629406967aff..711092539092 100644 --- a/test/jdk/java/net/vthread/BlockingSocketOps.java +++ b/test/jdk/java/net/vthread/BlockingSocketOps.java @@ -65,6 +65,8 @@ import java.net.SocketAddress; import java.net.SocketException; import java.net.SocketTimeoutException; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.LockSupport; import jdk.test.lib.thread.VThreadRunner; import org.junit.jupiter.api.Test; @@ -110,7 +112,7 @@ void testSocketRead(int timeout) throws Exception { // delayed write from sc1 byte[] ba1 = "XXX".getBytes("UTF-8"); - runAfterParkedAsync(() -> s1.getOutputStream().write(ba1)); + var unparker = runAfterParkedAsync(() -> s1.getOutputStream().write(ba1)); // read from sc2 should block if (timeout > 0) { @@ -120,6 +122,9 @@ void testSocketRead(int timeout) throws Exception { int n = s2.getInputStream().read(ba2); assertTrue(n > 0); assertTrue(ba2[0] == 'X'); + + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); } }); } @@ -136,8 +141,8 @@ void testSocketWrite1() throws Exception { // delayed read from s2 to EOF InputStream in = s2.getInputStream(); - Thread reader = runAfterParkedAsync(() -> - in.transferTo(OutputStream.nullOutputStream())); + var unparker = runAfterParkedAsync(() -> + in.transferTo(OutputStream.nullOutputStream()), true); // write should block byte[] ba = new byte[100*1024]; @@ -147,8 +152,11 @@ void testSocketWrite1() throws Exception { } } + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); + // wait for reader to finish - reader.join(); + unparker.join(); } }); } @@ -432,7 +440,7 @@ void testServerSocketAccept(int timeout) throws Exception { // schedule connect var socket1 = new Socket(); SocketAddress remote = listener.getLocalSocketAddress(); - runAfterParkedAsync(() -> socket1.connect(remote)); + var unparker = runAfterParkedAsync(() -> socket1.connect(remote)); // accept should block if (timeout > 0) { @@ -441,6 +449,9 @@ void testServerSocketAccept(int timeout) throws Exception { var socket2 = listener.accept(); socket1.close(); socket2.close(); + + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); } }); } @@ -551,7 +562,7 @@ void testDatagramSocketSendReceive(int timeout) throws Exception { byte[] bytes = "XXX".getBytes("UTF-8"); DatagramPacket p1 = new DatagramPacket(bytes, bytes.length); p1.setSocketAddress(s2.getLocalSocketAddress()); - runAfterParkedAsync(() -> s1.send(p1)); + var unparker = runAfterParkedAsync(() -> s1.send(p1)); // receive should block if (timeout > 0) { @@ -562,6 +573,9 @@ void testDatagramSocketSendReceive(int timeout) throws Exception { s2.receive(p2); assertEquals(s1.getLocalSocketAddress(), p2.getSocketAddress()); assertTrue(ba[0] == 'X'); + + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); } }); } @@ -694,27 +708,77 @@ interface ThrowingRunnable { } /** - * Runs the given task asynchronously after the current virtual thread has parked. - * @return the thread started to run the task + * The unparker returned by runAfterParkedAsync. + */ + private static class Unparker { + final Thread thread; + final AtomicReference parkBlockerRef; + + Unparker(Thread thread, AtomicReference parkBlockerRef) { + this.thread = thread; + this.parkBlockerRef = parkBlockerRef; + } + + Object parkBlocker() { + return parkBlockerRef.get(); + } + + void join() throws InterruptedException { + thread.join(); + } + } + + /** + * Runs the given task asynchronously after the current virtual thread parks. + * @param writing if the thread will block in write + * @return the unparker object */ - static Thread runAfterParkedAsync(ThrowingRunnable task) { + private static Unparker runAfterParkedAsync(ThrowingRunnable task, boolean writing) { Thread target = Thread.currentThread(); if (!target.isVirtual()) throw new WrongThreadException(); - return Thread.ofPlatform().daemon().start(() -> { + var parkBlockerRef = new AtomicReference(); + Thread unparkerThread = Thread.ofPlatform().daemon().start(() -> { try { - Thread.State state = target.getState(); - while (state != Thread.State.WAITING - && state != Thread.State.TIMED_WAITING) { + // wait for target thread to park + while (!isWaiting(target)) { Thread.sleep(20); - state = target.getState(); } - Thread.sleep(20); // give a bit more time to release carrier + + // if the target thread is parked in write then we nudge it a few times + // to avoid wakeup with some bytes written + if (writing) { + for (int i = 0; i < 3; i++) { + LockSupport.unpark(target); + while (!isWaiting(target)) { + Thread.sleep(20); + } + } + } + + // capture the blocker object + parkBlockerRef.set(LockSupport.getBlocker(target)); + task.run(); + } catch (Exception e) { e.printStackTrace(); } }); + return new Unparker(unparkerThread, parkBlockerRef); + } + + private static Unparker runAfterParkedAsync(ThrowingRunnable task) { + return runAfterParkedAsync(task, false); + } + + /** + * Return true if the given Thread is parked. + */ + private static boolean isWaiting(Thread target) { + Thread.State state = target.getState(); + assertNotEquals(Thread.State.TERMINATED, state); + return (state == Thread.State.WAITING || state == Thread.State.TIMED_WAITING); } /** diff --git a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java index 2514dd582e89..87b7011ff57b 100644 --- a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java +++ b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java @@ -58,7 +58,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; -import java.net.SocketAddress; import java.net.SocketException; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousCloseException; @@ -69,7 +68,7 @@ import java.nio.channels.ReadableByteChannel; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; -import java.nio.channels.WritableByteChannel; +import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; import jdk.test.lib.thread.VThreadRunner; @@ -116,13 +115,16 @@ void testSocketChannelRead() throws Exception { // write to sc1 when current thread blocks in sc2.read ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8")); - runAfterParkedAsync(() -> sc1.write(bb1)); + var unparker = runAfterParkedAsync(() -> sc1.write(bb1)); // read from sc2 should block ByteBuffer bb2 = ByteBuffer.allocate(10); int n = sc2.read(bb2); assertTrue(n > 0); assertTrue(bb2.get(0) == 'X'); + + // check blocker object was set when thread parked + assertSame(sc2, unparker.parkBlocker()); } }); } @@ -138,7 +140,7 @@ void testSocketChannelWrite() throws Exception { SocketChannel sc2 = connection.channel2(); // read from sc2 to EOF when current thread blocks in sc1.write - Thread reader = runAfterParkedAsync(() -> readToEOF(sc2)); + var unparker = runAfterParkedAsync(() -> readToEOF(sc2)); // write to sc1 should block ByteBuffer bb = ByteBuffer.allocate(100*1024); @@ -149,8 +151,11 @@ void testSocketChannelWrite() throws Exception { } sc1.close(); + // check blocker object was set when thread parked + assertSame(sc1, unparker.parkBlocker()); + // wait for reader to finish - reader.join(); + unparker.join(); } }); } @@ -321,7 +326,7 @@ void testSocketAdaptorRead(int timeout) throws Exception { // write to sc1 when currnet thread blocks reading from sc2 ByteBuffer bb = ByteBuffer.wrap("XXX".getBytes("UTF-8")); - runAfterParkedAsync(() -> sc1.write(bb)); + var unparker = runAfterParkedAsync(() -> sc1.write(bb)); // read from sc2 should block byte[] array = new byte[100]; @@ -330,6 +335,9 @@ void testSocketAdaptorRead(int timeout) throws Exception { int n = sc2.socket().getInputStream().read(array); assertTrue(n > 0); assertTrue(array[0] == 'X'); + + // check blocker object was set when thread parked + assertSame(sc2, unparker.parkBlocker()); } }); } @@ -362,12 +370,15 @@ void testServerSocketChannelAccept2() throws Exception { var sc1 = SocketChannel.open(); // connect when current thread when it blocks in accept - runAfterParkedAsync(() -> sc1.connect(ssc.getLocalAddress())); + var unparker = runAfterParkedAsync(() -> sc1.connect(ssc.getLocalAddress())); // accept should block var sc2 = ssc.accept(); sc1.close(); sc2.close(); + + // check blocker object was set when thread parked + assertSame(ssc, unparker.parkBlocker()); } }); } @@ -428,7 +439,7 @@ void testSocketChannelAdaptorAccept(int timeout) throws Exception { var sc = SocketChannel.open(); // interrupt current thread when it blocks in accept - runAfterParkedAsync(() -> sc.connect(ssc.getLocalAddress())); + var unparker = runAfterParkedAsync(() -> sc.connect(ssc.getLocalAddress())); // accept should block if (timeout > 0) @@ -436,6 +447,9 @@ void testSocketChannelAdaptorAccept(int timeout) throws Exception { Socket s = ssc.socket().accept(); sc.close(); s.close(); + + // check blocker object was set when thread parked + assertSame(ssc, unparker.parkBlocker()); } }); } @@ -479,12 +493,15 @@ void testDatagramChannelSendReceive2() throws Exception { // send from dc1 when current thread blocked in dc2.receive ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8")); - runAfterParkedAsync(() -> dc1.send(bb1, dc2.getLocalAddress())); + var unparker = runAfterParkedAsync(() -> dc1.send(bb1, dc2.getLocalAddress())); // read from dc2 should block ByteBuffer bb2 = ByteBuffer.allocate(10); dc2.receive(bb2); assertTrue(bb2.get(0) == 'X'); + + // check blocker object was set when thread parked + assertSame(dc2, unparker.parkBlocker()); } }); } @@ -546,7 +563,7 @@ void testDatagramSocketAdaptorReceive(int timeout) throws Exception { // send from dc1 when current thread blocks in dc2 receive ByteBuffer bb = ByteBuffer.wrap("XXX".getBytes("UTF-8")); - runAfterParkedAsync(() -> dc1.send(bb, dc2.getLocalAddress())); + var unparker = runAfterParkedAsync(() -> dc1.send(bb, dc2.getLocalAddress())); // receive should block byte[] array = new byte[100]; @@ -555,6 +572,9 @@ void testDatagramSocketAdaptorReceive(int timeout) throws Exception { dc2.socket().setSoTimeout(timeout); dc2.socket().receive(p); assertTrue(p.getLength() == 3 && array[0] == 'X'); + + // check blocker object was set when thread parked + assertSame(dc2, unparker.parkBlocker()); } }); } @@ -649,13 +669,16 @@ void testPipeReadWrite2() throws Exception { // write from sink when current thread blocks reading from source ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8")); - runAfterParkedAsync(() -> sink.write(bb1)); + var unparker = runAfterParkedAsync(() -> sink.write(bb1)); // read should block ByteBuffer bb2 = ByteBuffer.allocate(10); int n = source.read(bb2); assertTrue(n > 0); assertTrue(bb2.get(0) == 'X'); + + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); } }); } @@ -671,7 +694,7 @@ void testPipeReadWrite3() throws Exception { Pipe.SourceChannel source = p.source()) { // read from source to EOF when current thread blocking in write - Thread reader = runAfterParkedAsync(() -> readToEOF(source)); + var unparker = runAfterParkedAsync(() -> readToEOF(source)); // write to sink should block ByteBuffer bb = ByteBuffer.allocate(100*1024); @@ -682,8 +705,11 @@ void testPipeReadWrite3() throws Exception { } sink.close(); + // check blocker object was set when thread parked + assertNotNull(unparker.parkBlocker()); + // wait for reader to finish - reader.join(); + unparker.join(); } }); } @@ -854,16 +880,38 @@ interface ThrowingRunnable { void run() throws Exception; } + /** + * The unparker returned by runAfterParkedAsync. + */ + private static class Unparker { + final Thread thread; + final AtomicReference parkBlockerRef; + + Unparker(Thread thread, AtomicReference parkBlockerRef) { + this.thread = thread; + this.parkBlockerRef = parkBlockerRef; + } + + Object parkBlocker() { + return parkBlockerRef.get(); + } + + void join() throws InterruptedException { + thread.join(); + } + } + /** * Runs the given task asynchronously after the current virtual thread parks. * @param writing if the thread will block in write - * @return the thread started to run the task + * @return the unparker object */ - private static Thread runAfterParkedAsync(ThrowingRunnable task, boolean writing) { + private static Unparker runAfterParkedAsync(ThrowingRunnable task, boolean writing) { Thread target = Thread.currentThread(); if (!target.isVirtual()) throw new WrongThreadException(); - return Thread.ofPlatform().daemon().start(() -> { + var parkBlockerRef = new AtomicReference(); + Thread unparkerThread = Thread.ofPlatform().daemon().start(() -> { try { // wait for target thread to park while (!isWaiting(target)) { @@ -881,15 +929,19 @@ private static Thread runAfterParkedAsync(ThrowingRunnable task, boolean writing } } + // capture the blocker object + parkBlockerRef.set(LockSupport.getBlocker(target)); + task.run(); } catch (Exception e) { e.printStackTrace(); } }); + return new Unparker(unparkerThread, parkBlockerRef); } - private static Thread runAfterParkedAsync(ThrowingRunnable task) { + private static Unparker runAfterParkedAsync(ThrowingRunnable task) { return runAfterParkedAsync(task, false); } From 5cde5077ec2b490dd209bf9b44fbb3f0a3ccf1aa Mon Sep 17 00:00:00 2001 From: Volkan Yazici Date: Fri, 6 Nov 2026 11:19:03 +0000 Subject: [PATCH 025/110] 8396040: RandomAccessFile.skipBytes can skip backwards when n > 0 Reviewed-by: alanb --- .../classes/java/io/RandomAccessFile.java | 19 ++- .../java/io/RandomAccessFile/SkipBytes.java | 135 ++++++++++++++++++ .../RandomAccessFile/skipBytes/SkipBytes.java | 114 --------------- .../io/RandomAccessFile/skipBytes/input.txt | 3 - 4 files changed, 143 insertions(+), 128 deletions(-) create mode 100644 test/jdk/java/io/RandomAccessFile/SkipBytes.java delete mode 100644 test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java delete mode 100644 test/jdk/java/io/RandomAccessFile/skipBytes/input.txt diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java index 62a2afe5e45b..4d006f79572d 100644 --- a/src/java.base/share/classes/java/io/RandomAccessFile.java +++ b/src/java.base/share/classes/java/io/RandomAccessFile.java @@ -522,23 +522,20 @@ public final void readFully(byte[] b, int off, int len) throws IOException { * @throws IOException if an I/O error occurs. */ public int skipBytes(int n) throws IOException { - long pos; - long len; - long newpos; - if (n <= 0) { return 0; } - pos = getFilePointer(); - len = length(); - newpos = pos + n; - if (newpos > len) { - newpos = len; + long pos = getFilePointer(); + long len = length(); + if (pos >= len) { + return 0; } - seek(newpos); + long remaining = len - pos; + long newPos = remaining > n ? pos + n : len; + seek(newPos); /* return the actual number of bytes skipped */ - return (int) (newpos - pos); + return (int) (newPos - pos); } // 'Write' primitives diff --git a/test/jdk/java/io/RandomAccessFile/SkipBytes.java b/test/jdk/java/io/RandomAccessFile/SkipBytes.java new file mode 100644 index 000000000000..93e7d039b3dc --- /dev/null +++ b/test/jdk/java/io/RandomAccessFile/SkipBytes.java @@ -0,0 +1,135 @@ +/* + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.*; +import java.util.ArrayList; +import java.util.List; + +import static jdk.test.lib.Utils.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +/* + * @test + * @bug 4027717 8396040 + * @summary Check for correct implementation of RandomAccessFile.skipBytes + * @library /test/lib + * @run junit ${test.main.class} + */ + +class SkipBytes { + + static List args() throws IOException { + List args = new ArrayList<>(); + for (long size : List.of(0L, 1L, 100L)) { + + // Start positions + long[] positions = { + 0, + 1, + 2, + size - 1, + size, + size + 1, + Integer.MAX_VALUE - 1, + Integer.MAX_VALUE + }; + + // Skip lengths + long[] skips = { + Integer.MIN_VALUE, + Integer.MIN_VALUE + 1L, + -size - 1, + -size, + -size + 1, + -2, + -1, + 0, + 1, + 2, + size - 1, + size, + size + 1, + Integer.MAX_VALUE - 1L, + Integer.MAX_VALUE + }; + + // Generate test cases + for (long position : positions) { + if (position >= 0) { + for (long skip : skips) { + if (skip <= Integer.MAX_VALUE) { + args.add(Arguments.of(size, position, (int) skip)); + } + } + } + } + + } + return args; + } + + @ParameterizedTest + @MethodSource("args") + void test(long size, long initialPosition, int requestedSkip) throws IOException { + var path = createTempFileOfSize("RAF-SkipBytes-%s-".formatted(size), ".dat", size); + try (var raf = new RandomAccessFile(path.toFile(), "rw")) { + + // Seek to the requested start position + raf.seek(initialPosition); + long position0 = raf.getFilePointer(); + assertEquals(initialPosition, position0); + + // Skip requested bytes + int skip = raf.skipBytes(requestedSkip); + final int expectedSkip; + if (requestedSkip <= 0 || position0 >= size) { + expectedSkip = 0; + } else if (size - position0 > requestedSkip) { + expectedSkip = requestedSkip; + } else { + expectedSkip = Math.toIntExact(size - position0); + } + assertEquals(expectedSkip, skip); + + // Verify the new position + long position1 = raf.getFilePointer(); + long expectedPosition1 = initialPosition + skip; + assertEquals(expectedPosition1, position1); + + // Verify the read + int read = raf.read(); + if (position1 >= size) { + assertEquals(-1, read, "Expected EOF"); + } else { + assertNotEquals(-1, read, "Expected a byte"); + } + + } + } + +} diff --git a/test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java b/test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java deleted file mode 100644 index 2cf82899d8c3..000000000000 --- a/test/jdk/java/io/RandomAccessFile/skipBytes/SkipBytes.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -/* @test - @bug 4027717 - @summary Check for correct implementation of RandomAccessFile.skipBytes - */ - - -import java.io.*; - -public class SkipBytes{ - - - /* - * doTest attempts to skip num_to_skip bytes in raf starting from position 0. - * It also does a read after the skip to check if EOF has been reached - * correctly or incorrectly. - */ - - - private static void doTest(RandomAccessFile raf, int start, int num_to_skip) - throws Exception - { - - raf.seek(start); - - long cur_ptr = raf.getFilePointer(); - int length = (int) raf.length(); - System.err.println("\nCurrent pointer = " + cur_ptr + " length = " + - length + " num_to_skip = " + num_to_skip); - - //Do the Skip test - int num_skipped = raf.skipBytes(num_to_skip); - System.err.println("After skipBytes -- no. skipped = " + num_skipped); - - // if num_to_skip is negative do the negative skip test - if (num_to_skip <= 0) { - if (num_skipped != 0){ - System.err.println("Negative Skip Test Failed"); - throw new RuntimeException("Negative Skip Test Failed"); - } - else { - System.err.println("Negative Skip Test Succeeded"); - } - } - - cur_ptr = raf.getFilePointer(); - System.err.println("Current pointer = " + cur_ptr); - - // Check if skip has gone beyond EOF. - if (cur_ptr > length) { - System.err.println("Past EOF Skip Test Failed"); - throw new RuntimeException("Past EOF Skip Test Failed"); - } - else { - System.err.println("Past EOF Skip Test Succeeded"); - } - - // do read test - int byte_read = raf.read(); - if ( (cur_ptr == length) && - (byte_read != -1) ) { - System.err.println("byte_read = " + byte_read + - " Read Test Failed ......"); - throw new RuntimeException("Read Test Failed"); - } - else { - System.err.println("byte_read = " + byte_read + - " Read Test Succeeded"); - } - - } - - public static void main(String[] args) throws Exception { - - RandomAccessFile raf = new RandomAccessFile("input.txt" , "rw"); - try { - int length = (int)raf.length(); - - doTest(raf , 0 , 2*length); - doTest(raf , 0 , length); - doTest(raf , 0 , length/2); - doTest(raf , length/2 , -2); - doTest(raf , length , 0); - doTest(raf , 0 , -1); - } finally{ - raf.close(); - } - - } - -} diff --git a/test/jdk/java/io/RandomAccessFile/skipBytes/input.txt b/test/jdk/java/io/RandomAccessFile/skipBytes/input.txt deleted file mode 100644 index a5024189d8c7..000000000000 --- a/test/jdk/java/io/RandomAccessFile/skipBytes/input.txt +++ /dev/null @@ -1,3 +0,0 @@ -foo -goo -moo From 1b0a2fb98a5095feff1e03f8d5ec483e73b6add6 Mon Sep 17 00:00:00 2001 From: Martin Doerr Date: Fri, 6 Nov 2026 11:33:04 +0000 Subject: [PATCH 026/110] 8396833: [AIX] Remove -fsigned-char usage from flags-cflags.m4 Reviewed-by: dbriemann, mbaesken --- make/autoconf/flags-cflags.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 index e2a30c5cfbd5..45e2d8c4e9bb 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 @@ -583,7 +583,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER], if test "x$OPENJDK_TARGET_OS" = xaix; then TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno" - TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char" + TOOLCHAIN_CFLAGS_JDK="-ffunction-sections" fi TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -fvisibility=hidden -fstack-protector" From 1285b1ad915d0d9930a1453fb13021740669ff0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= Date: Fri, 6 Nov 2026 11:53:49 +0000 Subject: [PATCH 027/110] 8365796: Remove QuicPacketNumbersTest.java Reviewed-by: dfuchs --- .../httpclient/quic/PacketNumbersTest.java | 111 +++++++------- .../quic/packets/QuicPacketNumbersTest.java | 137 ------------------ 2 files changed, 61 insertions(+), 187 deletions(-) delete mode 100644 test/jdk/jdk/internal/net/http/quic/packets/QuicPacketNumbersTest.java diff --git a/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java b/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java index 7c19e8b414ed..1fbd744bc95d 100644 --- a/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java +++ b/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java @@ -22,7 +22,7 @@ */ import java.nio.ByteBuffer; -import java.util.List; +import java.util.HexFormat; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Assertions; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -41,18 +40,18 @@ */ public class PacketNumbersTest { - record EncodeResult(int expected, boolean assertion, Class failure) { + record EncodeResult(String expected, boolean assertion, Class failure) { public static EncodeResult illegal() { - return new EncodeResult(-1, true, IllegalArgumentException.class); + return new EncodeResult(null, false, IllegalArgumentException.class); } public static EncodeResult asserting() { - return new EncodeResult(-1, true, AssertionError.class); + return new EncodeResult(null, true, AssertionError.class); } - public static EncodeResult success(int result) { + public static EncodeResult success(String result) { return new EncodeResult(result, false, null); } public static EncodeResult fail(Class failure) { - return new EncodeResult(-1, false, failure); + return new EncodeResult(null, false, failure); } public boolean fail() { return failure() != null; @@ -86,72 +85,84 @@ public String toString() { } } - public static Object[][] encode() { - return List.of( + static Stream encode() { + return Stream.of( // these first three test cases are extracted from RFC 9000, appendix A.2 and A.3 - new TestCase("success", 0xa82f9b32L, 0xa82f30eaL, EncodeResult.success(0x9b32)), - new TestCase("success", 0xace8feL, 0xabe8b3L, EncodeResult.success(0xace8fe & 0xFFFFFF)), - new TestCase("success", 0xac5c02L, 0xabe8b3L, EncodeResult.success(0xac5c02 & 0xFFFF)), + new TestCase("success", 0xa82f9b32L, 0xa82f30eaL, EncodeResult.success("9B32")), + new TestCase("success", 0xace8feL, 0xabe8b3L, EncodeResult.success("ACE8FE")), + new TestCase("success", 0xac5c02L, 0xabe8b3L, EncodeResult.success("5C02")), // additional test cases - these have been obtained empirically to test at the limits - new TestCase("success", 0x7FFFFFFFFFFFL, 0x7FFFFFFFFF00L, EncodeResult.success(0x0000FFFF)), - new TestCase("success", 0xFFFFFFFFFFL, 0xFFFFFFFF00L, EncodeResult.success(0x0000FFFF)), - new TestCase("success", 0xFFFFFFFFL, 0xFFFFFFFEL, EncodeResult.success(0x000000FF)), - new TestCase("success", 0xFFFFFFFFL, 0xFFFFFF00L, EncodeResult.success(0x0000FFFF)), - new TestCase("success", 0xFFFFFFFFL, 0xFFFF0000L, EncodeResult.success(0x00FFFFFF)), - new TestCase("success", 0xFFFFFFFFL, 0xFF000000L, EncodeResult.success(0xFFFFFFFF)), - new TestCase("success", 0xFFFFFFFFL, 0xF0000000L, EncodeResult.success(0xFFFFFFFF)), - new TestCase("success", 0xFFFFFFFFL, 0x80000000L, EncodeResult.success(0xFFFFFFFF)), + new TestCase("success", 0x7FFFFFFFFFFFL, 0x7FFFFFFFFF00L, EncodeResult.success("FFFF")), + new TestCase("success", 0xFFFFFFFFFFL, 0xFFFFFFFF00L, EncodeResult.success("FFFF")), + new TestCase("success", 0xFFFFFFFFL, 0xFFFFFFFEL, EncodeResult.success("FF")), + new TestCase("success", 0xFFFFFFFFL, 0xFFFFFF00L, EncodeResult.success("FFFF")), + new TestCase("success", 0xFFFFFFFFL, 0xFFFF0000L, EncodeResult.success("FFFFFF")), + new TestCase("success", 0xFFFFFFFFL, 0xFF000000L, EncodeResult.success("FFFFFFFF")), + new TestCase("success", 0xFFFFFFFFL, 0xF0000000L, EncodeResult.success("FFFFFFFF")), + new TestCase("success", 0xFFFFFFFFL, 0x80000000L, EncodeResult.success("FFFFFFFF")), new TestCase("illegal(5)",0xFFFFFFFFL, 0x7FFFFFFFL, EncodeResult.illegal()), - new TestCase("success", 0x8FFFFFFFL, 0x10000000L, EncodeResult.success(0x8FFFFFFF)), + new TestCase("success", 0x8FFFFFFFL, 0x10000000L, EncodeResult.success("8FFFFFFF")), new TestCase("illegal(5)",0x8FFFFFFFL, 0x0FFFFFFFL, EncodeResult.illegal()), new TestCase("illegal(5)",0x8FFFFFFFL, 256L, EncodeResult.illegal()), - new TestCase("success", 0x7FFFFFFFL, 255L, EncodeResult.success(0x7FFFFFFF)), - new TestCase("success", 0x7FFFFFFFL, 0L, EncodeResult.success(0x7FFFFFFF)), + new TestCase("success", 0x7FFFFFFFL, 255L, EncodeResult.success("7FFFFFFF")), + new TestCase("success", 0x7FFFFFFFL, 0L, EncodeResult.success("7FFFFFFF")), new TestCase("illegal(5)",0x7FFFFFFFL, -1L, EncodeResult.illegal()), - new TestCase("success", 0x6FFFFFFFL, 0L, EncodeResult.success(0x6FFFFFFF)), - new TestCase("success", 0xFFFFFFL, 0L, EncodeResult.success(0xFFFFFF)), - new TestCase("success", 0xFFFFL, 0L, EncodeResult.success(0xFFFF)), - new TestCase("success", 255L, 0L, EncodeResult.success(255)), - new TestCase("success", 1L, 0L, EncodeResult.success(1)), - new TestCase("success", 0x6FFFFFFFL, -1L, EncodeResult.success(0x6FFFFFFF)), - new TestCase("success", 0xFFFFFFL, -1L, EncodeResult.success(0xFFFFFF)), - new TestCase("success", 0xFFFFL, -1L, EncodeResult.success(0xFFFF)), - new TestCase("success", 255L, -1L, EncodeResult.success(255)), - new TestCase("success", 1L, -1L, EncodeResult.success(1)), - new TestCase("success", 0L, -1L, EncodeResult.success(0)), + new TestCase("illegal(5)",0x80000000L, 0L, EncodeResult.illegal()), + new TestCase("success", 0x6FFFFFFFL, 0L, EncodeResult.success("6FFFFFFF")), + new TestCase("success", 0xFFFFFFL, 0L, EncodeResult.success("00FFFFFF")), + new TestCase("success", 0xFFFFL, 0L, EncodeResult.success("00FFFF")), + new TestCase("success", 255L, 0L, EncodeResult.success("00FF")), + new TestCase("success", 1L, 0L, EncodeResult.success("01")), + new TestCase("success", 0x6FFFFFFFL, -1L, EncodeResult.success("6FFFFFFF")), + new TestCase("success", 0xFFFFFFL, -1L, EncodeResult.success("00FFFFFF")), + new TestCase("success", 0xFFFFL, -1L, EncodeResult.success("00FFFF")), + new TestCase("success", 255L, -1L, EncodeResult.success("00FF")), + new TestCase("success", 1L, -1L, EncodeResult.success("01")), + new TestCase("success", 0L, -1L, EncodeResult.success("00")), new TestCase("assert", 0L, 1L, EncodeResult.asserting()), new TestCase("assert", 0L, 0L, EncodeResult.asserting()), - new TestCase("assert", 1L, 1L, EncodeResult.asserting()) - ).stream().map(Stream::of) - .map(Stream::toArray) - .toArray(Object[][]::new); + new TestCase("assert", 1L, 1L, EncodeResult.asserting()), + // Various other checks for first-packet encodings. + new TestCase("success", 5L, -1L, EncodeResult.success("05")), + new TestCase("success", 0x7EL, -1L, EncodeResult.success("7E")), + new TestCase("success", 0x7FL, -1L, EncodeResult.success("007F")), + new TestCase("success", 0x80L, -1L, EncodeResult.success("0080")), + new TestCase("success", 0x100L, -1L, EncodeResult.success("0100")), + // Various checks for a packet 0 that has been ack'd. + new TestCase("success", 0x7FL, 0L, EncodeResult.success("7F")), + new TestCase("success", 0x80L, 0L, EncodeResult.success("0080")), + new TestCase("success", 0x100L, 0L, EncodeResult.success("0100")), + new TestCase("success", 0x7FFFL, 0L, EncodeResult.success("7FFF")), + new TestCase("success", 0x8000L, 0L, EncodeResult.success("008000")), + new TestCase("success", 0x7FFFFFL, 0L, EncodeResult.success("7FFFFF")), + new TestCase("success", 0x800000L, 0L, EncodeResult.success("00800000")), + // Check some similar truncations. + new TestCase("success", 0x0101L, 0x82L, EncodeResult.success("01")), + new TestCase("success", 0x0101L, 0x81L, EncodeResult.success("0101")), + new TestCase("success", 0x010001L, 0xFF82L, EncodeResult.success("01")), + new TestCase("success", 0x010001L, 0xFF81L, EncodeResult.success("0001")), + new TestCase("success", 0x01000001L, 0xFFFF82L, EncodeResult.success("01")), + new TestCase("success", 0x01000001L, 0xFFFF81L, EncodeResult.success("0001")) + ); } @ParameterizedTest @MethodSource("encode") - public void testEncodePacketNumber(TestCase test) { + void testEncodePacketNumber(TestCase test) { System.out.println(test); if (test.result().assertion()) { - Assumptions.assumeFalse(!QuicPacketNumbers.class.desiredAssertionStatus(), "needs assertion enabled (-esa)"); - Throwable t = Assertions.assertThrows(test.result().failure(), test::encode); - System.out.println("Got expected assertion: " + t); - return; + Assumptions.assumeTrue(QuicPacketNumbers.class.desiredAssertionStatus(), "needs assertion enabled (-ea)"); } if (test.result().fail()) { Throwable t = Assertions.assertThrows(test.result().failure(), test::encode); System.out.println("Got expected exception: " + t); return; - } byte[] res = test.encode(); - int truncated = 0; - for (int i=0; i 4 bytes are not generated. - try { - checkEncodePacketNumber(0x80000000L, 0L, - new byte[]{(byte) 0x00, (byte) 0x80, (byte) 0x00, - (byte) 0x00, (byte) 0x00}); - throw new Exception("Shouldn't encode"); - } catch (RuntimeException e) { - System.out.println("Caught the right exception!"); - } - - // Test decoding logic. - - // Test values from the upcoming QUIC RFC, Appendix A.3. - checkDecodePacketNumber(0xa82f30eaL, - ByteBuffer.wrap(new byte[]{(byte) 0x9b, (byte) 0x32}), - 2, 0xa82f9b32L); - - // TBD: More test values - } - - public static void checkEncodePacketNumber( - long fullPN, long largestAcked, byte[] bytes) throws Exception { - - byte[] answer = QuicPacketNumbers.encodePacketNumber( - fullPN, largestAcked); - - if (!Arrays.equals(answer, bytes)) { - throw new Exception("Encoding Problem"); - } - } - - public static void checkDecodePacketNumber( - long largestPN, ByteBuffer buf, int headerNumBytes, - long answer) throws Exception { - - long result = QuicPacketNumbers.decodePacketNumber( - largestPN, buf, headerNumBytes); - - if (result != answer) { - throw new Exception("Decoding Problem"); - } - } -} From ef5b429ee042d58fd0504675056385af1e7c8458 Mon Sep 17 00:00:00 2001 From: Andreas Chmielewski Date: Fri, 6 Nov 2026 12:31:19 +0000 Subject: [PATCH 028/110] 8396122: Use narrow_subword_type() in remaining AArch64 compare-and-exchange instructions Reviewed-by: mhaessig, dlong --- src/hotspot/cpu/aarch64/aarch64_atomic.ad | 8 ++++---- src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic.ad b/src/hotspot/cpu/aarch64/aarch64_atomic.ad index 378a1ea8f131..071a893af4ad 100644 --- a/src/hotspot/cpu/aarch64/aarch64_atomic.ad +++ b/src/hotspot/cpu/aarch64/aarch64_atomic.ad @@ -50,7 +50,7 @@ instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI oldval, iRegI ne ins_encode %{ __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::byte, memory_order_release, $res$$Register); - __ sxtbw($res$$Register, $res$$Register); + __ narrow_subword_type($res$$Register, T_BYTE); %} ins_pipe(pipe_slow); %} @@ -66,7 +66,7 @@ instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI oldval, iRegI ne ins_encode %{ __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::halfword, memory_order_release, $res$$Register); - __ sxthw($res$$Register, $res$$Register); + __ narrow_subword_type($res$$Register, T_SHORT); %} ins_pipe(pipe_slow); %} @@ -142,7 +142,7 @@ instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI ins_encode %{ __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::byte, memory_order_seq_cst, $res$$Register); - __ sxtbw($res$$Register, $res$$Register); + __ narrow_subword_type($res$$Register, T_BYTE); %} ins_pipe(pipe_slow); %} @@ -158,7 +158,7 @@ instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI ins_encode %{ __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::halfword, memory_order_seq_cst, $res$$Register); - __ sxthw($res$$Register, $res$$Register); + __ narrow_subword_type($res$$Register, T_SHORT); %} ins_pipe(pipe_slow); %} diff --git a/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 index 82cbbd0c6f5d..dde3ac433533 100644 --- a/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 +++ b/src/hotspot/cpu/aarch64/aarch64_atomic_ad.m4 @@ -60,7 +60,7 @@ ifelse($7,Acq,INDENT(predicate(needs_acquiring_load_exclusive(n));), ins_encode %{ __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::$4, ifelse($7,Acq,memory_order_seq_cst,memory_order_release), $res$$Register); - __ $6($res$$Register, $res$$Register); + __ narrow_subword_type($res$$Register, $6); %} ins_pipe(pipe_slow); %}')dnl @@ -86,15 +86,15 @@ ifelse($1$6,PAcq,INDENT(predicate(needs_acquiring_load_exclusive(n) && (n->as_Lo ins_pipe(pipe_slow); %}')dnl dnl -CAE_INSN1(B, I, byte, byte, b, sxtbw, ) -CAE_INSN1(S, I, short, halfword, s, sxthw, ) +CAE_INSN1(B, I, byte, byte, b, T_BYTE, ) +CAE_INSN1(S, I, short, halfword, s, T_SHORT, ) CAE_INSN2(I, I, int, word, w, , ) CAE_INSN2(L, L, long, xword, , , ) CAE_INSN2(N, N, narrow oop, word, w, , ) CAE_INSN2(P, P, ptr, xword, , , ) dnl -CAE_INSN1(B, I, byte, byte, b, sxtbw, Acq) -CAE_INSN1(S, I, short, halfword, s, sxthw, Acq) +CAE_INSN1(B, I, byte, byte, b, T_BYTE, Acq) +CAE_INSN1(S, I, short, halfword, s, T_SHORT, Acq) CAE_INSN2(I, I, int, word, w, Acq) CAE_INSN2(L, L, long, xword, , Acq) CAE_INSN2(N, N, narrow oop, word, w, Acq) From 0c856e31e0317944dd2fc7303ff19cd2084c0b20 Mon Sep 17 00:00:00 2001 From: Adam Sotona Date: Fri, 6 Nov 2026 12:31:46 +0000 Subject: [PATCH 029/110] 8390208: Some typos in the java.base module ( 2 x "Varible", "There're", "norminal", "Builer", "sensistive", "altogther", "divisble", "converions") Reviewed-by: jpai, iris, liach --- .../java/lang/classfile/attribute/LocalVariableInfo.java | 4 ++-- .../lang/classfile/attribute/LocalVariableTableAttribute.java | 4 ++-- .../java/lang/classfile/instruction/ThrowInstruction.java | 4 ++-- src/java.base/share/classes/java/net/CookieManager.java | 4 ++-- src/java.base/share/classes/java/text/Collator.java | 4 ++-- .../share/classes/java/time/chrono/IsoChronology.java | 4 ++-- src/java.base/share/classes/java/util/Locale.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableInfo.java b/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableInfo.java index b6b1c03f1333..23bc52980152 100644 --- a/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableInfo.java +++ b/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ * * @see LocalVariableTableAttribute#localVariables() * @see LocalVariable - * @jvms 4.7.13 The {@code LocalVaribleTable} Attribute + * @jvms 4.7.13 The {@code LocalVariableTable} Attribute * @since 24 */ public sealed interface LocalVariableInfo diff --git a/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableTableAttribute.java b/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableTableAttribute.java index ad01a5c13ac7..f12fd36ee998 100644 --- a/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableTableAttribute.java +++ b/src/java.base/share/classes/java/lang/classfile/attribute/LocalVariableTableAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ * attribute to be present. * * @see Attributes#localVariableTable() - * @jvms 4.7.13 The {@code LocalVaribleTable} Attribute + * @jvms 4.7.13 The {@code LocalVariableTable} Attribute * @since 24 */ public sealed interface LocalVariableTableAttribute diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java index 4504b855c4c8..dd6c888bda84 100644 --- a/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java +++ b/src/java.base/share/classes/java/lang/classfile/instruction/ThrowInstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,7 @@ * A throw instruction has no visible state. * * @see Opcode.Kind#THROW_EXCEPTION - * @see CodeBuilder#athrow CodeBuiler::athrow + * @see CodeBuilder#athrow CodeBuilder::athrow * @since 24 */ public sealed interface ThrowInstruction extends Instruction diff --git a/src/java.base/share/classes/java/net/CookieManager.java b/src/java.base/share/classes/java/net/CookieManager.java index 9cb69b804937..bd6351e8de21 100644 --- a/src/java.base/share/classes/java/net/CookieManager.java +++ b/src/java.base/share/classes/java/net/CookieManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -85,7 +85,7 @@ * * * - *

There're various ways user can hook up his own HTTP cookie management behavior, e.g. + *

There are various ways a user can hook up his own HTTP cookie management behavior, e.g. *

*
    *
  • Use CookieHandler.setDefault to set a brand new {@link CookieHandler} implementation diff --git a/src/java.base/share/classes/java/text/Collator.java b/src/java.base/share/classes/java/text/Collator.java index 5e576cd800ff..5c1d5a8b5dba 100644 --- a/src/java.base/share/classes/java/text/Collator.java +++ b/src/java.base/share/classes/java/text/Collator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -204,7 +204,7 @@ public abstract class Collator * set, both Unicode canonical variants and Unicode compatibility variants * will be decomposed for collation. This causes not only accented * characters to be collated, but also characters that have special formats - * to be collated with their norminal form. For example, the half-width and + * to be collated with their nominal form. For example, the half-width and * full-width ASCII and Katakana characters are then collated together. * FULL_DECOMPOSITION is the most complete and therefore the slowest * decomposition mode. diff --git a/src/java.base/share/classes/java/time/chrono/IsoChronology.java b/src/java.base/share/classes/java/time/chrono/IsoChronology.java index d2590ad31585..b457237c3dc7 100644 --- a/src/java.base/share/classes/java/time/chrono/IsoChronology.java +++ b/src/java.base/share/classes/java/time/chrono/IsoChronology.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -116,7 +116,7 @@ * Month 2 has 28 days, or 29 in a leap year. *
  • day-of-year - There are 365 days in a standard ISO year and 366 in a leap year. * The days are numbered from 1 to 365 or 1 to 366. - *
  • leap-year - Leap years occur every 4 years, except where the year is divisble by 100 and not divisble by 400. + *
  • leap-year - Leap years occur every 4 years, except where the year is divisible by 100 and not divisible by 400. *
* * @implSpec diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java index 9cb1521ac622..66ee29a4fef9 100644 --- a/src/java.base/share/classes/java/util/Locale.java +++ b/src/java.base/share/classes/java/util/Locale.java @@ -2732,7 +2732,7 @@ public Builder setLocale(Locale locale) { * keys and attributes within a U extension. Note that subsequent subtags after * the occurrence of a duplicate are not ignored. * - *

See {@link Locale##langtag_conversions converions} for a full list + *

See {@link Locale##langtag_conversions conversions} for a full list * of conversions that are performed on {@code languageTag}. * * @param languageTag the language tag From 1ada181003c78e4b0e7eb8f6eecf4d66725cc74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Fri, 6 Nov 2026 12:55:10 +0000 Subject: [PATCH 030/110] 8396181: Clean up Content class hierarchy Reviewed-by: liach --- .../html/AbstractOverviewIndexWriter.java | 5 ++-- .../formats/html/AllClassesIndexWriter.java | 5 ++-- .../formats/html/AllPackagesIndexWriter.java | 5 ++-- .../doclets/formats/html/ClassUseWriter.java | 4 ++-- .../doclets/formats/html/ClassWriter.java | 4 ++-- .../formats/html/ConstantsSummaryWriter.java | 4 ++-- .../doclets/formats/html/DocFilesHandler.java | 3 ++- .../formats/html/ExternalSpecsWriter.java | 3 ++- .../doclets/formats/html/HelpWriter.java | 5 ++-- .../formats/html/HtmlDocletWriter.java | 2 +- .../formats/html/IndexItemListWriter.java | 5 ++-- .../formats/html/IndexRedirectWriter.java | 4 ++-- .../doclets/formats/html/IndexWriter.java | 5 ++-- .../doclets/formats/html/ModuleWriter.java | 4 ++-- .../formats/html/PackageTreeWriter.java | 4 ++-- .../formats/html/PackageUseWriter.java | 4 ++-- .../doclets/formats/html/PackageWriter.java | 4 ++-- .../doclets/formats/html/SearchWriter.java | 3 ++- .../formats/html/SerializedFormWriter.java | 4 ++-- .../formats/html/SourceToHTMLConverter.java | 4 ++-- .../formats/html/SummaryListWriter.java | 4 ++-- .../internal/doclets/formats/html/Table.java | 4 ++-- .../doclets/formats/html/TableHeader.java | 23 +++---------------- .../doclets/formats/html/TreeWriter.java | 5 ++-- .../formats/html/markup/BodyContents.java | 23 +++---------------- .../doclets/formats/html/markup/Head.java | 21 ++--------------- 26 files changed, 60 insertions(+), 101 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java index 12e6fbab4697..e7ce31ee3141 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -108,7 +108,8 @@ public void buildPage() throws DocFileIOException { body.add(new BodyContents() .setHeader(getHeader(PageMode.OVERVIEW)) .addMainContent(main) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument( configuration.metakeywords.getOverviewMetaKeywords(titleKey, configuration.getOptions().docTitle()), getDescription(), body); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java index c91ee348c117..67779b5ad5ab 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -71,7 +71,8 @@ public void buildPage() throws DocFileIOException { body.add(new BodyContents() .setHeader(getHeader(PageMode.ALL_CLASSES)) .addMainContent(mainContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "class index", body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java index b80be46aa24e..eb24e08cdd04 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,7 +68,8 @@ public void buildPage() throws DocFileIOException { .setHeader(getHeader(PageMode.ALL_PACKAGES)) .addMainContent(headerDiv) .addMainContent(mainContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "package index", body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java index c2a63be654d3..4a9b8f5f7ffe 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -214,7 +214,7 @@ public void buildPage() throws DocFileIOException { } bodyContents.addMainContent(mainContent); bodyContents.setFooter(getFooter()); - body.add(bodyContents); + body.add(bodyContents.toContent()); String description = getDescription("use", typeElement); printHtmlDocument(null, description, body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java index f5a5a48222cc..7b2fdaf56131 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -495,7 +495,7 @@ protected void printDocument(Content content) throws DocFileIOException { String description = getDescription("declaration", typeElement); PackageElement pkg = utils.containingPackage(typeElement); List localStylesheets = getLocalStylesheets(pkg); - content.add(bodyContents); + content.add(bodyContents.toContent()); printHtmlDocument(configuration.metakeywords.getMetaKeywords(typeElement), description, localStylesheets, content); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java index 3c191063e481..508b9d4fe47d 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -460,7 +460,7 @@ void addFooter() { } void printDocument(Content content) throws DocFileIOException { - content.add(bodyContents); + content.add(bodyContents.toContent()); printHtmlDocument(null, "summary of constants", content); if (hasConstants && configuration.indexBuilder != null) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java index 04a0309d1bef..6bc18dee5fed 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java @@ -229,7 +229,8 @@ public void buildPage() throws DocFileIOException { htmlContent.add(new BodyContents() .setHeader(getHeader(PageMode.DOC_FILE, dfElement.getElement())) .addMainContent(pageContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(List.of(), null, localTagsContent, List.of(), htmlContent); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java index b8767dd9913f..75e4725a840b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java @@ -130,7 +130,8 @@ function selectHost() { } selectHost(); """).asContent()) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "external specifications", body); if (configuration.indexBuilder != null) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java index cdbb2a85d093..5534de4d8cbf 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -85,7 +85,8 @@ public void buildPage() throws DocFileIOException { .setHeader(getHeader(PageMode.HELP)) .addMainContent(helpFileContent) .setSideContent(tableOfContents.toContent(false)) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "help", body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index 49e882ca4fe4..e4c5e4c8e796 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -516,7 +516,7 @@ public void printHtmlDocument(List metakeywords, .addContent(extraHeadContent); HtmlDocument htmlDocument = new HtmlDocument( - HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body)); + HtmlTree.HTML(configuration.getLocale().getLanguage(), head.toContent(), body)); htmlDocument.write(DocFile.createFileForOutput(configuration, path)); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java index 2a581a09c620..3f41aeff72d6 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexItemListWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -94,7 +94,8 @@ public void buildPage() throws DocFileIOException { .addMainContent(HtmlTree.DIV(HtmlStyles.header, HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, getPageLabel()))) .addMainContent(mainContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, title.toLowerCase(Locale.ROOT), body); if (configuration.indexBuilder != null) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java index 2ad39dbf94cf..9fc7f01b5f1e 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -107,7 +107,7 @@ public void buildPage() throws DocFileIOException { .add(HtmlTree.MAIN(bodyContent)); HtmlDocument htmlDocument = new HtmlDocument( - HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body)); + HtmlTree.HTML(configuration.getLocale().getLanguage(), head.toContent(), body)); htmlDocument.write(DocFile.createFileForOutput(configuration, path)); } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java index 14cf7f2daead..6178b3f8d21c 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,7 +132,8 @@ public void buildPage() throws DocFileIOException { HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, contents.getContent("doclet.Index")))) .addMainContent(mainContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); String description = splitIndex ? "index: " + displayFirstCharacters.get(0) : "index"; printHtmlDocument(null, description, body); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java index 020159bb599d..fdca0c7b852d 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -935,7 +935,7 @@ protected void addModuleFooter() { } protected void printDocument(Content content) throws DocFileIOException { - content.add(bodyContents); + content.add(bodyContents.toContent()); printHtmlDocument(configuration.metakeywords.getMetaKeywordsForModule(mdle), getDescription("declaration", mdle), getLocalStylesheets(mdle), content); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java index 8ff3cf977971..64ff01f25880 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -109,7 +109,7 @@ public void buildPage() throws DocFileIOException { addTree(classTree.recordClasses(), "doclet.Record_Class_Hierarchy", mainContent); bodyContents.addMainContent(mainContent); bodyContents.setFooter(getFooter()); - body.add(bodyContents); + body.add(bodyContents.toContent()); printHtmlDocument(null, getDescription("tree", packageElement), body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java index 078f5246de7f..bed0a24739bc 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -107,7 +107,7 @@ public void buildPage() throws DocFileIOException { } bodyContents.addMainContent(mainContent); bodyContents.setFooter(getFooter()); - body.add(bodyContents); + body.add(bodyContents.toContent()); printHtmlDocument(null, getDescription("use", packageElement), body); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java index c28ffe4ceef0..538143741bea 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -419,7 +419,7 @@ protected void addPackageFooter() { protected void printDocument(Content content) throws DocFileIOException { String description = getDescription("declaration", packageElement); List localStylesheets = getLocalStylesheets(packageElement); - content.add(bodyContents); + content.add(bodyContents.toContent()); printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageElement), description, localStylesheets, content); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java index 5fa0daacf987..85d03674488c 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java @@ -63,7 +63,8 @@ public void buildPage() throws DocFileIOException { body.add(new BodyContents() .setHeader(getHeader(PageMode.SEARCH)) .addMainContent(searchFileContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "search", body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java index e81ad2f39afb..ae0585793e8b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -694,7 +694,7 @@ void addFooter() { } void printDocument(Content source) throws DocFileIOException { - source.add(bodyContents); + source.add(bodyContents.toContent()); printHtmlDocument(null, "serialized forms", source); if (configuration.indexBuilder != null) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java index 68d2bc8b4d0d..5391191ec121 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -234,7 +234,7 @@ private void writeToFile(Content body, DocPath path, TypeElement te) throws DocF .setGenerator(HtmlDocletWriter.getGenerator(getClass())) .addDefaultScript(false) .setStylesheets(configuration.getMainStylesheet(), configuration.getAdditionalStylesheets(), List.of()); - var html = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body); + var html = HtmlTree.HTML(configuration.getLocale().getLanguage(), head.toContent(), body); HtmlDocument document = new HtmlDocument(html); messages.notice("doclet.Generating_0", path.getPath()); document.write(DocFile.createFileForOutput(configuration, path)); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java index b7e23530477a..9d471fa56764 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -169,7 +169,7 @@ public void buildPage() throws DocFileIOException { }); """).asContent()); bodyContents.setFooter(getFooter()); - body.add(bodyContents); + body.add(bodyContents.toContent()); printHtmlDocument(null, getDescription(), body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java index 383bde4a63d8..793eea3ae9e9 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -433,7 +433,7 @@ private HtmlTree createTab(HtmlId tabId, HtmlStyle style, boolean defaultTab, Co private Content getTableBody() { ContentBuilder tableContent = new ContentBuilder(); - tableContent.add(header); + tableContent.add(header.toContent()); bodyRows.forEach(tableContent::add); return tableContent; } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java index 52ca845d26e7..107aa0df96cc 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ * The attribute {@code scope="col"} is automatically added to each header cell. * In addition, a series of style class names can be specified, to be applied one per cell. */ -public class TableHeader extends Content { +public class TableHeader { /** * The content to be put in each of the {@code

* * + * + * * * * @@ -797,7 +799,7 @@ public static final class UnicodeBlock extends Subset { * It should be adjusted whenever the Unicode Character Database * is upgraded. */ - private static final int NUM_ENTITIES = 804; + private static final int NUM_ENTITIES = 821; private static Map map = HashMap.newHashMap(NUM_ENTITIES); /** @@ -3845,6 +3847,71 @@ private UnicodeBlock(String idName, String... aliases) { "CJK UNIFIED IDEOGRAPHS EXTENSION J", "CJKUNIFIEDIDEOGRAPHSEXTENSIONJ"); + /** + * Constant for the "Bengali Supplement" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock BENGALI_SUPPLEMENT = + new UnicodeBlock("BENGALI_SUPPLEMENT", + "BENGALI SUPPLEMENT", + "BENGALISUPPLEMENT"); + + /** + * Constant for the "Archaic Cuneiform Numerals" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock ARCHAIC_CUNEIFORM_NUMERALS = + new UnicodeBlock("ARCHAIC_CUNEIFORM_NUMERALS", + "ARCHAIC CUNEIFORM NUMERALS", + "ARCHAICCUNEIFORMNUMERALS"); + + /** + * Constant for the "Jurchen" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock JURCHEN = + new UnicodeBlock("JURCHEN"); + + /** + * Constant for the "Jurchen Radicals" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock JURCHEN_RADICALS = + new UnicodeBlock("JURCHEN_RADICALS", + "JURCHEN RADICALS", + "JURCHENRADICALS"); + + /** + * Constant for the "Musical Symbols Supplement" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock MUSICAL_SYMBOLS_SUPPLEMENT = + new UnicodeBlock("MUSICAL_SYMBOLS_SUPPLEMENT", + "MUSICAL SYMBOLS SUPPLEMENT", + "MUSICALSYMBOLSSUPPLEMENT"); + + /** + * Constant for the "Miscellaneous Symbols and Arrows Extended" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS_EXTENDED = + new UnicodeBlock("MISCELLANEOUS_SYMBOLS_AND_ARROWS_EXTENDED", + "MISCELLANEOUS SYMBOLS AND ARROWS EXTENDED", + "MISCELLANEOUSSYMBOLSANDARROWSEXTENDED"); + + /** + * Constant for the "Seal" Unicode + * character block. + * @since 28 + */ + public static final UnicodeBlock SEAL = + new UnicodeBlock("SEAL"); private static final int[] blockStarts = { 0x0000, // 0000..007F; Basic Latin @@ -4118,7 +4185,8 @@ private UnicodeBlock(String idName, String... aliases) { 0x11D00, // 11D00..11D5F; Masaram Gondi 0x11D60, // 11D60..11DAF; Gunjala Gondi 0x11DB0, // 11DB0..11DEF; Tolong Siki - 0x11DF0, // unassigned + 0x11DF0, // 11DF0..11DFF; Bengali Supplement + 0x11E00, // unassigned 0x11EE0, // 11EE0..11EFF; Makasar 0x11F00, // 11F00..11F5F; Kawi 0x11F60, // unassigned @@ -4127,7 +4195,8 @@ private UnicodeBlock(String idName, String... aliases) { 0x12000, // 12000..123FF; Cuneiform 0x12400, // 12400..1247F; Cuneiform Numbers and Punctuation 0x12480, // 12480..1254F; Early Dynastic Cuneiform - 0x12550, // unassigned + 0x12550, // 12550..1268F; Archaic Cuneiform Numerals + 0x12690, // unassigned 0x12F90, // 12F90..12FFF; Cypro-Minoan 0x13000, // 13000..1342F; Egyptian Hieroglyphs 0x13430, // 13430..1345F; Egyptian Hieroglyph Format Controls @@ -4155,7 +4224,9 @@ private UnicodeBlock(String idName, String... aliases) { 0x18B00, // 18B00..18CFF; Khitan Small Script 0x18D00, // 18D00..18D7F; Tangut Supplement 0x18D80, // 18D80..18DFF; Tangut Components Supplement - 0x18E00, // unassigned + 0x18E00, // 18E00..1919F; Jurchen + 0x191A0, // 191A0..191DF; Jurchen Radicals + 0x191E0, // unassigned 0x1AFF0, // 1AFF0..1AFFF; Kana Extended-B 0x1B000, // 1B000..1B0FF; Kana Supplement 0x1B100, // 1B100..1B12F; Kana Extended-A @@ -4172,7 +4243,8 @@ private UnicodeBlock(String idName, String... aliases) { 0x1D000, // 1D000..1D0FF; Byzantine Musical Symbols 0x1D100, // 1D100..1D1FF; Musical Symbols 0x1D200, // 1D200..1D24F; Ancient Greek Musical Notation - 0x1D250, // unassigned + 0x1D250, // 1D250..1D28F; Musical Symbols Supplement + 0x1D290, // unassigned 0x1D2C0, // 1D2C0..1D2DF; Kaktovik Numerals 0x1D2E0, // 1D2E0..1D2FF; Mayan Numerals 0x1D300, // 1D300..1D35F; Tai Xuan Jing Symbols @@ -4181,6 +4253,8 @@ private UnicodeBlock(String idName, String... aliases) { 0x1D400, // 1D400..1D7FF; Mathematical Alphanumeric Symbols 0x1D800, // 1D800..1DAAF; Sutton SignWriting 0x1DAB0, // unassigned + 0x1DB00, // 1DB00..1DBFF; Miscellaneous Symbols and Arrows Extended + 0x1DC00, // unassigned 0x1DF00, // 1DF00..1DFFF; Latin Extended-G 0x1E000, // 1E000..1E02F; Glagolitic Supplement 0x1E030, // 1E030..1E08F; Cyrillic Extended-D @@ -4238,6 +4312,8 @@ private UnicodeBlock(String idName, String... aliases) { 0x31350, // 31350..323AF; CJK Unified Ideographs Extension H 0x323B0, // 323B0..3347F; CJK Unified Ideographs Extension J 0x33480, // unassigned + 0x3D000, // 3D000..3FC3F; Seal + 0x3FC40, // unassigned 0xE0000, // E0000..E007F; Tags 0xE0080, // unassigned 0xE0100, // E0100..E01EF; Variation Selectors Supplement @@ -4518,6 +4594,7 @@ private UnicodeBlock(String idName, String... aliases) { MASARAM_GONDI, GUNJALA_GONDI, TOLONG_SIKI, + BENGALI_SUPPLEMENT, null, MAKASAR, KAWI, @@ -4527,6 +4604,7 @@ private UnicodeBlock(String idName, String... aliases) { CUNEIFORM, CUNEIFORM_NUMBERS_AND_PUNCTUATION, EARLY_DYNASTIC_CUNEIFORM, + ARCHAIC_CUNEIFORM_NUMERALS, null, CYPRO_MINOAN, EGYPTIAN_HIEROGLYPHS, @@ -4555,6 +4633,8 @@ private UnicodeBlock(String idName, String... aliases) { KHITAN_SMALL_SCRIPT, TANGUT_SUPPLEMENT, TANGUT_COMPONENTS_SUPPLEMENT, + JURCHEN, + JURCHEN_RADICALS, null, KANA_EXTENDED_B, KANA_SUPPLEMENT, @@ -4572,6 +4652,7 @@ private UnicodeBlock(String idName, String... aliases) { BYZANTINE_MUSICAL_SYMBOLS, MUSICAL_SYMBOLS, ANCIENT_GREEK_MUSICAL_NOTATION, + MUSICAL_SYMBOLS_SUPPLEMENT, null, KAKTOVIK_NUMERALS, MAYAN_NUMERALS, @@ -4581,6 +4662,8 @@ private UnicodeBlock(String idName, String... aliases) { MATHEMATICAL_ALPHANUMERIC_SYMBOLS, SUTTON_SIGNWRITING, null, + MISCELLANEOUS_SYMBOLS_AND_ARROWS_EXTENDED, + null, LATIN_EXTENDED_G, GLAGOLITIC_SUPPLEMENT, CYRILLIC_EXTENDED_D, @@ -4638,6 +4721,8 @@ private UnicodeBlock(String idName, String... aliases) { CJK_UNIFIED_IDEOGRAPHS_EXTENSION_H, CJK_UNIFIED_IDEOGRAPHS_EXTENSION_J, null, + SEAL, + null, TAGS, null, VARIATION_SELECTORS_SUPPLEMENT, @@ -5718,6 +5803,24 @@ public static enum UnicodeScript { */ TAI_YO, + /** + * Unicode script "Proto Cuneiform". + * @since 28 + */ + PROTO_CUNEIFORM, + + /** + * Unicode script "Jurchen". + * @since 28 + */ + JURCHEN, + + /** + * Unicode script "Seal". + * @since 28 + */ + SEAL, + /** * Unicode script "Unknown". */ @@ -5770,13 +5873,11 @@ public static enum UnicodeScript { 0x0487, // 0487..052F; CYRILLIC 0x0530, // 0530 ; UNKNOWN 0x0531, // 0531..0556; ARMENIAN - 0x0557, // 0557..0558; UNKNOWN - 0x0559, // 0559..058A; ARMENIAN - 0x058B, // 058B..058C; UNKNOWN - 0x058D, // 058D..058F; ARMENIAN + 0x0557, // 0557 ; UNKNOWN + 0x0558, // 0558..058F; ARMENIAN 0x0590, // 0590 ; UNKNOWN - 0x0591, // 0591..05C7; HEBREW - 0x05C8, // 05C8..05CF; UNKNOWN + 0x0591, // 0591..05C9; HEBREW + 0x05CA, // 05CA..05CF; UNKNOWN 0x05D0, // 05D0..05EA; HEBREW 0x05EB, // 05EB..05EE; UNKNOWN 0x05EF, // 05EF..05F4; HEBREW @@ -5936,8 +6037,8 @@ public static enum UnicodeScript { 0x0B47, // 0B47..0B48; ORIYA 0x0B49, // 0B49..0B4A; UNKNOWN 0x0B4B, // 0B4B..0B4D; ORIYA - 0x0B4E, // 0B4E..0B54; UNKNOWN - 0x0B55, // 0B55..0B57; ORIYA + 0x0B4E, // 0B4E..0B52; UNKNOWN + 0x0B53, // 0B53..0B57; ORIYA 0x0B58, // 0B58..0B5B; UNKNOWN 0x0B5C, // 0B5C..0B5D; ORIYA 0x0B5E, // 0B5E ; UNKNOWN @@ -6231,10 +6332,8 @@ public static enum UnicodeScript { 0x1A9A, // 1A9A..1A9F; UNKNOWN 0x1AA0, // 1AA0..1AAD; TAI_THAM 0x1AAE, // 1AAE..1AAF; UNKNOWN - 0x1AB0, // 1AB0..1ADD; INHERITED - 0x1ADE, // 1ADE..1ADF; UNKNOWN - 0x1AE0, // 1AE0..1AEB; INHERITED - 0x1AEC, // 1AEC..1AFF; UNKNOWN + 0x1AB0, // 1AB0..1AF0; INHERITED + 0x1AF1, // 1AF1..1AFF; UNKNOWN 0x1B00, // 1B00..1B4C; BALINESE 0x1B4D, // 1B4D ; UNKNOWN 0x1B4E, // 1B4E..1B7F; BALINESE @@ -6322,12 +6421,10 @@ public static enum UnicodeScript { 0x2072, // 2072..2073; UNKNOWN 0x2074, // 2074..207E; COMMON 0x207F, // 207F ; LATIN - 0x2080, // 2080..208E; COMMON - 0x208F, // 208F ; UNKNOWN - 0x2090, // 2090..209C; LATIN - 0x209D, // 209D..209F; UNKNOWN - 0x20A0, // 20A0..20C1; COMMON - 0x20C2, // 20C2..20CF; UNKNOWN + 0x2080, // 2080..208F; COMMON + 0x2090, // 2090..209F; LATIN + 0x20A0, // 20A0..20C4; COMMON + 0x20C5, // 20C5..20CF; UNKNOWN 0x20D0, // 20D0..20F0; INHERITED 0x20F1, // 20F1..20FF; UNKNOWN 0x2100, // 2100..2125; COMMON @@ -6387,7 +6484,9 @@ public static enum UnicodeScript { 0x2DDF, // 2DDF ; UNKNOWN 0x2DE0, // 2DE0..2DFF; CYRILLIC 0x2E00, // 2E00..2E5D; COMMON - 0x2E5E, // 2E5E..2E7F; UNKNOWN + 0x2E5E, // 2E5E..2E5F; UNKNOWN + 0x2E60, // 2E60..2E63; COMMON + 0x2E64, // 2E64..2E7F; UNKNOWN 0x2E80, // 2E80..2E99; HAN 0x2E9A, // 2E9A ; UNKNOWN 0x2E9B, // 2E9B..2EF3; HAN @@ -6451,8 +6550,10 @@ public static enum UnicodeScript { 0xA700, // A700..A721; COMMON 0xA722, // A722..A787; LATIN 0xA788, // A788..A78A; COMMON - 0xA78B, // A78B..A7DC; LATIN - 0xA7DD, // A7DD..A7F0; UNKNOWN + 0xA78B, // A78B..A7DD; LATIN + 0xA7DE, // A7DE..A7E1; UNKNOWN + 0xA7E2, // A7E2 ; LATIN + 0xA7E3, // A7E3..A7F0; UNKNOWN 0xA7F1, // A7F1..A7FF; LATIN 0xA800, // A800..A82C; SYLOTI_NAGRI 0xA82D, // A82D..A82F; UNKNOWN @@ -6510,7 +6611,8 @@ public static enum UnicodeScript { 0xAB65, // AB65 ; GREEK 0xAB66, // AB66..AB69; LATIN 0xAB6A, // AB6A..AB6B; COMMON - 0xAB6C, // AB6C..AB6F; UNKNOWN + 0xAB6C, // AB6C..AB6D; LATIN + 0xAB6E, // AB6E..AB6F; UNKNOWN 0xAB70, // AB70..ABBF; CHEROKEE 0xABC0, // ABC0..ABED; MEETEI_MAYEK 0xABEE, // ABEE..ABEF; UNKNOWN @@ -6680,8 +6782,8 @@ public static enum UnicodeScript { 0x10786, // 10786 ; UNKNOWN 0x10787, // 10787..107B0; LATIN 0x107B1, // 107B1 ; UNKNOWN - 0x107B2, // 107B2..107BA; LATIN - 0x107BB, // 107BB..107FF; UNKNOWN + 0x107B2, // 107B2..107BF; LATIN + 0x107C0, // 107C0..107FF; UNKNOWN 0x10800, // 10800..10805; CYPRIOT 0x10806, // 10806..10807; UNKNOWN 0x10808, // 10808 ; CYPRIOT @@ -6784,10 +6886,10 @@ public static enum UnicodeScript { 0x10EB0, // 10EB0..10EB1; YEZIDI 0x10EB2, // 10EB2..10EC1; UNKNOWN 0x10EC2, // 10EC2..10EC7; ARABIC - 0x10EC8, // 10EC8..10ECF; UNKNOWN - 0x10ED0, // 10ED0..10ED8; ARABIC - 0x10ED9, // 10ED9..10EF9; UNKNOWN - 0x10EFA, // 10EFA..10EFF; ARABIC + 0x10EC8, // 10EC8 ; UNKNOWN + 0x10EC9, // 10EC9..10EEE; ARABIC + 0x10EEF, // 10EEF ; UNKNOWN + 0x10EF0, // 10EF0..10EFF; ARABIC 0x10F00, // 10F00..10F27; OLD_SOGDIAN 0x10F28, // 10F28..10F2F; UNKNOWN 0x10F30, // 10F30..10F59; SOGDIAN @@ -6956,8 +7058,8 @@ public static enum UnicodeScript { 0x11AB0, // 11AB0..11ABF; CANADIAN_ABORIGINAL 0x11AC0, // 11AC0..11AF8; PAU_CIN_HAU 0x11AF9, // 11AF9..11AFF; UNKNOWN - 0x11B00, // 11B00..11B09; DEVANAGARI - 0x11B0A, // 11B0A..11B5F; UNKNOWN + 0x11B00, // 11B00..11B0A; DEVANAGARI + 0x11B0B, // 11B0B..11B5F; UNKNOWN 0x11B60, // 11B60..11B67; SHARADA 0x11B68, // 11B68..11BBF; UNKNOWN 0x11BC0, // 11BC0..11BE1; SUNUWAR @@ -7007,7 +7109,9 @@ public static enum UnicodeScript { 0x11DB0, // 11DB0..11DDB; TOLONG_SIKI 0x11DDC, // 11DDC..11DDF; UNKNOWN 0x11DE0, // 11DE0..11DE9; TOLONG_SIKI - 0x11DEA, // 11DEA..11EDF; UNKNOWN + 0x11DEA, // 11DEA..11DEF; UNKNOWN + 0x11DF0, // 11DF0..11DF1; BENGALI + 0x11DF2, // 11DF2..11EDF; UNKNOWN 0x11EE0, // 11EE0..11EF8; MAKASAR 0x11EF9, // 11EF9..11EFF; UNKNOWN 0x11F00, // 11F00..11F10; KAWI @@ -7023,12 +7127,12 @@ public static enum UnicodeScript { 0x11FFF, // 11FFF ; TAMIL 0x12000, // 12000..12399; CUNEIFORM 0x1239A, // 1239A..123FF; UNKNOWN - 0x12400, // 12400..1246E; CUNEIFORM - 0x1246F, // 1246F ; UNKNOWN - 0x12470, // 12470..12474; CUNEIFORM - 0x12475, // 12475..1247F; UNKNOWN - 0x12480, // 12480..12543; CUNEIFORM - 0x12544, // 12544..12F8F; UNKNOWN + 0x12400, // 12400..12543; CUNEIFORM + 0x12544, // 12544..1254F; UNKNOWN + 0x12550, // 12550..125A7; CUNEIFORM + 0x125A8, // 125A8..1264B; PROTO_CUNEIFORM + 0x1264C, // 1264C..12686; CUNEIFORM + 0x12687, // 12687..12F8F; UNKNOWN 0x12F90, // 12F90..12FF2; CYPRO_MINOAN 0x12FF3, // 12FF3..12FFF; UNKNOWN 0x13000, // 13000..13455; EGYPTIAN_HIEROGLYPHS @@ -7086,13 +7190,17 @@ public static enum UnicodeScript { 0x16FF0, // 16FF0..16FF6; HAN 0x16FF7, // 16FF7..16FFF; UNKNOWN 0x17000, // 17000..18AFF; TANGUT - 0x18B00, // 18B00..18CD5; KHITAN_SMALL_SCRIPT - 0x18CD6, // 18CD6..18CFE; UNKNOWN + 0x18B00, // 18B00..18CDA; KHITAN_SMALL_SCRIPT + 0x18CDB, // 18CDB..18CFE; UNKNOWN 0x18CFF, // 18CFF ; KHITAN_SMALL_SCRIPT - 0x18D00, // 18D00..18D1E; TANGUT - 0x18D1F, // 18D1F..18D7F; UNKNOWN + 0x18D00, // 18D00..18D20; TANGUT + 0x18D21, // 18D21..18D7F; UNKNOWN 0x18D80, // 18D80..18DF2; TANGUT - 0x18DF3, // 18DF3..1AFEF; UNKNOWN + 0x18DF3, // 18DF3..18DFF; UNKNOWN + 0x18E00, // 18E00..19191; JURCHEN + 0x19192, // 19192..1919F; UNKNOWN + 0x191A0, // 191A0..191D2; JURCHEN + 0x191D3, // 191D3..1AFEF; UNKNOWN 0x1AFF0, // 1AFF0..1AFF3; KATAKANA 0x1AFF4, // 1AFF4 ; UNKNOWN 0x1AFF5, // 1AFF5..1AFFB; KATAKANA @@ -7102,15 +7210,17 @@ public static enum UnicodeScript { 0x1B000, // 1B000 ; KATAKANA 0x1B001, // 1B001..1B11F; HIRAGANA 0x1B120, // 1B120..1B122; KATAKANA - 0x1B123, // 1B123..1B131; UNKNOWN + 0x1B123, // 1B123 ; HIRAGANA + 0x1B124, // 1B124..1B128; KATAKANA + 0x1B129, // 1B129..1B131; UNKNOWN 0x1B132, // 1B132 ; HIRAGANA 0x1B133, // 1B133..1B14F; UNKNOWN 0x1B150, // 1B150..1B152; HIRAGANA 0x1B153, // 1B153..1B154; UNKNOWN 0x1B155, // 1B155 ; KATAKANA 0x1B156, // 1B156..1B163; UNKNOWN - 0x1B164, // 1B164..1B167; KATAKANA - 0x1B168, // 1B168..1B16F; UNKNOWN + 0x1B164, // 1B164..1B168; KATAKANA + 0x1B169, // 1B169..1B16F; UNKNOWN 0x1B170, // 1B170..1B2FB; NUSHU 0x1B2FC, // 1B2FC..1BBFF; UNKNOWN 0x1BC00, // 1BC00..1BC6A; DUPLOYAN @@ -7129,9 +7239,11 @@ public static enum UnicodeScript { 0x1CD00, // 1CD00..1CEB3; COMMON 0x1CEB4, // 1CEB4..1CEB9; UNKNOWN 0x1CEBA, // 1CEBA..1CED0; COMMON - 0x1CED1, // 1CED1..1CEDF; UNKNOWN - 0x1CEE0, // 1CEE0..1CEF0; COMMON - 0x1CEF1, // 1CEF1..1CEFF; UNKNOWN + 0x1CED1, // 1CED1 ; UNKNOWN + 0x1CED2, // 1CED2..1CED4; COMMON + 0x1CED5, // 1CED5..1CEDC; UNKNOWN + 0x1CEDD, // 1CEDD..1CEFD; COMMON + 0x1CEFE, // 1CEFE..1CEFF; UNKNOWN 0x1CF00, // 1CF00..1CF2D; INHERITED 0x1CF2E, // 1CF2E..1CF2F; UNKNOWN 0x1CF30, // 1CF30..1CF46; INHERITED @@ -7141,7 +7253,7 @@ public static enum UnicodeScript { 0x1D000, // 1D000..1D0F5; COMMON 0x1D0F6, // 1D0F6..1D0FF; UNKNOWN 0x1D100, // 1D100..1D126; COMMON - 0x1D127, // 1D127..1D128; UNKNOWN + 0x1D127, // 1D127..1D128; INHERITED 0x1D129, // 1D129..1D166; COMMON 0x1D167, // 1D167..1D169; INHERITED 0x1D16A, // 1D16A..1D17A; COMMON @@ -7150,10 +7262,13 @@ public static enum UnicodeScript { 0x1D185, // 1D185..1D18B; INHERITED 0x1D18C, // 1D18C..1D1A9; COMMON 0x1D1AA, // 1D1AA..1D1AD; INHERITED - 0x1D1AE, // 1D1AE..1D1EA; COMMON - 0x1D1EB, // 1D1EB..1D1FF; UNKNOWN + 0x1D1AE, // 1D1AE..1D1FF; COMMON 0x1D200, // 1D200..1D245; GREEK - 0x1D246, // 1D246..1D2BF; UNKNOWN + 0x1D246, // 1D246..1D24F; UNKNOWN + 0x1D250, // 1D250..1D25A; COMMON + 0x1D25B, // 1D25B..1D25C; INHERITED + 0x1D25D, // 1D25D..1D281; COMMON + 0x1D282, // 1D282..1D2BF; UNKNOWN 0x1D2C0, // 1D2C0..1D2D3; COMMON 0x1D2D4, // 1D2D4..1D2DF; UNKNOWN 0x1D2E0, // 1D2E0..1D2F3; COMMON @@ -7198,8 +7313,8 @@ public static enum UnicodeScript { 0x1D547, // 1D547..1D549; UNKNOWN 0x1D54A, // 1D54A..1D550; COMMON 0x1D551, // 1D551 ; UNKNOWN - 0x1D552, // 1D552..1D6A5; COMMON - 0x1D6A6, // 1D6A6..1D6A7; UNKNOWN + 0x1D552, // 1D552..1D6A6; COMMON + 0x1D6A7, // 1D6A7 ; UNKNOWN 0x1D6A8, // 1D6A8..1D7CB; COMMON 0x1D7CC, // 1D7CC..1D7CD; UNKNOWN 0x1D7CE, // 1D7CE..1D7FF; COMMON @@ -7208,11 +7323,16 @@ public static enum UnicodeScript { 0x1DA9B, // 1DA9B..1DA9F; SIGNWRITING 0x1DAA0, // 1DAA0 ; UNKNOWN 0x1DAA1, // 1DAA1..1DAAF; SIGNWRITING - 0x1DAB0, // 1DAB0..1DEFF; UNKNOWN - 0x1DF00, // 1DF00..1DF1E; LATIN - 0x1DF1F, // 1DF1F..1DF24; UNKNOWN - 0x1DF25, // 1DF25..1DF2A; LATIN - 0x1DF2B, // 1DF2B..1DFFF; UNKNOWN + 0x1DAB0, // 1DAB0..1DAFF; UNKNOWN + 0x1DB00, // 1DB00..1DB1C; COMMON + 0x1DB1D, // 1DB1D..1DEFF; UNKNOWN + 0x1DF00, // 1DF00..1DF81; LATIN + 0x1DF82, // 1DF82..1DF8F; UNKNOWN + 0x1DF90, // 1DF90..1DF96; LATIN + 0x1DF97, // 1DF97..1DFCC; UNKNOWN + 0x1DFCD, // 1DFCD..1DFF2; LATIN + 0x1DFF3, // 1DFF3..1DFF4; GREEK + 0x1DFF5, // 1DFF5..1DFFF; LATIN 0x1E000, // 1E000..1E006; GLAGOLITIC 0x1E007, // 1E007 ; UNKNOWN 0x1E008, // 1E008..1E018; GLAGOLITIC @@ -7355,8 +7475,8 @@ public static enum UnicodeScript { 0x1F0D0, // 1F0D0 ; UNKNOWN 0x1F0D1, // 1F0D1..1F0F5; COMMON 0x1F0F6, // 1F0F6..1F0FF; UNKNOWN - 0x1F100, // 1F100..1F1AD; COMMON - 0x1F1AE, // 1F1AE..1F1E5; UNKNOWN + 0x1F100, // 1F100..1F1AE; COMMON + 0x1F1AF, // 1F1AF..1F1E5; UNKNOWN 0x1F1E6, // 1F1E6..1F1FF; COMMON 0x1F200, // 1F200 ; HIRAGANA 0x1F201, // 1F201..1F202; COMMON @@ -7369,19 +7489,17 @@ public static enum UnicodeScript { 0x1F252, // 1F252..1F25F; UNKNOWN 0x1F260, // 1F260..1F265; COMMON 0x1F266, // 1F266..1F2FF; UNKNOWN - 0x1F300, // 1F300..1F6D8; COMMON - 0x1F6D9, // 1F6D9..1F6DB; UNKNOWN + 0x1F300, // 1F300..1F6D9; COMMON + 0x1F6DA, // 1F6DA..1F6DB; UNKNOWN 0x1F6DC, // 1F6DC..1F6EC; COMMON 0x1F6ED, // 1F6ED..1F6EF; UNKNOWN 0x1F6F0, // 1F6F0..1F6FC; COMMON 0x1F6FD, // 1F6FD..1F6FF; UNKNOWN - 0x1F700, // 1F700..1F7D9; COMMON - 0x1F7DA, // 1F7DA..1F7DF; UNKNOWN + 0x1F700, // 1F700..1F7DB; COMMON + 0x1F7DC, // 1F7DC..1F7DF; UNKNOWN 0x1F7E0, // 1F7E0..1F7EB; COMMON 0x1F7EC, // 1F7EC..1F7EF; UNKNOWN - 0x1F7F0, // 1F7F0 ; COMMON - 0x1F7F1, // 1F7F1..1F7FF; UNKNOWN - 0x1F800, // 1F800..1F80B; COMMON + 0x1F7F0, // 1F7F0..1F80B; COMMON 0x1F80C, // 1F80C..1F80F; UNKNOWN 0x1F810, // 1F810..1F847; COMMON 0x1F848, // 1F848..1F84F; UNKNOWN @@ -7403,26 +7521,24 @@ public static enum UnicodeScript { 0x1FA6E, // 1FA6E..1FA6F; UNKNOWN 0x1FA70, // 1FA70..1FA7C; COMMON 0x1FA7D, // 1FA7D..1FA7F; UNKNOWN - 0x1FA80, // 1FA80..1FA8A; COMMON - 0x1FA8B, // 1FA8B..1FA8D; UNKNOWN - 0x1FA8E, // 1FA8E..1FAC6; COMMON + 0x1FA80, // 1FA80..1FAC6; COMMON 0x1FAC7, // 1FAC7 ; UNKNOWN 0x1FAC8, // 1FAC8 ; COMMON - 0x1FAC9, // 1FAC9..1FACC; UNKNOWN - 0x1FACD, // 1FACD..1FADC; COMMON - 0x1FADD, // 1FADD..1FADE; UNKNOWN - 0x1FADF, // 1FADF..1FAEA; COMMON - 0x1FAEB, // 1FAEB..1FAEE; UNKNOWN - 0x1FAEF, // 1FAEF..1FAF8; COMMON - 0x1FAF9, // 1FAF9..1FAFF; UNKNOWN + 0x1FAC9, // 1FAC9..1FACB; UNKNOWN + 0x1FACC, // 1FACC..1FADD; COMMON + 0x1FADE, // 1FADE ; UNKNOWN + 0x1FADF, // 1FADF..1FAEB; COMMON + 0x1FAEC, // 1FAEC..1FAEE; UNKNOWN + 0x1FAEF, // 1FAEF..1FAFA; COMMON + 0x1FAFB, // 1FAFB..1FAFF; UNKNOWN 0x1FB00, // 1FB00..1FB92; COMMON 0x1FB93, // 1FB93 ; UNKNOWN 0x1FB94, // 1FB94..1FBFA; COMMON 0x1FBFB, // 1FBFB..1FFFF; UNKNOWN 0x20000, // 20000..2A6DF; HAN 0x2A6E0, // 2A6E0..2A6FF; UNKNOWN - 0x2A700, // 2A700..2B81D; HAN - 0x2B81E, // 2B81E..2B81F; UNKNOWN + 0x2A700, // 2A700..2B81E; HAN + 0x2B81F, // 2B81F ; UNKNOWN 0x2B820, // 2B820..2CEAD; HAN 0x2CEAE, // 2CEAE..2CEAF; UNKNOWN 0x2CEB0, // 2CEB0..2EBE0; HAN @@ -7434,7 +7550,9 @@ public static enum UnicodeScript { 0x30000, // 30000..3134A; HAN 0x3134B, // 3134B..3134F; UNKNOWN 0x31350, // 31350..33479; HAN - 0x3347A, // 3347A..E0000; UNKNOWN + 0x3347A, // 3347A..3CFFF; UNKNOWN + 0x3D000, // 3D000..3FC3F; SEAL + 0x3FC40, // 3FC40..E0000; UNKNOWN 0xE0001, // E0001 ; COMMON 0xE0002, // E0002..E001F; UNKNOWN 0xE0020, // E0020..E007F; COMMON @@ -7490,13 +7608,11 @@ public static enum UnicodeScript { CYRILLIC, // 0487..052F UNKNOWN, // 0530 ARMENIAN, // 0531..0556 - UNKNOWN, // 0557..0558 - ARMENIAN, // 0559..058A - UNKNOWN, // 058B..058C - ARMENIAN, // 058D..058F + UNKNOWN, // 0557 + ARMENIAN, // 0558..058F UNKNOWN, // 0590 - HEBREW, // 0591..05C7 - UNKNOWN, // 05C8..05CF + HEBREW, // 0591..05C9 + UNKNOWN, // 05CA..05CF HEBREW, // 05D0..05EA UNKNOWN, // 05EB..05EE HEBREW, // 05EF..05F4 @@ -7656,8 +7772,8 @@ public static enum UnicodeScript { ORIYA, // 0B47..0B48 UNKNOWN, // 0B49..0B4A ORIYA, // 0B4B..0B4D - UNKNOWN, // 0B4E..0B54 - ORIYA, // 0B55..0B57 + UNKNOWN, // 0B4E..0B52 + ORIYA, // 0B53..0B57 UNKNOWN, // 0B58..0B5B ORIYA, // 0B5C..0B5D UNKNOWN, // 0B5E @@ -7951,10 +8067,8 @@ public static enum UnicodeScript { UNKNOWN, // 1A9A..1A9F TAI_THAM, // 1AA0..1AAD UNKNOWN, // 1AAE..1AAF - INHERITED, // 1AB0..1ADD - UNKNOWN, // 1ADE..1ADF - INHERITED, // 1AE0..1AEB - UNKNOWN, // 1AEC..1AFF + INHERITED, // 1AB0..1AF0 + UNKNOWN, // 1AF1..1AFF BALINESE, // 1B00..1B4C UNKNOWN, // 1B4D BALINESE, // 1B4E..1B7F @@ -8042,12 +8156,10 @@ public static enum UnicodeScript { UNKNOWN, // 2072..2073 COMMON, // 2074..207E LATIN, // 207F - COMMON, // 2080..208E - UNKNOWN, // 208F - LATIN, // 2090..209C - UNKNOWN, // 209D..209F - COMMON, // 20A0..20C1 - UNKNOWN, // 20C2..20CF + COMMON, // 2080..208F + LATIN, // 2090..209F + COMMON, // 20A0..20C4 + UNKNOWN, // 20C5..20CF INHERITED, // 20D0..20F0 UNKNOWN, // 20F1..20FF COMMON, // 2100..2125 @@ -8107,7 +8219,9 @@ public static enum UnicodeScript { UNKNOWN, // 2DDF CYRILLIC, // 2DE0..2DFF COMMON, // 2E00..2E5D - UNKNOWN, // 2E5E..2E7F + UNKNOWN, // 2E5E..2E5F + COMMON, // 2E60..2E63 + UNKNOWN, // 2E64..2E7F HAN, // 2E80..2E99 UNKNOWN, // 2E9A HAN, // 2E9B..2EF3 @@ -8171,8 +8285,10 @@ public static enum UnicodeScript { COMMON, // A700..A721 LATIN, // A722..A787 COMMON, // A788..A78A - LATIN, // A78B..A7DC - UNKNOWN, // A7DD..A7F0 + LATIN, // A78B..A7DD + UNKNOWN, // A7DE..A7E1 + LATIN, // A7E2 + UNKNOWN, // A7E3..A7F0 LATIN, // A7F1..A7FF SYLOTI_NAGRI, // A800..A82C UNKNOWN, // A82D..A82F @@ -8230,7 +8346,8 @@ public static enum UnicodeScript { GREEK, // AB65 LATIN, // AB66..AB69 COMMON, // AB6A..AB6B - UNKNOWN, // AB6C..AB6F + LATIN, // AB6C..AB6D + UNKNOWN, // AB6E..AB6F CHEROKEE, // AB70..ABBF MEETEI_MAYEK, // ABC0..ABED UNKNOWN, // ABEE..ABEF @@ -8400,8 +8517,8 @@ public static enum UnicodeScript { UNKNOWN, // 10786 LATIN, // 10787..107B0 UNKNOWN, // 107B1 - LATIN, // 107B2..107BA - UNKNOWN, // 107BB..107FF + LATIN, // 107B2..107BF + UNKNOWN, // 107C0..107FF CYPRIOT, // 10800..10805 UNKNOWN, // 10806..10807 CYPRIOT, // 10808 @@ -8504,10 +8621,10 @@ public static enum UnicodeScript { YEZIDI, // 10EB0..10EB1 UNKNOWN, // 10EB2..10EC1 ARABIC, // 10EC2..10EC7 - UNKNOWN, // 10EC8..10ECF - ARABIC, // 10ED0..10ED8 - UNKNOWN, // 10ED9..10EF9 - ARABIC, // 10EFA..10EFF + UNKNOWN, // 10EC8 + ARABIC, // 10EC9..10EEE + UNKNOWN, // 10EEF + ARABIC, // 10EF0..10EFF OLD_SOGDIAN, // 10F00..10F27 UNKNOWN, // 10F28..10F2F SOGDIAN, // 10F30..10F59 @@ -8676,8 +8793,8 @@ public static enum UnicodeScript { CANADIAN_ABORIGINAL, // 11AB0..11ABF PAU_CIN_HAU, // 11AC0..11AF8 UNKNOWN, // 11AF9..11AFF - DEVANAGARI, // 11B00..11B09 - UNKNOWN, // 11B0A..11B5F + DEVANAGARI, // 11B00..11B0A + UNKNOWN, // 11B0B..11B5F SHARADA, // 11B60..11B67 UNKNOWN, // 11B68..11BBF SUNUWAR, // 11BC0..11BE1 @@ -8727,7 +8844,9 @@ public static enum UnicodeScript { TOLONG_SIKI, // 11DB0..11DDB UNKNOWN, // 11DDC..11DDF TOLONG_SIKI, // 11DE0..11DE9 - UNKNOWN, // 11DEA..11EDF + UNKNOWN, // 11DEA..11DEF + BENGALI, // 11DF0..11DF1 + UNKNOWN, // 11DF2..11EDF MAKASAR, // 11EE0..11EF8 UNKNOWN, // 11EF9..11EFF KAWI, // 11F00..11F10 @@ -8743,12 +8862,12 @@ public static enum UnicodeScript { TAMIL, // 11FFF CUNEIFORM, // 12000..12399 UNKNOWN, // 1239A..123FF - CUNEIFORM, // 12400..1246E - UNKNOWN, // 1246F - CUNEIFORM, // 12470..12474 - UNKNOWN, // 12475..1247F - CUNEIFORM, // 12480..12543 - UNKNOWN, // 12544..12F8F + CUNEIFORM, // 12400..12543 + UNKNOWN, // 12544..1254F + CUNEIFORM, // 12550..125A7 + PROTO_CUNEIFORM, // 125A8..1264B + CUNEIFORM, // 1264C..12686 + UNKNOWN, // 12687..12F8F CYPRO_MINOAN, // 12F90..12FF2 UNKNOWN, // 12FF3..12FFF EGYPTIAN_HIEROGLYPHS, // 13000..13455 @@ -8806,13 +8925,17 @@ public static enum UnicodeScript { HAN, // 16FF0..16FF6 UNKNOWN, // 16FF7..16FFF TANGUT, // 17000..18AFF - KHITAN_SMALL_SCRIPT, // 18B00..18CD5 - UNKNOWN, // 18CD6..18CFE + KHITAN_SMALL_SCRIPT, // 18B00..18CDA + UNKNOWN, // 18CDB..18CFE KHITAN_SMALL_SCRIPT, // 18CFF - TANGUT, // 18D00..18D1E - UNKNOWN, // 18D1F..18D7F + TANGUT, // 18D00..18D20 + UNKNOWN, // 18D21..18D7F TANGUT, // 18D80..18DF2 - UNKNOWN, // 18DF3..1AFEF + UNKNOWN, // 18DF3..18DFF + JURCHEN, // 18E00..19191 + UNKNOWN, // 19192..1919F + JURCHEN, // 191A0..191D2 + UNKNOWN, // 191D3..1AFEF KATAKANA, // 1AFF0..1AFF3 UNKNOWN, // 1AFF4 KATAKANA, // 1AFF5..1AFFB @@ -8822,15 +8945,17 @@ public static enum UnicodeScript { KATAKANA, // 1B000 HIRAGANA, // 1B001..1B11F KATAKANA, // 1B120..1B122 - UNKNOWN, // 1B123..1B131 + HIRAGANA, // 1B123 + KATAKANA, // 1B124..1B128 + UNKNOWN, // 1B129..1B131 HIRAGANA, // 1B132 UNKNOWN, // 1B133..1B14F HIRAGANA, // 1B150..1B152 UNKNOWN, // 1B153..1B154 KATAKANA, // 1B155 UNKNOWN, // 1B156..1B163 - KATAKANA, // 1B164..1B167 - UNKNOWN, // 1B168..1B16F + KATAKANA, // 1B164..1B168 + UNKNOWN, // 1B169..1B16F NUSHU, // 1B170..1B2FB UNKNOWN, // 1B2FC..1BBFF DUPLOYAN, // 1BC00..1BC6A @@ -8849,9 +8974,11 @@ public static enum UnicodeScript { COMMON, // 1CD00..1CEB3 UNKNOWN, // 1CEB4..1CEB9 COMMON, // 1CEBA..1CED0 - UNKNOWN, // 1CED1..1CEDF - COMMON, // 1CEE0..1CEF0 - UNKNOWN, // 1CEF1..1CEFF + UNKNOWN, // 1CED1 + COMMON, // 1CED2..1CED4 + UNKNOWN, // 1CED5..1CEDC + COMMON, // 1CEDD..1CEFD + UNKNOWN, // 1CEFE..1CEFF INHERITED, // 1CF00..1CF2D UNKNOWN, // 1CF2E..1CF2F INHERITED, // 1CF30..1CF46 @@ -8861,7 +8988,7 @@ public static enum UnicodeScript { COMMON, // 1D000..1D0F5 UNKNOWN, // 1D0F6..1D0FF COMMON, // 1D100..1D126 - UNKNOWN, // 1D127..1D128 + INHERITED, // 1D127..1D128 COMMON, // 1D129..1D166 INHERITED, // 1D167..1D169 COMMON, // 1D16A..1D17A @@ -8870,10 +8997,13 @@ public static enum UnicodeScript { INHERITED, // 1D185..1D18B COMMON, // 1D18C..1D1A9 INHERITED, // 1D1AA..1D1AD - COMMON, // 1D1AE..1D1EA - UNKNOWN, // 1D1EB..1D1FF + COMMON, // 1D1AE..1D1FF GREEK, // 1D200..1D245 - UNKNOWN, // 1D246..1D2BF + UNKNOWN, // 1D246..1D24F + COMMON, // 1D250..1D25A + INHERITED, // 1D25B..1D25C + COMMON, // 1D25D..1D281 + UNKNOWN, // 1D282..1D2BF COMMON, // 1D2C0..1D2D3 UNKNOWN, // 1D2D4..1D2DF COMMON, // 1D2E0..1D2F3 @@ -8918,8 +9048,8 @@ public static enum UnicodeScript { UNKNOWN, // 1D547..1D549 COMMON, // 1D54A..1D550 UNKNOWN, // 1D551 - COMMON, // 1D552..1D6A5 - UNKNOWN, // 1D6A6..1D6A7 + COMMON, // 1D552..1D6A6 + UNKNOWN, // 1D6A7 COMMON, // 1D6A8..1D7CB UNKNOWN, // 1D7CC..1D7CD COMMON, // 1D7CE..1D7FF @@ -8928,11 +9058,16 @@ public static enum UnicodeScript { SIGNWRITING, // 1DA9B..1DA9F UNKNOWN, // 1DAA0 SIGNWRITING, // 1DAA1..1DAAF - UNKNOWN, // 1DAB0..1DEFF - LATIN, // 1DF00..1DF1E - UNKNOWN, // 1DF1F..1DF24 - LATIN, // 1DF25..1DF2A - UNKNOWN, // 1DF2B..1DFFF + UNKNOWN, // 1DAB0..1DAFF + COMMON, // 1DB00..1DB1C + UNKNOWN, // 1DB1D..1DEFF + LATIN, // 1DF00..1DF81 + UNKNOWN, // 1DF82..1DF8F + LATIN, // 1DF90..1DF96 + UNKNOWN, // 1DF97..1DFCC + LATIN, // 1DFCD..1DFF2 + GREEK, // 1DFF3..1DFF4 + LATIN, // 1DFF5..1DFFF GLAGOLITIC, // 1E000..1E006 UNKNOWN, // 1E007 GLAGOLITIC, // 1E008..1E018 @@ -9075,8 +9210,8 @@ public static enum UnicodeScript { UNKNOWN, // 1F0D0 COMMON, // 1F0D1..1F0F5 UNKNOWN, // 1F0F6..1F0FF - COMMON, // 1F100..1F1AD - UNKNOWN, // 1F1AE..1F1E5 + COMMON, // 1F100..1F1AE + UNKNOWN, // 1F1AF..1F1E5 COMMON, // 1F1E6..1F1FF HIRAGANA, // 1F200 COMMON, // 1F201..1F202 @@ -9089,19 +9224,17 @@ public static enum UnicodeScript { UNKNOWN, // 1F252..1F25F COMMON, // 1F260..1F265 UNKNOWN, // 1F266..1F2FF - COMMON, // 1F300..1F6D8 - UNKNOWN, // 1F6D9..1F6DB + COMMON, // 1F300..1F6D9 + UNKNOWN, // 1F6DA..1F6DB COMMON, // 1F6DC..1F6EC UNKNOWN, // 1F6ED..1F6EF COMMON, // 1F6F0..1F6FC UNKNOWN, // 1F6FD..1F6FF - COMMON, // 1F700..1F7D9 - UNKNOWN, // 1F7DA..1F7DF + COMMON, // 1F700..1F7DB + UNKNOWN, // 1F7DC..1F7DF COMMON, // 1F7E0..1F7EB UNKNOWN, // 1F7EC..1F7EF - COMMON, // 1F7F0 - UNKNOWN, // 1F7F1..1F7FF - COMMON, // 1F800..1F80B + COMMON, // 1F7F0..1F80B UNKNOWN, // 1F80C..1F80F COMMON, // 1F810..1F847 UNKNOWN, // 1F848..1F84F @@ -9123,26 +9256,24 @@ public static enum UnicodeScript { UNKNOWN, // 1FA6E..1FA6F COMMON, // 1FA70..1FA7C UNKNOWN, // 1FA7D..1FA7F - COMMON, // 1FA80..1FA8A - UNKNOWN, // 1FA8B..1FA8D - COMMON, // 1FA8E..1FAC6 + COMMON, // 1FA80..1FAC6 UNKNOWN, // 1FAC7 COMMON, // 1FAC8 - UNKNOWN, // 1FAC9..1FACC - COMMON, // 1FACD..1FADC - UNKNOWN, // 1FADD..1FADE - COMMON, // 1FADF..1FAEA - UNKNOWN, // 1FAEB..1FAEE - COMMON, // 1FAEF..1FAF8 - UNKNOWN, // 1FAF9..1FAFF + UNKNOWN, // 1FAC9..1FACB + COMMON, // 1FACC..1FADD + UNKNOWN, // 1FADE + COMMON, // 1FADF..1FAEB + UNKNOWN, // 1FAEC..1FAEE + COMMON, // 1FAEF..1FAFA + UNKNOWN, // 1FAFB..1FAFF COMMON, // 1FB00..1FB92 UNKNOWN, // 1FB93 COMMON, // 1FB94..1FBFA UNKNOWN, // 1FBFB..1FFFF HAN, // 20000..2A6DF UNKNOWN, // 2A6E0..2A6FF - HAN, // 2A700..2B81D - UNKNOWN, // 2B81E..2B81F + HAN, // 2A700..2B81E + UNKNOWN, // 2B81F HAN, // 2B820..2CEAD UNKNOWN, // 2CEAE..2CEAF HAN, // 2CEB0..2EBE0 @@ -9154,7 +9285,9 @@ public static enum UnicodeScript { HAN, // 30000..3134A UNKNOWN, // 3134B..3134F HAN, // 31350..33479 - UNKNOWN, // 3347A..E0000 + UNKNOWN, // 3347A..3CFFF + SEAL, // 3D000..3FC3F + UNKNOWN, // 3FC40..E0000 COMMON, // E0001 UNKNOWN, // E0002..E001F COMMON, // E0020..E007F @@ -9227,6 +9360,7 @@ public static enum UnicodeScript { aliases.put("HUNG", OLD_HUNGARIAN); aliases.put("ITAL", OLD_ITALIC); aliases.put("JAVA", JAVANESE); + aliases.put("JURC", JURCHEN); aliases.put("KALI", KAYAH_LI); aliases.put("KANA", KATAKANA); aliases.put("KAWI", KAWI); @@ -9280,6 +9414,7 @@ public static enum UnicodeScript { aliases.put("OUGR", OLD_UYGHUR); aliases.put("PALM", PALMYRENE); aliases.put("PAUC", PAU_CIN_HAU); + aliases.put("PCUN", PROTO_CUNEIFORM); aliases.put("PERM", OLD_PERMIC); aliases.put("PHAG", PHAGS_PA); aliases.put("PHLI", INSCRIPTIONAL_PAHLAVI); @@ -9293,6 +9428,7 @@ public static enum UnicodeScript { aliases.put("SAMR", SAMARITAN); aliases.put("SARB", OLD_SOUTH_ARABIAN); aliases.put("SAUR", SAURASHTRA); + aliases.put("SEAL", SEAL); aliases.put("SGNW", SIGNWRITING); aliases.put("SHAW", SHAVIAN); aliases.put("SHRD", SHARADA); @@ -12285,7 +12421,7 @@ static int toUpperCaseEx(int codePoint) { * Converts the character (Unicode code point) argument to uppercase using case * mapping information from the SpecialCasing file in the Unicode * specification. If a character has no explicit uppercase - * mapping, then the {@code char} itself is returned in the + * mapping, then the character itself is returned in the * {@code char[]}. * * @param codePoint the character (Unicode code point) to be converted. @@ -12293,8 +12429,7 @@ static int toUpperCaseEx(int codePoint) { * @since 1.4 */ static char[] toUpperCaseCharArray(int codePoint) { - // As of Unicode 6.0, 1:M uppercasings only happen in the BMP. - assert isBmpCodePoint(codePoint); + assert isValidCodePoint(codePoint); return CharacterData.of(codePoint).toUpperCaseCharArray(codePoint); } diff --git a/src/java.base/share/classes/java/lang/CharacterData00.java.template b/src/java.base/share/classes/java/lang/CharacterData00.java.template index cb1a9c9cc0b5..683f40b11f0f 100644 --- a/src/java.base/share/classes/java/lang/CharacterData00.java.template +++ b/src/java.base/share/classes/java/lang/CharacterData00.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -386,6 +386,8 @@ final class CharacterData00 extends CharacterData { case 0xA7C6: mapChar = 0x1D8E; break; case 0xA7CB: mapChar = 0x0264; break; case 0xA7DC: mapChar = 0x019B; break; + case 0xA7DD: mapChar = 0x0277; break; + case 0xA7E2: mapChar = 0x027C; break; // default mapChar is already set, so no // need to redo it here. // default : mapChar = ch; @@ -422,6 +424,8 @@ final class CharacterData00 extends CharacterData { case 0x026B: mapChar = 0x2C62; break; case 0x026C: mapChar = 0xA7AD; break; case 0x0271: mapChar = 0x2C6E; break; + case 0x0277: mapChar = 0xA7DD; break; + case 0x027C: mapChar = 0xA7E2; break; case 0x027D: mapChar = 0x2C64; break; case 0x0282: mapChar = 0xA7C5; break; case 0x0287: mapChar = 0xA7B1; break; @@ -878,6 +882,8 @@ final class CharacterData00 extends CharacterData { case 0x026B: mapChar = 0x2C62; break; case 0x026C: mapChar = 0xA7AD; break; case 0x0271: mapChar = 0x2C6E; break; + case 0x0277: mapChar = 0xA7DD; break; + case 0x027C: mapChar = 0xA7E2; break; case 0x027D: mapChar = 0x2C64; break; case 0x0282: mapChar = 0xA7C5; break; case 0x0287: mapChar = 0xA7B1; break; diff --git a/src/java.base/share/classes/java/lang/CharacterData01.java.template b/src/java.base/share/classes/java/lang/CharacterData01.java.template index e634e3486e83..acd2c666c007 100644 --- a/src/java.base/share/classes/java/lang/CharacterData01.java.template +++ b/src/java.base/share/classes/java/lang/CharacterData01.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -149,7 +149,9 @@ final class CharacterData01 extends CharacterData { if ((val & $$maskLowerCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch + offset; + if (offset != -1) { // excludes special case map + mapChar = ch + offset; + } } return mapChar; } @@ -160,7 +162,9 @@ final class CharacterData01 extends CharacterData { if ((val & $$maskUpperCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch - offset; + if (offset != -1) { // excludes special case map + mapChar = ch - offset; + } } return mapChar; } @@ -545,6 +549,37 @@ final class CharacterData01 extends CharacterData { return ((props & $$maskMirrored) != 0); } + int toUpperCaseEx(int ch) { + int mapChar = ch; + int val = getProperties(ch); + + if ((val & $$maskUpperCase) != 0) { + if ((val & $$maskCaseOffset) != $$maskCaseOffset) { + int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); + if (offset != -1) { // excludes special case map + mapChar = ch - offset; + } + } + else { + mapChar = Character.ERROR; + } + } + return mapChar; + } + + @Stable + static char[] sharpsMap = new char[] {'S', 'S'}; + + char[] toUpperCaseCharArray(int ch) { + if (ch == 0x1DF95) { + // LATIN SMALL LIGATURE LONG S WITH DESCENDER S + // same special case map as sharp S + return sharpsMap; + } else { + return Character.toChars(ch); + } + } + static final CharacterData instance = new CharacterData01(); private CharacterData01() {}; diff --git a/src/java.base/share/classes/java/lang/CharacterData02.java.template b/src/java.base/share/classes/java/lang/CharacterData02.java.template index 65570ae3f5b3..4a5a256e708e 100644 --- a/src/java.base/share/classes/java/lang/CharacterData02.java.template +++ b/src/java.base/share/classes/java/lang/CharacterData02.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -148,7 +148,9 @@ final class CharacterData02 extends CharacterData { if ((val & $$maskLowerCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch + offset; + if (offset != -1) { // excludes special case map + mapChar = ch + offset; + } } return mapChar; } @@ -159,7 +161,9 @@ final class CharacterData02 extends CharacterData { if ((val & $$maskUpperCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch - offset; + if (offset != -1) { // excludes special case map + mapChar = ch - offset; + } } return mapChar; } diff --git a/src/java.base/share/classes/java/lang/CharacterData03.java.template b/src/java.base/share/classes/java/lang/CharacterData03.java.template index 6b7d037fbc3c..ae2071b87ed9 100644 --- a/src/java.base/share/classes/java/lang/CharacterData03.java.template +++ b/src/java.base/share/classes/java/lang/CharacterData03.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -148,7 +148,9 @@ final class CharacterData03 extends CharacterData { if ((val & $$maskLowerCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch + offset; + if (offset != -1) { // excludes special case map + mapChar = ch + offset; + } } return mapChar; } @@ -159,7 +161,9 @@ final class CharacterData03 extends CharacterData { if ((val & $$maskUpperCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch - offset; + if (offset != -1) { // excludes special case map + mapChar = ch - offset; + } } return mapChar; } diff --git a/src/java.base/share/classes/java/lang/CharacterData0E.java.template b/src/java.base/share/classes/java/lang/CharacterData0E.java.template index 6e4858e4d3d9..91c552da3f12 100644 --- a/src/java.base/share/classes/java/lang/CharacterData0E.java.template +++ b/src/java.base/share/classes/java/lang/CharacterData0E.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -148,7 +148,9 @@ final class CharacterData0E extends CharacterData { if ((val & $$maskLowerCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch + offset; + if (offset != -1) { // excludes special case map + mapChar = ch + offset; + } } return mapChar; } @@ -159,7 +161,9 @@ final class CharacterData0E extends CharacterData { if ((val & $$maskUpperCase) != 0) { int offset = val << $$shiftCaseOffsetSign >> ($$shiftCaseOffsetSign+$$shiftCaseOffset); - mapChar = ch - offset; + if (offset != -1) { // excludes special case map + mapChar = ch - offset; + } } return mapChar; } diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java index adfd9c6dbabf..473e11804262 100644 --- a/src/java.base/share/classes/java/lang/StringLatin1.java +++ b/src/java.base/share/classes/java/lang/StringLatin1.java @@ -393,6 +393,9 @@ static int compareToFC_UTF16(byte[] value, byte[] other) { int cp1 = getChar(value, k); int cp2 = StringUTF16.codePointAt(other, k, olast, true); if (cp1 != cp2) { + if (Character.charCount(cp2) != 1) { + return compareToFC0_UTF16(value, k, last, other, k, olast); + } long cf1 = CaseFolding.fold(cp1); long cf2 = CaseFolding.fold(cp2); if (cf1 != cf2) { diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java index 23de31a61b79..77cab0826156 100644 --- a/src/java.base/share/classes/java/lang/StringUTF16.java +++ b/src/java.base/share/classes/java/lang/StringUTF16.java @@ -838,6 +838,9 @@ static int compareToFC(byte[] value, byte[] other) { int cp1 = codePointAt(value, k, tlast, true); int cp2 = codePointAt(other, k, olast, true); if (cp1 != cp2) { + if (Character.charCount(cp1) != Character.charCount(cp2)) { + return compareToFC0(value, k, tlast, other, k, olast); + } long cf1 = CaseFolding.fold(cp1); long cf2 = CaseFolding.fold(cp2); if (cf1 != cf2) { diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfc.nrm index fa1d2917ef760977c7474f739ab8016201b9d61c..b75b50cacb5bbd4467386aea86186106317248f3 100644 GIT binary patch delta 683 zcmZWlJ!lj`7@eJ4XZLcs+s(N~&YhnXXdQtwlG$Wn6aa>P%Q; z-$GKGsWPZ0OVm(iTkZ?@b?WMlR66eFFjY)-_uGKEKcTHTGw$!ypc=Ka6O`*k>eExW zOwZEu=8b>uqVYcE(p#Z7<@h0zHR)aY7^ZULm_CI^BgeEBggK!_usyPoc}q7`m;E}J zv?k?@5A&lAc-SAO@$Q8wV@O3Na<&qf#RQvVGm_1-i)<+k^W?Y zE^Du(z+ovbG9BZS%7Z*yf2Wj zg(s#(RRp3g8love(GqR3F1n&8`W^zi@VWGZ~mk{{sLd`y$JvS delta 606 zcmcaGhv~y?rU@cCf($4if`P&B4Ff~Z2?mB<3_Q`no;gAO(Z(ir4*o}MpV+zBHQDXJ z&}p&&lilQN9M_VV)Id-=073&<39SBLkph?qgyxV1i#7mNOpu-{y%HwNA_5fIB7Fp^ zN(d${eFegjzCU>bqllICGq}V@83s-b89o*v85tQJCN&uo87GcHt z2-Ggc#>pX5DbqPwk6VmMX7c1IT$+p%CQsm&XIwn_9@j|;yo;0n@hD6_z$n5b za}Vr6HXb1J1JDE=Ntyq${IasLT1;xPX0k4_AuvmLCns`i0`>5*$)?EW$W~2$!jsO} z3e+MuIg3}Gc`Ey5AX`B|b}38)h?d<56clroJt%uo_Mz-YIYv1_IYl``IY+rbxkR}_ zxkkB(atq})${m!uDECnAqdcR$puD2Ip}eDfpnRfyp?stKMEQmC8|4qmPu|Ea542rw zauDBq$=7Tg3`Y=vY;u+q_vXc3Yn@qE0RaG* C1*b>= diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfkc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/nfkc.nrm index c78a9d9cac5e80594bcd617998d54e8e47a8f2ab..d7221ed787776b2dd76c4860b9366a39c0d8cf3f 100644 GIT binary patch delta 5249 zcmb_ed0bTG-aj+I%m4#8EW_@w4$PccPy|HAT#x}=a-o^CuQS7NMvKx{$+SizCAUyc zX6}}+Qn`>$O6Edd3+!UKWo{XHyK1JsmR=(x<$Y$5tk37(f9@x~pYLz~JF8 z2Awz%v^>@u4gKj4g`nr=LeQlw2>RyV5ZVN)0mHtAAl)4Z@*IMoo=+esx(R|D76=j& z`eH$k2JIOD@*AF-F62Xy;_19p=!6uOyabXXp*hfgs7JCw)Ods2gL^|pgw%#KOW}}f zGPTSmg=HSuJF>52z48M2O!;p4DTPWgNwG|^U2$E0Dl{W>QfQ-Md+2AO--e}y6@|@` z!eQIPj)lv^W5Xwg*N1=H} z{1cB;@dS9J`5?9$@Vq~skeE=MFgsyi!u`bJ#My}-B;H9HoHRXYchVgxoIE&rdh+h% zJ1K)xrl;&qx#P=|E)EhumMFZbgHxYPT`q-F{|0z>pwU0lK-<8EfqN8t1|AJ~=QIgY zSThkYUDK#prP-)y)`*(5n$3TK=lyGj`L9Ru{w1sUucz0<{dp5FO5wERG#ngHu%sew zP1=R@q;x!eP5On5qzpV`O~!@Hgv_y-i!=Y86_zzNYjM`mY(;iO_JZtBwISLu+IsDg zoS>Z1@~iTn6_E;~Vq5?d#XRW~Qsr{-eMyQmq+R@3F)n0wPD73;4hS6-|8~yqoWJFq z>c3by|L|KmcR+EhG;%ReSz)=-zHDxoKU$r-M+)bH8v$f)e_QU*kifOgt>};RX~pY- zIuz8_C?z%@+i~8fa+xx8CR{vDPau5BU_$>Ea=*HZu!IN_Tr3;qA zI;Ad2@pFGxr&o;Xw?S^0t`f8-8A83f$vUnt5$1SY;J0*B|L7|k#c#us#WJPFpqr!k z{c#?b^v|VuL-G3?La_qutU(&)0F$LDm5ckU6{5H)Tqm|jGJ|!Cb*sf6!!@Dr_9dg* z0xi0|fiuyyi)qSi$!Y)Gk_-NfOm|(~uDcHg%*qW9?43SHAEQs#o20OQn7%>}cCrr< zJM}ewOJ4{2OkVW?^)dC=`Udq;{VIL4`V;k+`c{31{;dAmqs(16NPSL!8;*f9^_$fn zt52xEecS^weLa85!1-_~Tm?Je8E_?x!2&!2o(MB=EnEiMU>95hkAn%g9v0!%uw*58 ziot1cV3}|W+y)0O zl???dCD`Clj0Hy80K<&_1^czZ3xetdL!)7%p~cW<_}p;GaLe$(7-38`8jPtRnQJgw zjN^@@`hano6gJNFcNv%daSY=+<96c#<1ypc#+&|Au)d+sy~e$IM@wZ<>G0Q-Yx^ z;?<~mV?%nO6aA2>`z^ng=>UsmcG)c18+~!vUhseHrtG0SRi5XM$S28J`MkcIe4+UM zfKfqPe2VX#+%Yoop(#{6Zc>O3OyR-)l=y!`vwV5xVIfk-E52z%-jgIbmS(g%UXPyS zSeJ3o@xK{I9NRNKb9@kuI}V6>g)c}QpNQKFldO(o+4mh^WZH(g^ zNCHW;$=XaUtR18+a(oX-j9ZQG8$Z$x*OqF>Iqqnyw3wFBy0x|1nc6vy-$Z3mlFS*b z-Q`sJ3`HX)GW}Nld&Vi^^r1gXov}VoF|SM##un1TlfsljzOcH`BiIF8paov27ChqB zvVnTx8DY9GOL#$eNqAXUC@dCU6PkoKgf+qj;ca27@SdYVBHIu|)b=Xz(ebC>h5m{qvKDTtj{TESE~Wu8NX+7gMs#^*<%Am#lX!E!k4Cv!u18t)#u=q-(wF zUDt=MPfISk&X-(q-7UFM@=JA4byT&^5@Lz8#8*FI(O7iVQ!GO)mTIH@K@U%PcD` z>n+WeotC|pHcO}FjN9vOa&NI*bbn~MV!36xXX$l!y1RylxVwF?S7ylvcn;a7dk#HD zlPXOCzUL(V2(Y!b#r|{jNBkK4j^_~a3?xCVeI4kJLNp{X)%q{4I6x(nI*NQBOtyw3 z*T`yQW1o5iY-}IMv1CnTjrbFv2x=om3t}p)Q3Ip_=m81^FQURv45}^D)3tfD-`c0KV;m zxRv}uS#uNM*P34ig`n`wqsBIw5ii{H~3g`Ol&hDYxi>>1`69oVI@o+%#O!+SiQ=>h)*&&!_0o+i&4&)Wh2J zN8(84w=kQ-=C)0>)!Jq>sglGKslg)7^5O=gEUEWH|4$J}Km59nAm%&3Rs<<*&)Z(I zy<%I^q)HKkomCObZEI{hZSA&iY(Lv0MW=I?(w<`1+K1Vv*gf`_#S?j&^!IxK{15O) zJd{3^`h9;6jO7bXTNH{VZUv^Yx=?7ZT}U#rjHmp><^J3L}qjtrz7D=ls*oLLE@1lbGYFv zM1y1^If&lSX*iCUk-S>M z{#~s`>W~+adi`l+5wZ+ffviMUBkPg3kY;2DvJ2UR>_^&=BS;6*iJU~vA{UV^nBc(09=7=q_{*`XPD%J&b;W zeujSjA4c%^FZyHe=p4{}67-!x&!d;n%jgxbY%xd`C+60?sX(ufoq*m#e-e+@ydVW? zj4)J&UI)L|TjI+COQZMD9!!GCu?Q>%OT;u-HU?vZ9`74ggpI(;v56RhF_;^x#p*CG z)_^r)tFVn&GuDE&Vr^Ilb{sp4bz#@A+gLZ&i_1-$3_Ko*$BH98Y9*dDatNM=YjFcU zq)8PUi4Vg^;?}+?@bOKmfiipwjt=`C9FRBvBF^9rA$o8(?#8DU)#0`H47{!^9G`=G z@p`-gUxGIdnTm_}Dts-z5#NkA5AG^L@NLCsiX6q~@s@&dxDRi|_v3B&k>V9Yg76N! z6F-ih?q3jo7VpBZ;kWT_yqAy@QAB)yCZIzkgoeljci&6o5HMjT@`+-rml#frBFczL zYdtZ6m`vEL4Fo|jgoAJsPZQ7K^~6kK4&f#0iH33)u_RwZtRPkrtBLh^C-D}srF^z^ ziM6r(MdDpzN2!n4Wfh4%#6IF6aX5faiB94;ahfeNFzCjEFg=?;p8Z?jI1OlkX0l?61baWNC)XA zpC)IJb>tk&drDHgj&fOBD1oY_W>9tId#E~Ujdrkbf8 z)GlfdwU0VTc@I+^R3~+uI!&FWE>d08chog&8+C)aP2HpJQx9l~wSx|!L+J=wMaR*J zbSj-b`fT|bI-AzfMtTrkM3>Mb=u&GZT~1G+C)2iydK#lCnxkE`K-bbU=sJ21J)d4c zFQS)~UZYpgE9tfLTXZwMjowA?@zVR~gY;qR@v?mSQ~ERdbNVEGmcB@L(chI{rmxXA z=%46&^nJRQ31LFZuP_meiiu+qnN%j7$!1{2%oH%i%!u+^Oes^&OkgH6Hilq0#>EKC z)68=KGnv`t_m~%%`OE@l5wnaDnN_7N%z9=s)6DE(ygp_hbFd!^%7fTAHjzzbGXZq0ksZVqu_f#X zwv?@8C$N)Q8;h|N>tNmNRJN9#!Pc>J*!gS&yM$fAu4LD;8_Sc~&Fs5gwuSYv``Cl* z5w?TvWRJ6_*|Y3L_A+~oy+!HRyKFbx!}fAPoSX~iqPQ3?o=fI5rFXe(PRAL!L0kb> zT%N-X=SFd5TqQSwtKu+@;T)Wso66O4Gr8HEm#gO*xMiHkttypsYq^cwX0Dmr#z<2PS{7L={f1ba@U*@my*ZEr&PxE*AZoY@_bp$!& zjtGa!5${MX=y7BghC6Z`u*2-gFVukVo(;7%HWMU~HUPc>xC(FsBt2Ku6%I-Bs`6@p zJes#7AlrfbKJN#g>{Ep#3{1n+za z_~MYP31lY)Jwwcq2e|1BlE8912(*h{6Gx2>gYh^38x}2*?x=6G3bZgh^6E zfB^x@LC_1h0B|Q@3t&3n5WoV!LQpdwk~FUb8mu}Md@82C1}1(La5dl-P_qeWux7Bv UP~SK0WQ@;pAy}e#@6q4?19Ma$v;Y7A delta 4712 zcmb_ed010d+P?{8VF!V*8x~2(ii#37sZ!AdK~##|eN9MmqgAxlQnVTzYN@3R+FOTG zN71p0troN?@=ULC)uC(Y{dLzhU+(t_%Q>W~RfyNufrtoOfmcOMyK=pI{9qcMCPXhecvhrf9xU zBWe_#7sm@V;!)xf@p|!L@gs>zQYNXB{7V`ooh@A?-6^S)Uh|9c1Eq`nR{J&h_4+;W ze?h46U*ymEpYZPvkOkxhR0gyM3Ih2mfl#15a7*C9z=uHwp=Jm{=#VxbxxIoAchFm2 zJ!sFs_gSGP*k>>%cv3JGTp#>HNK6P4QXSGNecj84+zeHQIzu;x_Jk#d(P10IdWIzq zqlaxA))Sr>PKDQpcSeLn%#5gs_&TCLa$@B2$j>8x9IPkQ$bw|~vg#r0spQ%Ou`~C} zP6#zoqUWxtWPV9GJV*0mqnD5Bi3XyxqRXTA#Q-r`F-v1wV;;ngk1dOB6>4H1#Ep+D zi))R05I;V?EWXt0xu@%&XeC@19(`FuGlx60@I36}fMDf3@fasMg1_^+pzNB*&i|KJ<_V`372JidaQ zL?&@l;>Dz-BqnK7(#7PYWF~o2@`aSJl!BBsDW^t+jVKsVGomv!Bz1b~yQ#+%0g7D3 zJBn|Vev&3ho1{zfn>1no(cDPkL}4Jr?G(fdMb+GI(mYX?a)uJ+Lj6WXxs+wfRm!@d z2TS>pS5tn@2S*5l3wSZYUwLrQt32jq9SLtd3qJQuyDl1dY?Tj(m_aGUyfV$7AF*l5 zw2UFI?@K&0F>S`vs98gN8ab$?xx7cr{hR?`^N-&$JlYLbtRi3x3-#{z)`{6Bb68F$Qk;@V$ z%2WfF#!%*NHuEY@K?XI!6tw*{7aY)o;q`)eF?`t3OhYkX6cRWev}Bc+X(YA3dL|530Xa z|F8O2^*8Es>g(!#>XYgo_0Q_V>hIK7)L*KPslV6wY9chTnsAv$tr@M!(#+D(ngyD2 z{;D>3&ritjb*CWOf9P;T6TBS}YW~WL;X+YAFXDYQ8>C^pk{GIK9NLvvYQEq}S+wRG z%{k3=%|oqJ8?8;#j??C7VXadO^UgG_wp3fGt(8@18-yBdi#JQ#{`(r*E^V*&o=&2R z(kb~qO*E_ObOxP82kD%;QeCC4R@b0w(Y5QkbiKNJdWk+tuhbj#7CoeQ>Pz*N`dWR1 zzD3`z@6z|`@1;x9qtcb>hI9*G%EZkME$8-y22K?911FzDJPbG~P8LrRQ)2fJE3Owe zi`&Il#1FiTBu1i=OdIq`W^##P6U97PBB|l_MZWGi7xqLbwvMz;v`+W@5V1|@&q~?g z$H&+RHrBH`DpufYMXe4`WAqFmH$P753kU!KwnB{OVTsWC8TYOs)@=PE^?~*4)F-;Pb?@o^t`PB8PPp}$cM*y> zMT$bB7^N^+zXJrit-77MFBC5*vK4vO9z~%7QBVq}qC~M+vDA8<`^gY1w%%6kvOe?# zj>{5o3&Lcab^H~fP3Xy;U=56A$7PbNiOtHiW;!zGuv6F^b~-zYoz24BVe@b`i?cLa z%(Cpu>;m>x_I36Rww!&FeVcukUCqAFe!%{n-N=5#Zew?F!Ip26ZGN_JTY^n#8)Y-v zrrKuO5Sz_5&sJ(%VXLyOwbk32INzKN$+j{^rDq_St3#+Xd@8FtieH%&F=nP!<_`+WOydzHP; z{;~aYdz<~ACfa_+e#5&R(V;qxB>6MPzrfSn#(|S{bsnN9C)Mn~1 zopH=_lsh<6w_~g6vgxMjuBqSA>Nx&_$Z^^8YVHV0sB1?N?%MGje9IH1{Qon7m*NdY zqSx?Z^fuQHDATJAMngZa03gtpc%M$LJj_>UP4&G0l35h*_|@@i?(C;PatDFu;*Lj- zN8XBDJgm=j`tk_o5zQlo2mj(Z4Ln{PK%SFFZuKCXMNZ1;;+a>ta`>x2=Q3v{Z>||2 zauL*jz`u^Cws4KeTfSb!GY-x4iFP*f*v;cB9*23H7zFngaU#%pj>lCVzd3*N(Bu@s z2=+7fe+p|0HxzDV_Z2p>N7$2vy9>W6Jk0)!?P0I7KeP8;0C$8+&U8s#p{{6GqASfc za-bpOTv@Ih*DM$8q6ci&wZQedtK9XrYxRKrfor2{8<$9X_aDn;F%B+E?(6x6nc~BZ zwigCji(W1&FZ!TpXVH@E3%Eyr9c%-?*0yO6XxqWV zUHoo3*G>4fw#3C+D`Bu_z>)e#83zn1<4@=l27EOGzrRv%upUQ19}MpArvAZ8{~xMKqb&3s1#ZXEr%+g zN~j9@E5t#6gFb}nq0P`%=o6?3`V4A;_WXwm-u%+v=T27g*=>B@0jM47fI6Yme8;$o zG#QsPr&bDe<>o`(&;@SaoFzhDnC6ZXLtTIX>gJZrrQOga=o)kjx(oHe0$2hE!QpTW zEcdp25O6B2gU7-zz*FITxCka-J3J3w3@?LM!qxCvcs;xY{uFM8_rizZ(9-I>9sjj1SU`v?6p zGst=5GIA5Si#$d}L!Lp2`UIh2{DR`$Xe1hgCZI{E((FbxXgZpK8q5`_5uJo)n=8?2 zXg*qi7NHnQAq!C(>O$wC3(>_EJ6e_@N8M-zT8UO6t!NF(S<1{+<{HZ~v=&{L?Lq6! z9J(28K)0h!1Mr}&=w5U`dI;@6JJHi<7utLV;PtMGh#1dQ?Y4C5tfe?U_}^)F_;~5Ve_zs*kY^< zTZXORu@bAoYO*(D99E01$2MVGGAgl;u}?E^OD`JA<9Y&SMv` z%h)ySCiV+<7wg0NaUWbV`7|Do(SnEZh{EG|$ng|hg{R{gxB)lflkjZZg6H8g@j`PG z4&emO;C4$hZpU5b7JMGQ5MPX!nfFX~;>++A_)2^gUX8E8*W&B&dVDk9fN#g$O?Wfj zitoku03u{^m*or*PDBxL zgq%nvRD_NgW$qxx5=LSYk)2aPScp7gCQ(R01VJ!_op2E)#3G`USeo5SxQPm46;VU1 zCF+QJVzZlQAhr`t=FX`ZgokJ$_7H8vA>t@;oH%8ABt}v^Y^2k2mz+zMkc-Gt zaw)ljT$$ZOR*`GSwd6X|y@_lfx90?rO=L50k z40)NnX1+(>BJY~>$Ud^);zRjR5-NZS;}J#0QF1DkQc*f;6lI`{)FdjKvQT+c0aZjH z6hSeRopMnn)MBcPa#I!5DyrHNN3Ef1-PC$&6V*U%r*=`zR4cWY+D{##j#8b}8LAtP zqApUGscY0t>KE!R^?-Uz3uqDTM+ar!p~LAYI*yjpDYVj}q&0Lpok1IDBmE+6q4Vhi zx`;+-g0|64dLF%yUQ92gSI{f7CG;w~nqEV%rR(VRIb&(}CVC6~G5smMi*BY{>Ahp+ z^nSXX?w~vA({vZzO<$yY=^ON|oM}1vV~zA3`T_lz5ilagj|pKSnHVO4Nn(^a1&oFn z#TXbPGl|J&rZM?U0aL^v48bsrotev&FpHQ{W*M`BS;?$osu_-{W7ad9m@QM7?Mzb+ z|C7fwGp$S;bAV}QI+#x8G}Fa&=gea+GMAZa%uVJO<}TC6^jk&NfU$knu*?8!q&3Ex lU`@)D^Zyq9wva9IXxpU%ZsL)DdafTu!-W9gnR4D&@c#&{JNf_s diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/ubidi.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/ubidi.icu index bbd02f5f7dcbe3092c9fc15d25e83f463e5ba38a..93f80b44a41f3044ef3be50fa0297ff5a370c07f 100644 GIT binary patch literal 28800 zcmeHQ3zQyJeV^}}JMZ~6o86FxK-}GLq1mSz5Vr`HT>?rX3lSou8Zi-qKnRaeYfF!s zQ2T%+r?JI0wzRH-mhw)z3Y69^ht}32o>VBc1T{xWZS~mLpv@7e^#1RE{(B$u{Juru z(7iV^|M&0y@Bhxs&NnmX#Oi%&xwXi$YF6Dk{qi#|uh%WB%hFn>WnHt*vM$@hwL_NW z_F9(zWvdp>ShbErnx`pTSO3D=t(Tu*SsiPF57(wT_Sbvuo9$cd+w8mSzqP+&KVd&@ zPuqW$xqaLIu6@{kp4C~%T-L!Bv)8esSs(ebLAHW;plpnt#@^1(Wf!vdu@A7T*$3H& z*>AF4>=W!y*sbhN_806S_6U2F{R?}XeT#jE9bzvzE<56MIGxTCr`H*92Avho$<73) ztDJKLy}-GM>o0Y#;`U#$r=5>DH#j#rJDr=ITe$u<=Psw04LkSoI3CaK5AaN;oi93H z67(OPuW{)~=No+gtn+>6ht3Cu{zaF$vAYQPYTZ57o_3EzUw5Qp%$pMbQ=OBbbA;2~ z)$Vcb2KPMPFLSSU*CiewazC1I+ua-8k8{sG?iAnO&g#w)XOnxM`+)mJHth0QxsUOU z&nof%x_gj#pnR?Bs;u+wcicnnb6(^vbYJjn?`W^jJKj0sjd~|}Z?&hrGx^xOd++kz z>uvJ3cw4>ey&Jqq?BDYSEsPk5i@`?~?%{Vmd_srPxQ^Bw};d&GNG&xs?5 zQMv7a_l);F?{V)1-}WQF%Rk!h^N;tQL%Tnk&=d7|{}hzn2a&S6{|^6r{{nxdf02mT zN%%nhP5x&8*Zu3j*Z&Q%k_S{g?yNJA?Lg;5q|A2Sx>p5_$~M`Tcwa<|{B?f!BTof;R;H z!E*lVnfG7}slE?R4bI@Uv-oySa9;54;Qhg+!Bt7b*5G>kw%~@~CahGzf6L9SckJ)j zzo2u$8lcn{{LX@Z==3|6bgt{X1azIZp{4Wbg~u*jzwnlYPjoHnTHCd=>nq)HI38{b zXTq0iQ?;q+G}vR0J`~OJq~jh3Yg4fsPsH2fha0uVL}Qz@wZk=L+KG}e^YOA4?Qrw; zYo}^5rZLlDb#zL(RqmCqzj^fu{s^A|1)qWEF%CRmRC*xpCi%VKUR666o~_n<@Sq_- z9Q++=f`1MkW2=L2fE+vIm&9`I1;jo|66T`RgtKM1R+2LBY z+8GGfhZl!eu;Fm4c&6DA{+c}>8MBbiTGVP^=KHl=;SDQ5*JN`&v1E_(4I?PNS%FbIM^HBgHp6Ux=^>bBSn`)SGE&} zG5-D0FSj4vdSvvgyfz!Rb>F8GV~D9^dtMp=*8#< zu@^^W@vI(q^KEI|7xQ1C_H=x5Sww60cty<5Vt#&#-^IY?9U&pV>cwv>Mvu?Y?eY1B z{2pEAZwZtuV0y;RBuS)l*{JvBf4|w;+_y%!w?2Laq z-r;YGf8XX$1L9Be?N4Q{-X9RJA4#oA(e3>2O7eyQX#6=CJHCf+Ux*)yAHkzb^$`4y z_)+2gczl3t@iRj6ACy&lG(OZ`+{+aeABta!k3er&*x{X#>Ow6f~AYl%T*&Jykq?BP1)g$I6?Gjm~N1Ie?2i6AP^!Yk` zJyZ?cN`Nf25SRWdTu&+t{;*m_{cbTT&JfVB(~L29lE`b4d*KFqHN$)!a>zmh%w3`* zdfpy<$OfF0C5QH+*|uuSo=-7K)|otE&9$d9fpOsch2AHwA9x)hPr8l~1$|a-MLH7; z*2wV(r5WA?b16vqf$6(kzXK&MW{ zqgIbX2{YICm~TUj4_WL|aspZRCJE2xtTFO+*?+&PYWH$S*sz(SNPU)_tSSYB_S;-y zv*uxDQXRi+9&oR%HXrEvfOu1Eu_lrXy8Nxj$l}pY&EMsp4hvYE;^8)(DVg zPy1KXP>m&;8K>5V#xs3TRz0&l^0oP~`Ia;qU9o|}?>gBCg{ZW&#z8z*LB^4sT^-P7 zw|q<5U!9pcue4{e26LIxoK&fmoHP(26i1tN0B@{k8Y!*8XpEsfd70-1*@=>05zWGf z`0Pf=NV9#4wE4(+QBmzD@k9|jg?G+FY(7fD@=-RrwZM~-e?y6kNSja7ITT#K=-6wWR?J4^S#)kxAK4s{u2E%_Mlj<^ zF3OI4IHh&SqFJjUk2kD8uKOB(EbUiNVYSpF0**N;({WLCOg#_C0Ptldx*a7twrNz% zmOQgYzBW7|{O@pIsv;1xI~fsBVRW1g&64IrW6>xWsY-ZmP#jut9>B{p9{oT^nMyAl zf49gto2d0OD?AZqk~;!TH{be}=CZkFFa!8foz^g(RdYByle3KGh|TMs>vb zfP}iD`Jos3(K$i1C@yWID5Bg0T56URG_6KesZx0!X%xD*#Cb?NV9AEa!R)+*g{q)Z z@K9yo^(YBifrIR1CK5@_jbO5LWGkkKTkL~YHG?#thd`cr_H2EXDD=sWH?_3V@*4@# z=v6l3s>y(1wsuy8P>8}W>FN!$pvvV%!mly4Re4gjfd>$-8VkHy$2{JQk+Pnp887|H zI5QIEvM6cCJO~B!z-Kq|A`g>hMWwOQnyffH0&qmI(^%-MOL}~kEpJR%+v*KbB$nig zFz7oEN$r-tJCWaRWOGGh7u(=Vm|F5}2p#2lG<)o-+B{TMUxo#~MLsGP@cP%oX(=BI zk?`2d-<#usthW3}v}DDrI{4n%<$$mkdi5`C^7M*7mrCw)zz?5kQ4aa@t76$FMy4;W z`S{7-^q%Hfq?tu3rn`iQv0f)0LQgNn|j>Eo#qqN*C5NBds> zWVD^$O3v~al~M9K)eaZ(D+;0_l^8UZ)KudL4ZZh@ujqis@8}4FzO&n2dTk|7_!TjO? z@~dIVsXkkBzSg6!_R45FC&~ow^3zsRBeRm6=~E=jsCKwKWSB#qP1kR+ihB7skFXZ7 zev_Qy9yDqV_2Vlv#?!M&OMsdGO(u>gM^ib9RF9T?ej+)O@E9jar-Yu)vRpI4*8|Y- z>;Rrd+Aj1`Ls+2SSaB6=@&Z|rqq*obJJ?)7Q_hN_yV2~s&}?lQhq40;@Ma@BSR{{} z>02bHk&C^nj72_xR25%lPBT*TkSK&rRP`$7DN2r}Rxdvub1I(=;mUmTF;z=-e{}|G zKA^|BsJN~2gs#TT6&d4I#3G(DAPT-XGxOY&auJ?sLo7t4F{IA)t|rTPLd2CosTu}( z5rU+1TUEfp3gQSLwbv*kh(=VxAq&tc-gPT^6;l-hJV`dAvhpWi8W&|VQbkoG$eW@m z4(o>6tWn7?kLqK{86hH8N%cwRhcUFz8%NcvcqXsS7{Rovk-)?6PyN}W838gJ(M6qRjj?JC(|i_w+KUj;k`<%sWW1`)=cPYz zWsSUx{oogQIaW3XeT9^5E!SrK7RQywSaa3$WObxGpQ?JmD)%KHb!5)t+fZK5{0XksoE&Anm<&!dIN97ZzT#Mu$8Z?>XDUKE8`~d{4I0k z){3tHEx^vf$~xy-)zKPPqcr;>Z}K5ZD@HQXY_0AiB{`mXJWC65GA5hT{man68=8y~ zM-{zsH^0g;zd@kyC;0l&>LQ}tBXV}GSz5{@%O-XCe^0B$BNApQQS&*flJ23$XRkOt zZOEgPFVeKvgm`+<{$9ubbmiwA`A>4tlFn4us8=VIrwXdNd>*{>tzap$XJ0QQCgoE^ zr8gbr#ok3$vZkY#vu1Z?3FuXr5UcZ=TJ1n|s)X=I7W{ z^LDna`R8n=d8a+qe4y6be9X3*hwa|xbM|=ihxUf%|Jd7_N9r4z&)2s#U#L$tU#!nG z|F?dy`ICC@@~5qt!9TVR4)R}cgSXbU4L)Fv5B{h&HT2Ee!J%hrGeiGYw}zgrSwsJ2 zZ5#fHwedjbWtMG^*rPTZVyw|lfqH0@0Q&i+(=p?(U96Tg=;1-hSbz#?Zor9V1B_d&3w{ zXsA7p0{B630=d(Z(OnH=Z-$+xX?egxA{8n_(3Q3 zOn*&2=}jlj&Wcy6zgFYv^Ng1);mI!Mm1{Kmdm6SqHa0pk^5!=;`un@J_}8HD-gj@f z_@ejy(#H3!f4`U=Uw*T3{iT+*v@tLcePF3s0)EsD1j`mL86E8zIoWdiqIdPwx|i`P z_l#b!?m|u*QEgqLu{e6msi%&QztuX=TD#V=CeA&7<;s<3{NkE3-*)yXr<`@xJ65e) zwc6tEk3@U>Y3IE2baSA2`Tu(bHemr0GFy#HENhc>3GeW4zP)-Y;0|VlyZ705-~Vy`^SF0- zEjs_tJ^TIb{qO(WGxwf*vap69KE^u2vT9b{+OX}^ZS}fk^;^p5v#iTcvaHK)2JLFg z@`f!dxYw#h2d!Gq*A!1(*jB%N%lo#iwXB{k;RkASJrC4}?T_2n+c(+!?0>NDvmdk{ zwdd`x8efmuKeP|ohaKCA9pCA7UgiurE1f3$I^)h-=8-zDccz@voz2d9&Wv-JbGdV+ z^8x1%oj-E^)cK_I*Uo30FF1eW{JnFp^KIt=XTkZt^OS43zVkD;*X?(YbVuAVcidg; zp5Sf(I_;jF(sSL5K!2(GUa((f&%0NZh+%0-tFFP?j_!x?p5AB&V=_3 z&^-vRhq(f8!TUb*NMWyRSyp-Pzr3G%hy6kSNZW^I=GUllt4?~wPu?!%6# zlYRWh{2%&<{O<&I5C?<7%3vfI3nu-;WDkyO(G%6^U?a)FnM55sI45{paG^aPT#`o2 zGCtB^dvHbY!Ql7NH~2`plaI)F;PEm02VlD*_%k^EW$2l-G75?^3GI~ekKFUzXad%&I#Z% z8CX9XJOP>~gJ*#64So*C)%JW?4rrBHkZfW8W0+3gKHN&Je!KEpGNa z(DOj=5xrZG^6cH+dv9OTcU0d6eV3uG?`E>}E%Xof&-Bmre|uoXz9I- z(ZT3fwYl0{dM-K(hSp2lW^Ti@9fEzZh2=~ zo#EY@{7>P1tO*|tA9SX}$59S{6dq!|Od~ry91TXXtaGNLm&0o`TI1XS^tI6maMe3K zIxE`ZOuJ*z1<^aBcRLf&`_g-wz0vR4^U>8He<<3GtBO8~_cCz?XGYhh_cwP(bD;lJ zbep>Y=mpX3so$N^J>*Bn=%1r+ruv87-O;~;UwUsadNTTn;&oV-?D@DJN2G}x?(TS5 zd}KTVTKF6;W_+x~zYh6$LwpkH;_2u=L4K3)5S;sYXCnMkbVtkcqWFAa>z0czjo;gC zEOhj)815rKe=~-AjdA+@XE8Y=xIY|!7!l$>UJQ;L>u!wU9_QjFzHfO3+v86#pQZ7Q z@!oi^W5);F9&^t4%kkgFUxO8X1Eb?_39nR6zb^`1RW5$QekA@;d?@}8`=R)$_PeO*aNqygpUKfl`Wpi7D$TqzB>J*FpR8psGfhrV^~ouk{03EqUkRiu zU~;xIotz8vLRnjdZ+#|3Ecj%aTq4D!pH=xYDts=L@*(f-O5T&6A+yO9$yLGj_gPr^$E3%w)0{5Ee$0*yDm%cpsxivdIE7}ZR_oHW||Cm}uej~(vlcEPTI}1qkHgpAeC`va0jqY)G_$wJGGP4+2XqDwv=MA@e)*JHtmSw zO)EDa(a~%ntpLh;6-Sc)e(QyuTt8N$4_QNYS)+SDcXEDKwRg{51!iQb3p?Y$gCuG# z&!&XfgfEUY&^(_L9vf*-TyZ14$~54*-bmjc=Jhs$ePGAA30||Uxd|w}HUY&cEUeM# zWXqHFv#D&(YSN181?QwIYP683hDN(a&P0?eETU?};-uNMs%*ARQt!~(fS0;n7xqKe zVE0iLT8zv76|T2B%)5m&Z|+O8>Yd>gQ|&CV*CvRe7arvb^Lfl~LPN~ibP{^r5q;Q( zoR9@a_PmvLqc^Xo7|HZrUT-aSW-Gxw`2NK?l3qdZ+9IxA%rQj-Q*A{$&MIT@=2!-=(f-`}4vXSm8?x5%?O67CX!iiV{ZBvSdR|SE_D^RIh@vK#&NaEUM zO7%9<{8+_odxhwwN+OQl&88grI`iMJs@nbFh%Xv?7NIxU*(y^+=zc6F*0c`2lIr+n z>%h<2>L8giltrtNSxJs(9x2z)G#e>v%KZtG{DimMNg2-%9jQppkIlDa@%W036u;Mr!6;0Hr85rWsp}$+W!?>8L9VD@)vJ+LCa+7) zRW4D+ImJ`;|KUKGPej?>>8Y-h@TMbw0k@#ewEM9n@$+I-}^ zD6AxX;k}~teo>yMs#hyjB|ev_8nq_XlO;KVb)8YQx~#-#Y9^A<8||GBIf^orVTd~N zJgE*D89mFYE3@ZiV|}&i)$0XGjDU18*AR>k@zCk$;H*XHYAaQXpxvNIKB^wPLu^&4 z>WkME+OH{Vv2#BlR3Ga8O~Zag)_AKU1EuGf)kU>>ZP=I2*G%1HER?cC)u|DDUgCNe zJJcR_Cv{c>uUB1R83uY&7x+kL9igy}sf@-tnWDWszZ_xW)5?gbn4MO`tK{`?F3v)cvPAC@3f8Dy*5j(lh@p>e zc7#!w;y3B)gR0=p)$_X_SywLa&dAKla98uHgy#d09c%ui}V{?_00=jl0l%GUlI z!E5S-Qa7-3bmfHkRC;Mzyp7|3``Bmkz zHE|{QDL-q~HKHoP={`lWi0X#RL&i1a*;GCDayIQ@qji+KOV6gOXNYQ7(XtZl17#py zKjuA;$&qTlJZXLFoj~U(ODg4^%~n~iSr7e0G&;MH=S(|Oz0fcg>bF+hg_^j)RpfXr zDm4eI`c1gGg2JMdiFAxekHC z*i2=wa-O3^Ho1G{@%bJya*-ExM6Ac`%k`D{>Cx5w)p|u7>ZvC>b|*5U%Q1^Zrg#~# zi02BJqA#s1`z~fp5uR=%EJEcRLZ^FIlSMouc7Jvz)dITJ;1lU~-Th-6W9C~^0g$_U8gP<5%Q;(;Tpxnp;#5A-JdPND?9 zx))`Vh!b2FdEr;w%A*tC6tn<42g`KscdFw(u10zFMc(Yg)O=+yYdJ=zBAm)fp5<80 zKX;~@pK^9IZ+2#yw>WdnTkRdqFV?K)ef5Rrk8P`Y$R2L~w>{PTi9OT&X??2s^ZHEl zaD7Mff9rG2U(^pae_6MVdBmC<`-F9HY|h#-c4KX3?2Fda*fX^qaG&(vmvU+u`7RT$>t+T>agUeT}?3@C=QRu5RcI`Pc2Nxs#WnTu%7=QIuUj`cF>(CyjnUCTCH^HS zy#4%{cV2kWTerULf_J2=gYDM`=r6IXm5tS_<4afSEr7Fbb+~Hzipj~LiC?$8k@(F+ zwZT=;<)O*9oOdqJMqE3u(O4cs;0Y(4G&Oay^(Je}7Ry?H_Bk6jZanojHlOyJXPtQB z>8GE0#u;Z!TksQAI^J-~Z@qDYo@+_||K5R%sR1q0?#8<;>tgF&F!8^o@#5`(w|dap JHn|tZ{{gv98h-!) diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/uprops.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudata/uprops.icu index b72fcd903e009ddba8f3c750bd152cd0f3aa3db5..7fb3eea695586ac59bd74c15d6c92d74a4f66f1f 100644 GIT binary patch literal 174592 zcmeFa2e=f)(m%X$Hq7QU8&1v#6-5CvVgQAsm=UvHvw~nCm@yy%3K&5}MMcE~>Q&5H zP&tZ$7PWR08rgQN6{-5v8@0qFUN?jc$?Ck8Ut!`zjEn&0SZ4TSs zyPY`NXS3O2u<~W2qir^EJwFXPr_FZ#NSp13sW#hfux<7r2o>t@#i*CN+rt`)BLT&rDcTx(r_x?S#oJK?T!H@Vk$Z|vT}y`6ig zdl&cK?gQONxJS9ix=(PQ;y&9w#Xa49h5K6f&Fi*;Uy`8Lk|p9H|_yoT-dc&R3=@mx0|pWsY*M zvPgMMxkFi|yr#UPEK$BvzEgfxKKA%M5l`CV@U(e)d-{9oJcB*MJi|Q$JV$y)dQSEn zbulwZya9^R?$kpnrJX-k>+;&3fy- z?XD$C)Z53qxp!Od5cjp-eZ9Lw78ZC91*>Dcqr78*o(AjL-YMRTq2DTwYN&V zH+vVL)Vs+0n0JYHnRf;7?|D~y*LeR_qCUmv^+mjEfs6ZEeK}vFZ$scW^=<7N!FMZ$n zK7p|s1>>p1_ba1*zdz>B`WyVc{Js7C{SN;y|8V~R|6uVHt(T^&JXqTqFidX#z``RVg-uzC_}oqC#kuzIc%Ri~&| zsu!ylyGN=NUC3}KdQgrNU1n3g97eA zFpv!7fJ+7%MPK3r>#@-eY+@bt@+5)H%d_KFfdQQVA6K{saEtJIky4GIqM zJ!Xy;+&3YhXs!do(AQK!3%=ZgO>+S3SJYu3FLPM9}PYcyf65ia%Ax3 z;2S=Va&Pd{;QPUEK=)JduaHNHhQc8&R2ymyZ5Y}lw55BndoakhH`n*S^8b3^|BW69 zb%gc_?dn?6GlUNAA&v_D5C4aHfX&^|Xt-whI5aKdF7$HfjZproC-h0^57(lwI~)whe669cLqGO#_8c5f14hJW z$KOmu61yd4CZ0=rlYNsXC+|%@lX9gtOHD}4PkpAfX`5*ywRzgd>8AAI>DlRLGOo;4 znGu=U{)zr4RGT_bov7ZY{%C(YkoFHm1a=F|w7-oAyc~3)Bp46w89WK-mBF_{nb5w_ z6K{pn;Su2(Xchi<_*47akudWCZY$y#jqHXr0x=_3=OwTB2S%gFM|X$y1XyRYx=U@D zzwY^FDck?)|JMV5XAi{k`%8E0@Ys5S*odBZdu*{0Jv;mL+&i2N*N64{fOt#|_X%$s z-W-l8L&Cd-4^dwXA5AsD6=^g)COiSQ6T=sTFAT%|%J3Z561e{~KRgfk`Qf|5PlO); z?m1Xr3cnwI1L&vh_$_YLD}C|s7vW#R-(l>CFJg}bA_-q>qzXz+k@X{e@i?zUBRfQP zj%*bHJhIkEurh%9msj==SIWJ%=R$g;@m zl(}BZCm{bi@<-&ys4E(X#v^sn9ITD%mC;R<9iv-D*YnMdZXfN4?jAiRx^MK*=qM94kRj4vw7}n;yF?c0NjC^J4R3b7D`# z?utRL#+JpPUwz&f+{*>s3fzKpb?o=JJ+>ycHXe=pP!_L?H^CWc%lP{7zVQL^!6@U1 z4~riZKP*06w>&O>TKps>8i#Xh9PauQLR>%Fk~W^dGZep?MUCGYzdQb5{6^9vjXxQG zEB;~p^Z2*%UlR6&FACPOlGr``S>db_hbHzFwK($=$0SZkoWS2emX9)L6Tm|{vfRS0$#BHUbC+-1{+r(`D`+OpQ_fpI?@p$5yM5id> ze9u2sncK)>CtgXcNa)8Ov%ZoteRIHQVzsd>mJ(|ce4)KQ(zya%%FDWg6?>u)K~(W z{Mm=ep?s!j;cHEuFP0&L>3p6+^egbpo4Pr5tDo6 zAMGH~0wP1*+L5pxubrfwW}c1tI?mPhLr$BfT}s~C)w*OZWz}7(&By-N7P3*$;K-mo zE{@3G%?BRV>wi{OkM@!V*L>>|>*`*%_TIY8s&Fg~t~1vqw6E4>w9>KYyvQwmt(^ZS zICkf!`!#Dnl;azoUwD5cf9+@DjI@|<;i%Cs(wsXEG9Dc&< z9(qzM`F5{n=9P}7eF%zy&zNweGbI1J=s$b6I$duI_YeV_rX!Q530o4lG^}x5GQ>8; z_PpI^A7Y``}M~sI3g|nUNWE_()4QY)U?!|q%j78;Tia`PQ1@8Ge&yA#)CD~&Ad)rdltq?b|dW7N9z zct)A5q}cvh(A>a$k;lcA?`b@z(1N+!yN+}CATqAZo6U*BTV`q0S2mV316hseOL><| zsXnyFqc7X5SR`X+e@}_(?=CI3oyF{O!d$~IXo}gcdtI@Jm5*n!XfmB_4wfEi+!tIh z>p8kRe%ueQ=rC#ykb%AE@7w?55L?sZi(7?uX`Rw}tTIX=$P4>NzC_^qiNLQ_*;Ov~ zfV}k@_^>{w8oEneU1w@Bg1lClw9s`oW`_|KX?(G+{|=AY81u*LR#Ad;4$EAMnaSG6 zGRDzy=SP9hf047nDD|`l#0(4bIJf>g{fM>5^Ki>2cwSn#AA6FwH4}E^V58vD>sItn zEo8~YSjmqylcJe8ZdSgs-Zj^S<;q(r=2ocweCGlw6+dgTz+(y6p z51+0#?d;dNO=sWEtvY=jaD2&t6wggKzN{YWNMl6wCMv6$>5UrnVhhQ!gfrFHUX-GQ zC|Z~orbQ{$BwEPYi+#cB#W9vGXn}DlI~JK)5-;k^ywMYLW?teJ+sj(V#+OBB*Br>R z5oc24bpel#94i$YUroQ3VUgI@IAd5{=Jv8SQC&pMEj3z^mRXBFSg&<_v0c>HIL@q{ z)-h&T(-vzf)?PR_vU@*lMw6RB|Bm@gBSAev?Zvv-ShCg`=QB@=Y$~45p3a(%3Ao2{ zWPmp=Y|o+bLCO}&mNZ<7qetV2QmYS1$ycPP!-b71wVCESQQ3I&_Ol4A=3?Vbc8qH7 z4)-*7r=qeg^aLAi90f5$)*dEdb(pohTuRS+6XUZ{#P+f_vof3I)CQg}lZZK>4$EXK zJAN?>Yd=w3^v2rRRWNS_jVGs~PUPk76{T1g+n=d-slANimfAphu~FwGR%6NbviWV; zqw(sO1M9*1xP&;$m?+6Bp%~qIUc<1QpN{ zD~l&TC!sfMXL+q*wUygaSxl7SVvND!vOO1h>H#*|C}$GBHTug+*nhO|U>p{U)r8j} z9M&tjLf2?wFQPwd4Uc4Q7uT3MvnSWf^2XfF{f74{_%VRmS7;9K`0R*o{Y)TA@EZ|k zhjIBiASb)lgKtDScIeo-W3P?_Iu7p`*>Q5m`grDGpFEM`cU!pP=H>@#D}F+J~P>Q$8Rh36@9*mG1j=TO2*q?dob z=XDy7-rS4T#cH7A63WnmL$qSERLqg{?1;j$7ySH5`DsKgGe1>8qk}_)Ci>-RJ;y!Y{F=BE1a_SS~@w!E+k>@t$cJQGa7p zHlng?LZe-w5<3E5PS&N6k0?j~LW^i;j~QOV;bZ5@s2DwW%~nt zr-0WTtWAZ^)A@Yq^M=x)Oj9~Ns;9$4dkC{IW{D-bLMWs+da%6MmOXKTJj)yJla^qJ^%&v3F#BQb~SRTbip@ z4N7p~8p_B>x!%Z;l~F1$ku6e58{x?pwur~v?(*^s3Q1|a*m#I@mhrS-u@Yv<##_Gi zfVNOgRyms&#z+{S=8I7yn?ptmmYt-3S?A`rrS!&_vXUX3r9jv9#__YpG3v3z`j{-O zSMt^#lu20s@hD=yG2ZOOzRQsHi#Q+f+LA|QJV`L3%wMbteY@KxibHLq;|SG{W%EM0 z%kpBjEUHXT^&w?-@h$ZMQPd#M7OJ(JD-^L7H(XzHU=;DXiLSia(

QrBK`J^C^Y z&y;a2D&Mm9(HVaeztNq8^xgew%?(e*i|uthNq&q?-7 zL?M|uBHEe3$BRAHguTRU7$v39^<6XhBO;+t({@tyF*pa`>%s6(FXt^MoJ`Ogt$(I4 z?`^D%&l!`Q(IU|Gj0b+}O3!-;)X@nu85Z$#A3TSJz|Sx)TR;jPAr7C!2v~QOtr|S5 zx~MT9%@(wUggof!YS9WKP&wu3w0FlW!mb%%uT+~OreUu~Sz}m+p zg*onT=Fo@5F-J3(3q_|q(7uq5xzhG`~Cq13Aqo=2AZ&@uB z&k(WSt#eM&IztVzStXN|ieuK7jzRmAgvxrlT$!PDVphDLutr|0gp=f2W+a(sAz39E zaa)SUC6#gLj~-&5$@tPy(MzDOE0%70Io+ zVC!*Cbaz32ywc=Xn~dXSx&}qc?!4lb^hjw=6XhPp`&}f*>txPj{#3G3oCQou(TT?O zCX2JATwXqN<=&i{EcDf8KwhzI@)i$H+bP5oOOhDaNP3gpuH> zbaBRKXk@WP|H^qA<;1@g@pS6rRc0*ncaOH5f11BjRn-o4n%Wsq108{BfzF^B>liSG`bV9B7e zUc)-e8_gO^P3C;fJ!IBf%awcB+^0;k#wk~FYPWnbOAoYO0a^}lL?;aL4+rL_eIeShOz2mor<<{&jV5;UrbLrdcKn14v7i#T8DE(1|6DK(o(Pv5G0yFMS}zhO81q5yyKMo$p2@uCQ&D9tGvWuo*= zKh8VzfX%e2_;OZwvm0mzRi>)lWL>{V&u|EmVU@t-Ziv8T+3_VSOg6AEQuj z@m%Dbu}$o(!=BX<+b;KIc~Fa3Nz4>m#^#Q-UBx9Bi=DybHM6n8@nK_($5@of7BK?q zOO=f=L~HAKvhVi!F}GZfzuU&@K}Tl!a~5WMmLHqFe2e=H>y1M5gIY=Lqq3QjzEVnY zjDB*d(Z*Pc!QX231W{YhV9X|8GT#;8pKyv@5gTTnTUlKGXJDfzEAcvIT3v>{EzRE` zO&dx^d(j_xRu;EL`_d)j{H6I|rre5a%x9s(b(OxFGhSU=ONC>XqrqQOm9oP+i`kfS z;{71!3dO?f8-#e)k@0lCU=;7F8@~yX`G_+7t|SgmBc&{N=IIVSMrLtY9cW8WFY)sg zyN@sW;9D2t`ETyfj=igfdV#lFoU2?~K8F$6J1RsUl$KXUOB-aDfn4$ZgvjB2diu^0 zM?to*XR5fC^-g!+JIS9cjjclM)7Q2$ivv%g{(+kt~IkO zWsRdlk!7@$UgpDOUE_Y2`hYs2V`9ez9Wy&-cg*dW-*H#R1MusriPJ8aHgnqSX>+H| zpLW-@2k5sXY~K~PY3K=eaSDQlFB{dRAsNncK(8Jib^q z$HBVI?I=_>wySiB?&=k$>|KS0_4xdCF|AxzD1Vup&U)AyymmLA-I&BIl|?ejV1H#t zGyJw5-$Mhx4mMhpD#6j19}h8#o?X|bO9#KMWOa0@3NfW>WO}hjAQC&OVjC*S-<{71 z-#3#_habPn%Y(9^)@X&V1SWJ&?7X0JX6NkAxt;Sn@9KP@vwvqlIP>({KtCo#~xrbE1vFkZ>fbC5J6AgXa;*Dd1KsHeL~=3fQV zxrX|cW-C#WmqW2e7LV!{?^cx)L9lV-(<9v*cRdQ5MZ&zp%<_vcFU1}+ej;PGLPmP5 z;-4zb)~w7T8EcYT%BA2>^M}S?XqVhathu}XEN|LU{!}(mV}>TBwP?-SYEw)iKW~|( zg(H~H-}17-pRN)0H-l0BwEq|^p-{>74D+Q(3Va&3e%mC=&s-;d5-zpK@}jojr$%!R zn#yz>D*iSL^KlG5>%j4JvuThV)g@AP)L_qFqP*B5`dN88{_wsua~PZXvCqit_h8)0 z`ukvOEfq;miSWZlyrNGhI5{{JwF*e2}YnfiOmGND9Q9H`KUdYE1 z-f+?(-6z-?0yC72JNrd(dEbS)=QhV5UGP3?*-?B1$@-9w|qe?a4Z0tG{i%;NM?+L-XBjrn>dc_*qjAA23twc)u ziac_8(n9r%^3tP>7Tk(+VieBH^~S3$ZY}4;{^8@n+bkP*u4Nfu3|zQBa%|zUyud_I z&-~5#p&`nMn)OsR_X2s59wT5aY|mr0QN|)=Z7}W|Os1!x=R&cVq&r)l73VNxTyV>! zr8%_578s8~xG&>^Tc#zB9rfAwQ8@3}w-;#3m(sP8g|%iHOE%`171{E=O*Wq>7qaKs zRL)V2g{U=a%#-?wwSdhQc62jmAj@C0DO4|$8*4{DYt6i`%HgO!%o!Id7ox@t*hsPV zv)MsUof-E7J+!_l)&9ac^BBdrQt@SaK~|vstZmqKYB5qaLk-8vuKz?UmSZuUScg~} z`3SjEU3le}zs59w3MQ}eX`yj1F30%PA973iyy0_(GAz(O<9qqY*h2AmhAYiNi-Gi7 zSF|!_j~Y6*nl)H1cYk56XL~EgIXB>|X|R)(Td;L6I*={OJ>D@hk7VKSnOz=cV^4t3UNQjS!o| zR5EK(j{73%8D(X*wYJ<^r%{3)#(35e&Ls09=}&`+xfU!})nN*f~i|Pw%r}{FyHU1@dZ~V*f z=J-uJH|^{XZ{&HtW1G%?Dn74{|7iN6^_Q;f%|?ZKr+^%O|20WE*9+KlTdQB+L8LAJ zsYm94vCPjJpZ|OZyFlXG`GelD<6}%O!dg!&{E>I$id})F-JXX5-gu848&V)ua3MHzPql3_Pc<8ZZw%SCnAO z2I=kV$DiR4`aop6A{1x`uZz8%3GHb$_611w46r{rC-#nes#tS*ynGbo@mW5_bp4k0 z!?D+&En@93`(WP{i-0;<3qhYP)Z*ioc;w&Kb}2bUu(%v0mb3 zmUteat0>udjeL<7%OCYTzWI!b+T#8goBJcj&$)D#qNhsmdnDN+&0qgFmT9M`r%XFl zJ+;ucWb&5rI^=pL#jIGa()xLj{1Y?9VincN-rFsEGZwp+@9ICEfb4rtnT&fFIn(!* zrM}MuJubWkdF!YScFn}*W6!n}kx`meG<)O}e~&3%!-+948}M>Z-D;?Nsi^1{kG;^d zMc$8QY2iA|ma=kTZ?2)9G(QW*%Ch~P`w~}9U$FepLvGFUr>Kl_c`=Ur6t?0v$jR(b z&VH$Y-%c{1tUC)G?+Q`bafaEl+6wuZZrTG8scShB&53?^(%eO*+0>9Ycp5qQyRA`7N1)c=1lvSe*PwF@qbfEW~Q>w2TaB+ zjXh<|7A*?<%f5Xw*IwA4>Mhnj{8m6-KmRAw;{Ju}$GDh-{2z0u9rWEIyW3^F=SBXM zp>;0cyEjP7D9?v+ylk|ilBmbQ(Epp+@Ly@vkBm~@oYMYiwBz%-SpVVC5YG@4qdSym zQh>9z373Q(^ONf3{B{_BF;w)o#X0=t zk~kWk&YAG*;EC`%uD%`p@=u0Za~IoJDnEIv1Sy_tiY>C4M6z-ypQl(09{XipTuL@# zPW+6){K*C*F;6BTxtWp|v*lhq6Pbpha4X`tHA$?L=g)MakH}j+$(}`^s}3`z_-47h zjMj1uNlWM*(*H7mPqQ5*;!=D@DeL0Y=u=6laNJ6wh_)0_lrf$(jH0aABKjAzE2IovL2x^V4s zjnUiO4lJ`p?roHsy+v*DC_D?%r!ZfvCgvr(9-y{hZSJ1EJ+?dVRHZXcPkiAyiAfZv z`_%aEWQF)C#-Sg|77qz39ciE%I=d_GtXV-$;^4^v^v7kS-q&ST( z?)qMZ?ub`P=^aV3HkKnZUe8-grDF8tZEiyBy-qx4WBA#|oThL51JhNGI`^mUZ`?n* z|57xiR%ul>R5n$%QFc^zRrXO1R*q6eE8~^3l*!5rWtMWCa*MK1xnFr)c~*Hzc|&<$ z`BeEv`APZ9qj*A|l&8ki;_2<_?-}6P9{v@256^y{e|e7eoai~#a}GT3bFt@2&-I>L zJ$HK^^gQW#-t&s*EzgIZ&ztY{eCzqeYxjCu{%rfHb-UEzsbfpj$ajCZtmy!R~cWbX{`Ebq16o4t2<@AW?7ea5@gyWG3d`%&rx z?-$mt6vzG1%MzJq*6DxUg9b(8DPYI?ot z#nd^z<5Q>BUICb$x;AxP>XOuDsVnM+*NyOvgY`_`xxQ(2!+aM5Kg)NW@0Pm3b%T8i z>#nPtTLxzN?ys9sH^cY1?^)kVzBhdD*Dt6$#P_N18{bcLN7s$<{Z%*K?`b{&{?{t* z&-okuZH>SAH}Y@Vc$9yembiaM|E~Uh{0FzM_8-->XVVD(=%$Y5^_!bodi%#W{op^# zKe;*TpW(mMf3^R{#?g(tHXhu#PvaYnFEuqbosqgFwJ`N~>i*P{)C$0x{@YVi{R{o~ z!}f9iv;LP7GZK>%FZtg{Jeyb;|H=P;;=05wiN{mR{GTS?PpnR?NsdjPk(`vgD0z8u zPI6xIj>Ou;pGkYtSvR0zb;DOpnHC8t^>*aQR zyCH0MY}&GER-&$TLhG5W=ePB5{Ic==##K$*H{OEqf77_o|5KCG|EH>`AvM&zRpWI{ z*CpB#8>y+f2kRbGYwDilP+QdXwM|l=seNk~s$12*So?bIyXp?=klMMmx2VJF?rzGd z!_|XoKdJpn+p_leI$Q1iwGY=m4OpyoXnO+os{NtvdBDqcFY5I9x;OIlg}S%uKCJt^ z?(4cA^AfZx2g`Mje=m#D* zr|(SPmwq_?bh=|DsoIVFEX4Fp4#4|bVu1tNVJ<}(%d1l)T z)CJOE7zya!+NYWQGKXqYA&>o`=7pJ~Gh;Hr%!JHD&|Z+4nSK@MEU>x?bI9C~xmEi( zvmmo5^C-0X1duF-NGGIU1!<@DaAvt4y*jfp^HJst(0-?#m-#g_Br^*>ym+&bY`S)O zwl3S2*)csPyAeqHVkViNK)NNga&mV2vgQX5YxZmtB>9HQP7) zW%m2*Z`yc>H4dWwk-j?T2FnX`fm|$?&DH1HbA6zn&(H3g+cdWgXfCRqp4$<0!=UYp zp!~6Rk#=fsxV8%TyK@KS4hQ|Qxf3DhnYmMPXG34BneQ_H0qGQNVeZ1ru-s*ttFrT; ze0A=++%35U+FjW#GvVBQpm{hwD0^0BO*)u+GWUG$Wo&0|g}!|^6V@(+8a{y>x5#~@ zU6lJg_ib9utp$rewW*j#l~NUgep?B%>R~9)tV(K^Y2&J@tD3c`RU1_GgBi0*JFjZ% zszFt|K+nEgwKt4F7~)N=+PCW9s-v`pRimm-t~$NyyxQqi7gk*i+u2oft8S@USao0e zqN+!$U_3$gBDCn$v|4pz)pCfo66*P|>T{5PTlG`bpVf+XM|H3|jJ=drwN>dk=!3`( ztJZ3#SJ!B#RyRW)k5q2}J@;t!#?_l={{Z>6n%>&#ognk6)w@FGtFl`_56{Gz1ikwK z>@hIQAP(#sS*3a}u!B0P_sXJHnVz6^#qU))9y+S&h4$; zRXs61C$kiy-CZ>pv)4|`MXJxMo`y3RQGIFVCLF)&tEz9Pz7^=*)elxb33)uPU7TA5 zHO~auE3m#*{UP(f+N(cL-&OrBwBg6>%4%o>$Y6A|M`6Ct(tguUsGd^eNUJseDjP(& zy!yQC7Et$`nrKZ1_ph4T+}^s+)Z7uUzdTaYtStoV4Ql#ot7^8Y8JNC0^IgqOHM@bw z2pG9fG^oGkkeZ`wMgtvRbC$L$7p<90*)Uo&J@Z`66*X`y0GpeuuCG~8v#91V;1}1t zSo2!VJJ4GP)O=L)h4xAIkD705ey;fo=D{%Sky-`ot_`9ejz(>=HkVejk7d3CzM&>k z+pBitj3e`PdYhV!pbb}R=hZ@6YPYK$iXJ+4uN?txAE(`=ov3}Bi`5>2QiyqUE##|x zUOQfUwDwHg!)niO?%Q5lKeztobpiFr`q}F7%`Z3GjcEE^9oKY!)54|)o1bfbPCc`6 zR?~V-Pc|)Xn$gmtp07@C{9e7H=@9kW=1g;ydUNy6O`kMr=OJ-6nN?>-yF8|6l2UJ@Nm_ zEC_@G$v|3x4^KToUAkw`LjS}6sUA2$GvZL~n8r;Ln>EFo;)$&i+Xw0bZGnxFFC<@0 zzMWi^{4%w3YUkv=$w!jkr?yY+klHKx8@ycFn~J2;sk&5K@|nP9+V+8gft^wtrTV9~ z4D1#dp*3pjX(=riI3#d%U`)?uPhC1)1vnr*C;d*QDsw<)PUf9#RrY}Foa{Tfs@ws& zIk|VhU<6#hyjdNn-l_V6>gQ^_H9ORtSMyA*t9FOl^ZXP2PpCF^pgK{#PyI2qGLZHU zL_nr9lZycN2VM@kP!fy>_Y9r{^vd8{p-gDs(3RnRLvO_nj9nRfEB0BuAwC4QXT@)d zzmRaoK1=jTjDhWSiPsa~0M){u!za=Hk@n=cNZ;g7h{&;#Ya;KaHcf3Btxk&g87=l}or{tI6jzP0;(5YEJ^dxGe@J@JlJN8jzqxo=(g z1||f~3QSf!jpGr48G%`Ws~VqeygzV5;I_bmz&%t);Gt$;;HkjUhQWd5fj0y11U_z3 z179hgh5-$I8u~Y$75E|Wd(akCS{DUFZAvg1%mnLu9TRMCz1ECipWx=fZG%ICyI}0# z-oX*ULt2*wj}DH3(uCl|;03{%ilq57*t_dxK z2=|8`Z(R|3HuO^H_0YSaPeNaZz6<>tcC@W*TORg@W37L-t_^2-ooy}QhHx*)E7cYX zZyesDb>r}M;i2K(!~2F04Ijhp+DC*>V5Qd8t?z|T37;LF9G-!a@T~CF;Tzj`YWIY1 zZy(t9SNPv;HQ|TDPwTo)-1a&&{A&2^@CV_~!rz2{2>*(*h$EszLXlLYD$*2bi)@54 zj>u+_fssKGz2_r)wa<(k&@`r77#lg9Ma_F3-8P&fGP2jBz2^4%cdz^MnBVL6$jLm5 z|1KAq(EexppOMp>4=)2pg3a*;yAy=cgvfclw(SWb7q*>I1m`eaffw?uYPq~@5aX)ACErN>+I-LFn^Xtm*ZXV z=*s9vly`&HP!s*4p+5Ru^w*f9As6$iUm9!;o>+TBxb2`4xUKETw%gi9#rniH$2w!%QqA3??Q470^t!m$?AQ>9wQH{_ zv3+6(_e#Z%ij8FP+God3j-76e9h(@N)IK+MkyXPbvCCsu@e;(pK6bOAydbtnEQ7^k ztpZ|jR&HC`_Ec<{(W-PQwxWHv*xP6qTNV3Qw2yri`yuvw+!YVR6N)FE6LrYP8(a5{ zx5L^e-aiiCXtqslyQl4;_Hf%J?GxLsYS-E?Xulx-a{SHq`Rz;MAH+Xvzl$M080ez- zu=u1N0j@RvNyPVVniM~!x#_@VJ*;wQvUY5uHvhvxq@|J?jR{A_61h4IVcv*UB) z^Qo0BN41QGb!^KSEjzVLYPksb%UiB#nb&eh%WlBm-7=!(;Fbql9&bIg_2|~2ElXOK zwXA4)uXPX5t&ZOnf1o9&qo#FV=<_Gy&&B_0cn^_)KXpPh&JdCClKh{d4a5J7SdrMi z#cM>OqwR)&5{W(ATYG}U{=IsaM&jVa_Wvvzh80KRsJ}J8(e2ABM`C=hmUV^`daVN_ z&gyP2^?I@A=x*KMH@dFvA4T0iT06A;zj%~mN7Vfr4u(1pUnlh**D$7GUx+jw)+6+Y zXLQA#q;pdmW;D!dn9^`1l;$*Cugh+N?VUPzSHlB3eL~;zBmTO{j>oHliIS zz3$5H<*a+_PkVA*yiR<(am`ryRc2w2b$0F9&8yhNY3t&ewI_FA*NN{sxbE&zKdgf* z@19({yH~qcOa7bvd)r^OUjV;Lbe4Z|cirZi=bGX=!F7h~RM=kV8t*z6=+&+nuJc{D zxF))em*5i6Uan&v*e()qm#aLChx*QSUGF;1b*<~)0`7E`hw-l2u9IDtLks`urK?Bn zj&l0jV$E;Ysf*!*KAk3 zO=3$=a_r$a$8oIVaD8RmIeE!JKp9R4?KxmWrNec5lpL$KhWwAsM>@!HP@coO(Dxh% z#=r>2I(7!_p?c{c;78x0M(#=vO9ORT0b zf*vI}PTYoZ(iooC2-srB1!mZ;0L*cGsnaWLmjXuGMmqO{?G?_owkw@$5kP-I3+FMm z>rl_&SmQj<`8})$+D?RZr1x|loos9)Jre=Pd5-WL=U=}Rl=I+MSyPpn%B9K`%9Y9- z_;uDr$_>g*%6w&kaqGQj8&E> z&+C5Z%l*k_ta2vc1%3OHPcg$^rv{A(>>lXQF-(o9DK(-@P$u|%{+2=ro)A19SI4)` z7*agl*dGauMc9VLo~F}}eUWXn{axDx`@0CR(O2MCI-f2Do6TsU$5?64!}&xh*xxW( zkf(iR@MQZ3fK~R_03X<2@!aOS+qb~}l;;-1dV>9Ud!ZHmU$H+2zgpYGcf0=p|Gxfz z;Z~gne`*i#%y2$rzuZ0>Rs>PtJTtK5yx)R{EE1~?m)z|%<6euzYyoA@6z9G68TLzH zMGytfGes|*VIOZVcb#ZIRcd=O{4ViCRkJ7>j1l? z&UGd|XJp^Xz7<;#TM)h3X7g-T3V}@uTPQgz0{>w$M_j3K_>p&{JX;3(s}~3Q=Q?uv z_rkCvj-#zRprci4hNDVH#1SN!k-~31bwqEB-4qOjX&{%!pO0N-`to6rUD ztdf;=kz)KKLdUYwCd=E z+vuUrv=w&Ep0G#lA>S3gE0n|RjZnk3u(sz>Mt)#jC(Fy;k_X0U$*;zEqMu;l8Sfd- zBLcrAlyH^8b823`r88&W%>9W7yVo9ae+Kx({Uyrn1MCBI%A_Fo@8I9Tp0xsV0G#YO z*}sE#h>q>ym(C&vLTMoURn5-c!QL-n?FRf8BD~+0z#6XvI5(NUy1hCWu)PkVti)wx zffQ}>b}+LTb_>b@^Uk~LI>ZlN349M3_cUWEaIXaS2fB}k0)U{yjKHIS1%SH)PY0gB z9JH#`ywtqN84Tf@j1)?zqE+|?0oR4+LkU;J{P296Em~VK&WZvscC^Z7Oa4a&)UqXg zVhM~)kL|+f?6L6c*fYr&&JMNd?~RDv?f$`ju>D{--yCPa(ddN|qVD_TfLEIsG+1Ue zk{nC!pZr5vP3|8U^tgJ>P|v^Y|5DylcV>Qk>;9H__dV`=Aj&=VBkV`G*SOc9+*xl0 z)@eTgux}TD53Nalk^EHC|3TaTrxNy`40Zm=LA9U+d9JZ?X02ZSP1x!Y6u2{E{|=#q zl`zF89;uRl|5#`iX&JTurURnbA*#4Io2-C1N&C-$A49WJ7mC)zD~jT?uZC#fi143a z|Au6Yx}T8)dflL5Wl@SXDFOTE_SFcb>q7`gf!FIs`NwEy{|dK-7yIY_fGFMvjeVA9QPQo5Is;r)cv9y&@zLDmErjNImt1C zvX$cwWpk_xx60XOHqpTt9Ji*M{lJ`X~iwnxE{0!N=hqG*a8o8OMlf zZf(J)-Yo!voMqD`>D$E#HddJ|Hp(!X(K;XhGe$xC3FZb{0G43Iavy!|1N0-ZL>l|p z3Y3HOdfqnVWQ*hdocR$@BS5yP6}sO*$H3^r(T6=PIvVq|1wM~6NejHVr#z0Vh&Fmh1YZfhg0~&j+F~IvP0_NS`fIS5KA@F;^Ip;a=9_r2N&B4y#vfy)}w;14e9Y3;`;nsd9 z2V8mQ&tRxwy#21?fOlvKP*3t)4=v0~FbeUEVwuaVdUZ^3y)haumGUcDFXSzP=O{`! zU#dRTmw{`s2ckzsj|yy{j`Ga*%=28H$2{P#w%`(v1Q-L(S7S^&oxA8mb)7DD{Z;S_A1C=GuC zp!uHnJOJ3hzVVLnp5*z_JIeDNlz#Sl zJimEYAUt2C*Lwc6LiC3>?p1`8zVGk|67QFTw{U&9seEuR&iSwJE@Gd?K85|$gYaL= zzsnXPzN#Y7nr$t9 zVr2D2E5dLsjSKwg?oxGOB?xRD*j&9sy(6%>?tiO#Yh;IV5#A^AFI+{y%QWu_?*;O` zaBD<(9}Zn}bi@G6AaVr!lGp;&&|=kwcPAav@Gt}R3m=#V$Wb5vvj~1p_s`xe#jUx` z2^gjD0>3Z6A+R>^OVAzoSVS7;Zf0I)USN&{w+C(yToJeuwzo%J0#1tBqhkPYlU?Un zX-srnbeuVZ$e#?spY!-JXh7%zBTyT9ER_EYAN&pQjgIev7O=Wl+)%9q4WTY1H#Z|Q zJ99bDHZ`R?K!4^Jeai?QnQ@UBkqaX;!f(U&lE~$e*^#Rw*G8^~(zSpKk%r%cU-lxG zNBG0=$Kg-IZ$@qjznRAuv6|RnvC*;7sp`bBiDR`Jc`f$GO;~IBVG0QUEg!(zqQuCKWE>f>)TFyC(}T!mLS3uSq@!# z)ZzMX9W4K4U2VzxgSA1=VhHiyW%@2ZY&ol+;y(!A`P+Q^`1V5ty*6KLEQ75^z&5`7 zF^03lwoMoIu^nUE$99(>!z3Vgv3dKtY7FYqJ~!1G4n zwBV@>5jAm2;uP|LC%!DOEeE{Bpzg1Z(AN>_t{kBsLf_&V*(I`DWVh%YQT?tSi>V%} z9t79}toMfPI1ad`)$cMgJI1RkN&|i!yp;0I*YQ?FzXNKN@=|nEiK|}IRWbJ@&ggHx zjxJsHo>MvCYL~nwb#Ww-(@B)CnR+Lc53{eV?7a$b4FIWt%(;MxnTc?>aG-k&%esYo zYmk<+ZUJ^ie*p!0Ix< z+`vjqu!v%be@`PjR^0x(oj*|0owYpxpTYYuVa;3%xH>y7dlKri zW7vv3uBgjgo7KNN!+6>E%~8d2_LTIc2#gzhKKg9**~n@-#s*JSpVje<`b=QEz;^00 z>XQuVZCH%(e{_5wMyv(=5?(7t4?JHcmIRgrUI@G(`XV3NB9CX2`uRoFhXw*RwZdT2 zHzeZ8kPLl7&xk&p5A}|0++DCJkvqfv1#BK31jtL^s`&TtR#s5`Xczy6kchpRysZkOBTde`-e>+!DjIoETp9|1q>Te!~+bfxPJ z*K<^dy&Cea_FZX*J86u^vam{9WvAAfTTf-6dJQ?KabMSFt`^sZuJvKNrK{c52y{o+ z09QZPaNzcoU|ZJ?V1d}z<%LFd8?2S0KT66g=Y7|Q%y)DR)myM3d|vs>_$*ti0VtlN3z??7y@7z&ic6SwXoVO+Xbi_jm-;j!fdu5M2Zk2WH{TTj4p;oJBwW^kRH zOMFre;JO~{c!b19guv?+;H7|$a7P%PG{YsZJXBRVm@jTand}9XgZsms&z~v-`6eDn zJb<1^ivjJ6=>s)^tq{-``j+A|DQs&PK(BK|NnVO-eog;QGO!JzEBapQ14g9aIS+AB z9~ST!{FBB5q87g2iV_kHi3ZZeyQQU1(_GG6f`EU^Iy`$6+zov-`)Y2Gj_q>W!M|wjZ^DXfNxo^~k>#cI6Qz;yGQhv5>5xZ~ zOC>);GygCR{)nAJ9>prv&Zz`e|L7?KPLE~)egauXJtZLdh?sGt?*{w@xSQf|n#hDN z3SX3Qa|!2Cw;>Pj04}j`58XZ-vp}?nZDc@4ERX27zzqYi^2iuGl@VPd!I#k=5Lyua z!Sa^$Mq+H_WT4-A&PKx(S^p0vc%5z>-#7ukMSvc;54W@=dJ_jx2gJ7oV3v6= z_-`2j%#usEr^sbfIx?`uRRCT(a9|^(VzeS^0c>`;(OMuDA<;kge zTm=6hdv@~7N6SW{dbG zR){w7WyO#<6yE>*T;fm$^uuzzGv0|3&>WRGJpOq66~I$~#X4R|d|L!-5;~Ig$$E^J z*gyUt;LbQa<04z&jno#1cFB%H5UmRHG5AAG3HFPnW4Pj$CLVsT?W&YB8Bhyanru#EN8&0n2&RP!5S#C3rdUGW<(2;^p-HBFL+JntHGR z7Nr0hyqez#khN*esee-q@gpSoSKI`$Hq-cV@L#tAP@mp}ZACfCu*|kbjj1#!9Uy>p zARX4D4N4D6cck}$i4@S+ozls)l1`$|xTJknh!*fqz6PMqC@ERG4F22nGVNIg-5+@- zy-ZsQ{uje~nOJN2Jluwl>IeB~Dgpd)X3tc=)NldrlsjMQ2O2=~uaqO@FnjTG`iA0& zKT;`pY~(W4R^&D?+7v5g@5!D8D+1|R#cXA|%r}|OWpa{bzOsUJNR!8yA(NSHEafAU zOGH2nv3z9mdGHtsI0XLF{6MjO;**C-uwSwWm}hcy^2FqX(m-qYH^71b?O2nRmGv!U z$!T(}2=In7+lumHd}q8ti3UwxTGGjLeyt3t{9i02gS%vw}Ny?b35gFiDfgN>MR4# zX??Ulsl|Y0sb$6pnG*opW(L52Hx>XK3kqnY@&OPFW9ndafdpkIXHL!R0N6~5Ei)Em zyY5RGa~4b54`Rv6Ylmw4mx9%cB-%lhKlGRop4o-#xmy`1qM1rwM`V0Kku4{{>|MH? zezYVWN^g3HV0vc0o?Oz53ii~vn<_;35CtPo>I z8!Cn94WAEA?g_yE1S_b9`1ttv^z%IdT$wGgg5o2MSCD|-2XRiTVg&--X=?%(9u8F|?yT@gNIsMao_q@?7dt*5$96wi68il>#x}yyLT-T@L z!jaM+Gr*B1&xvJ_eu#iu4s3ys-PTx{;Z~VhqTPo;X=Y!u4$ImD3_1N<8g7x=uzR2g z@fI0K3&&5X9;Ms{Ihma~ z)N=wGA=GnZ`rIZ6*5iDOzgfjnZX<-uuUr{^p;ZnF#Y>$~9t!#UU#SGvD1rA%BlU9^ zAX{S$UuzLG`2@hDy+WyrM}L{Tl&lrvfiGr5TTYqAl36|`X2P@aZ;bWxvMHNl?Gtm? zbD*hFtM_)CRR73%|ZG`jk;(S=NZX6*wfI-xKoH zmqy|ahGbZ$3lsMw76SD5cCl8-w#hI7?$LDdGEU|#$_gJvOKDh??3Y=?_lII^wdV*t0Fu1!Y^?E)*PPKZ2-_(C-OLTO~wLf%}i%`JczHHK?63j}Y;l|9!Y zml;|D<1-99W-Ks9l9w{8OC!5!b_=jtWd+5|e2|^i6Tp7N{O{8#+wzF_WkreM8*R)0 zebQ%(fa{}tnQ^>KawCQ7)Ex*IF}|%CiA_bIjd4ltmB-Ub#G}b45L(yo=99ZyK@pO} zlEa8EOiNrpjL++dn$F)muC{egfw7`<88}Ch@+kAeEsG|P!==oUS)&Ioyo4NIF$3mF zHe6@4<9c~(SQH+QI4);?a&J*bJm$?7tB*V?d6GT(%V~60)b##aqh0JwImk+`*QKr3R1$_oJ zW>S91v%Y8jU`P&|lR>VvO3B_#Ba4awt&8bnXBXE;H!ZG@EQ+07KFqmeIeBFvXs_mc zGLOn-kw?0Le$lO?TNkb?(pVZ8!HDDy6fsg~25A_L?j7CRC^42&bsR=bd8OzU(M<{B z2*y8WrNj@(Ie@p5Z)>-vYtl8@S!^^iyQE)7h(4T;ua2)~^^;7GGDpw#Hx?>{Gy- zh^*h{%+6wRXyYuj*R{+Bw|bwWJnP4C$oiRtZ&5>Igwa@J+Gcjk?3N4U0+fCCC?3z! z`(^jYK8&y_GPvI=h!ybeqZKxvFKPT;ara7Uyf{imy~&n`=XlTYnHdOMpaOLHQyiU^ z9U*o_dBBXMme<8s#%@Snk=!8pF(GwE>eSRkT(!a4JBai#fJ4%U8P+2)X7**ki`k_W zwAj!#-={J})<@XFws4>uK);?Mx^wrDgW40nCVtJ%l>>82wU zJ_YUxz)iLn;NLSx+Wuqv+IgmJtZfirr!I8lxwKt%e`I&t-Oib|CAO!X7dfXoCp+iZ z9(7*fywdhOM7Y#>DNYCf z!nTp`rSjlk<~zoBWFDg-BZdQgN2-~?KJZSvXy_vZ{@1B(6OR19pANEZZrjSa6N7E5 zF6?DH(zciF5Ziv)XVq&6kewAz;=UWg$; zu;TWN!?*kC@ArfG`Vy`NV0?;4ac;`Tyop-Qsqbt#Y+!4M^PcT>8?HiZ*vo{H?It(8 zmK2-%UAKYuGFzrC zB-8s0M~&61zq?V7W9X}{8gwbd8i^}N#j(~S@R4MkFq$9wKJ=Y!Tad?1lpP;6Yz@`q z|G@u&??m5;Y8#9@_&86rJp}6l(ifs`j}c(UYRtDs?>)V>EP~ORmkPya{iyc<05 zN3;=n@&j3)Y4V4jFGg?Mqc$as^1lws3SDcsE zbG`j~_pk0>;Z~s2S!0F$>fmv~qa!N`@vkCVMz#!m2*}|!vM1hNvtR2UZokEV>kTE) zxgRTl2TbxO^|Bz19v*o^aoVr9UyES3^W1;XZ9OIh`G;X!D3JWtun z5BWPl9rm6hEW9Js;mN;VkzTXdUAn(xZ^tOdQI>U*3$fLdJLpq`u%WOmOMH}R) zOqA@9k_;)u6YDkGqMf*kdNWV4&2lV@I^vH4IpQSc``|>t?BGP_n{qf#VQ{`=h4_Y6 zL#|@p74X4xA(#AW{SUwB{#Kb$5*?8mni?9sUfINPF?_a$pKcnVyq(AE%Ioe^+|%=z z=34AN$$J69_p#sM`^!7m>2q#ZCh&e!PqB})G$i+x40oDF;^({`;A>}(;9Kshb|v7? zPc&E7rMf~E)Pb~zP?jsp;eD(}2sqeP9@^nuu8po;T)V*=UH>KE09Scn{yX|!cWvw* z%P%l<-XN@vwNZY4)?L{qxAJ~_n|QN#<`J->*?-u+>_jAx!3C+{Hy(| z14-8-?)Tvw18eA<&{?5#60U@uugO5t=UV3a0PrW^HF$@xWp&Rg1y?7B{|yHBH3Y8f zK8G>gnRS2$cLPLWD{ieY>(QgjGS(Dpl6^}f%G}LmprNQuajiLiY3tG!<;Pr?vCOq% zxpaIsBFxfiZIy_%$h1}&NstoHqmYCs*Obc@_e5=R3tmsTcH9FwtCv`(RcrJXOO@D? zAC4dK%b^H64%LO%+jnemw61v$+JUU zVNcYMmZ&){l}qU<3$iC#jvv{Gl=0%0B8pV>5aqmGMyae+xaZ8)Vm4GWw?ToTEBXVwIBCNX>TUGP7pVVmcmGZpHP5xYB+y3#-g3 zG1iEBW+NNHLf)cW2sm&)2sGFeS5N}*V?+KSs2(vqA}DjDNjrCg6(dHPaT#+Xz>uSz|w z_U0&LL6mBfQ?s|+%9v+)kuj3hl1Z#`UaxG%h+57Q$D?tMbV#jIE|GDfugu%1H`l-; zTI~u;%wDW4Ze_k^FJ>c`%KVKov!A&vT9b~bs6+n$EAC9-?5N7Lf2#Z5?%VtAeF?(t zq#FVR2%Cfeasxq7Q6f8v8WaX}Twoj-&;crtu&5v?`v}BAP=Oi4uDAsZm@pzJgE}KK zwxW*ujq@=&qA2S3Jnwt9x?A7m&hInN?{@v`t@pg=)Ty&o-Rg8bdp*DA{OfyFwwg-M zct7T5OR8!3Gn+b`Pqn?;61*KX@@aI;rLVVT+Bkh>{e*O}SFmQOo=-h{Ht)(kja@%& zt>g1~XUm)2n=h>%pU*3f>3rSR9n0=#_nc4tZSb!}Aze5cY)bWy#GdqWA5u0|b}vrX zh+QhTZMHnYKTz#_^!R*Uaa!l=w(+s82XrKsKyo|UBaR2{L>FS{T71H~S-t-+(#@#-s<^>TY| z>!QW`F}veo8;%AFM;+BZR$aPk|Jo^?pWCWebG|N3<+fI8+G^Qrr*)og>%4S7SOYna z>TT91>;mP0GnN8>RLYhGC zSiNmCp7Ymiz3A0;jTIu+%RjcqTph9cs$_kbSEC5Ej@7bh)c6QF-p}S+e=nOZju3N5 zuh!bfD!p8Z=JR&xs_Q0B8M8~lZ7sXAxozxUox*v!ZR}mk7LHe!I2j%t{?6jk z)s7L4I&$e;zPexQXuTuZoa(1+_MBRe;LfQsQsut$YqSk%0y%$Ls;%xQw~ddgXVxdX z7d+Hn>u8)`;Q2l4MXYBJu}QV!2V4CX?tI)f8D_3QtN`K~Bzhu>^ zt1Y!s*RoZojB{=_MI1%b%%8HhN7l-{tR>Eg$Lb$-N8Gk?q{_I>?uY1_qH>?sMx_k- zxRh=ijs)Vd?D6`s>mLd6V#>yKM`~N$QMax1(*0l!q$w(oyExgiqgQ3h;8~06c~?e? z{Q?K772DaG^K#zJUj5* Vj1wFbo;{a1n)BScw(C-HTPs?ny_Qcc8>7{>$2n%1{?)0PiBj9Awl(DGj=OC* zQlF}Qt1WTra5RuRp0#B6)JJP090}x(bDOnh_gr4JxAlFik5pSKV>%Drx;^#E+Oo$g zHix!TCu;<8pA(fzn|^*mxb^LC%uK7UTmqgIZ!&&b7ZeALBl*4z2HZSAw+(fRUq z5vsSf&av7nwrF1UbF6ch zKNnB8wAVY9^$dHJ{$W25y>&0x0)<%hC{7!v3mhoKsAUUB9c8`3RdvV1HtQMem85>o zJ8T`Pe|E1jhSpcsC%flTWUXOO&m`1R2%s)MXek5v9#UhjX`@c)y>tMV;q z{HgqrEvn-G|LA%te_Z~ks?SmRqhW3S!x*vmQP@`DGM#*0-I?$BlYFK+r#g3TQG0Z5 zyYP1yT1c(=?$x>PHfdYa;s52`dWHX?wDY1C^@+{~>UnR~(VIK7%B1c&v&uhneEy?_ z&xr0S+-2$3!tIvyi2M0O;fc;i3SW-Z`3Nk@|B7-gM0vXK^fshEw@|II!dRi(>a&HQ zzCvH&Ukd-yf4bHB{`G}>3itG%&Y#fzj{EK{6bsK<4Hus6hbMfWEquRF>>B95z3+j( z2gG)IVYWrRxlm7UESyq#Y+$BJ)0IBkxPN-#)c+M-P}nLBzKWWdaVlKcqSh5!(}xQG z8@ghvqilVO>T+s~dXehc<2a3d8XuiM&V1?X9gpoX$2pQ49n1P&QODOsaNBIEMtgCJ zn43-G{A#DIZQYtPcJXVcsTV(_YDBeD2Wy~4QS?~w4YW0>f^Yrw^^b(q)wFG?vT@=V zF=xG+*^5)h+)Ua^AMFkG`b4ES_g#)|Tg#`~)@%-qqq?JRTb)mB3v&;u?bEC^#39X> zs=}kzUpy*YRk*6_g{~L4ZKS#$R~MSqbxnIVis;spTfemvg)Z?`Zk|aHeJ2w&OY7Mnwl?H@N{`Mvkj@5r)J_- z`nc%3b$N9k(|t_WE?ckeRnUgU3b||}9oW@^hQ7D$e>KmhJglpA9nn;b=Dey)vo-0q z##eJ{E=BAWb9HIwvuNtZF^=eJe7ri3t@V#1gtUR;uW z=F-Mq@%d)$+4%9X?2+1g&fjfod&SmD&&qx0tM+g-kn@;lTd`vN-o*F1Ueltg{z6lD zHd;ma3x@IEJ*(#KeY+39-#4tG-nXl&({#PB``;q%+r2OTo?2IRjJ}r@$BW}V`*|JI zv)n};yt;4M;MK*=#m!Y^u62Ij>-uh&{q!H*e^lQq`VMF+U9DJI+a+CVB{H}3eX=Q= z-E&c!^{@0}`bt~8e|f{Bv8VFoT~xKbS<44)+M0j&H~t^x8#7wozg4!G-mYvr>ivtp zmsP8{Gc<+tbrr|${fk)rC-$GH5xdWe^pMlGrG^{zS!!tZm08l zuCAkZWbJk0H_ly;GUqe8-`}F*^WPT!RCjBdXPwx16^WzYY)y^-YIqYz|4&a=JM=VA z@7q*;Q%*hmG!XyRY^>dTe%iNlU#V~3zL)jv+OsQLaL*fiPHgFOc28?s*VC*n=&7X( zds%>>s^z@Xf_nvj_C` ztNM>~)Z(_X?N9ZMLm%n;aPdEjKN-2M_*`*r@ZrHP4?PBbz4{ZiUanE2wygcZtut{K zv?K3>sJN%}?Ex+6Ta@|i)u&q7x1#@51HTx&V(>%I6@!r~WZ!@G@6%X)zimzZRevDQTDtrG*k44a)|d3^c{Ohz?r%*C`?pTB{nTRl zxoiKf{mY?)S`gFM(!2U!+5foJD=j}U^cO>i4IS2hCUj`E2A>_;g&KTz@L5Uu%Kmq4 zv+R4*#XYhb+G*r>l^WZ*TK!kGreeOP@S0b#(EsDHvj%rBjtuTzOSBh9ipS5ZI|kYZ z{)CUH{}0qa`^Xg|SB+gfK3051V-0Mt#|IXO2KcY|ih+rd;h|@Se>wcis`tLC-vn!H z*=?XT?L9y(6}d=DZA{wvarUj-YSe~lCifbDM@H`&KYem%(UQp>C-EtsObr}7aEMcJ z1*Ln+P5gWdA{?x-B$_a714p!`;^Et(fwy~|KhT;k8K|WXdh6N&sCbr2_-~4TJ+KD4 za^UiT%V~$TR*d>KMt3>fHqf++=Rs*P9k@-1d*=<@-I|IQ4cuM4h#Gik;32!cn=JN= z2fo^(zCN(++A{Fuz%$#dZw)|$yH?A+p+C6i;B2uUKdUr)gHz4XF+cQyp%08dP1Qag ztQ4FKhl;f9^3xaZn>+%XR5jutt@;N}+MTW_2r9 zdEzTpdcVvb$5UXaVqV(%{Rw<4LroqtwLYl0vPIonY)O+N)YMTb-Q!Q*msEZRH{lKi z8a-s}8g55!6kUyt(NUbUc&-?I+|uG#$7$IS+2*553(nO*u3j z_SG}HUpxNrPlkUYJ;GfV)`h=@zV71kM{Hxxf6e0Pacv(t*qV+WJZfyowrlXFp*sg} zs?d#t(9oy7?i^V+vTou%qkDV3d=wi0;rI^+pJ-7}4Yr{1GY6k;O+zOPb;zr&9sK3x z!QT!3VRUqKf*L+={5KPa44G;TzklS*BM*;!VPwT5_M!bF?L8Fq@*$NwexUg2&;3U_qYeDQf*3`c-3%Y!_?jMd%kpKaVs|`o__5^rhBRwdgKXSsE|P zcN}g_ONLw1%Hh`Z>fvqG;ltGNTcu-$EA^J)7BsSa_>30y?%~#S*>G)LJPeH-N?AH` zZKI>aXKOUW_ob~7}EPbdkp^uO5q?Yl|Wa@0Eu!lHOPr*`)#!90nK*zQq zrf)?b9Bo#Yj8aclsM*x@{B9dUxEzhDgi?T6_2v3kmnoiujF=u2Zg(1y`Jjs9tDSyMWB?5$&Ou^JzH zx95?{cJ23lZyx{5#P+UlPfW81vtK)l_t&w&r}D?=v()&md~E0OoKwYbj_efe%eNKP z-?VR~rG;lW;pxxBzmM(FqHH^G?P068%ltKU*O}YqS_i$(YEhpbYfax7Yfb+;)|#Fh zYfZl%+gAN@jFNtW-nG4(E4k&qTB82+$FVT{za1X@RO*y* z>O(DR{djAV6^7Q=#P*Y~oqX+7_tbUz>*7<_O?CTv^0n%GZ5=)XyiNsoNWA z!Tt;O=iOdQx_qKqSJtpqd%-gG!-+4os4Ww%=@%0%X>w{_jZZev)DN8|7X>-n{M*T6 zTGV-yt*Pmr-e5$yY_eLPnruxQCad+pr0Of!etsTpp4?_l?LM{pU;{KxXI9TK8=cZcIAEuhovs2I3@%wQ_-{Zd8+!43+J$UNBtMtRE z|C;(~=JV5v{fgrYIx-5sqd|Mv%Tk=CeL-zyQ*8ZSoCmpfF3npj<8AH!_6u6mP77L+ z3I9$HXq4x~BAl$YT##)EKTqcm{kO{d=bh%z0_RsmY}*X|^JfJ+>xJh+JL*l&k-TM< z=eAtg`*dvHsMi`kg(!X@idk~k9X@2KXW>xhQto*lvy?X@t_-CpW+}fq_(WwZMP*y) ze3szSgZR^XXOw{9acZXV33-ePF#7ZLIr0SbL{I8(Wks&>!u}6tq1E z+cqOyitO;`If@;ei?}ml9}_-Z&i+yq2h3}PIKF+hbv~7tjq1~`=Ot~`a*^kvypx=7 zJIieQi116==9OnPZ4^Hj)s?Uv({deYVqUs-wv70WSCFGR5w`UpY|o{WKB?xbtoat0 zmmM1m5=VU;^W2rKzxd2bort{@`GdWGDe?z(Z8xmOK#E&p>qU!nS^d?YS2t|04aZkFae&!sr()gRo6I zME~wZdA4)qz4ImE&53zTc{sXu!oMv^zfjh`LvHIt`$JlCF<0_j!kET6Vwia?eA_bd zAwT}MWh{@_!8~`z-v5v4Kgx3~X@3#6eP@($3R(tXdtMXKm^0Cdv|BDp4nh10`VU?t zWfR_Vk&OSsfAID$<9RM|JSll;dr;OkBW&kB$2>1(Et|5o4Po1^lp`P82gPptpmLO# z?So=p8kNVkC9&If=$LgYY}=$`Urw}1UKh3da!P;U+GC3KIjv(j754pDrtkLj2(cZgyN+nB;O=AtOAW2Rliw9dzJ0{cvqFW9#+ zVcW)LqI`vIzQQ)z;G`4 zO~P}G*)ctXvW&>uMtM}$UAFg^xn!i`5e~+yz9CNkEd5a@SP!873MTipg!dgql+vv;m2tm-e&HGS5uS0s z;2GLpd7cG0r)U=zQ*YY#|Z_6Cp#oiX>)t1}Or)|p}?z!XlNMrr& z+E~(pmw5Y&flEH>I!AE>*1nVf;P7K`MX$eZtcOm95be}jA@=} zm$_KSMr9ojEvvtbfdv^?i^4j#E9;o7jBCU)h!2=;LwS_*tmoh(bG^08T(4})AZfuq zt&Yj?c?xS(O^Y!>|M6a;BkeUWqW-|+p!n@z@ngudcc4!dHm_k?W!%F$E^fX=8GSRiMdHui!Es>o z+LS(zux)FcrBXJ;8O$5YbAb`l+tKd=ulCIQbZ76_{2$(4*c{@3mpC7kZN&4Ior)2A zdnu$vKlO2P-p(;+^W1il7F^!^!|R3R9Mii3-xDP!{Zv`UgcAFpWf`B9^&Zo*j02We2mkzrz#TH4i%-XIzvJ!b%Vih8@Zwnq zIxgz`BL2k}JJ}9}OSw>KdyW5nKONn-TR|`dLMAGuZrxe zJ-4BKI)AeBXFu{B#bG~k{%p6N(QYI5cD7Gv-_hm8_Jg)6=Ve*)vTarTh3`v+ITz@4 zS*2~v*4qrG)QxL6Zo>|Kc!hAD<3ss5&Qq%fJ2$qQ;&W2x!keEHAK{n09cvz0_riZu zyD2$4*!m1%Y(bgjS~$ksx=Qa;hI6T7j8{Cbp-vsIJU^yBBP^SZ>6qmg{^K!HPB6=p zVfu_|8G4zoW3~Yq17CWsm*?wP{F&Duk8yU!%rJb8y94!~d$Gj4j=MwZS^BK9_F3UV zF4*lesN*)kznHs3(mp8tWo^nhUtu|Ob7KFB#0=aP+1v6Z@8jar-^Ca1)qEf6MDN*B z>P3AXhq1cL6hFpuu`K6K?z886T(nkH)@$b(b?6y&=o$0oahup?^co%asFYvJAZ+X8 ziO4Rj_B6*j*EO)RuE|q*hJdv?>Rj3SM9&t~4uASY_ta^0pOVV`g-sjXYos&GSMLRs zCEvs(#+1wmpOt~z(o(7DdB$Y;G3#@wF^}DTda#(BJw9TOY9ZDbmN*JW^+>t)E zY~UF)t>qLB_S39S;b!_wNIeuDVOotzo^|{Lee_xvo(DK0V@hko9^^ z2;2DYjO_1@_^gQEN4DqnfyjPA#A_m68}TJ%oA!#x4xY8wW%iMF@Rl8C-jPpM4bexh z=}EYbt{zVMc1WA%Lc2=Q2VEOW(Z4*SJ$pvG^^EqWjK}n{w&9uztZPf$JAik}@fgN= z&*g}*4)k`6v7WIGbj)$pF~0|K{M!(xm<#^J+(z~1x`OLc`pa{eSI(A|bGUZO95V}x za^gegvr77qImSBXSPGW=o#aZ14=x)1E106c4=UL8z#o2M#`M<+Yb*Je z!}p$Kca0qLIx2H*oD-Hh!FO=9%Y7W`ge>!5N&T0gQnt*bZLqg7=5N)G?>G{fn`kGq zKEdtq!9BZhp7)F^HLni(l(A-pPeIb+{x{;pbL@lXgs}HS=Rz*B?OD4#2P3m>6s$ce zTTfKB9{3e=Gbz)`eLC;K9rGR>?4A!ZU)=L*J9ljBQ0%>BDFfM+K{&5v7To-zwRQC}DJRAm*o4<%Y_XiIU3sE#REAQ-(^00{&g@fLRFvc!}zZL!8#9Obn*ioZCDzxxd0^EoPP$`U7kFw3UbG{3Tn<@)AV zGLBxa{H5^0y9(Q(KlLpS?VMu~w2F1IDlcVtPIxfahU+`Wd{+r`-A?A39QSU@_8v{_ z_8twqGx9PkHSNw(OmLT3A?JSFr*kH?@xh79OV|IJZyNPGW$ky$d`{kLz<3V!u<~}y zYv+iqkJ!OUZ(@*>uEW9TIVIDJaT`4D)@jN!rt4y7pD}|GPe#o3oA_T^GLI@RV4U?D zb3yyYX_HzWf)BqdhyQl;*;)OCZ5*(!UEwoLAFhWTb3Rhm`31a?K4rCoXUrO6Wk|uv@x*%F4Z%h zuY$K{8P=Ah4BJQkel5`#+BwP=o<%t3J!v0W5+^TSQ!?)9WG$+!YYcGW)*JnBXPrEX z_nj=4HcczDJh>7I%q>3o)t=>DBWo{3K2le-qx@1oo>4#K8GQI$-E%48HG#RVb3Xk3 z!m`f`aZ0)1FYl;0A6~nNCG8T7Ib3_d-o|r5%mSJ9%yHN;*LYxAS8(3+jO*x_^P^|A z_c9L0aMmqff<;Cxxe)s-py z^By9+{*6agU%5+g>cu|G4jhWlSdf zd=rzPIP&bGAMDz>Uh`44)*pXksbGvE-mgo?Ks(wF~^OW{mF#f zKhFzZU`a>twL>5u2}Di!vq{-xFy$h0%9d2FEPJLgveL5g0#xJqz2i z?Li;*FZjrJwJS?fX8Epm1=gIjb1hfaaxRTxE@fX^d0$GOJ)<~#@mh1e3j1D>eea0( zA+NxC06zPoY_eV=2cHgEo2`}dbnL?NuPxKRV>e;7D~mmR*IYFHxN16=6_Fya_GQj- zMf7FbF%A?x&zU~Qe4bC9fseMy@LU~s_k0^|z;k=i=(ER?)Tgqv&*(W}(K6?HWqszL zJS)#(!15eV`V?-t*$1sZo~?O*%A$qQ`tdxc{;@-%O>+C=UMm&^WMj?jl=m=+9B-1wmx-?Qhz^Q(T92Qoh8RM z4&U`My?VYfo^T9-k1*$S&w4ImN7{b1>-$Au|9%cw`e|;J)Zu$-)EbC<;s+4PmsJy5}#Z=4C^=AUEd@#E&H$IBRu0R0?%E>*(E;4Vfep+@%cQB z%s8p~zkxn{#sd2r#Yf9PmVQlpt3fG<^K1EsQamTAP?FnvvA4yWAJ=GlY!p!PX)B)~c<-V27^JRPX zJQtYblCzI^);3SOdv;Bp!NkDq<`SP7K%Px+r4R|j=JFjUeV$Q#?%X|3t9EENDNdILYqz}{D zILhcpYR@~n|DGClu($g@4!fVD9kc&}eSi0?Wm9|P!@lo);)uz%hTyI(JjMr))|lghJeKKFLaXWHPXO{Qms@+-?VN^~8?`@2!g zT>m)c8cBIt)=SDdk9fv<#F_VOc}H3ACBgn46D;p$aGnCoGjP5a z;h4|Em1pIB31xk@43_sdY+8KxJuPc3*bi}Y9Qdd#>l_FB(UBb-+jo;S9(>+SpH#~R z*7Y0g?;)4fj&}*BBX;(#>)e`fH0k{~<7>Ssv&>^A%$trm?s;Avn7_N~?0DANPG;NV zm+Mg z54?B21iPO*zF~?gnr_g=zWU!T5)*O_}z+QChGs4>*VRCTZWxGT1tKZ&bFwW*IoH zA`V&BpX8{_?-QT0_>i5?`y!unqB!TU3>-@l=bYHbazZ=Huy&=C|D4nqvkuQlVSj%V z=lxOI^CJ6sk^TJ0PA=MWIY0K1yk;b?3+Qj_oLqEFf7>=L;M@@y-#==dU(h+{eJ*62 zl_jYYvTGX`GLEh13!{2Q>+(JqMLrirKI<6MmVaF+fBuzZ?Nj+9ICp5j%fFS^SNmQ5 z^vDP8#QV#fXwym?uzd3j^5R-|%;f)#`Q}Q(zlivyz#W}r9dkPH?qZi&Eq$clue-+V z^Gtq!amvC;?xpFKqon+1zj;~b4dt5p~yW>GgX4^6iLc{HPRg&$ayuW659Ar++DsT{oZb5Sbvx{S-3}g+ zx_wS!jw$ydei(BmjJ`w8aoaJ+pNYhdCy&jn2FtpdYeg`|jcIw;6zrdKg5~`U_B-%_ zZRu)Ri-HfPe_8Ed9XHgDKJpXsU*Y;Y?BG+)g)fNxSdIxyJIOk*_23xm&jGTlAJ1hp zT5IQAX1Oi5)U)&#*x6q^vwnE)w3FF)ESEMf%H_!^;_~}ea68MxJ`2`0E&76Iw12RC zufaaz*v1z-`v~mvohkb-c!K#(UnDI3i_bA&S5|*vn-;9!O~A)L&j%mRIH{KZWY>3K zKbiKjwYz&**w5m*u+5X{bAzu20=hKzCIc_pZQHE2EmLc_X zJ?toh%WK_Qo;&Ms%4q*(e^~%_?_%LErhnG)cGidEq~}t^bAj`bo$E&D&-k7(KRV|1 zR@Udev_yp7SjKUxf9M-#;R!_;4Hm%UHp4bj&^uZfAS8@pG;oVE1#eXY^}j z?aN^KuG6N~XQvnkXqPzZKPjwsWzARF`}ml+|J7%bhy&L9UozL*e3ux!J!5j*0GA@3 zj?QH|inEkHY}@dE4Sm>uEz5lz+4VJY6ceoP@zU=4Eclqn=cI^FLwpz0e@_AbbEABf zpO-R_o&UK}oDW3)WVxq9oDW1k7snix?UE?%C6Ui1kP?ty z5@){0&#h6uV4v@;v42$N+amkz z5=Y~ci)%MX+Xm}<@+kA|QB21?m)qkwA%5;HVZ6<~WeH=hWIg9^n*ry_jNh>b^X1xU zJJY|n{K4Mm_Q($Qalp=}OYYOPKD+mzk8=OMOw0GWw@b(~ z!f0BCZH#lb;~9YGxxo8aJKCqQJ~HQWp2eXKwxu%0AI}(b!14@viN=?E+r{cH^CQ>Q z@KKKKn$|yeg3pmGC+9UX^GY?Xvike^2tH><{$!bhXm@=OtYbdLdGO_tzhC#luB_$v zV#r*sd0P*54OUI~aW# ze5UK0VBa6X@|_6#xU#lq@Fy4(bwWG%RL8#kmlAuQe&x*S8KZ4DH>Yb!*~iIpD_quX zihZsXVe{?QG4CZd0ALT^W31r4h^;|yft~KnR$uXvuhb;3K?QYH@ zM``b%|4J=`vX+4?&%oh-M|3V=oXfSdW!mMuv<&k9x2#;5@?7qW&R1E^H+LhB8P0cj zYARz9?>q1tE6Q_$nV+-snGE`+g7N%t zTApu!{n!rvRAdM1GZVEhasHo<;(&D=hRQV$1Pd;QVT3 zsVnQ_>J9$6C~c1Q%sCx)e;)x}=&lR+v#$M+X=j@WoL>#zz?f^xlCLt_kF`rXB)j%Q z);OBhwLRGHmN;5wWsRwteZT;V*FhzB`;z2Q~1n?k1}70Fl*ObT7q2}zxVBU-3np<{2BI>UHbvw z;MxFK*CfaV?B{W?AKSs7kNh8E8Msb>{UO&r$x(c;KBI>H3-sqYgzWkbIg0s3`mkTa z{>3Qf7emb4_kw@;y_=;`yLHU;;6cXBmz3o>o1CN05#9LxIQWb)CVxK;?A!BF{2Bw> z5ARjMc=oI71n@&_CuO#i#C*ZED`jnO;4eC#J;QfBefyv+EDzg{GM|Miv%LKMR@!Iq zv39>+g(rCKaSbnl=ayoc#7vZp=tg539$R;`Cz}sBfB~We~D#YTat2q z$<;sXUlw~=>|bX2`F$Vl?)pZ&g3PoRel@?E?8Z0nM#O2m1bL7{{4f^nW3Mms0Q<2B z?8hRozjolS$h^OZ{$VTvYZ>lE{UqU82Y83JbcytR@HDR}=T`7?wgFyiuzzk3{<6F7 z$}=(+DQg=5Zwx-G207+%tlKA9^_8}Cp*-u@CrJ@UpG7Rg`LjOR#~t%~WbzE{D*|@} zmS^Mi!5kpJe*|u09Gh0!4CiRtS+{(b)p5zQ{!Rhyye_%>Qt?TdFXmI&dzhAO5A5%W zz`h-NMmu!OcIa8tia+1`ReRoW40Igqef&RO=rhB7Z8;Z{IrqW73prI@CaiIkwG94u z0pP!aK77UtzJc|__6+_6?OZ2-ACBw~NAVwt+0Cc$|0>%fzZWA%KAR$bR9MTVEM*IA zds)=B!M;6%N0_#NdmONgQ3d>8YRag$MP&c}zgd=Od*=M5taGkoYsWp2w=ZzNiw7Uf zzdHAUcX9J3c!g`j%G$QUcyDA{+C2CXrcE{9O@Rw3c@^vjqP|(T9Me3{2^Z}5r~R-y z9sqZXKl%cAl;cV1+SxK#+7H_m*w1~QG50y<+(&lT!ZDx8fc^7o@MCh_wLFixag261 zj*%IMV;9+tU10gYi`fRqA+KPh>=0^LR&pBT04RLcadPs zO(mI|z=xAr|H^tT!2W&~{Fu95%6c8aUkhnd_~=-4P*l!?4F6vaTszc{aw=S=jh~V+ zj zZG(2nSM#!*F9mykS~>6XlK%&r_YSasJ&O7DDCXCrm`_ALPeeXXL_XiB!3p9&DQV}V zuAYp}>q+r{PR>i1?VtX9-#)c==?gz%IYXNV`}wyVy}MpEsm4Lu_AK>g?N8^Dvb1@f ze;sq|0;7Fu+XipR@~pIfwd3wX{U3L29(Kp4C~Nx%e?5u=_GzDt(mG~ZurC8R_IEK; z*tH+6G@*|;&acM0S?wkE3-S#2mD_TaToxa(b54i9pT`}uPdVls4VF2Y^FCPm5${JF zvwwN^c3msNE_1F;>(_^{KPBx!(<*D)Z@P8`pKnF{v}=d3KONhp{YcqDn_0;*2ha5Q z|G_Hv;QzR=Y~S&K-LLUhCgE9)XFPKTV~*4Iqpa&LuwTD{zvZs)5v*@p=Z<-e9J9_X z%k?7TT;z8%m9cg@CMP~KIF?(Z{$#G%=(EJGslaW_%f^)J$a;ny&sDVk!Fb2Ov%hw* z3v=%CjQV%X-^22(F~y(1ljZEZ?vAn6YKyo(;sIq}hSS`&gZ-Jn{rd+F*YSvGz61OD z4lMH>|9=v&U(Yxm!u^+H{{JN4tKG9Zu)pqLKem9s9enivbmjW?2>Tr<`@#_kDjoA9 z*YnD{{sAYE9qjGC{lG`oOI)`*wsBzBcZXodGmU9k+k=NAJMJlF*@hjAQ z_^(w4@ha2aSi+rT&M@yZ?=zQ}OU?T9UNpvn>Bg}g%|+=ZlTRnjWO@-kJDLupEgj+}F?YhR6P7VpmZg{42nVJo!8$Bn z`@ruca|!&~ZQ975UP2%IWZskMo!CyM`{470=}9NW_6^DHBqK5`m>B zcc3iv+0opRK9RDVx3Gkue)CaNK)DL$T5OkLdn2}!C{-`^+Rb{?hIF&$1oME|m~P=7 zE=e2yD{yE3R5)UeHRqZS7+M}oA2GZEYcsRyM*Q4_y$7(}f|~C(1NbUp6s4FlJD5cn zm@hNenVZcW=@;r8y*a%jI>J=bl5ROtUS)1T+V$qM<{ope`9k{jnx0Ed4PWy(yt~ag zXc70A?qn1xm#1f&T(ZCv(@&aWf~QgGO=cjOL20MVA~du`$zp6T!*+MrzK}j?Mw7kp zI>0_iw_UOyTHR#23>{$?v#VK>?q(LGZ%DhPM59Q>bDuHxY!I#6TxZX02HWoRI#`$! zY6VAgNZBpk-L7uvVNOYORm!Te5qHg5GIG3eQrflch8c-5kgHNG^%gmAHL~};^ zm!=}>04 zbd<+@I$m2zQ;`C8To2Y)+c36^u$@4g+%7%J?3ca{b#($hXzOi@%pPXX^cea1u-PNs z6ZTGXE?W4xZF`!_lHJW|=`-fEHvCPFWB=;ydz*6m+j~!MJF8$Y))+3q%tj1@_ES)jqAB6w z8<&u)&6z0GmFP7a%trH+nKRF$glO-{Qj~L5vN|~vrM)s)pKM4rCQl`E$@3_Av8~j$ z6y;ylwz}<1oW+%G>)ST8ZESn0ZLaNkoKdm8)V>sFwW@t}`cihzR4;>G7e68a<9skkso6gS8@y^-KeLD~9Jg)P!&i8e$>%6A(w$A%IAMJd` z>c^eWcmAe;ZkthOVccq_uuDxXFDx${l1Y<|P;c+(Oq#bA-dcEf;e6OWSh%)ud*Ok3 z^jLxVHuRIi3!;}Y@v3s|>h7BA+NEpHYOk&p)i$+sy&gKQ>$I--b*<~Vrt7w@`>h`B zdbI2Du79;&KkxcocX#(7Cidy>J-b(QzrOpFZuCOzzrXu~-8W);NB2YBk9Ys8=;z(P z>*?;9>e;1dxy!fb)h+7Co|EU%89itBoYO$(^;|lyF6+4-`g>REul;I@<7&azt5c9mym+uH5j6%oGKmeqf^Wn?f> zWQ2(!BTNJt;memg;-5Km>M%~7CRX*O#Y@}`b&8?5a&qc1v3jw-X{0`^l~pO`$P{ZN z)km>XrtY$O%siHiC;L+7TagB^)`-RbqAnKKI>2 z^>;?~HKY2tak>dB|k#;hTwHPn+1nq37T|~R$ zo(Fe5Ub`99?k3hASVuR~Qmj!MX-}it%j|_a`)cij`}SD-ntjd7BkgAzYZ>m3YUwWw zb-LMq9-V=Er&w<{S-rzF)_YB3U5dL3r>o7?W^IKoG1Qe_>rBwixRbh~Ld$Vy9P0p6 zU;Gl~AgfoHpo2|N8Fv_Evm(+V=1}ND(O;UC^XM?lh>i40^XJuH8`a_XX6((EXAA z%lw!5WTXf9d@9m2Saod{{fANg$vAz^s9tUUy!yOxdX4%2t0VC=DAsGupI5Ile_kDB zTGJ{#e^I^Ow5E6BDc8~F80c8&xGJ51r?&NVJf4PUb+*asZ;a{!<8+%*-EOGLf1kpW z-%ne8-+Uj>7^#z>{}!EtCwd>YV%j%&or^o5bItpyWWdS%Q1tIclpO5!`b1=Y+E~f{ zDqqYG;Mp|w5cEIL{}svMq%CQ~v&QRi5B8blgyaM zM>-}EiO+XUwQS;~2jYL_-bjNT+H&*yQMWk_)!=O@9GJhNC zMttvD`R`4pp^}cq3gMEs%%kN=V|6Fgp+O-wDcQ*>Yj=CeL82vz$XTnm$>CJB-C2^? zQEsnto1Cbsw8#6&e)x{||1=Pslg^+xt>a{SCvRDtSUF3@_G!~tcNprq$f;ceZx5Y(oj!U=qY?h80$Hc)$dG0CHZ+YnZ(*9snlLcLzy?vBVLY2=g~J! zO=TZ;*Vr3M8taIpp(DbStqA7R;9n+UyW~}WBCIX W&NGdK|BrYcz1uXFWOIl8_x}J09lZ(w literal 170864 zcmeFa2b|PY_dh%>nUd)(Gqas-tb!E~6%-3T%3{Z^*s!43zygYj1q%z@j-d0nn6!S$+sF4uLhuw|Q9y#8I+giO2gSeI+e#PMsn zT*-7w4UI^i?`iZ+_s#NM;Jdf3UyKKhodn-`+pmzpsD1 z{|NtX{*(Nt`Dgp5_^nD<68|ee-|;W?f8qbe|4YCX2>9kI zD+2LAF3=e0uN)s38dw9WwIMJ9yfzPv4vYc1D=d2j4h$R)JwHA$IWW!cZ`TB-2WFu* za6#aTz}&#CfqQ^|IIuAAY~WqsJ`Q{m_&V?^aNh>iz^_41FsiHwW`niCmf!&3h6Ohb zjt&kA?j9TyoDe)Lcua6y@but`V3`fe6~POGbAz`A=LPQ%E>K#7i-JpnF9qKWE`e<| z8n&l_;0HzeP4JhHI}{8hLYYuqaCvBOXn3eKG%z$Wv}I_A&>o?qLi>dd2^}Ar9y&jC zNoZzhjs-V{<^@|qcZVJdJrQ~)^aAj&h29H&75WBhZ3!*IHG}5T0->Lae1x<`Ii=ME zTeN0v6|){P6x-9*3eC~h)kcs^6rwiQw$`?%IAi{`YP+%CY5OXz+QG^S?Fj88ZHhKU z8LgeEouggio2$*i2<--nLmGNnyH$HwyGLCUA{OG7)SlH|)!xJ{rM(9u+oFA}eX0GR z{RZ3*VXqiVd{|>!JDjp_^~yBid}V&zD_qa{|8dSEfZHhC79JR0U0D%cCpVt4T zWk#eqva0XZ$oi4BQ6JeP(iwsG>d0P^10#nqmk#q_Il($kxzhr9r-EpSJWSkMN`olr4_Iu+H7v^f71U(;Qz`9L|2Wj z6J6amw{M7U*hl;;`ak?XGy-h)Mz@A@h9{#tMt3X9##w6M8{gdMl<4^A5vYxx6qTM& zMrQ~6gY`mKE{|Rvy&-x>^uB2EtS7oK`mXPS=*Q77qwq;H`fT*oKF*#Eljj3oNu^U` zQZrLa(&6-`=~L5pq*r9t$c)HL%iNv$KHHKVm%TQ7clJ}gQQu3yT7N&6&W*@T%gxWd zl23=Gg&u=XiX*gX+RfVM?zh9y&w9$c*O)sN#Or{FSR&RG%g2VsI$~?YMrgOj zHm4Q>%fPx#Y-d>S6+19CA$BBiQz7nn<@DI8z@HI2J9c&KV&HCo<@VU4vHO5N&GL$C z?WDlBvBj~sVn*L%pT$0meHr^9sK);A&5bMZNIZkbd1XbsH9jz27atzqG(I>!Iz9%h zrziR)R!OXp*gP>bF(NS<y5>zAb89u1O>{<*X{Zi_!)Q7QWoU2NG zoBB+&;w(@7nhvEsY~M{M(|WoNJ<_e^+ppXs@NIh4pvqciQR%hCI{tn>J=9)(dPI6; zdbC}Sn!bNFvi7k!4%?-7O7Cg4RV&l=e@4>>m}OB)AC^8LeY7$8AFVo+pf6I6?TKeNmDpQkb z&h$_JYFL)0zsszV{xGvPSk}*MlIhHBm)Rh*S!S!u4w;QId!*kqw{Mq}(V0VFIWlux zWyneZabw zXhS~Ol067VUArNDX?9}hG#+1s)(r#M0{ zW$(wIXy&m^_J>M+yZ*>yDz;7_zrQK z{I~h=Wk&n(&7U3my81?TZC^Ai>zcH_d0(oiJXVM64=WRT@%y%wnX^>|XgdQ-OuUEcAK_QV_~%^=H83g#SB*HCuQTkL5a+mCKZaG#=RE7>7`baKpWYXcyNgJ1@=_F^cCzPOPM| zcrjNsJnJ1>Q>z$Htvb~r#{D;V9Pi%b^|{KU0DCpU$&>6d%45t{pOMe3lSy#v=RXRX z8(1&$`0^D;8sAgsg|)kTj&pbeE-oyZ%?al<^EBJ5+mYlrTl7ynTB6Xl=5Bqwo)0Z-=3wi$!xMYSbj_6?DxT}=jiSB<8gRK zhp!qy9_W8>|4%_~-N?_^M$^KI-p8t=lz^geeB`e_)di~*J5R|{;`U2>nO#oz~{fn zxnL{xbp*r;oq3#Ff6q8#EAl!N`2;U&oyV~+b=xb!t%#pb5I&=A)%esxo@^Vd#cj>B z=q7GAJ73-CTH8Xo`d*5)IkjILTp;E07c3rl%;7Jp*i7RNTiWa;m+bY>$jkk$T8u{> zZVTDm!L4g=gKJp6KuI6&E$38Mz}Rx|Qy+sf*T}T!ft+=(kY&Vpe98KQ{_yE~o$kTi z8+H%s9@ZV~gn66?ExtG5_GRtZw=`zNXri)~ncZx`DE1;fN;p%^{Y5Qmh@yw}#jL2M zmP8L(e{n2WySR;IFZ95?R2|FAJc$==R^A+mHM1yjjs0c4!|lkn4z@r%QqmGdJHDtr zj+1bcoezu*lzpT$pX0x37!0Tli)(RhCl*w1# zU-Yn#6XnHdY@MA2Qy-90KZuGpk(b*=Ew;t>XBu7VFQd4oK2Tk3t8#V*ql$@=z8Z?z?e9z29v!vV%;I|-%N|&wE!Mg_7imK}7j+KCE7Iai z(oe&TS>^9ZXlDJatT(K+N_#5Hi8_3lbFjSp9f^$ujuJbX)4t90xHiYjB(`U=9JFTb zxQz1<9%Da~b2>*8M-k&$Z+IqazqrN9StGe!RyWpf9XGsE!H)r~hw^hV>^0BNj_CH! z1fm8%aWFs3%ijZPWaoPDjY#LFoufO)bnf0cu5&`?k(~qZor8VyM2g>S;Ue2^Vr9I> zQXKXMU$jkSl)pRD6%n3M=FeuC+)}BQUEvYO$~=Eah!Fx6Q9@X3J(|n!2E?>8z`MX1%;qF*xqC4H0?ap`B;JIcOrhu0`KiAS;BT^R0 z*5dXr$76&zA5cz}t$^1e=kVAmw}{$s1wNub;Bz6SAn(Qy97*UV$PA}2V%+nlVGqU=4b2iooHWIYv$27+A;~jZ$%Jv8P zP64lfus%7Rs}<{|&l_qdJo}~FufbDYXb)i?<|jR8@#AkSXZY9(hlVk-)qpL1Xq@w|)9+}YhI ztfg}2ZgM-uG7GPiaV#rev;NUL9`#nFd_FKO^~Zb+VG{FYM{L%Hy?;!@N1-pAQ+7|! z=OAZ~QWjp5?4AlIoi!u+S;4m#yDJJuiTN-}b}!s_ROqqsEMzCjEo|119x2bwy+k|m z+`_n0cFZT*W%=1>O?H)-Jh$7&*JF$^-2rU3;})QJs)hRR zD#m7u$Mc+VWyiX=F&XbuCO@-BxaS@b{MMH47ZIqZ8)h=R#Ltaz9~S~Y1NmHGDR_ny ze3Bzz+qJGbh^+0Q=6ZBj#1$3lpu4k0FU&x4*3)hOTr1Rv*XEpn-NGx7eFw`VUyDaF zGfzKJSBpP&H(R+R&r4c*e|N(>J73r=se#!;^M&6z>oKk);=Do|+m^WI`wHB1UG%9L z+%*KQaS!Sm+BFy+dpKO%NE_TavU70v@a~b_TXrj5h99=ez&L7^+Q7`LI?PNJ8NSL4 zWw9DkN2xQ^#r}|glz)bQaUc{Jl~`Oq>f+GkQRVEDM_oK>@(iq9U7T2a@r=of74~fz zjSuf1)rd8){&9^n$K$OW#;`orY*yJRJJo^yPBGS2tCg*7(=}kL-btn!xg9fbsanpd zpOxjQy!VymvwMjx*saxRXbx6F<(VsqWImF3Pj^5IbOyQt-9atb8SDynhqO?q{dno` zmK{a?6-Ucjsd|Qp<8GgGlHQqGkj*NYu3R3gy?hSZpCnW^(v|8=y%VeA*86!VyWE_|2ToNg}0*h<1Bc(Y>lt-AadyyW`cR8;^JV|znTajrg zJ5heOy11n);pH<=9%&yjvql~zXzgcc#&rsuiFnN-C7gdllz(w(RCqDy@H-OBLTC6j zs8dGS#u`Th{b*E(rVLHSxF$qfzdXghVP*Kq3iqh;5poawo|DD%(UN)n#%5-HR&gn|$ z3LQbJ>w(!Dx1bYnCRB>P)}mC=7S`mSUTI}=zw-OI7&ooVI80e6dY9rWnXT4%e21tM zeC}}09$W3`*^j;UoTW9YFhbRhJadJxsa$^hucMAKVTc;rz~rC*tcGluGv|> zxVGlA%jAtcW#6~*YwwEj$)nU5;OFvEcCyiZmi+TPS@0@>JqJE#fIVpdt?YRk$dzu7 zU2$OfMBbj?YL(Ss*0GVp`ASy_h;mK2*-Uo&c0ADY`Jnhsx#gDy_{%rClZdxZSxQlw zQ`YTG-`L~4v%WA!w!evf7+yoUDDa*{@%rg<7E&L~0)emdiZ;EDIYm zS^JoUMvK=X=gfU#?>g+B8?o>5SXKx1h)H6l*fTbF?ENaO!CdSeOx`lvR=9oGHpXKt z>SQl51KP{U<{YB8eS5O+==m|XQjS04#vZ|r%v6QlZq~5+*zDzN+;7-uIL!~rPyHj= zO37X=r99?1xz_AsmXfZ%Apw6&*%z3rDN5F>0{jzBsWW2J%v02bm45~{M>2`GDYF_n z9Bpa+CT-3nnf=9h4Rm00jsRptD! z%~C$rn)o=#Ij3BBeuEI-b!0rfUoeVS)y?1J$YMktepix$yNa^5EAw=P9y7DNtPS*~ zyO8+%6}yfv#^BQzQ^jxI(2qT{hDL$+Tb!$0TRDdr*|RFd7}QoKqbIw6CJV(!uWZQ?flGtzJ&F2fGt&ZZmwNr$7w4J<2 zU#U0qE9Z?{hce4(IlC-|>3X*N9ol?ta_6+pGdj=iytwn~&Ko-K=$sF~vYOU)M%US0 z7k6FVbwk%3UGwQTC2Zdn*KBqa^U1z#vHyl^ns$bEwsx_0wRVH%UrY$Y{ZS0{qs|Cj z+ylIWN}Z8dJg9R}=g=;Arl#1siB~!Yk+sw}j7F`477v1Zw=gfXH0omD{LnhPrwiNT z(&QNzg9M-D5sMkr84mkS&$yOlOqDzLNn&B=QO?_zETv0OtKU{QS175{rFQwd;rlB4 zi`p+kYZhDQ_WY2LtW2~imLKy~Bx?tIx?!opj1;)sw$9pS9oQN7QP!%H(IJPER}L_hn-pTwhTq!bb7|n$!e)XB8|Z}hd;@>s}$a?gnO{JPbAM+UmrcZz2e<}(_)pOIz+WHrCo`HQ$V+v#eO z^;g35oB4OTPWyO~;FU1ive==jf zLPbWd(w{D^-b`kh%q_`14+HSXn;*JIXN+r+zQ%e`cEQD5-W zqjdx=G98CXKi$H59D~n1a6BE_1;tTYB4tMnb{{6{d;8)eD1NqJpNXwG?Z4|adx-T_ z#nXPk-dV%&tPkTIz?@w^4%T+W{`Bzl?g+<5f|wg~kgv=x`pWp88mJ!?o*xu*2~Rlb zl8aE-r>O6Y(g-kGtg+M_HszAFfZqk!ztO_{^h9U&yifbs z+OL7h@>@qmw!ezG%{h4Qd5xr#ACqW=*t3tUt(TvtEW5di>LqqBfxUHn4jN^nN~u5W zyBOK{uy0qHKSh_O=B-LC;B4%9=N0d~wOd58h|lcIQ@B0p`FLk4KKZxUQ(M5VW&+Ykla5 zI-*uP$<|SzD6(S)Y=!N4tTn1wq^u9-eS_(Y5{z0X7t{1+&8y-ZR*WxPb8UGJy|D-8 zV-W7k_`)@_6334E?0YDj_v~8>^yRPet&)emW!jc(n`2ev%l9_fe4<*&pI1{oM=d&0 zd(~JcjT7qun=S0Rp6iNU=IYTx z$5yKa2JfORch8yd^O=@!VRDV=eRctX#Qxv{S2g%Jxv!25v_@7o@!wY4ux`MoOgC znoG%8MX8r$|1!C=Ua;0phN2*er%#}z&%BHAn7Q$!bMC?u%q+ zl*w#u@43BAvj!u~`Ro$TBlM#rzHU^m9;(}k^1P)u96cNpoXzGJ8zph?HS@Ci#94uv*}Iri`_+vT z+j2AqSgmZ!n(MYo?487_cZu|@IE*XbSt zPtsY`xncKU4ewLOe>8p8{tH+3d?KgOanQr>zNSm(x`RLWwZ{z_N!H5mc4QHl%X;r5 z&{7A&Rrsrwo~&IV9%7`wq-jt}!g8 zrxg`#hVHQ$3ygbMAe#9wItsFnGM;V}GM;cW3Z8LffVb1r0^Av+8ttP7dpgqS?_ho} z2k%mKT-og|*|)_O%Ej|1e#trWk(c&QIThO_UgnAWHNC6Jjx!XCv{e0Q=lQKiIJB0I z$J{&~IX)ZdctPLkh39&hmXxx$l#}jxXMhym!sB%O|IvSnq{lGVO1r^OSqf#%NX><7C;W zcB_r_r74ec_TxUt$^1~y?%2j}YZy@1n-?8#oTzL+XTGd8r#P!#tj%hZ$>qKQmc^KL zVvBa3eC?LXG_+4DPVDAL)( zY+?TL_dWZFnKYHYZNsKi3N%TmQgxNkQhA(gpXXYt972NoR+Asvn76vw#KOCIHG*Q>m8_-{5BAO2~hI4gEjbz1aWKlyU&JS|4oD6XAJ5bT)YF!Uc1=8a`nl3C1}gt z<13p#DZf>3mCJoTEo1jcpD_-f?mBJf3)YsIOm!ladsLzovzYlx zqGdjm#cm@Dqi8Sn65~txIoZVc%6b0egvw*clT|{JotCy!KT3~^eOpr;QG2`Qj8;3v z5w+T7GWyE&sH2z2lTM`Klf)S>TAlM#UZ?h{0%yD2Vs723edZ<4Ak$(Vddcjf4*f(~ z3>BGw<9I#mLS-cwgX1+qb7t_U0Ll@UCQ_FR}3b>vYP~duo0bE9NQpJl0Zn zbzvoy^!9t>-o^DUiuzG1y5g;8p4V2%mm~|L3x8V3)w&f$@PO z0#gFh0%rtf2QCa;8MrQROW^LnLxCr=j|7$kUJ1MtSQ_{u@O|L-peq-fO|t1WDg8o5}E_+8$>!7eL?Eo(2MEm z=~?Ny*;_(yrXNl}nO>6FKC@e9-^{_8Ntt6aCue4)UrE1{{!jXY#@c=l_FK>rNdG7G zW9rZBbJ>@(uVvp!Uy)s!U7B8=z9;=<`iJx%86^|RWHNP`)_#kc(=A7~KARbsSv#|S zW|Q>sna+MM_Iso8w8qm#^n0g>r9eOL_ievl4f#)8H~V0zZHc#xORMc8+dJF0Z~v|N zvF5v*=eOjVry@chG@lw;-uy;rMd)YErMX&z%}2IONJrCIEzo#T<3(D$@hT22r`79; z>{D7>!z^vJhMODiYIsl^qOIR>Lc?@zMB`b_E40nEZ5p0vSghw8-fDQS;ev)s8s-45 z(L3}t0c$n9)ObDMw#J(cdVS+PMS4@?eT|PcKHb>e_;OK$ewE-3!|QEh{eI)8jVP~Z z{8@Sg^P5ICZHbzu?R)fWWQ?pm zx}wxHuxYoZeGUHu$kudd^X|>N>s#wPG)&NU)A!L2(ht>-(vR0q(Yy4s^z-%0^=tK8 z^j-A3^@sE)^ltrS{cZgteYw6&|3?2M=gtLliCn&60z^;DHRf6yCgcX>2IYq3HqDLB zjnN;^?Vj5=cW`b}Zi>FEzJq?LJ{vsu$xVgz_}nCngNRdeUAgmem*nQ;Zp_Wg&CflW zdph@g?)BV%a-ZbB%Kv6VSEwh54cR4fO+| zj&-5sS^3TKTjf5_@0cG8*8TH`=H>xC3cMy`4f$#L)Ah&mGxO)?FN0oh4Vr5p)7H6p zpuJJQB!7od*>Cyz`N#6lfb|7^pZpv7_WV)#_wvi~U*&%U-JbOidkF4sMuG(^^ ze^$+~nvKD}dCfLZ^Px36)$9q{<@p!#&w=&;eOApu`2jT(^OFlFgFL0?_?qc8Gxgbp zeD2Gd^T2XRuDP&Beu@5h%~dtm*W8Bvthw7*KbZScp9s00fEsf(kLd^3JYDm=zP#oY z@OVc*5bLN}TJr^r+kBW+mw>xb4pTKhEUpRawj_MO_L`i$DoYrn)%f;qh)cPz#r3Il3?0I%Qm zo$I_%$E9@|jND~)@jAWmcEg0a2HogwT^qz5ST_(VUr@-w2p@_w2}bu3*kfRpK_1vQ z@=NR10zYV@Zr%Ivd1(X4gFreR#PrzYh8UI@mh;Wia25(%;m#t~;RaeSLY|r#0_EhDmk%6mrn^ zv2|b9{e=5h-5)h;8!-pgYy$hsrS)EYmcG1Rt550+>I?PtxheS<>f7p9%N<)k1h(80 zI<#NELH%a+TLRsoeh(O*uj}`tY8b7bkiV|}$a**yfX}J5C)UrbKfnHR;IFB_x&F@j z2Vk_;tADKi8U2aE+x5@azgGV)jO74md#Ta(=NN}uqyD@4U-adL%kwXQ##Q%KL!cp^ zdq3ZutE-PfAExO0G(cY(8XNj!gn`u?hCtuP=(F{0^v4S;8a6;J?6I3QK)w3Y4Lj(U zHSCUiSi`thcmJhLCp4Y9GNA3;bhNft>lH1}S+Gbuu;tX2sV%3qUeJ1hc6jrI7FWyc zmUCNnZ~ac2tW9fvMmwWruy%IKvXrWSg!^S~%FN5$pIMMulwBpe zO6J_mrI{DAP1%0gwK8vJ-pee@e3khz^JiAg{5!mg-V|Odyk0h%O=t7rjl-jKw;s%X zpZz7gU3k~;o8E|nwFYzHCNZX zU)xx_SMB+=FTh#GHg#v$EvXOJkB0ZeB@N-ww9sSlNo|BSO}kn9JUb^G4UIsAHw&MZ zIUaCA_^G1i$HC4mig7jW&N&3h1AMtQzcwEmsf{1S!pB8^C^JnJIge$v2cJJ&5i4mZw z3W;&7w%)FzzxOth#r-e-|L@}$n;M(h`!R_Ao>7+z zPwl5Qj|ndee--{V{B!#$5m)=m5kLH6V`>#OQqz906_Mu1s*$xL>qj=k>LdS(jEZd6 zepzJK$UYz)6qy(~HgdAEyzS-4jL5nD*Na>lnG?COb#D84%JTL}k$J7-BlkxZL>5I} zjJ%2Qt-G}D68S(`-ai#t-d~G+(=j;mOUJUPI||o4Iim57o2-3*-(H-yg1@RO5Z(IWZVz&5c&Lh&;yBIOXjFn(qHx{jOUH^uLa z-`Box`)=_^<4?z*cdn)5$N1}_wPRpMYy3a)PvT#}KK@bLNAVxq-j4r?9tpMo^;O~S zj`N(6h$hkr*#8i4iU>$Fh;{t^e4?f8iT>Z4@IzuiV$H*fg<4 zV%xsv?s!?iYl&S1Nwff;*gJ7x;_!~U5|a}rc3g%?z?^ToRzzZU)3u2Uo8~rM-gIlz zT}=-ru53QP`TWFntjfe~iF@%{cH)u5Q&e};7fs(Ko@@Fs@mk`&#ImLpiLVkrCjM;t zq3I8_G=1IlW7D5aUp9T;v?8fAJ<-(N^itECO;0sF*Ys-BJIP4X(*Dh5a9ICU`ybYS ztz;%yM{V|nCR>vO#rWjlVJCj7PD7*DS3BCCV4;lB^M+g7yXlqlP@LT zN`9F9Ecq>1e-UlSr`+vrDL*W+R5}IwY5%SJAJhND{;%}ksbggSJ^R1Yv1P}WsoPTb zrXJ}yCG}M5xsF2^QY}Cyr3R$-?Gs+L*7NtuskK|SORe8Bre#cO!_>c0Tc>tvy{9$N z`f%&Q)>~71LeCCLO-vn~Iw5r$^|EbH+b~!*ZX4B>Y1^)CSK#+)JE-l5wkd6Oz@O08 z+BTr=w6>Y;tF;eq*W1o(yR7Y+wwv1 zj}wvliuC^!?YHXRh?~5hLE{hCW7z2$$k zz8yNcsz-W{jwe#me` zNAw%nZ#Bp?8kY5pjNA3(-PPd6_8Zr4Lcg*74h89men%U+V_|)=!AbXTIvc(yG|rfd6U>I>P z^O?`^{sHNYwg)->$+JtN?dqUmVqn5_YMI!`6|N^(BARB%Y6I!F819j;Cf$WIKp?X?@-@a(8GWF z)ia`QPbK4R^Xc>+1|xrr_b3>VgT4EEcXG}3E^#gKo#kEIJKndCccS+y??}KNu2aGK znRi#GcQA2vt6+JGb2*U^b zJtqTqGE#@-M96?Xhjhxv&9(Bd23S1H!}7;#9^!lEc6)V;JvQ*5&*uc-#1 zUaMc}K8Za&+_RnMM9)E96N{R$KpCch^+fO?X`JDYnuCnqQ2ar~Ok+J`iyXFv zu_t;k2WB|PGa9UW8`4+&(WU4Vc~0|7dS4(v9&wpsY!mD|E|{HqMmm%a zDCPv6{~5sh{&!7ryLoo-RIy;Zu{`5n=zq)qO7P~;G5**6FB%KTsFN+BBN1Acf!W$@ zpll5^d|dd1@TstzU~niM2l7csJ==MofNeAdz}LuaM=07!W}YN5%Du-@6l?>t50_X= zTxPA|b`o{SOLO?U3D{%LbSqpJ0xtJ_YS0T^=K&_TCV0od`acGGr7U3lN{UbF-+ z44zkNA-~9uk!?yX(NCiv#~+VBn!GA`xwya{w0-q3_RbyMn;IAe>wjerc5ky1ux0jO zZ_(c?zS?llPw|J` zL*485U?@lxAhHqQU%2-CD)U$OFeC6&;Mc&fP{|je<>4BR#Ma)79d6y7b|>7?;H=;* zbys&Yw6GB@9Ys`7A9y#)>T3^;xJcnYqNrcrn{y9U z{v*O2a7UF70Y$BQ1NR2V7qy@dtsh$7U9bad037T;IJACXgn{(}W~>A9I`CHxn*@dj zK7^$g2%Ulmd|Cz{2PD9`$>OzjwDkb%7$C|dt|Jem=u`BAnZ>YaL=KpDfz4JTJ`YF` zoM+zC%u@IU32qMe9=C-NKiV)aJTLrjz})bC;k&U0-Itx2of$uvA$Fdbf^;By#m*Km zD|R7BxF9Z!UFdQpB30v%1ORgnqEh(Qfpq8}^bRYLV z>Z{ra)QKZ=;|43tT(D+{;7zg}x3!ZLob?>_}V}GCqUw4C#-v9of}k8GwK` z*YI59xdtBkdb^0XY#Gn0kMFmK)`J!VkX_S~qhfo6PID^Ds32GsuKBA-AC+YO)HxHv5|BDQdC(&<~+QJ*%lTYCW!@ z#Z{q4AgT30VGVo}uM;^nr{=h(uw8C~2Wwi>vu5~{@F!^T4z$DN3Qq`6$Om|&nai$~ z`oS~XGh2VtbEyfipD~%JvOosUY;_ex^bGKWJf7J=&jEC)@5SHE^z4V3H4y45@O%&f z>FJ*HJ?BTyz-Wj&!;Z*V94s<&ZscMPm^m%*^q5vSXB=e1YJoKYf}ZugN3&`VC-~TP zvfQY{Y-aCb{{Juv)_1TrSOZXk1?B$6(jVxX6#p4dfHjV^I;F(@%#s#7sS!2ZsmEw^O^)NdtUCz;PPzZ*#x#NEc%+r0sC;zCTa`N_0$#){W|2a6^Pn`0Q_dK7q$1GCBG%;*0IBg8{rv| zxG`~~zs^9RNbBJ9IMdYmdvs+u@+VpdY#mt`S%|IR%Rdw_*jNVpM*%m=(4cmxKWgYV zg(ofjOI_h#ACP8HS0~h!TQOtl5EXUx$Hwc(_qXAn8 z_+H?*fcKn-0$XU8YL`YHjXWNC2!1zYApTMOBi1uqyKm)yGw*A-h4Jn?O2dD#2<-s> z#n8i|4s#LDD9T)Cw`=1{+s)ayR4%S;yHK|XUZbexe7W|}UI8w^5lHNi*dbi6?d?Ac zp3F6~h|7RK*M>9w5?~IOOB+`PduukZNVfJLTPf0$Fd}_82g-qLAm0n50&$Fn_*yCU zh9`~f%`C~M%wTb}4&LpA+$^%dbG?*MAZIyG!3^MYUwMS!i-J%z_*n2UYL(OA1LYA) zgc3Z$%mp8Ig3HA$a88mArOi=X^54%9xCi;bf*w2=co6tUg5JP<|KotW{Ezx?^<+7?MMNVNra#4^l7djxPz zH3$z34}_=GTpc#fU$rZ=E8usf6(Tk=z6~xS;Ng;2#x@51#<(^kHj=}z>=-uz`w-tg zwxJ!YcWiC9#*EK}{{)>p;9afxx( zYT{ooM7}6udBlY1b!MP7dQ0?1mM8Kx;3EUeA~qC#jLgxL1n^J~LZ-Z`y4&5&EYK>}!m57-=)I8jUcgtN*#4 zz7*rZ+hk`sg#7O^drutpoV8E+?}vK^T*0k^+akihyMoC*7+m!NHVoc|IlLoX8}?u) z*Lc@Xu6jyc;vPhV@{KYk$`m*Iuq&;rM$FA^y4 zfae*st+mm{GFsb& zBl;mc=Kz-Y`tc3o8ze4G7*`irPHhKmJHTe(y#=ff;(&ANE2v%K;g65YA~8QPpT{Am zJsV$c)|jQlZe`B8EobHCXq3$H)ywb<-l_p-+Y~dkha-)gPPJFgG=Zs=!zqWT51a!y zAAnRq{$Rj?`2%65uBQyLErXPGKwHT&2>i_POha0d)(I{R8lM!@=hf$xlL5n(5kcWv zwi4+bqFZMZS(sJIs^tM*vjLYnBf0}a{^z`L9xsk1yz?F${G>FLe!WHLt`TRop?6fd8cN_xqCg&yY zN!$~Eg^sb2L$wDD%-80JhlGb{^R;^za_uZr>^%b?z!O?Nh%E(t5;J}N4L@8V9tb}W zek}Z$wZ7is{$VdCd;o+0L1Irb^44#g| z(H>hHP?TZzeHL5A4ypqEQm^;m=j3Clx2#A$U?*+A*d?*cll3wro=vWuTs!eB;5EPt ziI)M-Ci!)1p_zC$2dcRg@0Q6zsKp!o#b}h1x0ObEDg$`k0DJLpcnbAv@QmG_vmJhw zOU}i1GO%rI+xRZAo^@>3*qHe4SZQo4JH#IN2QY{_k&pgV2`D1^eQ!Y-;NEcoq_tA_ zmIQ9`U#n(34W3pT@}PA9T;K1pAkSoR&Fu!)&%Ks=fU&IZ9xS7wLTPB90)EoI(Z14t z1$?i4tbNY=0Du1dknerpySM~b1XqM!40Zb+E#e0s;v?TOAH2KxzVI#g{Rw#8*X_H% zXL;QBxbJJgx5oNw@cY{Litk0=OM7OL)m zIyN63f^5tNW=_~bSe&xKeXR=mE zSI$m;c8Zbg6}lJjP>*z1s7e&G+#j+)nCDQ`mUjHSB{vgYkoJ%$Jj`s2- z8&1um#I(kR`p^bV zMhb^i4;~L!J3p=t6q~*}eKkfREd}&1Wrr^h)g*)z$;sCK)6JGDDC<33pKll+AMU$Vpf=j@eS(Ssk8Kc=2Z!W!@$ z**T3(s2nURwtsBAfElrhf$_1^EjTq+0fc%_ikXn|ln0MSF8LROS<9v5?;^Nf&c%jU zA@_6Are{|Ir)ZedU6sHbpFV>l+YNXw`@t(0m^vTcRVERI&5N97|^XI}d z{VyvIF(2~z3-ZPtMpnHjN8juV;62J~2WW=?jAqa(wkPBB$07<_07hHwg-r@0%&>Y? zE*H)(oKx`S|AolDWx~7GEZJAeLvN5F`(hEVXN$1rmdUvrD!_^y!_7GZvOG>Y{qwT; zR2Sfs$Et^ab*lo_Xn4OmK)^u>f5IRCnLyt0AIjjjxDC0_;9uV^fq!}XBzFnr;WX`z z9Tz(;_a)bGE_*KW$+F-P$R+-;L-a^CnJ^?-MB+cdtqWlCPD!}iBk_&|ZzeuOWPiw> zl|3uhb3YEXkvg{$q(`J?rp`(kJ)}sY$wifc{LM6VM0vnnERJ6Jy8MpjjMYi$7ev7E z`~_SXI7b>Yb+DU0f5KC8OJma%0RAC{qcz>1_aU{B9oz~P{F>f5rKjMEb*j+}^g<0$ zvz1HMNQx3Y^nU5xQg!KUO2>u4$P2td3#mf77P++W4LV3!)Uj8pE!7ObDvMF+ya?vS zH56y2`9Bc_H(Qtl?^wqDZUr}TVEe5)K-98Azx+q}j|%-b;NGTw*mePagHUJ%fCqS@ z*J^+@^UDjX=D)~)orkNn`STCL^e%wd3sGxq@w%RG>oSj178qcY<& z`@=uGPOwA&Ff$&mMC_~k^>O;g`p4zkC}mHtlR7>d5Q>?zJW9<-q;0f3z zklrG7N9vCB77Q4Na_X+sU8n)e*6Goy>r?jwZUWqD;QsWRCGc9>Kqi<8V!reysX2fP zQdgp6f2A(AL-c}wyLEu*<;*98QjCNj<>P{Dj?U!f`qwK~a^{>>LMNnFZ(}D?k_5 zBiYNSh18Z3j7nKR-d390K35|G?K${v1=nUUja_f{0%@TBJpq1Q^S%C)k!@gZU~cW) zhWf9dfhD(w{)hgR{s-F3FZfSf8$=KNL^IH4)|8c|>WJGJjCkakcB+0S#7}``s@Q7f zJp3QpFIgq4WPZu~p7}9rd#}$nW;f!`k6_Hr{yBXw=HFt?Rg z>@a(jmI@caKeAn90IBiaMCk~#HUE14MYF~%6BpOObM{a%ubnIGkcW>dS~u-23Ys7Seb0BsY*`a-~0qX zG)QbM>Pzw2p&Tr4b|_pA04-Ysw>~TzWH-osfI9Ol^R^wLNA@NT$OjTzb8Q9O_1Ple zm;onskO5>p1xpt5i7)scdmBW1;pnO{1tTa&VUitWtAu9nssMNB@HgMtTLJfG?=@%5 z?*iz^x8*l=0-Pl}+9Z}X$b~r#u(m*hy4~~p;D0mc8>MK@+fWd`hcj2rCH)=F%Q$@t zeUoyK#W9_}S@O$jkv>Pv7k(b$lmo8oE@4PI9P88PFo-#;;d67#;@`Ov_e15kfvLl> zeZB-_b>+|M4S1&X?IO6oQVu@gWi3eMZ$*G5RmkUWvO~F-fDe){S#2mM->?I;FNpvdvs47$ zMz#JtQsnaY8+fRPKAJ~74!A475OA*@Vtn@gs_;;DA^P(Sg@dXE#ug5!6uc!fmsmj1 zcjF)*{YJ1pQVROcW>6%f$$<=sC!LTvJ6oq;q+gmFW{xB&w{C9T!pVRW5v1ibm#G{) zs<&MJhg{N%!WosLe7m_N46x@GIZ+1fB1Gvt`3*|j(W+m8KrX)#uB|WqY6h#`da$ij zraZErou#5=h2xRrXK75weUOv+8G0=pPp49e)I$vBsLG}M5oK^>-iE>;1ZyLIXk`#9 zV)5nHVuYP97hPD-9wTaUuQ~($oUNio%*goM$kMP!RHg~WDu*niIT}480kf{Ols>=; z?5C_HxlTJ;J38Ei(0V>I$UWuS+%J_u9u1$2cBu?b@u6p`fjvw3rSizW-vg-DoFiCY z0yRMaaI38#_3#)k)0flLLq3SbYG}PHK7h{pUakNO7%~y-Kd3HWL1&G zDAp;$vBlCox3t4EVt%%5xDL6}?PysoE34L=Ln5&%Gva84$Aq^va^-?$kv_kOpA33Y z`qK18fb&@ooYv`|2yjN+!^=3Q45ZH;CBbBgPUd$MWkH(PI7EGEK6AMUxB_I7WfJBy z>zOQSd7F7pY2^NrfyMAF<+%K)avu65C$LEU78AJl(YkRw)(^LX+Jwx95bs2DcUJ(( z{a4m}`WX(mM`xI>+rV?^Cv#rT<<}~MJ@X8!=WUQ@G;8zEl}Dkr&;VZDc2KVTGlj$Z z0{Fzl;x9EQTl0*U7DSElOh0NFDaPc+i-7Z?qRcohlip0>ymbHpGp0JMNH>T;AM-0S ztcaU4h`E^?5c=Nam08!09@~)25aOL_ne%}?i*}-x_hX({Z|y5ES7J5;=SWi-WpTJ> z+2nb+mU%L7>I;{U;|o^6BAHgSi9AIxUmnGKAhS>g?nNB;CXJm^?c_@oJw@Ig$uvA( z&LyTNrpql%o7`UxijiBnmi&lv3+Kp&lxrC$+GKXCKg#H*Kd3(_`{YLX&_=wB7S^-E z?1lNugViDPlhr2b^aXa%XHs(|l}r9+e{;kmhs(<#x7xMjZ>8~TO98!0*^}c-+Y_y& z?eS}q<12@?c9b(GIRSn-Rve?g()dliKyzZ%#H!9MS919qGnkQ?K^g5o4j>DoiA@rl zm^EezPXBvgwp1o1`X}Iz-WkL#n0k>(>31@x0-ne`p`Vk3N7@#qvb_1hxrY&A4ChnN zrJiGcq%*RdYSj7>%T%;G9OvxEm+bBgx!=W}>F3BnKDmd9lhaDyW9hn(H49ZGqv%W3 z<<$IO1e0;(Sf-+k4+{nuKHt(97pCUFrFf*wN4kD22grZx@=`2vn9bsCY%|shwx9o& zZAHEYTTlC#1M_m^hvtV`N1%EckB7O93+uS}BhhV~^0FgdfM*lE;0gxA=HLDHPSX6P zQ8w#bR}udG{QKpPLAb(IpeLU47_{OH$rCCARwVU2J@t5UM&^V}CbNW)-7mXO_CQ?p z)$}J3xorWP=Q>TxR#o)Uu|L80WQfC09pVL7%oPiJs|UvQ6^ZqF4{SUAVfw?ubUDzT zO_xLI9_07yJuq`{-QJ^gW#z5L{*Molw1LOw*DnqE$d=af?5-I6XXgIi@$jFTH+YW& zoZ$KqkRb#P@lJHz?Y-PP*Yyc-j{)Yo@ZUA}cdc-J>7DF4$~6+Oc@H{^T+Xd2@3H?JdG~U)fLAB1Pb%8bqXn>`cU^dP99SXpKG#5?+j=H>pEtZtVDX-< zK|0+vgTcS2f5%XxmJRM3+&{R#YZVjPT^oCUbgiO(;@`%<3nI8va3?L!5M3O7Hu`M* z`sA+3!;%w|6VqcePkFbp!?i~6smc&q7~CtkM-lr&MGRwtduWkxCp>dbiN1iq|3Y=G z%~AY!)D2zhx{fQ3=-aM&t{Z}<`ws-b5gZYm5PSlb3Bk#s)kAG?d9XEjl-3G(4VHe| zn;`FM%paUXW#Ia^ZOgGEe(^bX^t?Op;+mI=61_Ko#XBBntI3P|GY+4gXFNX-=G*hQ zn1J~yALW@_%sH2O&S`M694_!R<$2HbstXq(H|!;X5JmeKMVcw*;koEoA5Ry(?sFN4-xa?LG&ci^ zBOja?Jj`kF4za`Bs$JqW*lk!L8&y~rk1&kmvT?-u%=LkIL! zwG=c<0md9AJ*u=gC|)L2EcQ=dV%1O z(!lDxYglT8HiI)lkLSkZ#`HWXi=LQOEft=q1+B1WjUg?UNAwYSiUVEz{?f>eDQs36 zMnyu#VujeAxS)sK%j(0bWb46IZmZQHzZvCcO}W`%&NmqPAOfoQ2EAe2#-#vN;kM#H z30p=Dr_77Vv?e?ErC9Wk@hl6=Tx=1yUr+1iD3+h)D!=CSnp;{CdW&cQQUbuWu0NTxnk3&K&m~0RB{N%new59uc6XuvCuqpE$aHmE8pdky|#CGw8 z%CGJ@?kf@49^m^Tg|->gH=Jnv=az+u;eUB=K1WrT*-wyr~{4sEmSM?675bMJA zqP}8VZ+S?r3z@DImAT%6p8`wb6K|goT;$VzQJ>~Z_|kA$BVa=Tw0(rSNL>WaJKa;j zF22gp49`lf^Zm;=3Z9s{yMP^im4U@?6kOsPpd6qaq#W+M3x4Q&1^iI=8s%!`M&&wX zoU*sEj8%4nZXT{66_=xxsmh7U6s5Iy2)!G6HyrfctGo&CF|b4@MGucoN_~-9&X@G} z>2G|`_}&8i40sNn(Q8|jbIQTDkR$XQgK`mp+j`Go&I*1WRQ?A|DGUXm-J)*Kik)5&w0JyDWv0kaox!LFCLV%3`C%#v6=S%``@mXj<* ztu3MKWaD~SpPl2(ZD1CjiQ8m4=4rK9WuAj^^6Jp$9EldP61C)lkda2Q_jn>g^U5>7?g*t(?3a@?!Za&1(1KmD+9C zhFNQtSPe2Aug-3@Ysgzpd4+PjTw84`<}57Q+H$oyOZi)Ko7*=_@;q{_xW&vKqQrU5 zQJbi-YsqS+RzIuEyqUI?jc1j6ak~>&K2GLg*V#4Z7SYapWLwZFTGWd?<)(}zS4zcP zoadZ1535;jmusyVP_}!D8j-h0%d9e;J(6oge~~8-Q779<tvd$W-rznejrIoT6T$`hLf9!g@hIoH@!YiE*WPiXvKRJ=~vj@^+ZLoR=6&zC=Y^b$n$RL@$vS+p_Advglii zw{A7jw|q{shglLcS@&F-r%cCkI9sR9&#=B zklF29%l-k0d{$%&RhAim_5zH0oq}c`SJnB`+p( zE$7I?PR%}C;+#Fkt|{eR%4W}G)nGI&R+~&N)tcRA*T{0(bz(*49A?QL$ux2=xmKRT z?#ncGy*$2@)_H&7QRIWv-lko{BRMDcl52Ssa+Ug2>SxX=iy|FSb3Jy+*$*vbCCWAS zOy=6;cC%L8BD@9BhqOo;FKT3-q7HfTC%rj~%!51`wZ=PJOM9B*Na8V^BbyVg#IyX! zI%T)(SuUQ@seMr|^7f4Otz!1Uwn}A?*4%I0>RC3BpZLF9Qn)5>jDFRG}V zH^teUW0#)k${<5FlWX$g=`L6j3r@c!)E$0)v7g zh;Ts!4j~xufgp(B2n2a4>NO~W3TV)XNtB18<6LyE?cj_v&Miwb$NfpZz+gPP$`uDY&g?cQ&_;{cBS=FSm`o>)FEb+7gFjB&Kd2q1NA7 zT)O%(!cj*qoy%AE>m6-$q%x<*Dd&1ltw(U@R2`{$-}yD$hBSekKP|OZca+=aN7b{^ zr*bcNsJ-6NIKRNNdp3&L$R1*o>ctPX#x30WxNT)r#?>S7&sv{GC77*T)sd?GnQP;c z)uyhs)Jt8@R+}=;d9EqqD4J&Wl=VF-t=y}$#5wU;3~+cu9>9e1w#A-blh-lw%$ zDMLOkrQ3!hfq1O)c;ncOkA!$JRmOEk>Ra7Wx2^Wl{a_8GDXNdVIF)Bduj-V+vmQ0_ zu8tJ@1rAg%wzJL6%X!cB>IZ)%=E5r&a&zRi)hU|qH%e7$uiSGHX{~?6dDPp^o?$l#+G9)1>RWx@l^!8>r9JEgs?3}A_*jS(+ntBo#$L)SUpN{l z_H@?jZR``X^NVe+HY#m#S*wreeq6dn9f+AT+xfX| z{j=fG+46M}YPa>yvDPcLXkLwTYV zjra73J6^r5ZV5c@eB#p8v&F~jr)p#kDMQ>q;b<*2_iBDLjut#g&8~3pjMF=Ae$;uz z+c>Yerw*xV)6`nx{A$_xyRGwZc~slo@!IX&J>#@YKIyIl|GewE=8p^?CF_=edoU|+s3JRr14SBLyynqRau_K z-r>qL_6f0?`BWaO+zSz6s`iQZV~*2QawxsC$LV6$-zwmbyT1c(=?%KIzyR^OOPObjU#B);*J1bR@ zy62P{|BB&qopcjkilOSYcKJ&`}j>Z<%zxzFZ4n?H#^q0c++yDQh3d(x^q_hcTP@O?7( z_qoolj{J3fclX^bwv%%6Th!`YBOQ}Fq54?=K#lsVeYSJ|Z*nL7S#(}*n^fG78tZk+ zUC^T5pKDEPa(@n8zRgj#JwnUF_NA(f6UT_T(rYezaq5`olD67Mdqbl>QSHrrm!sR(^QpDXHHYR=-BGu#&8NPF zxd+wvnX5I#AqPxs)N3MjRsB;x{#4)AezFW9=MZ~ae2?JIq2V>Pl=rfZ(Z4zvGd`dK_0m7DAaY$G5?vdrS0Ob z3nenQvwbR4&UMd4ovVMfAJbRc;{CNvkH((LYrCjg`&=!T+O&25-fsMx;F~jA-j8b9 z%uAK+sP|2M#ab0cp&ZgTR2;YWO|kMv<&V;c-S3TbT({H8?o{+XyVbq$GuYqK{g&>F ztlr%1^xmE;8t88-?G55L&s~o)=eKm9-J;_2-yXiXyEV;Ism|ARv-}0` zsuVx(snlRk6ZIai>dQOzEN&wHjo4TVdVbcoW8YBUu6@OxoqKj>3+_3(=ctxGr}wm` z3wq|Nb9(COyq?xH*W4TVUDwl!)>QW9Iq!u$KiktpW7qcF*^0)lZWet`#~$c;p!bzM z_=)YSbQ>&gzsYt}PixxR)0&>_X-V7u*W#;E^fv#OU)@~22SUTpFJj?u*x;|&cShgYjX!p!=4a3R-|OF$E$&(P0#)3*u%WP_xc9)t zvG50CR9oDvTRVSS%aXpP>OH^rTzsf=g)Z#9xK}52QGy!?whC5)odXLxj(;_ zLm%TlEjb)lyYo=LT;W@VZ}uJ6x2o>v*!-sa`>DRy5A0T{{F?llz9aiitedV;ygK%Q zTLwNQpHB~bdgwm~c5614%<0&b=+Bi3R~RI3Y+TiMm%ew=x54TQeP765lRp7_x7Mn^ z9WsR@`fl#K8E*c=x&S&yT-ycQweYU}x?`%;c`EAp9o|-Q|ch2ve-xJ!q1u=a+ zy*0mo{;O8|TYg~RuLhP5EX}_a+OJl{tphty#jVAyl5&6Xr1!SVzOP)^u~GwLL;qB* zk)c}UFKJEv&(+oM`l0-jBPSN;7ut&R>xuS4TVds_x*`9Y{%7*PvHJHs^_!vdhAtR6 zbL8d1lIH5~)#LirTmB`gu%y3Z@Q(uz4L&vaRL%QVwQpcGx9rg0nkM?GokT9uPBtd( z{5bozZ8d7sG~@F|kEzh=(WA$Uq9Jr2d#d>7Mc&e!dZe-|AqY*(hh6A7>#X=?sB-c zf6gkL0i9Vmv;SHl?w!$pOKU2e-G58rY^wh={hzVhTgYO6Z~r|l>g)a6ulxHS>i_n3 zYhyp8ouTrldo#Ycb8)c$Mf|MM@TE?5N5|&|P98XU^Z}~=@nGf1=|)hu?SIj!I8s%z zKQ-UCN6#sqGrCywuk`0$KVtO%i9fl;3N?rO!K~gD3T6G8)va9RiLF@a-D8jADK1ns zFKzq&7`|1Z#t)cxc~D`W7IkZ(C5^pE&0D6@J^ti=GJ{&q{ZG( zk2qgPd4$HFv!`$7 z!Sdt7^7EYKJZgT{sg0_b_0v^bHBP8yJ??U?%!OXTv+`KeJ-G_vq4i%pOU1V76|T!E zRcBHYyU}%XSD43#*ERIAS2;Q!N`dwhavvB7T%Vi=xABMG?wF<=z&{s5JuCO!vC8e> zV}p-Lk8sz8b>Xj}ue-SX5!+a^U$Z!RT-*B>TT{7s(8%catN5XTYl|PM(iKH$;A*dH zhu$^xuCe2XcktS27#iI=y0!Q~i~2^f1&y9ie7H3Y99sNs@%PYgi+_OrwfOHtFAW=N z@YKZRpOS&ko%-^!cIB4;(UZNbxsF-I{)b7{6hxO2Ot|i``Coe;IO%A+-VgZUOUG}xM!47R3y z2Devx4N?bhlMWcH))9j(XlTLUsup$JU~4*iu)fY5gobvfEG-+_b7=3u_d;jL&$kbM zdVI&h%bIIwzrl+JFB;k}h+c4kp~EVrHrQW1OX}va zdGz)cb>Co1sy8OmHgvkG(Q&np?ml!@i~7(|Yr1NvHC;2*nywpaO}`)77P-8drExxP z`}?{jTtC#BzBtsnzB2Ts*`f?@tgo@I(QBaV!kxaQpAWAK8p(&_!)qI9q$kqTBNZC@ z8TTbG=4Un5G4{~tbre!I{-O|ZtG^T5=KW?@dJe}b&UxMN+UQK>tcTaJ{GrB#)(-cp zW%Qbg^!;HEaipGtr5=s+3?Bj=*n*h86}@M8u6p+{b$^xSn!1tSM}}L}$bUJF-WD|P zib~Bbm$89H;=MHVU8}8Qe?2xm_S0&OJU@J6eT|e_Qi9H|=q(@2}=7pvQ~-}k+F^qR2_*SE*I*n`=xoyGg> zSm0CnVIzZNBi<^L+v-^+h}Rw8BBP3Gxo^HycT8Kfol)jyj|$7 zX~lMKt%F`Cwy0Z2TGKa2TGO{iTGRJNTGKy{Y_Fagp`@RncXhbAl3VVpCF)QAGV(9j z!%uiz=e?&!Thn2q&2`o2Rq)`aTCW|Y&S_CsjJ78EmR7$j-Tt5BXU-IY>BnO&X}oPVjs2;a#t&#w zr;fL#Ik)sCJ>u-~T77i9HQg{?tDDDFcVT<$EZQ)>-I_NzZ*cr;E$S!Zt?8-pYW-u4 zrP?Ff4{u&sMX-aN|AHtE z+1fKEQ_9%7${5&f8HA;r9jP&e(tPm&7dDp);seHS!Bu{gU2;1@qU#evj-VpIj;OvTs zZJVKg_UvG1z3^OUN4?28lDDk#+}4SG>(jA$qh4$HP1jG7+cL0cN>XOw>^|2SXV30)LtwoY zZLIs3ti98qjV;XN=#O?~a@rn*ZJQA;MRxe}9K{aKMBEv%j|rbHXMZt@1LieC9N#|M zI-f|)M)hge^OCk|xxjN#-bK#0on^LtMEFH*^U712Hj1B#>Ppy-X_<~RF)v;}RYrWr zE67ou2-|uPw&&7GpH%Zz)_il!%Z`mXiK9M_dG5;AUwo#dPQ+e{{K4M86#0X_-JZLo z1qXZN|DyVLNA=JhoqKn5zQVQ*2;1}RjeL|fzOePlV`OyWp<}igSyX}L@QC_wWiruy!B4*QCi1LyO3#} zkL3jR$tYj2Z&$*$T}?*$3fp{zZOlc{xsVH)vb3v3QQKP-wY^1*Y1eg`>3;=$!uD|`-=if=GK$SxG%ui z;u-e~o^fB`8S8e>X#dK(2D3cv;$WN~$k;gGVaM(o(I4}X&zH=x-P&c%Suki1CB(s4 zN5*;>qa~SjuIpjTCDya$nZVg{#H%8n4y@}*O}qJ7EkENwU*;Gt_O>Xmw#jc!{^a5V#b@B%|Mne@WLrmP0v9uC7ovyY4NRC1_WhpZz@R&8;z* zmt)3MmT}B8?K0=;T&%2Ppk?)!aW5z1c|lmmaAh5Pm2r(&2Jr#2Z72_OKJ^@YWKOqs znbVbR86+*(r`2&7K2KmRs%bF}=s(^wbfmrJ`2w%k&}e8^L!+|Jlr}Sjm?(*GN!q{O zFDRo8bZ3n)=VG$V^_!p0C}XbQq&&hgYV*^*vbS6Zoih4n zW{bq1x}AN0^V*a?53+4*oTXAW#3^Qt<(a^U>Fwxufu}w5e%#qRHvh`obDKjP@Dk^P zvJH9OvP&UiZ!d+k=%+qT#@jjOY@V4fX~E^q|8#?}oMZa=!1tzPZ5#iT3H;BVkv3wn zmvyWtv2T`ft&Mq6?$d=g>U~pL$Al95pk*18mGxfIvWx?kr-OfXL*Nb>!^NlL`JZ?@ z`f}OD&%JQ=fsPA0r-*;yg-*6Z;Zi1)r=)YA+O_SGIUc(Bn7u5sU+dgdmOlQ1`Mktj ziTlj#?I)039|W}Lld}d5vWcU7P zpWX)??5iUCwC6UoPv=i|{_IDdqd07<&c6_)Euh_c`<7k258J1+FLM5DKWM9RUX~>< z+g8P2_})~QbAeu$RocdEy-i|D-FPX-ZP>vNuMp01d?-K7d1_U$b7Q+HJS}xDy!mPI z5q{CzvCfgT2mCj+o07AGt9fk(XN7Z_V7JejR^JW(LS~($y+``X+LUp=#&Tw6#Qrsj8MrO7w`EJ-$Hk|= zi!a=(`99c*-m|6Di~3xRvAW9?uI0H{mUAcf+4Ef;tq+y;+IdDDdPW_3#=N=u8*DRr zjaGkC%CBV*wsrE|$S$n*G{ZXAb+59n!&7-yfb}`*T-o|W&k)oOfBHoC&S`XSlDhRI zeWLq|RMz~u{#TZK6O$NIGDCbO25w7BrGn>4Q^Ai|pDT=c%_wSGL6}CQL?^B?UwS!~(u95u|$AfL@lqG-Xv2e6MbM*o*SAm;_1bUZIA&(2XyVH*?d%ejy~w*G}}od{chu+Mig ziYaV;9J8E@=wr(Uo-`9$PT^ob)%xUarq7tvL+)Elt1-z_jvu9uUhCY?0{7k!@uxzZ z0@|2sSC*w+DeE~ZZ@zvKWmeXF$97~|%Tp2W5%FFT?;Y_gBVIw)yvB}*>_~)!XupPW* z(d6mbWYqwD^qQXdAX&?K;u9flnhEVHMIUr+EJgqFjP~pq?bb8en=&53%X)_ED6p<4 zalZiGCBtJF+dY>f#@f%@F|K;X+Rrh^Qpfy`!}0SWP9YQg3z?1T&$R^CqV$*NEw7#` zD`#-+lsP{0IRouvK8JM7G1)Q4Pq5tMBv(s(aKZ3j&J_H;PtL9ZUV1L`u;Z88Gr!0s z2IGv@zp{=$;9c0)*!~^!`YLN*bIkVUnAcHx$}IM5uLWaXJz+LpKl!#UluzpaEMqWB z`fG&sl>E!!J592?Mvi$MmAM|y2(y0h>@G{Y+`FMp$TIhp)PD&oWy@sR274Q0KCgEF z{Rr)h!}GJwmoZ?=UrsB zjhwYhd@WB;RJI=Y6*7}4)5^U$@4FrIz8mbG{W4$N=W085Z0k_$y=5r_*_A;!t7RB< zZIx-+R$uzSRGG~3bX}%t$rF}wtdLnLWs|;U%ciV#B5cbkJQmq)eTtpW4G>Q`_R;zj zJMaCS55Efl@4ybR>0xOWvRpYOl#|EM=2-98Q6p`$Jk;yS-bKC;iwFy zh$o_aCz$Wj>m|N0pTQ!I;}vA4<=Enw>oLbmBes13Ey|$%OL@oz$Ba`}{{={2SUD;6 zupp)X#O2elP0`23@#8J*%4LZuvqH{&^`|o?wei7;%S+e%nr|BQJ7w*6%6uN)YruH+ z^|11M=Cy0Y)<^8%q&G3hN!Q+B^qi9E#kdU~b?Y?cNz?TKXP-31h{q%5`c3?=D4Fjl z@4z_gHRcZO8z)R^c>q5A9vuGj>9ec)3)?tgUAw|(f<9aiJLY_(tn&+a0e#A92Tz(+ zo~N80Yc^ds!e8dNlKKeSnBYm9m##TA-?0AdwQEAoeV!j7r>M76WbFz@`IY-{{bgLj zye4el+aa@Uusu88Tr!De`M!^g_F3Ap&kb2Jt|`Ck3_K;=#cQ3Shr&l0V}X?P z|2?T^JW~bl#4@ZcNf~yE{QX*@FSK)%Ej)j4%=^$jv?NYmyryK_$H`h$S=XiDgmue$ z%fp>@@*TX(WVy6yLYd{slu%%9@ySkmmiLIPy%hOKUD1y6OZ|98{g5Z|;j?tlrHC&L z%ypgf;dd66eO`!D$^?IT|HS$5+C?mBmtf4{+5`4Bo(p2;$gF3M!;ZPe1It>1^QLE9 zN5`BWJ*&N!aX5yH@{TX42ul~ADP=7z4!e1C|sUPgeYVdAM%lQtxd&Em3-Xm~! ze;HR-rtr^RF7+&RtLwTUsq>|B9XI27b>1lBc^z1vb7rJIm9_p?ssD^=&-1yNKQE5A zi786i{Md^+*Jo20hYODRoC++@n!53P$uXYE)5nj=c{~eZnTKZRzxqMcVcQEO`mg>W zSjJ?s&o?m%iX+b}@?h7_EtjNiCuTQ}MI7s32cP12_s9{*&CinQf=SB5uU6o9mvaXHEoYzWt22Mu#rC*SFzU(`e+ai{B4!g8fYZvCTYuZ^4 zoYToE;_$sDaE5laXRx$kuJOQrT=I-|2zJk!$l5;DUs-*GZ5&~K7q9;E-FiOaesDjp z7sm>6R387F3U+zNgYQ3p{W}j}zfJ~Azp(jgf6=mm@!e3w=sPTf*x8T33z#q0MPU5& z^(<`5wikWazu>c!J}XO7=B2z|E3oFIool(WmUC$ob1D1U%6n7#>>b6~hiSQ9g?*pM z{)&i~kyl_n0H1x4udJ8I!KY(_6jEQ)4xO3Y}T$U_VE33!Q|zg1kPmzh-sCz zFUO2=0N=v-KHle;&+y5UNULoxJWGe&J<~=T@Z4Uo&lpQmpW%69A$m5btoOOfdY=oH zXLr(%aGTA3$Mpd0c%J6{F{e)&u5(~tN*}Hz^<%iP~M<+X>aI9^btmXC%bvXv&MJ#*Yr_V ze_{4J*!}%AIV!WTEt|}hIn7s?_dD-k)O;)3Q!BuT2BrtIYCnjG~Y5jIg^OOknrl(}CUC)n2sU<7C8Nzfa-X zuV~U&`EyTnUBPFhMP*r6fZN;{1@3WU6gbayi1n9edVKx{yL^uj^HR0%=hhhTc~vD( z%31~X{oPone2R>9#UzL4x-Kt{dnH-V7iHW7b9_t2PNkh=X)#F=U)MQ9tTTQ}m>Yz3 ztwP4R%UI_b>vm<#xu_qqt8>dTj)DF7;2G`QF~8#mYoAs2^FHj-?>HuS*0f^hT<`3K z$j)`Rv*R5?&o(bf%Xd-W!)Fm@Wm(QwdB$_W+1Ymv{oxJb@A?|kT3$hB+c@;g8q;z@ zJKN{Vl_}F6FL{+DKDlr>)@-!9zDZ_U_Fu=Z@r<_xJa-vqm-rZm;r}Ma=QA`iWjdfBqbJs;r!i ze6oCIMSoduaJ&V}`rnpqQm%#CbsbWYe3i=)Yunf*Y6FMz99PbW&!KLtLwvB_VmC-02x?~3w$SClVU$7jR=_qlxE73F(o z6!T1;FV}?dKQoH|?kGOk*U7u1yxtwfJUj9SJOAwUlPrIk#$~ zm-JqbYo1}ZUMdOuXY8>1_0n*(MjAG$Jg?@nZpVC%4UXDmdbTfrqH8DK(+ykZeVJpf zk(4K7y`-#jhi9x|99w_C?tf%UU;M*PV#9>V_(?8{tdDr;XRGbY!TWY_n>Cq#Mqbsg-dGydU-MRwzZGRmpv z3p-ir_H_B4OUr*c;~%~@W!iJ1v|wKza0cy7(w@UI*g82UD%*Qm29BSILzZb3V(!F%xmlk9{mBw6hFrS4#QMPmM8`KU!e`&<_JTo(CU&X~6RmxuCa%Vh0S*+V%;Xur$8nb%kQUG}Y!&nXd~7O~8O zHqH%`$ct;*5tIE1^Uaime--iX0(T^29dkO+f4j`I^pX5fh_BBo`Q6ZneQwGBLlH5? zBK6TR%5$IE6O$Qc-=Q7vq6}xmKFPA#n8Gs}pUieY;+|2=Ft1feYxwRi(%R< z1NLPD>s$t(i#bnOAF%fadw;y==F1@OyxH=s3FYZ3lew-KNxD`wf-Zz6t2;5^n6F5eV&sP~~GNs78UMd}A%CrkTbU+_E=m~*AGcbv6vN|rWh{e`VR znfH&@r(|Qcv0V+Re;eBg@9E&<@7+9Oo(0R?%J)ymk-vX73%kD;^Q>vb&igNC=RK5T z-Zz2m{ZV!r?Efz$co&v4vr)>w3-jf;0sDcpuPlrG5aE)tn|I)I2>p5A0bW6$wKL*F zE;wf2U4uE4K5o7sGwmA8p`O33?B)yD-^e&CHQzVVpW`j;e(W8y;|#|Q#~5?^ly#hO z%yDMSjvMN)V~Aca%Tj)2mfQJroFPvd9X~x=f7-3TU!TLrug}3cem*TRN2H$de*0K> zN4SH#u7W8JTf^A_UmeJH~S#p!2tVbn_zi2gZ&PCU|TvZYfHHKE7tZQ2I1zVEN91eZ;YiFLw43 z*ya0Bwg>PS^PRX%So#;ASHP~U{=zmbSiggSkAH3tK8|rxEkEXQwBhTg%CNtg_Oi9R zdsW!a=DD!VlOrF$-hr&Z2Q)5rB?@C{Mg8zTQ3BRkl~yfOG>rLNd7#!dEo+Lc3} z9gpUEVf$X$xC!^U;Hcix^B70!U;32ZhmH$R$-E5q_p0DG^F1i`9k9Q@1N(Uve4guH z5x-Sg=U?zAT>nzmITw6mWC!a!t9Iwp^*%SRjVCF};9{nJeuo`pQ2RVwL)R~M0K508 zb}+qPbUfesa6I%}ig+e)HnMYl==|C5JYybo%~`^^yNK zL{9Nxe+SE$z&7BReHq-&^R@9auARW{=UmU|zslNY!SdauO{>pB(cfv8IO;zxtafG1 zSK0gcn7Gf?XN-sg*85yC*VTL<80_C41D6<|V+D93I+uwk&QkiY-NNT}^kF}>Eca_< z*Qdx)Ot8L-OS|iv;A1176C*wq@m{mth zk4E;7M)s>C`_+;Cn&=vVaosVNq72tWJ|BzHek}6;nD}TrRMz&OtnKjQ^uHBjHDZ38 z{_EA}<59i&aT`85R!^q%zbVR>?5@{MQ8{ml%6U^1^X4e+%~6@b{u~|iy4)Paxg|<_ zOJrXk*_CztSs(e_7Wv#39{$TI3KC<5y`GdXB zosk{v&5B^Bx@7K4mD{J}v*hqU6=TlN1Ex+<*5>uGZli`0W<6oXi z`EPY&5$){Dm*RPE;Hfg1F)zh>fE?xZ>8PBaj`F=d=E&cVKZtW@u!nJ@6pb5Te}7uC z|2J8$uZ|VM(R#RK*Taj^u9Wqif6wU4;Imxc1pEF7#<~}|Xj-tgXV`CLTSc8PE%+42 zzWtXHdp~~lo&zc*NU+DcI%k;l3>3k1pBogc$js|a|cUX z<#*X&|GhIg^4TGSy!eg>?01n5FDvu9^PY=#`m?`y)|j86KifI%%9@reZJ2h~ev}hg zCy*I4)pCBuU2E7sn_)~X4_W3f+TEN*j?&&u|CL$>Wi10)o^`|j?&w^=IG5|E%CyUQ zX<j8CI@Lc`l!e&R1E^H}gpxGo0`6bX3M7-gn@CohZ))W`54jXD{GS@>y>BwAjI2 z=2GUHglDZ_%uOY^cT=8lyxfhYu;Y8W3Av90`>`E-S7Zn4vk|o~asHo);(&D=hRQ0?YAC;Ow-r)Rpyd^#=b;ls3b9=9~_@zmEVfaMuO=Mc01F zw6o0w&Q60jFy`8_W7rXB}7DsKvG0z8_W!l#~&2tIk7}!5&17GjjjIy?w#U{1oXWBHBAqj11v3<|E zgz-vwQreR8u8#fp)Ubn3k@*+=Mb{pbb*xj?HUr)e`G8Rp&FdaFPQnK~5!qeZE_vS0 zwb|k%MOtT1;jg^Jgf`}RM&3)3w#PL9?b5DF5tls|*iYfp&U)r^GqB9*Y;RzFZl+vt zZ4&lD`tx@!g7Ga6%AtAbSgLXSdH_Dk7$3m?T^;bNTw4MkPd0{F|Wk0`^A@r@k$+#996SL}yLT4CNl!vEf0j<+jQ z@>imK$JcmnAP@_EY#wijOj1eK2b; zy`luWGXC$jnsD;39x_NwNG*s zAFR)!VSj-BT!)Zd-yugaAEXcaHS7;YF&_*uGd~Uf;s4GojoPharUw@pGh0%Y=WKG0 zIxlqN|G2?tgfaPl+`zs)FU5aLVEf^{Dj3gub)5kIx|_$r54d)vtnCf_p!3-~e5cd5 z3}s@?YpZ{UrH z)3y$IkVE`17A>>amwABwSOoTC5!hcl@Hb_yUr7Hj7J;=4c-FTp3C}vfJGZ4vr0;_# zcuhHyS2YVlXzZQKanXfJ9 zVlwAG*monR%FBf{jXnW@T zrL6CqIJS1&6X_fW`ws5^)`2nqdi!o}-h_RHYs1Rgw!wJTG$Cys{4J(UHQ!Bvb18Wh z><6O0S+^Y1JkJQ{?DwR3*d6zSyTu=U0qlS0HdxvZ+ZEW)eV#G*Ip*9)cGto&pUHsz z^J?%Ta^1B&kGOG+b~lcZ8HZyR*^OOb`8~sI1LTlbxV{HQ*B9)sFIcWG=OD13gAT;V zAbFv!9w=)ky)Iz?{UaE2Q%U9~@DXIzzp`Enu)m)LKjN;JvR+5~@l!I!G1f>~GV73Y8F>;P>m%b2`!ejf)`|3e&*&FmxxO3|JgeP* zcLuxf*I<8r!CO!snMW*_*vH8osrFN{TqBLItmRSGyue*Dwy1xf%`{!J^Hh4&@TCEUY4_^V9!n{XI)i&nBR|Lem{!&Xyo%~ zZ&3`U#O_6*)q$y3ti)s8z3w14nc*Ulq;tFpFv@b{xQV4wE! zD6M0r1^Y69V}BPjguiTcY=Cb&Ro%1;S{oL)C{m3!r zWw6Z4oa@0lFQYv>W}oux?YcgMeUjJOruAz=*q@L#plOvg?GIdAg3k{le$ur)*q@B; z(q^P=p`EPcID_YS{N1g}J^0-emhC$mu={o0$|O9K@r>upV9aZ}W>cP$_5=27Ht-MK z^);RNZ>fFw6%|FiLh=esqbHiTn|GRX%{p_1S)YCx16$5?^2GE}?7O|snMc#dWPdz85XToF^>XoG3g$-Jf#w$TIrw$LG6Ku;^a>l{ z!1P2|2gPd{{7y9M;MZ=`M)q_aeejcckEfr*c065%&!eU%9T(eUlG}+=9_E64#b48n zrwb$kOHb}VS?IIK+>$<;vYfZDgrL0nn8~4BIdeU>%d!0=w&N&OFZSBadeeq7B-96XFt z%riTih3F_(nopRU&E4q(4UXQN-W?rbstHNAKT=*}ZbaJk=8NV_=F8@R^!s%^mzp}h zW-GkA&G~2%UozdvFjDTHo@X-24yKUaZVCyW2&6Ze{$$cDOs_Nxlf@|Y1L@;tI9Y

Fgv7gO1q^L!$`&Roiz3gFwAtDPuR1W#I`&A1T4c^ z6F8bd%5L%QcJ)CIo5H13{|TwNo25kE$cb^TOdn6#wzUPIB&hehP{QTrD06~&dwK@0 z_)+G#^zHB-N19Gt>l4y*;c=AhA?K$T<2oIMRK@g@CW{_4fd67Tf-gTk;|weI%&y4C z9!*D5{HJr53cqb`mnz>~;C&f-ToFD)cp#|d!!>1nyW`D{ z@|aJ@>nW|QDh2Gg9*l@z>(ret#C8DfaDIBU*)M$q>gsrW(7xMtG<%u7(_`i5!)C8^ zZ`eD{1!&b5wC!%LL`yJle9t>xVan}?_RecNtMj)QR}7~-gHaY!T$*fbGi~Lzv~6R% zX)i}QrG4!jwWGUuTIt{8^W_wEedvT7}$>;X=d$)VLsr^Uozij_4 z>Y)dJmt=R;#_KXCWzIm2d?@pGna|C-O*2<#)@L?kHfEm4%w(QLofWdB>{8U*s_b<3 ztT}Jb%BI9`%-|^QS@9May<0Bn6b$p@Y z{*Lc<{G{Vo9l!7F>>TZ!>fE>U@Xpnpr*@v(d3oo@JMZYcw{uhHkF0*#`CpyCt24tiVeJ)OVJU7Y)1?vuH@XVKSl)K=)JI8GzZ z{W|xDuI{d4?eVUOTANzB_J;QDI=pLj*Qs6Sc3s}}ajQGJ?&!MPrRw^6*VeA5x_;65 z+pgbqC*8&FiSE6-SMX@}k=<|VJ{{Zlb$_t?lihcVzTUmH`>F0)E!hww>Az zZaWEMXKT8;D*XnG!m*yfh#bjaXs-~4@(N+-t`HtiHxU0&n^T8z>NK%(SZP!WuemnW zTMflEj#H0`)r*x#GxcF5t4cAerC80VK8AHH^?9pD%p=KYvM*(R7^xqtf>``TT(P(+ zi8X-LPpm<#-(wA7Z4_%5Yp_@&xCe+eYAQ8`{}K`l_aPOUhm~Qh9k8NmrukTxR%=HS zw3BJBow2sw7Ja~c04t5439QWjoLYdpkA;!mX5MB_hE9P_g(j;sg?p7+eZe@r+c=$t zbTeZ;6P zGpa?nM{A~COmi*9D-J=s8frJu?zlU_{fXBeMzyDjwHH>r&9oG&%4XWzsP-}Y;J&+7 z%Wzj6YhSakd1a*iOmi*AolHIbt)WgcubM?~$6ZdWcbH0@Zkp>H(_B~JKEUZZbDddR zrFDk7+Us%?bTjUGuBy`hxNnVhfN3l~W>b*vF1im}?OX@Y|FRRxY)dt-4ZNL+$xoJJ_5}ocbK_4_9G#_uGj~ePr zc!s39)dYPRPh~zWy3J7cLSKpWpXNW!?UC-|)1yc~#!73m=vPMdC*$;0qdL<3W%V`V z^g8qZS4ZKwO{~|OzpUP1{<1pSw5C;fVxsyh)0*Ci=TXO)W1%-ft7~*To~bt0ad=i; zsq;*w{+Cf*Vw~@&&|*AG>|$G`ijK>MTwvZu zCH+q3pG5!Hh>}CR{wfife{HVhRVrW13-RQb`a1Mm=)XjAIB84T@Ko>A=TA@j#bRi|g3uhM@QucR;OGe2`mUQd~qys9H5 z?kaP`EV>cTvLhu`|3b|Al)N&Q`Brl!lcLuqO=Vu5MO8&fUZ<)uhuy8Fxt=jla$u18 zN6~YpS|KJVIZ9Pwqw!YnE#&9xLy+MDSWNu^FqDpY+QmHWwZ z^S$Ou21UCjs$o2}Y9jNCI{JOc6VJPvYjvV3I8;hX z=KYaAiElNl|NXUTs-&a2LbzoAS%gQ_&|yI#Eh*W>snYKDl7mD`5|OjkZj&RZTD!9( zZ=l>>^)@*{Rc(*=ll_wY%)d7goRiL=IIZJkCns-NoLD(a)%Ho#Tz4Dla~1l&3Hr8a zu1)xMx|tp|&GndZ`fo!$UZp4Sty`?8O{M-|nkvc8qVXiwZb`NFNt(+1%`D>O_|7c) zfvKy?htYNR29oA_P100VEk$?VVw$UNA~hy^&Z0w;=6Yk&R5e*o 0); diff --git a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java index fa55b9df5af3..bf4948d97271 100644 --- a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java +++ b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,7 +54,7 @@ public final class VersionInfo * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "78b"; + public static final String ICU_DATA_VERSION_PATH = "79b"; // public methods ------------------------------------------------------ @@ -84,10 +84,10 @@ public static VersionInfo getInstance(String version) count ++; } else { - c -= '0'; - if (c < 0 || c > 9) { + if (c < '0' || c > '9') { throw new IllegalArgumentException(INVALID_VERSION_NUMBER_); } + c -= '0'; array[count] *= 10; array[count] += c; } diff --git a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java index 9457dc912b27..b8dfee6323fc 100644 --- a/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java +++ b/src/java.base/share/classes/jdk/internal/util/regex/Grapheme.java @@ -35,9 +35,9 @@ public final class Grapheme { *

* See Unicode Standard Annex #29 Unicode Text Segmentation for the specification * for the extended grapheme cluster boundary rules. The following implementation - * is based on the annex for Unicode version 17.0. + * is based on the annex for Unicode version 18.0. * - * @spec http://www.unicode.org/reports/tr29/tr29-47.html + * @spec http://www.unicode.org/reports/tr29/tr29-49.html * @param src the {@code CharSequence} to be scanned * @param off offset to start looking for the next boundary in the src * @param limit limit offset in the src (exclusive) @@ -57,10 +57,13 @@ public static int nextBoundary(CharSequence src, int off, int limit) { int t1 = getType(ch1); // GB9c - if (IndicConjunctBreak.isConsonant(ch0)) { + if (IndicConjunctBreak.isLinker(ch0)) { var advance = checkIndicConjunctBreak(src, ret, limit); if (advance >= 0) { ret += advance; + ch0 = Character.codePointBefore(src, ret); + t0 = getType(ch0); + gb11 = false; continue; } } @@ -301,34 +304,24 @@ static int getType(int cp) { } /** - * Checks for a possible GB9c Indic Conjunct Break sequence. If it is - * repetitive, e.g., Consonant1/Linker1/Consonant2/Linker2/Consonant3, only - * the first part of the sequence (Consonant1/Linker1/Consonant2) is - * recognized. The rest is analyzed in the next iteration of the grapheme - * cluster boundary search. + * Checks for a possible GB9c sequence: Linker Extend* x Consonant. + * The Linker has already been consumed by the caller. * * @param src the source char sequence - * @param index the index that points to the starting Linking Consonant + * @param index the index immediately after the Linker * @param limit limit to the char sequence * @return the advance in index if the indic conjunct break sequence * is found, it will be negative if the sequence is not found */ private static int checkIndicConjunctBreak(CharSequence src, int index, int limit) { - boolean linkerFound = false; int advance = 0; while (index + advance < limit) { int ch1 = Character.codePointAt(src, index + advance); advance += Character.charCount(ch1); - if (IndicConjunctBreak.isLinker(ch1)) { - linkerFound = true; - } else if (IndicConjunctBreak.isConsonant(ch1)) { - if (linkerFound) { - return advance; - } else { - break; - } + if (IndicConjunctBreak.isConsonant(ch1)) { + return advance; } else if (!IndicConjunctBreak.isExtend(ch1)) { break; } diff --git a/src/java.base/share/data/unicodedata/Blocks.txt b/src/java.base/share/data/unicodedata/Blocks.txt index 5c24ab60cb17..6c8edd514aaa 100644 --- a/src/java.base/share/data/unicodedata/Blocks.txt +++ b/src/java.base/share/data/unicodedata/Blocks.txt @@ -1,6 +1,6 @@ -# Blocks-17.0.0.txt -# Date: 2025-08-01 -# © 2025 Unicode®, Inc. +# Blocks-18.0.0.txt +# Date: 2026-07-08 +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -287,6 +287,7 @@ FFF0..FFFF; Specials 11D00..11D5F; Masaram Gondi 11D60..11DAF; Gunjala Gondi 11DB0..11DEF; Tolong Siki +11DF0..11DFF; Bengali Supplement 11EE0..11EFF; Makasar 11F00..11F5F; Kawi 11FB0..11FBF; Lisu Supplement @@ -294,6 +295,7 @@ FFF0..FFFF; Specials 12000..123FF; Cuneiform 12400..1247F; Cuneiform Numbers and Punctuation 12480..1254F; Early Dynastic Cuneiform +12550..1268F; Archaic Cuneiform Numerals 12F90..12FFF; Cypro-Minoan 13000..1342F; Egyptian Hieroglyphs 13430..1345F; Egyptian Hieroglyph Format Controls @@ -315,6 +317,8 @@ FFF0..FFFF; Specials 18B00..18CFF; Khitan Small Script 18D00..18D7F; Tangut Supplement 18D80..18DFF; Tangut Components Supplement +18E00..1919F; Jurchen +191A0..191DF; Jurchen Radicals 1AFF0..1AFFF; Kana Extended-B 1B000..1B0FF; Kana Supplement 1B100..1B12F; Kana Extended-A @@ -328,12 +332,14 @@ FFF0..FFFF; Specials 1D000..1D0FF; Byzantine Musical Symbols 1D100..1D1FF; Musical Symbols 1D200..1D24F; Ancient Greek Musical Notation +1D250..1D28F; Musical Symbols Supplement 1D2C0..1D2DF; Kaktovik Numerals 1D2E0..1D2FF; Mayan Numerals 1D300..1D35F; Tai Xuan Jing Symbols 1D360..1D37F; Counting Rod Numerals 1D400..1D7FF; Mathematical Alphanumeric Symbols 1D800..1DAAF; Sutton SignWriting +1DB00..1DBFF; Miscellaneous Symbols and Arrows Extended 1DF00..1DFFF; Latin Extended-G 1E000..1E02F; Glagolitic Supplement 1E030..1E08F; Cyrillic Extended-D @@ -375,6 +381,7 @@ FFF0..FFFF; Specials 30000..3134F; CJK Unified Ideographs Extension G 31350..323AF; CJK Unified Ideographs Extension H 323B0..3347F; CJK Unified Ideographs Extension J +3D000..3FC3F; Seal E0000..E007F; Tags E0100..E01EF; Variation Selectors Supplement F0000..FFFFF; Supplementary Private Use Area-A diff --git a/src/java.base/share/data/unicodedata/CaseFolding.txt b/src/java.base/share/data/unicodedata/CaseFolding.txt index a0b0f07fd645..9ee0a2dd654f 100644 --- a/src/java.base/share/data/unicodedata/CaseFolding.txt +++ b/src/java.base/share/data/unicodedata/CaseFolding.txt @@ -1,6 +1,6 @@ -# CaseFolding-17.0.0.txt -# Date: 2025-07-30, 23:54:36 GMT -# © 2025 Unicode®, Inc. +# CaseFolding-18.0.0.txt +# Date: 2026-02-03, 23:09:45 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -1251,7 +1251,11 @@ A7D6; C; A7D7; # LATIN CAPITAL LETTER MIDDLE SCOTS S A7D8; C; A7D9; # LATIN CAPITAL LETTER SIGMOID S A7DA; C; A7DB; # LATIN CAPITAL LETTER LAMBDA A7DC; C; 019B; # LATIN CAPITAL LETTER LAMBDA WITH STROKE +A7DD; C; 0277; # LATIN CAPITAL LETTER CLOSED OMEGA +A7E2; C; 027C; # LATIN CAPITAL LETTER R WITH LONG LEG A7F5; C; A7F6; # LATIN CAPITAL LETTER REVERSED HALF H +AB6C; C; AB4B; # LATIN CAPITAL LETTER SCRIPT R +AB6D; C; AB4C; # LATIN CAPITAL LETTER SCRIPT R WITH RING AB70; C; 13A0; # CHEROKEE SMALL LETTER A AB71; C; 13A1; # CHEROKEE SMALL LETTER E AB72; C; 13A2; # CHEROKEE SMALL LETTER I @@ -1644,6 +1648,24 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z 16EB6; C; 16ED1; # BERIA ERFE CAPITAL LETTER UI 16EB7; C; 16ED2; # BERIA ERFE CAPITAL LETTER WASSE 16EB8; C; 16ED3; # BERIA ERFE CAPITAL LETTER AY +1DF40; C; 1DF41; # LATIN CAPITAL LETTER BARRED A +1DF48; C; 1DF49; # LATIN CAPITAL LETTER BARRED K +1DF4A; C; 1DF4B; # LATIN CAPITAL LETTER BARRED M +1DF4D; C; 1DF4E; # LATIN CAPITAL LETTER BARRED N +1DF51; C; 1DF52; # LATIN CAPITAL LETTER BARRED V +1DF68; C; 1DF69; # LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH +1DF6A; C; 1DF6B; # LATIN CAPITAL LETTER PHONOTYPIC ROUNDTOP A +1DF6C; C; 1DF6D; # LATIN CAPITAL LETTER REVERSED SCRUPLE +1DF6E; C; 1DF6F; # LATIN CAPITAL LETTER PHONOTYPIC DIPHTHONG AI +1DF72; C; 1DF73; # LATIN CAPITAL LETTER O WITH CURL +1DF74; C; 1DF75; # LATIN CAPITAL LETTER CLOSED OMEGA WITH LONG STEM +1DF76; C; 1DF77; # LATIN CAPITAL LETTER TURNED CLOSED OMEGA +1DF78; C; 1DF79; # LATIN CAPITAL LETTER PHONOTYPIC TH +1DF7A; C; 1DF7B; # LATIN CAPITAL LETTER U WITH HOOK TAIL +1DF7C; C; 1DF7D; # LATIN CAPITAL LETTER U WITH NOTCH AT BOTTOM +1DF7E; C; 1DF7F; # LATIN CAPITAL LETTER REVERSED U +1DF95; F; 0073 0073; # LATIN SMALL LIGATURE LONG S WITH DESCENDER S +1DF95; S; 00DF; # LATIN SMALL LIGATURE LONG S WITH DESCENDER S 1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF 1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI 1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM diff --git a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt index f327784bf395..a41de001b7e2 100644 --- a/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt +++ b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt @@ -1,6 +1,6 @@ -# DerivedCoreProperties-17.0.0.txt -# Date: 2025-07-30, 23:55:08 GMT -# © 2025 Unicode®, Inc. +# DerivedCoreProperties-18.0.0.txt +# Date: 2026-08-07, 16:19:42 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -178,7 +178,8 @@ FF5E ; Math # Sm FULLWIDTH TILDE FFE2 ; Math # Sm FULLWIDTH NOT SIGN FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW 10D8E..10D8F ; Math # Sm [2] GARAY PLUS SIGN..GARAY MINUS SIGN -1CEF0 ; Math # Sm MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR +1CEDD..1CEDF ; Math # Sm [3] SQUARE ROOT OF SQUARE ROOT..SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT +1CEF0..1CEFD ; Math # Sm [14] MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR..HYPERBOLA 1D400..1D454 ; Math # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G 1D456..1D49C ; Math # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A 1D49E..1D49F ; Math # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D @@ -197,7 +198,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1D540..1D544 ; Math # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; Math # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; Math # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; Math # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; Math # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; Math # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C1 ; Math # Sm MATHEMATICAL BOLD NABLA 1D6C2..1D6DA ; Math # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA @@ -220,6 +221,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1D7C3 ; Math # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL 1D7C4..1D7CB ; Math # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1D7CE..1D7FF ; Math # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE +1DB00..1DB1C ; Math # Sm [29] LEIBNIZIAN EQUALS SIGN..FACIT SYMBOL 1EE00..1EE03 ; Math # Lo [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL 1EE05..1EE1F ; Math # Lo [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF 1EE21..1EE22 ; Math # Lo [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM @@ -254,9 +256,11 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1EEA5..1EEA9 ; Math # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; Math # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1EEF0..1EEF1 ; Math # Sm [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL +1F7DB ; Math # So BULLET IN DOUBLE CIRCLE +1F7F1..1F7FF ; Math # So [15] CIRCLE WITH DOUBLE VERTICAL AND HORIZONTAL LINE..RHOMBUS 1F8D0..1F8D8 ; Math # Sm [9] LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW..LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE -# Total code points: 2322 +# Total code points: 2384 # ================================================ @@ -298,13 +302,14 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 03F7..0481 ; Alphabetic # L& [139] GREEK CAPITAL LETTER SHO..CYRILLIC SMALL LETTER KOPPA 048A..052F ; Alphabetic # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; Alphabetic # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; Alphabetic # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; Alphabetic # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 0560..0588 ; Alphabetic # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; Alphabetic # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 05B0..05BD ; Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG 05BF ; Alphabetic # Mn HEBREW POINT RAFE 05C1..05C2 ; Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT 05C4..05C5 ; Alphabetic # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT -05C7 ; Alphabetic # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; Alphabetic # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 05D0..05EA ; Alphabetic # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; Alphabetic # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 0610..061A ; Alphabetic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA @@ -750,7 +755,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1FF6..1FFC ; Alphabetic # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI 2071 ; Alphabetic # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; Alphabetic # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; Alphabetic # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; Alphabetic # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 2102 ; Alphabetic # L& DOUBLE-STRUCK CAPITAL C 2107 ; Alphabetic # L& EULER CONSTANT 210A..2113 ; Alphabetic # L& [10] SCRIPT SMALL G..SCRIPT SMALL L @@ -835,7 +840,8 @@ A771..A787 ; Alphabetic # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER A788 ; Alphabetic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; Alphabetic # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; Alphabetic # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; Alphabetic # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; Alphabetic # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Alphabetic # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; Alphabetic # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Alphabetic # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; Alphabetic # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -925,6 +931,7 @@ AB30..AB5A ; Alphabetic # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SMA AB5C..AB5F ; Alphabetic # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; Alphabetic # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; Alphabetic # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; Alphabetic # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; Alphabetic # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA ABC0..ABE2 ; Alphabetic # Lo [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM ABE3..ABE4 ; Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP @@ -1006,7 +1013,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 10760..10767 ; Alphabetic # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 10780..10785 ; Alphabetic # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Alphabetic # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; Alphabetic # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; Alphabetic # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10800..10805 ; Alphabetic # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; Alphabetic # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; Alphabetic # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -1055,6 +1062,11 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 10EC2..10EC4 ; Alphabetic # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; Alphabetic # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; Alphabetic # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW +10ECB..10ECD ; Alphabetic # Mn [3] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC SOUTHWEST POINTING ARROWHEAD BELOW +10ED9..10EEE ; Alphabetic # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH +10EF3 ; Alphabetic # Mn ARABIC SMALL HIGH NOON WITH FATHA +10EF5 ; Alphabetic # Mn ARABIC SMALL HIGH NOON WITH DAMMA +10EF7..10EF8 ; Alphabetic # Mn [2] ARABIC SMALL HIGH HEH INITIAL FORM..ARABIC SMALL HIGH WORD KABBIR 10EFA..10EFC ; Alphabetic # Mn [3] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC COMBINING ALEF OVERLAY 10F00..10F1C ; Alphabetic # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; Alphabetic # Lo OLD SOGDIAN LIGATURE AYIN-DALETH @@ -1241,6 +1253,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11A97 ; Alphabetic # Mc SOYOMBO SIGN VISARGA 11A9D ; Alphabetic # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; Alphabetic # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11B0A ; Alphabetic # Lo DEVANAGARI LETTER ALTERNATE DDDA 11B60 ; Alphabetic # Mn SHARADA VOWEL SIGN OE 11B61 ; Alphabetic # Mc SHARADA VOWEL SIGN OOE 11B62..11B64 ; Alphabetic # Mn [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E @@ -1285,6 +1298,8 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11DB0..11DD8 ; Alphabetic # Lo [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH 11DD9 ; Alphabetic # Lm TOLONG SIKI SIGN SELA 11DDA..11DDB ; Alphabetic # Lo [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA +11DF0 ; Alphabetic # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE +11DF1 ; Alphabetic # Lo BENGALI LETTER ALTERNATE BARGIYA BA 11EE0..11EF2 ; Alphabetic # Lo [19] MAKASAR LETTER KA..MAKASAR ANGKA 11EF3..11EF4 ; Alphabetic # Mn [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U 11EF5..11EF6 ; Alphabetic # Mc [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O @@ -1299,8 +1314,10 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11F40 ; Alphabetic # Mn KAWI VOWEL SIGN EU 11FB0 ; Alphabetic # Lo LISU LETTER YHA 12000..12399 ; Alphabetic # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; Alphabetic # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; Alphabetic # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU +12475..1247F ; Alphabetic # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; Alphabetic # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..12686 ; Alphabetic # Nl [311] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN ONE N36 FLAT 12F90..12FF0 ; Alphabetic # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; Alphabetic # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13441..13446 ; Alphabetic # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN @@ -1335,17 +1352,19 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 16FF0..16FF1 ; Alphabetic # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY 16FF2..16FF3 ; Alphabetic # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; Alphabetic # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS -17000..18CD5 ; Alphabetic # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18CFF..18D1E ; Alphabetic # Lo [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E +17000..18CDA ; Alphabetic # Lo [7387] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CDA +18CFF..18D20 ; Alphabetic # Lo [34] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; Alphabetic # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 +18E00..19191 ; Alphabetic # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; Alphabetic # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 1AFF0..1AFF3 ; Alphabetic # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; Alphabetic # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 1AFFD..1AFFE ; Alphabetic # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 -1B000..1B122 ; Alphabetic # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU +1B000..1B128 ; Alphabetic # Lo [297] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ALTERNATE WI 1B132 ; Alphabetic # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; Alphabetic # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B155 ; Alphabetic # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; Alphabetic # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; Alphabetic # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE 1B170..1B2FB ; Alphabetic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 1BC00..1BC6A ; Alphabetic # Lo [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M 1BC70..1BC7C ; Alphabetic # Lo [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK @@ -1370,7 +1389,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1D540..1D544 ; Alphabetic # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; Alphabetic # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; Alphabetic # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; Alphabetic # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; Alphabetic # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; Alphabetic # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; Alphabetic # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; Alphabetic # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -1384,8 +1403,10 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1D7C4..1D7CB ; Alphabetic # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1DF00..1DF09 ; Alphabetic # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; Alphabetic # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; Alphabetic # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; Alphabetic # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; Alphabetic # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; Alphabetic # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; Alphabetic # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; Alphabetic # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E000..1E006 ; Alphabetic # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; Alphabetic # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; Alphabetic # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -1458,15 +1479,16 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1F150..1F169 ; Alphabetic # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Alphabetic # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z 20000..2A6DF ; Alphabetic # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; Alphabetic # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; Alphabetic # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; Alphabetic # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; Alphabetic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; Alphabetic # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D 2F800..2FA1D ; Alphabetic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; Alphabetic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; Alphabetic # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 +3D000..3FC3F ; Alphabetic # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F -# Total code points: 147421 +# Total code points: 160254 # ================================================ @@ -1749,7 +1771,9 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 052B ; Lowercase # L& CYRILLIC SMALL LETTER DZZHE 052D ; Lowercase # L& CYRILLIC SMALL LETTER DCHE 052F ; Lowercase # L& CYRILLIC SMALL LETTER EL WITH DESCENDER +0558 ; Lowercase # Lm MODIFIER LETTER ARMENIAN SMALL EH 0560..0588 ; Lowercase # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; Lowercase # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 10D0..10FA ; Lowercase # L& [43] GEORGIAN LETTER AN..GEORGIAN LETTER AIN 10FC ; Lowercase # Lm MODIFIER LETTER GEORGIAN NAR 10FD..10FF ; Lowercase # L& [3] GEORGIAN LETTER AEN..GEORGIAN LETTER LABIAL SIGN @@ -1908,7 +1932,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1FF6..1FF7 ; Lowercase # L& [2] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI 2071 ; Lowercase # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; Lowercase # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; Lowercase # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +2090..209F ; Lowercase # Lm [16] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER Z 210A ; Lowercase # L& SCRIPT SMALL G 210E..210F ; Lowercase # L& [2] PLANCK CONSTANT..PLANCK CONSTANT OVER TWO PI 2113 ; Lowercase # L& SCRIPT SMALL L @@ -2126,7 +2150,7 @@ FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 10780 ; Lowercase # Lm MODIFIER LETTER SMALL CAPITAL AA 10783..10785 ; Lowercase # Lm [3] MODIFIER LETTER SMALL AE..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Lowercase # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; Lowercase # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; Lowercase # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10CC0..10CF2 ; Lowercase # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 10D70..10D85 ; Lowercase # L& [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA 118C0..118DF ; Lowercase # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO @@ -2148,7 +2172,7 @@ FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 1D5EE..1D607 ; Lowercase # L& [26] MATHEMATICAL SANS-SERIF BOLD SMALL A..MATHEMATICAL SANS-SERIF BOLD SMALL Z 1D622..1D63B ; Lowercase # L& [26] MATHEMATICAL SANS-SERIF ITALIC SMALL A..MATHEMATICAL SANS-SERIF ITALIC SMALL Z 1D656..1D66F ; Lowercase # L& [26] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z -1D68A..1D6A5 ; Lowercase # L& [28] MATHEMATICAL MONOSPACE SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D68A..1D6A6 ; Lowercase # L& [29] MATHEMATICAL MONOSPACE SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6C2..1D6DA ; Lowercase # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6E1 ; Lowercase # L& [6] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL BOLD PI SYMBOL 1D6FC..1D714 ; Lowercase # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA @@ -2161,12 +2185,29 @@ FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 1D7C4..1D7C9 ; Lowercase # L& [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL 1D7CB ; Lowercase # L& MATHEMATICAL BOLD SMALL DIGAMMA 1DF00..1DF09 ; Lowercase # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK -1DF0B..1DF1E ; Lowercase # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; Lowercase # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF3F ; Lowercase # L& [53] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER BARRED W +1DF41..1DF47 ; Lowercase # L& [7] LATIN SMALL LETTER BARRED A..LATIN SMALL LETTER BARRED H WITH HOOK +1DF49 ; Lowercase # L& LATIN SMALL LETTER BARRED K +1DF4B..1DF4C ; Lowercase # L& [2] LATIN SMALL LETTER BARRED M..LATIN SMALL LETTER BARRED M WITH HOOK +1DF4E..1DF50 ; Lowercase # L& [3] LATIN SMALL LETTER BARRED N..LATIN SMALL LETTER TURNED R WITH STROKE +1DF52..1DF67 ; Lowercase # L& [22] LATIN SMALL LETTER BARRED V..LATIN SMALL LETTER LEZH WITH CURL +1DF69 ; Lowercase # L& LATIN SMALL LETTER PHONOTYPIC A WITH SWASH +1DF6B ; Lowercase # L& LATIN SMALL LETTER PHONOTYPIC ROUNDTOP A +1DF6D ; Lowercase # L& LATIN SMALL LETTER REVERSED SCRUPLE +1DF6F..1DF71 ; Lowercase # L& [3] LATIN SMALL LETTER PHONOTYPIC DIPHTHONG AI..LATIN SMALL LETTER STRETCHED I +1DF73 ; Lowercase # L& LATIN SMALL LETTER O WITH CURL +1DF75 ; Lowercase # L& LATIN SMALL LETTER CLOSED OMEGA WITH LONG STEM +1DF77 ; Lowercase # L& LATIN SMALL LETTER TURNED CLOSED OMEGA +1DF79 ; Lowercase # L& LATIN SMALL LETTER PHONOTYPIC TH +1DF7B ; Lowercase # L& LATIN SMALL LETTER U WITH HOOK TAIL +1DF7D ; Lowercase # L& LATIN SMALL LETTER U WITH NOTCH AT BOTTOM +1DF7F ; Lowercase # L& LATIN SMALL LETTER REVERSED U +1DF90..1DF96 ; Lowercase # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; Lowercase # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E030..1E06D ; Lowercase # Lm [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1E922..1E943 ; Lowercase # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 2595 +# Total code points: 2740 # ================================================ @@ -2784,8 +2825,10 @@ A7D4 ; Uppercase # L& LATIN CAPITAL LETTER DOUBLE WYNN A7D6 ; Uppercase # L& LATIN CAPITAL LETTER MIDDLE SCOTS S A7D8 ; Uppercase # L& LATIN CAPITAL LETTER SIGMOID S A7DA ; Uppercase # L& LATIN CAPITAL LETTER LAMBDA -A7DC ; Uppercase # L& LATIN CAPITAL LETTER LAMBDA WITH STROKE +A7DC..A7DD ; Uppercase # L& [2] LATIN CAPITAL LETTER LAMBDA WITH STROKE..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Uppercase # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F5 ; Uppercase # L& LATIN CAPITAL LETTER REVERSED HALF H +AB6C..AB6D ; Uppercase # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z 10400..10427 ; Uppercase # L& [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW 104B0..104D3 ; Uppercase # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA @@ -2829,12 +2872,28 @@ FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH 1D756..1D76E ; Uppercase # L& [25] MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA 1D790..1D7A8 ; Uppercase # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA 1D7CA ; Uppercase # L& MATHEMATICAL BOLD CAPITAL DIGAMMA +1DF40 ; Uppercase # L& LATIN CAPITAL LETTER BARRED A +1DF48 ; Uppercase # L& LATIN CAPITAL LETTER BARRED K +1DF4A ; Uppercase # L& LATIN CAPITAL LETTER BARRED M +1DF4D ; Uppercase # L& LATIN CAPITAL LETTER BARRED N +1DF51 ; Uppercase # L& LATIN CAPITAL LETTER BARRED V +1DF68 ; Uppercase # L& LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH +1DF6A ; Uppercase # L& LATIN CAPITAL LETTER PHONOTYPIC ROUNDTOP A +1DF6C ; Uppercase # L& LATIN CAPITAL LETTER REVERSED SCRUPLE +1DF6E ; Uppercase # L& LATIN CAPITAL LETTER PHONOTYPIC DIPHTHONG AI +1DF72 ; Uppercase # L& LATIN CAPITAL LETTER O WITH CURL +1DF74 ; Uppercase # L& LATIN CAPITAL LETTER CLOSED OMEGA WITH LONG STEM +1DF76 ; Uppercase # L& LATIN CAPITAL LETTER TURNED CLOSED OMEGA +1DF78 ; Uppercase # L& LATIN CAPITAL LETTER PHONOTYPIC TH +1DF7A ; Uppercase # L& LATIN CAPITAL LETTER U WITH HOOK TAIL +1DF7C ; Uppercase # L& LATIN CAPITAL LETTER U WITH NOTCH AT BOTTOM +1DF7E ; Uppercase # L& LATIN CAPITAL LETTER REVERSED U 1E900..1E921 ; Uppercase # L& [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA 1F130..1F149 ; Uppercase # So [26] SQUARED LATIN CAPITAL LETTER A..SQUARED LATIN CAPITAL LETTER Z 1F150..1F169 ; Uppercase # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Uppercase # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 2006 +# Total code points: 2026 # ================================================ @@ -2870,7 +2929,9 @@ FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH 03F7..0481 ; Cased # L& [139] GREEK CAPITAL LETTER SHO..CYRILLIC SMALL LETTER KOPPA 048A..052F ; Cased # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; Cased # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH +0558 ; Cased # Lm MODIFIER LETTER ARMENIAN SMALL EH 0560..0588 ; Cased # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; Cased # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 10A0..10C5 ; Cased # L& [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE 10C7 ; Cased # L& GEORGIAN CAPITAL LETTER YN 10CD ; Cased # L& GEORGIAN CAPITAL LETTER AEN @@ -2909,7 +2970,7 @@ FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH 1FF6..1FFC ; Cased # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI 2071 ; Cased # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; Cased # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; Cased # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +2090..209F ; Cased # Lm [16] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER Z 2102 ; Cased # L& DOUBLE-STRUCK CAPITAL C 2107 ; Cased # L& EULER CONSTANT 210A..2113 ; Cased # L& [10] SCRIPT SMALL G..SCRIPT SMALL L @@ -2942,7 +3003,8 @@ A722..A76F ; Cased # L& [78] LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF..LATIN A770 ; Cased # Lm MODIFIER LETTER US A771..A787 ; Cased # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T A78B..A78E ; Cased # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT -A790..A7DC ; Cased # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; Cased # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Cased # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; Cased # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Cased # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F8..A7F9 ; Cased # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -2951,6 +3013,7 @@ AB30..AB5A ; Cased # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL LE AB5C..AB5F ; Cased # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; Cased # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; Cased # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; Cased # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; Cased # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Cased # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST FB13..FB17 ; Cased # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH @@ -2970,7 +3033,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 10780 ; Cased # Lm MODIFIER LETTER SMALL CAPITAL AA 10783..10785 ; Cased # Lm [3] MODIFIER LETTER SMALL AE..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Cased # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; Cased # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; Cased # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10C80..10CB2 ; Cased # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 10CC0..10CF2 ; Cased # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 10D50..10D65 ; Cased # L& [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA @@ -2997,7 +3060,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1D540..1D544 ; Cased # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; Cased # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; Cased # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; Cased # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; Cased # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; Cased # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; Cased # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; Cased # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -3010,15 +3073,16 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1D7AA..1D7C2 ; Cased # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7CB ; Cased # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1DF00..1DF09 ; Cased # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK -1DF0B..1DF1E ; Cased # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; Cased # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; Cased # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF90..1DF96 ; Cased # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; Cased # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E030..1E06D ; Cased # Lm [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1E900..1E943 ; Cased # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1F130..1F149 ; Cased # So [26] SQUARED LATIN CAPITAL LETTER A..SQUARED LATIN CAPITAL LETTER Z 1F150..1F169 ; Cased # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Cased # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 4632 +# Total code points: 4797 # ================================================ @@ -3057,13 +3121,14 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 0387 ; Case_Ignorable # Po GREEK ANO TELEIA 0483..0487 ; Case_Ignorable # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE 0488..0489 ; Case_Ignorable # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN -0559 ; Case_Ignorable # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; Case_Ignorable # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 055F ; Case_Ignorable # Po ARMENIAN ABBREVIATION MARK +058B..058C ; Case_Ignorable # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 0591..05BD ; Case_Ignorable # Mn [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG 05BF ; Case_Ignorable # Mn HEBREW POINT RAFE 05C1..05C2 ; Case_Ignorable # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT 05C4..05C5 ; Case_Ignorable # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT -05C7 ; Case_Ignorable # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; Case_Ignorable # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 05F4 ; Case_Ignorable # Po HEBREW PUNCTUATION GERSHAYIM 0600..0605 ; Case_Ignorable # Cf [6] ARABIC NUMBER SIGN..ARABIC NUMBER MARK ABOVE 0610..061A ; Case_Ignorable # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA @@ -3133,7 +3198,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 0B3F ; Case_Ignorable # Mn ORIYA VOWEL SIGN I 0B41..0B44 ; Case_Ignorable # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR 0B4D ; Case_Ignorable # Mn ORIYA SIGN VIRAMA -0B55..0B56 ; Case_Ignorable # Mn [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK +0B53..0B56 ; Case_Ignorable # Mn [4] ORIYA SIGN DOT ABOVE..ORIYA AI LENGTH MARK 0B62..0B63 ; Case_Ignorable # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL 0B82 ; Case_Ignorable # Mn TAMIL SIGN ANUSVARA 0BC0 ; Case_Ignorable # Mn TAMIL VOWEL SIGN II @@ -3224,8 +3289,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1AA7 ; Case_Ignorable # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; Case_Ignorable # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Case_Ignorable # Me COMBINING PARENTHESES OVERLAY -1ABF..1ADD ; Case_Ignorable # Mn [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW -1AE0..1AEB ; Case_Ignorable # Mn [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE +1ABF..1AF0 ; Case_Ignorable # Mn [50] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOUBLE COMMA ABOVE 1B00..1B03 ; Case_Ignorable # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B34 ; Case_Ignorable # Mn BALINESE SIGN REREKAN 1B36..1B3A ; Case_Ignorable # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA @@ -3269,7 +3333,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 2066..206F ; Case_Ignorable # Cf [10] LEFT-TO-RIGHT ISOLATE..NOMINAL DIGIT SHAPES 2071 ; Case_Ignorable # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; Case_Ignorable # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; Case_Ignorable # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; Case_Ignorable # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 20D0..20DC ; Case_Ignorable # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE 20DD..20E0 ; Case_Ignorable # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH 20E1 ; Case_Ignorable # Mn COMBINING LEFT RIGHT ARROW ABOVE @@ -3369,7 +3433,7 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 10376..1037A ; Case_Ignorable # Mn [5] COMBINING OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII 10780..10785 ; Case_Ignorable # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Case_Ignorable # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; Case_Ignorable # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; Case_Ignorable # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10A01..10A03 ; Case_Ignorable # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R 10A05..10A06 ; Case_Ignorable # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O 10A0C..10A0F ; Case_Ignorable # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA @@ -3382,7 +3446,9 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 10D6F ; Case_Ignorable # Lm GARAY REDUPLICATION MARK 10EAB..10EAC ; Case_Ignorable # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK 10EC5 ; Case_Ignorable # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW -10EFA..10EFF ; Case_Ignorable # Mn [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA +10EC9..10ECA ; Case_Ignorable # Sk [2] ARABIC SMALL BASELINE FATHA..ARABIC SMALL BASELINE DOTLESS HEAD OF KHAH +10ECB..10ECF ; Case_Ignorable # Mn [5] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC LARGE CIRCLE ABOVE +10EF0..10EFF ; Case_Ignorable # Mn [16] ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Case_Ignorable # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Case_Ignorable # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11001 ; Case_Ignorable # Mn BRAHMI SIGN ANUSVARA @@ -3478,6 +3544,7 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 11D95 ; Case_Ignorable # Mn GUNJALA GONDI SIGN ANUSVARA 11D97 ; Case_Ignorable # Mn GUNJALA GONDI VIRAMA 11DD9 ; Case_Ignorable # Lm TOLONG SIKI SIGN SELA +11DF0 ; Case_Ignorable # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE 11EF3..11EF4 ; Case_Ignorable # Mn [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U 11F00..11F01 ; Case_Ignorable # Mn [2] KAWI SIGN CANDRABINDU..KAWI SIGN ANUSVARA 11F36..11F3A ; Case_Ignorable # Mn [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R @@ -3508,18 +3575,21 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 1BCA0..1BCA3 ; Case_Ignorable # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP 1CF00..1CF2D ; Case_Ignorable # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; Case_Ignorable # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG +1D127..1D128 ; Case_Ignorable # Mn [2] MUSICAL SYMBOL COMBINING STRESS..MUSICAL SYMBOL COMBINING UNSTRESS 1D167..1D169 ; Case_Ignorable # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D173..1D17A ; Case_Ignorable # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE 1D17B..1D182 ; Case_Ignorable # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE 1D185..1D18B ; Case_Ignorable # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; Case_Ignorable # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO 1D242..1D244 ; Case_Ignorable # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME +1D25B..1D25C ; Case_Ignorable # Mn [2] MUSICAL SYMBOL COMBINING TREMOLO-4..MUSICAL SYMBOL COMBINING TREMOLO-5 1DA00..1DA36 ; Case_Ignorable # Mn [55] SIGNWRITING HEAD RIM..SIGNWRITING AIR SUCKING IN 1DA3B..1DA6C ; Case_Ignorable # Mn [50] SIGNWRITING MOUTH CLOSED NEUTRAL..SIGNWRITING EXCITEMENT 1DA75 ; Case_Ignorable # Mn SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS 1DA84 ; Case_Ignorable # Mn SIGNWRITING LOCATION HEAD NECK 1DA9B..1DA9F ; Case_Ignorable # Mn [5] SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6 1DAA1..1DAAF ; Case_Ignorable # Mn [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16 +1DFCD..1DFFF ; Case_Ignorable # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E000..1E006 ; Case_Ignorable # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; Case_Ignorable # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; Case_Ignorable # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -3547,7 +3617,7 @@ E0001 ; Case_Ignorable # Cf LANGUAGE TAG E0020..E007F ; Case_Ignorable # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Case_Ignorable # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2794 +# Total code points: 2890 # ================================================ @@ -4160,8 +4230,10 @@ A7D4 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER DOUBLE W A7D6 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER MIDDLE SCOTS S A7D8 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER SIGMOID S A7DA ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER LAMBDA -A7DC ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER LAMBDA WITH STROKE +A7DC..A7DD ; Changes_When_Lowercased # L& [2] LATIN CAPITAL LETTER LAMBDA WITH STROKE..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F5 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER REVERSED HALF H +AB6C..AB6D ; Changes_When_Lowercased # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING FF21..FF3A ; Changes_When_Lowercased # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z 10400..10427 ; Changes_When_Lowercased # L& [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW 104B0..104D3 ; Changes_When_Lowercased # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA @@ -4174,9 +4246,25 @@ FF21..FF3A ; Changes_When_Lowercased # L& [26] FULLWIDTH LATIN CAPITAL LETTE 118A0..118BF ; Changes_When_Lowercased # L& [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO 16E40..16E5F ; Changes_When_Lowercased # L& [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y 16EA0..16EB8 ; Changes_When_Lowercased # L& [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY +1DF40 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER BARRED A +1DF48 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER BARRED K +1DF4A ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER BARRED M +1DF4D ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER BARRED N +1DF51 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER BARRED V +1DF68 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH +1DF6A ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER PHONOTYPIC ROUNDTOP A +1DF6C ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER REVERSED SCRUPLE +1DF6E ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER PHONOTYPIC DIPHTHONG AI +1DF72 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER O WITH CURL +1DF74 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER CLOSED OMEGA WITH LONG STEM +1DF76 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER TURNED CLOSED OMEGA +1DF78 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER PHONOTYPIC TH +1DF7A ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER U WITH HOOK TAIL +1DF7C ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER U WITH NOTCH AT BOTTOM +1DF7E ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER REVERSED U 1E900..1E921 ; Changes_When_Lowercased # L& [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA -# Total code points: 1488 +# Total code points: 1508 # ================================================ @@ -4339,7 +4427,8 @@ FF21..FF3A ; Changes_When_Lowercased # L& [26] FULLWIDTH LATIN CAPITAL LETTE 026F ; Changes_When_Uppercased # L& LATIN SMALL LETTER TURNED M 0271..0272 ; Changes_When_Uppercased # L& [2] LATIN SMALL LETTER M WITH HOOK..LATIN SMALL LETTER N WITH LEFT HOOK 0275 ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED O -027D ; Changes_When_Uppercased # L& LATIN SMALL LETTER R WITH TAIL +0277 ; Changes_When_Uppercased # L& LATIN SMALL LETTER CLOSED OMEGA +027C..027D ; Changes_When_Uppercased # L& [2] LATIN SMALL LETTER R WITH LONG LEG..LATIN SMALL LETTER R WITH TAIL 0280 ; Changes_When_Uppercased # L& LATIN LETTER SMALL CAPITAL R 0282..0283 ; Changes_When_Uppercased # L& [2] LATIN SMALL LETTER S WITH HOOK..LATIN SMALL LETTER ESH 0287..028C ; Changes_When_Uppercased # L& [6] LATIN SMALL LETTER TURNED T..LATIN SMALL LETTER TURNED V @@ -4803,6 +4892,7 @@ A7D7 ; Changes_When_Uppercased # L& LATIN SMALL LETTER MIDDLE SCO A7D9 ; Changes_When_Uppercased # L& LATIN SMALL LETTER SIGMOID S A7DB ; Changes_When_Uppercased # L& LATIN SMALL LETTER LAMBDA A7F6 ; Changes_When_Uppercased # L& LATIN SMALL LETTER REVERSED HALF H +AB4B..AB4C ; Changes_When_Uppercased # L& [2] LATIN SMALL LETTER SCRIPT R..LATIN SMALL LETTER SCRIPT R WITH RING AB53 ; Changes_When_Uppercased # L& LATIN SMALL LETTER CHI AB70..ABBF ; Changes_When_Uppercased # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Changes_When_Uppercased # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST @@ -4819,9 +4909,26 @@ FF41..FF5A ; Changes_When_Uppercased # L& [26] FULLWIDTH LATIN SMALL LETTER 118C0..118DF ; Changes_When_Uppercased # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E60..16E7F ; Changes_When_Uppercased # L& [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16EBB..16ED3 ; Changes_When_Uppercased # L& [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY +1DF41 ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED A +1DF49 ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED K +1DF4B ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED M +1DF4E ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED N +1DF52 ; Changes_When_Uppercased # L& LATIN SMALL LETTER BARRED V +1DF69 ; Changes_When_Uppercased # L& LATIN SMALL LETTER PHONOTYPIC A WITH SWASH +1DF6B ; Changes_When_Uppercased # L& LATIN SMALL LETTER PHONOTYPIC ROUNDTOP A +1DF6D ; Changes_When_Uppercased # L& LATIN SMALL LETTER REVERSED SCRUPLE +1DF6F ; Changes_When_Uppercased # L& LATIN SMALL LETTER PHONOTYPIC DIPHTHONG AI +1DF73 ; Changes_When_Uppercased # L& LATIN SMALL LETTER O WITH CURL +1DF75 ; Changes_When_Uppercased # L& LATIN SMALL LETTER CLOSED OMEGA WITH LONG STEM +1DF77 ; Changes_When_Uppercased # L& LATIN SMALL LETTER TURNED CLOSED OMEGA +1DF79 ; Changes_When_Uppercased # L& LATIN SMALL LETTER PHONOTYPIC TH +1DF7B ; Changes_When_Uppercased # L& LATIN SMALL LETTER U WITH HOOK TAIL +1DF7D ; Changes_When_Uppercased # L& LATIN SMALL LETTER U WITH NOTCH AT BOTTOM +1DF7F ; Changes_When_Uppercased # L& LATIN SMALL LETTER REVERSED U +1DF95 ; Changes_When_Uppercased # L& LATIN SMALL LIGATURE LONG S WITH DESCENDER S 1E922..1E943 ; Changes_When_Uppercased # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 1580 +# Total code points: 1601 # ================================================ @@ -4985,7 +5092,8 @@ FF41..FF5A ; Changes_When_Uppercased # L& [26] FULLWIDTH LATIN SMALL LETTER 026F ; Changes_When_Titlecased # L& LATIN SMALL LETTER TURNED M 0271..0272 ; Changes_When_Titlecased # L& [2] LATIN SMALL LETTER M WITH HOOK..LATIN SMALL LETTER N WITH LEFT HOOK 0275 ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED O -027D ; Changes_When_Titlecased # L& LATIN SMALL LETTER R WITH TAIL +0277 ; Changes_When_Titlecased # L& LATIN SMALL LETTER CLOSED OMEGA +027C..027D ; Changes_When_Titlecased # L& [2] LATIN SMALL LETTER R WITH LONG LEG..LATIN SMALL LETTER R WITH TAIL 0280 ; Changes_When_Titlecased # L& LATIN LETTER SMALL CAPITAL R 0282..0283 ; Changes_When_Titlecased # L& [2] LATIN SMALL LETTER S WITH HOOK..LATIN SMALL LETTER ESH 0287..028C ; Changes_When_Titlecased # L& [6] LATIN SMALL LETTER TURNED T..LATIN SMALL LETTER TURNED V @@ -5447,6 +5555,7 @@ A7D7 ; Changes_When_Titlecased # L& LATIN SMALL LETTER MIDDLE SCO A7D9 ; Changes_When_Titlecased # L& LATIN SMALL LETTER SIGMOID S A7DB ; Changes_When_Titlecased # L& LATIN SMALL LETTER LAMBDA A7F6 ; Changes_When_Titlecased # L& LATIN SMALL LETTER REVERSED HALF H +AB4B..AB4C ; Changes_When_Titlecased # L& [2] LATIN SMALL LETTER SCRIPT R..LATIN SMALL LETTER SCRIPT R WITH RING AB53 ; Changes_When_Titlecased # L& LATIN SMALL LETTER CHI AB70..ABBF ; Changes_When_Titlecased # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Changes_When_Titlecased # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST @@ -5463,9 +5572,26 @@ FF41..FF5A ; Changes_When_Titlecased # L& [26] FULLWIDTH LATIN SMALL LETTER 118C0..118DF ; Changes_When_Titlecased # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E60..16E7F ; Changes_When_Titlecased # L& [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16EBB..16ED3 ; Changes_When_Titlecased # L& [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY +1DF41 ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED A +1DF49 ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED K +1DF4B ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED M +1DF4E ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED N +1DF52 ; Changes_When_Titlecased # L& LATIN SMALL LETTER BARRED V +1DF69 ; Changes_When_Titlecased # L& LATIN SMALL LETTER PHONOTYPIC A WITH SWASH +1DF6B ; Changes_When_Titlecased # L& LATIN SMALL LETTER PHONOTYPIC ROUNDTOP A +1DF6D ; Changes_When_Titlecased # L& LATIN SMALL LETTER REVERSED SCRUPLE +1DF6F ; Changes_When_Titlecased # L& LATIN SMALL LETTER PHONOTYPIC DIPHTHONG AI +1DF73 ; Changes_When_Titlecased # L& LATIN SMALL LETTER O WITH CURL +1DF75 ; Changes_When_Titlecased # L& LATIN SMALL LETTER CLOSED OMEGA WITH LONG STEM +1DF77 ; Changes_When_Titlecased # L& LATIN SMALL LETTER TURNED CLOSED OMEGA +1DF79 ; Changes_When_Titlecased # L& LATIN SMALL LETTER PHONOTYPIC TH +1DF7B ; Changes_When_Titlecased # L& LATIN SMALL LETTER U WITH HOOK TAIL +1DF7D ; Changes_When_Titlecased # L& LATIN SMALL LETTER U WITH NOTCH AT BOTTOM +1DF7F ; Changes_When_Titlecased # L& LATIN SMALL LETTER REVERSED U +1DF95 ; Changes_When_Titlecased # L& LATIN SMALL LIGATURE LONG S WITH DESCENDER S 1E922..1E943 ; Changes_When_Titlecased # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 1507 +# Total code points: 1528 # ================================================ @@ -6087,8 +6213,10 @@ A7D4 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER DOUBLE W A7D6 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER MIDDLE SCOTS S A7D8 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER SIGMOID S A7DA ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER LAMBDA -A7DC ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER LAMBDA WITH STROKE +A7DC..A7DD ; Changes_When_Casefolded # L& [2] LATIN CAPITAL LETTER LAMBDA WITH STROKE..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F5 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER REVERSED HALF H +AB6C..AB6D ; Changes_When_Casefolded # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; Changes_When_Casefolded # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Changes_When_Casefolded # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST FB13..FB17 ; Changes_When_Casefolded # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH @@ -6104,9 +6232,26 @@ FF21..FF3A ; Changes_When_Casefolded # L& [26] FULLWIDTH LATIN CAPITAL LETTE 118A0..118BF ; Changes_When_Casefolded # L& [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO 16E40..16E5F ; Changes_When_Casefolded # L& [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y 16EA0..16EB8 ; Changes_When_Casefolded # L& [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY +1DF40 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER BARRED A +1DF48 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER BARRED K +1DF4A ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER BARRED M +1DF4D ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER BARRED N +1DF51 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER BARRED V +1DF68 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH +1DF6A ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER PHONOTYPIC ROUNDTOP A +1DF6C ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER REVERSED SCRUPLE +1DF6E ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER PHONOTYPIC DIPHTHONG AI +1DF72 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER O WITH CURL +1DF74 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER CLOSED OMEGA WITH LONG STEM +1DF76 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER TURNED CLOSED OMEGA +1DF78 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER PHONOTYPIC TH +1DF7A ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER U WITH HOOK TAIL +1DF7C ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER U WITH NOTCH AT BOTTOM +1DF7E ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER REVERSED U +1DF95 ; Changes_When_Casefolded # L& LATIN SMALL LIGATURE LONG S WITH DESCENDER S 1E900..1E921 ; Changes_When_Casefolded # L& [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA -# Total code points: 1561 +# Total code points: 1582 # ================================================ @@ -6139,7 +6284,8 @@ FF21..FF3A ; Changes_When_Casefolded # L& [26] FULLWIDTH LATIN CAPITAL LETTE 026F ; Changes_When_Casemapped # L& LATIN SMALL LETTER TURNED M 0271..0272 ; Changes_When_Casemapped # L& [2] LATIN SMALL LETTER M WITH HOOK..LATIN SMALL LETTER N WITH LEFT HOOK 0275 ; Changes_When_Casemapped # L& LATIN SMALL LETTER BARRED O -027D ; Changes_When_Casemapped # L& LATIN SMALL LETTER R WITH TAIL +0277 ; Changes_When_Casemapped # L& LATIN SMALL LETTER CLOSED OMEGA +027C..027D ; Changes_When_Casemapped # L& [2] LATIN SMALL LETTER R WITH LONG LEG..LATIN SMALL LETTER R WITH TAIL 0280 ; Changes_When_Casemapped # L& LATIN LETTER SMALL CAPITAL R 0282..0283 ; Changes_When_Casemapped # L& [2] LATIN SMALL LETTER S WITH HOOK..LATIN SMALL LETTER ESH 0287..028C ; Changes_When_Casemapped # L& [6] LATIN SMALL LETTER TURNED T..LATIN SMALL LETTER TURNED V @@ -6219,9 +6365,12 @@ A779..A787 ; Changes_When_Casemapped # L& [15] LATIN CAPITAL LETTER INSULAR A78B..A78D ; Changes_When_Casemapped # L& [3] LATIN CAPITAL LETTER SALTILLO..LATIN CAPITAL LETTER TURNED H A790..A794 ; Changes_When_Casemapped # L& [5] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER C WITH PALATAL HOOK A796..A7AE ; Changes_When_Casemapped # L& [25] LATIN CAPITAL LETTER B WITH FLOURISH..LATIN CAPITAL LETTER SMALL CAPITAL I -A7B0..A7DC ; Changes_When_Casemapped # L& [45] LATIN CAPITAL LETTER TURNED K..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A7B0..A7DD ; Changes_When_Casemapped # L& [46] LATIN CAPITAL LETTER TURNED K..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Changes_When_Casemapped # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F5..A7F6 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H +AB4B..AB4C ; Changes_When_Casemapped # L& [2] LATIN SMALL LETTER SCRIPT R..LATIN SMALL LETTER SCRIPT R WITH RING AB53 ; Changes_When_Casemapped # L& LATIN SMALL LETTER CHI +AB6C..AB6D ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; Changes_When_Casemapped # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Changes_When_Casemapped # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST FB13..FB17 ; Changes_When_Casemapped # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH @@ -6246,9 +6395,16 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 16E40..16E7F ; Changes_When_Casemapped # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16EA0..16EB8 ; Changes_When_Casemapped # L& [25] BERIA ERFE CAPITAL LETTER ARKAB..BERIA ERFE CAPITAL LETTER AY 16EBB..16ED3 ; Changes_When_Casemapped # L& [25] BERIA ERFE SMALL LETTER ARKAB..BERIA ERFE SMALL LETTER AY +1DF40..1DF41 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER BARRED A..LATIN SMALL LETTER BARRED A +1DF48..1DF4B ; Changes_When_Casemapped # L& [4] LATIN CAPITAL LETTER BARRED K..LATIN SMALL LETTER BARRED M +1DF4D..1DF4E ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER BARRED N..LATIN SMALL LETTER BARRED N +1DF51..1DF52 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER BARRED V..LATIN SMALL LETTER BARRED V +1DF68..1DF6F ; Changes_When_Casemapped # L& [8] LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH..LATIN SMALL LETTER PHONOTYPIC DIPHTHONG AI +1DF72..1DF7F ; Changes_When_Casemapped # L& [14] LATIN CAPITAL LETTER O WITH CURL..LATIN SMALL LETTER REVERSED U +1DF95 ; Changes_When_Casemapped # L& LATIN SMALL LIGATURE LONG S WITH DESCENDER S 1E900..1E943 ; Changes_When_Casemapped # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 3037 +# Total code points: 3078 # ================================================ @@ -6294,8 +6450,9 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 03F7..0481 ; ID_Start # L& [139] GREEK CAPITAL LETTER SHO..CYRILLIC SMALL LETTER KOPPA 048A..052F ; ID_Start # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; ID_Start # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; ID_Start # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; ID_Start # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 0560..0588 ; ID_Start # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; ID_Start # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 05D0..05EA ; ID_Start # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; ID_Start # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 0620..063F ; ID_Start # Lo [32] ARABIC LETTER KASHMIRI YEH..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE @@ -6541,7 +6698,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 1FF6..1FFC ; ID_Start # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI 2071 ; ID_Start # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; ID_Start # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; ID_Start # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; ID_Start # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 2102 ; ID_Start # L& DOUBLE-STRUCK CAPITAL C 2107 ; ID_Start # L& EULER CONSTANT 210A..2113 ; ID_Start # L& [10] SCRIPT SMALL G..SCRIPT SMALL L @@ -6624,7 +6781,8 @@ A771..A787 ; ID_Start # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER I A788 ; ID_Start # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; ID_Start # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ID_Start # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; ID_Start # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; ID_Start # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; ID_Start # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; ID_Start # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ID_Start # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ID_Start # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -6675,6 +6833,7 @@ AB30..AB5A ; ID_Start # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL AB5C..AB5F ; ID_Start # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; ID_Start # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; ID_Start # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; ID_Start # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; ID_Start # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA ABC0..ABE2 ; ID_Start # Lo [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM AC00..D7A3 ; ID_Start # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH @@ -6749,7 +6908,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 10760..10767 ; ID_Start # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 10780..10785 ; ID_Start # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; ID_Start # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; ID_Start # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; ID_Start # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10800..10805 ; ID_Start # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; ID_Start # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; ID_Start # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -6792,6 +6951,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 10EC2..10EC4 ; ID_Start # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; ID_Start # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; ID_Start # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW +10ED9..10EEE ; ID_Start # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH 10F00..10F1C ; ID_Start # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; ID_Start # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ID_Start # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -6871,6 +7031,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11A5C..11A89 ; ID_Start # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; ID_Start # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; ID_Start # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11B0A ; ID_Start # Lo DEVANAGARI LETTER ALTERNATE DDDA 11BC0..11BE0 ; ID_Start # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO 11C00..11C08 ; ID_Start # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; ID_Start # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA @@ -6887,14 +7048,17 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11DB0..11DD8 ; ID_Start # Lo [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH 11DD9 ; ID_Start # Lm TOLONG SIKI SIGN SELA 11DDA..11DDB ; ID_Start # Lo [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA +11DF1 ; ID_Start # Lo BENGALI LETTER ALTERNATE BARGIYA BA 11EE0..11EF2 ; ID_Start # Lo [19] MAKASAR LETTER KA..MAKASAR ANGKA 11F02 ; ID_Start # Lo KAWI SIGN REPHA 11F04..11F10 ; ID_Start # Lo [13] KAWI LETTER A..KAWI LETTER O 11F12..11F33 ; ID_Start # Lo [34] KAWI LETTER KA..KAWI LETTER JNYA 11FB0 ; ID_Start # Lo LISU LETTER YHA 12000..12399 ; ID_Start # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; ID_Start # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; ID_Start # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU +12475..1247F ; ID_Start # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; ID_Start # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..12686 ; ID_Start # Nl [311] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN ONE N36 FLAT 12F90..12FF0 ; ID_Start # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; ID_Start # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13441..13446 ; ID_Start # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN @@ -6922,17 +7086,19 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 16FE3 ; ID_Start # Lm OLD CHINESE ITERATION MARK 16FF2..16FF3 ; ID_Start # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; ID_Start # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS -17000..18CD5 ; ID_Start # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18CFF..18D1E ; ID_Start # Lo [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E +17000..18CDA ; ID_Start # Lo [7387] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CDA +18CFF..18D20 ; ID_Start # Lo [34] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; ID_Start # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 +18E00..19191 ; ID_Start # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; ID_Start # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 1AFF0..1AFF3 ; ID_Start # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; ID_Start # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 1AFFD..1AFFE ; ID_Start # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 -1B000..1B122 ; ID_Start # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU +1B000..1B128 ; ID_Start # Lo [297] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ALTERNATE WI 1B132 ; ID_Start # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; ID_Start # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B155 ; ID_Start # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; ID_Start # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; ID_Start # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE 1B170..1B2FB ; ID_Start # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 1BC00..1BC6A ; ID_Start # Lo [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M 1BC70..1BC7C ; ID_Start # Lo [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK @@ -6956,7 +7122,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1D540..1D544 ; ID_Start # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; ID_Start # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; ID_Start # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; ID_Start # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; ID_Start # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; ID_Start # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; ID_Start # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; ID_Start # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -6970,8 +7136,10 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1D7C4..1D7CB ; ID_Start # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1DF00..1DF09 ; ID_Start # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; ID_Start # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; ID_Start # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; ID_Start # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; ID_Start # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; ID_Start # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; ID_Start # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; ID_Start # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E030..1E06D ; ID_Start # Lm [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1E100..1E12C ; ID_Start # Lo [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W 1E137..1E13D ; ID_Start # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER @@ -7030,15 +7198,16 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1EEA5..1EEA9 ; ID_Start # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; ID_Start # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 20000..2A6DF ; ID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; ID_Start # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; ID_Start # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; ID_Start # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; ID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; ID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D 2F800..2FA1D ; ID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; ID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; ID_Start # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 +3D000..3FC3F ; ID_Start # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F -# Total code points: 145916 +# Total code points: 158739 # ================================================ @@ -7091,13 +7260,14 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0483..0487 ; ID_Continue # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE 048A..052F ; ID_Continue # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; ID_Continue # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; ID_Continue # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; ID_Continue # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 0560..0588 ; ID_Continue # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; ID_Continue # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 0591..05BD ; ID_Continue # Mn [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG 05BF ; ID_Continue # Mn HEBREW POINT RAFE 05C1..05C2 ; ID_Continue # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT 05C4..05C5 ; ID_Continue # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT -05C7 ; ID_Continue # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; ID_Continue # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 05D0..05EA ; ID_Continue # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; ID_Continue # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 0610..061A ; ID_Continue # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA @@ -7252,7 +7422,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0B47..0B48 ; ID_Continue # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI 0B4B..0B4C ; ID_Continue # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU 0B4D ; ID_Continue # Mn ORIYA SIGN VIRAMA -0B55..0B56 ; ID_Continue # Mn [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK +0B53..0B56 ; ID_Continue # Mn [4] ORIYA SIGN DOT ABOVE..ORIYA AI LENGTH MARK 0B57 ; ID_Continue # Mc ORIYA AU LENGTH MARK 0B5C..0B5D ; ID_Continue # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA 0B5F..0B61 ; ID_Continue # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL @@ -7533,8 +7703,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1A90..1A99 ; ID_Continue # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1AA7 ; ID_Continue # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; ID_Continue # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW -1ABF..1ADD ; ID_Continue # Mn [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW -1AE0..1AEB ; ID_Continue # Mn [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE +1ABF..1AF0 ; ID_Continue # Mn [50] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOUBLE COMMA ABOVE 1B00..1B03 ; ID_Continue # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B04 ; ID_Continue # Mc BALINESE SIGN BISAH 1B05..1B33 ; ID_Continue # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA @@ -7625,7 +7794,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 2054 ; ID_Continue # Pc INVERTED UNDERTIE 2071 ; ID_Continue # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; ID_Continue # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; ID_Continue # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; ID_Continue # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 20D0..20DC ; ID_Continue # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE 20E1 ; ID_Continue # Mn COMBINING LEFT RIGHT ARROW ABOVE 20E5..20F0 ; ID_Continue # Mn [12] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING ASTERISK ABOVE @@ -7723,7 +7892,8 @@ A771..A787 ; ID_Continue # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTE A788 ; ID_Continue # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; ID_Continue # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ID_Continue # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; ID_Continue # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; ID_Continue # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; ID_Continue # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; ID_Continue # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ID_Continue # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ID_Continue # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -7824,6 +7994,7 @@ AB30..AB5A ; ID_Continue # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SM AB5C..AB5F ; ID_Continue # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; ID_Continue # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; ID_Continue # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; ID_Continue # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; ID_Continue # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA ABC0..ABE2 ; ID_Continue # Lo [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM ABE3..ABE4 ; ID_Continue # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP @@ -7918,7 +8089,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 10760..10767 ; ID_Continue # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 10780..10785 ; ID_Continue # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; ID_Continue # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; ID_Continue # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; ID_Continue # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10800..10805 ; ID_Continue # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; ID_Continue # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; ID_Continue # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -7972,7 +8143,9 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 10EC2..10EC4 ; ID_Continue # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; ID_Continue # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; ID_Continue # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW -10EFA..10EFF ; ID_Continue # Mn [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA +10ECB..10ECF ; ID_Continue # Mn [5] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC LARGE CIRCLE ABOVE +10ED9..10EEE ; ID_Continue # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH +10EF0..10EFF ; ID_Continue # Mn [16] ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO..ARABIC SMALL LOW WORD MADDA 10F00..10F1C ; ID_Continue # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; ID_Continue # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ID_Continue # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -8199,6 +8372,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11A98..11A99 ; ID_Continue # Mn [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER 11A9D ; ID_Continue # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; ID_Continue # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11B0A ; ID_Continue # Lo DEVANAGARI LETTER ALTERNATE DDDA 11B60 ; ID_Continue # Mn SHARADA VOWEL SIGN OE 11B61 ; ID_Continue # Mc SHARADA VOWEL SIGN OOE 11B62..11B64 ; ID_Continue # Mn [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E @@ -8249,6 +8423,8 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11DD9 ; ID_Continue # Lm TOLONG SIKI SIGN SELA 11DDA..11DDB ; ID_Continue # Lo [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA 11DE0..11DE9 ; ID_Continue # Nd [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE +11DF0 ; ID_Continue # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE +11DF1 ; ID_Continue # Lo BENGALI LETTER ALTERNATE BARGIYA BA 11EE0..11EF2 ; ID_Continue # Lo [19] MAKASAR LETTER KA..MAKASAR ANGKA 11EF3..11EF4 ; ID_Continue # Mn [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U 11EF5..11EF6 ; ID_Continue # Mc [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O @@ -8267,8 +8443,10 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11F5A ; ID_Continue # Mn KAWI SIGN NUKTA 11FB0 ; ID_Continue # Lo LISU LETTER YHA 12000..12399 ; ID_Continue # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; ID_Continue # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; ID_Continue # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU +12475..1247F ; ID_Continue # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; ID_Continue # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..12686 ; ID_Continue # Nl [311] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN ONE N36 FLAT 12F90..12FF0 ; ID_Continue # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; ID_Continue # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13440 ; ID_Continue # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY @@ -8313,17 +8491,19 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 16FF0..16FF1 ; ID_Continue # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY 16FF2..16FF3 ; ID_Continue # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; ID_Continue # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS -17000..18CD5 ; ID_Continue # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18CFF..18D1E ; ID_Continue # Lo [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E +17000..18CDA ; ID_Continue # Lo [7387] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CDA +18CFF..18D20 ; ID_Continue # Lo [34] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; ID_Continue # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 +18E00..19191 ; ID_Continue # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; ID_Continue # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 1AFF0..1AFF3 ; ID_Continue # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; ID_Continue # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 1AFFD..1AFFE ; ID_Continue # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 -1B000..1B122 ; ID_Continue # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU +1B000..1B128 ; ID_Continue # Lo [297] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ALTERNATE WI 1B132 ; ID_Continue # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; ID_Continue # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B155 ; ID_Continue # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; ID_Continue # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; ID_Continue # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE 1B170..1B2FB ; ID_Continue # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 1BC00..1BC6A ; ID_Continue # Lo [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M 1BC70..1BC7C ; ID_Continue # Lo [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK @@ -8333,6 +8513,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1CCF0..1CCF9 ; ID_Continue # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE 1CF00..1CF2D ; ID_Continue # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; ID_Continue # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG +1D127..1D128 ; ID_Continue # Mn [2] MUSICAL SYMBOL COMBINING STRESS..MUSICAL SYMBOL COMBINING UNSTRESS 1D165..1D166 ; ID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; ID_Continue # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16D..1D172 ; ID_Continue # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 @@ -8340,6 +8521,10 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1D185..1D18B ; ID_Continue # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; ID_Continue # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO 1D242..1D244 ; ID_Continue # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME +1D250..1D252 ; ID_Continue # Mc [3] MUSICAL SYMBOL COMBINING FLAG-6..MUSICAL SYMBOL COMBINING FLAG-8 +1D25B..1D25C ; ID_Continue # Mn [2] MUSICAL SYMBOL COMBINING TREMOLO-4..MUSICAL SYMBOL COMBINING TREMOLO-5 +1D25F ; ID_Continue # Mc MUSICAL SYMBOL COMBINING BUZZ ROLL STEM +1D280..1D281 ; ID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM BOW BEHIND BRIDGE..MUSICAL SYMBOL COMBINING STEM BOW ON TOP OF BRIDGE 1D400..1D454 ; ID_Continue # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G 1D456..1D49C ; ID_Continue # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A 1D49E..1D49F ; ID_Continue # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D @@ -8358,7 +8543,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1D540..1D544 ; ID_Continue # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; ID_Continue # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; ID_Continue # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; ID_Continue # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; ID_Continue # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; ID_Continue # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; ID_Continue # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; ID_Continue # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -8379,8 +8564,10 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1DAA1..1DAAF ; ID_Continue # Mn [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16 1DF00..1DF09 ; ID_Continue # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; ID_Continue # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; ID_Continue # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; ID_Continue # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; ID_Continue # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; ID_Continue # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; ID_Continue # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; ID_Continue # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E000..1E006 ; ID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; ID_Continue # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; ID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -8462,16 +8649,17 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1EEAB..1EEBB ; ID_Continue # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1FBF0..1FBF9 ; ID_Continue # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE 20000..2A6DF ; ID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; ID_Continue # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; ID_Continue # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; ID_Continue # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; ID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; ID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D 2F800..2FA1D ; ID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; ID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; ID_Continue # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 +3D000..3FC3F ; ID_Continue # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 149240 +# Total code points: 162100 # ================================================ @@ -8514,8 +8702,9 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 03F7..0481 ; XID_Start # L& [139] GREEK CAPITAL LETTER SHO..CYRILLIC SMALL LETTER KOPPA 048A..052F ; XID_Start # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; XID_Start # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; XID_Start # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; XID_Start # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 0560..0588 ; XID_Start # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; XID_Start # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 05D0..05EA ; XID_Start # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; XID_Start # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 0620..063F ; XID_Start # Lo [32] ARABIC LETTER KASHMIRI YEH..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE @@ -8761,7 +8950,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 1FF6..1FFC ; XID_Start # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI 2071 ; XID_Start # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; XID_Start # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; XID_Start # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; XID_Start # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 2102 ; XID_Start # L& DOUBLE-STRUCK CAPITAL C 2107 ; XID_Start # L& EULER CONSTANT 210A..2113 ; XID_Start # L& [10] SCRIPT SMALL G..SCRIPT SMALL L @@ -8843,7 +9032,8 @@ A771..A787 ; XID_Start # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER A788 ; XID_Start # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; XID_Start # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; XID_Start # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; XID_Start # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; XID_Start # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; XID_Start # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; XID_Start # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; XID_Start # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; XID_Start # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -8894,6 +9084,7 @@ AB30..AB5A ; XID_Start # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SMAL AB5C..AB5F ; XID_Start # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; XID_Start # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; XID_Start # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; XID_Start # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; XID_Start # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA ABC0..ABE2 ; XID_Start # Lo [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM AC00..D7A3 ; XID_Start # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH @@ -8973,7 +9164,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 10760..10767 ; XID_Start # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 10780..10785 ; XID_Start # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; XID_Start # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; XID_Start # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; XID_Start # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10800..10805 ; XID_Start # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; XID_Start # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; XID_Start # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -9016,6 +9207,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 10EC2..10EC4 ; XID_Start # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; XID_Start # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; XID_Start # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW +10ED9..10EEE ; XID_Start # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH 10F00..10F1C ; XID_Start # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; XID_Start # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; XID_Start # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -9095,6 +9287,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 11A5C..11A89 ; XID_Start # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; XID_Start # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; XID_Start # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11B0A ; XID_Start # Lo DEVANAGARI LETTER ALTERNATE DDDA 11BC0..11BE0 ; XID_Start # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO 11C00..11C08 ; XID_Start # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; XID_Start # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA @@ -9111,14 +9304,17 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 11DB0..11DD8 ; XID_Start # Lo [41] TOLONG SIKI LETTER I..TOLONG SIKI LETTER RRH 11DD9 ; XID_Start # Lm TOLONG SIKI SIGN SELA 11DDA..11DDB ; XID_Start # Lo [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA +11DF1 ; XID_Start # Lo BENGALI LETTER ALTERNATE BARGIYA BA 11EE0..11EF2 ; XID_Start # Lo [19] MAKASAR LETTER KA..MAKASAR ANGKA 11F02 ; XID_Start # Lo KAWI SIGN REPHA 11F04..11F10 ; XID_Start # Lo [13] KAWI LETTER A..KAWI LETTER O 11F12..11F33 ; XID_Start # Lo [34] KAWI LETTER KA..KAWI LETTER JNYA 11FB0 ; XID_Start # Lo LISU LETTER YHA 12000..12399 ; XID_Start # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; XID_Start # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; XID_Start # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU +12475..1247F ; XID_Start # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; XID_Start # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..12686 ; XID_Start # Nl [311] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN ONE N36 FLAT 12F90..12FF0 ; XID_Start # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; XID_Start # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13441..13446 ; XID_Start # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN @@ -9146,17 +9342,19 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 16FE3 ; XID_Start # Lm OLD CHINESE ITERATION MARK 16FF2..16FF3 ; XID_Start # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; XID_Start # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS -17000..18CD5 ; XID_Start # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18CFF..18D1E ; XID_Start # Lo [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E +17000..18CDA ; XID_Start # Lo [7387] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CDA +18CFF..18D20 ; XID_Start # Lo [34] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; XID_Start # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 +18E00..19191 ; XID_Start # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; XID_Start # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 1AFF0..1AFF3 ; XID_Start # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; XID_Start # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 1AFFD..1AFFE ; XID_Start # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 -1B000..1B122 ; XID_Start # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU +1B000..1B128 ; XID_Start # Lo [297] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ALTERNATE WI 1B132 ; XID_Start # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; XID_Start # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B155 ; XID_Start # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; XID_Start # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; XID_Start # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE 1B170..1B2FB ; XID_Start # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 1BC00..1BC6A ; XID_Start # Lo [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M 1BC70..1BC7C ; XID_Start # Lo [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK @@ -9180,7 +9378,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1D540..1D544 ; XID_Start # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; XID_Start # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; XID_Start # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; XID_Start # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; XID_Start # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; XID_Start # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; XID_Start # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; XID_Start # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -9194,8 +9392,10 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1D7C4..1D7CB ; XID_Start # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1DF00..1DF09 ; XID_Start # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; XID_Start # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; XID_Start # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; XID_Start # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; XID_Start # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; XID_Start # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; XID_Start # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; XID_Start # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E030..1E06D ; XID_Start # Lm [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1E100..1E12C ; XID_Start # Lo [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W 1E137..1E13D ; XID_Start # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER @@ -9254,15 +9454,16 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1EEA5..1EEA9 ; XID_Start # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; XID_Start # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 20000..2A6DF ; XID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; XID_Start # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; XID_Start # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; XID_Start # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; XID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; XID_Start # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D 2F800..2FA1D ; XID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; XID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; XID_Start # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 +3D000..3FC3F ; XID_Start # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F -# Total code points: 145893 +# Total code points: 158716 # ================================================ @@ -9311,13 +9512,14 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0483..0487 ; XID_Continue # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE 048A..052F ; XID_Continue # L& [166] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EL WITH DESCENDER 0531..0556 ; XID_Continue # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; XID_Continue # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; XID_Continue # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 0560..0588 ; XID_Continue # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE +058B..058C ; XID_Continue # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 0591..05BD ; XID_Continue # Mn [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG 05BF ; XID_Continue # Mn HEBREW POINT RAFE 05C1..05C2 ; XID_Continue # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT 05C4..05C5 ; XID_Continue # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT -05C7 ; XID_Continue # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; XID_Continue # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 05D0..05EA ; XID_Continue # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; XID_Continue # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 0610..061A ; XID_Continue # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA @@ -9472,7 +9674,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0B47..0B48 ; XID_Continue # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI 0B4B..0B4C ; XID_Continue # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU 0B4D ; XID_Continue # Mn ORIYA SIGN VIRAMA -0B55..0B56 ; XID_Continue # Mn [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK +0B53..0B56 ; XID_Continue # Mn [4] ORIYA SIGN DOT ABOVE..ORIYA AI LENGTH MARK 0B57 ; XID_Continue # Mc ORIYA AU LENGTH MARK 0B5C..0B5D ; XID_Continue # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA 0B5F..0B61 ; XID_Continue # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL @@ -9753,8 +9955,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1A90..1A99 ; XID_Continue # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1AA7 ; XID_Continue # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; XID_Continue # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW -1ABF..1ADD ; XID_Continue # Mn [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW -1AE0..1AEB ; XID_Continue # Mn [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE +1ABF..1AF0 ; XID_Continue # Mn [50] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOUBLE COMMA ABOVE 1B00..1B03 ; XID_Continue # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B04 ; XID_Continue # Mc BALINESE SIGN BISAH 1B05..1B33 ; XID_Continue # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA @@ -9845,7 +10046,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 2054 ; XID_Continue # Pc INVERTED UNDERTIE 2071 ; XID_Continue # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; XID_Continue # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; XID_Continue # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +208F..209F ; XID_Continue # Lm [17] MODIFIER LETTER HIGH AND LOW VERTICAL LINE..LATIN SUBSCRIPT SMALL LETTER Z 20D0..20DC ; XID_Continue # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE 20E1 ; XID_Continue # Mn COMBINING LEFT RIGHT ARROW ABOVE 20E5..20F0 ; XID_Continue # Mn [12] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING ASTERISK ABOVE @@ -9942,7 +10143,8 @@ A771..A787 ; XID_Continue # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETT A788 ; XID_Continue # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; XID_Continue # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; XID_Continue # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; XID_Continue # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; XID_Continue # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; XID_Continue # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; XID_Continue # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; XID_Continue # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; XID_Continue # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -10043,6 +10245,7 @@ AB30..AB5A ; XID_Continue # L& [43] LATIN SMALL LETTER BARRED ALPHA..LATIN S AB5C..AB5F ; XID_Continue # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK AB60..AB68 ; XID_Continue # L& [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; XID_Continue # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; XID_Continue # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING AB70..ABBF ; XID_Continue # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA ABC0..ABE2 ; XID_Continue # Lo [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM ABE3..ABE4 ; XID_Continue # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP @@ -10143,7 +10346,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 10760..10767 ; XID_Continue # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 10780..10785 ; XID_Continue # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; XID_Continue # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; XID_Continue # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; XID_Continue # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 10800..10805 ; XID_Continue # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; XID_Continue # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; XID_Continue # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -10197,7 +10400,9 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 10EC2..10EC4 ; XID_Continue # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; XID_Continue # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; XID_Continue # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW -10EFA..10EFF ; XID_Continue # Mn [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA +10ECB..10ECF ; XID_Continue # Mn [5] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC LARGE CIRCLE ABOVE +10ED9..10EEE ; XID_Continue # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH +10EF0..10EFF ; XID_Continue # Mn [16] ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO..ARABIC SMALL LOW WORD MADDA 10F00..10F1C ; XID_Continue # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; XID_Continue # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; XID_Continue # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -10424,6 +10629,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11A98..11A99 ; XID_Continue # Mn [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER 11A9D ; XID_Continue # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; XID_Continue # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11B0A ; XID_Continue # Lo DEVANAGARI LETTER ALTERNATE DDDA 11B60 ; XID_Continue # Mn SHARADA VOWEL SIGN OE 11B61 ; XID_Continue # Mc SHARADA VOWEL SIGN OOE 11B62..11B64 ; XID_Continue # Mn [3] SHARADA VOWEL SIGN UE..SHARADA VOWEL SIGN SHORT E @@ -10474,6 +10680,8 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11DD9 ; XID_Continue # Lm TOLONG SIKI SIGN SELA 11DDA..11DDB ; XID_Continue # Lo [2] TOLONG SIKI SIGN HECAKA..TOLONG SIKI UNGGA 11DE0..11DE9 ; XID_Continue # Nd [10] TOLONG SIKI DIGIT ZERO..TOLONG SIKI DIGIT NINE +11DF0 ; XID_Continue # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE +11DF1 ; XID_Continue # Lo BENGALI LETTER ALTERNATE BARGIYA BA 11EE0..11EF2 ; XID_Continue # Lo [19] MAKASAR LETTER KA..MAKASAR ANGKA 11EF3..11EF4 ; XID_Continue # Mn [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U 11EF5..11EF6 ; XID_Continue # Mc [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O @@ -10492,8 +10700,10 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11F5A ; XID_Continue # Mn KAWI SIGN NUKTA 11FB0 ; XID_Continue # Lo LISU LETTER YHA 12000..12399 ; XID_Continue # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; XID_Continue # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; XID_Continue # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU +12475..1247F ; XID_Continue # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; XID_Continue # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..12686 ; XID_Continue # Nl [311] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN ONE N36 FLAT 12F90..12FF0 ; XID_Continue # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; XID_Continue # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13440 ; XID_Continue # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY @@ -10538,17 +10748,19 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 16FF0..16FF1 ; XID_Continue # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY 16FF2..16FF3 ; XID_Continue # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; XID_Continue # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS -17000..18CD5 ; XID_Continue # Lo [7382] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CD5 -18CFF..18D1E ; XID_Continue # Lo [32] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D1E +17000..18CDA ; XID_Continue # Lo [7387] TANGUT IDEOGRAPH-17000..KHITAN SMALL SCRIPT CHARACTER-18CDA +18CFF..18D20 ; XID_Continue # Lo [34] KHITAN SMALL SCRIPT CHARACTER-18CFF..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; XID_Continue # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 +18E00..19191 ; XID_Continue # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; XID_Continue # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 1AFF0..1AFF3 ; XID_Continue # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 1AFF5..1AFFB ; XID_Continue # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 1AFFD..1AFFE ; XID_Continue # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 -1B000..1B122 ; XID_Continue # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU +1B000..1B128 ; XID_Continue # Lo [297] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ALTERNATE WI 1B132 ; XID_Continue # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; XID_Continue # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B155 ; XID_Continue # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; XID_Continue # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; XID_Continue # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE 1B170..1B2FB ; XID_Continue # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB 1BC00..1BC6A ; XID_Continue # Lo [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M 1BC70..1BC7C ; XID_Continue # Lo [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK @@ -10558,6 +10770,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1CCF0..1CCF9 ; XID_Continue # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE 1CF00..1CF2D ; XID_Continue # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; XID_Continue # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG +1D127..1D128 ; XID_Continue # Mn [2] MUSICAL SYMBOL COMBINING STRESS..MUSICAL SYMBOL COMBINING UNSTRESS 1D165..1D166 ; XID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; XID_Continue # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16D..1D172 ; XID_Continue # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 @@ -10565,6 +10778,10 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1D185..1D18B ; XID_Continue # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; XID_Continue # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO 1D242..1D244 ; XID_Continue # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME +1D250..1D252 ; XID_Continue # Mc [3] MUSICAL SYMBOL COMBINING FLAG-6..MUSICAL SYMBOL COMBINING FLAG-8 +1D25B..1D25C ; XID_Continue # Mn [2] MUSICAL SYMBOL COMBINING TREMOLO-4..MUSICAL SYMBOL COMBINING TREMOLO-5 +1D25F ; XID_Continue # Mc MUSICAL SYMBOL COMBINING BUZZ ROLL STEM +1D280..1D281 ; XID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM BOW BEHIND BRIDGE..MUSICAL SYMBOL COMBINING STEM BOW ON TOP OF BRIDGE 1D400..1D454 ; XID_Continue # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G 1D456..1D49C ; XID_Continue # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A 1D49E..1D49F ; XID_Continue # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D @@ -10583,7 +10800,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1D540..1D544 ; XID_Continue # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; XID_Continue # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; XID_Continue # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; XID_Continue # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; XID_Continue # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; XID_Continue # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C2..1D6DA ; XID_Continue # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA 1D6DC..1D6FA ; XID_Continue # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA @@ -10604,8 +10821,10 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1DAA1..1DAAF ; XID_Continue # Mn [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16 1DF00..1DF09 ; XID_Continue # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; XID_Continue # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; XID_Continue # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; XID_Continue # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; XID_Continue # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; XID_Continue # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; XID_Continue # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFFF ; XID_Continue # Lm [51] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK 1E000..1E006 ; XID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; XID_Continue # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; XID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -10687,16 +10906,17 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1EEAB..1EEBB ; XID_Continue # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1FBF0..1FBF9 ; XID_Continue # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE 20000..2A6DF ; XID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; XID_Continue # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; XID_Continue # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; XID_Continue # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; XID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; XID_Continue # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D 2F800..2FA1D ; XID_Continue # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; XID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; XID_Continue # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 +3D000..3FC3F ; XID_Continue # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F E0100..E01EF ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 149221 +# Total code points: 162081 # ================================================ @@ -10763,7 +10983,7 @@ E01F0..E0FFF ; Default_Ignorable_Code_Point # Cn [3600] ........ +2E5E..2E5F ; Pattern_Syntax # Cn [2] .. +2E60..2E61 ; Pattern_Syntax # Po [2] WIGGLY EXCLAMATION MARK..INVERTED WIGGLY EXCLAMATION MARK +2E62 ; Pattern_Syntax # Ps LEFT PARENTHESIS WITH MIDDLE RING +2E63 ; Pattern_Syntax # Pe RIGHT PARENTHESIS WITH MIDDLE RING +2E64..2E7F ; Pattern_Syntax # Cn [28] .. 3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK 3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET 3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET @@ -1938,7 +1970,10 @@ FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT 08CD..08CF ; Modifier_Combining_Mark # Mn [3] ARABIC SMALL HIGH ZAH..ARABIC LARGE ROUND DOT BELOW 08D3 ; Modifier_Combining_Mark # Mn ARABIC SMALL LOW WAW 08F3 ; Modifier_Combining_Mark # Mn ARABIC SMALL HIGH WAW +10EF4 ; Modifier_Combining_Mark # Mn ARABIC SMALL LOW NOON WITH FATHA +10EF6 ; Modifier_Combining_Mark # Mn ARABIC SMALL LOW NOON WITH DAMMA +10EF9 ; Modifier_Combining_Mark # Mn ARABIC MARK CROWN -# Total code points: 14 +# Total code points: 17 # EOF diff --git a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt index b92662eda286..620db769d2bd 100644 --- a/src/java.base/share/data/unicodedata/PropertyValueAliases.txt +++ b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt @@ -1,6 +1,6 @@ -# PropertyValueAliases-17.0.0.txt -# Date: 2025-06-30, 06:16:21 GMT -# © 2025 Unicode®, Inc. +# PropertyValueAliases-18.0.0.txt +# Date: 2026-06-24, 13:39:29 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -94,6 +94,7 @@ age; 15.0 ; V15_0 age; 15.1 ; V15_1 age; 16.0 ; V16_0 age; 17.0 ; V17_0 +age; 18.0 ; V18_0 age; NA ; Unassigned # Alphabetic (Alpha) @@ -170,6 +171,7 @@ blk; Arabic_Math ; Arabic_Mathematical_Alphabetic_Symbols blk; Arabic_PF_A ; Arabic_Presentation_Forms_A ; Arabic_Presentation_Forms-A blk; Arabic_PF_B ; Arabic_Presentation_Forms_B blk; Arabic_Sup ; Arabic_Supplement +blk; Archaic_Cuneiform_Numerals ; Archaic_Cuneiform_Numerals blk; Armenian ; Armenian blk; Arrows ; Arrows blk; ASCII ; Basic_Latin @@ -180,6 +182,7 @@ blk; Bamum_Sup ; Bamum_Supplement blk; Bassa_Vah ; Bassa_Vah blk; Batak ; Batak blk; Bengali ; Bengali +blk; Bengali_Sup ; Bengali_Supplement blk; Beria_Erfe ; Beria_Erfe blk; Bhaiksuki ; Bhaiksuki blk; Block_Elements ; Block_Elements @@ -300,6 +303,8 @@ blk; Jamo ; Hangul_Jamo blk; Jamo_Ext_A ; Hangul_Jamo_Extended_A blk; Jamo_Ext_B ; Hangul_Jamo_Extended_B blk; Javanese ; Javanese +blk; Jurchen ; Jurchen +blk; Jurchen_Radicals ; Jurchen_Radicals blk; Kaithi ; Kaithi blk; Kaktovik_Numerals ; Kaktovik_Numerals blk; Kana_Ext_A ; Kana_Extended_A @@ -359,6 +364,7 @@ blk; Meroitic_Cursive ; Meroitic_Cursive blk; Meroitic_Hieroglyphs ; Meroitic_Hieroglyphs blk; Miao ; Miao blk; Misc_Arrows ; Miscellaneous_Symbols_And_Arrows +blk; Misc_Arrows_Ext ; Miscellaneous_Symbols_And_Arrows_Extended blk; Misc_Math_Symbols_A ; Miscellaneous_Mathematical_Symbols_A blk; Misc_Math_Symbols_B ; Miscellaneous_Mathematical_Symbols_B blk; Misc_Pictographs ; Miscellaneous_Symbols_And_Pictographs @@ -373,6 +379,7 @@ blk; Mongolian_Sup ; Mongolian_Supplement blk; Mro ; Mro blk; Multani ; Multani blk; Music ; Musical_Symbols +blk; Music_Sup ; Musical_Symbols_Supplement blk; Myanmar ; Myanmar blk; Myanmar_Ext_A ; Myanmar_Extended_A blk; Myanmar_Ext_B ; Myanmar_Extended_B @@ -422,6 +429,7 @@ blk; Rumi ; Rumi_Numeral_Symbols blk; Runic ; Runic blk; Samaritan ; Samaritan blk; Saurashtra ; Saurashtra +blk; Seal ; Seal blk; Sharada ; Sharada blk; Sharada_Sup ; Sharada_Supplement blk; Shavian ; Shavian @@ -1011,6 +1019,16 @@ jg ; Alef ; Alef jg ; Beh ; Beh jg ; Beth ; Beth jg ; Burushaski_Yeh_Barree ; Burushaski_Yeh_Barree +jg ; Crown_Ain ; Crown_Ain +jg ; Crown_Beh ; Crown_Beh +jg ; Crown_Feh ; Crown_Feh +jg ; Crown_Hah ; Crown_Hah +jg ; Crown_Heh ; Crown_Heh +jg ; Crown_Kaf ; Crown_Kaf +jg ; Crown_Meem ; Crown_Meem +jg ; Crown_Sad ; Crown_Sad +jg ; Crown_Seen ; Crown_Seen +jg ; Crown_Tah ; Crown_Tah jg ; Dal ; Dal jg ; Dalath_Rish ; Dalath_Rish jg ; E ; E @@ -1380,6 +1398,7 @@ sc ; Hrkt ; Katakana_Or_Hiragana sc ; Hung ; Old_Hungarian sc ; Ital ; Old_Italic sc ; Java ; Javanese +sc ; Jurc ; Jurchen sc ; Kali ; Kayah_Li sc ; Kana ; Katakana sc ; Kawi ; Kawi @@ -1433,6 +1452,7 @@ sc ; Osma ; Osmanya sc ; Ougr ; Old_Uyghur sc ; Palm ; Palmyrene sc ; Pauc ; Pau_Cin_Hau +sc ; Pcun ; Proto_Cuneiform sc ; Perm ; Old_Permic sc ; Phag ; Phags_Pa sc ; Phli ; Inscriptional_Pahlavi @@ -1446,6 +1466,7 @@ sc ; Runr ; Runic sc ; Samr ; Samaritan sc ; Sarb ; Old_South_Arabian sc ; Saur ; Saurashtra +sc ; Seal ; Seal sc ; Sgnw ; SignWriting sc ; Shaw ; Shavian sc ; Shrd ; Sharada @@ -1720,10 +1741,38 @@ kEH_NoMirror; Y ; Yes ; T kEH_NoRotate; N ; No ; F ; False kEH_NoRotate; Y ; Yes ; T ; True +# kJURC_Src (kJURC_Src) + +# @missing: 0000..10FFFF; kJURC_Src; + # kMandarin (cjkMandarin) # @missing: 0000..10FFFF; kMandarin; +# kNSHU_DubenSrc (kNSHU_DubenSrc) + +# @missing: 0000..10FFFF; kNSHU_DubenSrc; + +# kSEAL_CCZSrc (kSEAL_CCZSrc) + +# @missing: 0000..10FFFF; kSEAL_CCZSrc; + +# kSEAL_DYCSrc (kSEAL_DYCSrc) + +# @missing: 0000..10FFFF; kSEAL_DYCSrc; + +# kSEAL_QJZSrc (kSEAL_QJZSrc) + +# @missing: 0000..10FFFF; kSEAL_QJZSrc; + +# kSEAL_THXSrc (kSEAL_THXSrc) + +# @missing: 0000..10FFFF; kSEAL_THXSrc; + +# kTGT_MergedSrc (kTGT_MergedSrc) + +# @missing: 0000..10FFFF; kTGT_MergedSrc; + # kTotalStrokes (cjkTotalStrokes) # @missing: 0000..10FFFF; kTotalStrokes; diff --git a/src/java.base/share/data/unicodedata/ReadMe.txt b/src/java.base/share/data/unicodedata/ReadMe.txt index 268f62b8a93c..aa18f7175c4a 100644 --- a/src/java.base/share/data/unicodedata/ReadMe.txt +++ b/src/java.base/share/data/unicodedata/ReadMe.txt @@ -1,24 +1,19 @@ # Unicode Character Database -# Date: 2025-08-15 -# © 2025 Unicode®, Inc. +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html -# -# For documentation, see the following: -# ucd/NamesList.html -# UAX #38, "Unicode Han Database (Unihan)" -# UAX #42, "Unicode Character Database in XML" -# UAX #44, "Unicode Character Database" -# UTS #51, "Unicode Emoji" -# UAX #57, "Unicode Egyptian Hieroglyph Database" -# -# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode17.0.0/ -This directory contains the final data files -for Version 17.0.0 of the Unicode Standard. +This directory contains final data files for version 18.0.0 of the +Unicode Character Database. -The "charts" subdirectory contains an archival set of -pdf code charts corresponding exactly to Version 17.0.0. +For documentation, see https://www.unicode.org/versions/Unicode18.0.0/ +with links to +- UAX #38: Unicode Han Database (Unihan) +- UAX #42: Unicode Character Database in XML +- UAX #44: Unicode Character Database +- UTS #51: Unicode Emoji +- UAX #57: Unicode Egyptian Hieroglyph Database +- UAX #60: Data for Non Han Ideographic Scripts -The other subdirectories contain the data files for the -Unicode Character Database and for the synchronized Unicode Technical Standards. +as well as the following in this directory: +- NamesList.html diff --git a/src/java.base/share/data/unicodedata/Scripts.txt b/src/java.base/share/data/unicodedata/Scripts.txt index 5574fdd6ae35..56d341fce1e0 100644 --- a/src/java.base/share/data/unicodedata/Scripts.txt +++ b/src/java.base/share/data/unicodedata/Scripts.txt @@ -1,6 +1,6 @@ -# Scripts-17.0.0.txt -# Date: 2025-07-24, 13:28:55 GMT -# © 2025 Unicode®, Inc. +# Scripts-18.0.0.txt +# Date: 2026-06-29, 15:25:26 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -154,7 +154,8 @@ 208A..208C ; Common # Sm [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN 208D ; Common # Ps SUBSCRIPT LEFT PARENTHESIS 208E ; Common # Pe SUBSCRIPT RIGHT PARENTHESIS -20A0..20C1 ; Common # Sc [34] EURO-CURRENCY SIGN..SAUDI RIYAL SIGN +208F ; Common # Lm MODIFIER LETTER HIGH AND LOW VERTICAL LINE +20A0..20C4 ; Common # Sc [37] EURO-CURRENCY SIGN..OMANI RIAL SIGN 2100..2101 ; Common # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT 2102 ; Common # L& DOUBLE-STRUCK CAPITAL C 2103..2106 ; Common # So [4] DEGREE CELSIUS..CADA UNA @@ -356,6 +357,9 @@ 2E5B ; Common # Ps BOTTOM HALF LEFT PARENTHESIS 2E5C ; Common # Pe BOTTOM HALF RIGHT PARENTHESIS 2E5D ; Common # Pd OBLIQUE HYPHEN +2E60..2E61 ; Common # Po [2] WIGGLY EXCLAMATION MARK..INVERTED WIGGLY EXCLAMATION MARK +2E62 ; Common # Ps LEFT PARENTHESIS WITH MIDDLE RING +2E63 ; Common # Pe RIGHT PARENTHESIS WITH MIDDLE RING 2FF0..2FFF ; Common # So [16] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION 3000 ; Common # Zs IDEOGRAPHIC SPACE 3001..3003 ; Common # Po [3] IDEOGRAPHIC COMMA..DITTO MARK @@ -526,8 +530,10 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1CCFA..1CCFC ; Common # So [3] SNAKE SYMBOL..NOSE SYMBOL 1CD00..1CEB3 ; Common # So [436] BLOCK OCTANT-3..BLACK RIGHT TRIANGLE CARET 1CEBA..1CED0 ; Common # So [23] FRAGILE SYMBOL..LEUKOTHEA +1CED2..1CED4 ; Common # So [3] ALCHEMICAL SYMBOL FOR OIL INVERTED..ALCHEMICAL SYMBOL FOR SALT OF TARTAR +1CEDD..1CEDF ; Common # Sm [3] SQUARE ROOT OF SQUARE ROOT..SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT 1CEE0..1CEEF ; Common # So [16] GEOMANTIC FIGURE POPULUS..GEOMANTIC FIGURE VIA -1CEF0 ; Common # Sm MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR +1CEF0..1CEFD ; Common # Sm [14] MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR..HYPERBOLA 1CF50..1CFC3 ; Common # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK 1D000..1D0F5 ; Common # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO 1D100..1D126 ; Common # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 @@ -538,7 +544,13 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1D173..1D17A ; Common # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE 1D183..1D184 ; Common # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN 1D18C..1D1A9 ; Common # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH -1D1AE..1D1EA ; Common # So [61] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL KORON +1D1AE..1D1FF ; Common # So [82] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL LONGA REST +1D250..1D252 ; Common # Mc [3] MUSICAL SYMBOL COMBINING FLAG-6..MUSICAL SYMBOL COMBINING FLAG-8 +1D253..1D25A ; Common # So [8] MUSICAL SYMBOL TWO HUNDRED FIFTY-SIXTH REST..MUSICAL SYMBOL SHARP WITH STROKE +1D25D..1D25E ; Common # So [2] MUSICAL SYMBOL FINGERED TREMOLO-4..MUSICAL SYMBOL FINGERED TREMOLO-5 +1D25F ; Common # Mc MUSICAL SYMBOL COMBINING BUZZ ROLL STEM +1D260..1D27F ; Common # So [32] MUSICAL SYMBOL TRIPLE FLAT..MUSICAL SYMBOL ARPEGGIATO UP WITH ARROW +1D280..1D281 ; Common # Mc [2] MUSICAL SYMBOL COMBINING STEM BOW BEHIND BRIDGE..MUSICAL SYMBOL COMBINING STEM BOW ON TOP OF BRIDGE 1D2C0..1D2D3 ; Common # No [20] KAKTOVIK NUMERAL ZERO..KAKTOVIK NUMERAL NINETEEN 1D2E0..1D2F3 ; Common # No [20] MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN 1D300..1D356 ; Common # So [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING @@ -561,7 +573,7 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1D540..1D544 ; Common # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M 1D546 ; Common # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O 1D54A..1D550 ; Common # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y -1D552..1D6A5 ; Common # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J +1D552..1D6A6 ; Common # L& [341] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S 1D6A8..1D6C0 ; Common # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA 1D6C1 ; Common # Sm MATHEMATICAL BOLD NABLA 1D6C2..1D6DA ; Common # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA @@ -584,6 +596,7 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1D7C3 ; Common # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL 1D7C4..1D7CB ; Common # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA 1D7CE..1D7FF ; Common # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE +1DB00..1DB1C ; Common # Sm [29] LEIBNIZIAN EQUALS SIGN..FACIT SYMBOL 1EC71..1ECAB ; Common # No [59] INDIC SIYAQ NUMBER ONE..INDIC SIYAQ NUMBER PREFIXED NINE 1ECAC ; Common # So INDIC SIYAQ PLACEHOLDER 1ECAD..1ECAF ; Common # No [3] INDIC SIYAQ FRACTION ONE QUARTER..INDIC SIYAQ FRACTION THREE QUARTERS @@ -599,7 +612,7 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1F0C1..1F0CF ; Common # So [15] PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER 1F0D1..1F0F5 ; Common # So [37] PLAYING CARD ACE OF CLUBS..PLAYING CARD TRUMP-21 1F100..1F10C ; Common # No [13] DIGIT ZERO FULL STOP..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO -1F10D..1F1AD ; Common # So [161] CIRCLED ZERO WITH SLASH..MASK WORK SYMBOL +1F10D..1F1AE ; Common # So [162] CIRCLED ZERO WITH SLASH..TOMOBIKI SYMBOL 1F1E6..1F1FF ; Common # So [26] REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z 1F201..1F202 ; Common # So [2] SQUARED KATAKANA KOKO..SQUARED KATAKANA SA 1F210..1F23B ; Common # So [44] SQUARED CJK UNIFIED IDEOGRAPH-624B..SQUARED CJK UNIFIED IDEOGRAPH-914D @@ -608,13 +621,12 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1F260..1F265 ; Common # So [6] ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI 1F300..1F3FA ; Common # So [251] CYCLONE..AMPHORA 1F3FB..1F3FF ; Common # Sk [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6 -1F400..1F6D8 ; Common # So [729] RAT..LANDSLIDE +1F400..1F6D9 ; Common # So [730] RAT..LIGHTHOUSE 1F6DC..1F6EC ; Common # So [17] WIRELESS..AIRPLANE ARRIVING 1F6F0..1F6FC ; Common # So [13] SATELLITE..ROLLER SKATE -1F700..1F7D9 ; Common # So [218] ALCHEMICAL SYMBOL FOR QUINTESSENCE..NINE POINTED WHITE STAR +1F700..1F7DB ; Common # So [220] ALCHEMICAL SYMBOL FOR QUINTESSENCE..BULLET IN DOUBLE CIRCLE 1F7E0..1F7EB ; Common # So [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE -1F7F0 ; Common # So HEAVY EQUALS SIGN -1F800..1F80B ; Common # So [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD +1F7F0..1F80B ; Common # So [28] HEAVY EQUALS SIGN..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD 1F810..1F847 ; Common # So [56] LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW 1F850..1F859 ; Common # So [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW 1F860..1F887 ; Common # So [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW @@ -625,12 +637,11 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1F900..1FA57 ; Common # So [344] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS ALFIL 1FA60..1FA6D ; Common # So [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER 1FA70..1FA7C ; Common # So [13] BALLET SHOES..CRUTCH -1FA80..1FA8A ; Common # So [11] YO-YO..TROMBONE -1FA8E..1FAC6 ; Common # So [57] TREASURE CHEST..FINGERPRINT +1FA80..1FAC6 ; Common # So [71] YO-YO..FINGERPRINT 1FAC8 ; Common # So HAIRY CREATURE -1FACD..1FADC ; Common # So [16] ORCA..ROOT VEGETABLE -1FADF..1FAEA ; Common # So [12] SPLATTER..DISTORTED FACE -1FAEF..1FAF8 ; Common # So [10] FIGHT CLOUD..RIGHTWARDS PUSHING HAND +1FACC..1FADD ; Common # So [18] MONARCH BUTTERFLY..PICKLE +1FADF..1FAEB ; Common # So [13] SPLATTER..CRACKING FACE +1FAEF..1FAFA ; Common # So [12] FIGHT CLOUD..RIGHTWARDS THUMB SIGN 1FB00..1FB92 ; Common # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK 1FB94..1FBEF ; Common # So [92] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE 1FBF0..1FBF9 ; Common # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE @@ -638,7 +649,7 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR E0001 ; Common # Cf LANGUAGE TAG E0020..E007F ; Common # Cf [96] TAG SPACE..CANCEL TAG -# Total code points: 9123 +# Total code points: 9276 # ================================================ @@ -666,7 +677,7 @@ E0020..E007F ; Common # Cf [96] TAG SPACE..CANCEL TAG 1E00..1EFF ; Latin # L& [256] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER Y WITH LOOP 2071 ; Latin # Lm SUPERSCRIPT LATIN SMALL LETTER I 207F ; Latin # Lm SUPERSCRIPT LATIN SMALL LETTER N -2090..209C ; Latin # Lm [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T +2090..209F ; Latin # Lm [16] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER Z 212A..212B ; Latin # L& [2] KELVIN SIGN..ANGSTROM SIGN 2132 ; Latin # L& TURNED CAPITAL F 214E ; Latin # L& TURNED SMALL F @@ -681,7 +692,8 @@ A770 ; Latin # Lm MODIFIER LETTER US A771..A787 ; Latin # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T A78B..A78E ; Latin # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; Latin # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7DC ; Latin # L& [77] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER LAMBDA WITH STROKE +A790..A7DD ; Latin # L& [78] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER CLOSED OMEGA +A7E2 ; Latin # L& LATIN CAPITAL LETTER R WITH LONG LEG A7F1..A7F4 ; Latin # Lm [4] MODIFIER LETTER CAPITAL S..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Latin # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; Latin # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -693,18 +705,22 @@ AB5C..AB5F ; Latin # Lm [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMA AB60..AB64 ; Latin # L& [5] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER INVERTED ALPHA AB66..AB68 ; Latin # L& [3] LATIN SMALL LETTER DZ DIGRAPH WITH RETROFLEX HOOK..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE AB69 ; Latin # Lm MODIFIER LETTER SMALL TURNED W +AB6C..AB6D ; Latin # L& [2] LATIN CAPITAL LETTER SCRIPT R..LATIN CAPITAL LETTER SCRIPT R WITH RING FB00..FB06 ; Latin # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST FF21..FF3A ; Latin # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z FF41..FF5A ; Latin # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z 10780..10785 ; Latin # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK 10787..107B0 ; Latin # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK -107B2..107BA ; Latin # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +107B2..107BF ; Latin # Lm [14] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL ESH WITH DOUBLE BAR 1DF00..1DF09 ; Latin # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK 1DF0A ; Latin # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK -1DF0B..1DF1E ; Latin # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -1DF25..1DF2A ; Latin # L& [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK +1DF0B..1DF7F ; Latin # L& [117] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER REVERSED U +1DF80..1DF81 ; Latin # Lo [2] LATIN CAPITAL LETTER A WITH TOPBAR..LATIN CAPITAL LETTER E WITH BENT TOPBAR +1DF90..1DF96 ; Latin # L& [7] LATIN SMALL LETTER C WITH LOW SLASH..LATIN SMALL LETTER LONG S WITH TOP LOOP +1DFCD..1DFF2 ; Latin # Lm [38] MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK..MODIFIER LETTER SMALL T WITH CURL +1DFF5..1DFFF ; Latin # Lm [11] MODIFIER LETTER SMALL D WITH PALATAL HOOK..MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK -# Total code points: 1492 +# Total code points: 1653 # ================================================ @@ -763,8 +779,9 @@ AB65 ; Greek # L& GREEK LETTER SMALL CAPITAL OMEGA 1D200..1D241 ; Greek # So [66] GREEK VOCAL NOTATION SYMBOL-1..GREEK INSTRUMENTAL NOTATION SYMBOL-54 1D242..1D244 ; Greek # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME 1D245 ; Greek # So GREEK MUSICAL LEIMMA +1DFF3..1DFF4 ; Greek # Lm [2] MODIFIER LETTER SMALL GREEK PSI..MODIFIER LETTER SMALL GREEK OMEGA -# Total code points: 518 +# Total code points: 520 # ================================================ @@ -798,16 +815,17 @@ FE2E..FE2F ; Cyrillic # Mn [2] COMBINING CYRILLIC TITLO LEFT HALF..COMBININ # ================================================ 0531..0556 ; Armenian # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH -0559 ; Armenian # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +0558..0559 ; Armenian # Lm [2] MODIFIER LETTER ARMENIAN SMALL EH..ARMENIAN MODIFIER LETTER LEFT HALF RING 055A..055F ; Armenian # Po [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK 0560..0588 ; Armenian # L& [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE 0589 ; Armenian # Po ARMENIAN FULL STOP 058A ; Armenian # Pd ARMENIAN HYPHEN +058B..058C ; Armenian # Lm [2] MODIFIER LETTER ARMENIAN SMALL INI..MODIFIER LETTER ARMENIAN SMALL YI 058D..058E ; Armenian # So [2] RIGHT-FACING ARMENIAN ETERNITY SIGN..LEFT-FACING ARMENIAN ETERNITY SIGN 058F ; Armenian # Sc ARMENIAN DRAM SIGN FB13..FB17 ; Armenian # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH -# Total code points: 96 +# Total code points: 99 # ================================================ @@ -819,7 +837,7 @@ FB13..FB17 ; Armenian # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SM 05C3 ; Hebrew # Po HEBREW PUNCTUATION SOF PASUQ 05C4..05C5 ; Hebrew # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT 05C6 ; Hebrew # Po HEBREW PUNCTUATION NUN HAFUKHA -05C7 ; Hebrew # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; Hebrew # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 05D0..05EA ; Hebrew # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV 05EF..05F2 ; Hebrew # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 05F3..05F4 ; Hebrew # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM @@ -834,7 +852,7 @@ FB40..FB41 ; Hebrew # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER S FB43..FB44 ; Hebrew # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH FB46..FB4F ; Hebrew # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATURE ALEF LAMED -# Total code points: 134 +# Total code points: 136 # ================================================ @@ -896,9 +914,12 @@ FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA 10EC2..10EC4 ; Arabic # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10EC5 ; Arabic # Lm ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW 10EC6..10EC7 ; Arabic # Lo [2] ARABIC LETTER THIN NOON..ARABIC LETTER YEH WITH FOUR DOTS BELOW +10EC9..10ECA ; Arabic # Sk [2] ARABIC SMALL BASELINE FATHA..ARABIC SMALL BASELINE DOTLESS HEAD OF KHAH +10ECB..10ECF ; Arabic # Mn [5] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC LARGE CIRCLE ABOVE 10ED0 ; Arabic # Po ARABIC BIBLICAL END OF VERSE 10ED1..10ED8 ; Arabic # So [8] ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM..ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH -10EFA..10EFF ; Arabic # Mn [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA +10ED9..10EEE ; Arabic # Lo [22] ARABIC CROWN LETTER BEH..ARABIC CROWN LETTER YEH +10EF0..10EFF ; Arabic # Mn [16] ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO..ARABIC SMALL LOW WORD MADDA 1EE00..1EE03 ; Arabic # Lo [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL 1EE05..1EE1F ; Arabic # Lo [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF 1EE21..1EE22 ; Arabic # Lo [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM @@ -934,7 +955,7 @@ FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA 1EEAB..1EEBB ; Arabic # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1EEF0..1EEF1 ; Arabic # Sm [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL -# Total code points: 1413 +# Total code points: 1452 # ================================================ @@ -987,8 +1008,9 @@ A8FC ; Devanagari # Po DEVANAGARI SIGN SIDDHAM A8FD..A8FE ; Devanagari # Lo [2] DEVANAGARI JAIN OM..DEVANAGARI LETTER AY A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 11B00..11B09 ; Devanagari # Po [10] DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU +11B0A ; Devanagari # Lo DEVANAGARI LETTER ALTERNATE DDDA -# Total code points: 164 +# Total code points: 165 # ================================================ @@ -1022,8 +1044,10 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 09FC ; Bengali # Lo BENGALI LETTER VEDIC ANUSVARA 09FD ; Bengali # Po BENGALI ABBREVIATION SIGN 09FE ; Bengali # Mn BENGALI SANDHI MARK +11DF0 ; Bengali # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE +11DF1 ; Bengali # Lo BENGALI LETTER ALTERNATE BARGIYA BA -# Total code points: 96 +# Total code points: 98 # ================================================ @@ -1100,7 +1124,7 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0B47..0B48 ; Oriya # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI 0B4B..0B4C ; Oriya # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU 0B4D ; Oriya # Mn ORIYA SIGN VIRAMA -0B55..0B56 ; Oriya # Mn [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK +0B53..0B56 ; Oriya # Mn [4] ORIYA SIGN DOT ABOVE..ORIYA AI LENGTH MARK 0B57 ; Oriya # Mc ORIYA AU LENGTH MARK 0B5C..0B5D ; Oriya # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA 0B5F..0B61 ; Oriya # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL @@ -1110,7 +1134,7 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0B71 ; Oriya # Lo ORIYA LETTER WA 0B72..0B77 ; Oriya # No [6] ORIYA FRACTION ONE QUARTER..ORIYA FRACTION THREE SIXTEENTHS -# Total code points: 91 +# Total code points: 93 # ================================================ @@ -1551,11 +1575,12 @@ AB70..ABBF ; Cherokee # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT 309D..309E ; Hiragana # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK 309F ; Hiragana # Lo HIRAGANA DIGRAPH YORI 1B001..1B11F ; Hiragana # Lo [287] HIRAGANA LETTER ARCHAIC YE..HIRAGANA LETTER ARCHAIC WU +1B123 ; Hiragana # Lo HIRAGANA DIGRAPH KOTO 1B132 ; Hiragana # Lo HIRAGANA LETTER SMALL KO 1B150..1B152 ; Hiragana # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1F200 ; Hiragana # So SQUARE HIRAGANA HOKA -# Total code points: 381 +# Total code points: 382 # ================================================ @@ -1572,10 +1597,11 @@ FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAK 1AFFD..1AFFE ; Katakana # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 1B000 ; Katakana # Lo KATAKANA LETTER ARCHAIC E 1B120..1B122 ; Katakana # Lo [3] KATAKANA LETTER ARCHAIC YI..KATAKANA LETTER ARCHAIC WU +1B124..1B128 ; Katakana # Lo [5] KATAKANA DIGRAPH TOKI..KATAKANA LETTER ALTERNATE WI 1B155 ; Katakana # Lo KATAKANA LETTER SMALL KO -1B164..1B167 ; Katakana # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N +1B164..1B168 ; Katakana # Lo [5] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL ARCHAIC YE -# Total code points: 321 +# Total code points: 327 # ================================================ @@ -1605,7 +1631,7 @@ FA70..FAD9 ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILI 16FF2..16FF3 ; Han # Lm [2] CHINESE SMALL SIMPLIFIED ER..CHINESE SMALL TRADITIONAL ER 16FF4..16FF6 ; Han # Nl [3] YANGQIN SIGN SLOW ONE BEAT..YANGQIN SIGN SLOW TWO BEATS 20000..2A6DF ; Han # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF -2A700..2B81D ; Han # Lo [4382] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81D +2A700..2B81E ; Han # Lo [4383] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B81E 2B820..2CEAD ; Han # Lo [5774] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEAD 2CEB0..2EBE0 ; Han # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2EBF0..2EE5D ; Han # Lo [622] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE5D @@ -1613,7 +1639,7 @@ FA70..FAD9 ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILI 30000..3134A ; Han # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A 31350..33479 ; Han # Lo [8490] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-33479 -# Total code points: 103351 +# Total code points: 103352 # ================================================ @@ -1656,8 +1682,7 @@ A490..A4C6 ; Yi # So [55] YI RADICAL QOT..YI RADICAL KE 0951..0954 ; Inherited # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT 1AB0..1ABD ; Inherited # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Inherited # Me COMBINING PARENTHESES OVERLAY -1ABF..1ADD ; Inherited # Mn [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW -1AE0..1AEB ; Inherited # Mn [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE +1ABF..1AF0 ; Inherited # Mn [50] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOUBLE COMMA ABOVE 1CD0..1CD2 ; Inherited # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA 1CD4..1CE0 ; Inherited # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA 1CE2..1CE8 ; Inherited # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL @@ -1680,13 +1705,15 @@ FE20..FE2D ; Inherited # Mn [14] COMBINING LIGATURE LEFT HALF..COMBINING CON 1133B ; Inherited # Mn COMBINING BINDU BELOW 1CF00..1CF2D ; Inherited # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; Inherited # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG +1D127..1D128 ; Inherited # Mn [2] MUSICAL SYMBOL COMBINING STRESS..MUSICAL SYMBOL COMBINING UNSTRESS 1D167..1D169 ; Inherited # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D17B..1D182 ; Inherited # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE 1D185..1D18B ; Inherited # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; Inherited # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO +1D25B..1D25C ; Inherited # Mn [2] MUSICAL SYMBOL COMBINING TREMOLO-4..MUSICAL SYMBOL COMBINING TREMOLO-5 E0100..E01EF ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 684 +# Total code points: 695 # ================================================ @@ -1916,11 +1943,14 @@ A82C ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN ALTERNATE HASANTA # ================================================ 12000..12399 ; Cuneiform # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U -12400..1246E ; Cuneiform # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +12400..1246F ; Cuneiform # Nl [112] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN SEVEN ASH TENU 12470..12474 ; Cuneiform # Po [5] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON +12475..1247F ; Cuneiform # Nl [11] CUNEIFORM NUMERIC SIGN EIGHT ASH TENU..CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU 12480..12543 ; Cuneiform # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12550..125A7 ; Cuneiform # Nl [88] CUNEIFORM NUMERIC SIGN ONE N01..CUNEIFORM NUMERIC SIGN FIVE N54 +1264C..12686 ; Cuneiform # Nl [59] CUNEIFORM NUMERIC SIGN ONE N01 FLAT..CUNEIFORM NUMERIC SIGN ONE N36 FLAT -# Total code points: 1234 +# Total code points: 1393 # ================================================ @@ -2773,10 +2803,10 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 16FE0 ; Tangut # Lm TANGUT ITERATION MARK 17000..18AFF ; Tangut # Lo [6912] TANGUT IDEOGRAPH-17000..TANGUT COMPONENT-768 -18D00..18D1E ; Tangut # Lo [31] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D1E +18D00..18D20 ; Tangut # Lo [33] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D20 18D80..18DF2 ; Tangut # Lo [115] TANGUT COMPONENT-769..TANGUT COMPONENT-883 -# Total code points: 7059 +# Total code points: 7061 # ================================================ @@ -2973,10 +3003,10 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI # ================================================ 16FE4 ; Khitan_Small_Script # Mn KHITAN SMALL SCRIPT FILLER -18B00..18CD5 ; Khitan_Small_Script # Lo [470] KHITAN SMALL SCRIPT CHARACTER-18B00..KHITAN SMALL SCRIPT CHARACTER-18CD5 +18B00..18CDA ; Khitan_Small_Script # Lo [475] KHITAN SMALL SCRIPT CHARACTER-18B00..KHITAN SMALL SCRIPT CHARACTER-18CDA 18CFF ; Khitan_Small_Script # Lo KHITAN SMALL SCRIPT CHARACTER-18CFF -# Total code points: 472 +# Total code points: 477 # ================================================ @@ -3179,4 +3209,23 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI # Total code points: 50 +# ================================================ + +18E00..19191 ; Jurchen # Lo [914] JURCHEN CHARACTER-18E00..JURCHEN CHARACTER-19191 +191A0..191D2 ; Jurchen # Lo [51] JURCHEN RADICAL-01..JURCHEN RADICAL-51 + +# Total code points: 965 + +# ================================================ + +125A8..1264B ; Proto_Cuneiform # Nl [164] CUNEIFORM NUMERIC SIGN ONE N56..CUNEIFORM NUMERIC SIGN THREE N07B + +# Total code points: 164 + +# ================================================ + +3D000..3FC3F ; Seal # Lo [11328] SMALL SEAL CHARACTER-3D000..SMALL SEAL CHARACTER-3FC3F + +# Total code points: 11328 + # EOF diff --git a/src/java.base/share/data/unicodedata/SpecialCasing.txt b/src/java.base/share/data/unicodedata/SpecialCasing.txt index 1013344a6f20..50a40766199d 100644 --- a/src/java.base/share/data/unicodedata/SpecialCasing.txt +++ b/src/java.base/share/data/unicodedata/SpecialCasing.txt @@ -1,6 +1,6 @@ -# SpecialCasing-17.0.0.txt -# Date: 2025-07-31, 22:11:55 GMT -# © 2025 Unicode®, Inc. +# SpecialCasing-18.0.0.txt +# Date: 2026-05-19, 02:48:44 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -63,8 +63,16 @@ # do not modify the case mapping algorithms in the core specification, chapter 3. # ================================================================================ -# The German es-zed is special--the normal mapping is to SS. -# Note: the titlecase should never occur in practice. It is equal to titlecase(uppercase()) +# The German sharp s (ß, also called es-zed) is special: +# The customary uppercase mapping is to SS, +# rather than to the newer U+1E9E capital sharp s. +# +# Note: The Case Pair Stability policy forbids +# changing the default Unicode uppercasing of U+00DF to U+1E9E. +# +# For details see The Unicode Standard, section 5.18.2, under “German sharp s”. +# +# Note: The titlecase should never occur in practice. It is equal to titlecase(uppercase('ß')). 00DF; 00DF; 0053 0073; 0053 0053; # LATIN SMALL LETTER SHARP S @@ -81,6 +89,7 @@ FB03; FB03; 0046 0066 0069; 0046 0046 0049; # LATIN SMALL LIGATURE FFI FB04; FB04; 0046 0066 006C; 0046 0046 004C; # LATIN SMALL LIGATURE FFL FB05; FB05; 0053 0074; 0053 0054; # LATIN SMALL LIGATURE LONG S T FB06; FB06; 0053 0074; 0053 0054; # LATIN SMALL LIGATURE ST +1DF95; 1DF95; 0053 0073; 0053 0053; # LATIN SMALL LIGATURE LONG S WITH DESCENDER S 0587; 0587; 0535 0582; 0535 0552; # ARMENIAN SMALL LIGATURE ECH YIWN FB13; FB13; 0544 0576; 0544 0546; # ARMENIAN SMALL LIGATURE MEN NOW diff --git a/src/java.base/share/data/unicodedata/UnicodeData.txt b/src/java.base/share/data/unicodedata/UnicodeData.txt index fca68e3e154e..ebccf021c4fc 100644 --- a/src/java.base/share/data/unicodedata/UnicodeData.txt +++ b/src/java.base/share/data/unicodedata/UnicodeData.txt @@ -629,12 +629,12 @@ 0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;; 0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F 0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;; -0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;; +0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;A7DD;;A7DD 0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;; 0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;; 027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;; 027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;; -027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;; +027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;A7E2;;A7E2 027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64 027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;; 027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;; @@ -1355,6 +1355,7 @@ 0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584; 0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585; 0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586; +0558;MODIFIER LETTER ARMENIAN SMALL EH;Lm;0;L; 0567;;;;N;;;;; 0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;; 055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;; 055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;; @@ -1405,6 +1406,8 @@ 0588;ARMENIAN SMALL LETTER YI WITH STROKE;Ll;0;L;;;;;N;;;;; 0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;; 058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;; +058B;MODIFIER LETTER ARMENIAN SMALL INI;Lm;0;L; 056B;;;;N;;;;; +058C;MODIFIER LETTER ARMENIAN SMALL YI;Lm;0;L; 0575;;;;N;;;;; 058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;; 058E;LEFT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;; 058F;ARMENIAN DRAM SIGN;Sc;0;ET;;;;;N;;;;; @@ -1463,6 +1466,8 @@ 05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;; 05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;; 05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;; +05C8;HEBREW POINT SHEVA NA MUDGASH;Mn;10;NSM;;;;;N;;;;; +05C9;HEBREW POINT DAGESH HAZAQ MUDGASH;Mn;21;NSM;;;;;N;;;;; 05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;; 05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;; 05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;; @@ -2687,6 +2692,8 @@ 0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;; 0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;; 0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0B53;ORIYA SIGN DOT ABOVE;Mn;0;NSM;;;;;N;;;;; +0B54;ORIYA SIGN DOUBLE DOT ABOVE;Mn;0;NSM;;;;;N;;;;; 0B55;ORIYA SIGN OVERLINE;Mn;0;NSM;;;;;N;;;;; 0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;; 0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;; @@ -6155,6 +6162,8 @@ 1ADB;COMBINING DOWN TACK ABOVE;Mn;230;NSM;;;;;N;;;;; 1ADC;COMBINING DIAERESIS WITH RAISED LEFT DOT;Mn;230;NSM;;;;;N;;;;; 1ADD;COMBINING DOT-AND-RING BELOW;Mn;220;NSM;;;;;N;;;;; +1ADE;COMBINING GRAVE-DOT;Mn;230;NSM;;;;;N;;;;; +1ADF;COMBINING DOT-ACUTE;Mn;230;NSM;;;;;N;;;;; 1AE0;COMBINING LEFT TACK ABOVE;Mn;230;NSM;;;;;N;;;;; 1AE1;COMBINING RIGHT TACK ABOVE;Mn;230;NSM;;;;;N;;;;; 1AE2;COMBINING MINUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; @@ -6167,6 +6176,11 @@ 1AE9;COMBINING LEFT ANGLE CENTRED ABOVE;Mn;230;NSM;;;;;N;;;;; 1AEA;COMBINING UPWARDS ARROW ABOVE;Mn;230;NSM;;;;;N;;;;; 1AEB;COMBINING DOUBLE RIGHTWARDS ARROW ABOVE;Mn;234;NSM;;;;;N;;;;; +1AEC;COMBINING CARON-ACUTE;Mn;230;NSM;;;;;N;;;;; +1AED;COMBINING VERTICAL-LINE-DOUBLE-ACUTE;Mn;230;NSM;;;;;N;;;;; +1AEE;COMBINING DOUBLE GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;;;;; +1AEF;COMBINING DOUBLE ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;;;;; +1AF0;COMBINING DOUBLE COMMA ABOVE;Mn;230;NSM;;;;;N;;;;; 1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;; 1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;; 1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;; @@ -6225,15 +6239,15 @@ 1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;;;; 1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;; 1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;;;; -1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;;;; +1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;L;;;;;N;;;;; 1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;;;; -1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;;;; +1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;L;;;;;N;;;;; 1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;;;; 1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;; 1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;;;; 1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;;;; 1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;;;; -1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;; +1B42;BALINESE VOWEL SIGN PEPET;Mn;0;L;;;;;N;;;;; 1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;;;; 1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;;;; 1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;; @@ -7529,6 +7543,7 @@ 208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON; 003D;;;;N;;;;; 208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON; 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;; 208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;; +208F;MODIFIER LETTER HIGH AND LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;; 2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L; 0061;;;;N;;;;; 2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L; 0065;;;;N;;;;; 2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L; 006F;;;;N;;;;; @@ -7542,6 +7557,9 @@ 209A;LATIN SUBSCRIPT SMALL LETTER P;Lm;0;L; 0070;;;;N;;;;; 209B;LATIN SUBSCRIPT SMALL LETTER S;Lm;0;L; 0073;;;;N;;;;; 209C;LATIN SUBSCRIPT SMALL LETTER T;Lm;0;L; 0074;;;;N;;;;; +209D;LATIN SUBSCRIPT SMALL LETTER W;Lm;0;L; 0077;;;;N;;;;; +209E;LATIN SUBSCRIPT SMALL LETTER Y;Lm;0;L; 0079;;;;N;;;;; +209F;LATIN SUBSCRIPT SMALL LETTER Z;Lm;0;L; 007A;;;;N;;;;; 20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;; 20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;; 20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;; @@ -7576,6 +7594,9 @@ 20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;; 20C0;SOM SIGN;Sc;0;ET;;;;;N;;;;; 20C1;SAUDI RIYAL SIGN;Sc;0;ET;;;;;N;;;;; +20C2;RUFIYAA SIGN;Sc;0;ET;;;;;N;;;;; +20C3;UAE DIRHAM SIGN;Sc;0;ET;;;;;N;;;;; +20C4;OMANI RIAL SIGN;Sc;0;ET;;;;;N;;;;; 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;; 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;; 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;; @@ -10931,6 +10952,10 @@ 2E5B;BOTTOM HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;; 2E5C;BOTTOM HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;; 2E5D;OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;; +2E60;WIGGLY EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +2E61;INVERTED WIGGLY EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +2E62;LEFT PARENTHESIS WITH MIDDLE RING;Ps;0;ON;;;;;Y;;;;; +2E63;RIGHT PARENTHESIS WITH MIDDLE RING;Pe;0;ON;;;;;Y;;;;; 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;; 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;; 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;; @@ -14321,6 +14346,8 @@ A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8 A7DA;LATIN CAPITAL LETTER LAMBDA;Lu;0;L;;;;;N;;;;A7DB; A7DB;LATIN SMALL LETTER LAMBDA;Ll;0;L;;;;;N;;;A7DA;;A7DA A7DC;LATIN CAPITAL LETTER LAMBDA WITH STROKE;Lu;0;L;;;;;N;;;;019B; +A7DD;LATIN CAPITAL LETTER CLOSED OMEGA;Lu;0;L;;;;;N;;;;0277; +A7E2;LATIN CAPITAL LETTER R WITH LONG LEG;Lu;0;L;;;;;N;;;;027C; A7F1;MODIFIER LETTER CAPITAL S;Lm;0;L; 0053;;;;N;;;;; A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L; 0043;;;;N;;;;; A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L; 0046;;;;N;;;;; @@ -15066,8 +15093,8 @@ AB47;LATIN SMALL LETTER R WITHOUT HANDLE;Ll;0;L;;;;;N;;;;; AB48;LATIN SMALL LETTER DOUBLE R;Ll;0;L;;;;;N;;;;; AB49;LATIN SMALL LETTER R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; AB4A;LATIN SMALL LETTER DOUBLE R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; -AB4B;LATIN SMALL LETTER SCRIPT R;Ll;0;L;;;;;N;;;;; -AB4C;LATIN SMALL LETTER SCRIPT R WITH RING;Ll;0;L;;;;;N;;;;; +AB4B;LATIN SMALL LETTER SCRIPT R;Ll;0;L;;;;;N;;;AB6C;;AB6C +AB4C;LATIN SMALL LETTER SCRIPT R WITH RING;Ll;0;L;;;;;N;;;AB6D;;AB6D AB4D;LATIN SMALL LETTER BASELINE ESH;Ll;0;L;;;;;N;;;;; AB4E;LATIN SMALL LETTER U WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;; AB4F;LATIN SMALL LETTER U BAR WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;; @@ -15099,6 +15126,8 @@ AB68;LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; AB69;MODIFIER LETTER SMALL TURNED W;Lm;0;L; 028D;;;;N;;;;; AB6A;MODIFIER LETTER LEFT TACK;Sk;0;ON;;;;;N;;;;; AB6B;MODIFIER LETTER RIGHT TACK;Sk;0;ON;;;;;N;;;;; +AB6C;LATIN CAPITAL LETTER SCRIPT R;Lu;0;L;;;;;N;;;;AB4B; +AB6D;LATIN CAPITAL LETTER SCRIPT R WITH RING;Lu;0;L;;;;;N;;;;AB4C; AB70;CHEROKEE SMALL LETTER A;Ll;0;L;;;;;N;;;13A0;;13A0 AB71;CHEROKEE SMALL LETTER E;Ll;0;L;;;;;N;;;13A1;;13A1 AB72;CHEROKEE SMALL LETTER I;Ll;0;L;;;;;N;;;13A2;;13A2 @@ -18530,6 +18559,11 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 107B8;MODIFIER LETTER ALVEOLAR CLICK;Lm;0;L; 01C2;;;;N;;;;; 107B9;MODIFIER LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lm;0;L; 1DF0A;;;;N;;;;; 107BA;MODIFIER LETTER SMALL S WITH CURL;Lm;0;L; 1DF1E;;;;N;;;;; +107BB;MODIFIER LETTER SMALL TURNED T;Lm;0;L; 0287;;;;N;;;;; +107BC;MODIFIER LETTER INVERTED GLOTTAL STOP;Lm;0;L; 0296;;;;N;;;;; +107BD;MODIFIER LETTER STRETCHED C;Lm;0;L; 0297;;;;N;;;;; +107BE;MODIFIER LETTER SMALL TURNED K;Lm;0;L; 029E;;;;N;;;;; +107BF;MODIFIER LETTER SMALL ESH WITH DOUBLE BAR;Lm;0;L; 1DF0B;;;;N;;;;; 10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;; 10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;; 10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;; @@ -19632,6 +19666,13 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10EC5;ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW;Lm;0;AL;;;;;N;;;;; 10EC6;ARABIC LETTER THIN NOON;Lo;0;AL;;;;;N;;;;; 10EC7;ARABIC LETTER YEH WITH FOUR DOTS BELOW;Lo;0;AL;;;;;N;;;;; +10EC9;ARABIC SMALL BASELINE FATHA;Sk;0;AL;;;;;N;;;;; +10ECA;ARABIC SMALL BASELINE DOTLESS HEAD OF KHAH;Sk;0;AL;;;;;N;;;;; +10ECB;ARABIC NORTHEAST POINTING ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +10ECC;ARABIC NORTHEAST POINTING ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +10ECD;ARABIC SOUTHWEST POINTING ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +10ECE;ARABIC SMALL CIRCLE ABOVE;Mn;230;NSM;;;;;N;;;;; +10ECF;ARABIC LARGE CIRCLE ABOVE;Mn;230;NSM;;;;;N;;;;; 10ED0;ARABIC BIBLICAL END OF VERSE;Po;0;ON;;;;;N;;;;; 10ED1;ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; 10ED2;ARABIC LIGATURE ALAYHIM AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; @@ -19641,6 +19682,38 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10ED6;ARABIC LIGATURE QUDDISA SIRRUHUMAA;So;0;ON;;;;;N;;;;; 10ED7;ARABIC LIGATURE QUDDISAT ASRAARUHUM;So;0;ON;;;;;N;;;;; 10ED8;ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH;So;0;ON;;;;;N;;;;; +10ED9;ARABIC CROWN LETTER BEH;Lo;0;AL;;;;;N;;;;; +10EDA;ARABIC CROWN LETTER PEH;Lo;0;AL;;;;;N;;;;; +10EDB;ARABIC CROWN LETTER TEH;Lo;0;AL;;;;;N;;;;; +10EDC;ARABIC CROWN LETTER THEH;Lo;0;AL;;;;;N;;;;; +10EDD;ARABIC CROWN LETTER JEEM;Lo;0;AL;;;;;N;;;;; +10EDE;ARABIC CROWN LETTER HAH;Lo;0;AL;;;;;N;;;;; +10EDF;ARABIC CROWN LETTER KHAH;Lo;0;AL;;;;;N;;;;; +10EE0;ARABIC CROWN LETTER SEEN;Lo;0;AL;;;;;N;;;;; +10EE1;ARABIC CROWN LETTER SHEEN;Lo;0;AL;;;;;N;;;;; +10EE2;ARABIC CROWN LETTER SAD;Lo;0;AL;;;;;N;;;;; +10EE3;ARABIC CROWN LETTER DAD;Lo;0;AL;;;;;N;;;;; +10EE4;ARABIC CROWN LETTER TAH;Lo;0;AL;;;;;N;;;;; +10EE5;ARABIC CROWN LETTER ZAH;Lo;0;AL;;;;;N;;;;; +10EE6;ARABIC CROWN LETTER AIN;Lo;0;AL;;;;;N;;;;; +10EE7;ARABIC CROWN LETTER GHAIN;Lo;0;AL;;;;;N;;;;; +10EE8;ARABIC CROWN LETTER FEH;Lo;0;AL;;;;;N;;;;; +10EE9;ARABIC CROWN LETTER QAF;Lo;0;AL;;;;;N;;;;; +10EEA;ARABIC CROWN LETTER KAF;Lo;0;AL;;;;;N;;;;; +10EEB;ARABIC CROWN LETTER MEEM;Lo;0;AL;;;;;N;;;;; +10EEC;ARABIC CROWN LETTER NOON;Lo;0;AL;;;;;N;;;;; +10EED;ARABIC CROWN LETTER HEH;Lo;0;AL;;;;;N;;;;; +10EEE;ARABIC CROWN LETTER YEH;Lo;0;AL;;;;;N;;;;; +10EF0;ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO;Mn;220;NSM;;;;;N;;;;; +10EF1;ARABIC SQUARE BELOW;Mn;220;NSM;;;;;N;;;;; +10EF2;ARABIC FILLED SQUARE BELOW;Mn;220;NSM;;;;;N;;;;; +10EF3;ARABIC SMALL HIGH NOON WITH FATHA;Mn;230;NSM;;;;;N;;;;; +10EF4;ARABIC SMALL LOW NOON WITH FATHA;Mn;220;NSM;;;;;N;;;;; +10EF5;ARABIC SMALL HIGH NOON WITH DAMMA;Mn;230;NSM;;;;;N;;;;; +10EF6;ARABIC SMALL LOW NOON WITH DAMMA;Mn;220;NSM;;;;;N;;;;; +10EF7;ARABIC SMALL HIGH HEH INITIAL FORM;Mn;230;NSM;;;;;N;;;;; +10EF8;ARABIC SMALL HIGH WORD KABBIR;Mn;230;NSM;;;;;N;;;;; +10EF9;ARABIC MARK CROWN;Mn;230;NSM;;;;;N;;;;; 10EFA;ARABIC DOUBLE VERTICAL BAR BELOW;Mn;220;NSM;;;;;N;;;;; 10EFB;ARABIC SMALL LOW NOON;Mn;220;NSM;;;;;N;;;;; 10EFC;ARABIC COMBINING ALEF OVERLAY;Mn;0;NSM;;;;;N;;;;; @@ -21623,6 +21696,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;; +11B0A;DEVANAGARI LETTER ALTERNATE DDDA;Lo;0;L;;;;;N;;;;; 11B60;SHARADA VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; 11B61;SHARADA VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;; 11B62;SHARADA VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; @@ -22032,6 +22106,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11DE7;TOLONG SIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 11DE8;TOLONG SIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 11DE9;TOLONG SIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11DF0;BENGALI SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;; +11DF1;BENGALI LETTER ALTERNATE BARGIYA BA;Lo;0;L;;;;;N;;;;; 11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;; 11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;; 11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;; @@ -23229,11 +23305,23 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1246C;CUNEIFORM NUMERIC SIGN SEVEN U VARIANT FORM;Nl;0;L;;;;7;N;;;;; 1246D;CUNEIFORM NUMERIC SIGN EIGHT U VARIANT FORM;Nl;0;L;;;;8;N;;;;; 1246E;CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM;Nl;0;L;;;;9;N;;;;; +1246F;CUNEIFORM NUMERIC SIGN SEVEN ASH TENU;Nl;0;L;;;;7;N;;;;; 12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;; 12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;; 12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;; 12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;; 12474;CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON;Po;0;L;;;;;N;;;;; +12475;CUNEIFORM NUMERIC SIGN EIGHT ASH TENU;Nl;0;L;;;;8;N;;;;; +12476;CUNEIFORM NUMERIC SIGN NINE ASH TENU;Nl;0;L;;;;9;N;;;;; +12477;CUNEIFORM NUMERIC SIGN ASH TIMES ONE DISH TENU;Nl;0;L;;;;1;N;;;;; +12478;CUNEIFORM NUMERIC SIGN ASH TIMES TWO DISH TENU;Nl;0;L;;;;2;N;;;;; +12479;CUNEIFORM NUMERIC SIGN ASH TIMES THREE DISH TENU;Nl;0;L;;;;3;N;;;;; +1247A;CUNEIFORM NUMERIC SIGN ASH TIMES FOUR DISH TENU;Nl;0;L;;;;4;N;;;;; +1247B;CUNEIFORM NUMERIC SIGN ASH TIMES FIVE DISH TENU;Nl;0;L;;;;5;N;;;;; +1247C;CUNEIFORM NUMERIC SIGN ASH TIMES SIX DISH TENU;Nl;0;L;;;;6;N;;;;; +1247D;CUNEIFORM NUMERIC SIGN ASH TIMES SEVEN DISH TENU;Nl;0;L;;;;7;N;;;;; +1247E;CUNEIFORM NUMERIC SIGN ASH TIMES EIGHT DISH TENU;Nl;0;L;;;;8;N;;;;; +1247F;CUNEIFORM NUMERIC SIGN ASH TIMES NINE DISH TENU;Nl;0;L;;;;9;N;;;;; 12480;CUNEIFORM SIGN AB TIMES NUN TENU;Lo;0;L;;;;;N;;;;; 12481;CUNEIFORM SIGN AB TIMES SHU2;Lo;0;L;;;;;N;;;;; 12482;CUNEIFORM SIGN AD TIMES ESH2;Lo;0;L;;;;;N;;;;; @@ -23430,6 +23518,317 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 12541;CUNEIFORM SIGN ZA7;Lo;0;L;;;;;N;;;;; 12542;CUNEIFORM SIGN ZU OVER ZU PLUS SAR;Lo;0;L;;;;;N;;;;; 12543;CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU;Lo;0;L;;;;;N;;;;; +12550;CUNEIFORM NUMERIC SIGN ONE N01;Nl;0;L;;;;1;N;;;;; +12551;CUNEIFORM NUMERIC SIGN TWO N01;Nl;0;L;;;;2;N;;;;; +12552;CUNEIFORM NUMERIC SIGN THREE N01;Nl;0;L;;;;3;N;;;;; +12553;CUNEIFORM NUMERIC SIGN FOUR N01;Nl;0;L;;;;4;N;;;;; +12554;CUNEIFORM NUMERIC SIGN FIVE N01;Nl;0;L;;;;5;N;;;;; +12555;CUNEIFORM NUMERIC SIGN SIX N01;Nl;0;L;;;;6;N;;;;; +12556;CUNEIFORM NUMERIC SIGN SEVEN N01;Nl;0;L;;;;7;N;;;;; +12557;CUNEIFORM NUMERIC SIGN EIGHT N01;Nl;0;L;;;;8;N;;;;; +12558;CUNEIFORM NUMERIC SIGN NINE N01;Nl;0;L;;;;9;N;;;;; +12559;CUNEIFORM NUMERIC SIGN ONE N08;Nl;0;L;;;;1;N;;;;; +1255A;CUNEIFORM NUMERIC SIGN TWO N08;Nl;0;L;;;;2;N;;;;; +1255B;CUNEIFORM NUMERIC SIGN THREE N08;Nl;0;L;;;;3;N;;;;; +1255C;CUNEIFORM NUMERIC SIGN FOUR N08;Nl;0;L;;;;4;N;;;;; +1255D;CUNEIFORM NUMERIC SIGN FIVE N08;Nl;0;L;;;;5;N;;;;; +1255E;CUNEIFORM NUMERIC SIGN SIX N08;Nl;0;L;;;;6;N;;;;; +1255F;CUNEIFORM NUMERIC SIGN SEVEN N08;Nl;0;L;;;;7;N;;;;; +12560;CUNEIFORM NUMERIC SIGN EIGHT N08;Nl;0;L;;;;8;N;;;;; +12561;CUNEIFORM NUMERIC SIGN NINE N08;Nl;0;L;;;;9;N;;;;; +12562;CUNEIFORM NUMERIC SIGN ONE N14;Nl;0;L;;;;1;N;;;;; +12563;CUNEIFORM NUMERIC SIGN TWO N14;Nl;0;L;;;;2;N;;;;; +12564;CUNEIFORM NUMERIC SIGN THREE N14;Nl;0;L;;;;3;N;;;;; +12565;CUNEIFORM NUMERIC SIGN FOUR N14;Nl;0;L;;;;4;N;;;;; +12566;CUNEIFORM NUMERIC SIGN FIVE N14;Nl;0;L;;;;5;N;;;;; +12567;CUNEIFORM NUMERIC SIGN SIX N14;Nl;0;L;;;;6;N;;;;; +12568;CUNEIFORM NUMERIC SIGN SEVEN N14;Nl;0;L;;;;7;N;;;;; +12569;CUNEIFORM NUMERIC SIGN EIGHT N14;Nl;0;L;;;;8;N;;;;; +1256A;CUNEIFORM NUMERIC SIGN NINE N14;Nl;0;L;;;;9;N;;;;; +1256B;CUNEIFORM NUMERIC SIGN ONE N34;Nl;0;L;;;;1;N;;;;; +1256C;CUNEIFORM NUMERIC SIGN TWO N34;Nl;0;L;;;;2;N;;;;; +1256D;CUNEIFORM NUMERIC SIGN THREE N34;Nl;0;L;;;;3;N;;;;; +1256E;CUNEIFORM NUMERIC SIGN FOUR N34;Nl;0;L;;;;4;N;;;;; +1256F;CUNEIFORM NUMERIC SIGN FIVE N34;Nl;0;L;;;;5;N;;;;; +12570;CUNEIFORM NUMERIC SIGN SIX N34;Nl;0;L;;;;6;N;;;;; +12571;CUNEIFORM NUMERIC SIGN SEVEN N34;Nl;0;L;;;;7;N;;;;; +12572;CUNEIFORM NUMERIC SIGN EIGHT N34;Nl;0;L;;;;8;N;;;;; +12573;CUNEIFORM NUMERIC SIGN NINE N34;Nl;0;L;;;;9;N;;;;; +12574;CUNEIFORM NUMERIC SIGN ONE N48;Nl;0;L;;;;1;N;;;;; +12575;CUNEIFORM NUMERIC SIGN TWO N48;Nl;0;L;;;;2;N;;;;; +12576;CUNEIFORM NUMERIC SIGN THREE N48;Nl;0;L;;;;3;N;;;;; +12577;CUNEIFORM NUMERIC SIGN FOUR N48;Nl;0;L;;;;4;N;;;;; +12578;CUNEIFORM NUMERIC SIGN FIVE N48;Nl;0;L;;;;5;N;;;;; +12579;CUNEIFORM NUMERIC SIGN ONE N45;Nl;0;L;;;;1;N;;;;; +1257A;CUNEIFORM NUMERIC SIGN TWO N45;Nl;0;L;;;;2;N;;;;; +1257B;CUNEIFORM NUMERIC SIGN THREE N45;Nl;0;L;;;;3;N;;;;; +1257C;CUNEIFORM NUMERIC SIGN FOUR N45;Nl;0;L;;;;4;N;;;;; +1257D;CUNEIFORM NUMERIC SIGN FIVE N45;Nl;0;L;;;;5;N;;;;; +1257E;CUNEIFORM NUMERIC SIGN SIX N45;Nl;0;L;;;;6;N;;;;; +1257F;CUNEIFORM NUMERIC SIGN SEVEN N45;Nl;0;L;;;;7;N;;;;; +12580;CUNEIFORM NUMERIC SIGN EIGHT N45;Nl;0;L;;;;8;N;;;;; +12581;CUNEIFORM NUMERIC SIGN NINE N45;Nl;0;L;;;;9;N;;;;; +12582;CUNEIFORM NUMERIC SIGN ONE N50;Nl;0;L;;;;1;N;;;;; +12583;CUNEIFORM NUMERIC SIGN TWO N50;Nl;0;L;;;;2;N;;;;; +12584;CUNEIFORM NUMERIC SIGN THREE N50;Nl;0;L;;;;3;N;;;;; +12585;CUNEIFORM NUMERIC SIGN FOUR N50;Nl;0;L;;;;4;N;;;;; +12586;CUNEIFORM NUMERIC SIGN FIVE N50;Nl;0;L;;;;5;N;;;;; +12587;CUNEIFORM NUMERIC SIGN ONE EIGHTH IKU CURVED;Nl;0;L;;;;1/8;N;;;;; +12588;CUNEIFORM NUMERIC SIGN ONE EIGHTH IKU CURVED VARIANT FORM;Nl;0;L;;;;1/8;N;;;;; +12589;CUNEIFORM NUMERIC SIGN ONE N01 REVERSED;Nl;0;L;;;;1/4;N;;;;; +1258A;CUNEIFORM NUMERIC SIGN ONE QUARTER IKU CURVED VARIANT FORM;Nl;0;L;;;;1/4;N;;;;; +1258B;CUNEIFORM NUMERIC SIGN ONE HALF IKU CURVED VARIANT FORM;Nl;0;L;;;;1/2;N;;;;; +1258C;CUNEIFORM NUMERIC SIGN ONE N22;Nl;0;L;;;;1;N;;;;; +1258D;CUNEIFORM NUMERIC SIGN TWO N22;Nl;0;L;;;;2;N;;;;; +1258E;CUNEIFORM NUMERIC SIGN ONE BURU CURVED;Nl;0;L;;;;1;N;;;;; +1258F;CUNEIFORM NUMERIC SIGN TWO BURU CURVED;Nl;0;L;;;;2;N;;;;; +12590;CUNEIFORM NUMERIC SIGN THREE BURU CURVED;Nl;0;L;;;;3;N;;;;; +12591;CUNEIFORM NUMERIC SIGN FOUR BURU CURVED;Nl;0;L;;;;4;N;;;;; +12592;CUNEIFORM NUMERIC SIGN FIVE BURU CURVED;Nl;0;L;;;;5;N;;;;; +12593;CUNEIFORM NUMERIC SIGN ONE BAN2 CURVED;Nl;0;L;;;;1;N;;;;; +12594;CUNEIFORM NUMERIC SIGN TWO BAN2 CURVED;Nl;0;L;;;;2;N;;;;; +12595;CUNEIFORM NUMERIC SIGN THREE BAN2 CURVED;Nl;0;L;;;;3;N;;;;; +12596;CUNEIFORM NUMERIC SIGN FOUR BAN2 CURVED;Nl;0;L;;;;4;N;;;;; +12597;CUNEIFORM NUMERIC SIGN FIVE BAN2 CURVED;Nl;0;L;;;;5;N;;;;; +12598;CUNEIFORM NUMERIC SIGN NINDA2 TIMES SHE PLUS ONE ASH CURVED;Nl;0;L;;;;1/3;N;;;;; +12599;CUNEIFORM NUMERIC SIGN NINDA2 TIMES SHE PLUS TWO ASH CURVED;Nl;0;L;;;;2/3;N;;;;; +1259A;CUNEIFORM NUMERIC SIGN ONE N51;Nl;0;L;;;;1;N;;;;; +1259B;CUNEIFORM NUMERIC SIGN TWO N51;Nl;0;L;;;;2;N;;;;; +1259C;CUNEIFORM NUMERIC SIGN THREE N51;Nl;0;L;;;;3;N;;;;; +1259D;CUNEIFORM NUMERIC SIGN FOUR N51;Nl;0;L;;;;4;N;;;;; +1259E;CUNEIFORM NUMERIC SIGN FIVE N51;Nl;0;L;;;;5;N;;;;; +1259F;CUNEIFORM NUMERIC SIGN SIX N51;Nl;0;L;;;;6;N;;;;; +125A0;CUNEIFORM NUMERIC SIGN SEVEN N51;Nl;0;L;;;;7;N;;;;; +125A1;CUNEIFORM NUMERIC SIGN EIGHT N51;Nl;0;L;;;;8;N;;;;; +125A2;CUNEIFORM NUMERIC SIGN NINE N51;Nl;0;L;;;;9;N;;;;; +125A3;CUNEIFORM NUMERIC SIGN ONE N54;Nl;0;L;;;;1;N;;;;; +125A4;CUNEIFORM NUMERIC SIGN TWO N54;Nl;0;L;;;;2;N;;;;; +125A5;CUNEIFORM NUMERIC SIGN THREE N54;Nl;0;L;;;;3;N;;;;; +125A6;CUNEIFORM NUMERIC SIGN FOUR N54;Nl;0;L;;;;4;N;;;;; +125A7;CUNEIFORM NUMERIC SIGN FIVE N54;Nl;0;L;;;;5;N;;;;; +125A8;CUNEIFORM NUMERIC SIGN ONE N56;Nl;0;L;;;;1;N;;;;; +125A9;CUNEIFORM NUMERIC SIGN TWO N56;Nl;0;L;;;;2;N;;;;; +125AA;CUNEIFORM NUMERIC SIGN ONE N24;Nl;0;L;;;;1;N;;;;; +125AB;CUNEIFORM NUMERIC SIGN ONE N26;Nl;0;L;;;;1;N;;;;; +125AC;CUNEIFORM NUMERIC SIGN ONE N28;Nl;0;L;;;;1;N;;;;; +125AD;CUNEIFORM NUMERIC SIGN ONE N29A;Nl;0;L;;;;1;N;;;;; +125AE;CUNEIFORM NUMERIC SIGN ONE N29B;Nl;0;L;;;;1;N;;;;; +125AF;CUNEIFORM NUMERIC SIGN ONE N30A;Nl;0;L;;;;1;N;;;;; +125B0;CUNEIFORM NUMERIC SIGN ONE N30C;Nl;0;L;;;;1;N;;;;; +125B1;CUNEIFORM NUMERIC SIGN ONE N30D;Nl;0;L;;;;1;N;;;;; +125B2;CUNEIFORM NUMERIC SIGN ONE N30E;Nl;0;L;;;;1;N;;;;; +125B3;CUNEIFORM NUMERIC SIGN ONE N31;Nl;0;L;;;;1;N;;;;; +125B4;CUNEIFORM NUMERIC SIGN ONE N32;Nl;0;L;;;;1;N;;;;; +125B5;CUNEIFORM NUMERIC SIGN ONE N33;Nl;0;L;;;;1;N;;;;; +125B6;CUNEIFORM NUMERIC SIGN ONE N39A;Nl;0;L;;;;1;N;;;;; +125B7;CUNEIFORM NUMERIC SIGN TWO N39A;Nl;0;L;;;;2;N;;;;; +125B8;CUNEIFORM NUMERIC SIGN THREE N39A;Nl;0;L;;;;3;N;;;;; +125B9;CUNEIFORM NUMERIC SIGN FOUR N39A;Nl;0;L;;;;4;N;;;;; +125BA;CUNEIFORM NUMERIC SIGN ONE N39B;Nl;0;L;;;;1;N;;;;; +125BB;CUNEIFORM NUMERIC SIGN TWO N39B;Nl;0;L;;;;2;N;;;;; +125BC;CUNEIFORM NUMERIC SIGN THREE N39B;Nl;0;L;;;;3;N;;;;; +125BD;CUNEIFORM NUMERIC SIGN FOUR N39B;Nl;0;L;;;;4;N;;;;; +125BE;CUNEIFORM NUMERIC SIGN ONE N02;Nl;0;L;;;;1;N;;;;; +125BF;CUNEIFORM NUMERIC SIGN TWO N02;Nl;0;L;;;;2;N;;;;; +125C0;CUNEIFORM NUMERIC SIGN THREE N02;Nl;0;L;;;;3;N;;;;; +125C1;CUNEIFORM NUMERIC SIGN FOUR N02;Nl;0;L;;;;4;N;;;;; +125C2;CUNEIFORM NUMERIC SIGN FIVE N02;Nl;0;L;;;;5;N;;;;; +125C3;CUNEIFORM NUMERIC SIGN SIX N02;Nl;0;L;;;;6;N;;;;; +125C4;CUNEIFORM NUMERIC SIGN SEVEN N02;Nl;0;L;;;;7;N;;;;; +125C5;CUNEIFORM NUMERIC SIGN EIGHT N02;Nl;0;L;;;;8;N;;;;; +125C6;CUNEIFORM NUMERIC SIGN NINE N02;Nl;0;L;;;;9;N;;;;; +125C7;CUNEIFORM NUMERIC SIGN ONE N15;Nl;0;L;;;;1;N;;;;; +125C8;CUNEIFORM NUMERIC SIGN TWO N15;Nl;0;L;;;;2;N;;;;; +125C9;CUNEIFORM NUMERIC SIGN THREE N15;Nl;0;L;;;;3;N;;;;; +125CA;CUNEIFORM NUMERIC SIGN FOUR N15;Nl;0;L;;;;4;N;;;;; +125CB;CUNEIFORM NUMERIC SIGN FIVE N15;Nl;0;L;;;;5;N;;;;; +125CC;CUNEIFORM NUMERIC SIGN ONE N35;Nl;0;L;;;;1;N;;;;; +125CD;CUNEIFORM NUMERIC SIGN TWO N35;Nl;0;L;;;;2;N;;;;; +125CE;CUNEIFORM NUMERIC SIGN THREE N35;Nl;0;L;;;;3;N;;;;; +125CF;CUNEIFORM NUMERIC SIGN FOUR N35;Nl;0;L;;;;4;N;;;;; +125D0;CUNEIFORM NUMERIC SIGN FIVE N35;Nl;0;L;;;;5;N;;;;; +125D1;CUNEIFORM NUMERIC SIGN ONE N06;Nl;0;L;;;;1;N;;;;; +125D2;CUNEIFORM NUMERIC SIGN TWO N06;Nl;0;L;;;;2;N;;;;; +125D3;CUNEIFORM NUMERIC SIGN THREE N06;Nl;0;L;;;;3;N;;;;; +125D4;CUNEIFORM NUMERIC SIGN FOUR N06;Nl;0;L;;;;4;N;;;;; +125D5;CUNEIFORM NUMERIC SIGN FIVE N06;Nl;0;L;;;;5;N;;;;; +125D6;CUNEIFORM NUMERIC SIGN SIX N06;Nl;0;L;;;;6;N;;;;; +125D7;CUNEIFORM NUMERIC SIGN SEVEN N06;Nl;0;L;;;;7;N;;;;; +125D8;CUNEIFORM NUMERIC SIGN EIGHT N06;Nl;0;L;;;;8;N;;;;; +125D9;CUNEIFORM NUMERIC SIGN NINE N06;Nl;0;L;;;;9;N;;;;; +125DA;CUNEIFORM NUMERIC SIGN ONE N21;Nl;0;L;;;;1;N;;;;; +125DB;CUNEIFORM NUMERIC SIGN TWO N21;Nl;0;L;;;;2;N;;;;; +125DC;CUNEIFORM NUMERIC SIGN THREE N21;Nl;0;L;;;;3;N;;;;; +125DD;CUNEIFORM NUMERIC SIGN FOUR N21;Nl;0;L;;;;4;N;;;;; +125DE;CUNEIFORM NUMERIC SIGN FIVE N21;Nl;0;L;;;;5;N;;;;; +125DF;CUNEIFORM NUMERIC SIGN ONE N38;Nl;0;L;;;;1;N;;;;; +125E0;CUNEIFORM NUMERIC SIGN ONE N52;Nl;0;L;;;;1;N;;;;; +125E1;CUNEIFORM NUMERIC SIGN TWO N52;Nl;0;L;;;;2;N;;;;; +125E2;CUNEIFORM NUMERIC SIGN THREE N52;Nl;0;L;;;;3;N;;;;; +125E3;CUNEIFORM NUMERIC SIGN FOUR N52;Nl;0;L;;;;4;N;;;;; +125E4;CUNEIFORM NUMERIC SIGN FIVE N52;Nl;0;L;;;;5;N;;;;; +125E5;CUNEIFORM NUMERIC SIGN SIX N52;Nl;0;L;;;;6;N;;;;; +125E6;CUNEIFORM NUMERIC SIGN SEVEN N52;Nl;0;L;;;;7;N;;;;; +125E7;CUNEIFORM NUMERIC SIGN EIGHT N52;Nl;0;L;;;;8;N;;;;; +125E8;CUNEIFORM NUMERIC SIGN NINE N52;Nl;0;L;;;;9;N;;;;; +125E9;CUNEIFORM NUMERIC SIGN ONE N60;Nl;0;L;;;;1;N;;;;; +125EA;CUNEIFORM NUMERIC SIGN ONE N24A;Nl;0;L;;;;1;N;;;;; +125EB;CUNEIFORM NUMERIC SIGN ONE N40;Nl;0;L;;;;1;N;;;;; +125EC;CUNEIFORM NUMERIC SIGN TWO N40;Nl;0;L;;;;2;N;;;;; +125ED;CUNEIFORM NUMERIC SIGN THREE N40;Nl;0;L;;;;3;N;;;;; +125EE;CUNEIFORM NUMERIC SIGN FOUR N40;Nl;0;L;;;;4;N;;;;; +125EF;CUNEIFORM NUMERIC SIGN ONE N03;Nl;0;L;;;;1;N;;;;; +125F0;CUNEIFORM NUMERIC SIGN TWO N03;Nl;0;L;;;;2;N;;;;; +125F1;CUNEIFORM NUMERIC SIGN THREE N03;Nl;0;L;;;;3;N;;;;; +125F2;CUNEIFORM NUMERIC SIGN FOUR N03;Nl;0;L;;;;4;N;;;;; +125F3;CUNEIFORM NUMERIC SIGN FIVE N03;Nl;0;L;;;;5;N;;;;; +125F4;CUNEIFORM NUMERIC SIGN ONE N18;Nl;0;L;;;;1;N;;;;; +125F5;CUNEIFORM NUMERIC SIGN TWO N18;Nl;0;L;;;;2;N;;;;; +125F6;CUNEIFORM NUMERIC SIGN THREE N18;Nl;0;L;;;;3;N;;;;; +125F7;CUNEIFORM NUMERIC SIGN FOUR N18;Nl;0;L;;;;4;N;;;;; +125F8;CUNEIFORM NUMERIC SIGN FIVE N18;Nl;0;L;;;;5;N;;;;; +125F9;CUNEIFORM NUMERIC SIGN SIX N18;Nl;0;L;;;;6;N;;;;; +125FA;CUNEIFORM NUMERIC SIGN SEVEN N18;Nl;0;L;;;;7;N;;;;; +125FB;CUNEIFORM NUMERIC SIGN EIGHT N18;Nl;0;L;;;;8;N;;;;; +125FC;CUNEIFORM NUMERIC SIGN NINE N18;Nl;0;L;;;;9;N;;;;; +125FD;CUNEIFORM NUMERIC SIGN ONE N45A;Nl;0;L;;;;1;N;;;;; +125FE;CUNEIFORM NUMERIC SIGN ONE N24B;Nl;0;L;;;;1;N;;;;; +125FF;CUNEIFORM NUMERIC SIGN ONE N26B;Nl;0;L;;;;1;N;;;;; +12600;CUNEIFORM NUMERIC SIGN ONE N28B;Nl;0;L;;;;1;N;;;;; +12601;CUNEIFORM NUMERIC SIGN ONE N29AB;Nl;0;L;;;;1;N;;;;; +12602;CUNEIFORM NUMERIC SIGN ONE N41;Nl;0;L;;;;1;N;;;;; +12603;CUNEIFORM NUMERIC SIGN TWO N41;Nl;0;L;;;;2;N;;;;; +12604;CUNEIFORM NUMERIC SIGN THREE N41;Nl;0;L;;;;3;N;;;;; +12605;CUNEIFORM NUMERIC SIGN FOUR N41;Nl;0;L;;;;4;N;;;;; +12606;CUNEIFORM NUMERIC SIGN ONE N04;Nl;0;L;;;;1;N;;;;; +12607;CUNEIFORM NUMERIC SIGN TWO N04;Nl;0;L;;;;2;N;;;;; +12608;CUNEIFORM NUMERIC SIGN THREE N04;Nl;0;L;;;;3;N;;;;; +12609;CUNEIFORM NUMERIC SIGN FOUR N04;Nl;0;L;;;;4;N;;;;; +1260A;CUNEIFORM NUMERIC SIGN FIVE N04;Nl;0;L;;;;5;N;;;;; +1260B;CUNEIFORM NUMERIC SIGN ONE N19;Nl;0;L;;;;1;N;;;;; +1260C;CUNEIFORM NUMERIC SIGN TWO N19;Nl;0;L;;;;2;N;;;;; +1260D;CUNEIFORM NUMERIC SIGN THREE N19;Nl;0;L;;;;3;N;;;;; +1260E;CUNEIFORM NUMERIC SIGN FOUR N19;Nl;0;L;;;;4;N;;;;; +1260F;CUNEIFORM NUMERIC SIGN FIVE N19;Nl;0;L;;;;5;N;;;;; +12610;CUNEIFORM NUMERIC SIGN SIX N19;Nl;0;L;;;;6;N;;;;; +12611;CUNEIFORM NUMERIC SIGN SEVEN N19;Nl;0;L;;;;7;N;;;;; +12612;CUNEIFORM NUMERIC SIGN EIGHT N19;Nl;0;L;;;;8;N;;;;; +12613;CUNEIFORM NUMERIC SIGN NINE N19;Nl;0;L;;;;9;N;;;;; +12614;CUNEIFORM NUMERIC SIGN ONE N46;Nl;0;L;;;;1;N;;;;; +12615;CUNEIFORM NUMERIC SIGN TWO N46;Nl;0;L;;;;2;N;;;;; +12616;CUNEIFORM NUMERIC SIGN ONE N36;Nl;0;L;;;;1;N;;;;; +12617;CUNEIFORM NUMERIC SIGN TWO N36;Nl;0;L;;;;2;N;;;;; +12618;CUNEIFORM NUMERIC SIGN THREE N36;Nl;0;L;;;;3;N;;;;; +12619;CUNEIFORM NUMERIC SIGN FOUR N36;Nl;0;L;;;;4;N;;;;; +1261A;CUNEIFORM NUMERIC SIGN FIVE N36;Nl;0;L;;;;5;N;;;;; +1261B;CUNEIFORM NUMERIC SIGN SIX N36;Nl;0;L;;;;6;N;;;;; +1261C;CUNEIFORM NUMERIC SIGN SEVEN N36;Nl;0;L;;;;7;N;;;;; +1261D;CUNEIFORM NUMERIC SIGN EIGHT N36;Nl;0;L;;;;8;N;;;;; +1261E;CUNEIFORM NUMERIC SIGN NINE N36;Nl;0;L;;;;9;N;;;;; +1261F;CUNEIFORM NUMERIC SIGN ONE N49;Nl;0;L;;;;1;N;;;;; +12620;CUNEIFORM NUMERIC SIGN TWO N49;Nl;0;L;;;;2;N;;;;; +12621;CUNEIFORM NUMERIC SIGN THREE N49;Nl;0;L;;;;3;N;;;;; +12622;CUNEIFORM NUMERIC SIGN FOUR N49;Nl;0;L;;;;4;N;;;;; +12623;CUNEIFORM NUMERIC SIGN ONE N25;Nl;0;L;;;;1;N;;;;; +12624;CUNEIFORM NUMERIC SIGN ONE N27;Nl;0;L;;;;1;N;;;;; +12625;CUNEIFORM NUMERIC SIGN ONE N28C;Nl;0;L;;;;1;N;;;;; +12626;CUNEIFORM NUMERIC SIGN ONE N29AC;Nl;0;L;;;;1;N;;;;; +12627;CUNEIFORM NUMERIC SIGN ONE N30AC;Nl;0;L;;;;1;N;;;;; +12628;CUNEIFORM NUMERIC SIGN ONE N30CC;Nl;0;L;;;;1;N;;;;; +12629;CUNEIFORM NUMERIC SIGN ONE N42A;Nl;0;L;;;;1;N;;;;; +1262A;CUNEIFORM NUMERIC SIGN TWO N42A;Nl;0;L;;;;2;N;;;;; +1262B;CUNEIFORM NUMERIC SIGN THREE N42A;Nl;0;L;;;;3;N;;;;; +1262C;CUNEIFORM NUMERIC SIGN FOUR N42A;Nl;0;L;;;;4;N;;;;; +1262D;CUNEIFORM NUMERIC SIGN ONE N42B;Nl;0;L;;;;1;N;;;;; +1262E;CUNEIFORM NUMERIC SIGN TWO N42B;Nl;0;L;;;;2;N;;;;; +1262F;CUNEIFORM NUMERIC SIGN THREE N42B;Nl;0;L;;;;3;N;;;;; +12630;CUNEIFORM NUMERIC SIGN FOUR N42B;Nl;0;L;;;;4;N;;;;; +12631;CUNEIFORM NUMERIC SIGN ONE N05;Nl;0;L;;;;1;N;;;;; +12632;CUNEIFORM NUMERIC SIGN TWO N05;Nl;0;L;;;;2;N;;;;; +12633;CUNEIFORM NUMERIC SIGN THREE N05;Nl;0;L;;;;3;N;;;;; +12634;CUNEIFORM NUMERIC SIGN FOUR N05;Nl;0;L;;;;4;N;;;;; +12635;CUNEIFORM NUMERIC SIGN FIVE N05;Nl;0;L;;;;5;N;;;;; +12636;CUNEIFORM NUMERIC SIGN ONE N20;Nl;0;L;;;;1;N;;;;; +12637;CUNEIFORM NUMERIC SIGN TWO N20;Nl;0;L;;;;2;N;;;;; +12638;CUNEIFORM NUMERIC SIGN THREE N20;Nl;0;L;;;;3;N;;;;; +12639;CUNEIFORM NUMERIC SIGN FOUR N20;Nl;0;L;;;;4;N;;;;; +1263A;CUNEIFORM NUMERIC SIGN FIVE N20;Nl;0;L;;;;5;N;;;;; +1263B;CUNEIFORM NUMERIC SIGN SIX N20;Nl;0;L;;;;6;N;;;;; +1263C;CUNEIFORM NUMERIC SIGN SEVEN N20;Nl;0;L;;;;7;N;;;;; +1263D;CUNEIFORM NUMERIC SIGN EIGHT N20;Nl;0;L;;;;8;N;;;;; +1263E;CUNEIFORM NUMERIC SIGN NINE N20;Nl;0;L;;;;9;N;;;;; +1263F;CUNEIFORM NUMERIC SIGN ONE N47;Nl;0;L;;;;1;N;;;;; +12640;CUNEIFORM NUMERIC SIGN TWO N47;Nl;0;L;;;;2;N;;;;; +12641;CUNEIFORM NUMERIC SIGN ONE N37;Nl;0;L;;;;1;N;;;;; +12642;CUNEIFORM NUMERIC SIGN TWO N37;Nl;0;L;;;;2;N;;;;; +12643;CUNEIFORM NUMERIC SIGN ONE N09;Nl;0;L;;;;1;N;;;;; +12644;CUNEIFORM NUMERIC SIGN ONE N11;Nl;0;L;;;;1;N;;;;; +12645;CUNEIFORM NUMERIC SIGN ONE N12;Nl;0;L;;;;1;N;;;;; +12646;CUNEIFORM NUMERIC SIGN ONE N07A;Nl;0;L;;;;1;N;;;;; +12647;CUNEIFORM NUMERIC SIGN TWO N07A;Nl;0;L;;;;2;N;;;;; +12648;CUNEIFORM NUMERIC SIGN THREE N07A;Nl;0;L;;;;3;N;;;;; +12649;CUNEIFORM NUMERIC SIGN ONE N07B;Nl;0;L;;;;1;N;;;;; +1264A;CUNEIFORM NUMERIC SIGN TWO N07B;Nl;0;L;;;;2;N;;;;; +1264B;CUNEIFORM NUMERIC SIGN THREE N07B;Nl;0;L;;;;3;N;;;;; +1264C;CUNEIFORM NUMERIC SIGN ONE N01 FLAT;Nl;0;L;;;;1;N;;;;; +1264D;CUNEIFORM NUMERIC SIGN TWO N01 FLAT;Nl;0;L;;;;2;N;;;;; +1264E;CUNEIFORM NUMERIC SIGN THREE N01 FLAT;Nl;0;L;;;;3;N;;;;; +1264F;CUNEIFORM NUMERIC SIGN FOUR N01 FLAT;Nl;0;L;;;;4;N;;;;; +12650;CUNEIFORM NUMERIC SIGN FIVE N01 FLAT;Nl;0;L;;;;5;N;;;;; +12651;CUNEIFORM NUMERIC SIGN SIX N01 FLAT;Nl;0;L;;;;6;N;;;;; +12652;CUNEIFORM NUMERIC SIGN SEVEN N01 FLAT;Nl;0;L;;;;7;N;;;;; +12653;CUNEIFORM NUMERIC SIGN EIGHT N01 FLAT;Nl;0;L;;;;8;N;;;;; +12654;CUNEIFORM NUMERIC SIGN NINE N01 FLAT;Nl;0;L;;;;9;N;;;;; +12655;CUNEIFORM NUMERIC SIGN ONE N08 FLAT;Nl;0;L;;;;1;N;;;;; +12656;CUNEIFORM NUMERIC SIGN ONE N14 FLAT;Nl;0;L;;;;1;N;;;;; +12657;CUNEIFORM NUMERIC SIGN TWO N14 FLAT;Nl;0;L;;;;2;N;;;;; +12658;CUNEIFORM NUMERIC SIGN THREE N14 FLAT;Nl;0;L;;;;3;N;;;;; +12659;CUNEIFORM NUMERIC SIGN FOUR N14 FLAT;Nl;0;L;;;;4;N;;;;; +1265A;CUNEIFORM NUMERIC SIGN FIVE N14 FLAT;Nl;0;L;;;;5;N;;;;; +1265B;CUNEIFORM NUMERIC SIGN SIX N14 FLAT;Nl;0;L;;;;6;N;;;;; +1265C;CUNEIFORM NUMERIC SIGN SEVEN N14 FLAT;Nl;0;L;;;;7;N;;;;; +1265D;CUNEIFORM NUMERIC SIGN EIGHT N14 FLAT;Nl;0;L;;;;8;N;;;;; +1265E;CUNEIFORM NUMERIC SIGN NINE N14 FLAT;Nl;0;L;;;;9;N;;;;; +1265F;CUNEIFORM NUMERIC SIGN ONE N34 FLAT;Nl;0;L;;;;1;N;;;;; +12660;CUNEIFORM NUMERIC SIGN TWO N34 FLAT;Nl;0;L;;;;2;N;;;;; +12661;CUNEIFORM NUMERIC SIGN THREE N34 FLAT;Nl;0;L;;;;3;N;;;;; +12662;CUNEIFORM NUMERIC SIGN FOUR N34 FLAT;Nl;0;L;;;;4;N;;;;; +12663;CUNEIFORM NUMERIC SIGN FIVE N34 FLAT;Nl;0;L;;;;5;N;;;;; +12664;CUNEIFORM NUMERIC SIGN SIX N34 FLAT;Nl;0;L;;;;6;N;;;;; +12665;CUNEIFORM NUMERIC SIGN SEVEN N34 FLAT;Nl;0;L;;;;7;N;;;;; +12666;CUNEIFORM NUMERIC SIGN EIGHT N34 FLAT;Nl;0;L;;;;8;N;;;;; +12667;CUNEIFORM NUMERIC SIGN NINE N34 FLAT;Nl;0;L;;;;9;N;;;;; +12668;CUNEIFORM NUMERIC SIGN ONE N45 FLAT;Nl;0;L;;;;1;N;;;;; +12669;CUNEIFORM NUMERIC SIGN TWO N45 FLAT;Nl;0;L;;;;2;N;;;;; +1266A;CUNEIFORM NUMERIC SIGN ONE N22 FLAT;Nl;0;L;;;;1;N;;;;; +1266B;CUNEIFORM NUMERIC SIGN TWO N22 FLAT;Nl;0;L;;;;2;N;;;;; +1266C;CUNEIFORM NUMERIC SIGN ONE N51 FLAT;Nl;0;L;;;;1;N;;;;; +1266D;CUNEIFORM NUMERIC SIGN TWO N51 FLAT;Nl;0;L;;;;2;N;;;;; +1266E;CUNEIFORM NUMERIC SIGN THREE N51 FLAT;Nl;0;L;;;;3;N;;;;; +1266F;CUNEIFORM NUMERIC SIGN FOUR N51 FLAT;Nl;0;L;;;;4;N;;;;; +12670;CUNEIFORM NUMERIC SIGN FIVE N51 FLAT;Nl;0;L;;;;5;N;;;;; +12671;CUNEIFORM NUMERIC SIGN SIX N51 FLAT;Nl;0;L;;;;6;N;;;;; +12672;CUNEIFORM NUMERIC SIGN SEVEN N51 FLAT;Nl;0;L;;;;7;N;;;;; +12673;CUNEIFORM NUMERIC SIGN EIGHT N51 FLAT;Nl;0;L;;;;8;N;;;;; +12674;CUNEIFORM NUMERIC SIGN NINE N51 FLAT;Nl;0;L;;;;9;N;;;;; +12675;CUNEIFORM NUMERIC SIGN ONE N34 FLAT TENU;Nl;0;L;;;;1;N;;;;; +12676;CUNEIFORM NUMERIC SIGN ONE N04 FLAT;Nl;0;L;;;;1;N;;;;; +12677;CUNEIFORM NUMERIC SIGN TWO N04 FLAT;Nl;0;L;;;;2;N;;;;; +12678;CUNEIFORM NUMERIC SIGN THREE N04 FLAT;Nl;0;L;;;;3;N;;;;; +12679;CUNEIFORM NUMERIC SIGN FOUR N04 FLAT;Nl;0;L;;;;4;N;;;;; +1267A;CUNEIFORM NUMERIC SIGN FIVE N04 FLAT;Nl;0;L;;;;5;N;;;;; +1267B;CUNEIFORM NUMERIC SIGN ONE N19 FLAT;Nl;0;L;;;;1;N;;;;; +1267C;CUNEIFORM NUMERIC SIGN TWO N19 FLAT;Nl;0;L;;;;2;N;;;;; +1267D;CUNEIFORM NUMERIC SIGN THREE N19 FLAT;Nl;0;L;;;;3;N;;;;; +1267E;CUNEIFORM NUMERIC SIGN FOUR N19 FLAT;Nl;0;L;;;;4;N;;;;; +1267F;CUNEIFORM NUMERIC SIGN FIVE N19 FLAT;Nl;0;L;;;;5;N;;;;; +12680;CUNEIFORM NUMERIC SIGN SIX N19 FLAT;Nl;0;L;;;;6;N;;;;; +12681;CUNEIFORM NUMERIC SIGN SEVEN N19 FLAT;Nl;0;L;;;;7;N;;;;; +12682;CUNEIFORM NUMERIC SIGN EIGHT N19 FLAT;Nl;0;L;;;;8;N;;;;; +12683;CUNEIFORM NUMERIC SIGN NINE N19 FLAT;Nl;0;L;;;;9;N;;;;; +12684;CUNEIFORM NUMERIC SIGN ONE N46 FLAT;Nl;0;L;;;;1;N;;;;; +12685;CUNEIFORM NUMERIC SIGN TWO N46 FLAT;Nl;0;L;;;;2;N;;;;; +12686;CUNEIFORM NUMERIC SIGN ONE N36 FLAT;Nl;0;L;;;;1;N;;;;; 12F90;CYPRO-MINOAN SIGN CM001;Lo;0;L;;;;;N;;;;; 12F91;CYPRO-MINOAN SIGN CM002;Lo;0;L;;;;;N;;;;; 12F92;CYPRO-MINOAN SIGN CM004;Lo;0;L;;;;;N;;;;; @@ -31739,9 +32138,14 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 18CD3;KHITAN SMALL SCRIPT CHARACTER-18CD3;Lo;0;L;;;;;N;;;;; 18CD4;KHITAN SMALL SCRIPT CHARACTER-18CD4;Lo;0;L;;;;;N;;;;; 18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;; +18CD6;KHITAN SMALL SCRIPT CHARACTER-18CD6;Lo;0;L;;;;;N;;;;; +18CD7;KHITAN SMALL SCRIPT CHARACTER-18CD7;Lo;0;L;;;;;N;;;;; +18CD8;KHITAN SMALL SCRIPT CHARACTER-18CD8;Lo;0;L;;;;;N;;;;; +18CD9;KHITAN SMALL SCRIPT CHARACTER-18CD9;Lo;0;L;;;;;N;;;;; +18CDA;KHITAN SMALL SCRIPT CHARACTER-18CDA;Lo;0;L;;;;;N;;;;; 18CFF;KHITAN SMALL SCRIPT CHARACTER-18CFF;Lo;0;L;;;;;N;;;;; 18D00;;Lo;0;L;;;;;N;;;;; -18D1E;;Lo;0;L;;;;;N;;;;; +18D20;;Lo;0;L;;;;;N;;;;; 18D80;TANGUT COMPONENT-769;Lo;0;L;;;;;N;;;;; 18D81;TANGUT COMPONENT-770;Lo;0;L;;;;;N;;;;; 18D82;TANGUT COMPONENT-771;Lo;0;L;;;;;N;;;;; @@ -31857,6 +32261,59 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 18DF0;TANGUT COMPONENT-881;Lo;0;L;;;;;N;;;;; 18DF1;TANGUT COMPONENT-882;Lo;0;L;;;;;N;;;;; 18DF2;TANGUT COMPONENT-883;Lo;0;L;;;;;N;;;;; +18E00;;Lo;0;L;;;;;N;;;;; +19191;;Lo;0;L;;;;;N;;;;; +191A0;JURCHEN RADICAL-01;Lo;0;L;;;;;N;;;;; +191A1;JURCHEN RADICAL-02;Lo;0;L;;;;;N;;;;; +191A2;JURCHEN RADICAL-03;Lo;0;L;;;;;N;;;;; +191A3;JURCHEN RADICAL-04;Lo;0;L;;;;;N;;;;; +191A4;JURCHEN RADICAL-05;Lo;0;L;;;;;N;;;;; +191A5;JURCHEN RADICAL-06;Lo;0;L;;;;;N;;;;; +191A6;JURCHEN RADICAL-07;Lo;0;L;;;;;N;;;;; +191A7;JURCHEN RADICAL-08;Lo;0;L;;;;;N;;;;; +191A8;JURCHEN RADICAL-09;Lo;0;L;;;;;N;;;;; +191A9;JURCHEN RADICAL-10;Lo;0;L;;;;;N;;;;; +191AA;JURCHEN RADICAL-11;Lo;0;L;;;;;N;;;;; +191AB;JURCHEN RADICAL-12;Lo;0;L;;;;;N;;;;; +191AC;JURCHEN RADICAL-13;Lo;0;L;;;;;N;;;;; +191AD;JURCHEN RADICAL-14;Lo;0;L;;;;;N;;;;; +191AE;JURCHEN RADICAL-15;Lo;0;L;;;;;N;;;;; +191AF;JURCHEN RADICAL-16;Lo;0;L;;;;;N;;;;; +191B0;JURCHEN RADICAL-17;Lo;0;L;;;;;N;;;;; +191B1;JURCHEN RADICAL-18;Lo;0;L;;;;;N;;;;; +191B2;JURCHEN RADICAL-19;Lo;0;L;;;;;N;;;;; +191B3;JURCHEN RADICAL-20;Lo;0;L;;;;;N;;;;; +191B4;JURCHEN RADICAL-21;Lo;0;L;;;;;N;;;;; +191B5;JURCHEN RADICAL-22;Lo;0;L;;;;;N;;;;; +191B6;JURCHEN RADICAL-23;Lo;0;L;;;;;N;;;;; +191B7;JURCHEN RADICAL-24;Lo;0;L;;;;;N;;;;; +191B8;JURCHEN RADICAL-25;Lo;0;L;;;;;N;;;;; +191B9;JURCHEN RADICAL-26;Lo;0;L;;;;;N;;;;; +191BA;JURCHEN RADICAL-27;Lo;0;L;;;;;N;;;;; +191BB;JURCHEN RADICAL-28;Lo;0;L;;;;;N;;;;; +191BC;JURCHEN RADICAL-29;Lo;0;L;;;;;N;;;;; +191BD;JURCHEN RADICAL-30;Lo;0;L;;;;;N;;;;; +191BE;JURCHEN RADICAL-31;Lo;0;L;;;;;N;;;;; +191BF;JURCHEN RADICAL-32;Lo;0;L;;;;;N;;;;; +191C0;JURCHEN RADICAL-33;Lo;0;L;;;;;N;;;;; +191C1;JURCHEN RADICAL-34;Lo;0;L;;;;;N;;;;; +191C2;JURCHEN RADICAL-35;Lo;0;L;;;;;N;;;;; +191C3;JURCHEN RADICAL-36;Lo;0;L;;;;;N;;;;; +191C4;JURCHEN RADICAL-37;Lo;0;L;;;;;N;;;;; +191C5;JURCHEN RADICAL-38;Lo;0;L;;;;;N;;;;; +191C6;JURCHEN RADICAL-39;Lo;0;L;;;;;N;;;;; +191C7;JURCHEN RADICAL-40;Lo;0;L;;;;;N;;;;; +191C8;JURCHEN RADICAL-41;Lo;0;L;;;;;N;;;;; +191C9;JURCHEN RADICAL-42;Lo;0;L;;;;;N;;;;; +191CA;JURCHEN RADICAL-43;Lo;0;L;;;;;N;;;;; +191CB;JURCHEN RADICAL-44;Lo;0;L;;;;;N;;;;; +191CC;JURCHEN RADICAL-45;Lo;0;L;;;;;N;;;;; +191CD;JURCHEN RADICAL-46;Lo;0;L;;;;;N;;;;; +191CE;JURCHEN RADICAL-47;Lo;0;L;;;;;N;;;;; +191CF;JURCHEN RADICAL-48;Lo;0;L;;;;;N;;;;; +191D0;JURCHEN RADICAL-49;Lo;0;L;;;;;N;;;;; +191D1;JURCHEN RADICAL-50;Lo;0;L;;;;;N;;;;; +191D2;JURCHEN RADICAL-51;Lo;0;L;;;;;N;;;;; 1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;; 1AFF1;KATAKANA LETTER MINNAN TONE-3;Lm;0;L;;;;;N;;;;; 1AFF2;KATAKANA LETTER MINNAN TONE-4;Lm;0;L;;;;;N;;;;; @@ -32161,6 +32618,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1B120;KATAKANA LETTER ARCHAIC YI;Lo;0;L;;;;;N;;;;; 1B121;KATAKANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;; 1B122;KATAKANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;; +1B123;HIRAGANA DIGRAPH KOTO;Lo;0;L; 3053 3068;;;;N;;;;; +1B124;KATAKANA DIGRAPH TOKI;Lo;0;L; 30C8 30AD;;;;N;;;;; +1B125;KATAKANA DIGRAPH TOTE;Lo;0;L; 30C8 30C6;;;;N;;;;; +1B126;KATAKANA DIGRAPH YORI;Lo;0;L; 30E8 30EA;;;;N;;;;; +1B127;KATAKANA LETTER ALTERNATE NE;Lo;0;L;;;;;N;;;;; +1B128;KATAKANA LETTER ALTERNATE WI;Lo;0;L;;;;;N;;;;; 1B132;HIRAGANA LETTER SMALL KO;Lo;0;L;;;;;N;;;;; 1B150;HIRAGANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;; 1B151;HIRAGANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;; @@ -32170,6 +32633,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1B165;KATAKANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;; 1B166;KATAKANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;; 1B167;KATAKANA LETTER SMALL N;Lo;0;L;;;;;N;;;;; +1B168;KATAKANA LETTER SMALL ARCHAIC YE;Lo;0;L;;;;;N;;;;; 1B170;NUSHU CHARACTER-1B170;Lo;0;L;;;;;N;;;;; 1B171;NUSHU CHARACTER-1B171;Lo;0;L;;;;;N;;;;; 1B172;NUSHU CHARACTER-1B172;Lo;0;L;;;;;N;;;;; @@ -33425,6 +33889,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1CECE;BELLONA;So;0;ON;;;;;N;;;;; 1CECF;AMPHITRITE;So;0;ON;;;;;N;;;;; 1CED0;LEUKOTHEA;So;0;ON;;;;;N;;;;; +1CED2;ALCHEMICAL SYMBOL FOR OIL INVERTED;So;0;ON;;;;;N;;;;; +1CED3;ALCHEMICAL SYMBOL FOR MOON-JUPITER;So;0;ON;;;;;N;;;;; +1CED4;ALCHEMICAL SYMBOL FOR SALT OF TARTAR;So;0;ON;;;;;N;;;;; +1CEDD;SQUARE ROOT OF SQUARE ROOT;Sm;0;ON;;;;;Y;;;;; +1CEDE;SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT;Sm;0;ON;;;;;Y;;;;; +1CEDF;SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT OF SQUARE ROOT;Sm;0;ON;;;;;Y;;;;; 1CEE0;GEOMANTIC FIGURE POPULUS;So;0;ON;;;;;N;;;;; 1CEE1;GEOMANTIC FIGURE TRISTITIA;So;0;ON;;;;;N;;;;; 1CEE2;GEOMANTIC FIGURE ALBUS;So;0;ON;;;;;N;;;;; @@ -33442,6 +33912,19 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1CEEE;GEOMANTIC FIGURE CAUDA DRACONIS;So;0;ON;;;;;N;;;;; 1CEEF;GEOMANTIC FIGURE VIA;So;0;ON;;;;;N;;;;; 1CEF0;MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;; +1CEF1;LEIBNIZIAN DIVISION SIGN;Sm;0;ON;;;;;N;;;;; +1CEF2;LEIBNIZIAN MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;; +1CEF3;LEIBNIZIAN MULTIPLICATION-DIVISION SIGN;Sm;0;ON;;;;;N;;;;; +1CEF4;LEIBNIZIAN FRACTION REDUCTION SIGN-1;Sm;0;ON;;;;;N;;;;; +1CEF5;LEIBNIZIAN FRACTION REDUCTION SIGN-2;Sm;0;ON;;;;;N;;;;; +1CEF6;SECTOR WITH CHORD;Sm;0;ON;;;;;N;;;;; +1CEF7;SECTOR WITH DOUBLE ARC;Sm;0;ON;;;;;N;;;;; +1CEF8;SECTOR WITH CHORD AND DOTTED ARC;Sm;0;ON;;;;;N;;;;; +1CEF9;MEASURED ANGLE WITH DOUBLE ARC;Sm;0;ON;;;;;N;;;;; +1CEFA;MEASURED ANGLE WITH CONCAVE ARC;Sm;0;ON;;;;;N;;;;; +1CEFB;MEASURED ANGLE WITH DOUBLE CONCAVE ARC;Sm;0;ON;;;;;N;;;;; +1CEFC;ANGLE OPENING UP;Sm;0;ON;;;;;N;;;;; +1CEFD;HYPERBOLA;Sm;0;ON;;;;;N;;;;; 1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;; @@ -33912,6 +34395,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;; 1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;; 1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;; +1D127;MUSICAL SYMBOL COMBINING STRESS;Mn;220;NSM;;;;;N;;;;; +1D128;MUSICAL SYMBOL COMBINING UNSTRESS;Mn;220;NSM;;;;;N;;;;; 1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;; 1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;; 1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;; @@ -34106,6 +34591,27 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D1E8;MUSICAL SYMBOL KIEVAN FLAT SIGN;So;0;L;;;;;N;;;;; 1D1E9;MUSICAL SYMBOL SORI;So;0;ON;;;;;N;;;;; 1D1EA;MUSICAL SYMBOL KORON;So;0;ON;;;;;N;;;;; +1D1EB;MUSICAL SYMBOL HALF SHARP;So;0;L;;;;;N;;;;; +1D1EC;MUSICAL SYMBOL ONE AND A HALF SHARP;So;0;L;;;;;N;;;;; +1D1ED;MUSICAL SYMBOL REVERSED FLAT;So;0;L;;;;;N;;;;; +1D1EE;MUSICAL SYMBOL REVERSED FLAT AND FLAT;So;0;L;;;;;N;;;;; +1D1EF;MUSICAL SYMBOL HALF SHARP UP;So;0;L;;;;;N;;;;; +1D1F0;MUSICAL SYMBOL HALF SHARP DOWN;So;0;L;;;;;N;;;;; +1D1F1;MUSICAL SYMBOL ONE AND A HALF SHARP UP;So;0;L;;;;;N;;;;; +1D1F2;MUSICAL SYMBOL ONE AND A HALF SHARP DOWN;So;0;L;;;;;N;;;;; +1D1F3;MUSICAL SYMBOL REVERSED FLAT UP;So;0;L;;;;;N;;;;; +1D1F4;MUSICAL SYMBOL REVERSED FLAT DOWN;So;0;L;;;;;N;;;;; +1D1F5;MUSICAL SYMBOL REVERSED FLAT AND FLAT UP;So;0;L;;;;;N;;;;; +1D1F6;MUSICAL SYMBOL REVERSED FLAT AND FLAT DOWN;So;0;L;;;;;N;;;;; +1D1F7;MUSICAL SYMBOL DIGIT TWO WITH STROKE;So;0;L;;;;;N;;;;; +1D1F8;MUSICAL SYMBOL DIGIT FOUR WITH STROKE;So;0;L;;;;;N;;;;; +1D1F9;MUSICAL SYMBOL DIGIT FIVE WITH STROKE;So;0;L;;;;;N;;;;; +1D1FA;MUSICAL SYMBOL DIGIT SIX WITH STROKE;So;0;L;;;;;N;;;;; +1D1FB;MUSICAL SYMBOL DIGIT SEVEN WITH STROKE;So;0;L;;;;;N;;;;; +1D1FC;MUSICAL SYMBOL DIGIT NINE WITH STROKE;So;0;L;;;;;N;;;;; +1D1FD;MUSICAL SYMBOL DIGIT FIVE WITH LOW STROKE;So;0;L;;;;;N;;;;; +1D1FE;MUSICAL SYMBOL DIGIT SEVEN WITH LOW STROKE;So;0;L;;;;;N;;;;; +1D1FF;MUSICAL SYMBOL LONGA REST;So;0;L;;;;;N;;;;; 1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;; 1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;; 1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;; @@ -34176,6 +34682,56 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;; 1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;; 1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;; +1D250;MUSICAL SYMBOL COMBINING FLAG-6;Mc;216;L;;;;;N;;;;; +1D251;MUSICAL SYMBOL COMBINING FLAG-7;Mc;216;L;;;;;N;;;;; +1D252;MUSICAL SYMBOL COMBINING FLAG-8;Mc;216;L;;;;;N;;;;; +1D253;MUSICAL SYMBOL TWO HUNDRED FIFTY-SIXTH REST;So;0;L;;;;;N;;;;; +1D254;MUSICAL SYMBOL FIVE HUNDRED TWELFTH REST;So;0;L;;;;;N;;;;; +1D255;MUSICAL SYMBOL ONE THOUSAND TWENTY-FOURTH REST;So;0;L;;;;;N;;;;; +1D256;MUSICAL SYMBOL FLAT WITH STROKE;So;0;L;;;;;N;;;;; +1D257;MUSICAL SYMBOL FLAT WITH DOUBLE STROKE;So;0;L;;;;;N;;;;; +1D258;MUSICAL SYMBOL FLAT WITH DOUBLE STEM;So;0;L;;;;;N;;;;; +1D259;MUSICAL SYMBOL HALF SHARP WITH STROKE;So;0;L;;;;;N;;;;; +1D25A;MUSICAL SYMBOL SHARP WITH STROKE;So;0;L;;;;;N;;;;; +1D25B;MUSICAL SYMBOL COMBINING TREMOLO-4;Mn;1;NSM;;;;;N;;;;; +1D25C;MUSICAL SYMBOL COMBINING TREMOLO-5;Mn;1;NSM;;;;;N;;;;; +1D25D;MUSICAL SYMBOL FINGERED TREMOLO-4;So;0;L;;;;;N;;;;; +1D25E;MUSICAL SYMBOL FINGERED TREMOLO-5;So;0;L;;;;;N;;;;; +1D25F;MUSICAL SYMBOL COMBINING BUZZ ROLL STEM;Mc;216;L;;;;;N;;;;; +1D260;MUSICAL SYMBOL TRIPLE FLAT;So;0;L;;;;;N;;;;; +1D261;MUSICAL SYMBOL SUSPENSION;So;0;L;;;;;N;;;;; +1D262;MUSICAL SYMBOL HEAVY DOUBLE BARLINE;So;0;L;;;;;N;;;;; +1D263;MUSICAL SYMBOL SYSTEM DIVIDER;So;0;L;;;;;N;;;;; +1D264;MUSICAL SYMBOL NIENTE;So;0;L;;;;;N;;;;; +1D265;MUSICAL SYMBOL CRESCENDO WITH RING;So;0;L;;;;;N;;;;; +1D266;MUSICAL SYMBOL DECRESCENDO WITH RING;So;0;L;;;;;N;;;;; +1D267;MUSICAL SYMBOL DIAMOND NOTEHEAD WHOLE;So;0;L;;;;;N;;;;; +1D268;MUSICAL SYMBOL DIAMOND NOTEHEAD WHITE;So;0;L;;;;;N;;;;; +1D269;MUSICAL SYMBOL DIAMOND NOTEHEAD BLACK;So;0;L;;;;;N;;;;; +1D26A;MUSICAL SYMBOL DIAMOND NOTEHEAD HALF-FILLED;So;0;L;;;;;N;;;;; +1D26B;MUSICAL SYMBOL TRIANGULAR FERMATA;So;0;L;;;;;N;;;;; +1D26C;MUSICAL SYMBOL DOUBLE TRIANGULAR FERMATA;So;0;L;;;;;N;;;;; +1D26D;MUSICAL SYMBOL SQUARE FERMATA;So;0;L;;;;;N;;;;; +1D26E;MUSICAL SYMBOL DOUBLE SQUARE FERMATA;So;0;L;;;;;N;;;;; +1D26F;MUSICAL SYMBOL HENZE LONG FERMATA;So;0;L;;;;;N;;;;; +1D270;MUSICAL SYMBOL HENZE SHORT FERMATA;So;0;L;;;;;N;;;;; +1D271;MUSICAL SYMBOL CURLEW;So;0;L;;;;;N;;;;; +1D272;MUSICAL SYMBOL SALZEDO BREATH MARK;So;0;L;;;;;N;;;;; +1D273;MUSICAL SYMBOL ORGAN PEDAL HEEL;So;0;L;;;;;N;;;;; +1D274;MUSICAL SYMBOL ORGAN PEDAL TOE;So;0;L;;;;;N;;;;; +1D275;MUSICAL SYMBOL G CLEF OPTIONALLY OTTAVA BASSA;So;0;L;;;;;N;;;;; +1D276;MUSICAL SYMBOL DOUBLE G CLEF;So;0;L;;;;;N;;;;; +1D277;MUSICAL SYMBOL G CLEF OTTAVA BASSA WITH C CLEF;So;0;L;;;;;N;;;;; +1D278;MUSICAL SYMBOL C CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;; +1D279;MUSICAL SYMBOL G CLEF QUINDICESIMA ALTA;So;0;L;;;;;N;;;;; +1D27A;MUSICAL SYMBOL G CLEF QUINDICESIMA BASSA;So;0;L;;;;;N;;;;; +1D27B;MUSICAL SYMBOL F CLEF QUINDICESIMA ALTA;So;0;L;;;;;N;;;;; +1D27C;MUSICAL SYMBOL F CLEF QUINDICESIMA BASSA;So;0;L;;;;;N;;;;; +1D27D;MUSICAL SYMBOL C CLEF QUINDICESIMA BASSA;So;0;L;;;;;N;;;;; +1D27E;MUSICAL SYMBOL TABLATURE CLEF;So;0;L;;;;;N;;;;; +1D27F;MUSICAL SYMBOL ARPEGGIATO UP WITH ARROW;So;0;L;;;;;N;;;;; +1D280;MUSICAL SYMBOL COMBINING STEM BOW BEHIND BRIDGE;Mc;216;L;;;;;N;;;;; +1D281;MUSICAL SYMBOL COMBINING STEM BOW ON TOP OF BRIDGE;Mc;216;L;;;;;N;;;;; 1D2C0;KAKTOVIK NUMERAL ZERO;No;0;L;;;;0;N;;;;; 1D2C1;KAKTOVIK NUMERAL ONE;No;0;L;;;;1;N;;;;; 1D2C2;KAKTOVIK NUMERAL TWO;No;0;L;;;;2;N;;;;; @@ -34982,6 +35538,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L; 007A;;;;N;;;;; 1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L; 0131;;;;N;;;;; 1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L; 0237;;;;N;;;;; +1D6A6;MATHEMATICAL ITALIC SMALL LIGATURE LONG S WITH DESCENDER S;Ll;0;L; 1DF95;;;;N;;;;; 1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; 1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; 1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; @@ -35996,6 +36553,35 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;; 1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;; 1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;; +1DB00;LEIBNIZIAN EQUALS SIGN;Sm;0;ON;;;;;N;;;;; +1DB01;LEIBNIZIAN EQUALS SIGN WITH DOUBLE VERTICALS;Sm;0;ON;;;;;N;;;;; +1DB02;LEIBNIZIAN EQUALS SIGN WITH SMALL S;Sm;0;ON;;;;;N;;;;; +1DB03;LEIBNIZIAN GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +1DB04;LEIBNIZIAN LESS-THAN;Sm;0;ON;;;;;Y;;;;; +1DB05;LEIBNIZIAN GREATER-THAN WITH SMALL P;Sm;0;ON;;;;;Y;;;;; +1DB06;LEIBNIZIAN LESS-THAN WITH SMALL P;Sm;0;ON;;;;;Y;;;;; +1DB07;LEIBNIZIAN GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;;;;; +1DB08;INVERTED SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;; +1DB09;INVERTED SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;; +1DB0A;TWO-LINE GREATER-THAN;Sm;0;ON;;;;;N;;;;; +1DB0B;TWO-LINE LESS-THAN;Sm;0;ON;;;;;N;;;;; +1DB0C;COMMENSURABILITY;Sm;0;ON;;;;;N;;;;; +1DB0D;INCOMMENSURABILITY;Sm;0;ON;;;;;N;;;;; +1DB0E;COMMENSURABILITY IN SQUARE;Sm;0;ON;;;;;N;;;;; +1DB0F;INCOMMENSURABILITY IN SQUARE;Sm;0;ON;;;;;N;;;;; +1DB10;CARTESIAN EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +1DB11;LEIBNIZIAN CONGRUENCE;Sm;0;ON;;;;;N;;;;; +1DB12;LEIBNIZIAN CONGRUENCE WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +1DB13;LEIBNIZIAN CONGRUENCE-2;Sm;0;ON;;;;;N;;;;; +1DB14;LEIBNIZIAN CONGRUENCE-2 INVERTED;Sm;0;ON;;;;;N;;;;; +1DB15;LEIBNIZIAN CONGRUENCE-2 WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;; +1DB16;LEIBNIZIAN CONGRUENCE-2 WITH HORIZONTAL AND VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +1DB17;LEIBNIZIAN COINCIDENCE;Sm;0;ON;;;;;Y;;;;; +1DB18;INVERTED LAZY S OVER LAZY S;Sm;0;ON;;;;;Y;;;;; +1DB19;LEIBNIZIAN SIMILARITY;Sm;0;ON;;;;;N;;;;; +1DB1A;LEIBNIZIAN SIMILARITY-2;Sm;0;ON;;;;;N;;;;; +1DB1B;LEIBNIZIAN DISSIMILARITY;Sm;0;ON;;;;;Y;;;;; +1DB1C;FACIT SYMBOL;Sm;0;ON;;;;;N;;;;; 1DF00;LATIN SMALL LETTER FENG DIGRAPH WITH TRILL;Ll;0;L;;;;;N;;;;; 1DF01;LATIN SMALL LETTER REVERSED SCRIPT G;Ll;0;L;;;;;N;;;;; 1DF02;LATIN LETTER SMALL CAPITAL TURNED G;Ll;0;L;;;;;N;;;;; @@ -36027,12 +36613,163 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1DF1C;LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; 1DF1D;LATIN SMALL LETTER C WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; 1DF1E;LATIN SMALL LETTER S WITH CURL;Ll;0;L;;;;;N;;;;; +1DF1F;LATIN SMALL LETTER D-ETH DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF20;LATIN SMALL LETTER D-LEZH DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF21;LATIN SMALL LETTER D-LEZH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF22;LATIN SMALL LETTER TL DIGRAPH WITH BELT;Ll;0;L;;;;;N;;;;; +1DF23;LATIN SMALL LETTER TL DIGRAPH WITH RETROFLEX HOOK AND BELT;Ll;0;L;;;;;N;;;;; +1DF24;LATIN SMALL LETTER T-THETA DIGRAPH;Ll;0;L;;;;;N;;;;; 1DF25;LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; 1DF26;LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; 1DF27;LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; 1DF28;LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; 1DF29;LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; 1DF2A;LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF2B;LATIN SMALL LETTER DEZH DIGRAPH WITH CURL;Ll;0;L;;;;;N;;;;; +1DF2C;LATIN SMALL LETTER TESH DIGRAPH WITH CURL;Ll;0;L;;;;;N;;;;; +1DF2D;LATIN SMALL LETTER D WITH HOOK AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF2E;LATIN SMALL LETTER DZ DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF2F;LATIN SMALL LETTER ETH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF30;LATIN LETTER SMALL CAPITAL G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF31;LATIN SMALL LETTER GAMMA WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF32;LATIN SMALL LETTER H WITH STROKE AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF33;LATIN SMALL LETTER PHI WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF34;LATIN SMALL LETTER Q WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF35;LATIN LETTER SMALL CAPITAL R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF36;LATIN LETTER SMALL CAPITAL INVERTED R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF37;LATIN SMALL LETTER R WITH TAIL AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF38;LATIN SMALL LETTER TS DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF39;LATIN SMALL LETTER V WITH HOOK AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF3A;LATIN LETTER PHARYNGEAL VOICED FRICATIVE WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF3B;LATIN SMALL LETTER BETA WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF3C;LATIN SMALL LETTER THETA WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF3D;LATIN SMALL LETTER CHI WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF3E;LATIN SMALL LETTER BARRED TURNED H;Ll;0;L;;;;;N;;;;; +1DF3F;LATIN SMALL LETTER BARRED W;Ll;0;L;;;;;N;;;;; +1DF40;LATIN CAPITAL LETTER BARRED A;Lu;0;L;;;;;N;;;;1DF41; +1DF41;LATIN SMALL LETTER BARRED A;Ll;0;L;;;;;N;;;1DF40;;1DF40 +1DF42;LATIN SMALL LETTER BARRED OPEN O;Ll;0;L;;;;;N;;;;; +1DF43;LATIN LETTER SMALL CAPITAL BARRED E;Ll;0;L;;;;;N;;;;; +1DF44;LATIN SMALL LETTER BARRED OPEN E;Ll;0;L;;;;;N;;;;; +1DF45;LATIN SMALL LETTER G WITH STROKE AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF46;LATIN SMALL LETTER BARRED H;Ll;0;L;;;;;N;;;;; +1DF47;LATIN SMALL LETTER BARRED H WITH HOOK;Ll;0;L;;;;;N;;;;; +1DF48;LATIN CAPITAL LETTER BARRED K;Lu;0;L;;;;;N;;;;1DF49; +1DF49;LATIN SMALL LETTER BARRED K;Ll;0;L;;;;;N;;;1DF48;;1DF48 +1DF4A;LATIN CAPITAL LETTER BARRED M;Lu;0;L;;;;;N;;;;1DF4B; +1DF4B;LATIN SMALL LETTER BARRED M;Ll;0;L;;;;;N;;;1DF4A;;1DF4A +1DF4C;LATIN SMALL LETTER BARRED M WITH HOOK;Ll;0;L;;;;;N;;;;; +1DF4D;LATIN CAPITAL LETTER BARRED N;Lu;0;L;;;;;N;;;;1DF4E; +1DF4E;LATIN SMALL LETTER BARRED N;Ll;0;L;;;;;N;;;1DF4D;;1DF4D +1DF4F;LATIN SMALL LETTER BARRED ENG;Ll;0;L;;;;;N;;;;; +1DF50;LATIN SMALL LETTER TURNED R WITH STROKE;Ll;0;L;;;;;N;;;;; +1DF51;LATIN CAPITAL LETTER BARRED V;Lu;0;L;;;;;N;;;;1DF52; +1DF52;LATIN SMALL LETTER BARRED V;Ll;0;L;;;;;N;;;1DF51;;1DF51 +1DF53;LATIN SMALL LETTER BARRED CLOSED OMEGA;Ll;0;L;;;;;N;;;;; +1DF54;LATIN SMALL LETTER BARRED CHI;Ll;0;L;;;;;N;;;;; +1DF55;LATIN SMALL LETTER Y WITH LOW STROKE;Ll;0;L;;;;;N;;;;; +1DF56;LATIN LETTER GLOTTAL STOP WITH DOUBLE STROKE;Ll;0;L;;;;;N;;;;; +1DF57;LATIN SMALL LETTER TURNED R WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF58;LATIN SMALL LETTER SPLIT O;Ll;0;L;;;;;N;;;;; +1DF59;LATIN SMALL LETTER SPLIT U;Ll;0;L;;;;;N;;;;; +1DF5A;LATIN SMALL LETTER HALF A;Ll;0;L;;;;;N;;;;; +1DF5B;LATIN SMALL LETTER STRETCHED C-H DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF5C;LATIN SMALL LETTER LUNATE EE;Ll;0;L;;;;;N;;;;; +1DF5D;LATIN SMALL LETTER IE;Ll;0;L;;;;;N;;;;; +1DF5E;LATIN SMALL LETTER OI DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF5F;LATIN SMALL LETTER OU DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF60;LATIN SMALL LETTER OMEGA WITH LOOP;Ll;0;L;;;;;N;;;;; +1DF61;LATIN SMALL LETTER R WITH LEFT TIE;Ll;0;L;;;;;N;;;;; +1DF62;LATIN SMALL LETTER ESH-H DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF63;LATIN SMALL LETTER STRETCHED T-H DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF64;LATIN SMALL LETTER REVERSED T-H DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF65;LATIN SMALL LETTER WH DIGRAPH;Ll;0;L;;;;;N;;;;; +1DF66;LATIN SMALL LETTER REVERSED Z;Ll;0;L;;;;;N;;;;; +1DF67;LATIN SMALL LETTER LEZH WITH CURL;Ll;0;L;;;;;N;;;;; +1DF68;LATIN CAPITAL LETTER PHONOTYPIC A WITH SWASH;Lu;0;L;;;;;N;;;;1DF69; +1DF69;LATIN SMALL LETTER PHONOTYPIC A WITH SWASH;Ll;0;L;;;;;N;;;1DF68;;1DF68 +1DF6A;LATIN CAPITAL LETTER PHONOTYPIC ROUNDTOP A;Lu;0;L;;;;;N;;;;1DF6B; +1DF6B;LATIN SMALL LETTER PHONOTYPIC ROUNDTOP A;Ll;0;L;;;;;N;;;1DF6A;;1DF6A +1DF6C;LATIN CAPITAL LETTER REVERSED SCRUPLE;Lu;0;L;;;;;N;;;;1DF6D; +1DF6D;LATIN SMALL LETTER REVERSED SCRUPLE;Ll;0;L;;;;;N;;;1DF6C;;1DF6C +1DF6E;LATIN CAPITAL LETTER PHONOTYPIC DIPHTHONG AI;Lu;0;L;;;;;N;;;;1DF6F; +1DF6F;LATIN SMALL LETTER PHONOTYPIC DIPHTHONG AI;Ll;0;L;;;;;N;;;1DF6E;;1DF6E +1DF70;LATIN SMALL LETTER I WITH PIGTAIL AT BOTTOM;Ll;0;L;;;;;N;;;;; +1DF71;LATIN SMALL LETTER STRETCHED I;Ll;0;L;;;;;N;;;;; +1DF72;LATIN CAPITAL LETTER O WITH CURL;Lu;0;L;;;;;N;;;;1DF73; +1DF73;LATIN SMALL LETTER O WITH CURL;Ll;0;L;;;;;N;;;1DF72;;1DF72 +1DF74;LATIN CAPITAL LETTER CLOSED OMEGA WITH LONG STEM;Lu;0;L;;;;;N;;;;1DF75; +1DF75;LATIN SMALL LETTER CLOSED OMEGA WITH LONG STEM;Ll;0;L;;;;;N;;;1DF74;;1DF74 +1DF76;LATIN CAPITAL LETTER TURNED CLOSED OMEGA;Lu;0;L;;;;;N;;;;1DF77; +1DF77;LATIN SMALL LETTER TURNED CLOSED OMEGA;Ll;0;L;;;;;N;;;1DF76;;1DF76 +1DF78;LATIN CAPITAL LETTER PHONOTYPIC TH;Lu;0;L;;;;;N;;;;1DF79; +1DF79;LATIN SMALL LETTER PHONOTYPIC TH;Ll;0;L;;;;;N;;;1DF78;;1DF78 +1DF7A;LATIN CAPITAL LETTER U WITH HOOK TAIL;Lu;0;L;;;;;N;;;;1DF7B; +1DF7B;LATIN SMALL LETTER U WITH HOOK TAIL;Ll;0;L;;;;;N;;;1DF7A;;1DF7A +1DF7C;LATIN CAPITAL LETTER U WITH NOTCH AT BOTTOM;Lu;0;L;;;;;N;;;;1DF7D; +1DF7D;LATIN SMALL LETTER U WITH NOTCH AT BOTTOM;Ll;0;L;;;;;N;;;1DF7C;;1DF7C +1DF7E;LATIN CAPITAL LETTER REVERSED U;Lu;0;L;;;;;N;;;;1DF7F; +1DF7F;LATIN SMALL LETTER REVERSED U;Ll;0;L;;;;;N;;;1DF7E;;1DF7E +1DF80;LATIN CAPITAL LETTER A WITH TOPBAR;Lo;0;L;;;;;N;;;;; +1DF81;LATIN CAPITAL LETTER E WITH BENT TOPBAR;Lo;0;L;;;;;N;;;;; +1DF90;LATIN SMALL LETTER C WITH LOW SLASH;Ll;0;L;;;;;N;;;;; +1DF91;LATIN SMALL LETTER C WITH LOOPED CEDILLA;Ll;0;L;;;;;N;;;;; +1DF92;LATIN SMALL LETTER C WITH RIGHT LOOP;Ll;0;L;;;;;N;;;;; +1DF93;LATIN SMALL LETTER D ROTUNDA WITH DESCENDING CROSSING LOOP;Ll;0;L;;;;;N;;;;; +1DF94;LATIN SMALL LETTER R ROTUNDA WITH LOOP;Ll;0;L;;;;;N;;;;; +1DF95;LATIN SMALL LIGATURE LONG S WITH DESCENDER S;Ll;0;L; 00DF;;;;N;;;;; +1DF96;LATIN SMALL LETTER LONG S WITH TOP LOOP;Ll;0;L;;;;;N;;;;; +1DFCD;MODIFIER LETTER SMALL TURNED R WITH MID-HEIGHT LEFT HOOK;Lm;0;L; 1DF57;;;;N;;;;; +1DFCE;MODIFIER LETTER SMALL SPLIT O;Lm;0;L; 1DF58;;;;N;;;;; +1DFCF;MODIFIER LETTER SMALL SPLIT U;Lm;0;L; 1DF59;;;;N;;;;; +1DFD0;LATIN SUBSCRIPT SMALL LETTER GAMMA;Lm;0;L; 0263;;;;N;;;;; +1DFD1;MODIFIER LETTER SMALL CAPITAL P;Lm;0;L; 1D18;;;;N;;;;; +1DFD2;MODIFIER LETTER SMALL B WITH STROKE;Lm;0;L; 0180;;;;N;;;;; +1DFD3;MODIFIER LETTER SMALL D WITH STROKE;Lm;0;L; 0111;;;;N;;;;; +1DFD4;MODIFIER LETTER SMALL G WITH STROKE;Lm;0;L; 01E5;;;;N;;;;; +1DFD5;MODIFIER LETTER SMALL L WITH STROKE;Lm;0;L; 0142;;;;N;;;;; +1DFD6;MODIFIER LETTER SMALL L WITH BAR;Lm;0;L; 019A;;;;N;;;;; +1DFD7;MODIFIER LETTER SMALL TURNED R WITH STROKE;Lm;0;L; 1DF50;;;;N;;;;; +1DFD8;MODIFIER LETTER SMALL BARRED TURNED H;Lm;0;L; 1DF3E;;;;N;;;;; +1DFD9;MODIFIER LETTER SMALL J WITH STROKE;Lm;0;L; 0249;;;;N;;;;; +1DFDA;MODIFIER LETTER SMALL UPSILON WITH STROKE;Lm;0;L; 1D7F;;;;N;;;;; +1DFDB;MODIFIER LETTER SMALL BARRED W;Lm;0;L; 1DF3F;;;;N;;;;; +1DFDC;MODIFIER LETTER SMALL N WITH LONG RIGHT LEG;Lm;0;L; 019E;;;;N;;;;; +1DFDD;MODIFIER LETTER SMALL R WITH LONG LEG;Lm;0;L; 027C;;;;N;;;;; +1DFDE;MODIFIER LETTER SMALL DB DIGRAPH;Lm;0;L; 0238;;;;N;;;;; +1DFDF;MODIFIER LETTER SMALL QP DIGRAPH;Lm;0;L; 0239;;;;N;;;;; +1DFE0;MODIFIER LETTER SMALL DEZH DIGRAPH WITH CURL;Lm;0;L; 1DF2B;;;;N;;;;; +1DFE1;MODIFIER LETTER SMALL DEZH DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; 1DF19;;;;N;;;;; +1DFE2;MODIFIER LETTER SMALL ESH WITH CURL;Lm;0;L; 0286;;;;N;;;;; +1DFE3;MODIFIER LETTER SMALL ESH WITH RETROFLEX HOOK;Lm;0;L; 1D98;;;;N;;;;; +1DFE4;MODIFIER LETTER SMALL TESH DIGRAPH WITH CURL;Lm;0;L; 1DF2C;;;;N;;;;; +1DFE5;MODIFIER LETTER SMALL TESH DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; 1DF1C;;;;N;;;;; +1DFE6;MODIFIER LETTER SMALL EZH WITH CURL;Lm;0;L; 0293;;;;N;;;;; +1DFE7;MODIFIER LETTER SMALL EZH WITH RETROFLEX HOOK;Lm;0;L; 1D9A;;;;N;;;;; +1DFE8;MODIFIER LETTER SMALL CAPITAL D;Lm;0;L; 1D05;;;;N;;;;; +1DFE9;MODIFIER LETTER SMALL CAPITAL A;Lm;0;L; 1D00;;;;N;;;;; +1DFEA;MODIFIER LETTER SMALL CAPITAL E;Lm;0;L; 1D07;;;;N;;;;; +1DFEB;MODIFIER LETTER SMALL REVERSED R WITH FISHHOOK;Lm;0;L; 027F;;;;N;;;;; +1DFEC;MODIFIER LETTER SMALL SQUAT REVERSED ESH;Lm;0;L; 0285;;;;N;;;;; +1DFED;MODIFIER LETTER SMALL TURNED H WITH FISHHOOK;Lm;0;L; 02AE;;;;N;;;;; +1DFEE;MODIFIER LETTER SMALL TURNED H WITH FISHHOOK AND TAIL;Lm;0;L; 02AF;;;;N;;;;; +1DFEF;MODIFIER LETTER SMALL D WITH CURL;Lm;0;L; 0221;;;;N;;;;; +1DFF0;MODIFIER LETTER SMALL L WITH CURL;Lm;0;L; 0234;;;;N;;;;; +1DFF1;MODIFIER LETTER SMALL N WITH CURL;Lm;0;L; 0235;;;;N;;;;; +1DFF2;MODIFIER LETTER SMALL T WITH CURL;Lm;0;L; 0236;;;;N;;;;; +1DFF3;MODIFIER LETTER SMALL GREEK PSI;Lm;0;L; 03C8;;;;N;;;;; +1DFF4;MODIFIER LETTER SMALL GREEK OMEGA;Lm;0;L; 03C9;;;;N;;;;; +1DFF5;MODIFIER LETTER SMALL D WITH PALATAL HOOK;Lm;0;L; 1D81;;;;N;;;;; +1DFF6;MODIFIER LETTER SMALL H WITH PALATAL HOOK;Lm;0;L; A795;;;;N;;;;; +1DFF7;MODIFIER LETTER SMALL N WITH PALATAL HOOK;Lm;0;L; 1D87;;;;N;;;;; +1DFF8;MODIFIER LETTER SMALL S WITH PALATAL HOOK;Lm;0;L; 1D8A;;;;N;;;;; +1DFF9;MODIFIER LETTER SMALL Z WITH PALATAL HOOK;Lm;0;L; 1D8E;;;;N;;;;; +1DFFA;MODIFIER LETTER SMALL C WITH HOOK;Lm;0;L; 0188;;;;N;;;;; +1DFFB;MODIFIER LETTER SMALL K WITH HOOK;Lm;0;L; 0199;;;;N;;;;; +1DFFC;MODIFIER LETTER SMALL P WITH HOOK;Lm;0;L; 01A5;;;;N;;;;; +1DFFD;MODIFIER LETTER SMALL Q WITH HOOK;Lm;0;L; 02A0;;;;N;;;;; +1DFFE;MODIFIER LETTER SMALL T WITH HOOK;Lm;0;L; 01AD;;;;N;;;;; +1DFFF;MODIFIER LETTER SMALL T WITH HOOK AND RETROFLEX HOOK;Lm;0;L; 1DF09;;;;N;;;;; 1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;; 1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;; 1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;; @@ -37437,6 +38174,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F1AB;SQUARED UHD;So;0;L;;;;;N;;;;; 1F1AC;SQUARED VOD;So;0;L;;;;;N;;;;; 1F1AD;MASK WORK SYMBOL;So;0;ON;;;;;N;;;;; +1F1AE;TOMOBIKI SYMBOL;So;0;L;;;;;N;;;;; 1F1E6;REGIONAL INDICATOR SYMBOL LETTER A;So;0;L;;;;;N;;;;; 1F1E7;REGIONAL INDICATOR SYMBOL LETTER B;So;0;L;;;;;N;;;;; 1F1E8;REGIONAL INDICATOR SYMBOL LETTER C;So;0;L;;;;;N;;;;; @@ -38512,6 +39250,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F6D6;HUT;So;0;ON;;;;;N;;;;; 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;; 1F6D8;LANDSLIDE;So;0;ON;;;;;N;;;;; +1F6D9;LIGHTHOUSE;So;0;ON;;;;;N;;;;; 1F6DC;WIRELESS;So;0;ON;;;;;N;;;;; 1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;; 1F6DE;WHEEL;So;0;ON;;;;;N;;;;; @@ -38760,6 +39499,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;; 1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;; 1F7D9;NINE POINTED WHITE STAR;So;0;ON;;;;;N;;;;; +1F7DA;BLACK CIRCLE WITH WHITE VERTICAL BAR;So;0;L;;;;;N;;;;; +1F7DB;BULLET IN DOUBLE CIRCLE;So;0;ON;;;;;N;;;;; 1F7E0;LARGE ORANGE CIRCLE;So;0;ON;;;;;N;;;;; 1F7E1;LARGE YELLOW CIRCLE;So;0;ON;;;;;N;;;;; 1F7E2;LARGE GREEN CIRCLE;So;0;ON;;;;;N;;;;; @@ -38773,6 +39514,21 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F7EA;LARGE PURPLE SQUARE;So;0;ON;;;;;N;;;;; 1F7EB;LARGE BROWN SQUARE;So;0;ON;;;;;N;;;;; 1F7F0;HEAVY EQUALS SIGN;So;0;ON;;;;;N;;;;; +1F7F1;CIRCLE WITH DOUBLE VERTICAL AND HORIZONTAL LINE;So;0;ON;;;;;N;;;;; +1F7F2;DOUBLE CIRCLE WITH DOUBLE HORIZONTAL LINE;So;0;ON;;;;;N;;;;; +1F7F3;CIRCLED BOTTOM RIGHT OBLIQUE HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1F7F4;LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F7F5;RIGHT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F7F6;TRANSPARENT CUBE;So;0;ON;;;;;N;;;;; +1F7F7;WHITE CUBE;So;0;ON;;;;;N;;;;; +1F7F8;HORIZONTAL DOUBLE WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;; +1F7F9;VERTICAL DOUBLE WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;; +1F7FA;WHITE SQUARE WITH BOTTOM HALF BISECTED;So;0;ON;;;;;N;;;;; +1F7FB;WHITE SQUARE WITH TOP HALF BISECTED;So;0;ON;;;;;N;;;;; +1F7FC;WHITE SQUARE WITH HORIZONTAL AND VERTICAL BISECTING LINES;So;0;ON;;;;;N;;;;; +1F7FD;LOWER LEFT FLATTENED RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F7FE;LOWER RIGHT FLATTENED RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F7FF;RHOMBUS;So;0;ON;;;;;N;;;;; 1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; 1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; 1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; @@ -39326,6 +40082,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FA88;FLUTE;So;0;ON;;;;;N;;;;; 1FA89;HARP;So;0;ON;;;;;N;;;;; 1FA8A;TROMBONE;So;0;ON;;;;;N;;;;; +1FA8B;METEOR;So;0;ON;;;;;N;;;;; +1FA8C;ERASER;So;0;ON;;;;;N;;;;; +1FA8D;NET WITH HANDLE;So;0;ON;;;;;N;;;;; 1FA8E;TREASURE CHEST;So;0;ON;;;;;N;;;;; 1FA8F;SHOVEL;So;0;ON;;;;;N;;;;; 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;; @@ -39384,6 +40143,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;; 1FAC6;FINGERPRINT;So;0;ON;;;;;N;;;;; 1FAC8;HAIRY CREATURE;So;0;ON;;;;;N;;;;; +1FACC;MONARCH BUTTERFLY;So;0;ON;;;;;N;;;;; 1FACD;ORCA;So;0;ON;;;;;N;;;;; 1FACE;MOOSE;So;0;ON;;;;;N;;;;; 1FACF;DONKEY;So;0;ON;;;;;N;;;;; @@ -39400,6 +40160,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;; 1FADB;PEA POD;So;0;ON;;;;;N;;;;; 1FADC;ROOT VEGETABLE;So;0;ON;;;;;N;;;;; +1FADD;PICKLE;So;0;ON;;;;;N;;;;; 1FADF;SPLATTER;So;0;ON;;;;;N;;;;; 1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;; 1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;; @@ -39412,6 +40173,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;; 1FAE9;FACE WITH BAGS UNDER EYES;So;0;ON;;;;;N;;;;; 1FAEA;DISTORTED FACE;So;0;ON;;;;;N;;;;; +1FAEB;CRACKING FACE;So;0;ON;;;;;N;;;;; 1FAEF;FIGHT CLOUD;So;0;ON;;;;;N;;;;; 1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;; 1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;; @@ -39422,6 +40184,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAF6;HEART HANDS;So;0;ON;;;;;N;;;;; 1FAF7;LEFTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;; 1FAF8;RIGHTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;; +1FAF9;LEFTWARDS THUMB SIGN;So;0;ON;;;;;N;;;;; +1FAFA;RIGHTWARDS THUMB SIGN;So;0;ON;;;;;N;;;;; 1FB00;BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; 1FB01;BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; 1FB02;BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; @@ -39677,7 +40441,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 2A700;;Lo;0;L;;;;;N;;;;; 2B73F;;Lo;0;L;;;;;N;;;;; 2B740;;Lo;0;L;;;;;N;;;;; -2B81D;;Lo;0;L;;;;;N;;;;; +2B81E;;Lo;0;L;;;;;N;;;;; 2B820;;Lo;0;L;;;;;N;;;;; 2CEAD;;Lo;0;L;;;;;N;;;;; 2CEB0;;Lo;0;L;;;;;N;;;;; @@ -40232,6 +40996,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 323AF;;Lo;0;L;;;;;N;;;;; 323B0;;Lo;0;L;;;;;N;;;;; 33479;;Lo;0;L;;;;;N;;;;; +3D000;;Lo;0;L;;;;;N;;;;; +3FC3F;;Lo;0;L;;;;;N;;;;; E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;; E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;; E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;; diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt index 19b13571f347..7f1f2339fc9f 100644 --- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt +++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt @@ -1,6 +1,6 @@ -# GraphemeBreakProperty-17.0.0.txt -# Date: 2025-06-30, 06:20:23 GMT -# © 2025 Unicode®, Inc. +# GraphemeBreakProperty-18.0.0.txt +# Date: 2026-06-29, 15:25:05 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -88,7 +88,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 05BF ; Extend # Mn HEBREW POINT RAFE 05C1..05C2 ; Extend # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT 05C4..05C5 ; Extend # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT -05C7 ; Extend # Mn HEBREW POINT QAMATS QATAN +05C7..05C9 ; Extend # Mn [3] HEBREW POINT QAMATS QATAN..HEBREW POINT DAGESH HAZAQ MUDGASH 0610..061A ; Extend # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA 064B..065F ; Extend # Mn [21] ARABIC FATHATAN..ARABIC WAVY HAMZA BELOW 0670 ; Extend # Mn ARABIC LETTER SUPERSCRIPT ALEF @@ -144,7 +144,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 0B3F ; Extend # Mn ORIYA VOWEL SIGN I 0B41..0B44 ; Extend # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR 0B4D ; Extend # Mn ORIYA SIGN VIRAMA -0B55..0B56 ; Extend # Mn [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK +0B53..0B56 ; Extend # Mn [4] ORIYA SIGN DOT ABOVE..ORIYA AI LENGTH MARK 0B57 ; Extend # Mc ORIYA AU LENGTH MARK 0B62..0B63 ; Extend # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL 0B82 ; Extend # Mn TAMIL SIGN ANUSVARA @@ -242,8 +242,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 1A7F ; Extend # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT 1AB0..1ABD ; Extend # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Extend # Me COMBINING PARENTHESES OVERLAY -1ABF..1ADD ; Extend # Mn [31] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOT-AND-RING BELOW -1AE0..1AEB ; Extend # Mn [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE +1ABF..1AF0 ; Extend # Mn [50] COMBINING LATIN SMALL LETTER W BELOW..COMBINING DOUBLE COMMA ABOVE 1B00..1B03 ; Extend # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B34 ; Extend # Mn BALINESE SIGN REREKAN 1B35 ; Extend # Mc BALINESE VOWEL SIGN TEDUNG @@ -339,7 +338,8 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 10D24..10D27 ; Extend # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI 10D69..10D6D ; Extend # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK 10EAB..10EAC ; Extend # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK -10EFA..10EFF ; Extend # Mn [6] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW WORD MADDA +10ECB..10ECF ; Extend # Mn [5] ARABIC NORTHEAST POINTING ARROWHEAD ABOVE..ARABIC LARGE CIRCLE ABOVE +10EF0..10EFF ; Extend # Mn [16] ARABIC SMALL LOW UPRIGHT RECTANGULAR ZERO..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Extend # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Extend # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11001 ; Extend # Mn BRAHMI SIGN ANUSVARA @@ -448,6 +448,7 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11D90..11D91 ; Extend # Mn [2] GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI 11D95 ; Extend # Mn GUNJALA GONDI SIGN ANUSVARA 11D97 ; Extend # Mn GUNJALA GONDI VIRAMA +11DF0 ; Extend # Mn BENGALI SIGN COMBINING ANUSVARA ABOVE 11EF3..11EF4 ; Extend # Mn [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U 11F00..11F01 ; Extend # Mn [2] KAWI SIGN CANDRABINDU..KAWI SIGN ANUSVARA 11F36..11F3A ; Extend # Mn [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R @@ -468,6 +469,7 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1BC9D..1BC9E ; Extend # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK 1CF00..1CF2D ; Extend # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT 1CF30..1CF46 ; Extend # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG +1D127..1D128 ; Extend # Mn [2] MUSICAL SYMBOL COMBINING STRESS..MUSICAL SYMBOL COMBINING UNSTRESS 1D165..1D166 ; Extend # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; Extend # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16D..1D172 ; Extend # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 @@ -475,6 +477,10 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1D185..1D18B ; Extend # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; Extend # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO 1D242..1D244 ; Extend # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME +1D250..1D252 ; Extend # Mc [3] MUSICAL SYMBOL COMBINING FLAG-6..MUSICAL SYMBOL COMBINING FLAG-8 +1D25B..1D25C ; Extend # Mn [2] MUSICAL SYMBOL COMBINING TREMOLO-4..MUSICAL SYMBOL COMBINING TREMOLO-5 +1D25F ; Extend # Mc MUSICAL SYMBOL COMBINING BUZZ ROLL STEM +1D280..1D281 ; Extend # Mc [2] MUSICAL SYMBOL COMBINING STEM BOW BEHIND BRIDGE..MUSICAL SYMBOL COMBINING STEM BOW ON TOP OF BRIDGE 1DA00..1DA36 ; Extend # Mn [55] SIGNWRITING HEAD RIM..SIGNWRITING AIR SUCKING IN 1DA3B..1DA6C ; Extend # Mn [50] SIGNWRITING MOUTH CLOSED NEUTRAL..SIGNWRITING EXCITEMENT 1DA75 ; Extend # Mn SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS @@ -502,7 +508,7 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT E0020..E007F ; Extend # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2237 +# Total code points: 2274 # ================================================ diff --git a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt index e1215547c58f..75196cefa5ad 100644 --- a/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt +++ b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt @@ -1,6 +1,6 @@ -# GraphemeBreakTest-17.0.0.txt -# Date: 2025-03-24, 14:45:55 GMT -# © 2025 Unicode®, Inc. +# GraphemeBreakTest-18.0.0.txt +# Date: 2026-06-12, 00:44:16 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # @@ -24,773 +24,860 @@ # # These samples may be extended or changed in the future. # -÷ 000D ÷ 000D ÷ # ÷ [0.2] (CR) ÷ [4.0] (CR) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 000D ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 000D × 000A ÷ # ÷ [0.2] (CR) × [3.0] (LF) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 000A ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 000D ÷ 0000 ÷ # ÷ [0.2] (CR) ÷ [4.0] (Control) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 0000 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 000D ÷ 094D ÷ # ÷ [0.2] (CR) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 000D ÷ 0308 × 094D ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 000D ÷ 0300 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 000D ÷ 0308 × 0300 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 000D ÷ 200C ÷ # ÷ [0.2] (CR) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 000D ÷ 0308 × 200C ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 000D ÷ 200D ÷ # ÷ [0.2] (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 000D ÷ 0308 × 200D ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 000D ÷ 1F1E6 ÷ # ÷ [0.2] (CR) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 1F1E6 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 000D ÷ 06DD ÷ # ÷ [0.2] (CR) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 06DD ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 000D ÷ 0903 ÷ # ÷ [0.2] (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 000D ÷ 0308 × 0903 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 000D ÷ 1100 ÷ # ÷ [0.2] (CR) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 1100 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 000D ÷ 1160 ÷ # ÷ [0.2] (CR) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 1160 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 000D ÷ 11A8 ÷ # ÷ [0.2] (CR) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 11A8 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 000D ÷ AC00 ÷ # ÷ [0.2] (CR) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 000D ÷ 0308 ÷ AC00 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 000D ÷ AC01 ÷ # ÷ [0.2] (CR) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 000D ÷ 0308 ÷ AC01 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 000D ÷ 0915 ÷ # ÷ [0.2] (CR) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 0915 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 000D ÷ 00A9 ÷ # ÷ [0.2] (CR) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 00A9 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 000D ÷ 0020 ÷ # ÷ [0.2] (CR) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 0020 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000D ÷ 0378 ÷ # ÷ [0.2] (CR) ÷ [4.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000D ÷ 0308 ÷ 0378 ÷ # ÷ [0.2] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000A ÷ 000D ÷ # ÷ [0.2] (LF) ÷ [4.0] (CR) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 000D ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 000A ÷ 000A ÷ # ÷ [0.2] (LF) ÷ [4.0] (LF) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 000A ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 000A ÷ 0000 ÷ # ÷ [0.2] (LF) ÷ [4.0] (Control) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 0000 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 000A ÷ 094D ÷ # ÷ [0.2] (LF) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 000A ÷ 0308 × 094D ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 000A ÷ 0300 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 000A ÷ 0308 × 0300 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 000A ÷ 200C ÷ # ÷ [0.2] (LF) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 000A ÷ 0308 × 200C ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 000A ÷ 200D ÷ # ÷ [0.2] (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 000A ÷ 0308 × 200D ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 000A ÷ 1F1E6 ÷ # ÷ [0.2] (LF) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 1F1E6 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 000A ÷ 06DD ÷ # ÷ [0.2] (LF) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 06DD ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 000A ÷ 0903 ÷ # ÷ [0.2] (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 000A ÷ 0308 × 0903 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 000A ÷ 1100 ÷ # ÷ [0.2] (LF) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 1100 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 000A ÷ 1160 ÷ # ÷ [0.2] (LF) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 1160 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 000A ÷ 11A8 ÷ # ÷ [0.2] (LF) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 11A8 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 000A ÷ AC00 ÷ # ÷ [0.2] (LF) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 000A ÷ 0308 ÷ AC00 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 000A ÷ AC01 ÷ # ÷ [0.2] (LF) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 000A ÷ 0308 ÷ AC01 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 000A ÷ 0915 ÷ # ÷ [0.2] (LF) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 0915 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 000A ÷ 00A9 ÷ # ÷ [0.2] (LF) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 00A9 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 000A ÷ 0020 ÷ # ÷ [0.2] (LF) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 0020 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000A ÷ 0378 ÷ # ÷ [0.2] (LF) ÷ [4.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000A ÷ 0308 ÷ 0378 ÷ # ÷ [0.2] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0000 ÷ 000D ÷ # ÷ [0.2] (Control) ÷ [4.0] (CR) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 000D ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0000 ÷ 000A ÷ # ÷ [0.2] (Control) ÷ [4.0] (LF) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 000A ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0000 ÷ 0000 ÷ # ÷ [0.2] (Control) ÷ [4.0] (Control) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 0000 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0000 ÷ 094D ÷ # ÷ [0.2] (Control) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0000 ÷ 0308 × 094D ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0000 ÷ 0300 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0000 ÷ 0308 × 0300 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0000 ÷ 200C ÷ # ÷ [0.2] (Control) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0000 ÷ 0308 × 200C ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0000 ÷ 200D ÷ # ÷ [0.2] (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0000 ÷ 0308 × 200D ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0000 ÷ 1F1E6 ÷ # ÷ [0.2] (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 1F1E6 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0000 ÷ 06DD ÷ # ÷ [0.2] (Control) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 06DD ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0000 ÷ 0903 ÷ # ÷ [0.2] (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0000 ÷ 0308 × 0903 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0000 ÷ 1100 ÷ # ÷ [0.2] (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 1100 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0000 ÷ 1160 ÷ # ÷ [0.2] (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 1160 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0000 ÷ 11A8 ÷ # ÷ [0.2] (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 11A8 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0000 ÷ AC00 ÷ # ÷ [0.2] (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ AC00 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0000 ÷ AC01 ÷ # ÷ [0.2] (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ AC01 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0000 ÷ 0915 ÷ # ÷ [0.2] (Control) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 0915 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0000 ÷ 00A9 ÷ # ÷ [0.2] (Control) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 00A9 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0000 ÷ 0020 ÷ # ÷ [0.2] (Control) ÷ [4.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 0020 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0000 ÷ 0378 ÷ # ÷ [0.2] (Control) ÷ [4.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0000 ÷ 0308 ÷ 0378 ÷ # ÷ [0.2] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 094D ÷ 000D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 094D × 0308 ÷ 000D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 094D ÷ 000A ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 094D × 0308 ÷ 000A ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 094D ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 094D × 0308 ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 094D × 094D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 094D × 0308 × 094D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 094D × 0300 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 094D × 0308 × 0300 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 094D × 200C ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 094D × 0308 × 200C ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 094D × 200D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 094D × 0308 × 200D ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 094D ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 094D × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 094D ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 094D × 0308 ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 094D × 0903 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 094D × 0308 × 0903 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 094D ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 094D × 0308 ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 094D ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 094D × 0308 ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 094D ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 094D × 0308 ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 094D ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 094D × 0308 ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 094D ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 094D × 0308 ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 094D ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 094D × 0308 ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 094D ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 094D × 0308 ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 094D ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 094D × 0308 ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 094D ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 094D × 0308 ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0300 ÷ 000D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0300 × 0308 ÷ 000D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0300 ÷ 000A ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0300 × 0308 ÷ 000A ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0300 ÷ 0000 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0300 × 0308 ÷ 0000 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0300 × 094D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0300 × 0308 × 094D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0300 × 0300 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0300 × 0308 × 0300 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0300 × 200C ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0300 × 0308 × 200C ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0300 × 200D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0300 × 0308 × 200D ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0300 ÷ 1F1E6 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0300 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0300 ÷ 06DD ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0300 × 0308 ÷ 06DD ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0300 × 0903 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0300 × 0308 × 0903 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0300 ÷ 1100 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0300 × 0308 ÷ 1100 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0300 ÷ 1160 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0300 × 0308 ÷ 1160 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0300 ÷ 11A8 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0300 × 0308 ÷ 11A8 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0300 ÷ AC00 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0300 × 0308 ÷ AC00 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0300 ÷ AC01 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0300 × 0308 ÷ AC01 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0300 ÷ 0915 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0300 × 0308 ÷ 0915 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0300 ÷ 00A9 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0300 × 0308 ÷ 00A9 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0300 ÷ 0020 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0300 × 0308 ÷ 0020 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0300 ÷ 0378 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0300 × 0308 ÷ 0378 ÷ # ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200C ÷ 000D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (CR) ÷ [0.3] -÷ 200C × 0308 ÷ 000D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 200C ÷ 000A ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (LF) ÷ [0.3] -÷ 200C × 0308 ÷ 000A ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 200C ÷ 0000 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (Control) ÷ [0.3] -÷ 200C × 0308 ÷ 0000 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 200C × 094D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 200C × 0308 × 094D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 200C × 0300 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 200C × 0308 × 0300 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 200C × 200C ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 200C × 0308 × 200C ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 200C × 200D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 200C × 0308 × 200D ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 200C ÷ 1F1E6 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 200C × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 200C ÷ 06DD ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 200C × 0308 ÷ 06DD ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 200C × 0903 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 200C × 0308 × 0903 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 200C ÷ 1100 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 200C × 0308 ÷ 1100 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 200C ÷ 1160 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 200C × 0308 ÷ 1160 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 200C ÷ 11A8 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 200C × 0308 ÷ 11A8 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 200C ÷ AC00 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 200C × 0308 ÷ AC00 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 200C ÷ AC01 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 200C × 0308 ÷ AC01 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 200C ÷ 0915 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 200C × 0308 ÷ 0915 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 200C ÷ 00A9 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 200C × 0308 ÷ 00A9 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 200C ÷ 0020 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200C × 0308 ÷ 0020 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200C ÷ 0378 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200C × 0308 ÷ 0378 ÷ # ÷ [0.2] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200D ÷ 000D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (CR) ÷ [0.3] -÷ 200D × 0308 ÷ 000D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 200D ÷ 000A ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (LF) ÷ [0.3] -÷ 200D × 0308 ÷ 000A ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 200D ÷ 0000 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (Control) ÷ [0.3] -÷ 200D × 0308 ÷ 0000 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 200D × 094D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 200D × 0308 × 094D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 200D × 0300 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 200D × 0308 × 0300 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 200D × 200C ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 200D × 0308 × 200C ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 200D × 200D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 200D × 0308 × 200D ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 200D ÷ 1F1E6 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 200D × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 200D ÷ 06DD ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 200D × 0308 ÷ 06DD ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 200D × 0903 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 200D × 0308 × 0903 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 200D ÷ 1100 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 200D × 0308 ÷ 1100 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 200D ÷ 1160 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 200D × 0308 ÷ 1160 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 200D ÷ 11A8 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 200D × 0308 ÷ 11A8 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 200D ÷ AC00 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 200D × 0308 ÷ AC00 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 200D ÷ AC01 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 200D × 0308 ÷ AC01 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 200D ÷ 0915 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 200D × 0308 ÷ 0915 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 200D ÷ 00A9 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 200D × 0308 ÷ 00A9 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 200D ÷ 0020 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200D × 0308 ÷ 0020 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200D ÷ 0378 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 200D × 0308 ÷ 0378 ÷ # ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1F1E6 ÷ 000D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (CR) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 000D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 1F1E6 ÷ 000A ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (LF) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 000A ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 1F1E6 ÷ 0000 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (Control) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 0000 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 1F1E6 × 094D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1F1E6 × 0308 × 094D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1F1E6 × 0300 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1F1E6 × 0308 × 0300 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1F1E6 × 200C ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1F1E6 × 0308 × 200C ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1F1E6 × 200D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1F1E6 × 0308 × 200D ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1F1E6 × 1F1E6 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1F1E6 ÷ 06DD ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 06DD ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1F1E6 × 0903 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1F1E6 × 0308 × 0903 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1F1E6 ÷ 1100 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 1100 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1F1E6 ÷ 1160 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 1160 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1F1E6 ÷ 11A8 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 11A8 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1F1E6 ÷ AC00 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ AC00 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1F1E6 ÷ AC01 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ AC01 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1F1E6 ÷ 0915 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 0915 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1F1E6 ÷ 00A9 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 00A9 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1F1E6 ÷ 0020 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 0020 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1F1E6 ÷ 0378 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1F1E6 × 0308 ÷ 0378 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 06DD ÷ 000D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] (CR) ÷ [0.3] -÷ 06DD × 0308 ÷ 000D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 06DD ÷ 000A ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] (LF) ÷ [0.3] -÷ 06DD × 0308 ÷ 000A ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 06DD ÷ 0000 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) ÷ [5.0] (Control) ÷ [0.3] -÷ 06DD × 0308 ÷ 0000 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 06DD × 094D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 06DD × 0308 × 094D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 06DD × 0300 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 06DD × 0308 × 0300 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 06DD × 200C ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 06DD × 0308 × 200C ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 06DD × 200D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 06DD × 0308 × 200D ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 06DD × 1F1E6 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 06DD × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 06DD × 06DD ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 06DD × 0308 ÷ 06DD ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 06DD × 0903 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 06DD × 0308 × 0903 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 06DD × 1100 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 06DD × 0308 ÷ 1100 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 06DD × 1160 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 06DD × 0308 ÷ 1160 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 06DD × 11A8 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 06DD × 0308 ÷ 11A8 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 06DD × AC00 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 06DD × 0308 ÷ AC00 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 06DD × AC01 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 06DD × 0308 ÷ AC01 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 06DD × 0915 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 06DD × 0308 ÷ 0915 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 06DD × 00A9 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 06DD × 0308 ÷ 00A9 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 06DD × 0020 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 06DD × 0308 ÷ 0020 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 06DD × 0378 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.2] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 06DD × 0308 ÷ 0378 ÷ # ÷ [0.2] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0903 ÷ 000D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (CR) ÷ [0.3] -÷ 0903 × 0308 ÷ 000D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0903 ÷ 000A ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (LF) ÷ [0.3] -÷ 0903 × 0308 ÷ 000A ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0903 ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (Control) ÷ [0.3] -÷ 0903 × 0308 ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0903 × 094D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0903 × 0308 × 094D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0903 × 0300 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0903 × 0308 × 0300 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0903 × 200C ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0903 × 0308 × 200C ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0903 × 200D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0903 × 0308 × 200D ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0903 ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0903 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0903 ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0903 × 0308 ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0903 × 0903 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0903 × 0308 × 0903 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0903 ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0903 × 0308 ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0903 ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0903 × 0308 ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0903 ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0903 × 0308 ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0903 ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0903 × 0308 ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0903 ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0903 × 0308 ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0903 ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0903 × 0308 ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0903 ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0903 × 0308 ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0903 ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0903 × 0308 ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0903 ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0903 × 0308 ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1100 ÷ 000D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (CR) ÷ [0.3] -÷ 1100 × 0308 ÷ 000D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 1100 ÷ 000A ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (LF) ÷ [0.3] -÷ 1100 × 0308 ÷ 000A ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 1100 ÷ 0000 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (Control) ÷ [0.3] -÷ 1100 × 0308 ÷ 0000 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 1100 × 094D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1100 × 0308 × 094D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1100 × 0300 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1100 × 0308 × 0300 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1100 × 200C ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1100 × 0308 × 200C ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1100 × 200D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1100 × 0308 × 200D ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1100 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1100 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1100 ÷ 06DD ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1100 × 0308 ÷ 06DD ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1100 × 0903 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1100 × 0308 × 0903 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1100 × 1100 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1100 × 0308 ÷ 1100 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1100 × 1160 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1100 × 0308 ÷ 1160 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1100 ÷ 11A8 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1100 × 0308 ÷ 11A8 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1100 × AC00 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1100 × 0308 ÷ AC00 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1100 × AC01 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1100 × 0308 ÷ AC01 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1100 ÷ 0915 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1100 × 0308 ÷ 0915 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1100 ÷ 00A9 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1100 × 0308 ÷ 00A9 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1100 ÷ 0020 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1100 × 0308 ÷ 0020 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1100 ÷ 0378 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1100 × 0308 ÷ 0378 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1160 ÷ 000D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (CR) ÷ [0.3] -÷ 1160 × 0308 ÷ 000D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 1160 ÷ 000A ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (LF) ÷ [0.3] -÷ 1160 × 0308 ÷ 000A ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 1160 ÷ 0000 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (Control) ÷ [0.3] -÷ 1160 × 0308 ÷ 0000 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 1160 × 094D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1160 × 0308 × 094D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 1160 × 0300 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1160 × 0308 × 0300 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1160 × 200C ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1160 × 0308 × 200C ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 1160 × 200D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1160 × 0308 × 200D ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 1160 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1160 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 1160 ÷ 06DD ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1160 × 0308 ÷ 06DD ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 1160 × 0903 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1160 × 0308 × 0903 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 1160 ÷ 1100 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1160 × 0308 ÷ 1100 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1160 × 1160 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1160 × 0308 ÷ 1160 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 1160 × 11A8 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1160 × 0308 ÷ 11A8 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 1160 ÷ AC00 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1160 × 0308 ÷ AC00 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 1160 ÷ AC01 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1160 × 0308 ÷ AC01 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 1160 ÷ 0915 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1160 × 0308 ÷ 0915 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1160 ÷ 00A9 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1160 × 0308 ÷ 00A9 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 1160 ÷ 0020 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1160 × 0308 ÷ 0020 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1160 ÷ 0378 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1160 × 0308 ÷ 0378 ÷ # ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 11A8 ÷ 000D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (CR) ÷ [0.3] -÷ 11A8 × 0308 ÷ 000D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 11A8 ÷ 000A ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (LF) ÷ [0.3] -÷ 11A8 × 0308 ÷ 000A ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 11A8 ÷ 0000 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (Control) ÷ [0.3] -÷ 11A8 × 0308 ÷ 0000 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 11A8 × 094D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 11A8 × 0308 × 094D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 11A8 × 0300 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 11A8 × 0308 × 0300 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 11A8 × 200C ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 11A8 × 0308 × 200C ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 11A8 × 200D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 11A8 × 0308 × 200D ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 11A8 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 11A8 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 11A8 ÷ 06DD ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 11A8 × 0308 ÷ 06DD ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 11A8 × 0903 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 11A8 × 0308 × 0903 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 11A8 ÷ 1100 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 11A8 × 0308 ÷ 1100 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 11A8 ÷ 1160 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 11A8 × 0308 ÷ 1160 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 11A8 × 11A8 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 11A8 × 0308 ÷ 11A8 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 11A8 ÷ AC00 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 11A8 × 0308 ÷ AC00 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 11A8 ÷ AC01 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 11A8 × 0308 ÷ AC01 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 11A8 ÷ 0915 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 11A8 × 0308 ÷ 0915 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 11A8 ÷ 00A9 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 11A8 × 0308 ÷ 00A9 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 11A8 ÷ 0020 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 11A8 × 0308 ÷ 0020 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 11A8 ÷ 0378 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 11A8 × 0308 ÷ 0378 ÷ # ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC00 ÷ 000D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] (CR) ÷ [0.3] -÷ AC00 × 0308 ÷ 000D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ AC00 ÷ 000A ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] (LF) ÷ [0.3] -÷ AC00 × 0308 ÷ 000A ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ AC00 ÷ 0000 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] (Control) ÷ [0.3] -÷ AC00 × 0308 ÷ 0000 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ AC00 × 094D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ AC00 × 0308 × 094D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ AC00 × 0300 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ AC00 × 0308 × 0300 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ AC00 × 200C ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ AC00 × 0308 × 200C ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ AC00 × 200D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ AC00 × 0308 × 200D ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ AC00 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ AC00 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ AC00 ÷ 06DD ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ AC00 × 0308 ÷ 06DD ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ AC00 × 0903 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ AC00 × 0308 × 0903 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ AC00 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC00 × 0308 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC00 × 1160 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ AC00 × 0308 ÷ 1160 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ AC00 × 11A8 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ AC00 × 0308 ÷ 11A8 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ AC00 ÷ AC00 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ AC00 × 0308 ÷ AC00 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ AC00 ÷ AC01 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ AC00 × 0308 ÷ AC01 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ AC00 ÷ 0915 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ AC00 × 0308 ÷ 0915 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ AC00 ÷ 00A9 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ AC00 × 0308 ÷ 00A9 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ AC00 ÷ 0020 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC00 × 0308 ÷ 0020 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC00 ÷ 0378 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC00 × 0308 ÷ 0378 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC01 ÷ 000D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (CR) ÷ [0.3] -÷ AC01 × 0308 ÷ 000D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ AC01 ÷ 000A ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (LF) ÷ [0.3] -÷ AC01 × 0308 ÷ 000A ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ AC01 ÷ 0000 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (Control) ÷ [0.3] -÷ AC01 × 0308 ÷ 0000 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ AC01 × 094D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ AC01 × 0308 × 094D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ AC01 × 0300 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ AC01 × 0308 × 0300 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ AC01 × 200C ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ AC01 × 0308 × 200C ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ AC01 × 200D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ AC01 × 0308 × 200D ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ AC01 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ AC01 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ AC01 ÷ 06DD ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ AC01 × 0308 ÷ 06DD ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ AC01 × 0903 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ AC01 × 0308 × 0903 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ AC01 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC01 × 0308 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC01 ÷ 1160 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ AC01 × 0308 ÷ 1160 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ AC01 × 11A8 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ AC01 × 0308 ÷ 11A8 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ AC01 ÷ AC00 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ AC01 × 0308 ÷ AC00 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ AC01 ÷ AC01 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ AC01 × 0308 ÷ AC01 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ AC01 ÷ 0915 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ AC01 × 0308 ÷ 0915 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ AC01 ÷ 00A9 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ AC01 × 0308 ÷ 00A9 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ AC01 ÷ 0020 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC01 × 0308 ÷ 0020 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC01 ÷ 0378 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ AC01 × 0308 ÷ 0378 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0915 ÷ 000D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (CR) ÷ [0.3] -÷ 0915 × 0308 ÷ 000D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0915 ÷ 000A ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (LF) ÷ [0.3] -÷ 0915 × 0308 ÷ 000A ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0915 ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (Control) ÷ [0.3] -÷ 0915 × 0308 ÷ 0000 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0915 × 094D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0915 × 0308 × 094D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0915 × 0300 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0915 × 0308 × 0300 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0915 × 200C ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0915 × 0308 × 200C ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0915 × 200D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0915 × 0308 × 200D ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0915 ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0915 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0915 ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0915 × 0308 ÷ 06DD ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0915 × 0903 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0915 × 0308 × 0903 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0915 ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0915 × 0308 ÷ 1100 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0915 ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0915 × 0308 ÷ 1160 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0915 ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0915 × 0308 ÷ 11A8 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0915 ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0915 × 0308 ÷ AC00 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0915 ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0915 × 0308 ÷ AC01 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0915 ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 0308 ÷ 0915 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0915 ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0915 × 0308 ÷ 00A9 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0915 ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0915 × 0308 ÷ 0020 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0915 ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0915 × 0308 ÷ 0378 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 00A9 ÷ 000D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (CR) ÷ [0.3] -÷ 00A9 × 0308 ÷ 000D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 00A9 ÷ 000A ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (LF) ÷ [0.3] -÷ 00A9 × 0308 ÷ 000A ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 00A9 ÷ 0000 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (Control) ÷ [0.3] -÷ 00A9 × 0308 ÷ 0000 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 00A9 × 094D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 00A9 × 0308 × 094D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 00A9 × 0300 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 00A9 × 0308 × 0300 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 00A9 × 200C ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 00A9 × 0308 × 200C ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 00A9 × 200D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 00A9 × 0308 × 200D ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 00A9 ÷ 1F1E6 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 00A9 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 00A9 ÷ 06DD ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 00A9 × 0308 ÷ 06DD ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 00A9 × 0903 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 00A9 × 0308 × 0903 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 00A9 ÷ 1100 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 00A9 × 0308 ÷ 1100 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 00A9 ÷ 1160 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 00A9 × 0308 ÷ 1160 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 00A9 ÷ 11A8 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 00A9 × 0308 ÷ 11A8 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 00A9 ÷ AC00 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 00A9 × 0308 ÷ AC00 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 00A9 ÷ AC01 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 00A9 × 0308 ÷ AC01 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 00A9 ÷ 0915 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 00A9 × 0308 ÷ 0915 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 00A9 ÷ 00A9 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 00A9 × 0308 ÷ 00A9 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 00A9 ÷ 0020 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 00A9 × 0308 ÷ 0020 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 00A9 ÷ 0378 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 00A9 × 0308 ÷ 0378 ÷ # ÷ [0.2] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0020 ÷ 000D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] (CR) ÷ [0.3] -÷ 0020 × 0308 ÷ 000D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0020 ÷ 000A ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [0.3] -÷ 0020 × 0308 ÷ 000A ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0020 ÷ 0000 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [5.0] (Control) ÷ [0.3] -÷ 0020 × 0308 ÷ 0000 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0020 × 094D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0020 × 0308 × 094D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0020 × 0300 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0020 × 0308 × 0300 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0020 × 200C ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0020 × 0308 × 200C ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0020 × 200D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0020 × 0308 × 200D ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0020 ÷ 1F1E6 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0020 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0020 ÷ 06DD ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0020 × 0308 ÷ 06DD ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0020 × 0903 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0020 × 0308 × 0903 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0020 ÷ 1100 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0020 × 0308 ÷ 1100 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0020 ÷ 1160 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0020 × 0308 ÷ 1160 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0020 ÷ 11A8 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0020 × 0308 ÷ 11A8 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0020 ÷ AC00 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0020 × 0308 ÷ AC00 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0020 ÷ AC01 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0020 × 0308 ÷ AC01 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0020 ÷ 0915 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0020 × 0308 ÷ 0915 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0020 ÷ 00A9 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0020 × 0308 ÷ 00A9 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0020 ÷ 0020 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0020 × 0308 ÷ 0020 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0020 ÷ 0378 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0020 × 0308 ÷ 0378 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0378 ÷ 000D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [5.0] (CR) ÷ [0.3] -÷ 0378 × 0308 ÷ 000D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (CR) ÷ [0.3] -÷ 0378 ÷ 000A ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [0.3] -÷ 0378 × 0308 ÷ 000A ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (LF) ÷ [0.3] -÷ 0378 ÷ 0000 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [5.0] (Control) ÷ [0.3] -÷ 0378 × 0308 ÷ 0000 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [5.0] (Control) ÷ [0.3] -÷ 0378 × 094D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0378 × 0308 × 094D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [0.3] -÷ 0378 × 0300 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0378 × 0308 × 0300 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0378 × 200C ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0378 × 0308 × 200C ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [0.3] -÷ 0378 × 200D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0378 × 0308 × 200D ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0378 ÷ 1F1E6 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0378 × 0308 ÷ 1F1E6 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3] -÷ 0378 ÷ 06DD ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0378 × 0308 ÷ 06DD ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [0.3] -÷ 0378 × 0903 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0378 × 0308 × 0903 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3] -÷ 0378 ÷ 1100 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0378 × 0308 ÷ 1100 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 0378 ÷ 1160 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0378 × 0308 ÷ 1160 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3] -÷ 0378 ÷ 11A8 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0378 × 0308 ÷ 11A8 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3] -÷ 0378 ÷ AC00 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0378 × 0308 ÷ AC00 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3] -÷ 0378 ÷ AC01 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0378 × 0308 ÷ AC01 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3] -÷ 0378 ÷ 0915 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0378 × 0308 ÷ 0915 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 0378 ÷ 00A9 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0378 × 0308 ÷ 00A9 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [0.3] -÷ 0378 ÷ 0020 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0378 × 0308 ÷ 0020 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0378 ÷ 0378 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0378 × 0308 ÷ 0378 ÷ # ÷ [0.2] (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷ # ÷ [0.2] (CR) × [3.0] (LF) ÷ [4.0] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0061 × 0308 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 0020 × 200D ÷ 0646 ÷ # ÷ [0.2] SPACE (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC LETTER NOON (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0646 × 200D ÷ 0020 ÷ # ÷ [0.2] ARABIC LETTER NOON (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1100 × 1100 ÷ # ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC00 × 11A8 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ AC01 × 11A8 ÷ 1100 ÷ # ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3] -÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷ # ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 × 200D ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3] -÷ 0061 × 0308 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 × 0903 ÷ 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 ÷ 0600 × 0062 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 1F476 × 1F3FF ÷ 1F476 ÷ # ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) ÷ [0.3] -÷ 0061 × 1F3FF ÷ 1F476 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) ÷ [0.3] -÷ 0061 × 1F3FF ÷ 1F476 × 200D × 1F6D1 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BABY (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3] -÷ 1F476 × 1F3FF × 0308 × 200D × 1F476 × 1F3FF ÷ # ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1F6D1 × 200D × 1F6D1 ÷ # ÷ [0.2] OCTAGONAL SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3] -÷ 0061 × 200D ÷ 1F6D1 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3] -÷ 2701 × 200D ÷ 2701 ÷ # ÷ [0.2] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 × 200D ÷ 2701 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0915 ÷ 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D × 094D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D × 200D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 093C × 200D × 094D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtendermConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 093C × 094D × 200D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtendermConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D × 0924 × 094D × 092F ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER YA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D ÷ 0061 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) ÷ [0.3] -÷ 0061 × 094D ÷ 0924 ÷ # ÷ [0.2] LATIN SMALL LETTER A (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 003F × 094D ÷ 0924 ÷ # ÷ [0.2] QUESTION MARK (XXmLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0915 × 094D × 094D × 0924 ÷ # ÷ [0.2] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [0.3] -÷ 0AB8 × 0AFB × 0ACD × 0AB8 × 0AFB ÷ # ÷ [0.2] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtendermConjunctLinker) × [9.0] GUJARATI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1019 × 1039 × 1018 ÷ 102C × 1037 ÷ # ÷ [0.2] MYANMAR LETTER MA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER BHA (LinkingConsonant) ÷ [999.0] MYANMAR VOWEL SIGN AA (XXmLinkingConsonantmExtPict) × [9.0] MYANMAR SIGN DOT BELOW (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1004 × 103A × 1039 × 1011 × 1039 × 1011 ÷ # ÷ [0.2] MYANMAR LETTER NGA (LinkingConsonant) × [9.0] MYANMAR SIGN ASAT (Extend_ConjunctExtendermConjunctLinker) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) ÷ [0.3] -÷ 1B12 × 1B01 ÷ 1B32 × 1B44 × 1B2F ÷ 1B32 × 1B44 × 1B22 × 1B44 × 1B2C ÷ 1B32 × 1B44 × 1B22 × 1B38 ÷ # ÷ [0.2] BALINESE LETTER OKARA TEDUNG (XXmLinkingConsonantmExtPict) × [9.0] BALINESE SIGN ULU CANDRA (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER WA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER YA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE VOWEL SIGN SUKU (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 179F × 17D2 × 178F × 17D2 × 179A × 17B8 ÷ # ÷ [0.2] KHMER LETTER SA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER TA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER RO (LinkingConsonant) × [9.0] KHMER VOWEL SIGN II (Extend_ConjunctExtendermConjunctLinker) ÷ [0.3] -÷ 1B26 ÷ 1B17 × 1B44 × 1B13 ÷ # ÷ [0.2] BALINESE LETTER NA (LinkingConsonant) ÷ [999.0] BALINESE LETTER NGA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER KA (LinkingConsonant) ÷ [0.3] -÷ 1B27 ÷ 1B13 × 1B44 × 1B0B ÷ 1B0B × 1B04 ÷ # ÷ [0.2] BALINESE LETTER PA (LinkingConsonant) ÷ [999.0] BALINESE LETTER KA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER RA REPA (LinkingConsonant) ÷ [999.0] BALINESE LETTER RA REPA (LinkingConsonant) × [9.1] BALINESE SIGN BISAH (SpacingMark) ÷ [0.3] -÷ 1795 × 17D2 × 17AF ÷ 1798 ÷ # ÷ [0.2] KHMER LETTER PHA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL QE (LinkingConsonant) ÷ [999.0] KHMER LETTER MO (LinkingConsonant) ÷ [0.3] -÷ 17A0 × 17D2 × 17AB ÷ 1791 × 17D0 ÷ 1799 ÷ # ÷ [0.2] KHMER LETTER HA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL RY (LinkingConsonant) ÷ [999.0] KHMER LETTER TO (LinkingConsonant) × [9.0] KHMER SIGN SAMYOK SANNYA (Extend_ConjunctExtendermConjunctLinker) ÷ [999.0] KHMER LETTER YO (LinkingConsonant) ÷ [0.3] +÷ 000D ÷ 000D ÷ # ÷ [1.0] (CR) ÷ [4.0] (CR) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 000D ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 000D × 000A ÷ # ÷ [1.0] (CR) × [3.0] (LF) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 000A ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 000D ÷ 0000 ÷ # ÷ [1.0] (CR) ÷ [4.0] (Control) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 0000 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 000D ÷ 094D ÷ # ÷ [1.0] (CR) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 000D ÷ 0308 × 094D ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 000D ÷ 0300 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 000D ÷ 0308 × 0300 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 000D ÷ 200C ÷ # ÷ [1.0] (CR) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 000D ÷ 0308 × 200C ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 000D ÷ 200D ÷ # ÷ [1.0] (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 000D ÷ 0308 × 200D ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 000D ÷ 1F1E6 ÷ # ÷ [1.0] (CR) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 1F1E6 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 000D ÷ 06DD ÷ # ÷ [1.0] (CR) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 06DD ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 000D ÷ 0903 ÷ # ÷ [1.0] (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 000D ÷ 0308 × 0903 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 000D ÷ 1100 ÷ # ÷ [1.0] (CR) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 1100 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 000D ÷ 1160 ÷ # ÷ [1.0] (CR) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 1160 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 000D ÷ 11A8 ÷ # ÷ [1.0] (CR) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 11A8 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 000D ÷ AC00 ÷ # ÷ [1.0] (CR) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 000D ÷ 0308 ÷ AC00 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 000D ÷ AC01 ÷ # ÷ [1.0] (CR) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 000D ÷ 0308 ÷ AC01 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 000D ÷ 1CF5 ÷ # ÷ [1.0] (CR) ÷ [4.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 1CF5 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 000D ÷ 0915 ÷ # ÷ [1.0] (CR) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 0915 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 000D ÷ 00A9 ÷ # ÷ [1.0] (CR) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 00A9 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 000D ÷ 0020 ÷ # ÷ [1.0] (CR) ÷ [4.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 0020 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000D ÷ 0378 ÷ # ÷ [1.0] (CR) ÷ [4.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000D ÷ 0308 ÷ 0378 ÷ # ÷ [1.0] (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000A ÷ 000D ÷ # ÷ [1.0] (LF) ÷ [4.0] (CR) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 000D ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 000A ÷ 000A ÷ # ÷ [1.0] (LF) ÷ [4.0] (LF) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 000A ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 000A ÷ 0000 ÷ # ÷ [1.0] (LF) ÷ [4.0] (Control) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 0000 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 000A ÷ 094D ÷ # ÷ [1.0] (LF) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 000A ÷ 0308 × 094D ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 000A ÷ 0300 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 000A ÷ 0308 × 0300 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 000A ÷ 200C ÷ # ÷ [1.0] (LF) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 000A ÷ 0308 × 200C ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 000A ÷ 200D ÷ # ÷ [1.0] (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 000A ÷ 0308 × 200D ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 000A ÷ 1F1E6 ÷ # ÷ [1.0] (LF) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 1F1E6 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 000A ÷ 06DD ÷ # ÷ [1.0] (LF) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 06DD ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 000A ÷ 0903 ÷ # ÷ [1.0] (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 000A ÷ 0308 × 0903 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 000A ÷ 1100 ÷ # ÷ [1.0] (LF) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 1100 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 000A ÷ 1160 ÷ # ÷ [1.0] (LF) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 1160 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 000A ÷ 11A8 ÷ # ÷ [1.0] (LF) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 11A8 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 000A ÷ AC00 ÷ # ÷ [1.0] (LF) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 000A ÷ 0308 ÷ AC00 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 000A ÷ AC01 ÷ # ÷ [1.0] (LF) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 000A ÷ 0308 ÷ AC01 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 000A ÷ 1CF5 ÷ # ÷ [1.0] (LF) ÷ [4.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 1CF5 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 000A ÷ 0915 ÷ # ÷ [1.0] (LF) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 0915 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 000A ÷ 00A9 ÷ # ÷ [1.0] (LF) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 00A9 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 000A ÷ 0020 ÷ # ÷ [1.0] (LF) ÷ [4.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 0020 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000A ÷ 0378 ÷ # ÷ [1.0] (LF) ÷ [4.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000A ÷ 0308 ÷ 0378 ÷ # ÷ [1.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0000 ÷ 000D ÷ # ÷ [1.0] (Control) ÷ [4.0] (CR) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 000D ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0000 ÷ 000A ÷ # ÷ [1.0] (Control) ÷ [4.0] (LF) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 000A ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0000 ÷ 0000 ÷ # ÷ [1.0] (Control) ÷ [4.0] (Control) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 0000 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0000 ÷ 094D ÷ # ÷ [1.0] (Control) ÷ [4.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0000 ÷ 0308 × 094D ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0000 ÷ 0300 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0000 ÷ 0308 × 0300 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0000 ÷ 200C ÷ # ÷ [1.0] (Control) ÷ [4.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0000 ÷ 0308 × 200C ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0000 ÷ 200D ÷ # ÷ [1.0] (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0000 ÷ 0308 × 200D ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0000 ÷ 1F1E6 ÷ # ÷ [1.0] (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 1F1E6 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0000 ÷ 06DD ÷ # ÷ [1.0] (Control) ÷ [4.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 06DD ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0000 ÷ 0903 ÷ # ÷ [1.0] (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0000 ÷ 0308 × 0903 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0000 ÷ 1100 ÷ # ÷ [1.0] (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 1100 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0000 ÷ 1160 ÷ # ÷ [1.0] (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 1160 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0000 ÷ 11A8 ÷ # ÷ [1.0] (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 11A8 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0000 ÷ AC00 ÷ # ÷ [1.0] (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ AC00 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0000 ÷ AC01 ÷ # ÷ [1.0] (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ AC01 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0000 ÷ 1CF5 ÷ # ÷ [1.0] (Control) ÷ [4.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 1CF5 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0000 ÷ 0915 ÷ # ÷ [1.0] (Control) ÷ [4.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 0915 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0000 ÷ 00A9 ÷ # ÷ [1.0] (Control) ÷ [4.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 00A9 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0000 ÷ 0020 ÷ # ÷ [1.0] (Control) ÷ [4.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 0020 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0000 ÷ 0378 ÷ # ÷ [1.0] (Control) ÷ [4.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0000 ÷ 0308 ÷ 0378 ÷ # ÷ [1.0] (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 094D ÷ 000D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (CR) ÷ [2.0] +÷ 094D × 0308 ÷ 000D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 094D ÷ 000A ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (LF) ÷ [2.0] +÷ 094D × 0308 ÷ 000A ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 094D ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [5.0] (Control) ÷ [2.0] +÷ 094D × 0308 ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 094D × 094D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 094D × 0308 × 094D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 094D × 0300 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 094D × 0308 × 0300 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 094D × 200C ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 094D × 0308 × 200C ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 094D × 200D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 094D × 0308 × 200D ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 094D ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 094D × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 094D ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 094D × 0308 ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 094D × 0903 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 094D × 0308 × 0903 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 094D ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 094D × 0308 ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 094D ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 094D × 0308 ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 094D ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 094D × 0308 ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 094D ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 094D × 0308 ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 094D ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 094D × 0308 ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 094D ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 094D × 0308 ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 094D × 0915 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 094D × 0308 × 0915 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.3] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 094D ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 094D × 0308 ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 094D ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 094D × 0308 ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 094D ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 094D × 0308 ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0300 ÷ 000D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0300 × 0308 ÷ 000D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0300 ÷ 000A ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0300 × 0308 ÷ 000A ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0300 ÷ 0000 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0300 × 0308 ÷ 0000 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0300 × 094D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0300 × 0308 × 094D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0300 × 0300 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0300 × 0308 × 0300 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0300 × 200C ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0300 × 0308 × 200C ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0300 × 200D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0300 × 0308 × 200D ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0300 ÷ 1F1E6 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0300 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0300 ÷ 06DD ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0300 × 0308 ÷ 06DD ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0300 × 0903 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0300 × 0308 × 0903 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0300 ÷ 1100 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0300 × 0308 ÷ 1100 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0300 ÷ 1160 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0300 × 0308 ÷ 1160 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0300 ÷ 11A8 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0300 × 0308 ÷ 11A8 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0300 ÷ AC00 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0300 × 0308 ÷ AC00 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0300 ÷ AC01 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0300 × 0308 ÷ AC01 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0300 ÷ 1CF5 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0300 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0300 ÷ 0915 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0300 × 0308 ÷ 0915 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0300 ÷ 00A9 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0300 × 0308 ÷ 00A9 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0300 ÷ 0020 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0300 × 0308 ÷ 0020 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0300 ÷ 0378 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0300 × 0308 ÷ 0378 ÷ # ÷ [1.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200C ÷ 000D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 200C × 0308 ÷ 000D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 200C ÷ 000A ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 200C × 0308 ÷ 000A ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 200C ÷ 0000 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 200C × 0308 ÷ 0000 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 200C × 094D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 200C × 0308 × 094D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 200C × 0300 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 200C × 0308 × 0300 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 200C × 200C ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 200C × 0308 × 200C ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 200C × 200D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 200C × 0308 × 200D ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 200C ÷ 1F1E6 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 200C × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 200C ÷ 06DD ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 200C × 0308 ÷ 06DD ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 200C × 0903 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 200C × 0308 × 0903 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 200C ÷ 1100 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 200C × 0308 ÷ 1100 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 200C ÷ 1160 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 200C × 0308 ÷ 1160 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 200C ÷ 11A8 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 200C × 0308 ÷ 11A8 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 200C ÷ AC00 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 200C × 0308 ÷ AC00 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 200C ÷ AC01 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 200C × 0308 ÷ AC01 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 200C ÷ 1CF5 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 200C × 0308 ÷ 1CF5 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 200C ÷ 0915 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 200C × 0308 ÷ 0915 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 200C ÷ 00A9 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 200C × 0308 ÷ 00A9 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 200C ÷ 0020 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200C × 0308 ÷ 0020 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200C ÷ 0378 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200C × 0308 ÷ 0378 ÷ # ÷ [1.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200D ÷ 000D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (CR) ÷ [2.0] +÷ 200D × 0308 ÷ 000D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 200D ÷ 000A ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (LF) ÷ [2.0] +÷ 200D × 0308 ÷ 000A ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 200D ÷ 0000 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] (Control) ÷ [2.0] +÷ 200D × 0308 ÷ 0000 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 200D × 094D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 200D × 0308 × 094D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 200D × 0300 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 200D × 0308 × 0300 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 200D × 200C ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 200D × 0308 × 200C ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 200D × 200D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 200D × 0308 × 200D ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 200D ÷ 1F1E6 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 200D × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 200D ÷ 06DD ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 200D × 0308 ÷ 06DD ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 200D × 0903 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 200D × 0308 × 0903 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 200D ÷ 1100 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 200D × 0308 ÷ 1100 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 200D ÷ 1160 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 200D × 0308 ÷ 1160 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 200D ÷ 11A8 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 200D × 0308 ÷ 11A8 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 200D ÷ AC00 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 200D × 0308 ÷ AC00 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 200D ÷ AC01 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 200D × 0308 ÷ AC01 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 200D ÷ 1CF5 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 200D × 0308 ÷ 1CF5 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 200D ÷ 0915 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 200D × 0308 ÷ 0915 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 200D ÷ 00A9 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 200D × 0308 ÷ 00A9 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 200D ÷ 0020 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200D × 0308 ÷ 0020 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200D ÷ 0378 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 200D × 0308 ÷ 0378 ÷ # ÷ [1.0] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1F1E6 ÷ 000D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (CR) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 000D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 1F1E6 ÷ 000A ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (LF) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 000A ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 1F1E6 ÷ 0000 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] (Control) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 0000 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 1F1E6 × 094D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1F1E6 × 0308 × 094D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1F1E6 × 0300 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1F1E6 × 0308 × 0300 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1F1E6 × 200C ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1F1E6 × 0308 × 200C ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1F1E6 × 200D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1F1E6 × 0308 × 200D ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1F1E6 × 1F1E6 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1F1E6 ÷ 06DD ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 06DD ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1F1E6 × 0903 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1F1E6 × 0308 × 0903 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1F1E6 ÷ 1100 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 1100 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1F1E6 ÷ 1160 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 1160 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1F1E6 ÷ 11A8 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 11A8 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1F1E6 ÷ AC00 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ AC00 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1F1E6 ÷ AC01 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ AC01 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1F1E6 ÷ 1CF5 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1F1E6 ÷ 0915 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 0915 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1F1E6 ÷ 00A9 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 00A9 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1F1E6 ÷ 0020 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 0020 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1F1E6 ÷ 0378 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1F1E6 × 0308 ÷ 0378 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 06DD ÷ 000D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) ÷ [5.0] (CR) ÷ [2.0] +÷ 06DD × 0308 ÷ 000D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 06DD ÷ 000A ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) ÷ [5.0] (LF) ÷ [2.0] +÷ 06DD × 0308 ÷ 000A ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 06DD ÷ 0000 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) ÷ [5.0] (Control) ÷ [2.0] +÷ 06DD × 0308 ÷ 0000 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 06DD × 094D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 06DD × 0308 × 094D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 06DD × 0300 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 06DD × 0308 × 0300 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 06DD × 200C ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 06DD × 0308 × 200C ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 06DD × 200D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 06DD × 0308 × 200D ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 06DD × 1F1E6 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 06DD × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 06DD × 06DD ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 06DD × 0308 ÷ 06DD ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 06DD × 0903 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 06DD × 0308 × 0903 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 06DD × 1100 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 06DD × 0308 ÷ 1100 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 06DD × 1160 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 06DD × 0308 ÷ 1160 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 06DD × 11A8 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 06DD × 0308 ÷ 11A8 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 06DD × AC00 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 06DD × 0308 ÷ AC00 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 06DD × AC01 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 06DD × 0308 ÷ AC01 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 06DD × 1CF5 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 06DD × 0308 ÷ 1CF5 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 06DD × 0915 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 06DD × 0308 ÷ 0915 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 06DD × 00A9 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 06DD × 0308 ÷ 00A9 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 06DD × 0020 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 06DD × 0308 ÷ 0020 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 06DD × 0378 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.2] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 06DD × 0308 ÷ 0378 ÷ # ÷ [1.0] ARABIC END OF AYAH (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0903 ÷ 000D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (CR) ÷ [2.0] +÷ 0903 × 0308 ÷ 000D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0903 ÷ 000A ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (LF) ÷ [2.0] +÷ 0903 × 0308 ÷ 000A ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0903 ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] (Control) ÷ [2.0] +÷ 0903 × 0308 ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0903 × 094D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0903 × 0308 × 094D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0903 × 0300 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0903 × 0308 × 0300 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0903 × 200C ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0903 × 0308 × 200C ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0903 × 200D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0903 × 0308 × 200D ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0903 ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0903 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0903 ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0903 × 0308 ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0903 × 0903 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0903 × 0308 × 0903 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0903 ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0903 × 0308 ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0903 ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0903 × 0308 ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0903 ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0903 × 0308 ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0903 ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0903 × 0308 ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0903 ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0903 × 0308 ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0903 ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0903 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0903 ÷ 0915 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0903 × 0308 ÷ 0915 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0903 ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0903 × 0308 ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0903 ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0903 × 0308 ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0903 ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0903 × 0308 ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1100 ÷ 000D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (CR) ÷ [2.0] +÷ 1100 × 0308 ÷ 000D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 1100 ÷ 000A ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (LF) ÷ [2.0] +÷ 1100 × 0308 ÷ 000A ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 1100 ÷ 0000 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] (Control) ÷ [2.0] +÷ 1100 × 0308 ÷ 0000 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 1100 × 094D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1100 × 0308 × 094D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1100 × 0300 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1100 × 0308 × 0300 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1100 × 200C ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1100 × 0308 × 200C ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1100 × 200D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1100 × 0308 × 200D ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1100 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1100 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1100 ÷ 06DD ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1100 × 0308 ÷ 06DD ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1100 × 0903 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1100 × 0308 × 0903 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1100 × 1100 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1100 × 0308 ÷ 1100 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1100 × 1160 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1100 × 0308 ÷ 1160 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1100 ÷ 11A8 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1100 × 0308 ÷ 11A8 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1100 × AC00 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1100 × 0308 ÷ AC00 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1100 × AC01 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1100 × 0308 ÷ AC01 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1100 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1100 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1100 ÷ 0915 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1100 × 0308 ÷ 0915 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1100 ÷ 00A9 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1100 × 0308 ÷ 00A9 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1100 ÷ 0020 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1100 × 0308 ÷ 0020 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1100 ÷ 0378 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1100 × 0308 ÷ 0378 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1160 ÷ 000D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (CR) ÷ [2.0] +÷ 1160 × 0308 ÷ 000D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 1160 ÷ 000A ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (LF) ÷ [2.0] +÷ 1160 × 0308 ÷ 000A ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 1160 ÷ 0000 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] (Control) ÷ [2.0] +÷ 1160 × 0308 ÷ 0000 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 1160 × 094D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1160 × 0308 × 094D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1160 × 0300 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1160 × 0308 × 0300 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1160 × 200C ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1160 × 0308 × 200C ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1160 × 200D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1160 × 0308 × 200D ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1160 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1160 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1160 ÷ 06DD ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1160 × 0308 ÷ 06DD ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1160 × 0903 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1160 × 0308 × 0903 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1160 ÷ 1100 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1160 × 0308 ÷ 1100 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1160 × 1160 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1160 × 0308 ÷ 1160 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1160 × 11A8 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1160 × 0308 ÷ 11A8 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1160 ÷ AC00 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1160 × 0308 ÷ AC00 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1160 ÷ AC01 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1160 × 0308 ÷ AC01 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1160 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1160 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1160 ÷ 0915 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1160 × 0308 ÷ 0915 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1160 ÷ 00A9 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1160 × 0308 ÷ 00A9 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1160 ÷ 0020 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1160 × 0308 ÷ 0020 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1160 ÷ 0378 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1160 × 0308 ÷ 0378 ÷ # ÷ [1.0] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 11A8 ÷ 000D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (CR) ÷ [2.0] +÷ 11A8 × 0308 ÷ 000D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 11A8 ÷ 000A ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (LF) ÷ [2.0] +÷ 11A8 × 0308 ÷ 000A ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 11A8 ÷ 0000 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] (Control) ÷ [2.0] +÷ 11A8 × 0308 ÷ 0000 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 11A8 × 094D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 11A8 × 0308 × 094D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 11A8 × 0300 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 11A8 × 0308 × 0300 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 11A8 × 200C ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 11A8 × 0308 × 200C ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 11A8 × 200D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 11A8 × 0308 × 200D ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 11A8 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 11A8 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 11A8 ÷ 06DD ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 11A8 × 0308 ÷ 06DD ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 11A8 × 0903 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 11A8 × 0308 × 0903 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 11A8 ÷ 1100 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 11A8 × 0308 ÷ 1100 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 11A8 ÷ 1160 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 11A8 × 0308 ÷ 1160 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 11A8 × 11A8 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 11A8 × 0308 ÷ 11A8 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 11A8 ÷ AC00 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 11A8 × 0308 ÷ AC00 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 11A8 ÷ AC01 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 11A8 × 0308 ÷ AC01 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 11A8 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 11A8 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 11A8 ÷ 0915 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 11A8 × 0308 ÷ 0915 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 11A8 ÷ 00A9 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 11A8 × 0308 ÷ 00A9 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 11A8 ÷ 0020 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 11A8 × 0308 ÷ 0020 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 11A8 ÷ 0378 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 11A8 × 0308 ÷ 0378 ÷ # ÷ [1.0] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC00 ÷ 000D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [5.0] (CR) ÷ [2.0] +÷ AC00 × 0308 ÷ 000D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ AC00 ÷ 000A ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [5.0] (LF) ÷ [2.0] +÷ AC00 × 0308 ÷ 000A ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ AC00 ÷ 0000 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [5.0] (Control) ÷ [2.0] +÷ AC00 × 0308 ÷ 0000 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ AC00 × 094D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ AC00 × 0308 × 094D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ AC00 × 0300 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ AC00 × 0308 × 0300 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ AC00 × 200C ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ AC00 × 0308 × 200C ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ AC00 × 200D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ AC00 × 0308 × 200D ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ AC00 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ AC00 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ AC00 ÷ 06DD ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ AC00 × 0308 ÷ 06DD ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ AC00 × 0903 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ AC00 × 0308 × 0903 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ AC00 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC00 × 0308 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC00 × 1160 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ AC00 × 0308 ÷ 1160 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ AC00 × 11A8 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ AC00 × 0308 ÷ 11A8 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ AC00 ÷ AC00 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ AC00 × 0308 ÷ AC00 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ AC00 ÷ AC01 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ AC00 × 0308 ÷ AC01 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ AC00 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ AC00 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ AC00 ÷ 0915 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ AC00 × 0308 ÷ 0915 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ AC00 ÷ 00A9 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ AC00 × 0308 ÷ 00A9 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ AC00 ÷ 0020 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC00 × 0308 ÷ 0020 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC00 ÷ 0378 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC00 × 0308 ÷ 0378 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC01 ÷ 000D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (CR) ÷ [2.0] +÷ AC01 × 0308 ÷ 000D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ AC01 ÷ 000A ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (LF) ÷ [2.0] +÷ AC01 × 0308 ÷ 000A ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ AC01 ÷ 0000 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] (Control) ÷ [2.0] +÷ AC01 × 0308 ÷ 0000 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ AC01 × 094D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ AC01 × 0308 × 094D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ AC01 × 0300 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ AC01 × 0308 × 0300 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ AC01 × 200C ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ AC01 × 0308 × 200C ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ AC01 × 200D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ AC01 × 0308 × 200D ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ AC01 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ AC01 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ AC01 ÷ 06DD ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ AC01 × 0308 ÷ 06DD ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ AC01 × 0903 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ AC01 × 0308 × 0903 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ AC01 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC01 × 0308 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC01 ÷ 1160 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ AC01 × 0308 ÷ 1160 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ AC01 × 11A8 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ AC01 × 0308 ÷ 11A8 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ AC01 ÷ AC00 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ AC01 × 0308 ÷ AC00 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ AC01 ÷ AC01 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ AC01 × 0308 ÷ AC01 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ AC01 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ AC01 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ AC01 ÷ 0915 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ AC01 × 0308 ÷ 0915 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ AC01 ÷ 00A9 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ AC01 × 0308 ÷ 00A9 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ AC01 ÷ 0020 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC01 × 0308 ÷ 0020 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC01 ÷ 0378 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ AC01 × 0308 ÷ 0378 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1CF5 ÷ 000D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [5.0] (CR) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 000D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 1CF5 ÷ 000A ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [5.0] (LF) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 000A ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 1CF5 ÷ 0000 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [5.0] (Control) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 0000 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 1CF5 × 094D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1CF5 × 0308 × 094D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 1CF5 × 0300 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1CF5 × 0308 × 0300 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 1CF5 × 200C ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1CF5 × 0308 × 200C ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 1CF5 × 200D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1CF5 × 0308 × 200D ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 1CF5 ÷ 1F1E6 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 1CF5 ÷ 06DD ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 06DD ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 1CF5 × 0903 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1CF5 × 0308 × 0903 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 1CF5 ÷ 1100 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 1100 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1CF5 ÷ 1160 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 1160 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 1CF5 ÷ 11A8 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 11A8 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 1CF5 ÷ AC00 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1CF5 × 0308 ÷ AC00 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 1CF5 ÷ AC01 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1CF5 × 0308 ÷ AC01 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 1CF5 ÷ 1CF5 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 1CF5 × 0915 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.3] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1CF5 × 0308 × 0915 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.3] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1CF5 ÷ 00A9 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 00A9 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 1CF5 ÷ 0020 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 0020 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1CF5 ÷ 0378 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1CF5 × 0308 ÷ 0378 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0915 ÷ 000D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (CR) ÷ [2.0] +÷ 0915 × 0308 ÷ 000D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0915 ÷ 000A ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (LF) ÷ [2.0] +÷ 0915 × 0308 ÷ 000A ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0915 ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [5.0] (Control) ÷ [2.0] +÷ 0915 × 0308 ÷ 0000 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0915 × 094D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0915 × 0308 × 094D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0915 × 0300 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0915 × 0308 × 0300 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0915 × 200C ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0915 × 0308 × 200C ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0915 × 200D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0915 × 0308 × 200D ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0915 ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0915 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0915 ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0915 × 0308 ÷ 06DD ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0915 × 0903 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0915 × 0308 × 0903 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0915 ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0915 × 0308 ÷ 1100 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0915 ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0915 × 0308 ÷ 1160 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0915 ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0915 × 0308 ÷ 11A8 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0915 ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0915 × 0308 ÷ AC00 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0915 ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0915 × 0308 ÷ AC01 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0915 ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0915 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0915 ÷ 0915 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 0308 ÷ 0915 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0915 ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0915 × 0308 ÷ 00A9 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0915 ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0915 × 0308 ÷ 0020 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0915 ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0915 × 0308 ÷ 0378 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 00A9 ÷ 000D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (CR) ÷ [2.0] +÷ 00A9 × 0308 ÷ 000D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 00A9 ÷ 000A ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (LF) ÷ [2.0] +÷ 00A9 × 0308 ÷ 000A ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 00A9 ÷ 0000 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [5.0] (Control) ÷ [2.0] +÷ 00A9 × 0308 ÷ 0000 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 00A9 × 094D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 00A9 × 0308 × 094D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 00A9 × 0300 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 00A9 × 0308 × 0300 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 00A9 × 200C ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 00A9 × 0308 × 200C ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 00A9 × 200D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 00A9 × 0308 × 200D ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 00A9 ÷ 1F1E6 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 00A9 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 00A9 ÷ 06DD ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 00A9 × 0308 ÷ 06DD ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 00A9 × 0903 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 00A9 × 0308 × 0903 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 00A9 ÷ 1100 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 00A9 × 0308 ÷ 1100 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 00A9 ÷ 1160 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 00A9 × 0308 ÷ 1160 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 00A9 ÷ 11A8 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 00A9 × 0308 ÷ 11A8 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 00A9 ÷ AC00 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 00A9 × 0308 ÷ AC00 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 00A9 ÷ AC01 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 00A9 × 0308 ÷ AC01 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 00A9 ÷ 1CF5 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 00A9 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 00A9 ÷ 0915 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 00A9 × 0308 ÷ 0915 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 00A9 ÷ 00A9 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 00A9 × 0308 ÷ 00A9 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 00A9 ÷ 0020 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 00A9 × 0308 ÷ 0020 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 00A9 ÷ 0378 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 00A9 × 0308 ÷ 0378 ÷ # ÷ [1.0] COPYRIGHT SIGN (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0020 ÷ 000D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (CR) ÷ [2.0] +÷ 0020 × 0308 ÷ 000D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0020 ÷ 000A ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [2.0] +÷ 0020 × 0308 ÷ 000A ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0020 ÷ 0000 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (Control) ÷ [2.0] +÷ 0020 × 0308 ÷ 0000 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0020 × 094D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0020 × 0308 × 094D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0020 × 0300 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0020 × 0308 × 0300 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0020 × 200C ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0020 × 0308 × 200C ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0020 × 200D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0020 × 0308 × 200D ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0020 ÷ 1F1E6 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0020 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0020 ÷ 06DD ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0020 × 0308 ÷ 06DD ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0020 × 0903 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0020 × 0308 × 0903 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0020 ÷ 1100 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0020 × 0308 ÷ 1100 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0020 ÷ 1160 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0020 × 0308 ÷ 1160 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0020 ÷ 11A8 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0020 × 0308 ÷ 11A8 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0020 ÷ AC00 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0020 × 0308 ÷ AC00 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0020 ÷ AC01 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0020 × 0308 ÷ AC01 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0020 ÷ 1CF5 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0020 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0020 ÷ 0915 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0020 × 0308 ÷ 0915 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0020 ÷ 00A9 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0020 × 0308 ÷ 00A9 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0020 ÷ 0020 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0020 × 0308 ÷ 0020 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0020 ÷ 0378 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0020 × 0308 ÷ 0378 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0378 ÷ 000D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (CR) ÷ [2.0] +÷ 0378 × 0308 ÷ 000D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (CR) ÷ [2.0] +÷ 0378 ÷ 000A ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [2.0] +÷ 0378 × 0308 ÷ 000A ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (LF) ÷ [2.0] +÷ 0378 ÷ 0000 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (Control) ÷ [2.0] +÷ 0378 × 0308 ÷ 0000 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [5.0] (Control) ÷ [2.0] +÷ 0378 × 094D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0378 × 0308 × 094D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [2.0] +÷ 0378 × 0300 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0378 × 0308 × 0300 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] COMBINING GRAVE ACCENT (Extend_ConjunctExtender) ÷ [2.0] +÷ 0378 × 200C ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0378 × 0308 × 200C ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [2.0] +÷ 0378 × 200D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0378 × 0308 × 200D ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0378 ÷ 1F1E6 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0378 × 0308 ÷ 1F1E6 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [2.0] +÷ 0378 ÷ 06DD ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0378 × 0308 ÷ 06DD ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] ARABIC END OF AYAH (Prepend) ÷ [2.0] +÷ 0378 × 0903 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0378 × 0308 × 0903 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [2.0] +÷ 0378 ÷ 1100 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0378 × 0308 ÷ 1100 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 0378 ÷ 1160 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0378 × 0308 ÷ 1160 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [2.0] +÷ 0378 ÷ 11A8 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0378 × 0308 ÷ 11A8 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [2.0] +÷ 0378 ÷ AC00 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0378 × 0308 ÷ AC00 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [2.0] +÷ 0378 ÷ AC01 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0378 × 0308 ÷ AC01 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [2.0] +÷ 0378 ÷ 1CF5 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0378 × 0308 ÷ 1CF5 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) ÷ [2.0] +÷ 0378 ÷ 0915 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0378 × 0308 ÷ 0915 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 0378 ÷ 00A9 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0378 × 0308 ÷ 00A9 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] COPYRIGHT SIGN (ExtPict) ÷ [2.0] +÷ 0378 ÷ 0020 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0378 × 0308 ÷ 0020 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0378 ÷ 0378 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0378 × 0308 ÷ 0378 ÷ # ÷ [1.0] (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷ # ÷ [1.0] (CR) × [3.0] (LF) ÷ [4.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [5.0] (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [2.0] +÷ 0061 × 0308 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [2.0] +÷ 0020 × 200D ÷ 0646 ÷ # ÷ [1.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC LETTER NOON (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0646 × 200D ÷ 0020 ÷ # ÷ [1.0] ARABIC LETTER NOON (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1100 × 1100 ÷ # ÷ [1.0] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC00 × 11A8 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ AC01 × 11A8 ÷ 1100 ÷ # ÷ [1.0] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [2.0] +÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷ # ÷ [1.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 × 200D ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [2.0] +÷ 0061 × 0308 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 × 0903 ÷ 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 ÷ 0600 × 0062 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 1F476 × 1F3FF ÷ 1F476 ÷ # ÷ [1.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtender) ÷ [999.0] BABY (ExtPict) ÷ [2.0] +÷ 0061 × 1F3FF ÷ 1F476 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtender) ÷ [999.0] BABY (ExtPict) ÷ [2.0] +÷ 0061 × 1F3FF ÷ 1F476 × 200D × 1F6D1 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtender) ÷ [999.0] BABY (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [2.0] +÷ 1F476 × 1F3FF × 0308 × 200D × 1F476 × 1F3FF ÷ # ÷ [1.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtender) × [9.0] COMBINING DIAERESIS (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend_ConjunctExtender) ÷ [2.0] +÷ 1F6D1 × 200D × 1F6D1 ÷ # ÷ [1.0] OCTAGONAL SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [2.0] +÷ 0061 × 200D ÷ 1F6D1 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [2.0] +÷ 2701 × 200D ÷ 2701 ÷ # ÷ [1.0] UPPER BLADE SCISSORS (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 × 200D ÷ 2701 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] UPPER BLADE SCISSORS (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0915 ÷ 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) ÷ [999.0] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D × 094D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D × 200D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 093C × 200D × 094D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtender) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 093C × 094D × 200D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN NUKTA (Extend_ConjunctExtender) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] ZERO WIDTH JOINER (ZWJ) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D × 0924 × 094D × 092F ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER YA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D ÷ 0061 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) ÷ [999.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0061 × 094D × 0924 ÷ # ÷ [1.0] LATIN SMALL LETTER A (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 003F × 094D × 0924 ÷ # ÷ [1.0] QUESTION MARK (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0915 × 094D × 094D × 0924 ÷ # ÷ [1.0] DEVANAGARI LETTER KA (LinkingConsonant) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.0] DEVANAGARI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] DEVANAGARI LETTER TA (LinkingConsonant) ÷ [2.0] +÷ 0AB8 × 0AFB × 0ACD × 0AB8 × 0AFB ÷ # ÷ [1.0] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtender) × [9.0] GUJARATI SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] GUJARATI LETTER SA (LinkingConsonant) × [9.0] GUJARATI SIGN SHADDA (Extend_ConjunctExtender) ÷ [2.0] +÷ 1019 × 1039 × 1018 ÷ 102C × 1037 ÷ # ÷ [1.0] MYANMAR LETTER MA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER BHA (LinkingConsonant) ÷ [999.0] MYANMAR VOWEL SIGN AA (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] MYANMAR SIGN DOT BELOW (Extend_ConjunctExtender) ÷ [2.0] +÷ 1004 × 103A × 1039 × 1011 × 1039 × 1011 ÷ # ÷ [1.0] MYANMAR LETTER NGA (LinkingConsonant) × [9.0] MYANMAR SIGN ASAT (Extend_ConjunctExtender) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) × [9.0] MYANMAR SIGN VIRAMA (Extend_ConjunctLinker) × [9.3] MYANMAR LETTER THA (LinkingConsonant) ÷ [2.0] +÷ 1B12 × 1B01 ÷ 1B32 × 1B44 × 1B2F ÷ 1B32 × 1B44 × 1B22 × 1B44 × 1B2C ÷ 1B32 × 1B44 × 1B22 × 1B38 ÷ # ÷ [1.0] BALINESE LETTER OKARA TEDUNG (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] BALINESE SIGN ULU CANDRA (Extend_ConjunctExtender) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER WA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER YA (LinkingConsonant) ÷ [999.0] BALINESE LETTER SA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER TA (LinkingConsonant) × [9.0] BALINESE VOWEL SIGN SUKU (Extend_ConjunctExtender) ÷ [2.0] +÷ 179F × 17D2 × 178F × 17D2 × 179A × 17B8 ÷ # ÷ [1.0] KHMER LETTER SA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER TA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER LETTER RO (LinkingConsonant) × [9.0] KHMER VOWEL SIGN II (Extend_ConjunctExtender) ÷ [2.0] +÷ 1B26 ÷ 1B17 × 1B44 × 1B13 ÷ # ÷ [1.0] BALINESE LETTER NA (LinkingConsonant) ÷ [999.0] BALINESE LETTER NGA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1B27 ÷ 1B13 × 1B44 × 1B0B ÷ 1B0B × 1B04 ÷ # ÷ [1.0] BALINESE LETTER PA (LinkingConsonant) ÷ [999.0] BALINESE LETTER KA (LinkingConsonant) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER RA REPA (LinkingConsonant) ÷ [999.0] BALINESE LETTER RA REPA (LinkingConsonant) × [9.1] BALINESE SIGN BISAH (SpacingMark) ÷ [2.0] +÷ 1795 × 17D2 × 17AF ÷ 1798 ÷ # ÷ [1.0] KHMER LETTER PHA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL QE (LinkingConsonant) ÷ [999.0] KHMER LETTER MO (LinkingConsonant) ÷ [2.0] +÷ 17A0 × 17D2 × 17AB ÷ 1791 × 17D0 ÷ 1799 ÷ # ÷ [1.0] KHMER LETTER HA (LinkingConsonant) × [9.0] KHMER SIGN COENG (Extend_ConjunctLinker) × [9.3] KHMER INDEPENDENT VOWEL RY (LinkingConsonant) ÷ [999.0] KHMER LETTER TO (LinkingConsonant) × [9.0] KHMER SIGN SAMYOK SANNYA (Extend_ConjunctExtender) ÷ [999.0] KHMER LETTER YO (LinkingConsonant) ÷ [2.0] +÷ 1B05 × 1B44 × 1B33 × 1B03 ÷ # ÷ [1.0] BALINESE LETTER AKARA (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] BALINESE ADEG ADEG (Extend_ConjunctLinker) × [9.3] BALINESE LETTER HA (LinkingConsonant) × [9.0] BALINESE SIGN SURANG (Extend_ConjunctExtender) ÷ [2.0] +÷ 0CF1 ÷ 0C95 ÷ # ÷ [1.0] KANNADA SIGN JIHVAMULIYA (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] KANNADA LETTER KA (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0CF2 ÷ 0CAB ÷ # ÷ [1.0] KANNADA SIGN UPADHMANIYA (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] KANNADA LETTER PHA (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [2.0] +÷ 0CF1 ÷ 0C95 × 0CBF ÷ # ÷ [1.0] KANNADA SIGN JIHVAMULIYA (XXmConjunctLinkermLinkingConsonantmExtPict) ÷ [999.0] KANNADA LETTER KA (XXmConjunctLinkermLinkingConsonantmExtPict) × [9.0] KANNADA VOWEL SIGN I (Extend_ConjunctExtender) ÷ [2.0] +÷ 1CF5 × 0995 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.3] BENGALI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1CF6 × 09AA ÷ # ÷ [1.0] VEDIC SIGN UPADHMANIYA (ConjunctLinkermExtend) × [9.3] BENGALI LETTER PA (LinkingConsonant) ÷ [2.0] +÷ 1CF5 × 200C ÷ 0995 ÷ # ÷ [1.0] VEDIC SIGN JIHVAMULIYA (ConjunctLinkermExtend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] BENGALI LETTER KA (LinkingConsonant) ÷ [2.0] +÷ 1CF6 × 200C ÷ 09AA ÷ # ÷ [1.0] VEDIC SIGN UPADHMANIYA (ConjunctLinkermExtend) × [9.0] ZERO WIDTH NON-JOINER (ExtendmConjunctLinkermConjunctExtender) ÷ [999.0] BENGALI LETTER PA (LinkingConsonant) ÷ [2.0] +÷ 11A3A × 11A0B ÷ # ÷ [1.0] ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA (ConjunctLinkermExtend) × [9.3] ZANABAZAR SQUARE LETTER KA (LinkingConsonant) ÷ [2.0] # -# Lines: 766 +# Lines: 853 # # EOF diff --git a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt index 450252c4df3f..7a383f0dcfd6 100644 --- a/src/java.base/share/data/unicodedata/emoji/emoji-data.txt +++ b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt @@ -1,11 +1,11 @@ # emoji-data.txt -# Date: 2025-07-25, 17:54:31 GMT -# © 2025 Unicode®, Inc. +# Date: 2026-01-30, 22:30:17 GMT +# © 2026 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Emoji Data for UTS #51 -# Version: 17.0 +# Version: 18.0.0 # # For documentation and usage, see https://www.unicode.org/reports/tr51 # @@ -341,6 +341,7 @@ 1F6D5 ; Emoji # E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Emoji # E13.0 [2] (🛖..🛗) hut..elevator 1F6D8 ; Emoji # E17.0 [1] (🛘) landslide +1F6D9 ; Emoji # E18.0 [1] (🛙) lighthouse 1F6DC ; Emoji # E15.0 [1] (🛜) wireless 1F6DD..1F6DF ; Emoji # E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6E0..1F6E5 ; Emoji # E0.7 [6] (🛠️..🛥️) hammer and wrench..motor boat @@ -410,6 +411,7 @@ 1FA87..1FA88 ; Emoji # E15.0 [2] (🪇..🪈) maracas..flute 1FA89 ; Emoji # E16.0 [1] (🪉) harp 1FA8A ; Emoji # E17.0 [1] (🪊) trombone +1FA8B..1FA8D ; Emoji # E18.0 [3] (🪋..🪍) meteor..net with handle 1FA8E ; Emoji # E17.0 [1] (🪎) treasure chest 1FA8F ; Emoji # E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Emoji # E12.0 [6] (🪐..🪕) ringed planet..banjo @@ -425,22 +427,26 @@ 1FAC3..1FAC5 ; Emoji # E14.0 [3] (🫃..🫅) pregnant man..person with crown 1FAC6 ; Emoji # E16.0 [1] (🫆) fingerprint 1FAC8 ; Emoji # E17.0 [1] (🫈) hairy creature +1FACC ; Emoji # E18.0 [1] (🫌) monarch butterfly 1FACD ; Emoji # E17.0 [1] (🫍) orca 1FACE..1FACF ; Emoji # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji # E15.0 [2] (🫚..🫛) ginger root..pea pod 1FADC ; Emoji # E16.0 [1] (🫜) root vegetable +1FADD ; Emoji # E18.0 [1] (🫝) pickle 1FADF ; Emoji # E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Emoji # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji # E15.0 [1] (🫨) shaking face 1FAE9 ; Emoji # E16.0 [1] (🫩) face with bags under eyes 1FAEA ; Emoji # E17.0 [1] (🫪) distorted face +1FAEB ; Emoji # E18.0 [1] (🫫) cracking face 1FAEF ; Emoji # E17.0 [1] (🫯) fight cloud 1FAF0..1FAF6 ; Emoji # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand +1FAF9..1FAFA ; Emoji # E18.0 [2] (🫹..🫺) leftwards thumb sign..rightwards thumb sign -# Total elements: 1438 +# Total elements: 1447 # ================================================ @@ -648,6 +654,7 @@ 1F6D5 ; Emoji_Presentation # E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Emoji_Presentation # E13.0 [2] (🛖..🛗) hut..elevator 1F6D8 ; Emoji_Presentation # E17.0 [1] (🛘) landslide +1F6D9 ; Emoji_Presentation # E18.0 [1] (🛙) lighthouse 1F6DC ; Emoji_Presentation # E15.0 [1] (🛜) wireless 1F6DD..1F6DF ; Emoji_Presentation # E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6EB..1F6EC ; Emoji_Presentation # E1.0 [2] (🛫..🛬) airplane departure..airplane arrival @@ -713,6 +720,7 @@ 1FA87..1FA88 ; Emoji_Presentation # E15.0 [2] (🪇..🪈) maracas..flute 1FA89 ; Emoji_Presentation # E16.0 [1] (🪉) harp 1FA8A ; Emoji_Presentation # E17.0 [1] (🪊) trombone +1FA8B..1FA8D ; Emoji_Presentation # E18.0 [3] (🪋..🪍) meteor..net with handle 1FA8E ; Emoji_Presentation # E17.0 [1] (🪎) treasure chest 1FA8F ; Emoji_Presentation # E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Emoji_Presentation # E12.0 [6] (🪐..🪕) ringed planet..banjo @@ -728,22 +736,26 @@ 1FAC3..1FAC5 ; Emoji_Presentation # E14.0 [3] (🫃..🫅) pregnant man..person with crown 1FAC6 ; Emoji_Presentation # E16.0 [1] (🫆) fingerprint 1FAC8 ; Emoji_Presentation # E17.0 [1] (🫈) hairy creature +1FACC ; Emoji_Presentation # E18.0 [1] (🫌) monarch butterfly 1FACD ; Emoji_Presentation # E17.0 [1] (🫍) orca 1FACE..1FACF ; Emoji_Presentation # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji_Presentation # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji_Presentation # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji_Presentation # E15.0 [2] (🫚..🫛) ginger root..pea pod 1FADC ; Emoji_Presentation # E16.0 [1] (🫜) root vegetable +1FADD ; Emoji_Presentation # E18.0 [1] (🫝) pickle 1FADF ; Emoji_Presentation # E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Emoji_Presentation # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji_Presentation # E15.0 [1] (🫨) shaking face 1FAE9 ; Emoji_Presentation # E16.0 [1] (🫩) face with bags under eyes 1FAEA ; Emoji_Presentation # E17.0 [1] (🫪) distorted face +1FAEB ; Emoji_Presentation # E18.0 [1] (🫫) cracking face 1FAEF ; Emoji_Presentation # E17.0 [1] (🫯) fight cloud 1FAF0..1FAF6 ; Emoji_Presentation # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji_Presentation # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand +1FAF9..1FAFA ; Emoji_Presentation # E18.0 [2] (🫹..🫺) leftwards thumb sign..rightwards thumb sign -# Total elements: 1219 +# Total elements: 1228 # ================================================ @@ -807,8 +819,9 @@ 1FAC3..1FAC5 ; Emoji_Modifier_Base # E14.0 [3] (🫃..🫅) pregnant man..person with crown 1FAF0..1FAF6 ; Emoji_Modifier_Base # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji_Modifier_Base # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand +1FAF9..1FAFA ; Emoji_Modifier_Base # E18.0 [2] (🫹..🫺) leftwards thumb sign..rightwards thumb sign -# Total elements: 134 +# Total elements: 136 # ================================================ @@ -954,7 +967,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F17E..1F17F ; Extended_Pictographic# E0.6 [2] (🅾️..🅿️) O button (blood type)..P button 1F18E ; Extended_Pictographic# E0.6 [1] (🆎) AB button (blood type) 1F191..1F19A ; Extended_Pictographic# E0.6 [10] (🆑..🆚) CL button..VS button -1F1AE..1F1E5 ; Extended_Pictographic# E0.0 [56] (🆮..🇥) .. +1F1AF..1F1E5 ; Extended_Pictographic# E0.0 [55] (🆯..🇥) .. 1F201..1F202 ; Extended_Pictographic# E0.6 [2] (🈁..🈂️) Japanese “here” button..Japanese “service charge” button 1F203..1F20F ; Extended_Pictographic# E0.0 [13] (🈃..🈏) .. 1F21A ; Extended_Pictographic# E0.6 [1] (🈚) Japanese “free of charge” button @@ -1160,7 +1173,8 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F6D5 ; Extended_Pictographic# E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Extended_Pictographic# E13.0 [2] (🛖..🛗) hut..elevator 1F6D8 ; Extended_Pictographic# E17.0 [1] (🛘) landslide -1F6D9..1F6DB ; Extended_Pictographic# E0.0 [3] (🛙..🛛) .. +1F6D9 ; Extended_Pictographic# E18.0 [1] (🛙) lighthouse +1F6DA..1F6DB ; Extended_Pictographic# E0.0 [2] (🛚..🛛) .. 1F6DC ; Extended_Pictographic# E15.0 [1] (🛜) wireless 1F6DD..1F6DF ; Extended_Pictographic# E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6E0..1F6E5 ; Extended_Pictographic# E0.7 [6] (🛠️..🛥️) hammer and wrench..motor boat @@ -1175,11 +1189,10 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F6FA ; Extended_Pictographic# E12.0 [1] (🛺) auto rickshaw 1F6FB..1F6FC ; Extended_Pictographic# E13.0 [2] (🛻..🛼) pickup truck..roller skate 1F6FD..1F6FF ; Extended_Pictographic# E0.0 [3] (🛽..🛿) .. -1F7DA..1F7DF ; Extended_Pictographic# E0.0 [6] (🟚..🟟) .. +1F7DC..1F7DF ; Extended_Pictographic# E0.0 [4] (🟜..🟟) .. 1F7E0..1F7EB ; Extended_Pictographic# E12.0 [12] (🟠..🟫) orange circle..brown square 1F7EC..1F7EF ; Extended_Pictographic# E0.0 [4] (🟬..🟯) .. 1F7F0 ; Extended_Pictographic# E14.0 [1] (🟰) heavy equals sign -1F7F1..1F7FF ; Extended_Pictographic# E0.0 [15] (🟱..🟿) .. 1F80C..1F80F ; Extended_Pictographic# E0.0 [4] (🠌..🠏) .. 1F848..1F84F ; Extended_Pictographic# E0.0 [8] (🡈..🡏) .. 1F85A..1F85F ; Extended_Pictographic# E0.0 [6] (🡚..🡟) .. @@ -1246,7 +1259,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1FA87..1FA88 ; Extended_Pictographic# E15.0 [2] (🪇..🪈) maracas..flute 1FA89 ; Extended_Pictographic# E16.0 [1] (🪉) harp 1FA8A ; Extended_Pictographic# E17.0 [1] (🪊) trombone -1FA8B..1FA8D ; Extended_Pictographic# E0.0 [3] (🪋..🪍) .. +1FA8B..1FA8D ; Extended_Pictographic# E18.0 [3] (🪋..🪍) meteor..net with handle 1FA8E ; Extended_Pictographic# E17.0 [1] (🪎) treasure chest 1FA8F ; Extended_Pictographic# E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Extended_Pictographic# E12.0 [6] (🪐..🪕) ringed planet..banjo @@ -1263,26 +1276,30 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1FAC6 ; Extended_Pictographic# E16.0 [1] (🫆) fingerprint 1FAC7 ; Extended_Pictographic# E0.0 [1] (🫇) 1FAC8 ; Extended_Pictographic# E17.0 [1] (🫈) hairy creature -1FAC9..1FACC ; Extended_Pictographic# E0.0 [4] (🫉..🫌) .. +1FAC9..1FACB ; Extended_Pictographic# E0.0 [3] (🫉..🫋) .. +1FACC ; Extended_Pictographic# E18.0 [1] (🫌) monarch butterfly 1FACD ; Extended_Pictographic# E17.0 [1] (🫍) orca 1FACE..1FACF ; Extended_Pictographic# E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Extended_Pictographic# E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Extended_Pictographic# E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Extended_Pictographic# E15.0 [2] (🫚..🫛) ginger root..pea pod 1FADC ; Extended_Pictographic# E16.0 [1] (🫜) root vegetable -1FADD..1FADE ; Extended_Pictographic# E0.0 [2] (🫝..🫞) .. +1FADD ; Extended_Pictographic# E18.0 [1] (🫝) pickle +1FADE ; Extended_Pictographic# E0.0 [1] (🫞) 1FADF ; Extended_Pictographic# E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Extended_Pictographic# E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Extended_Pictographic# E15.0 [1] (🫨) shaking face 1FAE9 ; Extended_Pictographic# E16.0 [1] (🫩) face with bags under eyes 1FAEA ; Extended_Pictographic# E17.0 [1] (🫪) distorted face -1FAEB..1FAEE ; Extended_Pictographic# E0.0 [4] (🫫..🫮) .. +1FAEB ; Extended_Pictographic# E18.0 [1] (🫫) cracking face +1FAEC..1FAEE ; Extended_Pictographic# E0.0 [3] (🫬..🫮) .. 1FAEF ; Extended_Pictographic# E17.0 [1] (🫯) fight cloud 1FAF0..1FAF6 ; Extended_Pictographic# E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Extended_Pictographic# E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand -1FAF9..1FAFF ; Extended_Pictographic# E0.0 [7] (🫹..🫿) .. +1FAF9..1FAFA ; Extended_Pictographic# E18.0 [2] (🫹..🫺) leftwards thumb sign..rightwards thumb sign +1FAFB..1FAFF ; Extended_Pictographic# E0.0 [5] (🫻..🫿) .. 1FC00..1FFFD ; Extended_Pictographic# E0.0[1022] (🰀..🿽) .. -# Total elements: 2848 +# Total elements: 2830 #EOF diff --git a/src/java.base/share/legal/icu.md b/src/java.base/share/legal/icu.md index 634fea70d922..380ee5ac2957 100644 --- a/src/java.base/share/legal/icu.md +++ b/src/java.base/share/legal/icu.md @@ -1,4 +1,4 @@ -## International Components for Unicode (ICU4J) v78.1 +## International Components for Unicode (ICU4J) v79.1 ### ICU4J License ``` @@ -6,7 +6,7 @@ UNICODE LICENSE V3 COPYRIGHT AND PERMISSION NOTICE -Copyright © 2016-2025 Unicode, Inc. +Copyright © 2016-2026 Unicode, Inc. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR diff --git a/src/java.base/share/legal/unicode.md b/src/java.base/share/legal/unicode.md index a1009c70c1c9..4b0ee212dd85 100644 --- a/src/java.base/share/legal/unicode.md +++ b/src/java.base/share/legal/unicode.md @@ -1,4 +1,4 @@ -## The Unicode Standard, Unicode Character Database, Version 17.0.0 +## The Unicode Standard, Unicode Character Database, Version 18.0.0 ### Unicode Character Database ``` @@ -7,7 +7,7 @@ UNICODE LICENSE V3 COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2025 Unicode, Inc. +Copyright © 1991-2026 Unicode, Inc. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR diff --git a/test/jdk/java/lang/String/SpecialCasingTest.java b/test/jdk/java/lang/String/SpecialCasingTest.java index d4a5122e7adc..5d9d8054f93e 100644 --- a/test/jdk/java/lang/String/SpecialCasingTest.java +++ b/test/jdk/java/lang/String/SpecialCasingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @bug 4397357 6565620 6959267 7070436 7198195 8041791 8032446 8072600 - * 8221431 + * 8221431 8372208 * @summary Confirm special case mappings are handled correctly. * @library /lib/testlibrary/java/lang */ @@ -335,7 +335,7 @@ private String convert(String str) { String[] tokens = str.split(" "); for (String token : tokens) { - sb.append((char) Integer.parseInt(token, 16)); + sb.appendCodePoint(Integer.parseInt(token, 16)); } return sb.toString(); } diff --git a/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java b/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java index 86b3fba0a279..90b0ebb3b4c4 100644 --- a/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java +++ b/test/jdk/java/lang/String/UnicodeCaseFoldingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /** * @test * @summary tests unicode case-folding based String comparison and equality - * @bug 4397357 + * @bug 4397357 8372208 * @library /lib/testlibrary/java/lang * @modules java.base/jdk.internal.lang:+open * @run junit/othervm @@ -48,7 +48,7 @@ public class UnicodeCaseFoldingTest { @Test - void testAllCommnFullCodePointsListedInCaseFoldinigTxt() throws Throwable { + void testAllCommonFullCodePointsListedInCaseFoldinigTxt() throws Throwable { var filter = "^.*; [CF]; .*$"; // C=common, F=full, for full case folding var results = Files.lines(UCDFiles.CASEFOLDING) .filter(line -> !line.startsWith("#") && line.matches(filter)) @@ -285,6 +285,26 @@ void testCaseFoldRoundTrip(String s) { assertEquals(true, folded.equalsFoldCase(s)); } + @Test + void testFoldCaseAcrossDifferentUtf16Widths() { + String ligature = new String(Character.toChars(0x1DF95)); + + String[][] pairs = { + {ligature, "\u1E9E"}, // Both fold to ss + {"\u0100" + ligature, "\u0100\u00DF"} // Both fold to āss + }; + + for (String[] pair : pairs) { + String a = pair[0]; + String b = pair[1]; + + assertEquals(0, a.compareToFoldCase(b)); + assertEquals(0, b.compareToFoldCase(a)); + assertEquals(true, a.equalsFoldCase(b)); + assertEquals(true, b.equalsFoldCase(a)); + } + } + // helper to test the integrity of folding mapping private static int[] longToFolding(long value) { int len = (int) (value >>> 48); diff --git a/test/jdk/java/util/regex/CaseFoldingTest.java b/test/jdk/java/util/regex/CaseFoldingTest.java index c478577d7c9b..7682259e667f 100644 --- a/test/jdk/java/util/regex/CaseFoldingTest.java +++ b/test/jdk/java/util/regex/CaseFoldingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /** * @test * @summary tests RegExp unicode case-insensitive match (?ui) - * @bug 8360459 + * @bug 8360459 8372208 * @library /lib/testlibrary/java/lang * @run junit CaseFoldingTest */ @@ -52,7 +52,8 @@ void testUnicodeCaseInsensitiveMatch() throws Throwable { // exclude them for now. 0x1fd3, // 1FD3 [lo: 1fd3, up: 1fd3] 0390 [lo: 0390, up: 0390] 0x1fe3, // 1FE3 [lo: 1fe3, up: 1fe3] 03B0 [lo: 03b0, up: 03b0] - 0xfb05 // FB05 [lo: fb05, up: fb05] FB06 [lo: fb06, up: fb06] + 0xfb05, // FB05 [lo: fb05, up: fb05] FB06 [lo: fb06, up: fb06] + 0x1df95 // 1DF95 [lo: 1df95, up: 1df95] 00DF [lo: 00df, up: 00df] ); var results = Files.lines(UCDFiles.CASEFOLDING) diff --git a/test/jdk/java/util/regex/GraphemeTestCases.txt b/test/jdk/java/util/regex/GraphemeTestCases.txt index e346e3f5bf69..7967b81f2be8 100644 --- a/test/jdk/java/util/regex/GraphemeTestCases.txt +++ b/test/jdk/java/util/regex/GraphemeTestCases.txt @@ -37,3 +37,6 @@ ÷ 1F44D × 0301 × 200D × 1F44D ÷ ÷ 1F44D × 200D × 0301 ÷ 1F44D ÷ ÷ 1F44D × 093E × 200D ÷ 1F44D ÷ + +# Unicode 18 - Revised GB9c +÷ 1F600 × 094D × 0915 × 200D ÷ 1F600 ÷ diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java index 2052e2ac280f..b9b95ceaa09d 100644 --- a/test/jdk/java/util/regex/RegExTest.java +++ b/test/jdk/java/util/regex/RegExTest.java @@ -36,7 +36,7 @@ * 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706 * 8194667 8197462 8184692 8221431 8224789 8228352 8230829 8236034 8235812 * 8216332 8214245 8237599 8241055 8247546 8258259 8037397 8269753 8276694 - * 8280403 8264160 8281315 8305107 8393247 + * 8280403 8264160 8281315 8305107 8393247 8372208 * @library /test/lib * @library /lib/testlibrary/java/lang * @build jdk.test.lib.RandomFactory From 88747b52c5eb8d3e17f76d3362efdf3ad2f4ee9d Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Tue, 10 Nov 2026 17:04:14 +0000 Subject: [PATCH 077/110] 8384532: Update CLDR to Version 49 Reviewed-by: jlu --- make/data/cldr/LICENSE | 258 +- make/data/cldr/README-common.md | 10 - make/data/cldr/README.md | 10 + make/data/cldr/common/bcp47/README.md | 6 + make/data/cldr/common/bcp47/calendar.xml | 4 +- make/data/cldr/common/bcp47/currency.xml | 2 +- make/data/cldr/common/bcp47/timezone.xml | 34 +- make/data/cldr/common/dtd/README.md | 5 + make/data/cldr/common/dtd/ldml.dtd | 117 +- make/data/cldr/common/dtd/ldml.xsd | 303 +- make/data/cldr/common/dtd/ldmlBCP47.dtd | 4 +- make/data/cldr/common/dtd/ldmlBCP47.xsd | 6 +- .../data/cldr/common/dtd/ldmlSupplemental.dtd | 6 +- .../data/cldr/common/dtd/ldmlSupplemental.xsd | 6 +- make/data/cldr/common/main/aa.xml | 227 - make/data/cldr/common/main/aa_DJ.xml | 45 - make/data/cldr/common/main/aa_ER.xml | 21 - make/data/cldr/common/main/aa_ET.xml | 14 - make/data/cldr/common/main/ab.xml | 3778 --- make/data/cldr/common/main/ady.xml | 174 + .../common/main/{ab_GE.xml => ady_JO.xml} | 4 +- .../main/{zh_Latn_CN.xml => ady_RU.xml} | 9 +- make/data/cldr/common/main/ady_TR.xml | 31 + make/data/cldr/common/main/af.xml | 438 +- make/data/cldr/common/main/ak.xml | 371 +- make/data/cldr/common/main/am.xml | 281 +- make/data/cldr/common/main/an.xml | 1330 - make/data/cldr/common/main/an_ES.xml | 14 - make/data/cldr/common/main/ann.xml | 31 - make/data/cldr/common/main/ann_NG.xml | 14 - make/data/cldr/common/main/apc.xml | 84 - make/data/cldr/common/main/apc_SY.xml | 14 - make/data/cldr/common/main/ar.xml | 926 +- make/data/cldr/common/main/ar_SA.xml | 9 + make/data/cldr/common/main/arn.xml | 23 - make/data/cldr/common/main/arn_CL.xml | 14 - make/data/cldr/common/main/as.xml | 614 +- make/data/cldr/common/main/ast.xml | 596 +- make/data/cldr/common/main/az.xml | 1197 +- make/data/cldr/common/main/az_Arab.xml | 186 - make/data/cldr/common/main/az_Arab_IQ.xml | 15 - make/data/cldr/common/main/az_Arab_IR.xml | 15 - make/data/cldr/common/main/az_Arab_TR.xml | 15 - make/data/cldr/common/main/az_Cyrl.xml | 5 + make/data/cldr/common/main/ba.xml | 3230 +-- make/data/cldr/common/main/bal.xml | 564 - make/data/cldr/common/main/bal_Arab.xml | 14 - make/data/cldr/common/main/bal_Arab_PK.xml | 15 - make/data/cldr/common/main/bal_Latn.xml | 29 +- make/data/cldr/common/main/be.xml | 372 +- make/data/cldr/common/main/be_TARASK.xml | 29 +- make/data/cldr/common/main/bem.xml | 16 +- make/data/cldr/common/main/bew.xml | 6398 ----- make/data/cldr/common/main/bew_ID.xml | 15 - make/data/cldr/common/main/bg.xml | 453 +- make/data/cldr/common/main/bgc.xml | 18 + make/data/cldr/common/main/bgn.xml | 969 - make/data/cldr/common/main/bgn_AE.xml | 14 - make/data/cldr/common/main/bgn_AF.xml | 14 - make/data/cldr/common/main/bgn_IR.xml | 14 - make/data/cldr/common/main/bgn_OM.xml | 14 - make/data/cldr/common/main/bgn_PK.xml | 14 - make/data/cldr/common/main/bho.xml | 19 +- make/data/cldr/common/main/blo.xml | 2484 +- make/data/cldr/common/main/blt.xml | 22 - make/data/cldr/common/main/blt_VN.xml | 14 - make/data/cldr/common/main/bm_Nkoo.xml | 165 - make/data/cldr/common/main/bm_Nkoo_ML.xml | 15 - make/data/cldr/common/main/bn.xml | 829 +- make/data/cldr/common/main/bn_IN.xml | 2 +- make/data/cldr/common/main/bqi.xml | 342 - make/data/cldr/common/main/bqi_IR.xml | 14 - make/data/cldr/common/main/br.xml | 612 +- make/data/cldr/common/main/brx.xml | 89 +- make/data/cldr/common/main/bs.xml | 534 +- make/data/cldr/common/main/bs_Cyrl.xml | 324 +- make/data/cldr/common/main/bss.xml | 73 - make/data/cldr/common/main/bss_CM.xml | 14 - make/data/cldr/common/main/bua.xml | 5 + make/data/cldr/common/main/byn.xml | 525 - make/data/cldr/common/main/byn_ER.xml | 14 - make/data/cldr/common/main/ca.xml | 332 +- make/data/cldr/common/main/ca_ES_VALENCIA.xml | 5 - make/data/cldr/common/main/cad.xml | 161 - make/data/cldr/common/main/cad_US.xml | 14 - make/data/cldr/common/main/cch.xml | 172 - make/data/cldr/common/main/cch_NG.xml | 14 - make/data/cldr/common/main/ccp.xml | 75 +- make/data/cldr/common/main/ce.xml | 18 +- make/data/cldr/common/main/ceb.xml | 207 +- make/data/cldr/common/main/cho.xml | 34 - make/data/cldr/common/main/cho_US.xml | 14 - make/data/cldr/common/main/chr.xml | 604 +- make/data/cldr/common/main/cic.xml | 173 - make/data/cldr/common/main/cic_US.xml | 14 - make/data/cldr/common/main/ckb.xml | 109 +- make/data/cldr/common/main/co.xml | 933 - make/data/cldr/common/main/co_FR.xml | 14 - make/data/cldr/common/main/cop.xml | 4900 ++-- make/data/cldr/common/main/cs.xml | 348 +- make/data/cldr/common/main/cu.xml | 768 - make/data/cldr/common/main/cu_RU.xml | 14 - make/data/cldr/common/main/cv.xml | 21763 ++++++---------- make/data/cldr/common/main/cy.xml | 515 +- make/data/cldr/common/main/da.xml | 248 +- make/data/cldr/common/main/de.xml | 314 +- make/data/cldr/common/main/de_CH.xml | 143 +- make/data/cldr/common/main/de_LU.xml | 13 +- make/data/cldr/common/main/doi.xml | 36 +- make/data/cldr/common/main/dsb.xml | 267 +- make/data/cldr/common/main/dv.xml | 152 - make/data/cldr/common/main/dv_MV.xml | 14 - make/data/cldr/common/main/dz.xml | 22 +- make/data/cldr/common/main/ee.xml | 86 +- make/data/cldr/common/main/el.xml | 242 +- make/data/cldr/common/main/en.xml | 294 +- make/data/cldr/common/main/en_001.xml | 195 +- make/data/cldr/common/main/en_AE.xml | 3 + make/data/cldr/common/main/en_AU.xml | 138 +- make/data/cldr/common/main/en_BW.xml | 3 + make/data/cldr/common/main/en_BZ.xml | 3 + make/data/cldr/common/main/en_CA.xml | 24 +- make/data/cldr/common/main/en_Dsrt.xml | 884 - make/data/cldr/common/main/en_Dsrt_US.xml | 15 - make/data/cldr/common/main/en_GB.xml | 121 +- make/data/cldr/common/main/en_IE.xml | 5 +- make/data/cldr/common/main/en_IN.xml | 248 +- make/data/cldr/common/main/en_JP.xml | 3 + make/data/cldr/common/main/en_MO.xml | 7 - make/data/cldr/common/main/en_MT.xml | 3 + make/data/cldr/common/main/en_PK.xml | 3 + make/data/cldr/common/main/en_Shaw.xml | 1662 -- make/data/cldr/common/main/en_Shaw_GB.xml | 15 - make/data/cldr/common/main/en_ZA.xml | 3 + make/data/cldr/common/main/en_ZM.xml | 30 + make/data/cldr/common/main/en_ZW.xml | 3 + make/data/cldr/common/main/eo.xml | 1312 +- make/data/cldr/common/main/es.xml | 250 +- make/data/cldr/common/main/es_419.xml | 138 +- make/data/cldr/common/main/es_AR.xml | 56 + make/data/cldr/common/main/es_CL.xml | 29 + make/data/cldr/common/main/es_CO.xml | 5 + make/data/cldr/common/main/es_EC.xml | 3 + make/data/cldr/common/main/es_GT.xml | 4 + make/data/cldr/common/main/es_HN.xml | 4 + make/data/cldr/common/main/es_MX.xml | 40 - make/data/cldr/common/main/es_PA.xml | 4 + make/data/cldr/common/main/es_PE.xml | 3 + make/data/cldr/common/main/es_PR.xml | 3 + make/data/cldr/common/main/es_PY.xml | 31 + make/data/cldr/common/main/es_US.xml | 74 +- make/data/cldr/common/main/es_UY.xml | 26 + make/data/cldr/common/main/et.xml | 307 +- make/data/cldr/common/main/eu.xml | 437 +- make/data/cldr/common/main/fa.xml | 421 +- make/data/cldr/common/main/ff_Adlm.xml | 532 +- make/data/cldr/common/main/fi.xml | 312 +- make/data/cldr/common/main/fil.xml | 397 +- make/data/cldr/common/main/fo.xml | 101 +- make/data/cldr/common/main/fr.xml | 321 +- make/data/cldr/common/main/fr_CA.xml | 253 +- make/data/cldr/common/main/fr_GF.xml | 7 + make/data/cldr/common/main/fr_RW.xml | 4 + make/data/cldr/common/main/frr.xml | 5478 ---- make/data/cldr/common/main/frr_DE.xml | 14 - make/data/cldr/common/main/fur.xml | 8 + make/data/cldr/common/main/fy.xml | 85 +- make/data/cldr/common/main/ga.xml | 307 +- make/data/cldr/common/main/gaa.xml | 68 +- make/data/cldr/common/main/gd.xml | 268 +- make/data/cldr/common/main/gez.xml | 517 - make/data/cldr/common/main/gez_ER.xml | 21 - make/data/cldr/common/main/gez_ET.xml | 14 - make/data/cldr/common/main/gl.xml | 269 +- make/data/cldr/common/main/gn.xml | 152 - make/data/cldr/common/main/gn_PY.xml | 14 - make/data/cldr/common/main/gsw.xml | 14 +- make/data/cldr/common/main/gu.xml | 370 +- make/data/cldr/common/main/ha.xml | 665 +- make/data/cldr/common/main/ha_Arab.xml | 108 - make/data/cldr/common/main/ha_Arab_NG.xml | 15 - make/data/cldr/common/main/ha_Arab_SD.xml | 15 - make/data/cldr/common/main/haw.xml | 9 +- make/data/cldr/common/main/he.xml | 738 +- make/data/cldr/common/main/hi.xml | 663 +- make/data/cldr/common/main/hi_Latn.xml | 71 +- make/data/cldr/common/main/hnj.xml | 103 - make/data/cldr/common/main/hnj_Hmnp.xml | 14 - make/data/cldr/common/main/hnj_Hmnp_US.xml | 15 - make/data/cldr/common/main/hr.xml | 598 +- make/data/cldr/common/main/hsb.xml | 269 +- make/data/cldr/common/main/ht.xml | 30 - make/data/cldr/common/main/ht_HT.xml | 14 - make/data/cldr/common/main/hu.xml | 319 +- make/data/cldr/common/main/hy.xml | 326 +- make/data/cldr/common/main/ia.xml | 41 +- make/data/cldr/common/main/id.xml | 599 +- make/data/cldr/common/main/ie.xml | 28 +- make/data/cldr/common/main/ig.xml | 845 +- make/data/cldr/common/main/ii.xml | 6 +- make/data/cldr/common/main/io.xml | 22 - make/data/cldr/common/main/io_001.xml | 14 - make/data/cldr/common/main/is.xml | 324 +- make/data/cldr/common/main/it.xml | 251 +- make/data/cldr/common/main/it_CH.xml | 4 + make/data/cldr/common/main/iu.xml | 178 - make/data/cldr/common/main/iu_CA.xml | 14 - make/data/cldr/common/main/iu_Latn.xml | 19 - make/data/cldr/common/main/iu_Latn_CA.xml | 15 - make/data/cldr/common/main/ja.xml | 740 +- make/data/cldr/common/main/jbo.xml | 40 - make/data/cldr/common/main/jbo_001.xml | 14 - make/data/cldr/common/main/jv.xml | 1180 +- make/data/cldr/common/main/ka.xml | 399 +- make/data/cldr/common/main/kaa.xml | 734 - make/data/cldr/common/main/kaa_Cyrl.xml | 14 - make/data/cldr/common/main/kaa_Cyrl_UZ.xml | 15 - make/data/cldr/common/main/kaa_Latn.xml | 21 - make/data/cldr/common/main/kaa_Latn_UZ.xml | 15 - make/data/cldr/common/main/kab.xml | 368 +- make/data/cldr/common/main/kaj.xml | 180 - make/data/cldr/common/main/kaj_NG.xml | 14 - make/data/cldr/common/main/kbd.xml | 152 + .../common/main/{mdf_RU.xml => kbd_RU.xml} | 6 +- make/data/cldr/common/main/kbd_TR.xml | 97 + make/data/cldr/common/main/kcg.xml | 172 - make/data/cldr/common/main/kcg_NG.xml | 14 - make/data/cldr/common/main/kea.xml | 27 +- make/data/cldr/common/main/kek.xml | 1552 +- make/data/cldr/common/main/ken.xml | 24 - make/data/cldr/common/main/ken_CM.xml | 14 - make/data/cldr/common/main/kgp.xml | 92 +- make/data/cldr/common/main/ki.xml | 298 +- make/data/cldr/common/main/kk.xml | 318 +- make/data/cldr/common/main/kk_Arab.xml | 824 +- make/data/cldr/common/main/kl.xml | 5 + make/data/cldr/common/main/km.xml | 250 +- make/data/cldr/common/main/kn.xml | 309 +- make/data/cldr/common/main/ko.xml | 717 +- make/data/cldr/common/main/kok.xml | 362 +- make/data/cldr/common/main/kok_Latn.xml | 232 +- make/data/cldr/common/main/kpe.xml | 61 - make/data/cldr/common/main/kpe_GN.xml | 56 - make/data/cldr/common/main/kpe_LR.xml | 14 - make/data/cldr/common/main/ks.xml | 131 +- make/data/cldr/common/main/ks_Deva.xml | 60 +- make/data/cldr/common/main/ksh.xml | 44 +- make/data/cldr/common/main/ku.xml | 84 +- make/data/cldr/common/main/ku_Arab.xml | 27 - make/data/cldr/common/main/ku_Arab_IQ.xml | 15 - make/data/cldr/common/main/ku_Arab_IR.xml | 15 - make/data/cldr/common/main/kxv.xml | 25 +- make/data/cldr/common/main/kxv_Deva.xml | 9 +- make/data/cldr/common/main/kxv_Orya.xml | 25 +- make/data/cldr/common/main/kxv_Telu.xml | 25 +- make/data/cldr/common/main/ky.xml | 201 +- make/data/cldr/common/main/la.xml | 1171 - make/data/cldr/common/main/la_VA.xml | 14 - make/data/cldr/common/main/lb.xml | 62 +- make/data/cldr/common/main/lij.xml | 1505 +- make/data/cldr/common/main/lld.xml | 317 +- make/data/cldr/common/main/lmo.xml | 10 +- make/data/cldr/common/main/lo.xml | 497 +- make/data/cldr/common/main/lt.xml | 464 +- make/data/cldr/common/main/ltg.xml | 163 - make/data/cldr/common/main/ltg_LV.xml | 14 - make/data/cldr/common/main/lv.xml | 251 +- make/data/cldr/common/main/lzz.xml | 24 - make/data/cldr/common/main/lzz_TR.xml | 14 - make/data/cldr/common/main/mai.xml | 96 +- make/data/cldr/common/main/mdf.xml | 111 - make/data/cldr/common/main/mg.xml | 5 + make/data/cldr/common/main/mhn.xml | 18 - make/data/cldr/common/main/mhn_IT.xml | 14 - make/data/cldr/common/main/mi.xml | 118 +- make/data/cldr/common/main/mic.xml | 81 - make/data/cldr/common/main/mic_CA.xml | 14 - make/data/cldr/common/main/mk.xml | 324 +- make/data/cldr/common/main/ml.xml | 1569 +- make/data/cldr/common/main/mn.xml | 300 +- make/data/cldr/common/main/mn_Mong.xml | 72 - make/data/cldr/common/main/mn_Mong_CN.xml | 15 - make/data/cldr/common/main/mn_Mong_MN.xml | 532 - make/data/cldr/common/main/mni.xml | 21 +- make/data/cldr/common/main/mni_Mtei.xml | 87 - make/data/cldr/common/main/mni_Mtei_IN.xml | 15 - make/data/cldr/common/main/moh.xml | 55 - make/data/cldr/common/main/moh_CA.xml | 14 - make/data/cldr/common/main/mr.xml | 377 +- make/data/cldr/common/main/ms.xml | 229 +- make/data/cldr/common/main/ms_Arab.xml | 821 - make/data/cldr/common/main/ms_Arab_BN.xml | 57 - make/data/cldr/common/main/ms_Arab_MY.xml | 15 - make/data/cldr/common/main/mt.xml | 25 + make/data/cldr/common/main/mus.xml | 193 - make/data/cldr/common/main/mus_US.xml | 14 - make/data/cldr/common/main/mww.xml | 101 - make/data/cldr/common/main/mww_Hmnp.xml | 14 - make/data/cldr/common/main/mww_Hmnp_US.xml | 15 - make/data/cldr/common/main/my.xml | 323 +- make/data/cldr/common/main/myv.xml | 682 - make/data/cldr/common/main/myv_RU.xml | 14 - make/data/cldr/common/main/nds.xml | 6 +- make/data/cldr/common/main/ne.xml | 221 +- make/data/cldr/common/main/nl.xml | 396 +- make/data/cldr/common/main/nl_AW.xml | 25 + make/data/cldr/common/main/nl_BE.xml | 9 + make/data/cldr/common/main/nl_BQ.xml | 25 + make/data/cldr/common/main/nl_CW.xml | 25 + make/data/cldr/common/main/nl_SR.xml | 21 + make/data/cldr/common/main/nl_SX.xml | 25 + make/data/cldr/common/main/nn.xml | 270 +- make/data/cldr/common/main/no.xml | 622 +- make/data/cldr/common/main/nqo.xml | 19 +- make/data/cldr/common/main/nr.xml | 113 - make/data/cldr/common/main/nr_ZA.xml | 14 - make/data/cldr/common/main/nso.xml | 23 + make/data/cldr/common/main/nv.xml | 22 - make/data/cldr/common/main/nv_US.xml | 14 - make/data/cldr/common/main/ny.xml | 116 - make/data/cldr/common/main/ny_MW.xml | 14 - make/data/cldr/common/main/oc.xml | 26 +- make/data/cldr/common/main/oc_ES.xml | 118 +- make/data/cldr/common/main/oka.xml | 23 - make/data/cldr/common/main/oka_CA.xml | 14 - make/data/cldr/common/main/oka_US.xml | 14 - make/data/cldr/common/main/om.xml | 111 +- make/data/cldr/common/main/or.xml | 266 +- make/data/cldr/common/main/osa.xml | 225 - make/data/cldr/common/main/osa_US.xml | 14 - make/data/cldr/common/main/pa.xml | 446 +- make/data/cldr/common/main/pap.xml | 1575 -- make/data/cldr/common/main/pap_AW.xml | 14 - make/data/cldr/common/main/pap_CW.xml | 14 - make/data/cldr/common/main/pcm.xml | 204 +- make/data/cldr/common/main/pi.xml | 16 - make/data/cldr/common/main/pi_Latn.xml | 14 - make/data/cldr/common/main/pi_Latn_GB.xml | 15 - make/data/cldr/common/main/pis.xml | 93 - make/data/cldr/common/main/pis_SB.xml | 14 - make/data/cldr/common/main/pl.xml | 258 +- make/data/cldr/common/main/pms.xml | 45 +- make/data/cldr/common/main/prg.xml | 7 +- make/data/cldr/common/main/ps.xml | 941 +- make/data/cldr/common/main/ps_PK.xml | 7 +- make/data/cldr/common/main/pt.xml | 257 +- make/data/cldr/common/main/pt_CV.xml | 2 +- make/data/cldr/common/main/pt_GQ.xml | 32 + make/data/cldr/common/main/pt_PT.xml | 164 +- make/data/cldr/common/main/qu.xml | 260 +- make/data/cldr/common/main/quc.xml | 222 +- make/data/cldr/common/main/raj.xml | 16 + make/data/cldr/common/main/rhg.xml | 355 - make/data/cldr/common/main/rhg_Rohg.xml | 14 - make/data/cldr/common/main/rhg_Rohg_BD.xml | 47 - make/data/cldr/common/main/rhg_Rohg_MM.xml | 15 - make/data/cldr/common/main/rif.xml | 4049 --- make/data/cldr/common/main/rif_MA.xml | 14 - make/data/cldr/common/main/rm.xml | 517 +- make/data/cldr/common/main/ro.xml | 224 +- make/data/cldr/common/main/root.xml | 757 +- make/data/cldr/common/main/ru.xml | 867 +- make/data/cldr/common/main/ru_UA.xml | 1 + make/data/cldr/common/main/rw.xml | 153 +- make/data/cldr/common/main/sa.xml | 30 +- make/data/cldr/common/main/sah.xml | 7 + make/data/cldr/common/main/sat.xml | 25 +- make/data/cldr/common/main/sat_Deva.xml | 86 - make/data/cldr/common/main/sat_Deva_IN.xml | 15 - make/data/cldr/common/main/sc.xml | 144 +- make/data/cldr/common/main/scn.xml | 67 +- make/data/cldr/common/main/sd.xml | 289 +- make/data/cldr/common/main/sd_Deva.xml | 28 +- make/data/cldr/common/main/sdh.xml | 43 - make/data/cldr/common/main/sdh_IQ.xml | 14 - make/data/cldr/common/main/sdh_IR.xml | 14 - make/data/cldr/common/main/se.xml | 19 +- make/data/cldr/common/main/se_FI.xml | 27 +- make/data/cldr/common/main/sgs.xml | 39 - make/data/cldr/common/main/sgs_LT.xml | 14 - make/data/cldr/common/main/shn.xml | 4871 +--- make/data/cldr/common/main/si.xml | 442 +- make/data/cldr/common/main/sid.xml | 197 - make/data/cldr/common/main/sid_ET.xml | 14 - make/data/cldr/common/main/sk.xml | 269 +- make/data/cldr/common/main/skr.xml | 93 - make/data/cldr/common/main/skr_PK.xml | 14 - make/data/cldr/common/main/sl.xml | 466 +- make/data/cldr/common/main/sma.xml | 23 - make/data/cldr/common/main/sma_NO.xml | 18 - make/data/cldr/common/main/sma_SE.xml | 14 - make/data/cldr/common/main/smj.xml | 23 - make/data/cldr/common/main/smj_NO.xml | 14 - make/data/cldr/common/main/smj_SE.xml | 14 - make/data/cldr/common/main/smn.xml | 9 +- make/data/cldr/common/main/sms.xml | 206 - make/data/cldr/common/main/sms_FI.xml | 14 - make/data/cldr/common/main/sn.xml | 5 + make/data/cldr/common/main/so.xml | 775 +- make/data/cldr/common/main/sq.xml | 325 +- make/data/cldr/common/main/sr.xml | 514 +- make/data/cldr/common/main/sr_Cyrl_BA.xml | 38 +- make/data/cldr/common/main/sr_Latn.xml | 514 +- make/data/cldr/common/main/sr_Latn_BA.xml | 38 +- make/data/cldr/common/main/ss.xml | 112 - make/data/cldr/common/main/ss_SZ.xml | 46 - make/data/cldr/common/main/ss_ZA.xml | 14 - make/data/cldr/common/main/ssy.xml | 231 - make/data/cldr/common/main/ssy_ER.xml | 14 - make/data/cldr/common/main/st.xml | 16 + make/data/cldr/common/main/su.xml | 18 +- make/data/cldr/common/main/suz.xml | 19 - make/data/cldr/common/main/suz_Deva.xml | 14 - make/data/cldr/common/main/suz_Deva_NP.xml | 15 - make/data/cldr/common/main/suz_Sunu.xml | 63 +- make/data/cldr/common/main/sv.xml | 325 +- make/data/cldr/common/main/sv_FI.xml | 87 +- make/data/cldr/common/main/sw.xml | 354 +- make/data/cldr/common/main/sw_CD.xml | 8 - make/data/cldr/common/main/sw_KE.xml | 63 +- make/data/cldr/common/main/syr.xml | 164 +- make/data/cldr/common/main/szl.xml | 51 +- make/data/cldr/common/main/ta.xml | 1811 +- make/data/cldr/common/main/te.xml | 503 +- make/data/cldr/common/main/tg.xml | 39 +- make/data/cldr/common/main/th.xml | 551 +- make/data/cldr/common/main/ti.xml | 1577 +- make/data/cldr/common/main/ti_ER.xml | 2 +- make/data/cldr/common/main/tig.xml | 520 - make/data/cldr/common/main/tig_ER.xml | 14 - make/data/cldr/common/main/tk.xml | 578 +- make/data/cldr/common/main/tn.xml | 29 +- make/data/cldr/common/main/to.xml | 552 +- make/data/cldr/common/main/tok.xml | 29 +- make/data/cldr/common/main/tpi.xml | 210 - make/data/cldr/common/main/tpi_PG.xml | 14 - make/data/cldr/common/main/tr.xml | 241 +- make/data/cldr/common/main/trv.xml | 570 - make/data/cldr/common/main/trv_TW.xml | 14 - make/data/cldr/common/main/trw.xml | 4877 ---- make/data/cldr/common/main/trw_PK.xml | 14 - make/data/cldr/common/main/ts.xml | 226 - make/data/cldr/common/main/ts_ZA.xml | 14 - make/data/cldr/common/main/tt.xml | 59 +- make/data/cldr/common/main/tyv.xml | 260 +- make/data/cldr/common/main/ug.xml | 80 +- make/data/cldr/common/main/uk.xml | 702 +- make/data/cldr/common/main/ur.xml | 438 +- make/data/cldr/common/main/uz.xml | 252 +- make/data/cldr/common/main/uz_Cyrl.xml | 27 +- make/data/cldr/common/main/ve.xml | 123 - make/data/cldr/common/main/ve_ZA.xml | 14 - make/data/cldr/common/main/vec.xml | 30 +- make/data/cldr/common/main/vi.xml | 642 +- make/data/cldr/common/main/vo.xml | 335 - make/data/cldr/common/main/vo_001.xml | 14 - make/data/cldr/common/main/wa.xml | 24 - make/data/cldr/common/main/wa_BE.xml | 14 - make/data/cldr/common/main/wae.xml | 5 + make/data/cldr/common/main/wal.xml | 383 - make/data/cldr/common/main/wal_ET.xml | 14 - make/data/cldr/common/main/wbp.xml | 24 - make/data/cldr/common/main/wbp_AU.xml | 14 - make/data/cldr/common/main/wo.xml | 68 +- make/data/cldr/common/main/xh.xml | 330 +- make/data/cldr/common/main/xnr.xml | 25 +- make/data/cldr/common/main/yi.xml | 5 + make/data/cldr/common/main/yo.xml | 368 +- make/data/cldr/common/main/yo_BJ.xml | 166 +- make/data/cldr/common/main/yrl.xml | 92 +- make/data/cldr/common/main/yue.xml | 531 +- make/data/cldr/common/main/yue_Hans.xml | 439 +- make/data/cldr/common/main/yue_Hant_CN.xml | 26 + make/data/cldr/common/main/zgh.xml | 5 + make/data/cldr/common/main/zh.xml | 667 +- make/data/cldr/common/main/zh_Hant.xml | 769 +- make/data/cldr/common/main/zh_Hant_HK.xml | 78 +- make/data/cldr/common/main/zh_Latn.xml | 24 - make/data/cldr/common/main/zu.xml | 450 +- .../cldr/common/properties/coverageLevels.txt | 29 +- make/data/cldr/common/supplemental/README.md | 5 + .../supplemental/attributeValueValidity.xml | 34 +- .../common/supplemental/coverageLevels.xml | 154 +- .../common/supplemental/languageGroup.xml | 104 +- .../cldr/common/supplemental/languageInfo.xml | 7 +- .../common/supplemental/likelySubtags.xml | 166 +- .../cldr/common/supplemental/metaZones.xml | 126 +- .../cldr/common/supplemental/ordinals.xml | 18 +- .../cldr/common/supplemental/pluralRanges.xml | 12 +- .../data/cldr/common/supplemental/plurals.xml | 15 +- .../common/supplemental/supplementalData.xml | 443 +- .../supplemental/supplementalMetadata.xml | 245 +- make/data/cldr/common/supplemental/units.xml | 5 + .../cldr/common/supplemental/windowsZones.xml | 17 +- .../build/tools/cldrconverter/Bundle.java | 97 +- .../tools/cldrconverter/CLDRConverter.java | 45 +- .../DayPeriodRuleParseHandler.java | 6 +- .../tools/cldrconverter/LDMLParseHandler.java | 129 +- .../LikelySubtagsParseHandler.java | 8 +- .../cldrconverter/MetaZonesParseHandler.java | 4 +- .../NumberingSystemsParseHandler.java | 8 +- .../cldrconverter/PluralsParseHandler.java | 8 +- .../ResourceBundleGenerator.java | 28 +- .../SupplementalDataParseHandler.java | 17 +- .../SupplementalMetadataParseHandler.java | 6 +- .../cldrconverter/TimeZoneParseHandler.java | 4 +- .../cldrconverter/WinZonesParseHandler.java | 6 +- .../share/classes/java/text/Collator.java | 4 +- .../java/text/CompactNumberFormat.java | 8 +- .../classes/java/text/DateFormatSymbols.java | 6 +- .../classes/java/text/DecimalFormat.java | 2 +- .../share/classes/java/text/ListFormat.java | 2 +- .../share/classes/java/text/NumberFormat.java | 6 +- .../classes/java/text/SimpleDateFormat.java | 20 +- .../spi/DecimalFormatSymbolsProvider.java | 6 +- .../classes/java/time/chrono/Chronology.java | 4 +- .../java/time/chrono/HijrahChronology.java | 2 +- .../java/time/chrono/IsoChronology.java | 2 +- .../java/time/chrono/JapaneseChronology.java | 4 +- .../java/time/chrono/MinguoChronology.java | 4 +- .../time/chrono/ThaiBuddhistChronology.java | 4 +- .../java/time/format/DateTimeFormatter.java | 2 +- .../time/format/DateTimeFormatterBuilder.java | 31 +- .../share/classes/java/util/Calendar.java | 4 +- .../share/classes/java/util/Locale.java | 2 +- .../java/util/spi/LocaleServiceProvider.java | 10 +- .../cldr/CLDRTimeZoneNameProviderImpl.java | 4 +- .../locale/provider/TimeZoneNameUtility.java | 21 + .../share/data/tzdata/tzmappings.override | 12 - src/java.base/share/legal/cldr.md | 4 +- src/jdk.localedata/share/legal/cldr.md | 4 +- .../TestCompactPatternsValidity.java | 17 +- .../CompactNumberFormat/TestPlurals.java | 10 +- .../text/Format/DateFormat/Bug6530336.java | 11 +- .../text/Format/DateFormat/Bug6683975.java | 6 +- .../DateFormat/LocalizedGMTFormatTest.java | 67 + .../Format/DateFormat/TimeZoneNameTest.java | 6 +- .../java/time/chrono/CopticChronology.java | 4 +- .../time/format/Skeletons_en_US.properties | 10 +- .../time/format/TestLocalizedPattern.java | 4 +- .../time/format/TestUnicodeExtension.java | 15 +- .../format/TestZoneTextPrinterParser.java | 32 +- .../util/Locale/bcp47u/DisplayNameTests.java | 10 +- test/jdk/java/util/TimeZone/Bug6329116.java | 5 +- test/jdk/sun/text/resources/LocaleData.cldr | 50 +- .../sun/text/resources/LocaleDataTest.java | 2 +- .../resources/cldr/TimeZoneNamesTest.java | 120 +- .../plugins/IncludeLocalesPluginTest.java | 6 +- 548 files changed, 50150 insertions(+), 103623 deletions(-) delete mode 100644 make/data/cldr/README-common.md create mode 100644 make/data/cldr/README.md create mode 100644 make/data/cldr/common/bcp47/README.md create mode 100644 make/data/cldr/common/dtd/README.md delete mode 100644 make/data/cldr/common/main/aa.xml delete mode 100644 make/data/cldr/common/main/aa_DJ.xml delete mode 100644 make/data/cldr/common/main/aa_ER.xml delete mode 100644 make/data/cldr/common/main/aa_ET.xml delete mode 100644 make/data/cldr/common/main/ab.xml create mode 100644 make/data/cldr/common/main/ady.xml rename make/data/cldr/common/main/{ab_GE.xml => ady_JO.xml} (93%) rename make/data/cldr/common/main/{zh_Latn_CN.xml => ady_RU.xml} (72%) create mode 100644 make/data/cldr/common/main/ady_TR.xml delete mode 100644 make/data/cldr/common/main/an.xml delete mode 100644 make/data/cldr/common/main/an_ES.xml delete mode 100644 make/data/cldr/common/main/ann.xml delete mode 100644 make/data/cldr/common/main/ann_NG.xml delete mode 100644 make/data/cldr/common/main/apc.xml delete mode 100644 make/data/cldr/common/main/apc_SY.xml delete mode 100644 make/data/cldr/common/main/arn.xml delete mode 100644 make/data/cldr/common/main/arn_CL.xml delete mode 100644 make/data/cldr/common/main/az_Arab.xml delete mode 100644 make/data/cldr/common/main/az_Arab_IQ.xml delete mode 100644 make/data/cldr/common/main/az_Arab_IR.xml delete mode 100644 make/data/cldr/common/main/az_Arab_TR.xml delete mode 100644 make/data/cldr/common/main/bal.xml delete mode 100644 make/data/cldr/common/main/bal_Arab.xml delete mode 100644 make/data/cldr/common/main/bal_Arab_PK.xml delete mode 100644 make/data/cldr/common/main/bew.xml delete mode 100644 make/data/cldr/common/main/bew_ID.xml delete mode 100644 make/data/cldr/common/main/bgn.xml delete mode 100644 make/data/cldr/common/main/bgn_AE.xml delete mode 100644 make/data/cldr/common/main/bgn_AF.xml delete mode 100644 make/data/cldr/common/main/bgn_IR.xml delete mode 100644 make/data/cldr/common/main/bgn_OM.xml delete mode 100644 make/data/cldr/common/main/bgn_PK.xml delete mode 100644 make/data/cldr/common/main/blt.xml delete mode 100644 make/data/cldr/common/main/blt_VN.xml delete mode 100644 make/data/cldr/common/main/bm_Nkoo.xml delete mode 100644 make/data/cldr/common/main/bm_Nkoo_ML.xml delete mode 100644 make/data/cldr/common/main/bqi.xml delete mode 100644 make/data/cldr/common/main/bqi_IR.xml delete mode 100644 make/data/cldr/common/main/bss.xml delete mode 100644 make/data/cldr/common/main/bss_CM.xml delete mode 100644 make/data/cldr/common/main/byn.xml delete mode 100644 make/data/cldr/common/main/byn_ER.xml delete mode 100644 make/data/cldr/common/main/cad.xml delete mode 100644 make/data/cldr/common/main/cad_US.xml delete mode 100644 make/data/cldr/common/main/cch.xml delete mode 100644 make/data/cldr/common/main/cch_NG.xml delete mode 100644 make/data/cldr/common/main/cho.xml delete mode 100644 make/data/cldr/common/main/cho_US.xml delete mode 100644 make/data/cldr/common/main/cic.xml delete mode 100644 make/data/cldr/common/main/cic_US.xml delete mode 100644 make/data/cldr/common/main/co.xml delete mode 100644 make/data/cldr/common/main/co_FR.xml delete mode 100644 make/data/cldr/common/main/cu.xml delete mode 100644 make/data/cldr/common/main/cu_RU.xml delete mode 100644 make/data/cldr/common/main/dv.xml delete mode 100644 make/data/cldr/common/main/dv_MV.xml delete mode 100644 make/data/cldr/common/main/en_Dsrt.xml delete mode 100644 make/data/cldr/common/main/en_Dsrt_US.xml delete mode 100644 make/data/cldr/common/main/en_Shaw.xml delete mode 100644 make/data/cldr/common/main/en_Shaw_GB.xml delete mode 100644 make/data/cldr/common/main/frr.xml delete mode 100644 make/data/cldr/common/main/frr_DE.xml delete mode 100644 make/data/cldr/common/main/gez.xml delete mode 100644 make/data/cldr/common/main/gez_ER.xml delete mode 100644 make/data/cldr/common/main/gez_ET.xml delete mode 100644 make/data/cldr/common/main/gn.xml delete mode 100644 make/data/cldr/common/main/gn_PY.xml delete mode 100644 make/data/cldr/common/main/ha_Arab.xml delete mode 100644 make/data/cldr/common/main/ha_Arab_NG.xml delete mode 100644 make/data/cldr/common/main/ha_Arab_SD.xml delete mode 100644 make/data/cldr/common/main/hnj.xml delete mode 100644 make/data/cldr/common/main/hnj_Hmnp.xml delete mode 100644 make/data/cldr/common/main/hnj_Hmnp_US.xml delete mode 100644 make/data/cldr/common/main/ht.xml delete mode 100644 make/data/cldr/common/main/ht_HT.xml delete mode 100644 make/data/cldr/common/main/io.xml delete mode 100644 make/data/cldr/common/main/io_001.xml delete mode 100644 make/data/cldr/common/main/iu.xml delete mode 100644 make/data/cldr/common/main/iu_CA.xml delete mode 100644 make/data/cldr/common/main/iu_Latn.xml delete mode 100644 make/data/cldr/common/main/iu_Latn_CA.xml delete mode 100644 make/data/cldr/common/main/jbo.xml delete mode 100644 make/data/cldr/common/main/jbo_001.xml delete mode 100644 make/data/cldr/common/main/kaa.xml delete mode 100644 make/data/cldr/common/main/kaa_Cyrl.xml delete mode 100644 make/data/cldr/common/main/kaa_Cyrl_UZ.xml delete mode 100644 make/data/cldr/common/main/kaa_Latn.xml delete mode 100644 make/data/cldr/common/main/kaa_Latn_UZ.xml delete mode 100644 make/data/cldr/common/main/kaj.xml delete mode 100644 make/data/cldr/common/main/kaj_NG.xml create mode 100644 make/data/cldr/common/main/kbd.xml rename make/data/cldr/common/main/{mdf_RU.xml => kbd_RU.xml} (60%) create mode 100644 make/data/cldr/common/main/kbd_TR.xml delete mode 100644 make/data/cldr/common/main/kcg.xml delete mode 100644 make/data/cldr/common/main/kcg_NG.xml delete mode 100644 make/data/cldr/common/main/ken.xml delete mode 100644 make/data/cldr/common/main/ken_CM.xml delete mode 100644 make/data/cldr/common/main/kpe.xml delete mode 100644 make/data/cldr/common/main/kpe_GN.xml delete mode 100644 make/data/cldr/common/main/kpe_LR.xml delete mode 100644 make/data/cldr/common/main/ku_Arab.xml delete mode 100644 make/data/cldr/common/main/ku_Arab_IQ.xml delete mode 100644 make/data/cldr/common/main/ku_Arab_IR.xml delete mode 100644 make/data/cldr/common/main/la.xml delete mode 100644 make/data/cldr/common/main/la_VA.xml delete mode 100644 make/data/cldr/common/main/ltg.xml delete mode 100644 make/data/cldr/common/main/ltg_LV.xml delete mode 100644 make/data/cldr/common/main/lzz.xml delete mode 100644 make/data/cldr/common/main/lzz_TR.xml delete mode 100644 make/data/cldr/common/main/mdf.xml delete mode 100644 make/data/cldr/common/main/mhn.xml delete mode 100644 make/data/cldr/common/main/mhn_IT.xml delete mode 100644 make/data/cldr/common/main/mic.xml delete mode 100644 make/data/cldr/common/main/mic_CA.xml delete mode 100644 make/data/cldr/common/main/mn_Mong.xml delete mode 100644 make/data/cldr/common/main/mn_Mong_CN.xml delete mode 100644 make/data/cldr/common/main/mn_Mong_MN.xml delete mode 100644 make/data/cldr/common/main/mni_Mtei.xml delete mode 100644 make/data/cldr/common/main/mni_Mtei_IN.xml delete mode 100644 make/data/cldr/common/main/moh.xml delete mode 100644 make/data/cldr/common/main/moh_CA.xml delete mode 100644 make/data/cldr/common/main/ms_Arab.xml delete mode 100644 make/data/cldr/common/main/ms_Arab_BN.xml delete mode 100644 make/data/cldr/common/main/ms_Arab_MY.xml delete mode 100644 make/data/cldr/common/main/mus.xml delete mode 100644 make/data/cldr/common/main/mus_US.xml delete mode 100644 make/data/cldr/common/main/mww.xml delete mode 100644 make/data/cldr/common/main/mww_Hmnp.xml delete mode 100644 make/data/cldr/common/main/mww_Hmnp_US.xml delete mode 100644 make/data/cldr/common/main/myv.xml delete mode 100644 make/data/cldr/common/main/myv_RU.xml delete mode 100644 make/data/cldr/common/main/nr.xml delete mode 100644 make/data/cldr/common/main/nr_ZA.xml delete mode 100644 make/data/cldr/common/main/nv.xml delete mode 100644 make/data/cldr/common/main/nv_US.xml delete mode 100644 make/data/cldr/common/main/ny.xml delete mode 100644 make/data/cldr/common/main/ny_MW.xml delete mode 100644 make/data/cldr/common/main/oka.xml delete mode 100644 make/data/cldr/common/main/oka_CA.xml delete mode 100644 make/data/cldr/common/main/oka_US.xml delete mode 100644 make/data/cldr/common/main/osa.xml delete mode 100644 make/data/cldr/common/main/osa_US.xml delete mode 100644 make/data/cldr/common/main/pap.xml delete mode 100644 make/data/cldr/common/main/pap_AW.xml delete mode 100644 make/data/cldr/common/main/pap_CW.xml delete mode 100644 make/data/cldr/common/main/pi.xml delete mode 100644 make/data/cldr/common/main/pi_Latn.xml delete mode 100644 make/data/cldr/common/main/pi_Latn_GB.xml delete mode 100644 make/data/cldr/common/main/pis.xml delete mode 100644 make/data/cldr/common/main/pis_SB.xml delete mode 100644 make/data/cldr/common/main/rhg.xml delete mode 100644 make/data/cldr/common/main/rhg_Rohg.xml delete mode 100644 make/data/cldr/common/main/rhg_Rohg_BD.xml delete mode 100644 make/data/cldr/common/main/rhg_Rohg_MM.xml delete mode 100644 make/data/cldr/common/main/rif.xml delete mode 100644 make/data/cldr/common/main/rif_MA.xml delete mode 100644 make/data/cldr/common/main/sat_Deva.xml delete mode 100644 make/data/cldr/common/main/sat_Deva_IN.xml delete mode 100644 make/data/cldr/common/main/sdh.xml delete mode 100644 make/data/cldr/common/main/sdh_IQ.xml delete mode 100644 make/data/cldr/common/main/sdh_IR.xml delete mode 100644 make/data/cldr/common/main/sgs.xml delete mode 100644 make/data/cldr/common/main/sgs_LT.xml delete mode 100644 make/data/cldr/common/main/sid.xml delete mode 100644 make/data/cldr/common/main/sid_ET.xml delete mode 100644 make/data/cldr/common/main/skr.xml delete mode 100644 make/data/cldr/common/main/skr_PK.xml delete mode 100644 make/data/cldr/common/main/sma.xml delete mode 100644 make/data/cldr/common/main/sma_NO.xml delete mode 100644 make/data/cldr/common/main/sma_SE.xml delete mode 100644 make/data/cldr/common/main/smj.xml delete mode 100644 make/data/cldr/common/main/smj_NO.xml delete mode 100644 make/data/cldr/common/main/smj_SE.xml delete mode 100644 make/data/cldr/common/main/sms.xml delete mode 100644 make/data/cldr/common/main/sms_FI.xml delete mode 100644 make/data/cldr/common/main/ss.xml delete mode 100644 make/data/cldr/common/main/ss_SZ.xml delete mode 100644 make/data/cldr/common/main/ss_ZA.xml delete mode 100644 make/data/cldr/common/main/ssy.xml delete mode 100644 make/data/cldr/common/main/ssy_ER.xml delete mode 100644 make/data/cldr/common/main/suz.xml delete mode 100644 make/data/cldr/common/main/suz_Deva.xml delete mode 100644 make/data/cldr/common/main/suz_Deva_NP.xml delete mode 100644 make/data/cldr/common/main/tig.xml delete mode 100644 make/data/cldr/common/main/tig_ER.xml delete mode 100644 make/data/cldr/common/main/tpi.xml delete mode 100644 make/data/cldr/common/main/tpi_PG.xml delete mode 100644 make/data/cldr/common/main/trv.xml delete mode 100644 make/data/cldr/common/main/trv_TW.xml delete mode 100644 make/data/cldr/common/main/trw.xml delete mode 100644 make/data/cldr/common/main/trw_PK.xml delete mode 100644 make/data/cldr/common/main/ts.xml delete mode 100644 make/data/cldr/common/main/ts_ZA.xml delete mode 100644 make/data/cldr/common/main/ve.xml delete mode 100644 make/data/cldr/common/main/ve_ZA.xml delete mode 100644 make/data/cldr/common/main/vo.xml delete mode 100644 make/data/cldr/common/main/vo_001.xml delete mode 100644 make/data/cldr/common/main/wa.xml delete mode 100644 make/data/cldr/common/main/wa_BE.xml delete mode 100644 make/data/cldr/common/main/wal.xml delete mode 100644 make/data/cldr/common/main/wal_ET.xml delete mode 100644 make/data/cldr/common/main/wbp.xml delete mode 100644 make/data/cldr/common/main/wbp_AU.xml delete mode 100644 make/data/cldr/common/main/zh_Latn.xml create mode 100644 make/data/cldr/common/supplemental/README.md create mode 100644 test/jdk/java/text/Format/DateFormat/LocalizedGMTFormatTest.java diff --git a/make/data/cldr/LICENSE b/make/data/cldr/LICENSE index 9065fe54d8b9..36becf135671 100644 --- a/make/data/cldr/LICENSE +++ b/make/data/cldr/LICENSE @@ -1,8 +1,13 @@ -UNICODE LICENSE V3 +LICENSE: https://www.unicode.org/license.html +General Unicode Terms of Use: http://unicode.org/copyright.html + +--------------------------------------------- LICENSE ------------------------------------------------------ + +UNICODE LICENSE V3 COPYRIGHT AND PERMISSION NOTICE -Copyright © 2019-2025 Unicode, Inc. +Copyright © 1991-2026 Unicode, Inc. NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR @@ -38,4 +43,251 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. -SPDX-License-Identifier: Unicode-3.0 + +------------------------------------------------------------ Terms of Use --------------------------------------------------------------- + + Unicode® Consortium Copyright, Terms of Use, and Licenses + + Welcome to the website of Unicode, Inc. (dba The Unicode Consortium) + (“Unicode”). Except as otherwise noted herein, these terms and + conditions (“Terms of Use”) govern your use of the Unicode website + and Unicode Products. Your use of this website and/or Unicode + Products constitutes your agreement to follow and be bound by these + Terms of Use. Unicode provides you with access to and use of this + website and Unicode Products subject to your compliance with these + Terms of Use. If you do not agree to these Terms of Use, you should + not access or use this website or Unicode Products. Unicode reserves + the right to make changes to the website, to Unicode Products, and + to these Terms of Use at any time in its sole discretion. + + 1. Unicode Copyright: Copyright © 1991-Present Unicode, Inc. + + 2. Definitions + a. “Unicode Products” includes the Unicode website and its + content, Data Files, Software, the Unicode Standard, all + other Unicode standards, specifications, technical reports, + technical notes, annexes, code charts, data files, software, + publications, webinars, videos, course materials, online and + in-person events, and all other Unicode products and + services made available via this website or any other + channel of distribution, including but not limited to + Github, Maven, YouTube, and other third-party sites where + Unicode maintains and provides products, materials, and + services. + + b. “Unicode Data Files” or "Data Files" include all computer + data files under the following directories: + + i. https://www.unicode.org/Public + ii. https://www.unicode.org/reports + iii. https://www.unicode.org/ivd/data + iv. https://github.com/unicode-org + + but exclude any materials present in the above directories + that are not computer data files, such as PDF code charts + and Technical Reports. + + c. “Unicode Software” or "Software" includes any source code or + compiled code in any Unicode Product including but not + limited to the code included in the following directories: + + i. https://www.unicode.org/Public/PROGRAMS/ + ii. https://www.unicode.org/Public/cldr/ + iii. https://github.com/unicode-org/ + + 3. Permissions, Licenses, and Restrictions on Use + + a. You are authorized to freely access and use this website and + its content and all Unicode Products subject to these Terms + of Use and subject to any restriction, permission, or + license specifically associated with any specific material + or content. No license is granted to copy or "mirror" this + website. Linking to this website is permitted. + + b. Except where otherwise more broadly permitted or licensed: + + i. you may not make copies of or modifications to Unicode + Products for public distribution, or incorporate Unicode + Products in whole or in part into any product or + publication, or otherwise publicly distribute them, + without the express written permission of Unicode, and + + ii. you may not copy or extract fonts or font data from any + Unicode Products, including but not limited to Unicode + Code Charts . + + c. All Unicode Data Files and Unicode Software are subject to + the terms and conditions of the free and open-source Unicode + License v3 , unless + otherwise indicated by specific restriction, permission, or + license identified at the point of release or in such + software, data file, or other documentation. + + d. You may freely download and make copies of the Unicode® + Standard + Core Specification, Unicode Technical Reports , Unicode Technical Notes , Unicode Code Charts , and other portions of this + website and may annotate and translate such permitted + downloads and copies, provided that such downloads, copies, + annotations, and translations are solely for personal or + internal business purposes and not for public distribution, + and further provided that any permitted copies and + modifications fully reproduce all copyright and other legal + notices contained in the original. Notwithstanding the + foregoing, specific versions of the Unicode® Standard + Core + Specification, Unicode Technical Reports , Unicode Technical Notes , and Unicode Code Charts , as well as other Unicode + publications, materials, and portions of this website may be + subject to broader permissions and/or further reservations + of rights and restrictions on use found in the title pages, + cover sheets, front matter, and/or footnotes for each such + version, report, chart, or other publication or material. + Consult each version, report, chart, or other publication or + material for any such permissions and further reservations + of rights and restrictions on use. + + 4. Restricted Rights Legend. Any Unicode Data Files or Software + that are licensed to the United States of America, its agencies + and/or instrumentalities under these Terms of Use is commercial + technical data or commercial computer software developed + exclusively at private expense as defined in FAR 2.101, or DFARS + 252.227-7014, as applicable. For Unicode Data Files, use, + duplication, or disclosure by the Government is subject to + restrictions as set forth in DFARS 202.227-7015 Technical Data, + Commercial and Items and these Terms of Use. For Unicode + Software, in accordance with FAR 12-212 or DFARS 227-7202, as + applicable, use, duplication or disclosure by the Government is + subject to the restrictions set forth in these Terms of Use. + + 5. Disclaimer of Warranties & Limitation of Liability + + a. This website and the Unicode Products are provided “AS-IS” + without charge as a convenience to visitors and users. While + Unicode attempts to provide accurate, error-free, and timely + information, there may be technical or factual inaccuracies + and typographical or other errors in this website and in the + Unicode Products. Unicode reserves the right to make + corrections and changes to the website and the Unicode + Products at any time without notice. + + b. YOU ASSUME ALL RESPONSIBILITY AND RISK WITH RESPECT TO YOUR + USE OF THIS WEBSITE AND THE UNICODE PRODUCTS, WHICH ARE + PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER + EXPRESS, IMPLIED, OR STATUTORY, INCLUDING BUT NOT LIMITED TO + ANY WARRANTIES OF ACCURACY, COMPLETENESS, TITLE, + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON- + INFRINGEMENT OF THIRD PARTY RIGHTS. UNICODE AND ITS + LICENSORS AND CONTRIBUTORS ASSUME NO RESPONSIBILITY FOR + ERRORS OR OMISSIONS IN THIS WEBSITE AND/OR THE UNICODE + PRODUCTS. IF YOU ARE DISSATISFIED WITH THIS WEBSITE OR THE + UNICODE PRODUCTS, YOUR SOLE REMEDY IS TO DISCONTINUE USE OF + THE WEBSITE AND THE UNICODE PRODUCTS. + + c. IN NO EVENT SHALL UNICODE, ITS MEMBERS, OR ITS LICENSORS OR + CONTRIBUTORS BE LIABLE FOR ANY CLAIM OR DAMAGES WHATSOEVER + OF ANY KIND, WHETHER DIRECT, INDIRECT, SPECIAL, INCIDENTAL, + CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES, WHETHER OR + NOT UNICODE WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE, + INCLUDING BUT NOT LIMITED TO DAMAGE RESULTING FROM LOSS OF + USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE, INABILITY TO USE, PERFORMANCE, + FUNCTIONALITY, MODIFICATION, OR DISTRIBUTION OF THIS + WEBSITE, THE UNICODE PRODUCTS, OR ANY DERIVATIVES THEREOF. + + d. Unicode makes no warranties or representations of any kind + regarding any non-Unicode sites to which you may be directed + or hyperlinked from this website. Hyperlinks are included + solely for your convenience and Unicode makes no warranties + or representations with regard to the accuracy, + availability, suitability, or safety of information, + products, or services provided on such non-Unicode sites. + + 6. Intellectual Property Contributions to Unicode. All + contributions or submissions to Unicode are governed by The + Unicode Consortium Intellectual Property, Licensing & Technical + Contribution Policies . If you wish to make any contribution or + submission to Unicode, refer to the foregoing Policies for + further information on how to do so. In the absence of a signed + contributor license or other agreement with Unicode that + expressly governs a particular contribution or submission, the + act of making a contribution or submission of any kind to + Unicode by any communication channel constitutes a binding legal + agreement by the contributor or submitter that they: + + a. represent and agree that the contributed matter is not + proprietary or confidential to the contributor or any third + party, and + + b. grant to Unicode and to recipients of products distributed + by Unicode a perpetual, irrevocable, unrestricted, + worldwide, nonexclusive, no-charge, royalty-free license, + without obligation for accounting, to reproduce, prepare + derivative works of, publicly display, publicly perform, + distribute, make, use, sell, offer to sell, or import that + matter for any purpose, with the unrestricted right to + sublicense those rights. + + 7. Compliance with Unicode Policies. These Terms of Use hereby + incorporate by reference the following Unicode Policies. Your + use of this website and/or Unicode Products and/or your + participation in Unicode activities constitutes your agreement + to these Policies which may be modified at any time in Unicode’s + sole discretion: + + a. The Unicode Consortium Code of Conduct + + b. The Unicode Consortium Antitrust Policy & Guidelines + + c. The Unicode Consortium Intellectual Property, Licensing & + Technical Contribution Policies + + d. The Unicode Consortium Name and Trademark Usage Policy + + e. The Unicode Consortium Policy on Handling of Confidential + Business Data + + f. The Unicode Consortium General Privacy Policy + + g. The Unicode Technical Group Procedures + + + 8. Trademarks & Logos. The Unicode Word Mark and the Unicode Logo + are trademarks of Unicode, Inc. “The Unicode Consortium'' and + “Unicode, Inc.” are trade names of Unicode, Inc. You hereby + acknowledge and agree to respect Unicode’s exclusive worldwide + rights in the Unicode Word Mark, the Unicode Logo, and the + Unicode trade names. The Unicode Consortium Name and Trademark + Usage Policy + is incorporated herein by reference and you agree to abide by + its provisions, which may be changed from time to time in + Unicode’s sole discretion. + + 9. Jurisdiction and Venue. This website is operated from, and the + Unicode Products are made available from, locations in the + United States of America. Unicode makes no representation that + this website or Unicode Products are appropriate for use in + other locations. If you access this website or the Unicode + Products from other locations, you are responsible for + compliance with local laws. These Terms of Use, all use of this + website and Unicode Products, and any claims and damages + resulting from use of this website or Unicode Products, are + governed by the applicable laws of the United States of America + and the State of California without regard to any principles + which would apply the laws of different jurisdictions. You agree + that any disputes regarding this website and the Unicode + Products shall be resolved solely in the appropriate state and + federal courts located in the counties of San Francisco, San + Mateo, or Santa Clara, California. You agree that these courts + have personal jurisdiction over you and agree to waive any right + to transfer the dispute to any other forum. + + 10. Severability. If any provision of these Terms of Use is declared + invalid or unenforceable, the remaining provisions of these + Terms of Use shall remain in effect. diff --git a/make/data/cldr/README-common.md b/make/data/cldr/README-common.md deleted file mode 100644 index cadf839fb260..000000000000 --- a/make/data/cldr/README-common.md +++ /dev/null @@ -1,10 +0,0 @@ -# CLDR Common Data - -This zipfile contains [CLDR](http://cldr.unicode.org) Common Data. - -## LICENSE - -See [LICENSE.txt](./LICENSE.txt) - ->Copyright © 2019-2022 Unicode, Inc. All rights reserved. ->Distributed under the Terms of Use in https://www.unicode.org/copyright.html \ No newline at end of file diff --git a/make/data/cldr/README.md b/make/data/cldr/README.md new file mode 100644 index 000000000000..1fbda37aae01 --- /dev/null +++ b/make/data/cldr/README.md @@ -0,0 +1,10 @@ +# CLDR Data + +This zipfile contains [CLDR](http://cldr.unicode.org) Data. + +## LICENSE + +See [LICENSE.](./LICENSE) + +>Copyright © 2019-2026 Unicode, Inc. All rights reserved. +>Distributed under the Terms of Use in https://www.unicode.org/copyright.html diff --git a/make/data/cldr/common/bcp47/README.md b/make/data/cldr/common/bcp47/README.md new file mode 100644 index 000000000000..02338b3a7875 --- /dev/null +++ b/make/data/cldr/common/bcp47/README.md @@ -0,0 +1,6 @@ +# CLDR `common/bcp47` directory + +This directory contains XML data files related to [BCP (Best Current Practice) 47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) +and the [LDML specification](https://unicode.org/reports/tr35/). + +For copyright, terms of use, and further details, see the top [README](../../README.md). diff --git a/make/data/cldr/common/bcp47/calendar.xml b/make/data/cldr/common/bcp47/calendar.xml index 9b8bc3e9c1bc..78605b6e9395 100644 --- a/make/data/cldr/common/bcp47/calendar.xml +++ b/make/data/cldr/common/bcp47/calendar.xml @@ -45,8 +45,8 @@ For terms of use, see http://www.unicode.org/copyright.html - - + + diff --git a/make/data/cldr/common/bcp47/currency.xml b/make/data/cldr/common/bcp47/currency.xml index dd1bce5a142c..2481fb6edbd0 100644 --- a/make/data/cldr/common/bcp47/currency.xml +++ b/make/data/cldr/common/bcp47/currency.xml @@ -80,7 +80,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + diff --git a/make/data/cldr/common/bcp47/timezone.xml b/make/data/cldr/common/bcp47/timezone.xml index c0bb0793473c..4d456aa08ca9 100644 --- a/make/data/cldr/common/bcp47/timezone.xml +++ b/make/data/cldr/common/bcp47/timezone.xml @@ -142,7 +142,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -150,7 +150,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -165,7 +165,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -186,7 +186,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -274,7 +274,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -322,7 +322,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -334,12 +334,12 @@ For terms of use, see http://www.unicode.org/copyright.html - + - + @@ -349,10 +349,10 @@ For terms of use, see http://www.unicode.org/copyright.html - + - + @@ -409,23 +409,23 @@ For terms of use, see http://www.unicode.org/copyright.html - - + + - + - + - - - + + + diff --git a/make/data/cldr/common/dtd/README.md b/make/data/cldr/common/dtd/README.md new file mode 100644 index 000000000000..7cb120a52835 --- /dev/null +++ b/make/data/cldr/common/dtd/README.md @@ -0,0 +1,5 @@ +# CLDR `common/dtd` directory + +This directory contains DTD and other data files. See the [LDML specification](https://unicode.org/reports/tr35/). + +For copyright, terms of use, and further details, see the top [README](../../README.md). diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd index b4247f2d9243..d2abfb4ef0ba 100644 --- a/make/data/cldr/common/dtd/ldml.dtd +++ b/make/data/cldr/common/dtd/ldml.dtd @@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -120,7 +120,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -289,6 +289,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + @@ -454,7 +464,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -648,6 +658,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + @@ -867,7 +889,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1001,6 +1023,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1516,7 +1566,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1524,6 +1574,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + + + + + + + + + + @@ -1571,7 +1642,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1595,7 +1666,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1604,7 +1675,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1616,6 +1687,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + @@ -1732,7 +1815,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1763,7 +1846,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1778,16 +1861,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic + - + + + + + + + + + + @@ -2520,6 +2613,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + diff --git a/make/data/cldr/common/dtd/ldml.xsd b/make/data/cldr/common/dtd/ldml.xsd index 3ee2c75ed759..c11ee1746b5f 100644 --- a/make/data/cldr/common/dtd/ldml.xsd +++ b/make/data/cldr/common/dtd/ldml.xsd @@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2089,6 +2177,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -2499,6 +2588,100 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3909,6 +4092,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -3935,6 +4119,60 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4148,6 +4386,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -4174,6 +4413,38 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4520,6 +4791,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -4642,6 +4914,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -4664,6 +4937,28 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + + + + + + + + + + + + + + + + + + + @@ -6504,6 +6799,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + - + diff --git a/make/data/cldr/common/dtd/ldmlBCP47.xsd b/make/data/cldr/common/dtd/ldmlBCP47.xsd index 6ba36d5feb68..357e0de7600f 100644 --- a/make/data/cldr/common/dtd/ldmlBCP47.xsd +++ b/make/data/cldr/common/dtd/ldmlBCP47.xsd @@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file --> - + @@ -55,7 +55,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.xsd b/make/data/cldr/common/dtd/ldmlSupplemental.xsd index 17445fc07b07..dfc1dc24a2e0 100644 --- a/make/data/cldr/common/dtd/ldmlSupplemental.xsd +++ b/make/data/cldr/common/dtd/ldmlSupplemental.xsd @@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file --> - - - - - - - - Qafar - - - Yabuuti - Eretria - Otobbia - - - - [a b t s e c k x i d q r f g o l m n u w h y] - [j p v z] - [A B T S E C K X I D Q R F G O L M N U W H Y] - - - - - - - - EEEE, MMMM dd, y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - - - Qun - Nah - Cig - Agd - Cax - Qas - Qad - Leq - Way - Dit - Xim - Kax - - - Qunxa Garablu - Kudo - Ciggilta Kudo - Agda Baxis - Caxah Alsa - Qasa Dirri - Qado Dirri - Liiqen - Waysu - Diteli - Ximoli - Kaxxa Garablu - - - - - Q - N - C - A - C - Q - Q - L - W - D - X - K - - - - - - - Aca - Etl - Tal - Arb - Kam - Gum - Sab - - - Acaada - Etleeni - Talaata - Arbaqa - Kamiisi - Gumqata - Sabti - - - - - A - E - T - A - K - G - S - - - - - - - saaku - carra - - - - - - Yaasuusuk Duma - Yaasuusuk Wadir - - - YD - YW - - - - - - EEEE, MMMM dd, y - yMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - - ¤#,##0.00 - - - - - - Br - - - - diff --git a/make/data/cldr/common/main/aa_DJ.xml b/make/data/cldr/common/main/aa_DJ.xml deleted file mode 100644 index 9d0ba4bced5d..000000000000 --- a/make/data/cldr/common/main/aa_DJ.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - Qunxa Garablu - Kudo - Ciggilta Kudo - Agda Baxis - Caxah Alsa - Qasa Dirri - Qado Dirri - Leqeeni - Waysu - Diteli - Ximoli - Kaxxa Garablu - - - - - - - - - - Fdj - - - - diff --git a/make/data/cldr/common/main/aa_ER.xml b/make/data/cldr/common/main/aa_ER.xml deleted file mode 100644 index 45557af65937..000000000000 --- a/make/data/cldr/common/main/aa_ER.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - Nfk - - - - diff --git a/make/data/cldr/common/main/aa_ET.xml b/make/data/cldr/common/main/aa_ET.xml deleted file mode 100644 index 9e7133882bf5..000000000000 --- a/make/data/cldr/common/main/aa_ET.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ab.xml b/make/data/cldr/common/main/ab.xml deleted file mode 100644 index 875592fab779..000000000000 --- a/make/data/cldr/common/main/ab.xml +++ /dev/null @@ -1,3778 +0,0 @@ - - - - - - - - - - - Аԥсшәа - ачех - адангме - аедыгь - африкаанс - агем - аин - акан - алеут - аладалтаи - амхар - арагон - ангика - араб - амапуче - арапахо - анедџитә араб - ассам - асу - астури - авар - авадхи - аимара - азербаиџьан - абашкир - абали - абаса - абелорус - абемба - абена - аболгар - абхоџпури - абислама - абини - асиксика - абамбара - абенгал - атибет - абретон - абодо - абосни - абуги - абилин - акаталан - акаиуга - ачакма - ачечен - асебуано - акига - ачаморро - ачукот - амари - ачоктав - ачипевиан - ачероки - ашаиен - агәҭантәи ақәырд - ақәырд (асорани) - акорсикан - ачеш - ауахәама-славиан - ачуваш - авалли - адат - адакота - адаргин - атаита - агерман - австриа агерман - алитературатә ашвеицар агерман - адогриб - аџерма - адогри - ҵаҟатәи лужик - адуала - амалдив - адиола-фони - аӡонг-ка - адаза - аембу - аеве - аефик - аекаџук - абырзен - англыз - австралиатәи англыз - канадатәи англыз - абритан англыз - америкатәи англыз - аесперанто - аиспан - алаҭын-америкатәи аиспан - европатәи аиспан - мексикатәи аиспан - аестон - абаск - аевондо - аџьам - адари - афулах - афин - афилиппин - афиџи - афарер - афон - афранцыз - канадатәи афранцыз - швеицариатәи афранцыз - каџунтәи афранцыз - африул - мраҭашәаратәи африз - аирланд - ага - агел - агеез - агилберт - агалиси - агуарани - агоронтало - швеицариатәи агерман - агуџарати - агуси - амен - агвичин - ахауса - ахаида - агаваи - аиврит - ахинди - ахынглыз - ахилигаинон - ахмонг - ахорват - хыхьтәи-алужик - агаитиан - авенгер - ахупа - аерман - агереро - аинтерлингва - аибан - аибибио - аиндонез - аигбо - аносу - аилоко - аингәыш - аидо - аисланд - аиталиа - аинуктитут - аиапон - аложбан - ангомба - амачаме - аиаван - ақырҭ - акабил - акачин - акаџи - акамба - аҟабарда - атиап - амаконде - акабувердиану - акоро - акхаси - акоира чиини - акикәиу - акәнама - аҟазах - акако - агренланд - акаленџин - акхмер - акимбунду - аканнада - акореи - аконкани - акпелле - аканури - аҟарач-абалҟар - акарел - акурух - акашмири - ашамбала - абафиа - акиолн - ақәырд - акәымык - акоми - акорн - акиргиз - алаҭын - аладино - аланго - алиуксембург - алезгьын - аганда - алимбург - алакота - алингала - алаос - алуизиантәи акреол - алози - аҩадалур - алитов - алуба-акатанга - алуба-алулуа - алунда - алуо - амизо - алухьиа - алатыш - амадур - амагахи - амаитхили - амакассар - амасаи - амокшан - аменде - амеру - амаврикитә креол - амалагаси - амакуа-амеетто - амета - амаршал - амаори - амикмак - аминангкабау - амакедон - амалаиалам - амонгол - аманипур - амохаук - амоси - амаратхи - амалаи - амалти - амунданг - еиуеиԥшым аҭаацәаратә бызшәақәа - акрик - амиранд - абирман - аерзиан - амазандеран - анауру - анеаполитан - анама - анорвегтәи абукмол - нхыҵ андебеле - ҵаҟатәи агерман - ҵаҟатәи асаксон - анепал - аневар - андонга - аниас - аниуе - анидерланд - афламанд - аквасио - аниунорск - ангиембунд - анорвег - аногаи - анко - аладатәи андебеле - аҩадатәи асото - ануер - анавахо - анианџа - анианколе - аокситан - аоромо - аориа - ауаԥс - апанџаби - апангасинан - апампанга - апапиаменто - апалау - анигери-креол - апол - апрус - апушту - апортугал - бразилиатәи апортугал - европатәи апортугал - акечуа - арапануи - араротонга - арохинџа - ароманш - арунди - арумын - молдав - аромбо - аурыс - аромун - акиниаруанда - аруанда - асанскрит - асандаве - асаха - асамбуру - асантали - ангамбаи - асангу - асардин - асицили - ашотланд - асиндхи - аҩадасаам - асена - акоираборо асенни - асанго - аташелхит - ашан - асингал - асловак - асловен - асамоан - аинари-асаам - аколтта-асаам - ашона - асонинке - асомали - арнауҭ - асерб - асранан-атонго - асвази - аладатәи асото - асундан - асукәыма - ашвед - асуахили - конголезтәи асуахили - акомор - ашьам - атамил - ателугу - атемне - атесо - атетум - аҭаџьык - атаи - атигриниа - атигре - атуркмен - аклингон - атлингит - атсвана - атонган - аток-аписин - аҭырқә - аседек - атсонга - аҭаҭар - атумбука - атувалу - атасавак - атаитиан - атувин - абжьара-атластәи атамазигхт - аудмурт - ауигур - аукраин - аумбунду - еилкаам абызшәа - аурду - аузбек - аваи - авенда - авиетнам - аволапиук - авунџо - аваллон - аваллис - аволамо - авараи - аволоф - аву - аҟалмыҟ - акоса - асога - аиангбен - аиемба - аидиш - аиоруба - акантон - атамазигхт - акитаи - аҩадакитаи - акитаи, имариоу аҩыра - аҩадакитаи, имариоу аҩыра - акитаи, атрадициатә ҩыра - аҩадакитаи, атрадициатә ҩыра - азулу - азуни - абызшәатә хыҵхырҭақәа ыҟаӡам - азаза - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - адунеи зегьы - Африка - Аҩадатәи Америка - Аладатәи Америка - Океаниа - Мраҭашәаратәи Африка - Агәҭантәи Америка - Мрагыларатәи Африка - Аҩадатәи Африка - Агәҭантәи Африка - Аладатәи Африка - Америка - Аҩада-Америкатәи арегион - Кариб - Мрагыларатәи Азиа - Аладатәи Азиа - Алада-Мрагыларатәи Азиа - Аладатәи Европа - Австралазиа - Меланезиа - Микронезиа - Полинезиа - Азиа - Агәҭантәи Азиа - Мраҭашәаратәи Азиа - Европа - Мрагыларатәи Европа - Аҩадатәи Европа - Мраҭашәаратәи Европа - Атроптә Африка - Алаҭынтәи Америка - ад-ха Вознесениа - Андорра - ЕАЕ - Афганистан - Антигуеи Барбудеи - Ангилиа - Албаниа - Ермантәыла - Ангола - Антарктида - Аргентина - Америкатәи Самоа - Австриа - Австралиа - Аруба - Аландтәи ад-хақәа - Азербаиџьан - Босниеи Герцеговинеи - Барбадос - Бангладеш - Бельгиа - Буркина-Фасо - Болгариа - Бахреин - Бурунди - Бенин - Сен-Бартелеми - Бермудтәи ад-хақәа - Брунеи-Даруссалам - Боливиа - Бонеир, Синт-Естатиуси Сабеи - Бразилиа - Баӷама - Бутан - ад-ха Буве - Ботсвана - Беларус - Белиз - Канада - Кокостәи ад-қәа - Конго-Киншаса - Конго (АРК) - Агәҭантәи-Африкатәи Ареспублика - Конго-Браззавиль - Ареспублика Конго - Швеицариа - Кот-д’Ивуар - Кук идгьылбжьахақәа - Чили - Камерун - Китаи - Колумбиа - ад-ха Клиппертон - Коста-Рика - Куба - Кабо-Верде - Киурасао - ад-ха Қьырса - Кипр - Чехиа - Чештәи ареспублика - Германиа - Диего-Гарсиа - Џибути - Даниа - Доминика - Доминиканатәи Ареспублика - Алжир - Сеутеи Мелилиеи - Еквадор - Естониа - Египет - Мраҭашәаратәи Сахара - Еритреиа - Испаниа - Ефиопиа - Европатәи аидгыла - евроцәаҳәа - Финлиандиа - Фиџи - Фолклендтәи ад-хақәа - Фолклендтәи (Мальвинтәи) ад-хақәа - Еилоу Микронезиатәи Аштатқәа - Фарертәи ад-хақәа - Франциа - Габон - Британиа ду - Британиа - Гренада - Қырҭтәыла - Францызтәи Гвиана - Гернси - Гана - Гибралтар - Гренландиа - Гамбиа - Гвинеиа - Гваделупа - Екваториалтәи Гвинеиа - Бырзентәыла - Аладатәи Георгиеи Аладатәи Сандвичқәеи ад-қәа - Гватемала - Гуам - Гвинеиа-Бисау - Гаиана - Гонконг (ҶАР) - Гонконг - ад-хақәа Херди Макдональди - Гондурас - Хорватиа - Гаити - Венгриа - Канартәи ад-хақәа - Индонезиа - Ирландиа - Израиль - ад-ха Мен - Индиа - Британиатәи аҵакырадгьыл Индиатәи аокеан аҟны - Ирак - Иран - Исландиа - Италиа - Џерси - Иамаика - Иорданиа - Иапониа - Кениа - Киргизиа - Камбоџа - Кирибати - Комор - Сент-Китси Невиси - КЖӘДР - Кореиа Ареспублика - Кувеит - Адгьылбжьахақәа Каиман - Ҟазахсҭан - Лаос - Ливан - Сент-Люсиа - Лихтенштеин - Шри-Ланка - Либериа - Лесото - Литва - Лиуксембург - Латвиа - Ливиа - Марокко - Монако - Молдова - Ашьхеиқәаҵәа - Сен-Мартен - Мадагаскар - Маршаллтәи Адгьылбжьахақәа - Аҩадатәи Македониа - Мали - Мианма (Бирма) - Монголиа - Макао (ҶАР) - Макао - Аҩадатәи Мариантәи ад-хақәа - Мартиника - Мавританиа - Монтсеррат - Мальта - Маврики - Мальдив - Малави - Мексика - Малаизиа - Мозамбик - Намибиа - Каледониа ҿыц - Нигер - Ад-ха Норфолк - Нигериа - Никарагуа - Нидерланд - Норвегиа - Непал - Науру - Ниуе - Зеландиа ҿыц - Аотеароа (Зеландиа ҿыц) - Оман - Панама - Перу - Францызтәи Полинезиа - Папуа — Гвинеиа ҿыц - Филиппин - Пакистан - Польша - Сен-Пиери Микелони - Питкерн ад-хақәа - Пуерто-Рико - Палестинатәи аҵакырадгьылқәа - Палестина - Португалиа - Палау - Парагваи - Катар - Нҭыҵтәи Океаниа - Реиунон - Румыниа - Сербиа - Урыстәыла - Руанда - Саудтәи Арабсҭан - Соломонтәи адгьылбжьахақәа - Сеишелтәи адгьылбжьахақәа - Судан - Швециа - Сингапур - Иԥшьоу Елена ладгьылбжьаха - Словениа - Шпицбергени Иан-Маиени - Словакиа - Сиерра-Леоне - Сан-Марино - Сенегал - Сомали - Суринам - Аладатәи Судан - Сан-Томеи Принсипиеи - Сальвадор - Синт-Мартен - Шьамтәыла - Есватини - Свазиленд - Тристан-да-Куниа - ад-хақәа Тиоркси Каикоси - Чад - Францызтәи Аладатәи аҵакырадгьылқәа - Того - Таиланд - Таџьықсҭан - Токелау - Мрагыларатәи Тимор - Тимор-Лесте - Ҭурқменисҭан - Тунис - Тонга - Ҭырқәтәыла - Тринидади Тобагои - Тувалу - Таиван - Танзаниа - Украина - Уганда - Нҭыҵтәи малыетәи ад-қәа (ЕАШ) - Еиду Амилаҭқәа Реиҿкаара - Еиду Аштатқәа - ЕАШ - Уругваи - Узбеқьисҭан - Ватикан - Сент-Винсенти Гренадини - Венесуела - Виргинтәи ад-хақәа (Британиаду) - Виргинтәи ад-хақәа (ЕАШ) - Виетнам - Вануату - Уоллиси Футунеи - Самоа - амццәажәашьақәа - амц-Bidi - Косово - Иемен - Маиотта - Алада-Африкатәи ареспублика - Замбиа - Зимбабве - еилкаам арегион - - - агригориантә мзар - амзар ISO-8601 - астандартә сортла аилыхра - иахьатәи араб ацифра - - - Аметрикатә - Англиатәи - Америкатә - - - Абызшәа: {0} - Аҩыра: {0} - Арегион: {0} - - - - [а ә б в г {гә} {гь} ӷ {ӷә} {ӷь} д {дә} е ж {жә} {жь} з ӡ {ӡә} и к {кә} {кь} қ {қә} {қь} ҟ {ҟә} {ҟь} л м н о п ԥ р с т {тә} ҭ {ҭә} у ф х {хә} {хь} ҳ {ҳә} ц {цә} ҵ {ҵә} ч ҷ ҽ ҿ џ {џь} ш {шә} {шь} ы ь ҩ] - [{а́} ҕ {ҕә} {ҕь} {е́} {и́} {о́} ҧ {у́} {ы́}] - [А Б В Г {ГӘ} {ГЬ} Ӷ {ӶӘ} {ӶЬ} Д {ДӘ} Е Ж {ЖӘ} {ЖЬ} З Ӡ {ӠӘ} И К {КӘ} {КЬ} Қ {ҚӘ} {ҚЬ} Ҟ {ҞӘ} {ҞЬ} Л М Н О П Ԥ Р С Т {ТӘ} Ҭ {ҬӘ} У Ф Х {ХӘ} {ХЬ} Ҳ {ҲӘ} Ц {ЦӘ} Ҵ {ҴӘ} Ч Ҷ Ҽ Ҿ Џ {ЏЬ} Ш {ШӘ} {ШЬ} Ы Ҩ] - [\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9] - [\- ‐‑ – — , ; \: ! ? . … '‘‚ "“„ « » ( ) \[ \] \{ \} § @ * / \& #] - - [\: ∶] - - - [££ ₤] - - - [\--﹣ ‑ ‒ −⁻₋ ➖] - [,,﹐︐ ، ٫ 、﹑、︑] - - - [,,﹐︐ ٫] - - - - « - » - „ - “ - - - - - - - - EEEE, d MMMM y 'ш'. G - - - - - d MMMM y 'ш'. G - - - - - d MMM y 'ш'. G - - - - - dd.MM.y G - - - - - - - {1}, {0} - - - {1}, {0} 'аҿы' - - - - - {1}, {0} - - - {1}, {0} 'аҿы' - - - - - {1}, {0} - - - - - {1}, {0} - - - - E, d - ccc, h:mm a - ccc HH:mm - ccc, h:mm:ss a - ccc HH:mm:ss - y 'ш'. G - dd.MM.y G - LLL y 'ш'. G - d MMM y 'ш'. G - E, d MMM y 'ш'. G - dd.MM - E, dd.MM - d MMM - ccc, d MMM - d MMMM - y 'ш'. G - y 'ш'. G - MM.y G - dd.MM.y G - E, dd.MM.y G - LLL y 'ш'. G - d MMM y 'ш'. G - E, d MMM y 'ш'. G - LLLL y 'ш'. G - QQQ y 'ш'. G - QQQQ y 'ш'. G - - - - y 'ш'. G – y 'ш'. G - y–y 'шш'. G - - - MM.y G – MM.y G - MM.y – MM.y G - MM.y – MM.y G - - - dd.MM.y – dd.MM.y G - dd.MM.y G – dd.MM.y G - dd.MM.y – dd.MM.y G - dd.MM.y – dd.MM.y G - - - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y G – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - - - LLL y 'ш'. G – LLL y 'ш'. G - LLL – LLL y 'ш'. G - LLL y – LLL y 'шш'. G - - - d–d MMM y 'ш'. G - d MMM y 'ш'. G – d MMM y 'ш'. G - d MMM – d MMM y 'ш'. G - d MMM y – d MMM y 'шш'. G - - - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM y 'ш'. G – ccc, d MMM y 'ш'. G - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM y – ccc, d MMM y 'шш'. G - - - M–M - - - E, dd.MM – E, dd.MM - E, dd.MM – E, dd.MM - - - LLL – LLL - - - d–d MMM - d MMM – d MMM - - - ccc, d MMM – ccc, d MMM - ccc, d MMM – ccc, d MMM - - - y–y 'шш'. G - - - MM.y – MM.y G - MM.y – MM.y G - - - dd.MM.y – dd.MM.y G - dd.MM.y – dd.MM.y G - dd.MM.y – dd.MM.y G - - - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - - - LLL – LLL y 'ш'. G - LLL y 'ш'. – LLL y 'ш'. G - - - d–d MMM y 'ш'. G - d MMM – d MMM y 'ш'. G - d MMM y 'ш'. – d MMM y 'ш'. G - - - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM y 'ш'. – ccc, d MMM y 'ш'. G - - - LLLL – LLLL y 'ш'. G - LLLL y 'ш'. – LLLL y 'ш'. G - - - - - - - - - Ажь - Жəаб - Хəажә - Мш - Лаҵ - Рашә - Ԥхынгә - Нанҳә - Цəыб - Жьҭ - Абҵ - Ԥхынҷ - - - Жь - Жə - Хə - М - Л - Р - Гә - Н - Цə - Ҭ - Б - Ҷ - - - Ажьырныҳəа - Жəабран - Хəажəкыра - Мшаԥы - Лаҵара - Рашəара - Ԥхынгəы - Нанҳəа - Цəыббра - Жьҭаара - Абҵара - Ԥхынҷкәын - - - - - Жь - Жə - Хə - М - Л - Р - Гә - Н - Цә - Ҭ - Б - Ҷ - - - - - - - Ам - Ашә - Аҩ - Ах - Аԥ - Ахә - Ас - - - Амҽыша - Ашәахьа - Аҩаша - Ахаша - Аԥшьаша - Ахәаша - Асабша - - - - - М - Шә - Ҩ - Х - Ԥ - Хә - С - - - - - - - 1-тәи акв. - 2-тәи акв. - 3-тәи акв. - 4-тәи акв. - - - 1-тәи аквартал - 2-тәи аквартал - 3-тәи аквартал - 4-тәи аквартал - - - - - - - EEEE, d MMMM y 'ш'. - - - - - d MMMM y 'ш'. - - - - - d MMM y 'ш'. - - - - - dd.MM.y - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1}, {0} - - - {1}, {0} 'аҿы' - - - - - {1}, {0} - - - {1}, {0} 'аҿы' - - - - - {1}, {0} - - - - - {1}, {0} - - - - ccc, h:mm B - ccc, h:mm:ss B - ccc, d - y 'ш'. G - dd.MM.y GGGGG - LLL y 'ш'. G - d MMM y 'ш'. G - E, d MMM y 'ш'. G - h:mm a - h:mm:ss a - h:mm:ss a v - dd.MM - E, dd.MM - d MMM - ccc, d MMM - d MMMM - W-'тәи' 'амчыбжь' MMMM - MM.y - dd.MM.y - ccc, dd.MM.y 'ш'. - LLL y 'ш'. - d MMM y 'ш'. - E, d MMM y 'ш'. - LLLL y 'ш'. - QQQ y 'ш'. - QQQQ y 'ш'. - w-'тәи' 'амчыбжь' Y 'ш'. - - - {0} – {1} - - y 'ш'. G – y 'ш'. G - y–y 'шш'. G - - - MM.y G – MM.y G - MM.y – MM.y G - MM.y – MM.y G - - - dd.MM.y – dd.MM.y G - dd.MM.y G – dd.MM.y G - dd.MM.y – dd.MM.y G - dd.MM.y – dd.MM.y G - - - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y G – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - - - LLL y 'ш'. G – LLL y 'ш'. G - LLL – LLL y 'ш'. G - LLL y – LLL y 'шш'. G - - - d–d MMM y 'ш'. G - d MMM y 'ш'. G – d MMM y 'ш'. G - d MMM – d MMM y 'ш'. G - d MMM y – d MMM y 'шш'. G - - - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM y 'ш'. G – ccc, d MMM y 'ш'. G - ccc, d MMM – ccc, d MMM y 'ш'. G - ccc, d MMM y – ccc, d MMM y 'шш'. G - - - h a – h a - h–h a - - - h:mm a – h:mm a - h:mm–h:mm a - h:mm–h:mm a - - - h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v - - - h a – h a v - h–h a v - - - M–M - - - dd.MM – dd.MM - dd.MM – dd.MM - - - E, dd.MM – E, dd.MM - E, dd.MM – E, dd.MM - - - LLL – LLL - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - MM.y – MM.y - MM.y – MM.y - - - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y - - - ccc, dd.MM.y – ccc, dd.MM.y - ccc, dd.MM.y – ccc, dd.MM.y - ccc, dd.MM.y – ccc, dd.MM.y - - - LLL – LLL y 'ш'. - LLL y 'ш'. – LLL y 'ш'. - - - d–d MMM y 'ш'. - d MMM – d MMM y 'ш'. - d MMM y 'ш'. – d MMM y 'ш'. - - - ccc, d – ccc, d MMM y 'ш'. - ccc, d MMM – ccc, d MMM y 'ш'. - ccc, d MMM y 'ш'. – ccc, d MMM y 'ш'. - - - LLLL – LLLL y 'ш'. - LLLL y 'ш'. – LLLL y 'ш'. - - - - - - - - аера - - - ашықәс - - - ш. - - - ш - - - аквартал - - - акв. - - - акв - - - амза - - - амз. - - - амз - - - амчыбжь - - - амч. - - - амч - - - амш - иацы - иахьа - уаҵәы - - - - {0} Аамҭа - {0} Аԥхынтәи Аамҭа - {0} Астандартә Аамҭа - - Еилкаам ақалақь - - - Андорра - - - Дубаи - - - Кабул - - - Антигуа - - - Ангилиа - - - Тирана - - - Ереван - - - Луанда - - - Ротера - - - Палмер - - - Тролл - - - Сиова - - - Моусон - - - Деивис - - - Амрагылара - - - Кеиси - - - Диумон-д’Иурвил - - - Мак-Мердо - - - Рио-Галегос - - - Мендоса - - - Сан-Хуан - - - Ушуаиа - - - Ла-Риоха - - - Сан-Луис - - - Катамарка - - - Салта - - - Жужуи - - - Тукуман - - - Кордова - - - Буенос-Аирес - - - Паго-Паго - - - Вена - - - Перт - - - Иукла - - - Дарвин - - - Аделаида - - - Брокен-Хилл - - - Мелбурн - - - Хобарт - - - Линдеман - - - Сиднеи - - - Брисбен - - - Маккуори - - - Лорд-Хау - - - Аруба - - - Мариехамн - - - Баку - - - Сараево - - - Барбадос - - - Дакка - - - Бриуссел - - - Уагадугу - - - Софиа - - - Бахреин - - - Бужумбура - - - Порто-Ново - - - Сен-Бартелеми - - - Бермудтәи ад-хақәа - - - Брунеи - - - Ла-Пас - - - Кралендеик - - - Еирунепе - - - Риу-Бранку - - - Порту-Велиу - - - Боа-Виста - - - Манаус - - - Куиаба - - - Сантарен - - - Кампу-Гранди - - - Белен - - - Арагуаина - - - Сан-Паулу - - - Баиа - - - Форталеза - - - Масеио - - - Ресифи - - - Норониа - - - Нассау - - - Тхимпху - - - Габороне - - - Минск - - - Белиз - - - Доусон - - - Уаитхорс - - - Инувик - - - Ванкувер - - - Форт Нелсон - - - Доусон-Крик - - - Крестон - - - Едмонтон - - - Свифт-Керрент - - - Кеимбриџ-Беи - - - Реџаина - - - Виннипег - - - Резолиут - - - Ранкин-Инлет - - - Корал-Харбор - - - Торонто - - - Икалуит - - - Монктон - - - Ҳалифакс - - - Гус-Беи - - - Глеис-Беи - - - Бланк-Саблон - - - Сент-Џонс - - - Кокостәи ад-хақәа - - - Киншаса - - - Лубумбаши - - - Банги - - - Браззавил - - - Циурих - - - Абиџан - - - Раротонга - - - ад-ха Пасхи - - - Пунта-Аренас - - - Сантиаго - - - Дуала - - - Урумчи - - - Шанхаи - - - Богота - - - Коста-Рика - - - Гавана - - - Кабо-Верде - - - Киурасао - - - ад-ха Қьырса - - - Никосиа - - - Фамагуста - - - Прага - - - Биузинген-Хыхьтәи-Реине - - - Берлин - - - Џибути - - - Копенҳаген - - - Доминика - - - Санто-Доминго - - - Алжир - - - Галапагостәи ад-хақәа - - - Гуаиакил - - - Таллин - - - Каир - - - Ел-Аиун - - - Асмера - - - Канартәи ад-хақәа - - - Сеута - - - Мадрид - - - Аддис-Абеба - - - Хелсинки - - - Фиџи - - - Стенли - - - Трук - - - Понпеи - - - Косрае - - - Фарертәи ад-хақәа - - - Париж - - - Либревил - - - - Англиа Аԥхынтәи Аамҭа - - Лондон - - - Гренада - - - Қарҭ - - - Каиенна - - - Гернси - - - Аккра - - - Гибралтар - - - Туле - - - Нуук - - - Скорсбисунн - - - Денмарксхавн - - - Банжул - - - Конакри - - - Гваделупа - - - Малабо - - - Афин - - - Аладатәи Георгиа - - - Гватемала - - - Гуам - - - Бисау - - - Гаиана - - - Ҳонконг - - - Тегусигалпа - - - Загреб - - - Порт-о-Пренс - - - Будапешт - - - Џакарта - - - Понтианак - - - Макасар - - - Џаиапура - - - - Аирланд Астандартә Аамҭа - - Дублин - - - Иерусалим - - - ад-ха Мен - - - Калкутта - - - Чагос - - - Багдад - - - Тегеран - - - Реикиавик - - - Рим - - - Џерси - - - Иамаика - - - Амман - - - Токио - - - Наироби - - - Бишкек - - - Пномпен - - - Кантон - - - Киритимати - - - Тарава - - - Комор - - - Сент-Китс - - - Пхениан - - - Сеул - - - Кувеит - - - Адгьылбжьахақәа Каиман - - - Актау - - - Уралск - - - Атырау - - - Актобе - - - Костанаи - - - Кызылорда - - - Алматы - - - Вентиан - - - Беирут - - - Сент-Лиусиа - - - Вадуц - - - Коломбо - - - Монровиа - - - Масеру - - - Вилниус - - - Лиуксембург - - - Рига - - - Триполи - - - Касабланка - - - Монако - - - Кишинев - - - Подгорица - - - Мариго - - - Антананариву - - - Кваџалеин - - - Маџуро - - - Скопе - - - Бамако - - - Иангон - - - Ховд - - - Улан-Батор - - - Макао - - - Саипан - - - Мартиника - - - Нуакшот - - - Монтсеррат - - - Малта - - - Маврики - - - Малдив - - - Блантаир - - - Тихуана - - - Ермосило - - - Масатлан - - - Чиуауа - - - Баиа-де-Бандерас - - - Охинага - - - Монтерреи - - - Мехико - - - Матаморос - - - Мерида - - - Канкун - - - Куала-Лумпур - - - Кучинг - - - Мапуту - - - Виндхук - - - Нумеа - - - Ниамеи - - - Норфолк - - - Лагос - - - Манагуа - - - Амстердам - - - Осло - - - Катманду - - - Науру - - - Ниуе - - - Чатем - - - Окленд - - - Маскат - - - Панама - - - Лима - - - Таити - - - Маркизтәи ад-хақәа - - - ад-хақәа Гамбе - - - Порт-Морсби - - - Бугенвил - - - Манила - - - Карачи - - - Варшава - - - Микелон - - - Питкерн - - - Пуерто-Рико - - - Газа - - - Хеврон - - - Азортәи ад-хақәа - - - Мадеира - - - Лиссабон - - - Палау - - - Асунсон - - - Катар - - - Реиунон - - - Бухарест - - - Белград - - - Калининград - - - Москва - - - Волгоград - - - Саратов - - - Астрахан - - - Улиановск - - - Киров - - - Самара - - - Екатеринбург - - - Омск - - - Новосибирск - - - Барнаул - - - Томск - - - Новокузнецк - - - Красноиарск - - - Иркутск - - - Чита - - - Иакутск - - - Владивосток - - - Хандыга - - - ад-ха Сахалин - - - Уст-Нера - - - Магадан - - - Среднеколымск - - - Петропавловск-Камчаткатәи - - - Анадыр - - - Кигали - - - Ер-Риад - - - Гуадалканал - - - Мае - - - Хартум - - - Стокҳолм - - - Сингапур - - - Иԥшьоу Елена ладгьылбжьаха - - - Лиублиана - - - Лонгир - - - Братислава - - - Фритаун - - - Сан-Марино - - - Дакар - - - Могадишо - - - Парамарибо - - - Џуба - - - Сан-Томе - - - Салвадор - - - Лоуер-Принс-Куотер - - - Дамаск - - - Мбабане - - - Гранд-Терк - - - Нџамена - - - Кергелен - - - Ломе - - - Бангкок - - - Душанбе - - - Факаофо - - - Дили - - - Ашхабад - - - Тунис - - - Тонгатапу - - - Стамбул - - - Порт-оф-Спеин - - - Фунафути - - - Таибеи - - - Дар-ес-Салам - - - Киев - - - Симферопол - - - Кампала - - - ад-хақәа Мидуеи - - - Уеик - - - Адак - - - Ном - - - Анкориџ - - - Иакутат - - - Ситка - - - Џуно - - - Метлакатла - - - Лос-Анџелес - - - Боисе - - - Финикс - - - Денвер - - - Боила, Аҩадатәи Дакота - - - Ниу-Сеилем, Аҩадатәи Дакота - - - Агәҭа, Аҩадатәи Дакота - - - Чикаго - - - Меномини - - - Винсеннес - - - Питерсберг, Индиана - - - Телл-Сити - - - Нокс, Индиана - - - Уинамак - - - Маренго, Индиана - - - Индианаполис - - - Луисвилл - - - Вевеи, Индиана - - - Монтиселло, Кентукки - - - Детроит - - - Ниу-Иорк - - - Монтевидео - - - Самарканд - - - Ташкент - - - Ватикан - - - Сент-Винсент - - - Каракас - - - Тортола - - - Сент-Томас - - - Хошимин - - - Ефате - - - Уоллис - - - Апиа - - - Аден - - - Маиотта - - - Иоҳаннесбург - - - Лусака - - - Ҳараре - - - - Акри аамҭа - Акри астандартә аамҭа - Акри аԥхынтәи аамҭа - - - - - Афганистан - - - - - Агәҭантәи Африка - - - - - Мрагыларатәи Африка - - - - - Аладатәи Африка - - - - - Мраҭашәаратәи Африка - - - - - Алиаска - Алиаска, астандартә аамҭа - Алиаска, аԥхынтәи аамҭа - - - - - Алма-Ата аамҭа - Алма-Ата астандартә аамҭа - Алма-Ата аԥхынтәи аамҭа - - - - - Амазонка - Амазонка, астандартә аамҭа - Амазонка, аԥхынтәи аамҭа - - - - - Агәҭантәи Америка - Агәҭантәи Америка, астандартә аамҭа - Агәҭантәи Америка, аԥхынтәи аамҭа - - - - - Мрагыларатәи Америка - Мрагыларатәи Америка, астандартә аамҭа - Мрагыларатәи Америка, аԥхынтәи аамҭа - - - - - Ашьхатә аамҭа (Аҩадатәи Америка) - Астандартә ашьхатә аамҭа (Аҩадатәи Америка) - Аԥхынтәи ашьхатә аамҭа (Аҩадатәи Америка) - - - - - Аокеанҭынчтәи аамҭа - Аокеанҭынчтәи астандартә аамҭа - Аокеанҭынчтәи аԥхынтәи аамҭа - - - - - аамҭа Анадыр аҿы - Анадыр астандартә аамҭа - Анадыр аԥхынтәи аамҭа - - - - - Апиа - Апиа, астандартә аамҭа - Апиа, аԥхынтәи аамҭа - - - - - Актау аамҭа - Актау, астандартә аамҭа - Актау аԥхынтәи аамҭа - - - - - Актобе аамҭа - Актобе астандартә аамҭа - Актобе аԥхынтәи аамҭа - - - - - Саудтәи Арабсҭан - Саудтәи Арабсҭан, астандартә аамҭа - Саудтәи Арабсҭан, аԥхынтәи аамҭа - - - - - Аргентина - Аргентина, астандартә аамҭа - Аргентина, аԥхынтәи аамҭа - - - - - Мраҭашәаратәи Аргентина - Мраҭашәаратәи Аргентина, астандартә аамҭа - Мраҭашәаратәи Аргентина, аԥхынтәи аамҭа - - - - - Ермантәыла - Ермантәыла, астандартә аамҭа - Ермантәыла, аԥхынтәи аамҭа - - - - - Атлантикатәи аамҭа - Атлантикатәи астандартә аамҭа - Атлантикатәи аԥхынтәи аамҭа - - - - - Агәҭантәи Австралиа - Агәҭантәи Австралиа, астандартә аамҭа - Агәҭантәи Австралиа, аԥхынтәи аамҭа - - - - - Агәҭантәи Австралиа, мраҭашәаратәи аамҭа - Агәҭантәи Австралиа, мраҭашәаратәи астандартә аамҭа - Агәҭантәи Австралиа, мраҭашәаратәи аԥхынтәи аамҭа - - - - - Мрагыларатәи Австралиа - Мрагыларатәи Австралиа, астандартә аамҭа - Мрагыларатәи Австралиа, аԥхынтәи аамҭа - - - - - Мраҭашәаратәи Австралиа - Мраҭашәаратәи Австралиа, астандартә аамҭа - Мраҭашәаратәи Австралиа, аԥхынтәи аамҭа - - - - - Азербаиџьан - Азербаиџьан, астандартә аамҭа - Азербаиџьан, аԥхынтәи аамҭа - - - - - Азортәи ад-хақәа - Азортәи ад-хақәа, астандартә аамҭа - Азортәи ад-хақәа, аԥхынтәи аамҭа - - - - - Бангладеш - Бангладеш, астандартә аамҭа - Бангладеш, аԥхынтәи аамҭа - - - - - Бутан - - - - - Боливиа - - - - - Бразилиа - Бразилиа, астандартә аамҭа - Бразилиа, аԥхынтәи аамҭа - - - - - Брунеи-Даруссалам - - - - - Кабо-Верде - Кабо-Верде, астандартә аамҭа - Кабо-Верде, аԥхынтәи аамҭа - - - - - Кеиси - - - - - Чаморро - - - - - Чатем - Чатем, астандартә аамҭа - Чатем, аԥхынтәи аамҭа - - - - - Чили - Чили, астандартә аамҭа - Чили, аԥхынтәи аамҭа - - - - - Китаи - Китаи, астандартә аамҭа - Китаи, аԥхынтәи аамҭа - - - - - ад-ха Қьырса - - - - - Кокостәи ад-хақәа - - - - - Колумбиа - Колумбиа, астандартә аамҭа - Колумбиа, аԥхынтәи аамҭа - - - - - Кук идгьылбжьахақәа - Кук идгьылбжьахақәа, астандартә аамҭа - Кук идгьылбжьахақәа, полуаԥхынтәи аамҭа - - - - - Куба - Куба, астандартә аамҭа - Куба, аԥхынтәи аамҭа - - - - - Деивис - - - - - Диумон-д’Иурвил - - - - - Мрагыларатәи Тимор - - - - - ад-ха Пасхи - ад-ха Пасхи, астандартә аамҭа - ад-ха Пасхи, аԥхынтәи аамҭа - - - - - Еквадор - - - - - Агәҭантәи Европа - Агәҭантәи Европа, астандартә аамҭа - Агәҭантәи Европа, аԥхынтәи аамҭа - - - - - Мрагыларатәи Европа - Мрагыларатәи Европа, астандартә аамҭа - Мрагыларатәи Европа, аԥхынтәи аамҭа - - - - - Московатәи аамҭа - - - - - Мраҭашәаратәи Европа - Мраҭашәаратәи Европа, астандартә аамҭа - Мраҭашәаратәи Европа, аԥхынтәи аамҭа - - - - - Фолклендтәи ад-хақәа - Фолклендтәи ад-хақәа, астандартә аамҭа - Фолклендтәи ад-хақәа, аԥхынтәи аамҭа - - - - - Фиџи - Фиџи, астандартә аамҭа - Фиџи, аԥхынтәи аамҭа - - - - - Францызтәи Гвиана - - - - - Францызтәи Аладатәеи Антарктикатәи рҵакырадгьылқәа - - - - - Галапагостәи ад-хақәа - - - - - Гамбе - - - - - Қырҭтәыла - Қырҭтәыла, астандартә аамҭа - Қырҭтәыла, аԥхынтәи аамҭа - - - - - ад-хақәа Гилберта - - - - - Агринвич Ибжьаратәу Аамҭа - - - - - Мрагыларатәи Гренландиа - Мрагыларатәи Гренландиа, стандарное времиа - Мрагыларатәи Гренландиа, аԥхынтәи аамҭа - - - - - Мраҭашәаратәи Гренландиа - Мраҭашәаратәи Гренландиа, астандартә аамҭа - Мраҭашәаратәи Гренландиа, аԥхынтәи аамҭа - - - - - Гуам - - - - - Аџьамтә аӡыбжьахала - - - - - Гаиана - - - - - Ҳаваи-алеуттәи астандартә аамҭа - - - - - Ҳаваи-алеуттәи аамҭа - Ҳаваи-алеуттәи астандартә аамҭа - Ҳаваи-алеуттәи аԥхынтәи аамҭа - - - - - Ҳонконг - Ҳонконг, астандартә аамҭа - Ҳонконг, аԥхынтәи аамҭа - - - - - Ховд - Ховд, астандартә аамҭа - Ховд, аԥхынтәи аамҭа - - - - - Индиа - - - - - Индиатәи аокеан - - - - - Индокитаи - - - - - Агәҭантәи Индонезиа - - - - - Мрагыларатәи Индонезиа - - - - - Мраҭашәаратәи Индонезиа - - - - - Иран - Иран, астандартә аамҭа - Иран, аԥхынтәи аамҭа - - - - - Иркутск - Иркутск, астандартә аамҭа - Иркутск, аԥхынтәи аамҭа - - - - - Израиль - Израиль, астандартә аамҭа - Израиль, аԥхынтәи аамҭа - - - - - Иапониа - Иапониа, астандартә аамҭа - Иапониа, аԥхынтәи аамҭа - - - - - Петропавловск-Камчаткатәи - Петропавловск-Камчаткатәи, астандартә аамҭа - Петропавловск-Камчаткатәи, аԥхынтәи аамҭа - - - - - Мрагыларатәи Ҟазахсҭан - - - - - Мраҭашәаратәи Ҟазахсҭан - - - - - Кореиа - Кореиа, астандартә аамҭа - Кореиа, аԥхынтәи аамҭа - - - - - Косрае - - - - - Красноиарск - Красноиарск, астандартә аамҭа - Красноиарск, аԥхынтәи аамҭа - - - - - Киргизиа - - - - - Шри-Ланка - - - - - ад-хақәа Лаин - - - - - Лорд-Ҳау - Лорд-Ҳау, астандартә аамҭа - Лорд-Ҳау, аԥхынтәи аамҭа - - - - - Макао - Макао, астандартә аамҭа - Макао, аԥхынтәи аамҭа - - - - - Магадан - Магадан, астандартә аамҭа - Магадан, аԥхынтәи аамҭа - - - - - Малаизиа - - - - - Мальдив - - - - - Маркизтәи ад-хақәа - - - - - Маршаллтәи Адгьылбжьахақәа - - - - - Маврики - Маврики, астандартә аамҭа - Маврики, аԥхынтәи аамҭа - - - - - Моусон - - - - - Аокеанҭынчтәи амексикатә аамҭа - Аокеанҭынчтәи амексикатә астандартә аамҭа - Аокеанҭынчтәи амексикатә аԥхынтәи аамҭа - - - - - Улан-Батор - Улан-Батор, астандартә аамҭа - Улан-Батор, аԥхынтәи аамҭа - - - - - Москва - Москва, астандартә аамҭа - Москва, аԥхынтәи аамҭа - - - - - Мианма - - - - - Науру - - - - - Непал - - - - - Каледониа ҿыц - Каледониа ҿыц, астандартә аамҭа - Каледониа ҿыц, аԥхынтәи аамҭа - - - - - Зеландиа ҿыц - Зеландиа ҿыц, астандартә аамҭа - Зеландиа ҿыц, аԥхынтәи аамҭа - - - - - Ниуфаундленд - Ниуфаундленд, астандартә аамҭа - Ниуфаундленд, аԥхынтәи аамҭа - - - - - Ниуе - - - - - Норфолк - Норфолк, астандартә аамҭа - Норфолк, аԥхынтәи аамҭа - - - - - Фернанду-ди-Норониа - Фернанду-ди-Норониа, астандартә аамҭа - Фернанду-ди-Норониа, аԥхынтәи аамҭа - - - - - Аҩадатәи Мариантәи ад-хақәа - - - - - Новосибирск - Новосибирск, астандартә аамҭа - Новосибирск, аԥхынтәи аамҭа - - - - - Омск - Омск, астандартә аамҭа - Омск, аԥхынтәи аамҭа - - - - - Пакистан - Пакистан, астандартә аамҭа - Пакистан, аԥхынтәи аамҭа - - - - - Палау - - - - - Папуа — Гвинеиа ҿыц - - - - - Парагваи - Парагваи, астандартә аамҭа - Парагваи, аԥхынтәи аамҭа - - - - - Перу - Перу, астандартә аамҭа - Перу, аԥхынтәи аамҭа - - - - - Филиппин - Филиппин, астандартә аамҭа - Филиппин, аԥхынтәи аамҭа - - - - - ад-хақәа Феникс - - - - - Сен-Пиери Микелони - Сен-Пиери Микелони, астандартә аамҭа - Сен-Пиери Микелони, аԥхынтәи аамҭа - - - - - Питкерн - - - - - Понпеи - - - - - Пхениан - - - - - Кызылорда* - Кызылорда, астандартә аамҭа* - Кызылорда, аԥхынтәи аамҭа* - - - - - Реиунон - - - - - Ротера - - - - - Сахалин - Сахалин, астандартә аамҭа - Сахалин, аԥхынтәи аамҭа - - - - - аамҭа Самараҿы - Самартәи астандартә аамҭа - Самартәи аԥхынтәи аамҭа - - - - - Самоа - Самоа, астандартә аамҭа - Самоа, аԥхынтәи аамҭа - - - - - Сеишелтәи адгьылбжьахақәа - - - - - Сингапур - - - - - Соломонтәи адгьылбжьахақәа - - - - - Аладатәи Георгиа - - - - - Суринам - - - - - Сиова - - - - - Таити - - - - - Таиван - Таиван, астандартә аамҭа - Таиван, аԥхынтәи аамҭа - - - - - Таџьықсҭан - - - - - Токелау - - - - - Тонга - Тонга, астандартә аамҭа - Тонга, аԥхынтәи аамҭа - - - - - Трук - - - - - Туркменистан - Туркменистан, астандартә аамҭа - Туркменистан, аԥхынтәи аамҭа - - - - - Тувалу - - - - - Уругваи - Уругваи, астандартә аамҭа - Уругваи, аԥхынтәи аамҭа - - - - - Узбеқьисҭан - Узбеқьисҭан, астандартә аамҭа - Узбеқьисҭан, аԥхынтәи аамҭа - - - - - Вануату - Вануату, астандартә аамҭа - Вануату, аԥхынтәи аамҭа - - - - - Венесуела - - - - - Владивосток - Владивосток, астандартә аамҭа - Владивосток, аԥхынтәи аамҭа - - - - - Волгоград - Волгоград, астандартә аамҭа - Волгоград, аԥхынтәи аамҭа - - - - - Амрагылара - - - - - Уеик - - - - - Уоллиси Футунеи - - - - - Иакутск - Иакутск, астандартә аамҭа - Иакутск, аԥхынтәи аамҭа - - - - - Екатеринбург - Екатеринбург, астандартә аамҭа - Екатеринбург, аԥхынтәи аамҭа - - - - - Иукон - - - - - - - , -   - ≈ - - - - - #,##0 % - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤ - - - {0} {1} - - - - бермудтәи адоллар - - - евро - - - ლ - - - ¥ - - - PHP - - - L - - - ₽ - - - леоне - - - леоне (1964—2022) - - - ฿ - - - NT$ - - - ₴ - - - $ - - - Еилкаам Авалиута - (еилкаам авалиута) - - - - ≈{0} - - - {0} мшы - - - - - {0}-и {1}-и - {0}-и {1}-и - - - {0} ма {1} - {0} ма {1} - - - {0}, {1} - {0}, {1} - - - {0} {1} - {0} {1} - {0} {1} - {0} {1} - - - - - ааи:а - мап:м - - - diff --git a/make/data/cldr/common/main/ady.xml b/make/data/cldr/common/main/ady.xml new file mode 100644 index 000000000000..1b60319c0ff0 --- /dev/null +++ b/make/data/cldr/common/main/ady.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + адыгабзэ + арабыбзэ + инджылызыбзэ + урысыбзэ + тыркубзэ + + + + + + + Иордание + Урысые + Тыркуе + + + метрик + ПЗ + ШЗ + + + бзэ: {0} + тхэпкъылъэ {0} + чӏыналъэ: {0} + + + + [а б в г {гу} {гъ} {гъу} д {дж} {дз} {дзу} её ж {жъ} {жъу} {жь} з и й к {ку} {къ} {къу} {кӏ} {кӏу} л {лъ} {лӏ} м н о п {пӏ} {пӏу} р с т {тӏ} {тӏу} у ф х {хъ} {хъу} {хь} ц {цу} {цӏ} ч {чъ} {чӏ} ш {шъ} {шъу} {шӏ} {шӏу} щ ъ ы ь э ю я ӏ {ӏу}] + [{гь} {кӏь}] + [_ \- ‑ – , ; \: ! ? . … ' " « » ( ) \[ \] \{ \} @ * / \& # ` ~] + + + « + » + + + + + + + + щылэмазэм + мэзаем + гъэтхапэм + мэлылъфэгъум + жъоныгъуакӏэм + мэкъуогъум + бэдзэогъум + шышъхьэӏум + ӏоныгъум + чъэпыогъум + шэкӏогъум + тыгъэгъазэм + + + + + щылэмаз + мэзай + гъэтхапэ + мэлылъфэгъу + жъоныгъуакӏ + мэкъуогъу + бэдзэогъу + шышъхьэӏу + ӏоныгъу + чъэпыогъу + шэкӏогъу + тыгъэгъаз + + + + + + + тхьаумаф + блыпэ + гъубдж + бэрэскэжъый + мэфэкъу + бэрэскэшху + шэмбэт + + + + + тхьаумаф + блыпэ + гъубдж + бэрэскэжъый + мэфэкъу + бэрэскэшху + шэмбэт + + + + + + dd.MM.y + MMM 'и' d, y 'гъэ' + MMM y + MMMM 'и' d, y 'гъэ' + MMMM 'и' d, y 'гъэ' E + + + + + + + илъэс + + + мазэ + + + тхьамафэ + + + мафэ + + + сыхьат + + + такъикъ + + + нэгъэупӏэпӏэгъу + + + + ГГС {0} + ДСЗ {0} + {0} сыхьат + {0} гъэмэфэ сыхьат + {0} шэпхъэ сыхьат + + + Дунэепсэу сыхьат зэтегъэуцуагъ + + + ДСЗ + + + + + Греенвич гурыт сыхьатыр + + + + + + + , +   + ≈ + пчъагъэп + + + diff --git a/make/data/cldr/common/main/ab_GE.xml b/make/data/cldr/common/main/ady_JO.xml similarity index 93% rename from make/data/cldr/common/main/ab_GE.xml rename to make/data/cldr/common/main/ady_JO.xml index 1ae5854dccef..20f896d19ad9 100644 --- a/make/data/cldr/common/main/ab_GE.xml +++ b/make/data/cldr/common/main/ady_JO.xml @@ -12,7 +12,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - + + diff --git a/make/data/cldr/common/main/zh_Latn_CN.xml b/make/data/cldr/common/main/ady_RU.xml similarity index 72% rename from make/data/cldr/common/main/zh_Latn_CN.xml rename to make/data/cldr/common/main/ady_RU.xml index 35b284697028..7bfacadfea20 100644 --- a/make/data/cldr/common/main/zh_Latn_CN.xml +++ b/make/data/cldr/common/main/ady_RU.xml @@ -5,15 +5,14 @@ For terms of use, see http://www.unicode.org/copyright.html SPDX-License-Identifier: Unicode-3.0 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -(http://unicode.org/reports/tr35/) -annotations. +Proper interpretation of these files requires synthesis of missing items, as per +​https://www.unicode.org/reports/tr35/tr35-general.html#Annotations Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations. --> - - - - - - - - - - - - - - - Mundo - Africa - America d’o Norte - Sudamerica - Oceanía - Africa occidental - America Central - Africa oriental - Africa septentrional - Africa central - Africa meridional - America - Norteamerica - Caribe - Asia oriental - Asia meridional - Asia sudoriental - Europa meridional - Australasia - Melanesia - Rechión d’a Micronesia - Polinesia - Asia - Asia central - Asia occidental - Europa - Europa oriental - Europa septentrional - Europa occidental - Africa subsahariana - Latino-america - Isla Ascensión - Andorra - Emiratos Arabes Unius - Afganistán - Antigua y Barbuda - Anguilla - Albania - Armenia - Angola - Antartida - Archentina - Samoa Americana - Austria - Australia - Aruba - Islas Åland - Azerbaichán - Bosnia y Herzegovina - Barbados - Bangladesh - Belchica - Burkina Faso - Bulgaria - Bahrain - Burundi - Benín - St. Barthélemy - Bermuda - Brunei - Bolivia - Caribe neerlandés - Brasil - Bahamas - Bhután - Isla Bouvet - Botswana - Belarrusia - Belize - Canadá - Islas Cocos - Republica Democratica d’o Congo - Congo Kinshasa - Republica Centro-africana - Republica d’o Congo - Congo Brazzaville - Suiza - Côte d’Ivoire - Costa de Vori - Islas Cook - Chile - Camerún - ¨China - Colombia - Isla Clipperton - Costa Rica - Cuba - Cabo Verde - Curaçao - Isla Chirstmas - Chipre - Chequia - Republica checa - Alemanya - Diego García - Chibuti - Dinamarca - Dominica - Republica Dominicana - Alcheria - Ceuta y Melilla - Ecuador - Estonia - Echipto - Sahara occidental - Eritrea - Espanya - Ethiopia - Unión Europea - Eurozona - Finlandia - Fichi - Islas Malvinas - Islas Malvinas (Islas Falkland) - Micronesia - Islas Feroe - Francia - Gabón - Reino Uniu - RU - Grenada - Cheorchia - Guayana francesa - Guernsey - Ghana - Chibraltar - Gronlandia - Gambia - Guinea - Guadeloupe - Guinea equatorial - Grecia - Islas Cheorchia d’o Sud y Sandwich d’o Sud - Guatemala - Guam - Guinea-Bissau - Guyana - Hong Kong, RAS China - Hong Kong - Islas Heard y McDonald - Honduras - Croacia - Haití - Hongría - Islas Canarias - Indonesia - Irlanda - Israel - Isla de Man - India - Territorio Britanico de l’Oceano Indico - Iraq - Irán - Islandia - Italia - Jersey - Chamaica - Chordania - Chapón - Kenya - Kirguistán - Cambocha - Kiribati - Comoros - Sant Cristofo y Nieus - Corea d’o Norte - Corea d’o Sud - Kuwait - Islas Caimán - Cazaquistán - Laos - Libano - Santa Lucía - Liechtenstein - Sri Lanka - Liberia - Lesotho - Lituania - Luxemburgo - Letonia - Libia - Marruecos - Monaco - Moldavia - Montenegro - Sant Martín - Madagascar - Islas Marshall - Macedonia d’o norte - Mali - Myanmar (Burma) - Mongolia - Macau, RAS China - Macau - Islas Marianas d’o Norte - Martinica - Mauritania - Montserrat - Malta - Mauricio - Maldivas - Malawi - Mexico - Malasia - Mozambique - Namibia - Nueva Caledonia - Nicher - Isla Norfolk - Nicheria - Nicaragua - Países Baixos - Noruega - Nepal - Nauru - Niue - Nueva Zelanda - Omán - Panamá - Perú - Polinesa Francesa - Papúa Nueva Guinea - Filipinas - Paquistán - Polonia - Saint-Pierre y Miquelon - Islas Pitcairn - Puerto Rico - Territorios Palestinos - Palestina - Portugal - Palau - Paraguay - Qatar - Territorios aleixaus d’Oceanía - Isla d’a Reunión - Rumanía - Serbia - Rusia - Ruanda - Arabia Saudí - Islas Salomón - Seychelles - Sudán - Suecia - Singapur - Santa Helena - Eslovenia - Svalbard y Jan Mayen - Eslovaquia - Sierra Leona - San Marino - Senegal - Somalia - Surinam - Sudán d’o Sud - Sant Tomé y Principe - El Salvador - Sint Maarten - Siria - Eswatini - Swazilandia - Tristán da Cunha - Islas Turcas y Caicos - Chad - Territorios australs franceses - Togo - Tailandia - Tayikistán - Tokelau - Timor-Leste - Timor Oriental - Turkmenistán - Tunicia - Tonga - Turquía - Trinidad y Tobago - Tuvalu - Taiwán - Tanzania - Ucrainia - Uganda - Islas perifericas d’os EUA - Nacions Unidas - Estaus Unius - EUA - Uruguay - Uzbequistán - Ciudat d’o Vaticano - Sant Vicent y las Granadinas - Venezuela - Islas Virchens Britanicas - Islas Virchens Norte-americanas - Vietnam - Vanuatu - Wallis y Fortuna - Samoa - Pseudoaccentos - Pseudobidi - Kosovo - Yemen - Mayotte - Republica de Sudafrica - Zambia - Zimbabue - Rechión desconoixida - - - calendario gregoriano - calendario ISO-8601 - ordenación standard - dichitos occidentals - - - metrico - RU - EUA - - - Idioma: {0} - Escritura: {0} - Rechión: {0} - - - - [aá b c d eé f g h ií j k l m n oó p q r s t uúü v w x y z] - [· àâä ç èêë ìîï ñ òôö ùû] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - [\- ‐‑ – — , ; \: ! ¡ ? ¿ . … '‘’ "“” « » ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - « - » - ” - ” - - - - - - - - EEEE, d MMMM 'de' y G - - - - - d MMMM 'de' y G - - - - - d MMM 'de' y G - - - - - dd-MM-y GGGGG - - - - - - - {1} 'a' 'las' {0} - - - - - {1} 'a' 'las' {0} - - - - - {1}, {0} - - - - - {1} {0} - - - - E, d - y G - MMM y G - d MMM y G - E, d MMM y G - d/M - E, d/M - d MMM - E, d MMM - d 'de' MMMM - y G - y G - M/y GGGGG - d/M/y GGGGG - E, d/M/y GGGGG - MMM y G - d MMM y G - E, d MMM y G - MMMM y G - QQQ y G - QQQQ y G - - - - y G – y G - y – y G - - - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG - - - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - - - E, d/M/y – E, d/M/y GGGGG - E, d/M/y GGGGG – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - - - LLL y G – LLL y G - LLL–LLL y G - LLL y – LLL y G - - - d–d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - M–M - - - d/M – d/M - d/M – d/M - - - E, d/M – E, d/M - E, d/M – E, d/M - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - y–y G - - - M/y – M/y GGGGG - M/y – M/y GGGGG - - - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - - - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - - - LLL–LLL y G - LLL y – LLL y G - - - d–d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - E, d MMM y – E, d MMM y G - - - LLLL – LLLL y G - LLLL y – LLLL y G - - - - - - - - - chi. - feb. - mar. - abr. - may. - chn. - chl. - ago. - set. - oct. - nov. - avi. - - - de chinero - de febrero - de marzo - d’abril - de mayo - de chunyo - de chuliol - d’agosto - de setiembre - d’octubre - de noviembre - d’aviento - - - - - chinero - febrero - marzo - abril - mayo - chunyo - chuliol - agosto - setiembre - octubre - noviembre - aviento - - - - - - - dom - lun - mar - mie - chu - vie - sab - - - dominche - luns - martz - miercres - chueves - viernes - sabado - - - - - D - L - Ma - Mi - Ch - V - S - - - - - - - 1T - 2T - 3T - 4T - - - 1r trimestre - 2o trimestre - 3r trimestre - 4o trimestre - - - - - - - a.m. - p.m. - - - - - - a.C. - AEC - d.C. - EC - - - - - - EEEE, d MMMM 'de' y - - - - - d MMMM 'de' y - - - - - d MMM y - - - - - d/M/yy - yyMd - - - - - - - H:mm:ss zzzz - Hmmsszzzz - - - - - H:mm:ss z - Hmmssz - - - - - H:mm:ss - Hmmss - - - - - H:mm - Hmm - - - - - - - {1} 'a' 'las' {0} - - - - - {1} 'a' 'las' {0} - - - - - {1}, {0} - - - - - {1} {0} - - - - E d - y G - MMM y G - d MMM y G - E, d MMM y G - d/M - E, d/M - d MMM - E, d MMM - d MMMM - 'semana' W 'de' MMMM - 'semana' W 'de' MMMM - M/y - d/M/y - E, d/M/y - d MMM y - E, d MMM y - MMMM y - QQQ 'de' y - QQQQ y - 'semana' w 'de' Y - 'semana' w 'de' Y - - - - y G – y G - y–y G - - - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG - - - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - M/d/y – M/d/y GGGGG - - - E, d/M/y – E, d/M/y GGGGG - E, dd/MM/y GGGGG – E, dd/MM/y GGGGG - E, dd/MM/y GGGGG – E, dd/MM/y GGGGG - E, dd/MM/y GGGGG – E, dd/MM/y GGGGG - - - LLL y G – LLL y G - LLL – LLL y G - LLL y – LLL y G - - - d–d LLL y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - h a – h a - h – h a - - - HH – HH - - - h:mm a – h:mm a - h:mm – h:mm a - h:mm – h:mm a - - - HH:mm – HH:mm - HH:mm – HH:mm - - - h:mm a – h:mm a v - h:mm – h:mm a v - h:mm – h:mm a v - - - HH:mm – HH:mm v - HH:mm – HH:mm v - - - h a – h a v - h – h a v - - - HH – HH v - - - M–M - - - d/M – d/M - d/M – d/M - - - E, d/M – E, d/M - E, d/M – E, d/M - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - - - LLL–LLL y - LLL y – LLL y - - - d–d MMM y - d MMM – d MMM y - d MMM y – d MMM y - - - E, d MMM y – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y - - - LLLL–LLLL y - LLLL y – LLLL y - - - - - - - - era - - - anyo - l’anyo pasau - estianyo - l’anyo que viene - - - a. - - - trimestre - - - trim. - - - mes - lo mes pasau - este mes - lo mes que viene - - - m. - - - semana - la semana pasada - esta semana - la semana que viene - la semana de {0} - - - s. - - - la semana de ´{0} - - - día - ahiere - hue - manyana - - - día d’a semana - - - a.m./p.m. - - - hora - - - h. - - - minuto - - - min. - - - segundo - - - s. - - - zona horaria - - - - Hora de {0} - Hora de verano de {0} - Hora standard de {0} - - - tiempo universal coordenado - - - - Ciudat desconoixida - - - Macau - - - - hora central d’America d’o Norte - hora standard central d’America d’o Norte - hora de verano central d’America d’o Norte - - - - - hora oriental d’America d’o Norte - hora standard oriental d’America d’o Norte - hora de verano oriental d’America d’o Norte - - - - - hora de montanya d’America d’o Norte - hora standard de montanya d’America d’o Norte - hora de verano de montanya d’America d’o Norte - - - - - hora d’o Pacifico d’America d’o Norte - hora standard d’o Pacifico d’America d’o Norte - hora de verano d’o Pacifico d’America d’o Norte - - - - - hora de l’Atlantico - hora standard de l’Atlantico - hora de verano de l’Atlantico - - - - - hora d’o centro d’Europa - hora standard d’o centro d’Europa - hora de verano d’o centro d’Europa - - - - - hora de l’este d’Europa - hora standard de l’este d’Europa - hora de verano de l’este d’Europa - - - - - hora de l’ueste d’Europa - hora standard de l’ueste d’Europa - hora de verano de l’ueste d’Europa - - - - - hora d’o meridiano de Greenwich - - - - - - - , - . - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - ¤#,##0.00;(¤#,##0.00) - ¤ #,##0.00;(¤ #,##0.00) - #,##0.00;(#,##0.00) - - - {0} {1} - {0} {1} - - - - real brasilenyo - real brasilenyo - reals brasilenyos - - - yuan chino - yuan chino - yuans chinos - - - euro - euro - euros - r - - - libra britanica - libra britanica - libras britanicas - - - rupia india - rupia india - rupias indias - - - yen chaponés - yen chaponés - yens chaponeses - ¥ - - - ringgit de Malasia - - - piso filipino - piso filipino - pisos filipinos - - - rublo ruso - rublo ruso - rublos rusos - - - dólar de Singapur - dolar de Singapur - dolars de Singapur - - - baht tailandés - - - dolar d’os Estaus Unius - dolar d’os Estaus Unius - dolars d’os Estaus Unius - - - moneda desconoixida - (moneda desconoixida) - (moneda desconoixida) - - - - {0} día - {0} días - Pilla lo {0}o a la dreita - - - - - - {0} per {1} - - - revolución - {0} revolución - {0} revolucions - - - radians - {0} radián - {0} radians - - - graus - {0} grau - {0} graus - - - minutos d’arco - {0} minutos d’arco - {0} minutos d’arco - - - segundos d’arco - {0} segundo d’arco - {0} segundos d’arco - - - quiratz - {0} quirat - {0} quiratz - - - per cient - {0} per cient - {0} per cient - - - per mil - {0} per mil - {0} per mil - - - per miriada - {0} per miriada - {0} per miriada - - - joules - {0} joule - {0} joules - - - centimetros - {0} centimetro - {0} centimetros - {0} per centimetro - - - tonas metricas - {0} tona metrica - {0} tonas metricas - - - kilogramos - {0} kilogramo - {0} kilogramos - {0} per kilogramo - - - gramos - {0} gramo - {0} gramos - {0} per gramo - - - tonas - {0} tona - {0} tonas - - - quiratz - {0} quirat - {0} quiratz - - - masas d’a Tierra - {0} masa d’a Tierra - {0} masas d’a Tierra - - - masas solars - {0} masa solar - {0} masas solars - - - watts - {0} watt - {0} watts - - - caballos de vapor - {0} caballo de vapor - {0} caballos de vapor - - - graus Celsius - {0} grau Celsius - {0} graus Celsius - - - graus Farenheit - {0} grau Farenheit - {0} graus Farenheit - - - punto cardinal - {0} este - {0} norte - {0} sud - {0} ueste - - - - - º - - - {0} arcmin - {0} arcmin - - - {0} arcsec - {0} arcsec - - - J - - - tm - {0} tm - {0} tm - - - g - - - W - - - punto - {0}U - - - - - - {0} y {1} - {0} y {1} - - - {0} u {1} - {0} u {1} - - - {0} {1} - {0} {1} - {0} {1} - {0} {1} - - - - - sí:s - - - diff --git a/make/data/cldr/common/main/an_ES.xml b/make/data/cldr/common/main/an_ES.xml deleted file mode 100644 index 8c0fbc42beb9..000000000000 --- a/make/data/cldr/common/main/an_ES.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ann.xml b/make/data/cldr/common/main/ann.xml deleted file mode 100644 index 45b9a7a3d894..000000000000 --- a/make/data/cldr/common/main/ann.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - Obolo - - - - [aàâ b {ch} d eèê f g iìî j k l m{m̀} nǹ{n̄} oòôọ{ọ̀}ộ p r s {sh} t uùû v w y z] - [áǎ c éě h íǐ ḿ ń óǒ{ọ́}{ọ̌} q ṣ úǔ x] - [a b {ch} d e f g i j k l m n{n̄} oọ p r s t u v w y z] - [, ; ! ? .] - - - - - ₦ - - - - diff --git a/make/data/cldr/common/main/ann_NG.xml b/make/data/cldr/common/main/ann_NG.xml deleted file mode 100644 index e4dc94350beb..000000000000 --- a/make/data/cldr/common/main/ann_NG.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/apc.xml b/make/data/cldr/common/main/apc.xml deleted file mode 100644 index ac4484ef0157..000000000000 --- a/make/data/cldr/common/main/apc.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - العامية - - - - - right-to-left - - - - [ً ٌ ٍ َ ُ ِ ّ ْ ٰ ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي] - [ـ\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی] - [ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي] - [\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩] - [\- ‐‑ – — ، ؛ \: ! ؟ . … ' " « » ( ) \[ \] \&] - - - - - - - - كانون التاني - شباط - أذار - نيسان - أيار - حزيران - تموز - آب - أيلول - تشرين الأول - تشرين التاني - كانون الأول - - - - - - - الأحد - التنين - التلاتا - الأربعا - الخميس - الجمعة - السبت - - - - - - - صباحا - مساء - - - - - - - - - - د.أ.‏ - - - - diff --git a/make/data/cldr/common/main/apc_SY.xml b/make/data/cldr/common/main/apc_SY.xml deleted file mode 100644 index eff03d52bfbd..000000000000 --- a/make/data/cldr/common/main/apc_SY.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ar.xml b/make/data/cldr/common/main/ar.xml index 6370d1caf9dc..37ea2452bfc3 100644 --- a/make/data/cldr/common/main/ar.xml +++ b/make/data/cldr/common/main/ar.xml @@ -74,7 +74,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ البينية لغة الكوم السيكسيكية - الآنية + الآنية البامبارا البنغالية التبتية @@ -132,7 +132,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ الدارجوا تيتا الألمانية - الألمانية النمساوية الديلوير السلافية الدوجريب @@ -155,8 +154,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ اليونانية الإمايت الإنجليزية - الإنجليزية المملكة المتحدة - الإنجليزية الولايات المتحدة الإنجليزية الوسطى الإسبرانتو الإسبانية @@ -214,7 +211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ هايدا الجنوبية العبرية الهندية - الهنجليزية + الهندية الإنجليزية الهيليجينون الحثية الهمونجية @@ -423,6 +420,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ البالية بيجين البولندية + البيدمونتية البوهنبيايان الماليزيت-باساماكودي البروسياوية @@ -505,7 +503,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ القمرية سريانية تقليدية السريانية - السيليزية + السيليزية التاميلية التوتشون الجنوبية التيلوغوية @@ -1068,28 +1066,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ترتيب الفرز الفرز الموحد الفرز الرقمي + إعادة ترتيب أنظمة الكتابة/الكتل قوة الفرز العملة - عرض الرموز التعبيرية + وجهة التحويل + استثناءات فواصل القاموس + عرض الرموز التعبيرية + أول يوم في الأسبوع + مختلط نظام التوقيت (12 مقابل 24) + طريقة الإدخال + لوحة المفاتيح + أعلى قيمة مهملة نمط فصل السطور - فصل السطور وسط الكلمات + فصل السطور وسط الكلمات + قواعد التحويل نظام القياس + وحدة القياس الأرقام - فاصل الجملة بعد الاختصار + المنطقة للبيانات التكميلية + مصدر التحويل + تقسيم فرعي للمنطقة + فاصل الجملة بعد الاختصار + تحويل + ترجمة آلية المنطقة الزمنية متغيرات اللغة استخدام خاص + تحويل للاستخدام الخاص التقويم البوذي - البوذي + البوذي التقويم الصيني - الصيني + الصيني التقويم القبطي - القبطي + القبطي تقويم دانجي - دانجي + دانجي التقويم الإثيوبي الإثيوبي تقويم أميتي أليم الإثيوبي @@ -1097,18 +1111,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ التقويم الميلادي الميلادي التقويم العبري - العبري + العبري التقويم القومي الهندي + الوطني الهندي التقويم الهجري الهجري التقويم الهجري المدني الهجري المدني التقويم الهجري (السعودية - الرؤية) + التقويم الهجري، الرؤية في السعودية التقويم الهجري (الحسابات الفلكية) الهجري (الحسابات الفلكية) التقويم الهجري (أم القرى) الهجري (أم القرى) تقويم ISO-8601 + الميلادي التقويم الياباني الياباني التقويم الفارسي @@ -1124,8 +1141,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ تصنيف اللكنات بشكل عادي تصنيف اللكنات معكوسة تصنيف الأحرف الصغيرة أولاً + الأحرف الصغيرة ترتيب تصنيف حالة الأحرف الطبيعية + الأحرف الصغيرة تصنيف الأحرف الكبيرة أولاً + الأحرف الكبيرة تصنيف بحسب الأحرف غير الحساسة لحالة الأحرف تصنيف بحسب حساسية الأحرف ترتيب الفرز السابق: للتوافق @@ -1134,15 +1154,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ القاموس ترتيب فرز Unicode الافتراضي Unicode افتراضي + الرموز التعبيرية + القواعد الأوروبية الترتيب حسب دليل الهاتف دليل الهاتف الترتيب حسب اللفظ حسب اللفظ الترتيب حسب نظام بنيين الصيني - بنيين الصيني + بنيين الصيني بحث لأغراض عامة بحث بحث باستخدام حرف الهانغول الساكن الأول + الحرف الساكن الأولي الكوري ترتيب الفرز القياسي قياسي الترتيب حسب نظام كتابة المجموع الصيني @@ -1150,24 +1173,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ترتيب تقليدي تقليدي الترتيب حسب نظام الكتابة بالجذر والمجموع - نظام الكتابة بالجذر والمجموع + نظام الكتابة بالجذر والمجموع الترتيب حسب نظام بوبوموفو نظام بوبوموفو التصفية بدون تسوية تصنيف Unicode طبيعي تصنيف الأرقام على حدة تصنيف الأرقام بالعدد + العملة + الأرقام + علامات الترقيم + المسافات البيضاء + الرموز تصنيف الكل + الكل تصنيف الحروف الأساسية فقط + الأحرف الأساسية فقط تصنيف اللكنات/الحالة/العرض/الكانا + الأحرف الأساسية، علامات التشكيل، حالة الأحرف، المتغيرات، الكانا تصنيف اللكنات + الأحرف الأساسية، علامات التشكيل تصنيف اللكنات/الحالة/العرض + الأحرف الأساسية، علامات التشكيل، حالة الأحرف، المتغيرات عرض كامل نصف العرض رقمي افتراضي رمز تعبيري نص + نظام 12 ساعة + 12 + نظام 24 ساعة + 24 نظام 12 ساعة (0–11) 12 (0–11) نظام 12 ساعة (1–12) @@ -1176,6 +1213,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) نظام 24 ساعة (1–24) 24 (1–24) + إزاحة المسافات وعلامات الترقيم وجميع الرموز + إزاحة المسافات وعلامات الترقيم + إزاحة المسافات وعلامات الترقيم + إزاحة المسافات وعلامات الترقيم والرموز غير النقدية نمط فصل السطور: متباعد متباعد نمط فصل السطور: عادي @@ -1185,62 +1226,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ فصل الكل الاحتفاظ بالكل عادي - عدم فصل العبارات + عدم فصل العبارات بي جي إن يو إن جي إي جي إن النظام المتري - متري + متري نظام القياس البريطاني - بريطاني + بريطاني نظام القياس الأمريكي - أمريكي + أمريكي الأرقام العربية الهندية الأرقام العربية الهندية الممتدة + العربية الهندية الممتدة الأرقام الأرمينية الأرقام الأرمينية الصغيرة + الأرمينية الصغيرة الأرقام البنغالية أرقام تشاكما الأرقام الديفانغارية الأرقام الإثيوبية الأرقام المالية - أرقام كاملة العرض + المالية + الأرقام الكاملة العرض + كاملة العرض الأرقام الجورجية الأرقام اليونانية الأرقام اليونانية الصغيرة + اليونانية الصغيرة الأرقام الغوجاراتية الأرقام الغورموخية + ترقيم أيام الشهر بالحروف الصينية للتقاويم التقليدية الأرقام العشرية الصينية + نظام عشري موضعي يُستخدم فيه نظام العد الصيني كأرقام الأرقام الصينية المبسطة الأرقام المالية الصينية المبسطة + المالية الصينية المبسطة الأرقام الصينية التقليدية الأرقام المالية الصينية التقليدية + المالية الصينية التقليدية الأرقام العبرية الأرقام الجاوية الأرقام اليابانية الأرقام المالية اليابانية + المالية اليابانية + نظام ترقيم السنة الأولى (غانين) الياباني الأرقام الخيمرية أرقام الكانادا + تاي ثام (الديني) الأرقام اللاوية الأرقام الغربية + رياضي عريض + رياضي مزدوج الخطوط + رياضي أحادي المسافة + رياضي عريض بلا تذييل + رياضي بلا تذييل الأرقام الملايلامية الأرقام المغولية أرقام ميتي أرقام ميانمار + كارين بو الشرقية الميانمارية + باو الميانمارية + شان الميانمارية + تاي لاينغ الميانمارية الأرقام الأصلية + الأرقام الأصلية أرقام أُول تشيكي أرقام الأوريا + المفرّغة الأرقام الرومانية + الرومانية الكبيرة الأرقام الرومانية الصغيرة + الرومانية الصغيرة + المجزأة الأرقام التاميلية التقليدية الأرقام التاميلية + التاميلية المعاصرة الأرقام التيلوغوية الأرقام التايلاندية الأرقام التبتية أرقام تقليدية + الأرقام التقليدية أرقام فاي غير مفعّل مفعّل + ترجمة آلية غير محددة + متغيّر POSIX + + غير مفعّل + مفعّل + النظام المتري النظام البريطاني @@ -1287,6 +1362,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + r/MM/dd + + + + + + / + + + r/MM/dd + + + @@ -1404,6 +1496,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E، d y G + G y/MM d‏/M‏/y G E، M/d/y G MMM y G @@ -1427,6 +1520,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + ‏{0} – ‏{1} + ‏{0} – ‏{1} + {0} – {1} y G – y G @@ -1491,6 +1588,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + ‏d–‏d ‏MMMM + MMMM d – ‏MMMM d + y–y G @@ -1744,6 +1845,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + ‏/ + {1}، {0} @@ -1752,7 +1856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} في {0} - {1} في {0} + {1} في {0} @@ -1763,7 +1867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} في {0} - {1} في {0} + {1} في {0} @@ -1806,6 +1910,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E، d MMM y MMMM y + d MMMM y + EEE، d MMMM y QQQ y QQQQ y الأسبوع w من سنة Y @@ -1815,6 +1921,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ الأسبوع w من سنة Y الأسبوع w من سنة Y + + {0} {1} + {0} – {1} @@ -1880,6 +1989,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d–d MMMM + d MMMM – d MMMM + M‏/y – M‏/y M‏/y – M‏/y @@ -2021,246 +2134,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - y-MM G + y-MM G E، y/M/d G + + + + + y MMMM d + + + + + y MMM d + + + + + y/MM/dd + + + + + + / + + + y/MM/dd + + + - تيكا - هاكتشي - هاكهو - شتشو - تيهو - كيين - وادو - رييكي - يورو - جينكي - تمبيو - تمبيو-كامبو - تمبيو-شوهو - تمبيو-هوجي - تمفو-جينجو - جينجو-كيين - هوكي - تن-أو - إنرياكو - ديدو - كونين - تنتشو - شووا (٨٣٤–٨٤٨)‏ - كاجو - نينجو - سيكو - تنان - جوجان - جينكيي - نينا - كامبيو - شوتاي - انجي - انتشو - شوهيي - تنجيو - تنرياكو - تنتوكو - أووا - كوهو - آنا - تينروكو - تن-نن - جوجن - تنجن - إيكان - كانا - اي-ان - ايسو - شورياكو (٩٩٠–٩٩٥)‏ - تشوتوكو - تشوهو - كانكو - تشووا - كانين - جاين - مانجو - تشوجين - تشورياكو - تشوكيو (١٠٤٠–١٠٤٤)‏ - كانتوكو - ايشو (١٠٤٦–١٠٥٣)‏ - تينجي - كوهيي - جيرياكو - انكيو (١٠٦٩–١٠٧٤)‏ - شوهو (١٠٧٤–١٠٧٧)‏ - شورياكو (١٠٧٧–١٠٨١)‏ - ايهو - أوتوكو - كانجي - كاهو - ايتشو - شوتوكو - كووا (١٠٩٩–١١٠٤)‏ - تشوجي - كاشو - تنين - تن-اي - ايكيو (١١١٣–١١١٨)‏ - جن-اي - هوان - تنجي - ديجي - تنشو (١١٣١–١١٣٢)‏ - تشوشو - هوين - ايجي - كوجي (١١٤٢–١١٤٤)‏ - تنيو - كيوان - نينبيي - كيوجو - هجين - هيجي - ايرياكو - أوهو - تشوكان - ايمان - نين-ان - كاو - شون - أنجين - جيشو - يووا - جيي - جنريوكو - بنجي - كنكيو - شوجي - كنين - جنكيو (١٢٠٤–١٢٠٦)‏ - كن-اي - شوجن (١٢٠٧–١٢١١)‏ - كنرياكو - كنبو (١٢١٣–١٢١٩)‏ - شوكيو - جو - جيننين - كروكو - أنتيي - كنكي - جويي - تمبكو - بنرياكو - كاتيي - رياكنين - ان-أو - نينجي - كنجين - هوجي - كنتشو - كوجن - شوكا - شوجن (١٢٥٩–١٢٦٠)‏ - بن-أو - كوتشو - بن-اي - كنجي - كوان - شوو (١٢٨٨–١٢٩٣)‏ - اينين - شوان - كنجن - كجن - توكجي - انكي - أوتشو - شووا (١٣١٢–١٣١٧)‏ - بنبو - جنو - جنكيو (١٣٢١–١٣٢٤)‏ - شوتشو (١٣٢٤–١٣٢٦)‏ - كريكي - جنتكو - جنكو - كمو - إنجن - كوككو - شوهي - كنتكو - بنتشو - تنجو - كورياكو - كووا (١٣٨١–١٣٨٤)‏ - جنتشو - مييتكو (١٣٨٤–١٣٨٧)‏ - كاكي - كو - مييتكو (١٣٩٠–١٣٩٤)‏ - أويي - شوتشو (١٤٢٨–١٤٢٩)‏ - ايكيو (١٤٢٩–١٤٤١)‏ - ككيتسو - بن-أن - هوتكو - كيوتكو - كوشو - تشوركو - كنشو - بنشو - أونين - بنمي - تشوكيو (١٤٨٧–١٤٨٩)‏ - انتكو - ميو - بنكي - ايشو (١٥٠٤–١٥٢١)‏ - تييي - كيوركو - تنمن - كوجي (١٥٥٥–١٥٥٨)‏ - ايركو - جنكي - تنشو (١٥٧٣–١٥٩٢)‏ - بنركو - كيتشو - جنوا - كان-اي - شوهو (١٦٤٤–١٦٤٨)‏ - كيان - شوو (١٦٥٢–١٦٥٥)‏ - ميرياكو - منجي - كنبن - انبو - تنوا - جوكيو - جنركو - هويي - شوتكو - كيوهو - جنبن - كنبو (١٧٤١–١٧٤٤)‏ - انكيو (١٧٤٤–١٧٤٨)‏ - كان-ان - هورياكو - مييوا - ان-اي - تنمي - كنسي - كيووا - بنكا - بنسي - تنبو - كوكا - كاي - أنسي - من-ان - بنكيو - جنجي - كيو ميجي تيشو شووا @@ -2882,8 +2790,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ غرينتش{0} - غرينتش + التوقيت العالمي {0} غرينتش+? + التوقيت العالمي+? توقيت {0} توقيت {0} الصيفي توقيت {0} الرسمي @@ -2894,6 +2803,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ التوقيت العالمي المنسق + + التوقيت العالمي + مدينة غير معروفة @@ -3238,10 +3150,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ راروتونغا - استر + جزيرة إيستر - كويهايكيو + كويهايكيو بونتا أريناز @@ -3364,9 +3276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ليبرفيل - - توقيت بريطانيا الصيفي - لندن @@ -3457,9 +3366,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ جايابيورا - - توقيت أيرلندا الرسمي - دبلن @@ -4155,6 +4061,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ هراري + + + توقيت أكري + توقيت أكري الرسمي + توقيت أكري الصيفي + + توقيت أفغانستان @@ -4231,9 +4144,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - توقيت آبيا - التوقيت الرسمي لآبيا - التوقيت الصيفي لأبيا + توقيت ساموا الغربية + توقيت ساموا الغربية الرسمي + توقيت ساموا الغربية الصيفي @@ -4337,6 +4250,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت برازيليا الصيفي + + + توقيت بريطانيا + توقيت بريطانيا الصيفي + + توقيت بروناي @@ -4510,6 +4429,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت غرينتش + + + توقيت غرينلاند + توقيت غرينلاند الرسمي + توقيت غرينلاند الصيفي + + توقيت شرق غرينلاند @@ -4524,11 +4450,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت غرب غرينلاند الصيفي - - - توقيت غوام - - توقيت الخليج @@ -4541,7 +4462,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - توقيت هاواي ألوتيان الرسمي + توقيت هاواي @@ -4602,6 +4523,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت إيران الصيفي + + + توقيت أيرلندا + توقيت أيرلندا الرسمي + + توقيت إركوتسك @@ -4625,9 +4552,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - توقيت كامشاتكا - توقيت بيتروبافلوفسك-كامتشاتسكي - توقيت بيتروبافلوفسك-كامتشاتسكي الصيفي + توقيت كامتشاتكا + توقيت كامتشاتكا الرسمي + توقيت كامتشاتكا الصيفي @@ -4796,11 +4723,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت فرناندو دي نورونها الصيفي - - - توقيت جزر ماريانا الشمالية - - توقيت نوفوسيبيرسك @@ -4899,16 +4821,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - توقيت سامارا - توقيت سمارا - توقيت سمارا الصيفي + توقيت سامارا + توقيت سامارا الرسمي + توقيت سامارا الصيفي - توقيت ساموا توقيت ساموا الرسمي - توقيت ساموا الصيفي @@ -4975,6 +4895,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت شوك + + + توقيت تركيا + توقيت تركيا الرسمي + توقيت تركيا الصيفي + + توقيت تركمانستان @@ -4994,6 +4921,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ توقيت أوروغواي الصيفي + + + توقيت أورومتشي + + توقيت أوزبكستان @@ -5179,23 +5111,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 000 ألف 000 ألف 000 ألف + 0 مليون 0 مليون + 0 مليون + 0 مليون + 0 مليون 0 مليون + 00 مليون 00 مليون + 00 مليون + 00 مليون + 00 مليون 00 مليون + 000 مليون 000 مليون + 000 مليون + 000 مليون + 000 مليون 000 مليون + 0 مليار 0 مليار + 0 مليار + 0 مليار + 0 مليار 0 مليار + 00 مليار 00 مليار + 00 مليار + 00 مليار + 00 مليار 00 مليار + 000 مليار 000 مليار + 000 مليار + 000 مليار + 000 مليار 000 مليار + 0 ترليون 0 ترليون + 0 ترليون + 0 ترليون + 0 ترليون 0 ترليون + 00 ترليون 00 ترليون + 00 ترليون + 00 ترليون + 00 ترليون 00 ترليون + 000 ترليون 000 ترليون + 000 ترليون + 000 ترليون + 000 ترليون 000 ترليون @@ -5203,12 +5171,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}⁄{0} {1} {0} - {1} {0}⁠ {1}⁄{0} {1} {0} - {1} {0}⁠ {1} {0}⁠ @@ -5511,6 +5477,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ فرنك سويسري + Fr بيزو تشيلي @@ -5772,7 +5739,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ كيب لاوسي - جنيه لبناني + ليرة لبنانية + ليرة لبنانية + ليرة لبنانية + ليرة لبنانية + ليرات لبنانية + ليرة لبنانية + ليرة لبنانية ل.ل.‏ @@ -6230,12 +6203,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ غيلدر كاريبي - غيلدر كاريبي - غيلدر كاريبي - غيلدر كاريبي - غيلدر كاريبي - غيلدر كاريبي - غيلدر كاريبي حقوق السحب الخاصة @@ -6308,13 +6275,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ دولار زمبابوي - ذهب زيمبابوي - ذهب زيمبابوي - ذهب زيمبابوي - ذهب زيمبابوي - ذهب زيمبابوي - ذهب زيمبابوي - ذهب زيمبابوي + ذهب زيمبابوي دولار زمبابوي 2009 @@ -6606,15 +6567,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} عنصرًا {0} عنصر - - جزء - {0} جزء - {0} جزء - جزآن - {0} أجزاء - {0} جزءًا - {0} جزء - masculine جزء في المليون @@ -6649,15 +6601,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - - سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - masculine لتر لكل كيلومتر @@ -7026,6 +6969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} نقطة لكل سنتيمتر + نقاط لكل بوصة {0} نقطة لكل بوصة {0} نقطة لكل بوصة نقطتان لكل بوصة @@ -7279,15 +7223,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} مليمتر زئبقي {0} مليمتر زئبقي - - زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - رطل لكل بوصة مربعة {0} رطل لكل بوصة مربعة @@ -7509,13 +7444,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - أونصة سائلة مترية - {0} أونصة سائلة مترية - {0} أونصة سائلة مترية - {0} أونصة سائلة مترية - {0} أونصة سائلة مترية - {0} أونصة سائلة مترية - {0} أونصة سائلة مترية + أونصة سائلة مترية + {0} أونصة سائلة مترية + {0} أونصة سائلة مترية + {0} أونصة سائلة مترية + {0} أونصة سائلة مترية + {0} أونصة سائلة مترية + {0} أونصة سائلة مترية {0} لكل غالون @@ -7611,15 +7546,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} رشّة {0} رشّة - - ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - كاتال {0} كاتال @@ -7674,15 +7600,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} سعرة-it {0} سعرة-it - - بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - زيفرت {0} زيفرت @@ -7692,15 +7609,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} زيفرت {0} زيفرت - - جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - كيلوغرام ثقلي {0} كيلوغرام ثقلي @@ -7710,33 +7618,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} كيلوغرام ثقلي {0} كيلوغرام ثقلي - - تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - - - ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - - - ضوئي - {0} ضوئي - {0} ضوئي - {0} ضوئي - {0} ضوئية - {0} ضوئي - {0} ضوئي - masculine جزء بالمليار @@ -8052,13 +7933,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} عنصر - جزء - {0} جزء - {0} جزء - جزآن - {0} أجزاء - {0} جزءًا - {0} جزء + جزء + {0} جزء + {0} جزء + جزآن + {0} أجزاء + {0} جزءًا + {0} جزء جزء/مليون @@ -8097,13 +7978,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} مول - سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري + سكّري + {0} سكّري + {0} سكّري + {0} سكّري + {0} سكّري + {0} سكّري + {0} سكّري لتر/كم @@ -9050,13 +8931,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ملم زئبقي - زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي + زئبقي + {0} زئبقي + {0} زئبقي + {0} زئبقي + {0} زئبقي + {0} زئبقي + {0} زئبقي رطل/بوصة مربعة @@ -9368,13 +9249,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} كوب متري - أونصة س مترية - {0} أونصة س مترية - {0} أونصة س مترية - {0} أونصة س مترية - {0} أونصة س مترية - {0} أونصة س مترية - {0} أونصة س مترية + أونصة س مترية + {0} أونصة س مترية + {0} أونصة س مترية + {0} أونصة س مترية + {0} أونصة س مترية + {0} أونصة س مترية + {0} أونصة س مترية فدان قدم @@ -9613,13 +9494,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} سع-it - بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل + بيكريل + {0} بيكريل + {0} بيكريل + {0} بيكريل + {0} بيكريل + {0} بيكريل + {0} بيكريل زيف @@ -9649,13 +9530,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} كغ ث - تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا + تسلا + {0} تسلا + {0} تسلا + {0} تسلا + {0} تسلا + {0} تسلا + {0} تسلا ويبر @@ -9716,12 +9597,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ رونا.{0} - {0} درجة - {0} درجة - درجتان - {0} درجات - {0} درجة - {0} درجة + ‏{0} ° + {0} °‏ + {0} °‏ + {0} °‏ + {0} °‏ + {0} °‏ د قوسية @@ -9758,15 +9639,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} عنصر {0} عنصر - - جزء - {0} جزء - {0} جزء - جزآن - {0} أجزاء - {0} جزءًا - {0} جزء - ٪ @@ -9782,15 +9654,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ؊ {0} ؊ - - سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - {0} سكّري - ل/كم {0} ل/كم @@ -10046,15 +9909,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ك واط {0} ك واط - - زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - {0} زئبقي - رطل/بوصة² @@ -10100,13 +9954,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ل - أونصة س م - {0} أونصة س م - {0} أونصة س م - {0} أونصة س م - {0} أونصة س م - {0} أونصة س م - {0} أونصة س م + أونصة س م + {0} أونصة س م + {0} أونصة س م + {0} أونصة س م + {0} أونصة س م + {0} أونصة س م + {0} أونصة س م أونصة س @@ -10151,132 +10005,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} قدح {0} قدح - - ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - {0} ستراديان - - - كات - {0} كات - {0} كات - {0} كات - {0} كات - {0} كات - {0} كات - - - كول - {0} كول - {0} كول - {0} كول - {0} كول - {0} كول - {0} كول - - - ف - {0} ف - {0} ف - {0} ف - {0} ف - {0} ف - {0} ف - - - ه - {0} ه - {0} ه - {0} ه - {0} ه - {0} ه - {0} ه - - - س - {0} س - {0} س - {0} س - {0} س - {0} س - {0} س - - - سع-it - {0} سع-it - {0} سع-it - {0} سع-it - {0} سع-it - {0} سع-it - {0} سع-it - - - بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - {0} بيكريل - - - زيف - {0} زيف - {0} زيف - {0} زيف - {0} زيف - {0} زيف - {0} زيف - - - جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - {0} جراي - - - كغ ث - {0} كغ ث - {0} كغ ث - {0} كغ ث - {0} كغ ث - {0} كغ ث - {0} كغ ث - - - تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - {0} تسلا - - - ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - {0} ويبر - - - ضوئي - {0} ضوئي - {0} ضوئي - {0} ضوئي - {0} ضوئية - {0} ضوئي - {0} ضوئي - {0} ل {0} ل diff --git a/make/data/cldr/common/main/ar_SA.xml b/make/data/cldr/common/main/ar_SA.xml index f64ae0fe86e3..6d293dd93bd8 100644 --- a/make/data/cldr/common/main/ar_SA.xml +++ b/make/data/cldr/common/main/ar_SA.xml @@ -57,6 +57,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + {0} – {1} + {0} – {1} + {0}–{1} + + + diff --git a/make/data/cldr/common/main/arn.xml b/make/data/cldr/common/main/arn.xml deleted file mode 100644 index b6071431991e..000000000000 --- a/make/data/cldr/common/main/arn.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - Mapudungun - - - - [a {ch} d e f g i k lḻ {ll} m nñṉ {ng} o p r s {sh} tṯ {tr} uü w y] - [b c h j q x z] - [A {CH} D E F G I K LḺ {LL} M NÑṈ {NG} O P R S {SH} TṮ {TR} UÜ W Y] - - diff --git a/make/data/cldr/common/main/arn_CL.xml b/make/data/cldr/common/main/arn_CL.xml deleted file mode 100644 index 108934a2154e..000000000000 --- a/make/data/cldr/common/main/arn_CL.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/as.xml b/make/data/cldr/common/main/as.xml index 9cb49f5dff35..bb8b25b58942 100644 --- a/make/data/cldr/common/main/as.xml +++ b/make/data/cldr/common/main/as.xml @@ -334,6 +334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ নাইজেৰিয়ান পিজিন পিজিন প’লিচ + পিডমণ্টিজ মালিছীট-পাছামাকু’ডী প্ৰুছিয়ান পুস্ত @@ -348,7 +349,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ৰোহিঙ্গিয়া ৰোমানচ ৰুন্দি - ৰোমানীয় + ৰোমানিয়ান মোল্ডাভিয়ান ৰোম্বো ৰাছিয়ান @@ -853,15 +854,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কেলেণ্ডাৰ মুদ্ৰা সজ্জা + চিহ্ন সজোৱা উপেক্ষা কৰা + বিপৰীত উচ্চাৰণক্ৰমে সজোৱা + বৰফলা/সৰুফলা আখৰৰ ক্ৰমবিন্যাস + সৰু আৰু বৰফলাৰ পাৰ্থক্য সজোৱা ক্ৰম + সাধাৰণভাৱে সজোৱা + সংখ্যাগতভাৱে সজোৱা + লিপি/খণ্ডৰ পুনৰ্সজ্জাকৰণ + ক্ৰমবিন্যাসৰ প্ৰবলতা মুদ্ৰা + ৰূপান্তৰৰ গন্তব্যস্থান + অভিধান অনুসৰি শব্দ-বিভাজনৰ ব্যতিক্ৰমসমূহ ইম’জীৰ উপস্থাপনা + সপ্তাহৰ প্ৰথম দিন + ঘণ্টা ঘণ্টীয়া চক্ৰ (১২ বনাম ২৪) + ইনপুট পদ্ধতি + কীব’ৰ্ড + সৰ্বোচ্চ উপেক্ষিত পংক্তি বিচ্ছেদ শৈলী শব্দৰ মাজত শাৰীৰ বিভাজন + ৰূপান্তৰৰ নিয়মসমূহ জোখ-মাখৰ প্ৰণালী + জোখ-মাখৰ একক সংখ্যা + পৰিপূৰক ডেটাৰ বাবে অঞ্চল + ৰূপান্তৰৰ উৎস + আঞ্চলিক উপ-বিভাগ ঃ + ৰূপান্তৰ কৰা + যন্ত্ৰ অনুদিত + সময় মণ্ডল + ভাষাৰ ভেৰিয়েণ্ট + ব্যক্তিগত ব্যৱহাৰ + ব্যক্তিগত ব্যৱহাৰৰ ৰূপান্তৰ বৌদ্ধ কেলেণ্ডাৰ @@ -886,9 +913,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ হিজৰি হিজৰি কেলেণ্ডাৰ (টেবুলাৰ, নাগৰিক যুগ) হিজৰি (টেবুলাৰ, নাগৰিক যুগ) + হিজৰী, ছৌদি আৰৱত চন্দ্ৰ দৰ্শন + হিজৰী (তালিকাভিত্তিক, জ্যোতিৰ্বৈজ্ঞানিক যুগ) হিজৰি কেলেণ্ডাৰ (উম অল-কুৰা) হিজৰি (উম অল-কুৰা) আই. এছ. অ’.-৮৬০১ কেলেণ্ডাৰ + গ্ৰেগ’ৰিয়ান জাপানী কেলেণ্ডাৰ জাপানী ফাৰ্চী কেলেণ্ডাৰ @@ -899,19 +929,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ গাণনিক মান্য মুদ্ৰা সজ্জা মান্য + সৰুফলা আখৰ + সৰুফলা আখৰ + বৰফলা আখৰ + সুসংগততা + অভিধান ডিফ’ল্ট ইউনিকোড সজোৱা ক্ৰম ডিফ’ল্ট ইউনিকোড + ইম’জি + ইউৰোপীয় নিয়মসমূহ টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম + ফ’নবুক + ধ্বনিগত পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম + পিনয়িন সাধাৰণ উদ্দেশ্যে সন্ধান সন্ধান + কোৰিয়ান প্ৰথম ব্যঞ্জনবৰ্ণ মান্য সজোৱা ক্ৰম মান্য স্ট্ৰোক শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম + ষ্ট্ৰ’ক পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম + পৰম্পৰাগত + ৰেডিকেল-ষ্ট্ৰ’ক + ঝুইন + মুদ্ৰা + অংকসমূহ + যতি-চিহ্ন + খালী ঠাই + চিহ্ন + আটাইবোৰ + কেৱল মূল আখৰসমূহ + মূল আখৰ, উচ্চাৰণ, আখৰৰ ফলা, প্ৰকাৰভেদ, কানা + মূল আখৰ, উচ্চাৰণ + মূল আখৰ, উচ্চাৰণ, আখৰৰ ফলা, প্ৰকাৰভেদ + পূৰ্ণ-প্ৰস্থ লৈ + অৰ্ধ-প্ৰস্থ লৈ ডিফ’ল্ট ইম’জী পাঠ্য + ১২ ঘণ্টীয়া প্ৰণালী + ১২ + ২৪ ঘণ্টীয়া প্ৰণালী + ২৪ ১২ ঘণ্টীয়া প্ৰণালী (০–১১) ১২ (০–১১) ১২ ঘণ্টীয়া প্ৰণালী (১–১২) @@ -920,6 +981,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ২৪ (০–২৩) ২৪ ঘণ্টীয়া প্ৰণালী (১–২৪) ২৪ (১–২৪) + শ্বিফ্ট স্পে’চ, যতিচিহ্ন, আটাইবোৰ চিহ্ন + শ্বিফ্ট স্পে’চ, যতিচিহ্ন + শ্বিফ্ট স্পে’চ, যতিচিহ্ন + শ্বিফ্ট স্পে’চ, যতিচিহ্ন, মুদ্ৰা নোহোৱা চিহ্নসমূহ ঢিলা পংক্তি বিচ্ছেদ শৈলী ঢিলা সাধাৰণ পংক্তি বিচ্ছেদ শৈলী @@ -930,6 +995,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আটাইবোৰ ৰাখক সাধাৰণ ব্যাক্যাংশত ৰাখক + আমেৰিকা যুক্তৰাষ্ট্ৰ বি.জি.এন. লিপ্যন্তৰকৰণ + ৰাষ্ট্ৰসংঘৰ জি.ই.জি.এন. লিপ্যন্তৰকৰণ মেট্ৰিক প্ৰণালী মেট্ৰিক ইম্পেৰিয়েল জোখ-মাখৰ প্ৰণালী @@ -938,47 +1005,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ মাৰ্কিন আৰবী-ভাৰতীয় অংক বিস্তাৰিত আৰবী-ভাৰতীয় অংক + বিস্তাৰিত আৰবী-ভাৰতীয় আৰ্মেনীয় সংখ্যা আৰ্মেনীয় সৰুফলা সংখ্যা + আৰ্মেনীয় সৰুফলা বাংলা অংক চাকমা অংক দেৱনাগৰী অংক ইথিঅ’পিক সংখ্যা + বিত্তীয় পূৰ্ণ-প্ৰস্থৰ অংক + পূৰ্ণ-প্ৰস্থ জৰ্জীয়ান সংখ্যা গ্ৰীক সংখ্যা গ্ৰীক সৰুফলা সংখ্যা + গ্ৰীক সৰুফলা গুজৰাটী অংক গুৰুমুখী অংক + পৰম্পৰাগত কেলেণ্ডাৰৰ বাবে হান-আখৰৰ মাহৰ দিন গণনা চীনা দশমিক সংখ্যা + সংখ্যা হিচাপে চীনা সংখ্যা-চিহ্ন ব্যৱহাৰ কৰা স্থানভিত্তিক দশমিক পদ্ধতি সৰলীকৃত চীনা সংখ্যা সৰলীকৃত চীনা বিত্তীয় সংখ্যা + সৰলীকৃত চীনা বিত্তীয় পৰম্পৰাগত চীনা সংখ্যা পৰম্পৰাগত চীনা বিত্তীয় সংখ্যা + পৰম্পৰাগত চীনা বিত্তীয় হিব্ৰু সংখ্যা জাভানীজ অংক জাপানী সংখ্যা জাপানী বিত্তীয় সংখ্যা + জাপানী বিত্তীয় + জাপানী বৰ্ষপঞ্জীৰ প্ৰথম বছৰৰ বাবে গাননেন গণনা খমেৰ অংক কানাড়া অংক + টাই থাম থাম (ধৰ্মীয়) লাও অংক পশ্চিমীয়া অংক + মেথামেটিকেল ব’ল্ড + মেথামেটিকেল ডাবল-ষ্ট্ৰাক + মেথামেটিকেল মন’স্পেচ + মেথামেটিকেল ছেনছ-ছেৰিফ ব’ল্ড + মেথামেটিকেল ছেনছ-ছেৰিফ মালায়ালম অংক মেইতেই মায়েক সংখ্যা ম্যানমাৰ অংক + ম্যানমাৰ ইষ্টাৰ্ন প্ব’ কাৰেন + ম্যানমাৰ পা-অ’ + ম্যানমাৰ শ্বান + ম্যানমাৰ টাই লাইং + স্থানীয় অংকসমূহ + স্থানীয় অংকসমূহ অ’ল চিকি সংখ্যা ওড়িয়া অংক + আউটলাইন কৰা ৰোমান সংখ্যা + ৰোমান বৰফলা ৰোমান সৰুফলা সংখ্যা + ৰোমান সৰুফলা + খণ্ডিত পৰম্পৰাগত তামিল সংখ্যা তামিল অংক + আধুনিক তামিল তেলুগু অংক থাই অংক তিব্বতী অংক + পৰম্পৰাগত সংখ্যা ভেই সংখ্যা ঃ ঃ + অনিৰ্দিষ্ট যান্ত্ৰিক অনুবাদ + POSIX ভেৰিয়েণ্ট + + অফ + অন + মেট্ৰিক ইউ. কে. @@ -1039,9 +1141,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} বজাত - - {1} 'at' {0} - @@ -1067,9 +1166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, B h:mm:ss E, a h:mm E, a h:mm:ss - d/M/y GGGGG - M/d - E, M/d y G y G MM-y GGGGG @@ -1081,55 +1177,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM y G - {0} – {1} - - h – h B - - - h:mm – h:mm B - h:mm – h:mm B - - - y G – y G - y – y G - - - GGGGG M/y – GGGGG M/y - GGGGG M/y – M/y - GGGGG M/y – M/y - - - GGGGG d/M/y – d/M/y - GGGGG d/M/y – GGGGG d/M/y - M/d/y – M/d/y GGGGG - GGGGG d/M/y – d/M/y - - - GGGGG E, d/M/y – E, d/M/y - GGGGG E, d/M/y – GGGGG E, d/M/y - GGGGG E, d/M/y – E, d/M/y - GGGGG E, d/M/y – E, d/M/y - - - G MMM y – G MMM y - G MMM – MMM y - G MMM y – MMM y - - - G d – d MMM, y - G d MMM, y – G d MMM, y - G d MMM – d MMM, y - G d MMM, y – d MMM, y - - - G E, d MMM – E, d MMM, y - G E, d MMM, y – G E, d MMM, y - G E, d MMM – E, d MMM, y - G E, d MMM, y – E, d MMM, y - - - MMM – MMM - + + {0} – {1} + {0}–{1} + @@ -1193,6 +1244,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ শুক্ৰ শনি + + দে + সো + ম + বু + বৃ + শু + শ + দেওবাৰ সোমবাৰ @@ -1205,24 +1265,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - দ - স + দে + সো ম - ব - ব - শ + বু + বৃ + শু শ - - ১মঃ তিঃ - ২য়ঃ তিঃ - ৩য়ঃ তিঃ - ৪ৰ্থঃ তিঃ - প্ৰথম তিনিমাহ দ্বিতীয় তিনিমাহ @@ -1262,7 +1316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - EEEE, d MMMM, y + y MMMM d, EEEE @@ -1272,7 +1326,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - dd-MM-y + y MMM d yMMdd @@ -1314,17 +1368,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - - {1} 'at' {0} - {1} {0} - - {1} 'at' {0} - @@ -1351,17 +1399,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d E a h:mm E a h:mm:ss - d/M/y GGGGG a h a h:mm a h:mm:ss a h:mm:ss v a h:mm v dd-MM - E, dd-MM - d MMM - E, d MMM d MMMM + d MMMM, E MMMMৰ সপ্তাহ W MMMMৰ সপ্তাহ W MM-y @@ -1369,120 +1414,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd-MM-y MMM y d MMM y - E, d MMM y MMMM y + d MMMM, y + d MMMM, y, E QQQ y QQQQ y Yৰ সপ্তাহ w Yৰ সপ্তাহ w - {0} – {1} - - h – h B - - - h:mm – h:mm B - h:mm – h:mm B - - - G y – y - - - GGGGG M/y – GGGGG M/y - G M/y – M/y - GGGGG M/y – M/y - - - GGGGG d/M/y – d/M/y - GGGGG d/M/y – GGGGG d/M/y - GGGGG d/M/y – d/M/y - GGGGG d/M/y – d/M/y - - - GGGGG E, d/M/y – E, d/M/y - GGGGG E, d/M/y – GGGGG E, d/M/y - GGGGG E, d/M/y – E, d/M/y - GGGGG E, d/M/y – E, d/M/y - - - G MMM y – G MMM y - G MMM – MMM y - G MMM y – MMM y - - - G d – d MMM, y - G d MMM, y – G d MMM, y - G d MMM – d MMM, y - G d MMM, y – d MMM, y - - - G E, d MMM – E, d MMM, y - G E, d MMM, y – G E, d MMM, y - G E, d MMM – E, d MMM, y - G E, d MMM, y – E, d MMM, y - - a h – a h a h–h - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm v - a h:mm–h:mm v - a h:mm–h:mm v - - - a h – a h v - a h–h v - - - dd-MM – dd-MM - dd-MM – dd-MM - E, dd-MM – E, dd-MM - E, dd-MM – E, dd-MM - - - d – d MMM - d MMM – d MMM - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - MM-y – MM-y - MM-y – MM-y - - - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y - - - dd-MM-y, E – dd-MM-y - dd-MM-y, E – dd-MM-y - dd-MM-y, E – dd-MM-y + + d–d MMMM MMM–MMM y - MMM y – MMM y d–d MMM y - d MMM y – d MMM - d MMM y – d MMM y - - - E, d MMM y – E, d MMM - E, d MMM y – E, d MMM - E, d MMM y – d MMM y MMMM–MMMM y @@ -1715,17 +1669,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} বৃহস্পতিবাৰৰ পূৰ্বে - - যোৱা বৃহস্পতি - এই বৃহস্পতি - অহা বৃহস্পতি + + যোৱা বৃহস্পতিবাৰ + এই বৃহস্পতিবাৰ + অহা বৃহস্পতিবাৰ - {0} বৃহস্পতিয়ে - {0} বৃহস্পতিয়ে + {0} বৃহস্পতিবাৰে + {0} বৃহস্পতিবাৰে - {0} বৃহস্পতিৰ পূৰ্বে - {0} বৃহস্পতিৰ পূৰ্বে + {0} বৃহস্পতিবাৰৰ পূৰ্বে + {0} বৃহস্পতিবাৰৰ পূৰ্বে @@ -1743,8 +1697,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ যোৱা শুক্ৰ - এই শুক্ৰ - অহা শুক্ৰ + এই শুক্ৰবাৰ + অহা শুক্ৰবাৰ {0} শুকুৰে {0} শুকুৰে @@ -1754,6 +1708,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} শুক্ৰৰ পূৰ্বে + + যোৱা শুক্ৰ + এই শুক্ৰবাৰ + অহা শুক্ৰবাৰ + যোৱা শনিবাৰ এই শনিবাৰ @@ -2304,9 +2263,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ লিব্ৰিভিলে - - ব্ৰিটিছ গ্ৰীষ্মকালীন সময় - লণ্ডন @@ -2397,9 +2353,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জায়াপুৰা - - আইৰিচ মান সময় - ডাবলিন @@ -3095,6 +3048,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ হাৰাৰে + + + এক্ৰেৰ সময় + এক্ৰেৰ মানক সময় + এক্ৰেৰ গ্ৰীষ্মকালীন সময় + + আফগানিস্তানৰ সময় @@ -3164,9 +3124,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - আপিয়াৰ সময় + পশ্চিম চামোয়াৰ সময় আপিয়াৰ মান সময় - আপিয়াৰ ডেলাইট সময় + পশ্চিম চামোয়াৰ ডেলাইট সময় @@ -3270,6 +3230,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ব্ৰাজিলিয়াৰ গ্ৰীষ্মকালীন সময় + + + ব্ৰিটিছ সময় + ব্ৰিটিছ গ্ৰীষ্মকালীন সময় + + ব্ৰুনেই ডাৰুছালেমৰ সময় @@ -3443,6 +3409,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ গ্ৰীণউইচ মান সময় + + + গ্ৰীণলেণ্ডৰ সময় + গ্ৰীণলেণ্ডৰ মানক সময় + গ্ৰীণলেণ্ডৰ গ্ৰীষ্মকালীন সময় + + পূব গ্ৰীণলেণ্ডৰ সময় @@ -3469,7 +3442,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - হাৱাই-এলিউশ্বনৰ মান সময় + হাৱাই-এলিউশ্বনৰ মানক সময় @@ -3533,6 +3506,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইৰানৰ ডেলাইট সময় + + + আইৰিচ সময় + আইৰিচ মান সময় + + ইৰ্কুটস্কৰ সময় @@ -3554,6 +3533,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জাপানৰ ডেলাইট সময় + + + কামচাটকাৰ সময় + কামচাটকাৰ মানক সময় + কামচাটকাৰ গ্ৰীষ্মকালীন সময় + + কাজাখস্তানৰ সময় @@ -3816,11 +3802,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ছাখালিনৰ গ্ৰীষ্মকালীন সময় + + + ছামাৰাৰ সময় + ছামাৰাৰ মানক সময় + ছামাৰাৰ গ্ৰীষ্মকালীন সময় + + - ছামোৱাৰ সময় ছামোৱাৰ মান সময় - ছামোৱাৰ ডেলাইট সময় @@ -3887,6 +3878,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ চ্চুকৰ সময় + + + তুৰ্কীয়েৰ সময় + তুৰ্কীয়েৰ মানক সময় + তুৰ্কীয়েৰ গ্ৰীষ্মকালীন সময় + + তুৰ্কমেনিস্তানৰ সময় @@ -3906,6 +3904,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ উৰুগুৱেৰ গ্ৰীষ্মকালীন সময় + + + উৰুমচিৰ সময় + + উজবেকিস্তানৰ সময় @@ -4034,7 +4037,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 00 নিযুত 0 নিঃ 0 নিঃ - 0 শঃ কোঃ + 0 শঃকোঃ 0 শঃ কোঃ 00 শঃ কোঃ 00 শঃ কোঃ @@ -4044,14 +4047,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 শঃ পঃ 00 শঃ পঃ 00 শঃ পঃ - 000 শঃ পঃ + 000 শঃপঃ 000 শঃ পঃ - - never - @@ -4600,8 +4600,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কেৰিবীয়ান গিল্ডাৰ - কেৰিবীয়ান গিল্ডাৰ - কেৰিবীয়ান গিল্ডাৰ পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক @@ -4625,8 +4623,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জিম্বাৱীয় সোণ - জিম্বাৱীয় সোণ - জিম্বাৱীয় সোণ @@ -4635,7 +4631,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আপুনি তাত {0} দিন আছিল, আপোনাৰ দিনটো কেনে আছিল? আপুনি তাত {0} দিন আছিল, আপোনাৰ দিনবোৰ কেনে আছিল? - সোঁফালে {0}ৰ্থ পাক লওক৷ + {0}ম সোঁফালটো লওক। + {0}য় সোঁফালটো লওক। + {0}ৰ্থ সোঁফালটো লওক। + অধিক + {0}ষ্ঠ সোঁফালটো লওক। @@ -4758,6 +4758,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড {0} মিটাৰ প্ৰতি বৰ্গ ছেকেণ্ড + + {0} ৰে. + {0} ৰে. + {0} বৰ্গ কিলোমিটাৰ {0} বৰ্গ কিলোমিটাৰ @@ -4799,11 +4803,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আইটেমসমূহ - - অংশ - {0} অংশ - {0} অংশ - প্ৰতি মিলিয়নত ভাগ প্ৰতি মিলিয়নত {0} ভাগ @@ -5002,8 +5001,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ প্ৰতি চেণ্টিমিটাৰত পিক্সেল - {0} পিপিচিএম - প্ৰতি চেণ্টিমিটাৰত {0} পিক্সেল প্ৰতি ইঞ্চিত পিক্সেল @@ -5186,11 +5183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} মিলিমিটাৰ মাৰ্কিউৰী {0} মিলিমিটাৰ মাৰ্কিউৰী - - মাৰ্কিঃ - {0} মাৰ্কিঃ - {0} মাৰ্কিঃ - প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড {0} প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড @@ -5208,8 +5200,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ বতৰ - {0} বতৰ - {0} atm পাস্কেল @@ -5223,8 +5213,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কিল’পাস্কেল - {0} কিল’পাস্কেল - {0} কি. পা. {0} মেগাপাস্কেল @@ -5344,7 +5332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} মেট্ৰিক কাপ - ফ্লুঃ আঃ মেঃ {0} ফ্লুঃ আঃ মেঃ {0}ফ্লুঃ আঃ মেঃ @@ -5406,13 +5393,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কাটাল - {0} কাটাঃ - {0} কাটাঃ কুলম্ব - {0} কুঃ - {0} কুঃ ফাৰাড @@ -5426,11 +5409,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ছিয়েমেন - {0} ছিয়েঃ - {0} ছিয়েঃ - কেল’ৰি-আইটি {0}কেল-আইটি {0} কেল-আইটি @@ -5441,28 +5421,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ চিয়েভাৰ্ট - {0} এচভিঃ - {0} এচভিঃ - গ্ৰে {0} গ্ৰে {0} গ্ৰে কিলোগ্ৰাম-বল - {0} কিঃগ্ৰাঃবঃ - {0} কিঃগ্ৰাঃবঃ টেচলা - {0} টেঃ - {0} টেঃ ৱেবাৰ - {0} ৱেঃ - {0} ৱেঃ প্ৰতি বিলিয়নত অংশ @@ -5586,8 +5557,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ৰেডিয়েন - {0} ৰেডিয়েন - {0} ৰেডিয়েন + {0} ৰে. + {0} ৰে. ডিগ্ৰী @@ -5813,8 +5784,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ছেকেণ্ড - {0} ছেকেণ্ড - {0} ছেকেণ্ড + {0} ছে. + {0} ছে. {0}/ছেকেণ্ড @@ -6085,8 +6056,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কিঃ গ্ৰাঃ - {0} কিঃ গ্ৰাঃ - {0} কিঃ গ্ৰাঃ + {0} কিগ্ৰা + {0} কিগ্ৰা {0}/কিঃ গ্ৰাঃ @@ -6139,8 +6110,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ডলট’ন - {0} ডলট’ন - {0} ডলট’ন + {0} ড.ট’. + {0} ড.ট’. আৰ্থ মাছ @@ -6244,9 +6215,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}°ফা. - কেলভিন - {0} কেলভিন - {0} কেলভিন + কে. + {0} কে. + {0} কে. নি. মি. @@ -6486,21 +6457,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ডেচি{0} - - - চেণ্টি{0} - - - মিলি{0} - - - নেনো{0} - - - পিকো{0} - ফেমটো{0} @@ -6516,24 +6472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ডেকা{0} - - হেক্টো{0} - - - কিলো{0} - - - মেগা{0} - - - গিগা{0} - - - টেৰা{0} - - - পেটা{0} - এক্সা{0} @@ -6558,12 +6496,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ য়ো{0} + + ৰে. + {0} ৰে. + {0} ৰে. + {0}° {0}° - আঃ মিঃ {0}′ {0}′ @@ -6571,11 +6513,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}″ {0}″ - - অংশ - {0} অংশ - {0} অংশ - ppm {0}ppm @@ -6590,14 +6527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - গ্লুঃ - {0} গ্লুঃ - {0} গ্লুঃ - - - ল/১০০ ক.ম. - {0}mpg {0}mpg @@ -6645,6 +6574,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}কো {0}কো + + {0} ছে. + {0} ছে. + {0}কেলৰি {0}কেলৰি @@ -6688,14 +6621,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ L☉ - - {0} মিঃমিঃমাৰ্কিঃ - {0}মিঃমিঃমাৰ্কিঃ + + {0} কিগ্ৰা + {0} কিগ্ৰা - - মাৰ্কিঃ - {0} মাৰ্কিঃ - {0} মাৰ্কিঃ + + {0} ড.ট’. + {0} ড.ট’. ″ Hg @@ -6722,10 +6654,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}° {0}° - - ফ্লুঃ আঃ মেঃ - {0}ফ্লুঃ আঃ মেঃ - {0} ফ্লুঃ আঃ মেঃ + + কে. + {0} কে. + {0} কে. {0}টিস্পুন @@ -6740,71 +6672,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dsp-Imp {0}dsp-Imp - - ষ্টেৰাঃ - {0} ষ্টেৰাঃ - {0}ষ্টেৰাঃ - - - কাটাঃ - {0} কাটাঃ - {0} কাটাঃ - - - কুঃ - {0} কুঃ - {0} কুঃ - - - ফাঃ - {0} ফাঃ - {0} ফাঃ - - - হেনঃ - {0} হেনঃ - {0} হেনঃ - - - ছিয়েঃ - {0} ছিয়েঃ - {0} ছিয়েঃ - - - কেল’ৰি-আইটি - {0} কেল-আইটি - {0} কেল-আইটি - - - বেঃ - {0}বেঃ - {0}বেঃ - - - এচভিঃ - {0} এচভিঃ - {0} এচভিঃ - - গ্ৰে {0} গ্ৰে {0}গ্ৰে - - কিঃগ্ৰাঃবঃ - {0} কিঃগ্ৰাঃবঃ - {0} কিঃগ্ৰাঃবঃ - - - টেঃ - {0} টেঃ - {0} টেঃ - - - ৱেঃ - {0} ৱেঃ - {0} ৱেঃ - {0}আলোক {0}আলোক @@ -7020,7 +6891,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ und as ko si ta te vi yue zh - informal {given} {given2} {surname} {credentials} @@ -7108,12 +6978,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {surname} {given-initial} {given2-initial} - - {surname} {given-initial} - - - {title} {surname} - {given-informal} diff --git a/make/data/cldr/common/main/ast.xml b/make/data/cldr/common/main/ast.xml index 140ce1855850..1d9cac7e01e9 100644 --- a/make/data/cldr/common/main/ast.xml +++ b/make/data/cldr/common/main/ast.xml @@ -1212,6 +1212,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic orde de clasificación tradicional orde de clasificación por radical y trazu orde de clasificación zhuyin + sistema de 12 hores + sistema de 24 hores sistema de 12 hores (0–11) sistema de 12 hores (1–12) sistema de 24 hores (0–23) @@ -2160,6 +2162,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'selmana' w 'de' Y + + {0} – {1} + {0} – {1} + {0} – {1} + d – d @@ -2384,492 +2391,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Taika (645–650) - Hakuchi (650–671) - Hakuhō (672–686) - Shuchō (686–701) - Taihō (701–704) - Keiun (704–708) - Wadō (708–715) - Reiki (715–717) - Yōrō (717–724) - Jinki (724–729) - Tenpyō (729–749) - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Hōki (770–780) - Ten-ō (781-782) - Enryaku (782–806) - Daidō (806–810) - Kōnin (810–824) - Tenchō (824–834) - Jōwa (834–848) - Kajō (848–851) - Ninju (851–854) - Saikō (854–857) - Ten-an (857-859) - Jōgan (859–877) - Gangyō (877–885) - Ninna (885–889) - Kanpyō (889–898) - Shōtai (898–901) - Engi (901–923) - Enchō (923–931) - Jōhei (931–938) - Tengyō (938–947) - Tenryaku (947–957) - Tentoku (957–961) - Ōwa (961–964) - Kōhō (964–968) - Anna (968–970) - Tenroku (970–973) - Ten’en (973–976) - Jōgen (976–978) - Tengen (978–983) - Eikan (983–985) - Kanna (985–987) - Eien (987–989) - Eiso (989–990) - Shōryaku (990–995) - Chōtoku (995–999) - Chōhō (999–1004) - Kankō (1004–1012) - Chōwa (1012–1017) - Kannin (1017–1021) - Jian (1021–1024) - Manju (1024–1028) - Chōgen (1028–1037) - Chōryaku (1037–1040) - Chōkyū (1040–1044) - Kantoku (1044–1046) - Eishō (1046–1053) - Tengi (1053–1058) - Kōhei (1058–1065) - Jiryaku (1065–1069) - Enkyū (1069–1074) - Shōho (1074–1077) - Shōryaku (1077–1081) - Eihō (1081–1084) - Ōtoku (1084–1087) - Kanji (1087–1094) - Kahō (1094–1096) - Eichō (1096–1097) - Jōtoku (1097–1099) - Kōwa (1099–1104) - Chōji (1104–1106) - Kashō (1106–1108) - Tennin (1108–1110) - Ten-ei (1110-1113) - Eikyū (1113–1118) - Gen’ei (1118–1120) - Hōan (1120–1124) - Tenji (1124–1126) - Daiji (1126–1131) - Tenshō (1131–1132) - Chōshō (1132–1135) - Hōen (1135–1141) - Eiji (1141–1142) - Kōji (1142–1144) - Ten’yō (1144–1145) - Kyūan (1145–1151) - Ninpei (1151–1154) - Kyūju (1154–1156) - Hōgen (1156–1159) - Heiji (1159–1160) - Eiryaku (1160–1161) - Ōho (1161–1163) - Chōkan (1163–1165) - Eiman (1165–1166) - Nin’an (1166–1169) - Kaō (1169–1171) - Shōan (1171–1175) - Angen (1175–1177) - Jishō (1177–1181) - Yōwa (1181–1182) - Juei (1182–1184) - Genryaku (1184–1185) - Bunji (1185–1190) - Kenkyū (1190–1199) - Shōji (1199–1201) - Kennin (1201–1204) - Genkyū (1204–1206) - Ken’ei (1206–1207) - Jōgen (1207–1211) - Kenryaku (1211–1213) - Kenpō (1213–1219) - Jōkyū (1219–1222) - Jōō (1222–1224) - Gennin (1224–1225) - Karoku (1225–1227) - Antei (1227–1229) - Kanki (1229–1232) - Jōei (1232–1233) - Tenpuku (1233–1234) - Bunryaku (1234–1235) - Katei (1235–1238) - Ryakunin (1238–1239) - En-ō (1239-1240) - Ninji (1240–1243) - Kangen (1243–1247) - Hōji (1247–1249) - Kenchō (1249–1256) - Kōgen (1256–1257) - Shōka (1257–1259) - Shōgen (1259–1260) - Bun’ō (1260–1261) - Kōchō (1261–1264) - Bun’ei (1264–1275) - Kenji (1275–1278) - Kōan (1278–1288) - Shōō (1288–1293) - Einin (1293–1299) - Shōan (1299–1302) - Kengen (1302–1303) - Kagen (1303–1306) - Tokuji (1306–1308) - Enkyō (1308–1311) - Ōchō (1311–1312) - Shōwa (1312–1317) - Bunpō (1317–1319) - Genō (1319–1321) - Genkō (1321–1324) - Shōchū (1324–1326) - Karyaku (1326–1329) - Gentoku (1329–1331) - Genkō (1331–1334) - Kenmu (1334–1336) - Engen (1336–1340) - Kōkoku (1340–1346) - Shōhei (1346–1370) - Kentoku (1370–1372) - Bunchū (1372–1375) - Tenju (1375–1379) - Kōryaku (1379–1381) - Kōwa (1381–1384) - Genchū (1384–1392) - Meitoku (1384–1387) - Kakei (1387–1389) - Kōō (1389–1390) - Meitoku (1390–1394) - Ōei (1394–1428) - Shōchō (1428–1429) - Eikyō (1429–1441) - Kakitsu (1441–1444) - Bun’an (1444–1449) - Hōtoku (1449–1452) - Kyōtoku (1452–1455) - Kōshō (1455–1457) - Chōroku (1457–1460) - Kanshō (1460–1466) - Bunshō (1466–1467) - Ōnin (1467–1469) - Bunmei (1469–1487) - Chōkyō (1487–1489) - Entoku (1489–1492) - Meiō (1492–1501) - Bunki (1501–1504) - Eishō (1504–1521) - Taiei (1521–1528) - Kyōroku (1528–1532) - Tenbun (1532–1555) - Kōji (1555–1558) - Eiroku (1558–1570) - Genki (1570–1573) - Tenshō (1573–1592) - Bunroku (1592–1596) - Keichō (1596–1615) - Genna (1615–1624) - Kan’ei (1624–1644) - Shōho (1644–1648) - Keian (1648–1652) - Jōō (1652–1655) - Meireki (1655–1658) - Manji (1658–1661) - Kanbun (1661–1673) - Enpō (1673–1681) - Tenna (1681–1684) - Jōkyō (1684–1688) - Genroku (1688–1704) - Hōei (1704–1711) - Shōtoku (1711–1716) - Kyōhō (1716–1736) - Genbun (1736–1741) - Kanpō (1741–1744) - Enkyō (1744–1748) - Kan’en (1748–1751) - Hōreki (1751–1764) - Meiwa (1764–1772) - An’ei (1772–1781) - Tenmei (1781–1789) - Kansei (1789–1801) - Kyōwa (1801–1804) - Bunka (1804–1818) - Bunsei (1818–1830) - Tenpō (1830–1844) - Kōka (1844–1848) - Kaei (1848–1854) - Ansei (1854–1860) - Man’en (1860–1861) - Bunkyū (1861–1864) - Genji (1864–1865) - Keiō (1865–1868) era Shōwa - Taika - Hakuchi - Hakuhō - Shuchō - Taihō - Keiun - Wadō - Reiki - Yōrō - Jinki - Tenpyō - T.-kampō - T.-shōhō - T.-hōji - T.-jingo - J.-keiun - Hōki - Ten-ō - Enryaku - Daidō - Kōnin - Tenchō - Jōwa - Kajō - Ninju - Saikō - Ten-an - Jōgan - Gangyō - Ninna - Kanpyō - Shōtai - Engi - Enchō - Jōhei - Tengyō - Tenryaku - Tentoku - Ōwa - Kōhō - Anna - Tenroku - Ten’en - Jōgen - Tengen - Eikan - Kanna - Eien - Eiso - Shōryaku - Chōtoku - Chōhō - Kankō - Chōwa - Kannin - Jian - Manju - Chōgen - Chōryaku - Chōkyū - Kantoku - Eishō - Tengi - Kōhei - Jiryaku - Enkyū - Shōho - Shōryaku II - Eihō - Ōtoku - Kanji - Kahō - Eichō - Jōtoku - Kōwa - Chōji - Kashō - Tennin - Ten-ei - Eikyū - Gen’ei - Hōan - Tenji - Daiji - Tenshō - Chōshō - Hōen - Eiji - Kōji - Ten’yō - Kyūan - Ninpei - Kyūju - Hōgen - Heiji - Eiryaku - Ōho - Chōkan - Eiman - Nin’an - Kaō - Shōan - Angen - Jishō - Yōwa - Juei - Genryaku - Bunji - Kenkyū - Shōji - Kennin - Genkyū - Ken’ei - Jōgen II - Kenryaku - Kenpō - Jōkyū - Jōō - Gennin - Karoku - Antei - Kanki - Jōei - Tenpuku - Bunryaku - Katei - Ryakunin - En’ō - Ninji - Kangen - Hōji - Kenchō - Kōgen - Shōka - Shōgen - Bun’ō - Kōchō - Bun’ei - Kenji - Kōan - Shōō - Einin - Shōan II - Kengen - Kagen - Tokuji - Enkyō - Ōchō - Shōwa - Bunpō - Genō - Genkō - Shōchū - Karyaku - Gentoku - Genkō II - Kenmu - Engen - Kōkoku - Shōhei - Kentoku - Bunchū - Tenju - Kōryaku - Kōwa II - Genchū - Meitoku - Kakei - Kōō - Meitoku II - Ōei - Shōchō - Eikyō - Kakitsu - Bun’an - Hōtoku - Kyōtoku - Kōshō - Chōroku - Kanshō - Bunshō - Ōnin - Bunmei - Chōkyō - Entoku - Meiō - Bunki - Eishō II - Taiei - Kyōroku - Tenbun - Kōji II - Eiroku - Genki - Tenshō II - Bunroku - Keichō - Genna - Kan’ei - Shōho II - Keian - Jōō II - Meireki - Manji - Kanbun - Enpō - Tenna - Jōkyō - Genroku - Hōei - Shōtoku - Kyōhō - Genbun - Kanpō - Enkyō II - Kan’en - Hōreki - Meiwa - An’ei - Tenmei - Kansei - Kyōwa - Bunka - Bunsei - Tenpō - Kōka - Kaei - Ansei - Man’en - Bunkyū - Genji - Keiō e. Shōwa - - Taika - Tenpyō - T. kampō - T. shōhō - T. hōji - T. jingo - Saikō - Ten-an - Jōgan - Gangyō - Kanpyō - Jōhei - Tenryaku - Eien - Eihō - @@ -3467,9 +2993,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic París - - Hora braniega británica - Londres @@ -3500,9 +3023,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Xayapura - - Hora estándar irlandesa - Dublín @@ -3753,18 +3273,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar d’Alaska Hora braniega d’Alaska - - AKT - AKST - AKDT - - - - - Hora d’Almaty - hora estándar d’Almaty - hora braniega d’Almaty - @@ -3779,11 +3287,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar central norteamericana Hora braniega central norteamericana - - CT - CST - CDT - @@ -3791,11 +3294,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar del este norteamericanu Hora braniega del este norteamericanu - - ET - EST - EDT - @@ -3803,11 +3301,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar de les montañes norteamericanes Hora braniega de les montañes norteamericanes - - MT - MST - MDT - @@ -3815,11 +3308,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar del Pacíficu norteamericanu Hora braniega del Pacíficu norteamericanu - - PT - PST - PDT - @@ -3835,20 +3323,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega d’Apia - - - Hora d’Aqtau - Hora estándar d’Aqtau - Hora braniega d’Aqtau - - - - - Hora d’Aqtobe - Hora estándar d’Aqtobe - Hora braniega d’Aqtobe - - Hora d’Arabia @@ -3883,11 +3357,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar del Atlánticu Hora braniega del Atlánticu - - AT - AST - ADT - @@ -3955,6 +3424,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega de Brasilia + + + Hora braniega británica + + Hora de Brunéi Darussalam @@ -4165,11 +3639,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega de Groenlandia occidental - - - Hora estándar de Guam - - Hora estándar del Golfu @@ -4191,11 +3660,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora estándar de Hawaii-Aleutianes Hora braniega de Hawaii-Aleutianes - - HAT - HAST - HADT - @@ -4248,6 +3712,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega d’Irán + + + Hora estándar irlandesa + + Hora d’Irkutsk @@ -4310,11 +3779,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora del Kirguistán - - - Hora de Lanka - - Hora de les Islles Line @@ -4327,13 +3791,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega de Lord Howe - - - Hora de Macáu - Hora estándar de Macáu - Hora braniega de Macáu - - Hora de Magadán @@ -4449,11 +3906,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora braniega de Fernando de Noronha - - - Hora de les Islles Marianes del Norte - - Hora de Novosibirsk @@ -4533,13 +3985,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de Pyongyang - - - Hora de Qyzylorda - Hora estándar de Qyzylorda - Hora braniega de Qyzylorda - - Hora de Reunión @@ -4566,9 +4011,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hora de Samoa Hora estándar de Samoa - Hora braniega de Samoa @@ -5114,11 +4557,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic pesu chilenu pesos chilenos - - Dólar del Bancu Popular Chinu - dólar del Bancu Popular Chinu - dólares del Bancu Popular Chinu - Yuan chinu yuan chinu diff --git a/make/data/cldr/common/main/az.xml b/make/data/cldr/common/main/az.xml index 099c5bba4fc6..930b69733085 100644 --- a/make/data/cldr/common/main/az.xml +++ b/make/data/cldr/common/main/az.xml @@ -124,6 +124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ taita alman Avstriya almancası + İsveçrə yüksək almancası delaver slavey doqrib @@ -211,6 +212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ivrit hind Hindi (latın) + Hinqliş hiliqaynon hittit monq @@ -416,6 +418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pali picin polyak + Pyemont ponpey malesit-passamakvodi pruss @@ -588,7 +591,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -629,9 +632,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + @@ -1039,15 +1042,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Təqvim Valyuta Formatı + Simvol çeşidlənməsini iqnor edin + Tərs vurğulu çeşidləmə + Böyük/kiçik hərflərlə sıralama + Hərf ölçüsünə həssas çeşidləmə Sıralama + Normallaşdırılmış çeşidləmə + Rəqəmsal çeşidləmə + Skript/blok təkrar sıralanması + Çeşidləmə gücü Valyuta + Təyinatın transformasiyası + Sözlüyün pozulması istisnaları Emojilərin təqdim edilməsi + Həftənin ilk günü + Qarışıq Saat Sikli (12 / 24) + Daxiletmə metodu + Klaviatura + Ən yüksək dərəcəli iqnor Sətirdən sətrə keçirmə üslubu Sözlərin bölünərək sətirdən-sətrə keçirilməsi + Transformasiya qaydaları Ölçü Sistemi + Ölçü vahidi Rəqəmlər + Əlavə məlumat üçün yer + Mənbə çevrilməsi + Regional alt bölmə Abreviaturadan sonra cümlə kəsintisi + Transformasiya + Maşın tərcüməsi + Saat qurşağı + Yerli variant + Şəxsi istifadə + Şəxsi istifadə transformasiyası Buddist təqvimi @@ -1067,15 +1096,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yəhudi Təqvimi Yəhudi Hindi təqvimi + Hind milli Hicri təqvimi Hicri Hicri təqvimi (tabulyar, vətəndaşlıq dövrü) Hicri (cədvəl, mülki dövr) + Hicri, Səudiyyə Ərəbistanının müşahidəsi Hicri təqvim (tabulyar, astromonik dövr) Hicri (cədvəl, astronomik dövr) Hicri təqvim (Umm əl-Qura) Hicri (Umm əl-Qura) ISO-8601 Təqvimi + Qreqorian Yapon Təqvimi Yapon İran Təqvimi @@ -1086,16 +1118,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Valyuta formatı: Uçot Standart Valyuta Formatı Valyuta formatı: Standart + Kiçik hərflər + Kiçik hərflər + Böyük hərflər + Uyğunluq + Sözlük Standart Unicode Sıralama Defolt unikod + Emoji + Avropa qaydaları + Telefon bloknotu + Fonetik Pinyin təqvimi + Pinyin Ümumi Məqsədli Axtarış Axtarış + Koreya başlanğıc samiti Standart Sıralama Standart + Ştrix + Ənənəvi + Radikal ştrix + Cuyin + Valyuta + Rəqəmlər + Punktuasiya + Boşluq + İşarə + Hamısı + Yalnız təməl hərflər + Təməl, vurğular, korpus, variantlar, kana + Təməl, vurğular + Təməl, vurğular, korpus, variantlar + Tam eninə + Yarım eninə Emojilərin təqdim edilməsi: Standart Emoji Mətn + 12 Saatlıq Sistem + 12 + 24 Saatlıq Sistem + 24 12 Saatlıq Sistem (0–11) 12 (0–11) 12 Saatlıq Sistem (0–12) @@ -1104,6 +1167,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 Saatlıq Sistem (0–23) 24 (1–24) + Boşluqları, punktuasiyanı, bütün işarələri dəyişin + Boşluqları, punktuasiyanı dəyişin + Boşluqları, punktuasiyanı dəyişin + Boşluqları, punktuasiyanı, valyuta olmayan işarələri dəyişin Sərbəst sətirdən sətrə keçirmə üslubu Sərbəst Normal sətirdən sətrə keçirmə üslubu @@ -1114,6 +1181,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hamısını saxla Normal İfadələrdə saxla + US BGN transliterasiyası + UN GEGN transliterasiyası Metrik Sistem Metrik İmperial Ölçü Sistemi @@ -1122,47 +1191,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Birləşmiş Ştatlar Ərəb-Hind Rəqəmləri Genişlənmiş Ərəb-Hind Rəqəmləri + Genişləndirilmiş ərəb-hind Erməni Rəqəmləri Kiçik Erməni Rəqəmləri + Erməni kiçik hərfləri Benqal Rəqəmləri Çakma rəqəmləri Devanaqari Rəqəmləri Efiop Rəqəmləri + Maliyyə Tam Geniş Rəqəmlər + Tam geniş Gürcü Rəqəmləri Yunan Rəqəmləri Kiçik Yunan Rəqəmləri + Yunan kiçik hərfləri Qucarat Rəqəmləri Qurmuxi Rəqəmləri + Ənənəvi təqvimlər üçün ay günlərinin han hərfləri ilə nömrələnməsi Onluq Çin Rəqəmləri + Çin rəqəm ideoqraflarından rəqəm kimi istifadə edən mövqeli onluq sistem Sadələşmiş Çin Rəqəmləri Sadələşmiş Çin Maliyyə Rəqəmləri + Sadələşdirilmiş Çin maliyyə Ənənəvi Çin Rəqəmləri Ənənəvi Çin Maliyyə Rəqəmləri + Ənənəvi Çin maliyyə İvrit Rəqəmləri Cava rəqəmləri Yapon Rəqəmləri Yapon Maliyyə Rəqəmləri + Yapon maliyyə + Yapon birinci il Gannen nömrələməsi Kxmer Rəqəmləri Kannada Rəqəmləri + Tai Tham Tham (ekkleziastik) Lao Rəqəmləri Qərb Rəqəmləri + Riyazi qalınlıq + Riyazi ikiqat zərbə + Riyazi monoboşluq + Riyazi sans-serif qalın + Riyazi sans-serif Malayalam Rəqəmləri Mitei Mayek rəqəmləri Myanma Rəqəmləri + Myanma Şərqi Puo Karen + Myanma Pao + Myanma Şan + Myanma Tay Lainq + Yerli Rəqəmlər + Yerli rəqəmlər Ol Çiki rəqəmləri Oriya Rəqəmləri + Konturlanmış Rum Rəqəmləri + Roma böyük hərfləri Kiçik Rum Rəqəmləri + Roma kiçik hərfləri + Seqmentli Ənənəvi Tamil Rəqəmləri Tamil Rəqəmləri + Modern tamil Teluqu Rəqəmləri Tay Rəqəmləri Tibet Rəqəmləri + Ənənəvi rəqəmlər Vai rəqəmləri Deaktiv Aktiv + Qeyri-müəyyən maşın tərcüməsi + POSIX variantı + + Deaktiv + Aktiv + Metrik Britaniya @@ -1196,7 +1300,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G d MMMM y, EEEE + G EEEE, d MMMM y @@ -1249,23 +1353,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + B h + B h:mm + B h:mm:ss + E B h + E B h:mm + E B h:mm:ss + E, d E h:mm a E h:mm:ss a G MM/y GGGGG d M y - G dd/MM/y, E + G E, dd/MM/y G MMM y G d MMM y - G d MMM y, E + G E, d MMM y h:mm a h:mm:ss a dd.MM - dd.MM, E + E, dd.MM d MMM - d MMM, E + E, d MMM + d MMMM GGGGG MM y GGGGG dd.MM.y - GGGGG dd.MM.y, E + GGGGG E, dd.MM.y G MMM y G d MMM y G d MMM y, E @@ -1282,21 +1394,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h:mm – h:mm - GGGGG MM/y– GGGGG MM/y - GGGGG MM/y – MM/y - GGGGG MM/y – MM/y + G M/y – G M/y + G M/y – M/y + G M/y – M/y - GGGGG dd/MM/y – dd/MM/y - GGGGG dd/MM/y – GGGGG dd/MM/y - GGGGG dd/MM/y – dd/MM/y - GGGGG dd/MM/y – dd/MM/y + G d/M/y – d/M/y + G d/M/y – G d/M/y + G d/M/y – d/M/y + G d/M/y – d/M/y - GGGGG dd/MM/y, E – dd/MM/y, E - GGGGG dd/MM/y, E – GGGGG dd/MM/y, E - GGGGG dd/MM/y, E – dd/MM/y, E - GGGGG dd/MM/y, E – dd/MM/y, E + G E, d/M/y – E, d/M/y + G E, d/M/y – G E, d/M/y + G E, d/M/y – E, d/M/y + G E, d/M/y – E, d/M/y G MMM y – G MMM y @@ -1310,10 +1422,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G d MMM y – d MMM y - G d MMM, E – d MMM y, E - G d MMM y, E – G d MMM y, E - G d MMM, E – d MMM y, E - G d MMM y, E – d MMM y, E + G E, d MMM – E, d MMM y + G E, d MMM y – G E, d MMM y + G E, d MMM – E, d MMM y + G E, d MMM y – E, d MMM y h:mm a – h:mm a @@ -1325,47 +1437,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm–h:mm a v h:mm–h:mm a v + + M – M + dd.MM – dd.MM - dd.MM – dd.MM + d/M – d/M - dd.MM, E – dd.MM, E - dd.MM, E – dd.MM, E + E, d/M – E, d/M + E, d/M – E, d/M + + + MMM – MMM d – d MMM + d MMM – d MMM + + + E, d MMM – E, d MMM + E, d MMM – E, d MMM + + + d–d MMMM + d MMMM – d MMMM - GGGGG MM/y – MM/y - GGGGG MM/y – MM/y + G M/y – M/y + G M/y – M/y - GGGGG dd/MM/y – dd/MM/y - GGGGG dd/MM/y – dd/MM/y - GGGGG dd/MM/y – dd/MM/y + G d/M/y – d/M/y + G d/M/y – d/M/y + G d/M/y – d/M/y - GGGGG dd/MM/y , E – dd/MM/y, E - GGGGG dd/MM/y , E – dd/MM/y, E - GGGGG dd/MM/y , E – dd/MM/y, E + G E, d/M/y – E, d/M/y + G E, d/M/y – E, d/M/y + G E, d/M/y – E, d/M/y G MMM–MMM y G MMM y – MMM y - G MMM d – d, y - G MMM d – MMM d, y + G d – d MMM y + G d MMM – d MMM y G d MMM y – d MMM y - G d MMM y, E – d MMM, E - G d MMM y, E – d MMM, E + G E, d MMM y – E, d MMM + G E, d MMM – E, d MMM y G d MMM y, E – d MMM y, E - G MMMM y –MMMM + G MMMM –MMMM y G MMMM y – MMMM y @@ -1388,6 +1515,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ noy dek + + 01 + 02 + 03 + 04 + 05 + 06 + 07 + 08 + 09 + o + n + d + yanvar fevral @@ -1403,6 +1544,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dekabr + + + y + f + m + a + m + i + i + a + s + o + n + d + + @@ -1425,13 +1582,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ş. - bazar - bazar ertəsi - çərşənbə axşamı - çərşənbə - cümə axşamı - cümə - şənbə + Bazar + Bazar ertəsi + Çərşənbə axşamı + Çərşənbə + Cümə axşamı + Cümə + Şənbə @@ -1464,10 +1621,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 4-cü kv. - 1-ci kvartal - 2-ci kvartal - 3-cü kvartal - 4-cü kvartal + 1-ci rüb + 2-ci rüb + 3-cü rüb + 4-cü rüb + + + + + 1-ci rüb + 2-ci rüb + 3-cü kv. + 4-cü kv. + + + 1-ci rüb + 2-ci rüb + 3-cü rüb + 4-cü rüb @@ -1501,20 +1672,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ eramızdan əvvəl bizim eradan əvvəl - yeni era + bizim era bizim era e.ə. b.e.ə. - y.e. - b.e. + b.e. - d MMMM y, EEEE + EEEE, d MMMM y @@ -1557,6 +1727,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1605,6 +1778,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h B h:mm B h:mm:ss + E B h E B h:mm E B h:mm:ss d E @@ -1615,27 +1789,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G d M y, E G MMM y G d MMM y - G d MMM y, E + G E, d MMM y + G MMMM y + G d MMMM y + G E, d MMMM y h:mm a h:mm:ss a h:mm:ss a v h:mm a v dd.MM - dd.MM, E + E, dd.MM d MMM - d MMM, E + E, d MMM d MMMM - MMMM, W 'həftə' - MMMM, W 'həftə' + E, d MMMM + MMMM, 'həftə' W + MMMM, 'həftə' W MM.y dd.MM.y dd.MM.y, E MMM y d MMM y - d MMM y, E + E, d MMM y MMMM y - Y, w 'həftə' - Y, w 'həftə' + d MMMM y + E, d MMMM y + Y, 'həftə' w + Y, 'həftə' w @@ -1648,21 +1828,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h:mm–h:mm - GGGGG MM.y – GGGGG MM.y - GGGGG MM.y – MM.y - GGGGG MM.y – MM.y + G M/y – G M/y + G M/y – M/y + G M/y – M/y - GGGGG dd.MM.y – dd.MM.y - GGGGG dd.MM.y – GGGGG dd.MM.y - GGGGG dd.MM.y – dd.MM.y - GGGGG dd.MM.y – dd.MM.y + G d/M/y – d/M/y + G d/M/y – G d/M/y + G d/M/y – d/M/y + G d/M/y – d/M/y - GGGGG dd.MM.y, E – dd.MM.y, E - GGGGG dd.MM.y, E – GGGGG dd.MM.y, E - GGGGG dd.MM.y, E – dd.MM.y, E - GGGGG dd.MM.y, E – dd.MM.y, E + G E, d/M/y – E, d/M/y + G E, d/M/y – G E, d/M/y + G E, d/M/y – E, d/M/y + G E, d/M/y – E, d/M/y G MMM y – G MMM y @@ -1676,10 +1856,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G d MMM y – d MMM y - G d MMM, E – d MMM, E, y - G d MMM y, E – d MMM y, E - G d MMM, E – d MMM y, E - G d MMM y, E – d MMM y, E + G E, d MMM – E, d MMM y + G E, d MMM y – E, d MMM y + G E, d MMM – E, d MMM y + G E, d MMM y – E, d MMM y h:mm a – h:mm a @@ -1691,35 +1871,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm–h:mm a v h:mm–h:mm a v + + M – M + - dd.MM – dd.MM - dd.MM – dd.MM + d/M – d/M + d/M – d/M - dd.MM, E – dd.MM, E - dd.MM, E – dd.MM, E + E, d/M – E, d/M + E, d/M – E, d/M + + + MMM – MMM d–d MMM d MMM – d MMM - d MMM, E – d MMM, E + E, d MMM – E, d MMM d MMM, E – d MMM, E + + d–d MMMM + d MMMM – d MMMM + - MM.y – MM.y - MM.y – MM.y + M/y – M/y + M/y – M/y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y + d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y - dd.MM.y, E – dd.MM.y, E - dd.MM.y, E – dd.MM.y, E - dd.MM.y, E – dd.MM.y, E + E, d/M/y – E, d/M/y + E, dd.MM.y – E, dd.MM.y + E, d/M/y – E, d/M/y MMM–MMM y @@ -1733,7 +1923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y E, d MMM – E, d MMM y - d MMM y, E – d MMM y, E + E, d MMM y – E, d MMM y MMMM–MMMM y @@ -1775,10 +1965,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + G EEEE, d MMMM y + + + + + G d MMMM, y + + + + + G d MMM y + + + + + G d/M/y + + + - G MM/y - G dd/MM/y, E + E, d + G M/y + G d/M/y + G E, d/M/y + G E, d MMM y + d/M + E, d/M + E, d MMM + d MMMM + G y/M + G d/M/y + G E, d/M/y + G E, d MMM y @@ -1804,100 +2027,212 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + era + + + era + + + era + - İl + il keçən il bu il gələn il - {0} il ərzində - {0} il ərzində + {0} il sonra + {0} il sonra - {0} il öncə - {0} il öncə + {0} il əvvəl + {0} il əvvəl il + + {0} il sonra + {0} il sonra + + + {0} il əvvəl + {0} il əvvəl + + + + + {0} il sonra + {0} il sonra + + + {0} il əvvəl + {0} il əvvəl + - Rüb + rüb keçən rüb bu rüb gələn rüb - {0} rüb ərzində - {0} rüb ərzində + {0} rüb sonra + {0} rüb sonra - {0} rüb öncə - {0} rüb öncə + {0} rüb əvvəl + {0} rüb əvvəl rüb + + {0} rb sonra + {0} rb sonra + + + {0} rb əvvəl + {0} rb əvvəl + + + + + {0} r sonra + {0} r sonra + + + {0} r əvvəl + {0} r əvvəl + - Ay + ay keçən ay bu ay gələn ay - {0} ay ərzində - {0} ay ərzində + {0} ay sonra + {0} ay sonra - {0} ay öncə - {0} ay öncə + {0} ay əvvəl + {0} ay əvvəl ay + + {0} ay sonra + {0} ay sonra + + + {0} ay əvvəl + {0} ay əvvəl + + + + + {0} ay sonra + {0} ay sonra + + + {0} ay əvvəl + {0} ay əvvəl + - Həftə + həftə keçən həftə bu həftə gələn həftə - {0} həftə ərzində - {0} həftə ərzində + {0} həftə sonra + {0} həftə sonra - {0} həftə öncə - {0} həftə öncə + {0} həftə əvvəl + {0} həftə əvvəl - {0} həftəsi + həftə {0} - həftə + hft. + keçən hft + bu hft + gələn hft + + {0} hft sonra + {0} hft sonra + + + {0} hft əvvəl + {0} hft əvvəl + + hft {0} + + + hft + keçən h + bu h + gələn h + + {0} h sonra + {0} h sonra + + + {0} h əvvəl + {0} h əvvəl + + h {0} - Ayın həftəsi + ayın həftəsi ay hft. - Gün + gün dünən bu gün sabah - {0} gün ərzində - {0} gün ərzində + {0} gün sonra + {0} gün sonra + + + {0} gün əvvəl + {0} gün əvvəl + + + + gün + + {0} gün sonra + {0} gün sonra - {0} gün öncə - {0} gün öncə + {0} gün əvvəl + {0} gün əvvəl + + + + gün + + {0} g sonra + {0} g sonra + + + {0} g əvvəl + {0} g əvvəl ilin günü - Həftənin Günü + həftənin günü hft. günü @@ -1913,12 +2248,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bu bazar gələn bazar - {0} bazar ərzində - {0} bazar ərzində + {0} bazar sonra + {0} bazar sonra + + + {0} bazar əvvəl + {0} bazar əvvəl + + + + keçən b. + bu b. + gələn b. + + {0} b. sonra + {0} b. sonra - {0} bazar öncə - {0} bazar öncə + {0} b. əvvəl + {0} b. əvvəl + + + + keçən b + bu b + gələn b + + {0} b sonra + {0} b sonra + + + {0} b əvvəl + {0} b əvvəl @@ -1926,45 +2287,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bu bazar ertəsi gələn bazar ertəsi - {0} bazar ertəsi ərzində - {0} bazar ertəsi əzrində + {0} bazar ertəsi sonra + {0} bazar ertəsi sonra - {0} bazar ertəsi öncə - {0} bazar ertəsi öncə + {0} bazar ertəsi əvvəl + {0} bazar ertəsi əvvəl + keçən b.er. + bu b.er. + gələn b.er. - {0} bazar ertəsi ərzində - {0} bazar ertəsi ərzində + {0} b.er. sonra + {0} b.er. sonra + + + {0} b.er. əvvəl + {0} b.er. əvvəl - keçən BE - bu BE - gələn BE + keçən b.e. + bu b.e. + gələn b.e. + + {0} b.e. sonra + {0} b.e. sonra + + + {0} b.e. əvvəl + {0} b.e. əvvəl + keçən çərşənbə axşamı bu çərşənbə axşamı gələn çərşənbə axşamı - {0} çərşənbə axşamı ərzində - {0} çərşənbə axşamı ərzində + {0} çərşənbə axşamı sonra + {0} çərşənbə axşamı sonra - {0} çərşənbə axşamı öncə - {0} çərşənbə axşamı öncə + {0} çərşənbə axşamı əvvəl + {0} çərşənbə axşamı əvvəl - keçən Ç.ax. - bu ÇƏ - gələn ÇƏ + keçən çər.ax. + bu çər.ax. + gələn çər.ax. - {0} çərşənbə axşamı sonra - {0} çərşənbə axşamı ərzində + çər.ax. sonra + {0} çər.ax. sonra + + + {0} çər.ax. əvvəl + {0} çər.ax. əvvəl + + + + keçən ç.a. + bu ç.a. + gələn ç.a. + + {0} ç.a. sonra + {0} ç.a. sonra + + + {0} ç.a. əvvəl + {0} ç.a. əvvəl @@ -1972,123 +2365,264 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bu çərşənbə gələn çərşənbə - {0} çərşənbə ərzində - {0} çərşənbə ərzində + {0} çərşənbə sonra + {0} çərşənbə sonra - {0} çərşənbə öncə - {0} çərşənbə öncə + {0} çərşənbə əvvəl + {0} çərşənbə əvvəl + + + + keçən çər. + bu çər. + gələn çər. + + {0} çər. sonra + {0} çər. sonra + + + {0} çər. əvvəl + {0} çər. əvvəl - keçən Ç - bu Ç - gələn Ç + keçən ç. + bu ç. + gələn ç. + + {0} ç. sonra + {0} ç. sonra + + + {0} ç. əvvəl + {0} ç. əvvəl + keçən cümə axşamı bu cümə axşamı gələn cümə axşamı - {0} cümə axşamı ərzində - {0} cümə axşamı ərzində + {0} cümə axşamı sonra + {0} cümə axşamı sonra - {0} cümə axşamı öncə - {0} cümə axşamı öncə + {0} cümə axşamı əvvəl + {0} cümə axşamı əvvəl + + + + keçən c.ax. + bu c.ax. + gələn c.ax. + + {0} c.ax. sonra + {0} c.ax. sonra + + + {0} c.ax. əvvəl + {0} c.ax. əvvəl - keçən CA - bu CA - gələn CA + keçən c.a. + bu c.a. + gələn c.a. + + {0} c.a. sonra + {0} c.a. sonra + + + {0} c.a. əvvəl + {0} c.a. əvvəl + keçən cümə bu cümə gələn cümə - {0} cümə ərzində - {0} cümə ərzində + {0} cümə sonra + {0} cümə sonra - {0} cümə öncə - {0} cümə öncə + {0} cümə əvvəl + {0} cümə əvvəl + + + + keçən cüm. + bu cüm. + gələn cüm. + + {0} cüm. sonra + {0} cüm. sonra + + + {0} cüm. əvvəl + {0} cüm. əvvəl - keçən C - bu C - gələn C + keçən c. + bu c. + gələn c. + + {0} c. sonra + {0} c. sonra + + + {0} c. əvvəl + {0} c. əvvəl + keçən şənbə bu şənbə gələn şənbə - {0} şənbə ərzində - {0} şənbə ərzində + {0} şənbə sonra + {0} şənbə sonra - {0} şənbə öncə - {0} şənbə öncə + {0} şənbə əvvəl + {0} şənbə əvvəl + + + + keçən şən. + bu şən. + gələn şən. + + {0} şən. sonra + {0} şən. sonra + + + {0} şən. əvvəl + {0} şən. əvvəl - keçən Ş - bu Ş - gələn Ş + keçən ş. + bu ş. + gələn ş. + + {0} ş. sonra + {0} ş. sonra + + + {0} ş. əvvəl + {0} ş. əvvəl + AM/PM - Saat + saat bu saat - {0} saat ərzində - {0} saat ərzində + {0} saat sonra + {0} saat sonra - {0} saat öncə - {0} saat öncə + {0} saat əvvəl + {0} saat əvvəl - saat + st. + + {0} st sonra + {0} st sonra + + + {0} st əvvəl + {0} st əvvəl + + + + st + + {0} st sonra + {0} st sonra + + + {0} st əvvəl + {0} st əvvəl + - Dəqiqə + dəqiqə bu dəqiqə - {0} dəqiqə ərzində - {0} dəqiqə ərzində + {0} dəqiqə sonra + {0} dəqiqə sonra - {0} dəqiqə öncə - {0} dəqiqə öncə + {0} dəqiqə əvvəl + {0} dəqiqə əvvəl dəq. + + {0} dəq sonra + {0} dəq sonra + + + {0} dəq əvvəl + {0} dəq əvvəl + + + + dəq + + {0} dq sonra + {0} dq sonra + + + {0} dq əvvəl + {0} dq əvvəl + - Saniyə + saniyə indi - {0} saniyə ərzində - {0} saniyə ərzində + {0} saniyə sonra + {0} saniyə sonra - {0} saniyə öncə - {0} saniyə öncə + {0} saniyə əvvəl + {0} saniyə əvvəl san. + + {0} san sonra + {0} san sonra + + + {0} san əvvəl + {0} san əvvəl + + + + san + + {0} sn sonra + {0} sn sonra + + + {0} sn əvvəl + {0} sn əvvəl + - Saat Qurşağı + saat qurşağı qurşaq @@ -2121,8 +2655,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Angilya + + Rotera stansiyası + + + Palmer torpağı + + + Troll stansiyası + - Syova + Syova stansiyası Mouson @@ -2130,6 +2673,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Deyvis + + Vostok stansiyası + Keysi @@ -2142,6 +2688,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rio Qalyeqos + + Mendosa + San Xuan @@ -2247,9 +2796,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kuyaba + + Santarem + Kampo Qrande + + Belem + Araguayna @@ -2460,11 +3015,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevil - - - Britaniya Yay Vaxtı - - Qrenada @@ -2537,11 +3087,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cayapura - - - İrlandiya Yay Vaxtı - - Yerusəlim @@ -2698,6 +3243,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hermosilo + + Siudad Xuares + Mazaltan @@ -2788,6 +3336,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Asunsion + + Reunion + Buxarest @@ -2842,6 +3393,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Quadalkanal + + Mahe + Xartum @@ -2887,6 +3441,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kergelen + + Lome + Banqkok @@ -3019,6 +3576,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yohanesburq + + + Əkka + Əkka standart vaxtı + Əkka yay vaxtı + + Əfqanıstan Vaxtı @@ -3194,6 +3758,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Braziliya Yay Vaxtı + + + Britaniya vaxtı + Britaniya Yay Vaxtı + + Brunei Darussalam vaxtı @@ -3270,7 +3840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Dümon-d’Ürvil Vaxtı + Dümon-d’Urvil Vaxtı @@ -3367,6 +3937,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Qrinviç Orta Vaxtı + + + Qrenlandiya vaxtı + Qrenlandiya standart vaxtı + Qrenlandiya yay vaxtı + + Şərqi Qrenlandiya Vaxtı @@ -3393,7 +3970,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havay-Aleut Standart Vaxtı + Havay vaxtı @@ -3454,6 +4031,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ İran Yay Vaxtı + + + İrlandiya vaxtı + İrlandiya Yay Vaxtı + + İrkutsk Vaxtı @@ -3475,6 +4058,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yaponiya Yay Vaxtı + + + Kamçatka vaxtı + Kamçatka standart vaxtı + Kamçatka yay vaxtı + + Qazaxıstan vaxtı @@ -3746,9 +4336,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa Vaxtı Samoa Standart Vaxtı - Samoa Yay Vaxtı @@ -3841,6 +4429,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruqvay Yay Vaxtı + + + Urumçi vaxtı + + Özbəkistan Vaxtı @@ -3927,20 +4520,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ , . - - - - standart onluq kəsr0.### - - - - - - - standart onluq kəsr0.### - - - @@ -3993,13 +4572,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - - standart elmi# - - - @@ -4017,10 +4589,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - #,##0.00 - @@ -5272,8 +5840,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Karib gilderi - Karib gilderi - Karib gilderi Fransız Gızıl Frankı @@ -5390,9 +5956,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alış-veriş kartınızda {0} var. Alınsın? Alış-veriş kartınızda {0} var. Alınsınlar? + {0}-ci sağ döngəni seçin. {0}-cü sağ döngəni seçin. {0}-cı sağ döngəni seçin. - {0}-ci sağ döngəni seçin. {0}-cu sağ döngəni seçin. @@ -5583,11 +6149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} millimol/litr {0} millimol/litr - - hissə - {0} hissə - {0} hissə - milyonda hissəcik {0} milyonda hissəcik @@ -6209,11 +6770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ katal - - kulomb - {0} kulomb - {0} kulomb - farad @@ -6240,13 +6796,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ qrey - {0} Qy - {0} Qy kiloqram qüvvə - {0} kqq - {0} kqq tesla @@ -6909,11 +7461,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ft² {0} ft² - - hissə - {0} hissə - {0} hissə - % @@ -6923,11 +7470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Qlk - {0} Qlk - {0} Qlk - {0} mil/imq {0} mil/imq @@ -7101,11 +7643,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mf {0} mf - - mmu - {0} mmu - {0} mmu - ak-ft {0} ak-ft @@ -7142,39 +7679,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} K {0} K - - kal-IT - {0} kal-IT - {0} kal-IT - - - Bk - {0} Bk - {0} Bk - - - Zv - {0} Zv - {0} Zv - - - Qy - {0} Qy - {0} Qy - - - kqq - {0} kqq - {0} kqq - {0}işıq {0}işıq - - {0} hissə/milyard - {0} hissə/milyard - {0}gecə {0}gecə @@ -7381,6 +7889,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ und az ko vi yue zh informal + + {title} {given} {given2} {surname} {generation}, {credentials} + {given-informal} {surname} @@ -7390,6 +7901,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {given-informal} + + {given-monogram-allCaps}{given2-monogram-allCaps} {surname-monogram-allCaps} + {given-informal-monogram-allCaps}{surname-monogram-allCaps} @@ -7432,31 +7946,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {surname} {given} {given2} {credentials} + + {surname} {given-informal} + + + {title} {surname} + + + {given-informal} + + + {surname-monogram-allCaps}{given-monogram-allCaps} {given2-monogram-allCaps} + {surname-monogram-allCaps}{given-informal-monogram-allCaps} + + {surname} {given} {given2-initial} {generation}, {credentials} + + + {surname} {given-informal} + + + {title} {surname} + {given-informal} + + {surname-monogram-allCaps} + + + {given-informal-monogram-allCaps} + + + {surname} {given-initial} {given2-initial} + + + {surname} {given-initial} + + + {title} {surname} + + + {given-informal} + + + {surname-monogram-allCaps} + + + {given-informal-monogram-allCaps} + + + {surname-core}, {given} {given2} {surname-prefix} + + + {surname}, {given-informal} + + + {surname-core}, {given} {given2-initial} {surname-prefix} + + + {surname}, {given-informal} + + + {surname-core}, {given-initial} {given2-initial} {surname-prefix} + + + {surname}, {given-informal} + - Sinbad + Elvin - İren - Adler + Ayan + Çingizli - Con - Hamiş - Vatson + Günay + Elbəy + Xanlar Cənab - Arif Aliyev - Arif - İlvus Santak + İlkin Seyranoğlu + İlkin + Elnur Qaraxanlı ∅∅∅ - Aydan + Emilzadə ∅∅∅ Kiçik Deputat @@ -7465,22 +8042,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sinbad - Käthe - Müller + Aysu + Elxanlı Zazilia - Hamiş - Ştöber + Hamish + Stöber Prof. Dr. - Ada Kornelia + Ada Cornelia Neele - Sezar Martin - van den - Volf - Becker Schmidt + Cesar Martin + von + Brühl + Gonzalez Domingo Kiçik M.D. Ph.D. diff --git a/make/data/cldr/common/main/az_Arab.xml b/make/data/cldr/common/main/az_Arab.xml deleted file mode 100644 index 17c62c3faa58..000000000000 --- a/make/data/cldr/common/main/az_Arab.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - دۆنیا - - - دیل: {0} - یازی: {0} - بؤلگه: {0} - - - - - right-to-left - - - - [آ ؤ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ۆ ۇ ی ؽ] - [\u200C\u200D\u200E\u200F َ ُ ِ ْ إ ك ڭ ى ي] - [آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی] - [\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\] - ؟ - - - « - » - ‹ - › - - - arabext - - arabext - - - : - - - diff --git a/make/data/cldr/common/main/az_Arab_IQ.xml b/make/data/cldr/common/main/az_Arab_IQ.xml deleted file mode 100644 index 03dec993622a..000000000000 --- a/make/data/cldr/common/main/az_Arab_IQ.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - - - برازیل - چین - جرمنی - پرانس - برتانیا - هندستان - ایتالیا - جاپان - پاکستان - روس - امریکی هئوارێن ملک - نگیشّتگێن دمگ - - - بُدّایی سالدر - چینی سالدر - کپتی سالدر - دانگی سالدر - ایتیوپیایی سالدر - ایتیوپیایی آمیت آلم سالدر - گرێگۆری سالدر - ابرانی سالدر - هندی کئومی سالدر - اسلامی سالدر - اسلامی شهری سالدر - اسلامی سئوودی اربی سالدر - اسلامی نجومی سالدر - اسلامی ام الکراهی سالدر - سالدر ISO-8601 - جاپانی سالدر - پارسی سالدر - مینگۆ چینی سالدر - زرّئے گیشّتگێن کالب - گیشّتگێن ترتیب - اربی-هندی نمبر - روسی نمبر - دێوناگری نمبر - مگربی نمبر - - - میتَری - برتانی - امریکی - - - زبان: {0} - سیاهگ: {0} - دمگ: {0} - - - - - right-to-left - - - - [َ ُ ِ ّ ْ آ ا ئ ب پ ت ٹ ج چ د ڈ ر ڑ ز ژ س ش ک گ ل م ن و ۆ ه ی ێ ے] - [\u200C\u200D ً ٔ ء أ ؤ إ ة ث ح خ ذ ص ض ط ظ ع غ ف ق ں ھ ہ] - [آ ا {ای} {اێ} {ائی} ب پ ت ٹ ج چ د ڈ ر ڑ ز ژ س ش ف ک گ ل م ن و ه ی] - [، ؛ \: ! ؟ . ' ‹ › " « »] - - - - - - - - جن - پر - مار - اپر - مئیی - جون - جۆل - اگست - ستم - اکت - نئوم - دسم - - - جنوری - پروری - مارچ - اپرێل - مئیی - جون - جۆلایی - اگست - ستمبر - اکتوبر - نئومبر - دسمبر - - - - - - - یک - دو - سئے - چار - پنچ - جمه - شم - - - یکشمبه - دوشمبه - سئیشمبه - چارشمبه - پنچشمبه - جمه - شمبه - - - - - - - 1/4 - 2/4 - 3/4 - 4/4 - - - ائوَلی چارِک - دومی چارِک - سئیمی چارِک - چارُمی چارِک - - - - - - - EEEE, d MMMM, y - - - - - d MMMM, y - - - - - d MMM, y - - - - - d/M/yy - - - - - - - hh:mm:ss a zzzz - - - - - hh:mm:ss a zzz - - - - - hh:mm:ss a - - - - - hh:mm a - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - dd-MM-y - d MMM y - - - {1} - {0} - - - - - - - - اَلاسکائے ساهت - اَلاسکائے گیشّتگێن ساهت - اَلاسکائے گرماگی ساهت - - - - - امازۆنئے ساهت - امازۆنئے گیشّتگێن ساهت - امازۆنئے گرماگی ساهت - - - - - نیامی امریکائے ساهت - نیامی امریکائے گیشّتگێن ساهت - نیامی امریکائے گرماگی ساهت - - - - - رۆدراتکی امریکائے ساهت - رۆدراتکی امریکائے گیشّتگێن ساهت - رۆدراتکی امریکائے گرماگی ساهت - - - - - کۆهستگێن امریکائے ساهت - کۆهستگێن امریکائے گیشّتگێن ساهت - کۆهستگێن امریکائے گرماگی ساهت - - - - - آرامزِری امریکائے ساهت - آرامزِری امریکائے گیشّتگێن ساهت - آرامزِری امریکائے گرماگی ساهت - - - - - ارجنتینائے ساهت - ارجنتینائے گیشّتگێن ساهت - ارجنتینائے گرماگی ساهت - - - - - رۆنندی ارجنتینائے ساهت - رۆنندی ارجنتینائے گیشّتگێن ساهت - رۆنندی ارجنتینائے گرماگی ساهت - - - - - نیامی اُسترالیائے ساهت - نیامی اُسترالیائے گیشّتگێن ساهت - نیامی اُسترالیائے گرماگی ساهت - - - - - نیام‌رۆنندی اُسترالیائے ساهت - نیام‌رۆنندی اُسترالیائے گیشّتگێن ساهت - نیام‌رۆنندی اُسترالیائے گرماگی ساهت - - - - - رۆدراتکی اُسترالیائے ساهت - رۆدراتکی اُسترالیائے گیشّتگێن ساهت - رۆدراتکی اُسترالیائے گرماگی ساهت - - - - - رۆنندی اُسترالیائے ساهت - رۆنندی اُسترالیائے گیشّتگێن ساهت - رۆنندی اُسترالیائے گرماگی ساهت - - - - - برازیلئے ساهت - برازیلئے گیشّتگێن ساهت - برازیلئے گرماگی ساهت - - - - - نیامی یورپئے ساهت - نیامی یورپئے گیشّتگێن ساهت - نیامی یورپئے گرماگی ساهت - - - - - رۆدراتکی یورپئے ساهت - رۆدراتکی یورپئے گیشّتگێن ساهت - رۆدراتکی یورپئے گرماگی ساهت - - - - - دێمتری رۆدراتکی یورپئے گیشّتگێن ساهت - - - - - رۆنندی یورپئے ساهت - رۆنندی یورپئے گیشّتگێن ساهت - رۆنندی یورپئے گرماگی ساهت - - - - - گرین‌وِچ مین ٹائم - - - - - هئواییئے گیشّتگێن ساهت - - - - - هئواییئے ساهت - هئواییئے گیشّتگێن ساهت - هئواییئے گرماگی ساهت - - - - - نیامی اندۆنیزیائے گیشّتگێن ساهت - - - - - رۆدراتکی اندۆنیزیائے گیشّتگێن ساهت - - - - - رۆنندی اندۆنیزیائے گیشّتگێن ساهت - - - - - ایرکوتسکئے ساهت - ایرکوتسکئے گیشّتگێن ساهت - ایرکوتسکئے گرماگی ساهت - - - - - رۆدراتکی کازکستانئے گیشّتگێن ساهت - - - - - رۆنندی کازکستانئے گیشّتگێن ساهت - - - - - کرانسنُیارسکئے ساهت - کرانسنُیارسکئے گیشّتگێن ساهت - کرانسنُیارسکئے گرماگی ساهت - - - - - لۆرڈ هئو اُسترالیائے ساهت - لۆرڈ هئو اُسترالیائے گیشّتگێن ساهت - لۆرڈ هئو اُسترالیائے گرماگی ساهت - - - - - مَگَدَنئے ساهت - مَگَدَنئے گیشّتگێن ساهت - مَگَدَنئے گرماگی ساهت - - - - - آرامزِری مِکسیکۆئے ساهت - آرامزِری مِکسیکۆئے گیشّتگێن ساهت - آرامزِری مِکسیکۆئے گرماگی ساهت - - - - - ماسکۆئے ساهت - ماسکۆئے گیشّتگێن ساهت - ماسکۆئے گرماگی ساهت - - - - - نیوفاوونڈلئینڈئے ساهت - نیوفاوونڈلئینڈئے گیشّتگێن ساهت - نیوفاوونڈلئینڈئے گرماگی ساهت - - - - - نُرُنهائے ساهت - نُرُنهائے گیشّتگێن ساهت - نُرُنهائے گرماگی ساهت - - - - - نۆوۆسیبیرسکئے ساهت - نۆوۆسیبیرسکئے گیشّتگێن ساهت - نۆوۆسیبیرسکئے گرماگی ساهت - - - - - اۆمسکئے ساهت - اۆمسکئے گیشّتگێن ساهت - اۆمسکئے گرماگی ساهت - - - - - ولادیوُستُکئے ساهت - ولادیوُستُکئے گیشّتگێن ساهت - ولادیوُستُکئے گرماگی ساهت - - - - - یاکوتسکئے ساهت - یاکوتسکئے گیشّتگێن ساهت - یاکوتسکئے گرماگی ساهت - - - - - یێکاترینبورگئے ساهت - یێکاترینبورگئے گیشّتگێن ساهت - یێکاترینبورگئے گرماگی ساهت - - - - - - - - برازیلی ریال - - - یورۆ - - - برتانی پئوند - - - هندُستانی روپّئیی - - - اێرانی ریال - ریال - - - جاپانی یَن - ¥ - - - پاکستانی روپی - Rs - - - روسی روبل - ₽ - - - امریکی دالر - $ - - - نگیشّتگێن زَرّ - XXX - - - - - - هئو:ه - نه:ن - - - diff --git a/make/data/cldr/common/main/bal_Arab.xml b/make/data/cldr/common/main/bal_Arab.xml deleted file mode 100644 index 71c508189f09..000000000000 --- a/make/data/cldr/common/main/bal_Arab.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dunia - Aprika - Amrik Lor - Amrik Kidul - Oséani - Aprika Bekulon - Amrik Tenga - Aprika Belètan - Aprika Belèlir - Aprika Bela Tenga - Aprika Bekidul - Amrik - Amrik Belèlir - Karaiben - Asia Wètan - Asia Kidul - Asia Kidul-wètan - Èropa Kidul - Ostralasi - Mélanési - Daèrah Mikronési - Polinési - Asia - Asia Tenga - Asia Kulon - Èropa - Èropa Wètan - Èropa Lor - Èropa Kulon - Aprika Kidulnya Sahara - Amrik Latèn - Pulo Kenaèkan - Andora - Imarat Arab Rempug - Apganistan - Antigua èn Barbuda - Angguila - Albani - Lemènder - Anggola - Kutub Kidul - Argèntina - Samoa Amrik - Ostenrèk - Ostrali - Aruba - Pulo Olan - Asèrbaijan - Bosni èn Hèrségowina - Barbados - Benggaladésa - Bèlgi - Burkina Paso - Bulgari - Bahrén - Burundi - Bénin - Sint-Bartoloméus - Bermuda - Bruné - Boliwi - Welanda Karaiben - Brasil - Bahama - Butan - Pulo Buwèt - Boswana - Ruslan Puti - Bélis - Kanada - Pulo Kokos (Keeling) - Kongo - Kinsasa - Kongo (KDK) - Kiblik Aprika Tenga - Kongo - Brasawil - Kongo (Kiblik) - Switserlan - Panté Gading - Pulo Cook - Cili - Kamérun - Tiongkok - Kolombia - Pulo Kliperten - Sarek - Kosta Rika - Kuba - Tanjung Ijo - Kurasao - Pulo Natal - Sipres - Cèki - Kiblik Cèk - Dètslan - Diégo Garsia - Jibuti - Dènemarken - Dominika - Kiblik Dominika - Aljajaèr - Sabtah èn Mélila - Èkuador - Èstlan - Mesir - Sahara Kulon - Èritréa - Spanyol - Habsi (Ètiopi) - Uni Èropa - Gutekan Èuro - Pinlan - Piji - Pulo Paklan - Pulo Paklan (Malbinas) - Mikronési - Pulo Pèrower - Prasman - Gabon - Kerajaan Rempug - KR - Grénada - Géorgi - Guyana Prasman - Gèrensi - Gana - Jabal Tarik - Grunlan - Gambia - Giné - Guadelup - Giné Katulistiwa - Yunani - Géorgi Kidul èn Pulo Sènwit Kidul - Guatémala - Guam - Giné-Biso - Guyana - Daèrah Bestir Istimèwa Hongkong - Hongkong - Pulo Hered èn MikDonal - Honduras - Kroasi - Haiti - Honggari - Pulo Kenari - Indonésia - Irlan - Israèl - Pulo Man - Hindi - Wilayah Britani di Laotan Hindi - Kepuloan Cagos - Irak - Iran - Èslan - Itali - Jèrsi - Jamaika - Urdun - Jepang - Kénia - Kirgistan - Kemboja - Kiribati - Komoro - Sint-Kristoper èn Nèwis - Koréa Lor - Koréa Kidul - Kuwét - Pulo Kaèman - Kasakstan - Laos - Lèbanon - Sint Lusia - Lihtenstèn - Sri Langka - Libéria - Lésoto - Litowen - Leksembereh - Lètlan - Libi - Maroko - Monako - Moldawi - Gunung Item (Montenègro) - Sint-Martèn (Prasman) - Madagaskar - Pulo Marsal - Makédoni Lor - Mali - Mianmar (Birma) - Monggoli - Daèrah Bestir Istimèwa Makao - Makao - Pulo Mariana Lor - Martinik - Moritani - Monsèrat - Malta - Moritius - Maladéwa - Malawi - Mèksiko - Malésia - Mosambik - Namibi - Kalédoni Baru - Nigèr - Pulo Norpolek - Nigéria - Nikaragua - Welanda - Norwèhen - Népal - Nauru - Niué - Sélan Baru - Sélanda Anyar - Oman - Panama - Péru - Polinési Prasman - Papua Giné Baru (Papua Nugini) - Pilipénen (Pilipina) - Pakistan - Polen - Sint-Pièr èn Mikélon - Pulo Pitkèren - Porto Riko - Wilayah Palestèn - Palèstina - Portugal - Palau - Paragué - Katar - Oséani Luar - Réunion - Ruméni - Sèrwi - Ruslan - Ruanda - Arab Saudi - Pulo Suléman - Sésèl - Sudan - Swèden - Singapur - Sint-Héléna - Slowéni - Spitbèrhen & Jan Mayen - Slowaki - Gunung Singa (Sièra Léon) - San Marino - Sénégal - Somali - Suriname - Sudan Kidul - Sint-Tomas èn Prins - Salbador - Sint-Martèn (Welanda) - Suriah - Èswatini - Swasilan - Tristang da Kunya - Pulo Turks èn Kaikos - Cad - Wilayah Kidul Prasman - Togo - Siam - Tajikistan - Tokélau - Timor Wètan - Turkmènistan - Tunis - Tonga - Turki - Trinidad èn Tobago - Tuwalu - Taiwan - Tansania - Ukrain - Uganda - Kepuloan Mentil AS Luar - Peserèkatan Bangsa-Bangsa - Amrik Serèkat - AS - Urugué - Usbèkistan - Kota Watikan - Sint-Winsèn èn Grénadin - Bénésuèla - Pulo Perawan Britani - Pulo Perawan Amrik - Piètnam - Wanuatu - Walis èn Putuna - Samoa - Logat Asing - Dua Arah Palsu - Kosowa - Yaman - Méot - Aprika Kidul - Sambia - Jimbabwé - Daèrah Kaga’ Ditauin - - - èjaan Dèt Terdisionil - èjaan Résia Pakem - èjaan Dèt tahon 1996 - Prasman Tenga Akir ampé 1606 - Prasman Modèren Awal - Akademi - Rancangan èjaan tahon 1943 - Akuapèm - Penglatènan ALA-LC tahon 1997 - logat Aluku - Mupakat Èjaan Basa Portugis tahon 1990 - Aranis - Asanti - Owernyat - Hurup Latin Turkik Rempug - logat Balangka basa Ani - kelompok logat Barlawèntu basa Tanjung Ijo - Inggris Dasar - Cara Buda - Biskaye - logat San Giorgio/Bila - hurup Bohorič - Boontling - Mupakat Èjaan Portugis-Brasil tahon 1945 - Kornis - lisan Croissant - hurup Dajnko - Sèrwi paké lapal Èkawia - Inggris Modèren Awal - Hurup Pengucapan Antérobangsa - Hurup Pengucapan Kirshenbaum - Hurup Pengucapan Amrik Lor - Hurup Pengucapan Ural - Hurup Pengucapan X-SAMPA - Gaskon - Èjaan Oksitan Klasik - Èjaan Oksitan Keitalian - Èjaan Oksitan Mistral - penglatènan Hepburn - Nor Tinggi - Sistim Èjaan H Sepèranto - Sèrwi paké lapal Iyèkawia - Èjaan Bulgari tahon 1899 - Jawer - Penglatènan Jyutping - Èjaan Umum - Kociéwié - Èjaan Pakem - Limosin - Langgedok - logat Lipowas basa Résia - Èjaan Rus Perobahan tahon 1918 - hurup Metelko - Nada Tunggal - logat Ndyuka - logat Natison - Inggris Niuponlan - Nis - logat Nyiwa - Wolapik Modèren - logat Osoyané - èjaan Kamus Inggris Okspot - èjaan ringkes Pahaw Mong tahap 2 - èjaan ringkes Pahaw Mong tahap 3 - èjaan Pahaw Mong rampung - logat Pamaka - Èjaan Pèter Agung tahun 1708 - Penglatinan Pin-in - Nada Banyak - Kumpiuter - Prowangsal - Putèr - Èjaan Perbaèkan - Wolapik Klasik - Résia - Graubenderlan - Saho - Inggris Pakem Skot - Skos - Ringkes - logat Stolwitsa/Solbitsa - kelompok logat Sotawèntu basa Tanjung Ijo - Inggris-Spanyol - Surmèr - Sursèlwi - Sutsèlwi - Èjaan Taraskiéwitsa - Èjaan Kegabreg - Èjaan Kegabreg Perbaèkan - Èjaan Ulster - Hurup Pengucapan Unifon - Cara Wéda - Balènsi - Waladèr - Wiwaro-Alpen - Penglatènan Wade-Giles - Sistim Èjaan X Sepèranto - - - Almenak - Pormat Mata Uang - Rèntètan Sortir - Mata Uang - Puteran Jem (12 vs 24) - Setil Pembelèk Baris - Sistim Pengukuran - Angka - - - Almenak Buda - Almenak Tionghoa - Almenak Kibti - Almenak Koréa - Almenak Habsi - Almenak Habsi Awal Alam - Almenak Grégorian - Almenak Ibrani - Almenak Negara Hindi - Almenak Selam - Almenak Selam (hisab, sipil) - Almenak Selam (Arab saudi, ru’yat) - Almenak Selam (hisab, palakiah) - Almenak Selam (Umulkura) - Almenak ISO-8601 - Almenak Jepang - Almenak Parsi - Almenak Bingkok - Pormat Mata Uang Pembukuan - Pormat Mata Uang Pakem - Rèntètan Sortir Sebelonnya, bakal kecocokan - Rèntètan Sortir Kamus - Rèntètan Sortir Bawaan Unicode - Rèntètan Sortir Émoji - Aturan Pengrèntètan Èropa - Rèntètan Sortir Buku Telepon - Rèntètan Sortir Pin-in - Rèntètan Sortir Kerobah - Penyarian Tujuan Umum - Penyarian berales Hurup Mati Depan Hanggel - Rèntètan Sortiran Pakem - Rèntètan Gorètan - Rèntètan Gorètan Terdisionil - Rèntètan Sortir Gorètan Oyod - Rèntètan Sortir Cuim - Sistim 12 Jem (0–11) - Sistim 12 Jem (1–12) - Sistim 24 Jem (0–23) - Sistim 24 Jem (1–24) - Setil Pembelèk Baris Longgar - Setil Pembelèk Baris Normal - Setil Pembelèk Baris Rapet - Sistim Mètrik - Sistim Pengukuran Kekaèsaran - Sistim Pengukuran AS - Angka Ahom - Angka Arab-Hindi - Angka Arab-Hindi Perluasan - Angka Lemènder - Angka Lemènder Kecil - Angka Bali - Angka Benggala - Angka Brahmi - Angka Cakma - Angka Campa - Angka Sirilik - Angka Déwanagari - Angka Diwéhi Akuru - Angka Habsi - Angka Lèbar-Pol - Angka Géorgi - Angka Gunjala Gondi - Angka Masaram Gondi - Angka Yunani - Angka Yunani Kecil - Angka Gujarat - Angka Gurmuk - Angka Persepuluan Tionghoa - Angka Tionghoa Ringkes - Angka Duit Tionghoa Ringkes - Angka Tionghoa Terdisionil - Angka Duit Tionghoa Terdisionil - Angka Ibrani - Angka Pahaw Mong - Angka Mong Alkitab - Angka Jawa - Angka Jepang - Angka Duit Jepang - Angka Kayah Li - Angka Jawa Kuna - Angka Kemboja - Angka Kenada - Angka Lanna Hora - Angka Lanna Tam - Angka Laos - Angka Latin - Angka Rong - Angka Limbu - Angka Tebel Matimatika - Angka Corèt Dua Matimatika - Angka Apstan Tunggal Matimatika - Angka Sonderkail Tebel Matimatika - Angka Bekail Matimatika - Angka Malayalam - Angka Modi - Angka Monggoli - Angka Meru - Angka Manipur - Angka Birma - Angka San Birma - Angka Tailaing Birma - Angka Nag Mundari - Angka Ngko - Angka Ol Ciki - Angka Oria - Angka Osmania - Angka Rohingya Hanipi - Angka Romèn - Angka Romèn Kecil - Angka Sorastra - Angka Sarada - Angka Hudabadi - Angka Singala - Angka Sora Sompèng - Angka Sunda - Angka Takri - Angka Taileu Baru - Angka Tamil Terdisionil - Angka Tamil - Angka Telugu - Angka Siam - Angka Tibèt - Angka Tirhuta - Angka Tangsa - Angka Wai - Angka Warang Citi - Angka Wanco - - - Mètrik - Inggris - AS - - - - [a b c d eéèĕ f g h i j k l m n o p q r s t u v w x y z] - [áàăâåäãā æ čç ḍ êëē ğġ ḥḫ íìĭîïī ḷḹ ṁṃ ñṅṇ óòŏôöøō œ ṛṝ śšşṣ ṭ úùŭûüū ÿ żẓ ʾ ʿ] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - - Capit - Capji - Cia - Ji - Sa - Si - Go - Lak - Cit - Pé’ - Kao - Cap - - - Capitgwé - Capjigwé - Ciagwé - Jigwé - Sagwé - Sigwé - Gogwé - Lakgwé - Citgwé - Pé’gwé - Kaogwé - Capgwé - - - - - - - Tikus Kayu Ganjil - Kebo Kayu Genep - Macan Api Ganjil - Kelinci Api Genep - Liong Tana Ganjil - Ula Tana Genep - Kuda Logem Ganjil - Kambing Logem Genep - Kunyuk Aèr Ganjil - Ayam Aèr Genep - Anjing Kayu Ganjil - Cèlèng Kayu Genep - Tikus Api Ganjil - Kebo Api Genep - Macan Tana Ganjil - Kelinci Tana Genep - Liong Logem Ganjil - Ula Logem Genep - Kuda Aèr Ganjil - Kambing Aèr Genep - Kunyuk Kayu Ganjil - Ayam Kayu Genep - Anjing Api Ganjil - Cèlèng Api Genep - Tikus Tana Ganjil - Kebo Tana Genep - Macan Logem Ganjil - Kelinci Logem Genep - Liong Aèr Ganjil - Ula Aèr Genep - Kuda Kayu Ganjil - Kambing Kayu Genep - Kunyuk Api Ganjil - Ayam Api Genep - Anjing Tana Ganjil - Cèlèng Tana Genep - Tikus Logem Ganjil - Kebo Logem Genep - Macan Aèr Ganjil - Kelinci Aèr Genep - Liong Kayu Ganjil - Ula Kayu Genep - Kuda Api Ganjil - Kambing Api Genep - Kunyuk Tana Ganjil - Ayam Tana Genep - Anjing Logem Ganjil - Cèlèng Logem Genep - Tikus Aèr Ganjil - Kebo Aèr Genep - Macan Kayu Ganjil - Kelinci Kayu Genep - Liong Api Ganjil - Ula Api Genep - Kuda Tana Ganjil - Kambing Tana Genep - Kunyuk Logem Ganjil - Ayam Logem Genep - Anjing Aèr Ganjil - Cèlèng Aèr Genep - - - - - - - Tikus Kayu Ganjil - Kebo Kayu Genep - Macan Api Ganjil - Kelinci Api Genep - Liong Tana Ganjil - Ula Tana Genep - Kuda Logem Ganjil - Kambing Logem Genep - - - - - - - - - - EEEE, d MMMM y G - - - - - d MMMM y G - - - - - d MMM y G - - - - - d/M/y GGGGG - - - - - - - {1}, {0} - - - {1} 'jem' 'pukul' {0} - - - - - {1}, {0} - - - {1} 'jem' 'pukul' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - h.mm B - h.mm.ss B - E h.mm B - E h.mm.ss B - E, d - E h.mm a - E HH.mm - E h.mm.ss a - E HH.mm.ss - y G - d/M/y GGGGG - MMM y G - d MMM y G - E, d MMM y G - h a - h.mm a - HH.mm - h.mm.ss a - HH.mm.ss - d/M - E, d/M - d MMM - E, d MMM - d MMMM - mm.ss - y G - y G - M/y GGGGG - d/M/y GGGGG - E, d/M/y GGGGG - MMM y G - d MMM y G - E, d MMM y G - MMMM y G - QQQ y G - QQQQ y G - - - - h.mm B – h.mm B - h.mm–h.mm B - h.mm–h.mm B - - - y G – y G - y–y G - - - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG - - - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - - - E, d/M/y – E, d/M/y GGGGG - E, d/M/y GGGGG – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - - - MMM y G – MMM y G - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM y G - d MMM y – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - M–M - - - d/M – d/M - d/M – d/M - - - E, d/M – E, d/M - E, d/M – E, d/M - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - y–y G - - - M/y – M/y GGGGG - M/y – M/y GGGGG - - - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - - - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - - - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - MMMM–MMMM y G - MMMM y – MMMM y G - - - - - - - - - Jan - Pèb - Mar - Apr - Méi - Jun - Jul - Ags - Sèp - Okt - Nop - Dés - - - Januari - Pèbruari - Maret - April - Méi - Juni - Juli - Agustus - Sèptèmber - Oktober - Nopèmber - Désèmber - - - - - J - P - M - A - M - J - J - A - S - O - N - D - - - - - - - Min - Sen - Sel - Reb - Kem - Jum - Sap - - - Minggu - Senèn - Selasa - Rebo - Kemis - Juma’at - Saptu - - - - - M - S - S - R - K - J - S - - - - - - - K1 - K2 - K3 - K4 - - - kuartal ke-1 - kuartal ke-2 - kuartal ke-3 - kuartal ke-4 - - - - - - - pg/sg - sr/mlm - - - pagi/siang - soré/malem - - - - - pagi/siang - soré/malem - - - - - - Jaman Kita - Masèhi - - - SM - SJK - M - JK - - - - - - EEEE, d MMMM y - - - - - d MMMM y - - - - - d MMM y - - - - - dd/MM/yy - - - - - - - HH.mm.ss zzzz - - - - - HH.mm.ss z - - - - - HH.mm.ss - - - - - HH.mm - - - - - - - {1} {0} - - - {1} 'jem' 'pukul' {0} - - - - - {1} {0} - - - {1} 'jem' 'pukul' {0} - - - - - {1} {0} - - - {1}, {0} - - - - - {1} {0} - - - {1}, {0} - - - - h.mm B - h.mm.ss B - E h.mm B - E h.mm.ss B - E, d - E h.mm a - E HH.mm - E h.mm.s a - E HH.mm.ss - y G - d/M/y GGGGG - MMM y G - d MMM y G - E, d MMM y G - h a - h.mm a - HH.mm - h.mm.ss a - HH.mm.ss - h.mm.ss. a v - HH.mm.ss v - h.mm a v - HH.mm v - d/M - E, d/M - d MMM - E, d MMM - d MMMM - 'minggu' 'ke'-W MMMM - mm.ss - M/y - d/M/y - E, d/M/y - MMM y - d MMM y - E, d MMM y - MMMM y - QQQ y - QQQQ y - 'minggu' 'ke'-w Y - - - - h.mm B – h.mm B - h.mm–h.mm B - h.mm–h.mm B - - - y G – y G - y – y G - - - M/y GGGG – M/y GGGG - M/y – M/y GGGG - M/y – M/y GGGG - - - d/M/y – d/My GGGG - d/M/y GGGG – d/M/y GGGG - d/M/y – d/M/y GGGG - d/M/y – d/M/y GGGG - - - E, d/M/y – E, d/M/y GGGG - E, d/M/y GGGG – E, d/M/y GGGG - E, d/M/y – E, d/M/y GGGG - E, d/M/y – E, d/M/y GGGG - - - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G - - - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - h a – h a - h–h a - - - h.mm a – h.mm a - h.mm–h.mm a - h.mm–h.mm a - - - HH.mm–HH.mm - HH.mm–HH.mm - - - h.mm a – h.mm a v - h.mm–h.mm a v - h.mm–h.mm a v - - - HH.mm–HH.mm v - HH.mm–HH.mm v - - - h a – h a v - h–h a v - - - M–M - - - d/M – d/M - d/M – d/M - - - E, d/M – E, d/M - E, d/M – E, d/M - - - LLL – LLL - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - - - MMM–MMM y - MMM y – MMM y - - - d–d MMM y - d MMM – d MMM y - d MMM y – d MMM y - - - E, d MMM – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y - - - MMMM–MMMM y - MMMM y – MMMM y - - - - - - - - - Sur. - Sap. - Mul. - S. Mul. - Jum. I - Jum. II - Rej. - Roa. - Psa. - Saw. - Hap. - Haj. - - - Sura - Sapar - Mulud - Seri Mulud - Jumadilawal - Jumadilakir - Rejeb - Roah - Puasa - Sawal - Hapit - Haji - - - - - - H - - - - - - - jaman - - - jmn - - - jmn - - - tahon - tahon kemarèn - ni tahon - tahon bèsok - - {0} tahon lagi - - - {0} tahon nyang liwat - - - - thn - thn marèn - ni thn - thn bèsok - - {0} thn lagi - - - {0} thn nyang liwat - - - - kuartal - kuartal kemarèn - ni kuartal - kuartal bèsok - - {0} kuartal lagi - - - {0} kuartal nyang liwat - - - - krtl - krtl marèn - ni krtl - krtl bèsok - - {0} krtl lagi - - - {0} krtl nyang liwat - - - - bulan - bulan kemarèn - ni bulan - bulan bèsok - - {0} bulan lagi - - - {0} bulan nyang liwat - - - - bln - bln marèn - ni bln - bln bèsok - - {0} bln lagi - - - {0} bln nyang liwat - - - - - {0} bulan nyang liwat - - - - minggu - minggu marèn - ni minggu - minggu bèsok - - {0} minggu lagi - - - {0} minggu nyang liwat - - minggu ke-{0} - - - mgg - mgg marèn - ni mgg - mgg bèsok - - {0} mgg lagi - - - {0} mgg nyang liwat - - mgg ke-{0} - - - minggu dalem sebulan - - - minggu dlm sebulan - - - mgg dlm 1 bln - - - ari - kemarèn - ni ari - bèsok - - {0} ari lagi - - - {0} ari nyang liwat - - - - marèn - ni ari - bèsok - - - ari dalem setahon - - - ari dlm setahon - - - ari dlm 1 thn - - - ari dalem seminggu - - - ari dlm seminggu - - - ari dlm 1 mgg - - - ari gawé - - - - Min marèn - ni Min - Min bèsok - - {0} Min lagi - - - {0} Min nyang liwat - - - - Senèn kemarèn - ni Senèn - Senèn bèsok - - {0} Senèn lagi - - - {0} Senèn nyang liwat - - - - Sen marèn - ni Sen - Sen bèsok - - {0} Sen lagi - - - {0} Sen nyang liwat - - - - Selasa kemarèn - ni Selasa - Selasa bèsok - - {0} Selasa lagi - - - {0} Selasa nyang liwat - - - - Sel marèn - ni Sel - Sel bèsok - - {0} Sel lagi - - - {0} Sel nyang liwat - - - - Rebo kemarèn - ni Rebo - Rebo bèsok - - {0} Rebo lagi - - - {0} Rebo nyang liwat - - - - Reb marèn - ni Reb - Reb bèsok - - {0} Reb lagi - - - {0} Reb nyang liwat - - - - Kemis kemarèn - ni Kemis - Kemis bèsok - - {0} Kemis lagi - - - {0} Kemis nyang liwat - - - - Kem marèn - ni Kem - Kem bèsok - - {0} Kem lagi - - - {0} Kem nyang liwat - - - - Juma’at kemarèn - ni Juma’at - Juma’at bèsok - - {0} Juma’at lagi - - - {0} Juma’at nyang liwat - - - - Jum marèn - ni Jum - Jum bèsok - - {0} Jum lagi - - - {0} Jum nyang liwat - - - - Saptu kemarèn - ni Saptu - Saptu bèsok - - {0} Saptu lagi - - - {0} Saptu nyang liwat - - - - Sap marèn - ni Sap - Sap bèsok - - {0} Sap lagi - - - {0} Sap nyang liwat - - - - pagi/siang/soré/malem - - - jem - ni jem - - {0} jem lagi - - - {0} jem nyang liwat - - - - j - - {0} j lagi - - - {0} j nyang liwat - - - - menit - ni menit - - {0} menit lagi - - - {0} menit nyang liwat - - - - mnt - - {0} mnt lagi - - - {0} mnt nyang liwat - - - - m - - {0} m lagi - - - {0} m nyang liwat - - - - sekon - sekarang - - {0} sekon lagi - - - {0} sekon nyang liwat - - - - sek - karang - - {0} sek lagi - - - {0} sek nyang liwat - - - - s - skrg - - {0} s lagi - - - {0} s nyang liwat - - - - gutekan wayah - - - gutekan wyh - - - gtkn wyh - - - - +HH.mm;-HH.mm - Waktu {0} - Waktu Musim Pentèr {0} - Waktu Pakem {0} - - - Waktu Kabèhan Ragem - - - - Kota Kaga’ Ditauin - - - Andora - - - Dubé - - - Angguila - - - Tirana - - - Yéréwan - - - Wostok - - - Dumont-d’Urville - - - Katamarka - - - Kordoba - - - Buénos Airès - - - Wènen - - - Pert - - - Adeléd - - - Sidni - - - Brisbèn - - - Marihamen - - - Sarayéwo - - - Daka - - - Bresèl - - - Wagadugu - - - Sopia - - - Bahrén - - - Sint-Bartoloméus - - - Bruné - - - La Pas - - - Portu Béliu - - - Sang Paulu - - - Naso - - - Timpu - - - Gaboroné - - - Min - - - Bélis - - - Wangkuber - - - Telok Kèmbrit - - - Halipak - - - Pulo Kokos - - - Kinsasa - - - Brasawil - - - Sirik - - - Abijan - - - Paskah - - - Duala - - - Urumci - - - Sanghay - - - Kosta Rika - - - Hawana - - - Tanjung Ijo - - - Kurasao - - - Pulo Natal - - - Nikosia - - - Pamagusta - - - Prah - - - Berlèn - - - Jibuti - - - Kopenhagen - - - Dominika - - - Aljajaèr - - - Talin - - - Kairo - - - Aluyun - - - Kenari - - - Sabtah - - - Madrit - - - Adis Ababa - - - Hèlsingki - - - Piji - - - Stènli - - - Cuk - - - Pompé - - - Kosaé - - - Perower - - - Parès - - - - Waktu Musim Pentèr Britani - - Londen - - - Grénada - - - Tiplis - - - Kéyèn - - - Gèrensi - - - Akra - - - Jabal Tarik - - - Nuk - - - Konakri - - - Guadelup - - - Atène - - - Géorgi Kidul - - - Guatémala - - - Biso - - - Hongkong - - - Sagrèp - - - Budapès - - - Makasar - - - - Waktu Pakem Irlan - - - - Bétulmegedis - - - Pulo Man - - - Kalkuta - - - Cagos - - - Bagdad - - - Tèhèran - - - Rékiawik - - - Roma - - - Jèrsi - - - Jamaika - - - Aman - - - Biskèk - - - Penom Pèn - - - Komoro - - - Sint-Kristoper - - - Piongyang - - - Séul - - - Kuwét - - - Kaèman - - - Akto - - - Atiro - - - Aktobé - - - Kostané - - - Kisilorda - - - Almati - - - Wiang Cendana - - - Bérut - - - Sint-Lusia - - - Padus - - - Kolombo - - - Monrowia - - - Maséru - - - Wilnius - - - Leksembereh Kota - - - Kasablangka - - - Monako - - - Kisinèp - - - Podgoritsa - - - Antananariwo - - - Kuajelin - - - Majero - - - Skopi - - - Yanggon - - - Houd - - - Ulanbator - - - Makao - - - Martinik - - - Nuaksot - - - Monsérat - - - Moritius - - - Maladéwa - - - Cihuahua - - - Kota Mèksiko - - - Kucing - - - Winhuk - - - Numéa - - - Niamé - - - Norpok - - - Amsteredam - - - Katmandu - - - Niué - - - Catham - - - Oklan - - - Muskat - - - Markésas - - - Pot Morèsbi - - - Bugènpil - - - Karaci - - - Warso - - - Mikélon - - - Pitkèren - - - Porto Riko - - - Gaja - - - Hèbron/Halil - - - Asoren - - - Madéra - - - Lisabon - - - Asunsion - - - Katar - - - Réunion - - - Bukarès - - - Bèlgrado - - - Mosko - - - Wolgograd - - - Saratop - - - Astrahan - - - Ulyanop - - - Kirop - - - Yékatèrinbereh - - - Om - - - Nowosibir - - - Tom - - - Nowokusnèt - - - Krasnoyar - - - Irkut - - - Cita - - - Yakut - - - Weladiwostok - - - Handiga - - - Sahalin - - - Ust-Néra - - - Srèdnèkolim - - - Kamcatka - - - Anadir - - - Riad - - - Guadalkanal - - - Mahé - - - Hartum - - - Stokholem - - - Singapur - - - Sint-Héléna - - - Lubliana - - - Longyear Kota - - - Bratislawa - - - Priton - - - Mogadisu - - - Sint-Tomas - - - Salbador - - - Damsik - - - Njamèna - - - Kèrgélèn - - - Dusambé - - - Pakaopo - - - Askabat - - - Stambul - - - Punaputi - - - Taipé - - - Darussalam - - - Kiip - - - Akmesjid - - - Midwé - - - Wék - - - Angkorèt - - - Losènjeles - - - Pènik - - - Cikago - - - Piterbereh, Indiana - - - Niu-Yorek - - - Montébidéo - - - Samarkan - - - Taskèn - - - Watikan - - - Sint-Winsèn - - - Karakas - - - Sint-Tomas (Karaiben) - - - Hociming - - - Épaté - - - Walis - - - Méot - - - Yohanesbereh - - - Hararé - - - - Waktu Akre - Waktu Pakem Akre - Waktu Musim Pentèr Akre - - - - - Waktu Apganistan - - - - - Waktu Aprika Tenga - - - - - Waktu Aprika Wètan - - - - - Waktu Pakem Aprika Kidul - - - - - Waktu Aprika Kulon - - - - - Waktu Alaska - Waktu Pakem Alaska - Waktu Musim Pentèr Alaska - - - - - Waktu Almati - Waktu Pakem Almati - Waktu Musim Pentèr Almati - - - - - Waktu Amason - Waktu Pakem Amason - Waktu Musim Pentèr Amason - - - - - Waktu Tenga - Waktu Pakem Tenga - Waktu Musim Pentèr Tenga - - - - - Waktu Wètan - Waktu Pakem Wètan - Waktu Musim Pentèr Wètan - - - - - Waktu Gunung - Waktu Pakem Gunung - Waktu Musim Pentèr Gunung - - - - - Waktu Teduh - Waktu Pakem Teduh - Waktu Musim Pentèr Teduh - - - - - Waktu Anadir - Waktu Pakem Anadir - Waktu Musim Pentèr Anadir - - - - - Waktu Apia - Waktu Pakem Apia - Waktu Musim Pentèr Apia - - - - - Waktu Akto - Waktu Pakem Akto - Waktu Musim Pentèr Akto - - - - - Waktu Aktobé - Waktu Pakem Aktobé - Waktu Musim Pentèr Aktobé - - - - - Waktu Arab - Waktu Pakem Arab - Waktu Musim Pentèr Arab - - - - - Waktu Argèntina - Waktu Pakem Argèntina - Waktu Musim Pentèr Argèntina - - - - - Waktu Argèntina Kulon - Waktu Pakem Argèntina Kulon - Waktu Musim Pentèr Argèntina Kulon - - - - - Waktu Lemènder - Waktu Pakem Lemènder - Waktu Musim Pentèr Lemènder - - - - - Waktu Atlantik - Waktu Pakem Atlantik - Waktu Musim Pentèr Atlantik - - - - - Waktu Ostrali Tenga - Waktu Pakem Ostrali Tenga - Waktu Musim Pentèr Ostrali Tena - - - - - Waktu Ostrali Kulon-tenga - Waktu Pakem Ostrali Kulon-tenga - Waktu Musim Pentèr Ostrali Kulon-tenga - - - - - Waktu Ostrali Wètan - Waktu Pakem Ostrali Wètan - Waktu Musim Pentèr Ostrali Wètan - - - - - Waktu Ostrali Kulon - Waktu Pakem Ostrali Kulon - Waktu Musim Pentèr Ostrali Kulon - - - - - Waktu Asèrbaijan - Waktu Pakem Asèrbaijan - Waktu Musim Pentèr Asèrbaijan - - - - - Waktu Asoren - Waktu Pakem Asoren - Waktu Musim Pentèr Asoren - - - - - Waktu Benggaladésa - Waktu Pakem Benggaladésa - Waktu Musim Pentèr Benggaladésa - - - - - Waktu Butan - - - - - Waktu Boliwi - - - - - Waktu Brasilia - Waktu Pakem Brasilia - Waktu Musim Pentèr Brasilia - - - - - Waktu Bruné Darussalam - - - - - Waktu Tanjung Ijo - Waktu Pakem Tanjung Ijo - Waktu Musim Pentèr Tanjung Ijo - - - - - Waktu Casey - - - - - Waktu Pakem Camoro - - - - - Waktu Catham - Waktu Pakem Catham - Waktu Musim Pentèr Catham - - - - - Waktu Cili - Waktu Pakem Cili - Waktu Musim Pentèr Cili - - - - - Waktu Tiongkok - Waktu Pakem Tiongkok - Waktu Musim Pentèr Tiongkok - - - - - Waktu Pulo Natal - - - - - Waktu Pulo Kokos - - - - - Waktu Kolombia - Waktu Pakem Kolombia - Waktu Musim Pentèr Kolombia - - - - - Waktu Pulo Cook - Waktu Pakem Pulo Cook - Waktu Musim Pentèr Pulo Cook - - - - - Waktu Kuba - Waktu Pakem Kuba - Waktu Musim Pentèr Kuba - - - - - Waktu Davis - - - - - Waktu Dumont-d’Urville - - - - - Waktu Timor Wètan - - - - - Waktu Pulo Paskah - Waktu Pakem Pulo Paskah - Waktu Musim Pentèr Pulo Paskah - - - - - Waktu Èkuador - - - - - Waktu Èropa Tenga - Waktu Pakem Èropa Tenga - Waktu Musim Pentèr Èropa Tenga - - - - - Waktu Èropa Wètan - Waktu Pakem Èropa Wètan - Waktu Musim Pentèr Èropa Wètan - - - - - Waktu Èropa Wètan-jau - - - - - Waktu Èropa Kulon - Waktu Pakem Èropa Kulon - Waktu Musim Pentèr Èropa Kulon - - - - - Waktu Pulo Paklan - Waktu Pakem Pulo Paklan - Waktu Musim Pentèr Pulo Paklan - - - - - Waktu Piji - Waktu Pakem Piji - Waktu Musim Pentèr Piji - - - - - Waktu Guyana Prasman - - - - - Waktu Wilayah Kulon èn Kutub Kidul Prasman - - - - - Waktu Galapagos - - - - - Waktu Gambier - - - - - Waktu Géorgi - Waktu Pakem Géorgi - Waktu Musim Pentèr Géorgi - - - - - Waktu Pulo Gilbet - - - - - Waktu Rerata Greenwich - - - - - Waktu Grunlan Wètan - Waktu Pakem Grunlan Wètan - Waktu Musim Pentèr Grunlan Wètan - - - - - Waktu Grunlan Kulon - Waktu Pakem Grunlan Kulon - Waktu Musim Pentèr Grunlan Kulon - - - - - Waktu Pakem Telok - - - - - Waktu Guyana - - - - - Waktu Pakem Hawai-Aléut - - - - - Waktu Hawai-Aléut - Waktu Pakem Hawai-Aléut - Waktu Musim Pentèr Hawai-Aléut - - - - - Waktu Hongkong - Waktu Pakem Hongkong - Waktu Musim Pentèr Hongkong - - - - - Waktu Houd - Waktu Pakem Houd - Waktu Musim Pentèr Houd - - - - - Waktu Hindi Pakem - - - - - Waktu Laotan Hindi - - - - - Waktu Indocina - - - - - Waktu Indonésia Tenga - - - - - Waktu Indonésia Wètan - - - - - Waktu Indonésia Kulon - - - - - Waktu Iran - Waktu Pakem Iran - Waktu Musim Pentèr Iran - - - - - Waktu Irkut - Waktu Pakem Irkut - Waktu Musim Pentèr Irkut - - - - - Waktu Israèl - Waktu Pakem Israèl - Waktu Musim Pentèr Israèl - - - - - Waktu Jepang - Waktu Pakem Jepang - Waktu Musim Pentèr Jepang - - - - - Waktu Pètropaulop-Kamcatka - Waktu Pakem Pètropaulop-Kamcatka - Waktu Musim Pentèr Pètropaulop-Kamcatka - - - - - Waktu Kasakstan Wètan - - - - - Waktu Kasakstan Kulon - - - - - Waktu Koréa - Waktu Pakem Koréa - Waktu Musim Pentèr Koréa - - - - - Waktu Kosaé - - - - - Waktu Krasnoyar - Waktu Pakem Krasnoyar - Waktu Musim Pentèr Krasnoyar - - - - - Waktu Kirgistan - - - - - Waktu Sri Langka - - - - - Waktu Pulo Line - - - - - Waktu Lord Howe - Waktu Pakem Lord Howe - Waktu Musim Pentèr Lord Howe - - - - - Waktu Makao - Waktu Pakem Makao - Waktu Musim Pentèr Makao - - - - - Waktu Magadan - Waktu Pakem Magadan - Waktu Musim Pentèr Magadan - - - - - Waktu Malésia - - - - - Waktu Maladéwa - - - - - Waktu Markésas - - - - - Waktu Pulo Marsal - - - - - Waktu Moritius - Waktu Pakem Moritius - Waktu Musim Pentèr Moritius - - - - - Waktu Mawson - - - - - Waktu Mèksiko Teduh - Waktu Pakem Mèksiko Teduh - Waktu Musim Pentèr Mèksiko Teduh - - - - - Waktu Ulanbator - Waktu Pakem Ulanbator - Waktu Musim Pentèr Ulanbator - - - - - Waktu Mosko - Waktu Pakem Mosko - Waktu Musim Pentèr Mosko - - - - - Waktu Mianmar - - - - - Waktu Nauru - - - - - Waktu Népal - - - - - Waktu Kalédoni Baru - Waktu Pakem Kalédoni Baru - Waktu Musim Pentèr Kalédoni Baru - - - - - Waktu Sélan Baru - Waktu Pakem Sélan Baru - Waktu Musim Pentèr Sélan Baru - - - - - Waktu Niuponlan - Waktu Pakem Niuponlan - Waktu Musim Pentèr Niuponlan - - - - - Waktu Niué - - - - - Waktu Pulo Norpok - Waktu Pakem Pulo Norpok - Waktu Musim Pentèr Pulo Norpok - - - - - Waktu Fernando de Noronha - Waktu Pakem Fernando de Noronha - Waktu Musim Pentèr Fernando de Noronha - - - - - Waktu Nowosibir - Waktu Pakem Nowosibir - Waktu Musim Pentèr Nowosibir - - - - - Waktu Om - Waktu Pakem Om - Waktu Musim Pentèr Om - - - - - Waktu Pakistan - Waktu Pakem Pakistan - Waktu Musim Pentèr Pakistan - - - - - Waktu Palau - - - - - Waktu Papua Giné Baru - - - - - Waktu Paragué - Waktu Pakem Paragué - Waktu Musim Pentèr Paragué - - - - - Waktu Péru - Waktu Pakem Péru - Waktu Musim Pentèr Péru - - - - - Waktu Pilipénen - Waktu Pakem Pilipénen - Waktu Musim Pentèr Pilipénen - - - - - Waktu Pulo Pènik - - - - - Waktu Sint-Pièr èn Mikélon - Waktu Pakem Sint-Pièr èn Mikélon - Waktu Musim Pentèr Sint-Pièr èn Mikélon - - - - - Waktu Pitkèren - - - - - Waktu Ponapé - - - - - Waktu Piongyang - - - - - Waktu Kisilorda - Waktu Pakem Kisilorda - Waktu Musim Pentèr Kisilorda - - - - - Waktu Réunion - - - - - Waktu Rothera - - - - - Waktu Sahalin - Waktu Pakem Sahalin - Waktu Musim Pentèr Sahalin - - - - - Waktu Samara - Waktu Pakem Samara - Waktu Musim Pentèr Samara - - - - - Waktu Samoa - Waktu Pakem Samoa - Waktu Musim Pentèr Samoa - - - - - Waktu Sésèl - - - - - Waktu Pakem Singapur - - - - - Waktu Pulo Suléman - - - - - Waktu Géorgi Kidul - - - - - Waktu Suriname - - - - - Waktu Syowa - - - - - Waktu Tahiti - - - - - Waktu Taipé - Waktu Pakem Taipé - Waktu Musim Pentèr Taipé - - - - - Waktu Tajikistan - - - - - Waktu Tokelau - - - - - Waktu Tonga - Waktu Pakem Tonga - Waktu Musim Pentèr Tonga - - - - - Waktu Cuk - - - - - Waktu Turkmènistan - Waktu Pakem Turkmènistan - Waktu Musim Pentèr Turkmènistan - - - - - Waktu Tuwalu - - - - - Waktu Urugué - Waktu Pakem Urugué - Waktu Musim Pentèr Urugué - - - - - Waktu Usbèkistan - Waktu Pakem Usbèkistan - Waktu Musim Pentèr Usbèkistan - - - - - Waktu Wanuatu - Waktu Pakem Wanuatu - Waktu Musim Pentèr Wanuatu - - - - - Waktu Bénésuèla - - - - - Waktu Weladiwostok - Waktu Pakem Weladiwostok - Waktu Musim Pentèr Weladiwostok - - - - - Waktu Wolgograd - Waktu Pake Wolgograd - Waktu Musim Pentèr Wolgograd - - - - - Waktu Wostok - - - - - Waktu Pulo Wék - - - - - Waktu Walis èn Putuna - - - - - Waktu Yakut - Waktu Pakem Yakut - Waktu Musim Pentèr Yakut - - - - - Waktu Yékatèrinenbereh - Waktu Pakem Yékatèrinenbereh - Waktu Musim Pentèr Yékatèrinenbereh - - - - - Waktu Yukon - - - - - - - , - . - . - - - - - 0 rèbu - 00 rèbu - 000 rèbu - 0 juta - 00 juta - 000 juta - 0 miliar - 00 miliar - 000 miliar - 0 triliun - 00 triliun - 000 triliun - - - - - 0 rb - 00 rb - 000 rb - 0 jt - 00 jt - 000 jt - 0 M - 00 M - 000 M - 0 T - 00 T - 000 T - - - - - - - ¤#,##0.00 - - - - - ¤ 0 rb - ¤ 00 rb - ¤ 000 rb - ¤ 0 jt - ¤ 00 jt - ¤ 000 jt - ¤ 0 M - ¤ 00 M - ¤ 000 M - ¤ 0 T - ¤ 00 T - ¤ 000 T - - - {0} {1} - - - - Dirham Imarat Arab Rempug - dirham Imarat Arab Rempug - - - Apgani Apganistan - apgani Apganistan - - - Lèk Albani - lèk Albani - - - Dirham Lemènder - dirham Lemènder - - - Gulden Antilen Belanda - gulden Antilen Belanda - - - Kuansa Anggola - kuansa Anggola - - - Pèso Argèntina - pèso Argèntina - - - Dolar Ostrali - dolar Ostrali - - - Plorèn Aruba - plorèn Aruba - - - Manat Asèrbaijan - manat Asèrbaijan - - - Marek Tukeran Bosni-Hèrségowina - marek tukeran Bosni-Hèrségowina - - - Dolar Barbados - dolar Barbados - - - Taka Benggaladésa - taka Benggaladésa - - - Lèp Bulgari - lèp Bulgari - - - Dinar Bahrén - dinar Bahrén - - - Prang Burundi - prang Burundi - - - Dolar Bermuda - dolar Bermuda - - - Ringgit Bruné - ringgit Bruné - - - Boliwiano Boliwi - boliwiano Boliwi - - - Rèal Brasil - rèal Brasil - - - Dolar Bahama - dolar Bahama - - - Ngultrum Butan - ngultrum Butan - - - Pula Boswana - pula Boswana - - - Rubel Ruslan Puti - rubel Ruslan Puti - - - Dolar Bélis - dolar Bélis - - - Dolar Kanada - dolar Kanada - - - Prang Kongo - prang Kongo - - - Prang Switserlan - prang Switserlan - - - Pèso Cili - pèso Cili - - - Yuèn Tiongkok (luar negeri) - yuèn Tiongkok (luar negeri) - - - Yuèn Tiongkok - yuèn Tiongkok - - - Pèso Kolombia - pèso Kolombia - - - Kolon Kosta Rika - kolon Kosta Rika - - - Pèso Tukeran Kuba - pèso tukeran Kuba - - - Pèso Kuba - pèso Kuba - - - Èskudo Tanjung Ijo - èskudo Tanjung Ijo - - - Kron Cèko - kron Cèko - - - Prang Jibuti - prang Jibuti - - - Kron Dènemarken - kron Dènemarken - - - Pèso Dominika - pèso Dominika - - - Dinar Aljajaèr - dinar Aljajaèr - - - Pon Mesir - pon Mesir - - - nakpa Èritréa - - - Bir Habsi - bir Habsi - - - Èuro - èuro - - - Dolar Piji - dolar Piji - - - Pon Pulo Paklan - pon Pulo Paklan - - - Pon Britani - pon Britani - - - Lari Géorgi - lari Géorgi - - - Sédi Gana - sédi Gana - - - Pon Jabal Tarik - pon Jabal Tarik - - - Dalasi Gana - dalasi Gambia - - - Prang Giné - prang Giné - - - Kètsal Guatémala - kètsal Guatémala - - - Dolar Guyana - dolar Guyana - - - Dolar Hongkong - dolar Hongkong - - - Lèmpira Honduras - lèmpira Honduras - - - Kuna Kroasi - kuna Kroasi - - - Gurda Haiti - gurda Haiti - - - Porin Honggari - porin Honggari - - - Rupiah Indonésia - rupiah Indonésia - - - Sèkèl Baru Israèl - sèkèl baru Israèl - - - Rupiah Hindi - rupiah Hindi - - - Dinar Irak - dinar Irak - - - Rèal Iran - rèal Iran - - - Kron Èslan - kron Èslan - - - Dolar Jamaika - dolar Jamaika - - - Dinar Urdun - dinar Urdun - - - Yèn Jepang - yèn Jepang - - - Siling Kénia - siling Kénia - - - Sum Kirgistan - sum Kirgistan - - - Rèal Kemboja - rèal Kemboja - - - Prang Komoro - prang Komoro - - - Won Koréa Lor - won Koréa Lor - - - Won Koréa Kidul - won Koréa Kidul - - - Dinar Kuwaèt - dinar Kuwaèt - - - Dolar Pulo Kaèman - dolar Pulo Kaèman - - - Tènggé Kasakstan - tènggé Kasakstan - - - Kip Laos - kip Laos - - - Pon Lèbanon - pon Lèbanon - - - Rupiah Sri Langka - rupiah Sri Langka - - - Dolar Libéria - dolar Libéria - - - Loti Lésoto - loti Lésoto - - - Dinar Libi - dinar Libi - - - Dirham Maroko - dirham Maroko - - - Léu Moldawi - léu Moldawi - - - Rèal Madagaskar - rèal Madagaskar - - - Dinar Makèdoni - dinar Makèdoni - - - Kiat Mianmar - kiat Mianmar - - - Tugrik Monggoli - tugrik Monggoli - - - Pataka Makao - pataka Makao - - - Ukiah Moritani - ukiah Moritani - - - Rupiah Moritius - rupiah Moritius - - - Rupiah Maladéwa - rupiah Maladéwa - - - Kuaca Malawi - kuaca Malawi - - - Pèso Mèksiko - pèso Mèksiko - - - Pèso Pèrak Mèksiko (1861–1992) - pèso pèrak Mèksiko (1861–1992) - - - Ringgit Malésia - ringgit Malésia - - - Miskal Mosambik - miskal Mosambik - - - Dolar Namibi - dolar Namibi - - - Naira Nigéria - naira Nigéria - - - Kordoba Nikaragua (1988–1991) - kordoba Nikaragua (1988–1991) - - - Kordoba Nikaragua - kordoba Nikaragua - - - Kron Norwèhen - kron Norwèhen - - - Rupiah Népal - rupiah Népal - - - Dolar Sélan Baru - dolar Sélan Baru - - - Rèal Oman - rèal Oman - - - Balboa Panama - balboa Panama - - - Sol Péru - sol Péru - - - Kina Papua Giné Baru - kina Papua Giné Baru - - - Pèso Pilipénen - pèso Pilipénen - - - Rupiah Pakistan - rupiah Pakistan - - - Złoty Polen - złoty Polen - - - Guarani Paragué - guarani Paragué - - - Rèal Katar - rèal Katar - - - Léu Ruméni - léu Ruméni - - - Dinar Sèrwi - dinar Sèrwi - - - Rubel Ruslan - rubel Ruslan - - - Prang Ruanda - prang Ruanda - - - Rèal Saudi - rèal Saudi - - - Dolar Pulo Suléman - dolar Pulo Suléman - - - Rupiah Sésèl - rupiah Sésèl - - - Pon Sudan - pon Sudan - - - Kron Swèden - kron Swèden - - - Dolar Singapur - dolar Singapur - - - Pon Sint Héléna - pon Sint Héléna - - - Léon Gunung Singa - léon Gunung Singa - - - Léon Gunung Singa (1964—2022) - léon Gunung Singa (1964—2022) - - - Siling Somali - siling Somali - - - Dolar Suriname - dolar Suriname - - - Pon Sudan Kidul - pon Sudan Kidul - - - Dobra Sint Tomas èn Prins - dobra Sint Tomas èn Prins - - - Kolon Salbador - kolon Salbador - - - Pon Suriah - pon Suriah - - - Lilanggéni Swasilan - lilanggéni Swasilan - - - Bat Muang-Tay - bat Muang-Tay - - - Samani Tajikistan - samani Tajikistan - - - Manat Turkmènistan - manat Turkmènistan - - - Dinar Tunis - dinar Tunis - - - Pa’anga Tonga - pa’anga Tonga - - - Lira Turki - lira Turki - - - Dolar Trinidad èn Tobago - dolar Trinidad èn Tobago - - - Yuèn Baru Taiwan - yuèn baru Taiwan - - - Siling Tansania - siling Tansania - - - Heriwnia Ukrain - heriwnia Ukrain - - - Siling Uganda - siling Uganda - - - Dolar Amrik Serèkat - dolar Amrik Serèkat - - - Dolar AS (Bèsokannya) - dolar AS (bèsokannya) - - - Dolar AS (Ari nyang sama) - dolar AS (ari nyang sama) - - - Pèso Urugué - pèso Urugué - - - Sum Usbèkistan - sum Usbèkistan - - - Boliwar Bénésuèla - boliwar Bénésuèla - - - Dong Piètnam - dong Piètnam - - - Watu Wanuatu - watu Wanuatu - - - Dolar Samoa - dolar Samoa - - - Prang CFA Aprika Tenga - prang CFA Aprika Tenga - - - Dolar Karaiben Wètan - dolar Karaiben Wètan - - - Prang CFA Aprika Kulon - prang CFA Aprika Kulon - - - Prang CFP - prang CFP - - - Mata Uang Kaga’ Ditauin - (mata uang kaga’ ditauin) - - - Rèal Yaman - rèal Yaman - - - Ran Aprika Kidul - ran Aprika Kidul - - - Kuaca Sambia - kuaca Sambia - - - - {0} ari - Ambil tègongan ke-{0} nganan. - - - - - - dèsi{0} - - - sènti{0} - - - mili{0} - - - mikro{0} - - - nano{0} - - - piko{0} - - - pèmto{0} - - - ato{0} - - - sèpto{0} - - - jokto{0} - - - ronto{0} - - - kuèkto{0} - - - dèka{0} - - - hèkto{0} - - - kilo{0} - - - mèga{0} - - - giga{0} - - - tèra{0} - - - pèta{0} - - - èksa{0} - - - sèta{0} - - - jota{0} - - - rona{0} - - - kuèta{0} - - - kibi{0} - - - mèbi{0} - - - gibi{0} - - - tèbi{0} - - - pèbi{0} - - - èksbi{0} - - - sèbi{0} - - - jobi{0} - - - {0} per {1} - - - {0} pesegi - - - {0} kubik - - - {0}-{1} - - - {0} g-force - - - mèter per sekon pesegi - {0} mèter per sekon pesegi - - - kiteran - {0} kiteran - - - {0} radial - - - {0} derajat - - - menit busur - {0} menit busur - - - sekon busur - {0} sekon busur - - - kilomèter pesegi - {0} kilomèter pesegi - {0} per kilomèter pesegi - - - {0} hèktar - - - mèter pesegi - {0} mèter pesegi - {0} per mèter pesegi - - - sèntimèter pesegi - {0} sèntimèter pesegi - {0} per sèntimèter pesegi - - - mil pesegi - {0} mil pesegi - {0} per mil pesegi - - - {0} aker - - - yard pesegi - {0} yard pesegi - - - kaki pesegi - {0} kaki pesegi - - - inci pesegi - {0} inci pesegi - {0} per inci pesegi - - - {0} karat - - - miligram per dèsilèter - {0} miligram per dèsilèter - - - milimol per lèter - {0} milimol per lèter - - - bagèan per juta - {0} bagèan per juta - - - {0} prosèn - - - {0} perèbu - - - {0} perceban - - - lèter per kilomèter - {0} lèter per kilomèter - - - lèter per 100 kilomèter - {0} lèter per 100 kilomèter - - - mil per galon - {0} mil per galon - - - mil per galon Kaès. - {0} mil per galon Kaès. - - - pètabèt - {0} pètabèt - - - tèrabèt - {0} tèrabèt - - - tèrabit - {0} tèrabit - - - gigabèt - {0} gigabèt - - - gigabit - {0} gigabit - - - mègabèt - {0} mègabèt - - - mègabit - {0} mègabit - - - kilobèt - {0} kilobèt - - - kilobit - {0} kilobit - - - abad - {0} abad - - - dékade - {0} dékade - - - tahon - {0} tahon - {0} per tahon - - - kuartal - {0} kuartal - {0} per kuartal - - - bulan - {0} bulan - {0} per bulan - - - minggu - {0} minggu - {0} per minggu - - - {0} per ari - - - {0} per jem - - - menit - {0} menit - {0} per menit - - - sekon - {0} sekon - {0} per sekon - - - milisekon - {0} milisekon - - - mikrosekon - {0} mikrosekon - - - nanosekon - {0} nanosek - - - ampere - {0} ampere - - - miliampere - {0} miliampere - - - {0} ohm - - - {0} volt - - - kilokalori - {0} kilokalori - - - kalori - {0} kalori - - - {0} kilojoule - - - {0} joule - - - kilowatt-jem - {0} kilowatt-jem - - - {0} èlèktronvolt - - - satuan panas Britani - {0} satuan panas Britani - - - {0} pon gaya - - - {0} newton - - - kilowatt-jem per 100 kilomèter - {0} kilowatt-jem per 100 kilomèter - - - gigahertz - {0} gigahertz - - - mègahertz - {0} mègahertz - - - kilohertz - {0} kilohertz - - - hertz - {0} hertz - - - em tulisan - - - piksel - {0} piksel - - - mègapiksel - {0} mègapiksel - - - piksel per sèntimèter - {0} piksel per sèntimèter - - - piksel per inci - {0} piksel per inci - - - jari-jari Bumi - {0} jari-jari Bumi - - - kilomèter - {0} kilomèter - {0} per kilomèter - - - mèter - {0} mèter - {0} per mèter - - - dèsimèter - {0} dèsimèter - - - sèntimèter - {0} sèntimèter - {0} per sèntimèter - - - milimèter - {0} milimèter - - - mikromèter - {0} mikromèter - - - nanomèter - {0} nanomèter - - - pikomèter - {0} pikomèter - - - mil - {0} mil - - - yard - {0} yard - - - {0} per kaki - - - inci - {0} inci - {0} per inci - - - parsek - {0} parsek - - - tahon cahaya - {0} tahon cahaya - - - satuan palak - {0} satuan palak - - - purlong - {0} purlong - - - padem - {0} padem - - - mil laot - {0} mil laot - - - mil skandinawi - {0} mil skandinawi - - - poin - {0} poin - - - jari-jari Mataari - {0} jari-jari Mataari - - - {0} luk - - - kandèla - {0} kandèla - - - lumèn - {0} lumèn - - - {0} pentèran Mataari - - - ton mètrik - {0} ton mètrik - - - kilogram - {0} kilogram - {0} per kilogram - - - {0} gram - {0} per gram - - - miligram - {0} miligram - - - mikrogram - {0} mikrogram - - - ton Amrik Serèkat - {0} ton Amrik Serèkat - - - {0} batu - - - {0} per pon - - - {0} per on - - - {0} dalton - - - masa Bumi - {0} masa Bumi - - - masa Mataari - {0} masa Mataari - - - gigawatt - {0} gigawatt - - - mègawatt - {0} mègawatt - - - kilowatt - {0} kilowatt - - - {0} watt - - - miliwatt - {0} miliwatt - - - tenaga kuda - {0} tenaga kuda - - - milimèter raksa - {0} milimèter raksa - - - pon per inci pesegi - {0} pon per inci pesegi - - - inci raksa - {0} inci raksa - - - milibar - {0} milibar - - - atmospir - {0} atmospir - - - pascal - {0} pascal - - - hèktopascal - {0} hèktopascal - - - kilopascal - {0} kilopascal - - - mègapascal - {0} mègapascal - - - kilomèter per jem - {0} kilomèter per jem - - - mèter per sekon - {0} mèter per sekon - - - mil per jem - {0} mil per jem - - - kenop - {0} kenop - - - Beaufort - Beaufort {0} - - - derajat Celsius - {0} derajat Celsius - - - deraja Fahrenheit - {0} derajat Fahrenheit - - - kelvin - {0} kelvin - - - pon kaki - {0} pon kaki - - - newton mèter - {0} newton mèter - - - kilomèter kibik - {0} kilomèter kibik - - - mèter kibik - {0} mèter kibik - {0} per mèter kibik - - - sèntimèter kibik - {0} sèntimèter kibik - {0} per sèntimèter kibik - - - mil kibik - {0} mil kibik - - - yard kibik - {0} yard kibik - - - kaki kibik - {0} kaki kibik - - - inci kibik - {0} inci kibik - - - mègalèter - {0} mègalèter - - - hèktolèter - {0} hèktolèter - - - {0} lèter - {0} per lèter - - - dèsilèter - {0} dèsilèter - - - sèntilèter - {0} sèntilèter - - - mililèter - {0} mililèter - - - pint mètrik - {0} pint mètrik - - - cangkir mètrik - {0} cangkir mètrik - - - aker kaki - {0} aker kaki - - - {0} gantang - - - galon - {0} galon - {0} per galon - - - galon Kaès. - {0} galon Kaès. - {0} per galon Kaès. - - - kuart - {0} kuart - - - {0} pint - - - {0} cangkir - - - on caèr - {0} on caèr - - - on caèr Kaès. - {0} on caèr Kaès. - - - tèsi makan - {0} tèsi makan - - - tèsi té - {0} tèsi té - - - {0} barèl - - - tèsi kué - {0} tèsi kué - - - tèsi kué Kaès. - {0} tèsi kué Kaès. - - - kuart Kaès. - {0} kuart Kaès. - - - arah mata angin - {0} wètan - {0} lor - {0} kidul - {0} kulon - - - - - m/sek² - {0} m/sek² - - - kit - {0} kit - - - radial - - - derajat - {0} drj - - - mnt busur - {0} mnt busur - - - sek busur - {0} sek busur - - - hèktar - - - aker - - - yard² - - - inci² - - - karat - - - milimol/lèter - - - biji - {0} biji - - - bagèan/juta - - - prosèn - - - perèbu - - - perceban - - - lèter/km - - - mil/gal - {0} mpg - - - mil/gal Kaès. - {0} mpg Kaès. - - - PBèt - - - TBèt - - - Tbit - - - GBèt - - - Gbit - - - MBèt - - - Mbit - - - kBèt - - - kbit - - - bèt - {0} bèt - - - abd - {0} abd - - - dék - {0} dék - - - thn - {0} thn - {0}/thn - - - krtl - {0} krtl - {0}/krtl - - - bln - {0} bln - {0}/bln - - - mgg - {0} mgg - {0}/mgg - - - ari - {0} ari - {0}/ari - - - jem - {0} jem - {0}/jem - - - mnt - {0} mnt - {0}/mnt - - - sek - {0} sek - {0}/sek - - - milisek - {0} msek - - - μsek - {0} μsek - - - nsek - {0} nsek - - - miliamp - - - kkal - {0} kkal - - - kal - {0} kal - - - kilojoule - - - kW-jem - - - èlèktronvolt - - - BTU - - - tèrem AS - {0} tèrem AS - - - pon gaya - - - newton - - - piks - {0} piks - - - Mpiks - {0} Mpiks - - - m - - - kaki - {0} kaki - {0}/kaki - - - thn cah - {0} thn cah - - - sa - {0} sa - - - pdm - {0} pdm - - - luk - - - pentèran Mataari - - - ton AS - {0} tn AS - - - batu - - - pon - {0} pon - {0}/pon - - - on - {0} on - {0}/on - - - on troy - {0} on troy - - - karat - {0} karat - - - dalton - - - grèn - {0} grèn - - - tk - {0} tk - - - mmHg - {0} mmHg - - - km/jem - {0} km/jem - - - m/sek - {0} m/sek - - - mil/jem - {0} mil/jem - - - yard³ - - - inci³ - - - lèter - {0} L - {0}/L - - - gantang - - - gal - {0} gal - {0}/gal - - - gal Kaès. - {0} gal Kaès. - {0}/gal Kaès. - - - pint - - - cangkir - - - fl oz - {0} fl oz - - - fl oz Kaès. - {0} fl oz Kaès. - - - tsm - {0} tsm - - - tst - {0} tst - - - barèl - - - tsk - {0} tsk - - - tsk Kaès. - {0} tsk Kaès. - - - tètès - {0} tètès - - - dirham caèr - {0} dirham caèr - - - takeran gula - {0} takeran gula - - - jumput - {0} jumput - - - qt Kaès. - {0} qt Kaès. - - - arah - {0} w - {0} l - {0} kdl - {0} kln - - - - - m/s² - - - {0}kit - - - {0}rad - - - drj - - - m busur - - - s busur - - - yd² - - - {0} inci² - {0}/inci² - - - mpg - - - mpg Kaès. - {0} m/g Kaès. - - - PB - - - TB - - - Tb - - - GB - - - Gb - - - Mb - - - B - - - j - {0} j - {0}/j - - - m - {0} m - {0}/m - - - s - {0} s - {0}/s - - - ms - {0} ms - - - μs - {0} μs - - - ns - - - kJ - - - kWh - - - lbf - - - N - - - px - - - MP - - - {0}″ - - - tc - {0} tc - - - {0} au - - - L☉ - - - ton - - - oz - {0}/oz - - - gr - {0} gr - - - ″ Hg - {0}″ Hg - - - km/j - {0} km/j - - - m/s - - - mil/j - {0} mil/j - - - {0} galIm - {0}/galIm - - - fl.dr. - {0} fl.dr. - - - {0} - - - {0}w - {0}l - {0}kdl - {0}kln - - - - h.mm - - - h.mm.ss - - - m.ss - - - - - {0}, èn {1} - {0} èn {1} - - - {0}, atawa {1} - {0} atawa {1} - - - {0}, {1} - - - {0}, {1} - - - {0}, {1} - - - - - ya:y - kaga’:k - - - - {0} — semua - {0} — kecocokan - {0} — kelampir - {0} — tambahan - {0} — madep kèbot - {0} — madep kanan - {0} — jaman dulu - {0} — laèn-laèn - {0} — laènnya - hurup — {0} - {0} gorètan - hurup kecil bawah {0} - hurup kecil atas {0} - aktipitèt - hurup Aprika - hurup Amrik - héwan - héwan atawa alam - panah - awak - gambar kotak - brél - gedong - buletan atawa bintang - camo hurup mati - lambang mata uang - setrip atawa tanda pengubung - angka - lambang nujum - panah bawah - panah atas-bawah - hurup Asia Wètan - émoji - hurup Èropa - wadon - bendèra - bendèra - makanan & minuman - bentukan - bentukan & apstan kosong - macem lèbar-tutug - bentuk géomètris - macem lèbar-paro - hurup Han - oyod Han - Hanja - hurup Tionghoa (ringkes) - hurup Tionghoa (terdisionil) - ati - hurup jaman dulu - lèter jab. gambar arti - gana Jepang - kambun - Kanji - panah kèbot - panah kanan-kèbot - lambang kaya’ hurup - pemakéan kewates - lanang - lambang ètung-ètungan - hurup Wètan Tenga - laèn-laèn - hurup modèren - pengrobah - lambang tanji - alam - sonderapstan - nomer - benda - laènnya - dipasangin - orang - hurup ponètis - hurup gambar - tempat - taneman - tenger baca - panah kanan - tenger atawa lambang - macem kecil - mèseman - mèseman atawa orang - hurup Asia Kidul - hurup Asia Kidul-wètan - apstan - gerak badan - lambang - lambang tèhnis - tenger nada - ladog - ladog atawa tempat - panah atas - macem - camo hurup idup - cuaca - hurup Asia Kulon - apstan kosong - - - doyong - ukuran optikal - mèncong - lèbar - berat - tulisan - keterangan - tèks - judul - pampangan - mèncong kèbot - gaceng - mèncong - lebi-mèncong - keliwat-cempèt - lebi-cempèt - cempèt - separo-cempèt - biasa - separo-longgar - longgar - lebi-longgar - keliwat-longgar - tipis - lebi-tipis - terang - separo-terang - kitap - lumbrah - sedeng - separo-tebel - tebel - lebi-tebel - kereng - lebi-kereng - pecahan atas-bawah - apstan hurup gedé - ligatur opsionil - pecahan nyèrong - angka baris - angka tinggi sama - rèndèngan - angka proporsionil - hurup gedé-cilik - angka jadwal - nol begaris doyong - - - - {title} {given} {given2} {surname} {generation}, {credentials} - - - {given-informal} {surname} - - - {title} {surname} - - - {given-informal} - - - {given-informal-monogram-allCaps}{surname-monogram-allCaps} - - - {given} {given2-initial} {surname} {generation}, {credentials} - - - {given-informal} {surname} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {given-initial} {given2-initial} {surname} - - - {given-informal} {surname-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {title} {surname}, {given} {given2} {generation}, {credentials} - - - {surname}, {given-informal} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps}{given-informal-monogram-allCaps} - - - {surname}, {given} {given2-initial} {generation}, {credentials} - - - {surname}, {given-informal} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname}, {given-initial} {given2-initial} - - - {surname}, {given-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname-core}, {given} {given2} {surname-prefix} - - - {surname}, {given-informal} - - - {surname-core}, {given} {given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - {surname-core}, {given-initial} {given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - Nori - - - Abdulrachman - Saleh - - - Mohammad Hoesni - bin - Thamrin - - - Tn. - Zainuddin Hamidi - Zainuddin - bin - ∅∅∅ - Turmudzi - ∅∅∅ - ∅∅∅ - MP - - - Sinbad - - - Käthe - Müller - - - Zäzilia - Hamish - Stöber - - - Prof. Dr. - Ada Cornelia - Neele - César Martín - Brühl - González Domingo - Jr - M.D., Ph.D. - - - diff --git a/make/data/cldr/common/main/bew_ID.xml b/make/data/cldr/common/main/bew_ID.xml deleted file mode 100644 index 7aa28e331413..000000000000 --- a/make/data/cldr/common/main/bew_ID.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/make/data/cldr/common/main/bg.xml b/make/data/cldr/common/main/bg.xml index 48035772aec3..6ed2562021a9 100644 --- a/make/data/cldr/common/main/bg.xml +++ b/make/data/cldr/common/main/bg.xml @@ -143,11 +143,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ гръцки еламитски английски - австралийски английски - канадски английски - британски английски английски (UK) - американски английски английски (US) средновековен английски есперанто @@ -407,6 +403,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пали пиджин полски + пиемонтски понапеан малисеет-пасамакуоди пруски @@ -1066,18 +1063,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ред на сортиране Нормализирано сортиране Сортиране на цифрите + Пренареждане на скриптове/блокове Сила на сортиране валута + Трансформиране на дестинацията + Изключения за пренасяне по речник Представяне на емотикон + Първият ден от седмицата + Комбинирано Часови формат (12- или 24-часов) + Метод на въвеждане + Клавиатура + Игнорирани до най-високо ниво Стил за нов ред Нов ред в средата на думите + Правила за трансформиране Мерна система - цифри + Мерна единица + Числа + Регион за допълнителни данни + Източник за преобразуване + Подразделение на региона прекъсване на изречение след съкращение + Трансформиране + Машинно преведено Часова зона Вариант на локала Собствена употреба + Трансформиране за лична употреба будистки календар @@ -1097,13 +1110,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ еврейски календар еврейски Индийски граждански календар + индийски национален ислямски календар Хиджра ислямски календар Хиджра календар Хиджра + Хиджра, по наблюдение в Саудитска Арабия + Хиджра (табличен, астрономическа епоха) ислямски календар Хиджра (Ум ал-Кура) Хиджра (Ум ал-Кура) календар съгласно ISO 8601 + грегориански японски календар японски персийски календар @@ -1119,8 +1136,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Нормално сортиране по диакритични знаци Обратно сортиране по диакритични знаци Сортиране първо по долен регистър + Долен регистър Сортиране с нормален ред за регистъра + Долен регистър Сортиране първо по горен регистър + Горен регистър Сортиране без различаване на регистъра на буквите Сортиране с различаване на регистъра на буквите предишен ред на сортиране, за съвместимост @@ -1129,6 +1149,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ речник ред на сортиране в Unicode по подразбиране по подразбиране Unicode + емоджи + европейски правила Азбучен ред азбучен Фонетичен ред на сортиране @@ -1138,6 +1160,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ търсене с общо предназначение търсене Търсене по първоначални съгласни в хангул + корейска начална съгласна стандартен ред на сортиране стандартен Сортиране по щрих @@ -1152,17 +1175,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Нормализирано сортиране в Уникод Сортиране на цифрите индивидуално Сортиране на цифрите по числена стойност + Валута + Цифри + Пунктуация + Интервал + Символ Сортиране на всички + всички Сортиране само по основни букви + Само основни букви Сортиране по диакритични знаци/регистър/ширина/кана + Основни, диакритични знаци, регистър, варианти, кана Сортиране по диакритични знаци + Основни, диакритични знаци Сортиране по диакритични знаци/регистър/ширина + Основни, диакритични знаци, регистър, варианти С пълна ширина С половин ширина Цифрови по подразбиране емоджи текст + 12-часова система + 12 + 24-часова система + 24 12-часова система (0 – 11) 12 (0 – 11) 12-часова система (1 – 12) @@ -1171,6 +1208,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0 – 23) 24-часова система (1 – 24) 24 (1 – 24) + Преместване на интервали, пунктуация, всички символи + Преместване на интервали, пунктуация + Преместване на интервали, пунктуация + Преместване на интервали, пунктуация, невалутни символи Свободен стил за нов ред Свободен Нормален стил за нов ред @@ -1191,51 +1232,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ САЩ арабско-индийски цифри разширени арабско-индийски цифри + разширени арабско-индийски арменски цифри арменски цифри в долен регистър + арменски в долен регистър бенгалски цифри цифри в чакма цифри в деванагари етиопски цифри Финансови цифри + финансови цифри с пълна ширина + с пълна ширина грузински цифри гръцки цифри гръцки цифри в долен регистър + гръцки в долен регистър цифри в гуджарати цифри в гурмукхи + номериране на дните от месеца с логограми Хан за традиционни календари китайски десетични цифри + позиционна десетична система, използваща китайски йероглифи като цифри цифри в китайски (опростен) финансови цифри в китайски (опростен) + финансови в китайски (опростен) цифри в китайски (традиционен) финансови цифри в китайски (традиционен) + финансови в китайски (традиционен) цифри в иврит явански цифри японски цифри японски финансови цифри + японски финансови + японско номериране на първата година „Ганен“ кхмерски цифри цифри в каннада + религиозен Тай там там лаоски цифри западни цифри + математически удебелени + математически с двойни линии + математически непропорционални + математически несерифни удебелени + математически несерифни цифри в малаялам Монголски цифри цифри в меетеи майтек бирмански цифри + мианмарски източни Пуо Карен + мианмарски Пао + мианмарски Шан + мианмарски Тай Лайнг Местни цифри + местни цифри цифри в ол чики цифри в одия + контурни римски цифри + римски в горен регистър римски цифри в долен регистър + римски в долен регистър + сегментирани традиционни тамилски цифри тамилски цифри + модерни тамилски цифри в телугу тайландски цифри тибетски цифри Традиционни цифри + традиционни цифри цифри във ваи изкл. вкл. + Неопределен машинен превод + Вариант POSIX + + изкл. + вкл. + метрична имперска @@ -1300,7 +1375,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} 'в' {0} - {1} 'в' {0} + {1} 'в' {0} 'ч'. @@ -1311,23 +1386,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} 'в' {0} - {1} 'в' {0} + {1} 'в' {0} 'ч'. {1}, {0} + + {1}, {0} 'ч'. + {1}, {0} + + {1}, {0} 'ч'. + h 'ч'. B h:mm 'ч'. B h:mm:ss 'ч'. B + E h 'ч'. B E, h:mm 'ч'. B E, h:mm:ss 'ч'. B E, d @@ -1336,7 +1418,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, h:mm:ss 'ч'. a E, HH:mm:ss 'ч'. y 'г'. G + MM.y 'г'. G dd.MM.y 'г'. GGGGG + E, dd.MM.y 'г'. G MM.y 'г'. G d.MM.y 'г'. G E, d.MM.y 'г'. G @@ -1349,13 +1433,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH:mm 'ч'. h:mm:ss 'ч'. a HH:mm:ss 'ч'. + h 'ч'. a v HH 'ч' v M - d.MM - E, d.MM - MM - d.MM - E, d.MM + d.MM. + E, d.MM. + MM. + d.MM. + E, d.MM. LLLL d MMMM E, d MMMM @@ -1374,54 +1459,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y 'г'. G + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} - h – h B + h 'ч'. B – h 'ч'. B + h 'ч'. – h 'ч'. B - h:mm – h:mm B - h:mm – h:mm B + h:mm 'ч'. B – h:mm 'ч'. B + h:mm 'ч'. – h:mm 'ч'. B + h:mm 'ч'. – h:mm 'ч'. B d – d - y G – y G - y – y G + y 'г'. G – y 'г'. G + y 'г'. – y 'г'. G - M.y GGGGG – M.y GGGGG - M.y – M.y GGGGG - M.y – M.y GGGGG + M.y 'г'. GGGGG – M.y 'г'. GGGGG + M.y 'г'. – M.y 'г'. GGGGG + M.y 'г'. – M.y 'г'. GGGGG - d.M.y – d.M.y GGGGG - d.M.y GGGGG – d.M.y GGGGG - d.M.y – d.M.y GGGGG - d.M.y – d.M.y GGGGG + d.M.y 'г'. – d.M.y 'г'. GGGGG + d.M.y 'г'. GGGGG – d.M.y 'г'. GGGGG + d.M.y 'г'. – d.M.y 'г'. GGGGG + d.M.y 'г'. – d.M.y 'г'. GGGGG - E, d.M.y – E, d.M.y GGGGG - E, d.M.y GGGGG – E, d.M.y GGGGG - E, d.M.y – E, d.M.y GGGGG - E, d.M.y – E, d.M.y GGGGG + E, d.M.y 'г'. – E, d.M.y 'г'. GGGGG + E, d.M.y 'г'. GGGGG – E, d.M.y 'г'. GGGGG + E, d.M.y 'г'. – E, d.M.y 'г'. GGGGG + E, d.M.y 'г'. – E, d.M.y 'г'. GGGGG - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G + MMM y 'г'. G – MMM y 'г'. G + MMM – MMM y 'г'. G + MMM y 'г'. – MMM y 'г'. G - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G + d – d MMM y 'г'. G + d MMM y 'г'. G – d MMM y 'г'. G + d MMM – d MMM y 'г'. G + d MMM y 'г'. – d MMM y 'г'. G - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, d MMM – E, d MMM y 'г'. G + E, d MMM y 'г'. G – E, d MMM y 'г'. G + E, d MMM – E, d MMM y 'г'. G + E, d MMM y 'г'. – E, d MMM y 'г'. G h a – h a @@ -1445,23 +1537,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M – M - d.MM – d.MM - d.MM – d.MM + d.MM. – d.MM. + d.MM. – d.MM. - E, d.MM – E, d.MM - E, d.MM – E, d.MM + E, d.MM. – E, d.MM. + E, d.MM. – E, d.MM. - MM – MM + MM. – MM. - d.MM – d.MM - d.MM – d.MM + d.MM. – d.MM. + d.MM. – d.MM. - E, d.MM – E, d.MM - E, d.MM – E, d.MM + E, d.MM. – E, d.MM. + E, d.MM. – E, d.MM. LLLL – LLLL @@ -1482,27 +1574,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MM.y 'г'. – MM.y 'г'. G - d.MM – d.MM.y 'г'. G - d.MM – d.MM.y 'г'. G + d.MM. – d.MM.y 'г'. G + d.MM. – d.MM.y 'г'. G d.MM.y 'г'. – d.MM.y 'г'. G - E, d.MM – E, d.MM.y 'г'. G - E, d.MM – E, d.MM.y 'г'. G + E, d.MM. – E, d.MM.y 'г'. G + E, d.MM. – E, d.MM.y 'г'. G E, d.MM.y 'г'. – E, d.MM.y 'г'. G - MM – MM.y 'г'. G + MM. – MM.y 'г'. G MM.y 'г'. – MM.y 'г'. G - d.MM – d.MM.y 'г'. G - d.MM – d.MM.y 'г'. G + d.MM. – d.MM.y 'г'. G + d.MM. – d.MM.y 'г'. G d.MM.y 'г'. – d.MM.y 'г'. G - E, d.MM – E, d.MM.y 'г'. G - E, d.MM – E, d.MM.y 'г'. G + E, d.MM. – E, d.MM.y 'г'. G + E, d.MM. – E, d.MM.y 'г'. G E, d.MM.y 'г'. – E, d.MM.y 'г'. G @@ -1632,10 +1724,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ вечерта през нощта - - пр.об. - сл.об. - @@ -1703,6 +1791,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1711,7 +1802,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} 'в' {0} - {1} 'в' {0} 'ч' + {1} 'в' {0} 'ч'. @@ -1722,27 +1813,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} 'в' {0} - {1} 'в' {0} 'ч' + {1} 'в' {0} 'ч'. {1}, {0} + + {1}, {0} 'ч'. + - {1}, {0} 'ч' + {1}, {0} 'ч'. {1}, {0} + + {1}, {0} 'ч'. + + + {1}, {0} 'ч'. + h 'ч'. B h:mm 'ч'. B h:mm:ss 'ч'. B - E, h B + E, h 'ч'. B E, h:mm 'ч'. B E, h:mm:ss 'ч'. B E, d @@ -1773,11 +1873,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH:mm 'ч'. v h 'ч'. a v HH 'ч' v - d.MM - E, d.MM - MM - d.MM - E, d.MM + d.MM. + E, d.MM. + MM. + d.MM. + E, d.MM. LLLL d MMMM d MMMM @@ -1800,55 +1900,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'седмица' w 'от' Y 'г'. 'седмица' w 'от' Y 'г'. + + {1}, {0} + {1}, {0} + {0} {1} + {1}, {0} ч. + {0} ч. {1} + + + {0} – {1} + {0} – {1} + {0} – {1} - h – h B + h 'ч'. B – h 'ч'. B + h 'ч'. – h 'ч'. B - h:mm – h:mm B - h:mm – h:mm B + h:mm 'ч'. B – h:mm 'ч'. B + h:mm 'ч'. – h:mm 'ч'. B + h:mm 'ч'. – h:mm 'ч'. B d – d - y G – y G - y – y G + y 'г'. G – y 'г'. G + y 'г'. – y 'г'. G - MM.y GGGGG – MM.y GGGGG - MM.y – MM.y GGGGG - MM.y – MM.y GGGGG + MM.y 'г'. GGGGG – MM.y 'г'. GGGGG + MM.y 'г'. – MM.y 'г'. GGGGG + MM.y 'г'. – MM.y 'г'. GGGG - dd.MM.y – dd.MM.y GGGGG - dd.MM.y GGGGG – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG + dd.MM.y 'г'. – dd.MM.y 'г'. GGGGG + dd.MM.y 'г'. GGGGG – dd.MM.y 'г'. GGGGG + dd.MM.y 'г'. – dd.MM.y 'г'. GGGGG + dd.MM.y 'г'. – dd.MM.y 'г'. GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y GGGGG – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG + E, dd.MM.y 'г'. – E, dd.MM.y 'г'. GGGGG + E, dd.MM.y 'г'. GGGGG – E, dd.MM.y 'г'. GGGGG + E, dd.MM.y 'г'. – E, dd.MM.y 'г'. GGGGG + E, dd.MM.y 'г'. – E, dd.MM.y 'г'. GGGGG - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G + MMM y 'г'. G – MMM y 'г'. G + MMM – MMM y 'г'. G + MMM y 'г'. – MMM y 'г'. G - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G + d – d MMM y 'г'. G + d MMM y 'г'. G – d MMM y 'г'. G + d MMM – d MMM y 'г'. G + d MMM y 'г'. – d MMM y 'г'. G - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, d MMM – E, d MMM y 'г'. G + E, d MMM y 'г'. G – E, d MMM y 'г'. G + E, d MMM – E, d MMM y 'г'. G + E, d MMM y 'г'. – E, d MMM y 'г'. G h 'ч'. a – h 'ч'. a @@ -1883,26 +1996,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ H – H 'ч'. v - M – M + M. – M. - d.MM – d.MM - d.MM – d.MM + d.MM. – d.MM. + d.MM. – d.MM. - E, d.MM – E, d.MM - E, d.MM – E, d.MM + E, d.MM. – E, d.MM. + E, d.MM. – E, d.MM. - MM – MM + MM. – MM. - d.MM – d.MM - d.MM – d.MM + d.MM. – d.MM. + d.MM. – d.MM. - E, d.MM – E, d.MM - E, d.MM – E, d.MM + E, d.MM. – E, d.MM. + E, d.MM. – E, d.MM. LLLL – LLLL @@ -1923,13 +2036,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MM.y 'г'. – MM.y 'г'. - d.MM – d.MM.y 'г'. - d.MM – d.MM.y 'г'. + d.MM. – d.MM.y 'г'. + d.MM. – d.MM.y 'г'. d.MM.y 'г'. – d.MM.y 'г'. - E, d.MM – E, d.MM.y 'г'. - E, d.MM – E, d.MM.y 'г'. + E, d.MM. – E, d.MM.y 'г'. + E, d.MM. – E, d.MM.y 'г'. E, d.MM.y 'г'. – E, d.MM.y 'г'. @@ -1937,13 +2050,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MM.y 'г'. – MM.y 'г'. - d.MM – d.MM.y 'г'. - d.MM – d.MM.y 'г'. + d.MM. – d.MM.y 'г'. + d.MM. – d.MM.y 'г'. d.MM.y 'г'. – d.MM.y 'г'. - E, d.MM – E, d.MM.y 'г'. - E, d.MM – E, d.MM.y 'г'. + E, d.MM. – E, d.MM.y 'г'. + E, d.MM. – E, d.MM.y 'г'. E, d.MM.y 'г'. – E, d.MM.y 'г'. @@ -2519,8 +2632,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пр. {0} сб + + am/pm + - пр.об./сл.об. + am/pm + + + am/pm час @@ -2630,7 +2749,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Гринуич{0} - Гринуич Гринуич+? {0} – лятно часово време {0} – стандартно време @@ -3111,9 +3229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либревил - - Британско лятно часово време - Лондон @@ -3204,9 +3319,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Джаяпура - - Ирландско стандартно време - Дъблин @@ -3902,6 +4014,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Хараре + + + Акра + Акра – стандартно време + Акра – лятно часово време + + Афганистанско време @@ -4084,6 +4203,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бразилско лятно часово време + + + Британско време + Британско лятно часово време + + Бруней Даруссалам @@ -4257,6 +4382,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Средно гринуичко време + + + Гренландско време + Гренландско стандартно време + Гренландско лятно време + + Източногренландско време @@ -4283,7 +4415,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Хавайско-алеутско стандартно време + Хавайско стандартно време @@ -4344,6 +4476,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Иранско лятно часово време + + + Ирландско време + Ирландско стандартно време + + Иркутско време @@ -4367,9 +4505,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Петропавловск-Камчатски време - Петропавловск-Камчатски стандартно време - Петропавловск-Камчатски – лятно часово време + Камчатско време + Камчатско стандартно време + Камчатско лятно време @@ -4636,16 +4774,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Самара време + Самарско време Самара – стандартно време Самара – лятно часово време - Самоанско време Самоанско стандартно време - Самоанско лятно часово време @@ -4712,6 +4848,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Чуюк + + + Турско време + Турско стандартно време + Турско лятно време + + Туркменистанско време @@ -4731,6 +4874,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Уругвайско лятно часово време + + + Урумчи + + Узбекистанско време @@ -4869,7 +5017,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - #,##0.00 #,##0.00 ¤;(#,##0.00 ¤) @@ -6161,8 +6308,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Карибски гулден - Карибски гулден - Карибски гулден Специални права на тираж @@ -6259,8 +6404,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Зимбабвийско злато - Зимбабвийско злато - Зимбабвийско злато Зимбабвийски долар (2009) @@ -6276,6 +6419,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ден {0} дена + Завийте надясно по {0}-вата пресечка. + Завийте надясно по {0}-рата пресечка. + Завийте надясно по {0}-тата пресечка. Завийте надясно по {0}-ата пресечка. @@ -7428,8 +7574,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ мол - {0} mol - {0} mol Glc @@ -7792,11 +7936,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} кв. миля {0} кв. мили - - част - {0} част - {0} част - % @@ -7805,11 +7944,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mol - {0} mol - {0} mol - - - Glc PB @@ -7882,31 +8016,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} брит. дес. лъж. {0} брит. дес. лъж. - - {0} kat - {0} kat - - - cal-IT - {0} cal-IT - {0} cal-IT - - - {0} Gy - {0} Gy - - - {0} kgf - {0} kgf - - - {0} T - {0} T - - - {0} Wb - {0} Wb - ppb diff --git a/make/data/cldr/common/main/bgc.xml b/make/data/cldr/common/main/bgc.xml index 0a09a3fee28f..72c0c94b834c 100644 --- a/make/data/cldr/common/main/bgc.xml +++ b/make/data/cldr/common/main/bgc.xml @@ -107,6 +107,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + - + : + + + d MMMM y + E, d MMMM y + + @@ -139,6 +149,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} समय {0} (+0) स्टैण्डर्ड समय + + + कॉर्डिनेटेड यूनिवर्सल टाइम + + + यूटीसी + + ग्रीनविच मीन टाइम diff --git a/make/data/cldr/common/main/bgn.xml b/make/data/cldr/common/main/bgn.xml deleted file mode 100644 index 6eca6dbe5066..000000000000 --- a/make/data/cldr/common/main/bgn.xml +++ /dev/null @@ -1,969 +0,0 @@ - - - - - - - - - - - افار - آبخازی - آچه‌ای - ادانگمی - ادیغی - افریکانس - اغیمی - آینو - اکانی - الیوتی - جهلسرین آلتایی - امهاری - آراگونی - انگیکای - عربی - پیشرفته‌این عربی - ماپوچه‌ای - اراپاهو - آسامی - آسو - آستوری - آواری - آوادی - ایمارای - آذربایجانی - آذری - باشقیری - بالینسی - باسا - بیلاروسی - بیمبا - بینای - بلغاری - بلوچی (رخشانی) - بهوجپوری - بیسلامه - بینی - سیکسیکا - بمبارای - بنگالی - تبتی - بریتون - بۆدو - بوسنی - بوگینسی - بلین - کاتالانی - چیچینی - سینوگبانونی - شیگی - چه‌مروری - تروسکی - ماری - چاکتاوی - چیروکی - شاینی زبان - مرکزین کوردی - کرسی - سیشلی کریولین فرانسوی - چیکی - سلاواکی کلیسایی - چواشی - ولزی - ڈینمارکی - داکوتی - دارگوایی - تایتایی - جرمنی - استرالیاین جرمنی - سویسین جرمنی - داگریبی - زرمی - صُربی سفلی - دوالی - دیوهی - جولا فونی - دزونگخا - دزازا - ایمبو - اوه‌ای - ایفیکی - ایکاجوکی - یونانی - انگریزی - استرالیاین انگریزی - کاناڈاین انگریزی - بریتانیاین انگریزی - بریتن انگریزی - امریکاین انگریزی - یو اس انگریزی - اسپرانتوی - هسپانوی - لاتین امریکایی هسپانوی - اوروپایین هسپانوی - مکسیکوین هسپانوی - استونیایی - باسکی - اواندویی - پارسی - فولایی - فنلاندی - فلیپینی - فیجی - فاروئی - فون - فرانسوی - کاناڈاین فرانسوی - اشاره‌این فرانسوی - فریولی - روچ‌کپتین فریزی - ایرلندی - گا - اسکاتلندی گیلی - گعزی - گیلبیرتی - گالیسی - گوارانی - گورونتالو - جرمنین سوئیسی - گوجراتی - گوسی - مانی - گویچنی - هوسه‌ای - هاوایی - عبرانی - هندی - هیلیگایونی - همونگی - کراوتی - علیای سیربی - کریول آییسینی - مجارستانی - هوپی - ارمنی - هرویی - اینترلینگوایی - ایبانگه - ایبیبیو - ایندونیزیایی - ایگبویی - یی سیچوان - ایلوکانوی - اینگوشی - ایدوی - ایسلندی - ایتالیایی - اینوکتیتوتی - جاپانی - لوجبانی - نگومبی - ماچامه‌ای - جاوه‌ای - گرجی - قبایلی - کاچینی - جیجو - کامبایی - کاباردینی - تیاپی - ماکوندی - کابووردیانو - کورو - خاسی - کوجراچینی - کیکویویی - کوانیامایی - قزاقی - کاکویی - گرینلندی - کالنجین - خمری - کیمبوندویی - کانارا - کوریایی - کونکانی - کپله‌ای - کانوری - قره‌چایی‐بالکاری - کاریلینی - کوروخی - کشمیری - شامبالای - بافیا - کولوگنی - کوردی - کومیکی - کومی - کورنی - قیرغیزی - لاتین - لادینو - لانگی - لوگزامبورگی - لزگی - گاندایی - لیمبورگی - لاکوتا - لینگالایی - لائوسی - لوزی - بُرزسرین لوری - لیتوانی - لوبایی‐کاتانگا - لوبایی‐لولوا - لوندایی - لوئویی - لوشه‌ای - لویایی - لاتوینی - مادورایی - ماگاهی - مایدیلی - ماکاساری - ماسایی - موکشی - منده‌ای - مرویی - موریسینی - مالاگاسی - ماکوا متوی - میٹایی - مارشالی - مائوری - میکماکی - مینانگ‌کابویی - مقدونی - مالایالامی - منگولی - مانیپوری - موهاکی - موسیی - مراٹی - مالایی - مالته‌ای - ماندانگی - چینکه زبان - کریکی - میراندیسی - بورمي - ارزیای - مازندرانی - نائورویی - ناپلی - نامایی - نارویی بوک‌مولی - بُرزسرین انده‌بله‌ای - ساکسونی سفلی - نیپالی - نیواری - اندونگی - نیاسی - نیویی - هالنڈی - فلامانی - کوازیو - نارویی نی‌نوشکی - انگی‌ایمبونی - نغایی - نکوی - جهلسرین انده‌بله‌ای - بُرزسرین سوتویی - نویری - ناواهویی - نیانجی - نیانکوله‌ای - اوکیتایی - اورومویی - اودیه‌ای - آسیتینی - پنجاپی - پانگاسینانی - پامپانگی - پاپیامنتوی - پالائویی - نایجیریای پیڈگین - پولنڈی - پروسی - پشتو - پورتگالی - برازیلین پورتگالی - اوروپایین پورتگالی - کچوایی - کیچه‌ - راپانویی - راروتونگی - رومانش - رونڈی - رومانی - مالداوی - رومبویی - اوروسی - آرومانی - کینیارواندی - روایی - سانسکریٹ - سانڈاوه‌ای - یاقوتی - سامبوروی - سانٹالی - انگامبی - سانگویی - ساردینی - سیسیلی - اسکاتلندی - سیندی - بُرزسرین سامی - سینایی - کویرابورا سنی - سانگۆیی - تاچل‌هیتی - شانی - سینهالی - اسلواکی - اسلوانی - ساموآیی - جهلسرین سامی - لوله سامی - اناری سمی - اسکولت سامی - شونی - سونینکه‌ای - سومالی - البانی - سیربی - تاکی‌تاکی - سواتی - ساهویی - جهلسرین سوتویی - سونڈی - سوکومایی - سویڈنی - سواحلی - کانگویی سواحلی - قمرین - سریانی - تامیلی - تلوگویی - تیمنه‌ای - تیسویی - ٹیٹومی - تاجیکی - تایلندی - ٹیگرینیایی - ٹایگری - تورکمنی - کلینگونی - تسوانی - تونگی - توک‌پیسینی - تورکی - تاروکویی - تسونگی - تاتاری - تومبوکی - ٹووالی - تسواکی - تاهیتی - ٹووینی - مرکزین اتلسین تامازیگتی - اوڈمورتی - اویغوری - اوکراینی - امبونڈویی - نازانتین زبان - اوردو - اوزبکی - وایی - وینڈایی - ویتنامی - ولاپوکی - ونجو - والونی - والسیری - وولایٹی - واری - ولوفی - کالمیکی - خوسی - سوگایی - یانگبینی - یمبی - یدی - یوروبایی - کانتونیونی - آمازیغی مراکشی معیار - چینایی - ساده‌گین چینایی - غدیمین چینایی - زولویی - زونی - بغیر شه زبانین لڑا - زازایی - - - - - - - - - - - - - - - - - - - - - - - - - - - دونیا/جهان - افریقا - اوقیانوسیه - امریکای براعظم - استرالیا - اسیا - اورورپا - متحدین عربین امارات - انگویلا - انگولا - ارجنٹاین - اسٹرالیا - آزربایجان - بیلجیم - بولغاریه - بحرین - بروندی - بیرمودا - برونی - بولیویه - برازیل - بهاماس - بوتان - کاناڈا - چیلی - کامیرون - چین - کولومبیا - کوبا - قبرس - جرمنی - جیبوتی - الجزایر - اکوادور - مصر - روچ‌کپتین سحرا - اریتره - هسپانیه - ایتوپیه - اورورپایی یکویی - فیجی - فرانسه - گابون - گرجستان - گانا - گرینلاند - گامبیا - گوینیا - یونان - گویانا - هانگ کانگ - هنگری - ایندونیزیا - اسرائیل - عراق - ایتالیه - اردن - کینیا - قیرغیزستان - کمبودیا - کومورس - کویٹ - قزاقستان - لاوس - لیبنان - لیبیا - مراکو - مالداویا - ماداگاسکار - مالی - مالته - موریتانیا - مکسیکو - مالیزیا - نیجیر - نایجیریا - نیوزلنڈ - ئومان - پانامه - پیرو - فلیپین - پورتگال - پاراگوی - قطر - رومانیه - سیربستان - روندا - سیشیل - سوڈان - سینگاپور - سینیگال - سومالیا - سورینامی - سوریه - چاد - ٹایلنڈ - تاجیکستان - تورکمنستان - ٹونیس - تانزانیا - اوگاندا - متحدین ایالات - اوراگوی - اوزبکیستان - وینزوویلا - ویتنام - یمن - زامبیا - زیمبابوی - نازانتین سیمسر - - - میٹریک - بریتانوی - امریکایی - - - - - right-to-left - - - - [آ ئ ا ب پ ت ث ٹ ج چ ح خ د ڈ ر ز ڑ ژ س ش ص ض ط ظ غ ف ق ک گ ل م ن ھ و ۆ ی ێ] - [\u200C ؤ] - [آ ئ ا ب پ ت ث ٹ ج چ ح خ د ڈ ر ز ڑ ژ س ش ص ض ط ظ غ ف ق ک گ ل م ن ھ و ۆ ی ێ] - [‐ – — ، ؛ \: ! ؟ . … ‘’ "“” « » ( ) \[ \] § @ * \\ \& # † ‡ ′ ″] - - - - - سال - - - ماه - - - هفته‌گ - - - روچ - زي - مروچی - باندا - - +{0} روچ - - - - هفته‌گئ روچان - - - ساعت - - - سائت - - - ساعت - - - - - نازانتین شاران - - - دوبی - - - کابل - - - باکو - - - ڈاکا - - - بحرین - - - ٹیمپو - - - اورمچی - - - تیبلیسی - - - یورشلیم - - - کلکته - - - بغداد - - - تهران - - - امان - - - توکیو - - - بیشکیک - - - سیول - - - کویٹ - - - اقتاو - - - اورال - - - اقتوبه - - - قیزیلوردا - - - الماته - - - کولومبو - - - اولان‌باتور - - - مالدیف - - - کٹمنڈو - - - مسقط - - - کراچی - - - غزه - - - قطر - - - کیروف - - - سامارا - - - تومسک - - - ریاض - - - دمشق - - - دوشنبه - - - عشق آبات - - - استانبول - - - سمرقند - - - تاشکینت - - - عدن - - - - اوگانستانی وخت - - - - - روچ‌دراتین قزاقستانی وخت - - - - - روچ‌کپتین قزاقستانی وخت - - - - - قیرغیزستانی وخت - - - - - تاجیکستانی وخت - - - - - - arabext - - arabext - - - : - - - ٫ - ، - ٪ - ناعدد - - - - - 0 هزار ¤ - ¤00هزار - ¤ 000هزار - ¤ 0میلیون - ¤ 00میلیون - ¤000میلیون - ¤0میلیارد - ¤00میلیارد - - - {0} {1} - - - - اوگانستانئ اوگانی - ؋ - - - بنگلادیشئ ٹاکه - - - بوتانئ انگولٹروم - - - هندوستانئ روپی - - - ایرانئ ریال - ریال - - - سریلانکایی روپی - - - مالدیوی روپی - - - نیپالین روپی - - - پاکستانئ روپی - - - روسین روبل - - - - - - - {0} سالئ تا - - - {0} به ماه‌ای تا - - - {0} هفته‌گئ تا - - - {0} روچئ تا - - - {0} ساعتئ تا - - - {0} دقیقه‌ای تا - - - {0} ثانیه‌ای تا - - - {0} کیلومیترئ تا - - - {0} میترئ تا - - - - - سده‌گ - {0} سده‌گ - - - سال - {0} سال - {0}/سال - - - ماه - {0} ماه - {0}/ماه - - - هفته‌گ - {0} هفته‌گ - {0}/هفته‌گ - - - روچ - {0} روچ - {0}/روچ - - - ساعت - {0} ساعت - {0}/ساعت - - - دقیقه - {0} دقیقه - {0}/دقیقه - - - ثانیه - {0} ثانیه - {0}/ث - - - میلی‌ثانیه - {0} میلی‌ثانیه - - - مایکروثانیه - {0} مایکروثانیه - - - نانوثانیه - {0} نانوثانیه - - - کیلومیتر - {0} کیلومیتر - {0}/کیلومیتر - - - میتر - {0} میتر - {0}/میتر - - - روچ‌دراتین {0} - بُرزسرین {0} - - - - - {0}ماه - - - {0}هفته‌گ - - - {0}روچ - - - {0}ساعت - - - {0}دقیقه - - - {0}ث - - - {0}میلی‌ثانیه - - - {0}کیلومیتر - - - {0}میتر - - - - - - {0}، {1} - {0}، {1} - {0}، و {1} - {0} و {1} - - - {0} {1} - {0} {1} - {0} {1} - {0} {1} - - - {0}، {1} - {0}، {1} - - - - - هان:هاو - نه:ن - - - - {0} — موچ - {0} — تاریخی - {0} ضربه - - diff --git a/make/data/cldr/common/main/bgn_AE.xml b/make/data/cldr/common/main/bgn_AE.xml deleted file mode 100644 index 9ea4eab2495a..000000000000 --- a/make/data/cldr/common/main/bgn_AE.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bgn_AF.xml b/make/data/cldr/common/main/bgn_AF.xml deleted file mode 100644 index 9fd3eec10cce..000000000000 --- a/make/data/cldr/common/main/bgn_AF.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bgn_IR.xml b/make/data/cldr/common/main/bgn_IR.xml deleted file mode 100644 index 1c563b1383f0..000000000000 --- a/make/data/cldr/common/main/bgn_IR.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bgn_OM.xml b/make/data/cldr/common/main/bgn_OM.xml deleted file mode 100644 index e716360eeb9c..000000000000 --- a/make/data/cldr/common/main/bgn_OM.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bgn_PK.xml b/make/data/cldr/common/main/bgn_PK.xml deleted file mode 100644 index a8a616a494df..000000000000 --- a/make/data/cldr/common/main/bgn_PK.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bho.xml b/make/data/cldr/common/main/bho.xml index 53211c8cc1a0..1938c5b2b333 100644 --- a/make/data/cldr/common/main/bho.xml +++ b/make/data/cldr/common/main/bho.xml @@ -108,9 +108,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - {0} – {1} - + + - + : + + + y MMMM d + y MMMM d, EEE + @@ -118,6 +123,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} टाइम {0} डेलाइट समय {0} मानक समय + + + समन्वित वैश्विक समय + + + यूटीसी + + ग्रीनविच मीन टाइम diff --git a/make/data/cldr/common/main/blo.xml b/make/data/cldr/common/main/blo.xml index 5828d378fc3a..5796c01dba76 100644 --- a/make/data/cldr/common/main/blo.xml +++ b/make/data/cldr/common/main/blo.xml @@ -16,363 +16,428 @@ CLDR data files are interpreted according to the LDML specification (http://unic Afaar kagɩja - Abkhase kagɩja - Saʊtafrɩka kagɩja + Abkasii kagɩja + Aɖigee kagɩja + Afrikaansi kagɩja Agem kagɩja Akan kagɩja Amhariiki kagɩja - Aragonɛs kagɩja - oboloo kagɩja - gjakalaŋ kagɩlaarɩbuja + Aragonɛɛsɩ kagɩja + Oboloo kagɩja + gajakalaŋ kagɩlaaribuja + Apashe gɩteŋshilelaŋ kagɩja gɩlaaribuja gɩlaaribuja ŋgɩɖee kǝ ba na fʊba na - mapushi kagɩja - Assamɛs kagɩja + Mapushi kagɩja + gɩlaaribuja Morooko kagɩja + Assam kagɩja Asuu kagɩja - Asturiya kagɩja - Asɛrbayijanii kagɩja + Asɩtuuriya kagɩja + Asɛrbayijaŋ kagɩja Aserii kagɩja Bashikiiri kagɩja Balushii kagɩja Basaa kagɩja - Belarusiya kagɩja + Belaruus kagɩja Bɛmba kagɩja Betawii kagɩja Bena kagɩja - Bulgariya kagɩja - Haryaŋfiki kagɩja - Gɩbaloshiija - Bojpuri kagɩja + Bulgarii kagɩja + Haryaŋfii kagɩja + Baluushi gɩteŋshilelaŋ kagɩja + Bojɩpuuri kagɩja anii kagɩja Taii Ɖam kagɩja Bambaraa kagɩja Baŋgǝla kagɩja - Tibetaŋ kagɩja (Gɩtibetaŋja) - Baktiyarii kagɩja + Tibeeti kagɩja + Bakitiyarii kagɩja Bretɔn kagɩja + Brahui kagɩja Boɖo kagɩja - Bosniya kagɩja + Bɔsniya kagɩja Akoose kagɩja Buriyaat kagɩja - Bliin kagɩja + Biliin kagɩja Katalan kagɩja - Canaɖo kagɩja - Atsam kagɩja - Shakma kagɩja + Kaaɖo kagɩja + Atɩsaam kagɩja + Shakamaa kagɩja Sheshɛn kagɩja Sebuwanoo kagɩja Shiga kagɩja - Shɔktaʊ kagɩja + Shɔkɩtaʊ kagɩja Sherokee kagɩja Shikasawʊ kagɩja - Kurɖish gɩcɩɩca kagɩja - Kurɖish, gɩcɩɩca kagɩja - Kurɖish, Sorani kagɩja - Kɔrsikan kagɩja - Kɔptik kagɩja + Kurɖiishi gɩcɩɩca kagɩja + Kurɖiishi Sorani kagɩja + Kɔrisiika kagɩja + Kɔptiiki kagɩja Cɛk kagɩja - sʊwampii kree kagɩja - Shʊrshʊ kagɩja + Sʊwampii Kree kagɩja + Slaafi cɔɔcɩ kagɩja Shufash kagɩja - Gɩwɛlshja - Ɖanǝmaakɩ kagɩja - Tayɩta kagɩja (Gɩtayɩtaja) + Wɛɛlishi kagɩja + Ɖanǝmark kagɩja + Tayɩta kagɩja gɩjaamaja - Gɩsarmaja + gɩsarmaja Ɖogri kagɩja - sɔrabɩyan atǝntǝn kagɩja + Sɔrbii atǝntǝn kagɩja Ɖuwala kagɩja Ɖifehii kagɩja - jola-fonyii kagɩja - Ɖsɔŋgkha kagɩja - ɛmbuu kagɩja + Jola-Fonyii kagɩja + Ɖɩsɔŋka kagɩja + Ɛmbuu kagɩja gɩyigbeja - grɛɛkɩ kagɩja + Grɛs kagɩja gɛɛshɩ - gɛɛshɩ (Ganɔ gaɖɔŋkɔnɔ kabʊtǝna Amalɩka nɩ) gɛɛshɩ (GKA) - Ɛspɛrnatoo kagɩja + Ɛsɩpɛrantoo kagɩja gɩspaŋja gɩspaŋja (latɛŋ kaAmalɩkatǝna) - Ɛstonia kagɩja + Ɛstoniya kagɩja Baske kagɩja Ɛwonɖoo kagɩja - pɛrsɩaŋ kagɩja - ɖaarii kagɩja + Pɛrs kagɩja + Ɖaarii kagɩja gɩfǝlanɖɩja - finiish kagɩja - filipinoo kagɩja - faroɛsi kagɩja + Fɛnlanɖ kagɩja + Filipiin kagɩja + Faroi kagɩja gɩfɔnɔ Kajun kagɩfɔnɔ - friisɔŋ gʊnyɩpɛnɛlaŋ kagɩja - friula kagɩja - Gɩfrisianja - irlanɖɛɛ kagɩja - gaa kagɩja - skɔtiishɩ kagɩja - gɛɛsɩ kagɩja - galisiaŋ kagɩja - gaaranii kagɩja - suisi jaama kagɩja - gujaratii kagɩja - gusii kagɩja - mansɩ kagɩja + Firiisi gʊnyɩpɛnɛlaŋ kagɩja + Friula kagɩja + Frisiya gɩteŋshilelaŋ kagɩja + Irlanɖ kagɩja + Gaa kagɩja + Gɛɛliiki Ekɔɔsɩ kagɩja + Gɛɛsɩ kagɩja + Galiisiya kagɩja + Guwaaranii kagɩja + Suwis kagɩjaamakrǝ + Gujaratii kagɩja + Gusii kagɩja + Mansɩ kagɩja gɩgambrɩja - hawahiyaŋ kagɩja - hebree kagɩja - hinɖii kagɩja - hinɖii kagɩja (latɛŋ kʊja) - hiŋgliishɩ kagɩja - Hmoŋg ŋjʊwaa kagɩja - Kʊrwasiya kagɩja - Upɛr Sɔrbɩyaŋ kagɩja - haɩtiɛŋ kreɔlɩ kagɩja - hɔŋgrii kagɩja - Armeniya kagɩja - ɛntɛrliŋgua kagɩja + Awayii kagɩja + Ibrii kagɩja + Hinɖii kagɩja + Hinɖii kagɩja (latɛŋ kʊja) + Hiŋgliishɩ kagɩja + Hɩmoŋ Njʊwaa kagɩja + Krowasii kagɩja + Hunsriiki kagɩja + Sɔrbii alaŋ kagɩja + Kreyool Hayitii kagɩja + Ɔŋgrii kagɩja + Armenii kagɩja + Ɛntɛrliŋguwaa kagɩja Ɛnɖonosii kagɩja - ɛntɛrliŋguɩ kagɩja - ibo kagɩja - sishuaŋ yii kagɩja - iɖoo kagɩja - islanɖii kagɩja + Ɛntɛrliŋgii kagɩja + Igboo kagɩja + Sishuaŋ Yii kagɩja + Iɖoo kagɩja + Islanɖ kagɩja + Ɛntɔrsǝlafiiki kagɩja gɩtaliija - inuktituu kagɩja + Inuktituuti kagɩja gɩjapaŋja - lɔbaŋ kagɩja - ŋgomba kagɩja - masham kagɩja - jafanɛɛ kagɩja - jɔrjia kagɩja - Karaa Kalpaakɩ kagɩja - kabil kagɩja - juu kagɩja - kambaa kagɩja - Gɩtɩyapja - makɔnɖee kagɩja - kapfɛɛ kagɩja + Lɔjɩbaŋ kagɩja + Ŋgomba kagɩja + Mashaam kagɩja + Jafaa kagɩja + Jɔrjiya kagɩja + Karaa-Kalpaakɩ kagɩja + Kabilii kagɩja + Juu kagɩja + Kambaa kagɩja + Kabarɖii kagɩja + Tɩyaapɩ kagɩja + Makɔnɖee kagɩja + Kapfɛɛr kagɩja Kekshii kagɩja - Keniyaa kagɩja - kaɩŋgan kagɩja - koyira-shiinii kagɩja - kikuyuu kagɩja - kasaakɩ kagɩja - kakoo kagɩja - kalaalisut kagɩja - kalaŋjɩn kagɩja - kamɛr kagɩja - kananɖa kagɩja + Kenyaŋ kagɩja + Kaɩŋgan kagɩja + Koyira-Shiinii kagɩja + Kikuyuu kagɩja + Kasaakɩ kagɩja + Kakoo kagɩja + Kalalisuuti kagɩja + Kalaŋjɩn kagɩja + Kǝmɛɛr kagɩja + Kanaaɖa kagɩja Koree kagɩja - koŋkanii kagɩja - kpɛl kagɩja - kashimirii kagɩja - shambalaa kagɩja + Koŋkanii kagɩja + Kɩpɛɛl kagɩja + Kashimirii kagɩja + Shambalaa kagɩja Bafiya kagɩja - Kolonyiya kagɩja - kurɖikɩ kagɩja - Kʊrɖiishi kagɩja + Kolɔnjǝ kagɩja + Kurɖiishi kagɩja + Kurɖiishi kagɩja Kʊrmanjii kagɩja - Kɔrnish kagɩja + Kɔrniishi kagɩja Kʊfii kagɩja - kirgis kagɩja + Kirgistan kagɩja latɛŋ kagɩja Laŋgii kagɩja - Lʊsɛŋburgiishi kagɩja - ganɖaa kagɩja + Lusɛmbuur kagɩja + Ganɖaa kagɩja Liguriaŋ kagɩja Lakotaa kagɩja Laɖɛŋ kagɩja - Lɔmbaarɩ kagɩja - liŋgalaa kagɩja - lawo kagɩja - luwisaana kreyɔl kagɩja - lorii gʊnyɩpɛnɛlaŋ kagɩja - lituyanii kagɩja - Latɩgalɩyaŋ Kagɩja - luba-kataŋgaa kagɩja - luwo kagɩja - luyaa kagɩja - latɩfɩyaŋ kagɩja + Lɔmbaaɖɩ kagɩja + Liŋgalaa kagɩja + Lawɔs kagɩja + Kreyool Luwisiyana kagɩja + Lurii gʊnyɩpɛnɛlaŋ kagɩja + Lituwaniya kagɩja + Latɩgalɩyaŋ kagɩja + Luba-Kataŋgaa kagɩja + Luwo kagɩja + Luyaa kagɩja + Lɛtfiya kagɩja Laas kagɩja - mayitilii kagɩja + Mayitilii kagɩja Masaɩ kagɩja - moshaa kagɩja - meruu kagɩja - kreyol-morisi kagɩja - malagaasɩ kagɩja - Makuwa-meeto kagɩja - metaa kagɩja + mɔkɩshaa kagɩja + Meruu kagɩja + Kreyool Imoris kagɩja + Malagaasɩ kagɩja + Makʊwa-Meeto kagɩja + Metaa kagɩja Moshenoo kagɩja - maworii kagɩja - Mikmaawʊ kagɩja - maseɖoniya kagɩja - maalayalam kagɩja - moŋgolii kagɩja - manipurii kagɩja - mowak kagɩja - maratii kagɩja - malɛɛ kagɩja - maltɛsɩ kagɩja - manɖaŋgɩ kagɩja + Maworii kagɩja + Mikimaawʊ kagɩja + Manɖayiiki kagɩja + Maseɖoniya kagɩja + Maalayalam kagɩja + Mɔŋgolii kagɩja + Manipurii kagɩja + mohawaaki kagɩja + Maratii kagɩja + Mara Shin kagɩja + Malɛɛ kagɩja + Malta kagɩja + Mʊnɖaŋgɩ kagɩja ɩkrǝ tuutuuma - kriki kagɩja - Burmɛs kagɩja - Ɛrsia kagɩja - masanɖarii kɩja - namaa kagɩja - nɔrfɛɛjɩ bokimalɩ kagɩja - nɖebelee gʊnyɩpɛnɛlaŋ kagɩja - jaama atǝntǝn kagɩja - jaama atǝntǝn kagɩja (Holanɖ) - nepal kagɩja + Musikogee kagɩja + Hɩmɔŋ Ɖaʊ kagɩja + Burmaa kagɩja + Ɛrisiiya kagɩja + Masanɖarii kɩja + caniisi Min Nan + Namaa kagɩja + Nɔrfɛɛsh bokimaalɩ kagɩja + Nɖebelee gʊnyɩpɛnɛlaŋ kagɩja + atǝntǝn kagɩjaamakrǝ + Saason atǝntǝn kagɩja (Holanɖ) + Neepal kagɩja Holanɖ kagɩja - kʊwasiyo kagɩja - nɔrfɛɛjɩ ninɔrisikɩ kagɩja - ŋgiyembuu kagɩja - nɔrfɛɛjɩ kagɩja - ŋkoo kagɩja - nɖebelee gʊnyɩsonolaŋ kagɩja - sotoo gʊnyɩpɛnɛlaŋ kagɩja - nuyɛr kagɩja - nafaɖo kagɩja - shewa kagɩja - niyaŋkolee kagɩja - oksitaŋ kagɩja - oromoo kagɩja - oɖia kagɩja - osɛtiiki kagɩja + Kʊwaasiyo kagɩja + Nɔrfɛɛsh ninɔrisikɩ kagɩja + Ŋgiyembuu kagɩja + Wansho kagɩja + Nɔrfɛɛsh kagɩja + Ŋkoo kagɩja + Nɖebelee gʊnyɩsonolaŋ kagɩja + Sotoo gʊnyɩpɛnɛlaŋ kagɩja + Nuyɛɛr kagɩja + Nafajo kagɩja + Nyanja kagɩja + Nyaŋkolee kagɩja + Ɔkitaŋ kagɩja + Okanagan kagɩja + Oromoo kagɩja + Oɖiya kagɩja + Ɔsɛtiiki kagɩja Osage kagɩja Pʊŋjabii kagɩja - papiamantoo kagɩja - piɖijin nanjiriya kagɩja + Papiamentoo kagɩja + piɖijin Nanjiiriya kagɩja + Palii kagɩja Pijiŋ kagɩja Polanɖ kagɩja - Piyeɖmɔŋtɛsɩ kagɩja - Prʊsiaŋ kagɩja - pashɩtoo kagɩja + Piyemɔŋtɛɛsɩ kagɩja + Prʊsiya kagɩja + Pashɩtoo kagɩja gɩpɔrtigalja Keshʊwaa kagɩja Kishee kagɩja Rajastanii kagɩja + Rejaŋ kagɩja Rɔhiŋgiyaa kagɩja Rifiyaŋ kagɩja Romaŋshɩ kagɩja Rʊnɖii kagɩja - Romaniaŋ kagɩja - Romaniaŋ kagɩja (Mɔlɖafiya) - Rɔŋboo kagɩja + Romanii kagɩja + Mɔlɖafiya kagɩja + Rɔmboo kagɩja gɩrɔɔshɩyaja - kiŋyarwan kagɩja - rʊwaa kagɩja - saŋskriitɩ kagɩja - Gɩyakutuja - samburu - santalii kagɩja - saŋguu kagɩja - sarɖiniaŋ kagɩja - sisiliaŋ kagɩja - sɛnɖii kagɩja - Kʊrɖish gʊnyɩsonolaŋ kaja kagɩja - samee - senaa kagɩja - koyirabɔrɔ-senii kagɩja - saŋgoo kagɩja - samburuu kagɩja - Tashelhiiti kagɩja (Gɩtashelhiitija) + Kiŋyarwandaa kagɩja + Rʊwaa kagɩja + Saŋsikriitɩ kagɩja + Yakuutu kagɩja + Samburuu kagɩja + Santalii kagɩja + Saŋguu kagɩja + Sarɖiniaŋ kagɩja + Sisilii kagɩja + Sinɖii kagɩja + Kurɖiishi gʊnyɩsonolaŋ kagɩja + Samii gʊnyɩpɛnɛlaŋ kagɩja + Senaa kagɩja + Koyirabɔrɔ-Senii kagɩja + Saŋgoo kagɩja + Samogiiti kagɩja + Tashelhiiti kagɩja Shaŋ kagɩja - sɛnhalaa kagɩja + Sinhalaa kagɩja Siɖamoo kagɩja - slofaakɩ kagɩja - Gɩsarayikiija - slofenia kagɩja - Samii gʊnyɩsonolaŋ kaja kagɩja + Kilɖin Sami kagɩja + Pite Sami kagɩja + Ume Sami kagɩja + Slofakii kagɩja + Sarayiiki kagɩja + Slofeniya kagɩja + Samii gʊnyɩsonolaŋ kagɩja Lʊl Samii kagɩja - inarii samii kagɩja - skɔltɩ samii kagɩja - shonaa kagɩja - somalii kagɩja - Albaniya kagɩja - sɛrbiaŋ kagɩja - sʊwatii kagɩja - Sawoo kagɩja - sotoo gʊnyɩsonolaŋ kaja kagɩja - sunɖanɛsɩ kagɩja - sʊwɛɛɖɩ kagɩja - sʊwahilii kagɩja - Ccŋgoo sʊwahilii kagɩja - siriyaakɩ kagɩja - Sisiliyaŋ kagɩja - Tamil kagɩja (Gɩtamilja) - Telugu kagɩja (Gɩteluguja) - Teso kagɩja (Gɩtesoja) - Tajiik kagɩja - taɩ kagɩja + Inarii Samii kagɩja + Sǝkɔltɩ Samii kagɩja + Shonaa kagɩja + Somalii kagɩja + Albanii kagɩja + Sɛrbii kagɩja + Sʊwatii kagɩja + Sahoo kagɩja + Sotoo gʊnyɩsonolaŋ kagɩja + Sunɖanɛɛsɩ kagɩja + Susu kagɩja + Sʊnwaar kagɩja + Sʊwɛɖ kagɩja + Sʊwahilii kagɩja + Sʊwahili kagɩja (Koŋgoo) + Siriyaakɩ kagɩja + Silesiyaŋ kagɩja + Tamil kagɩja + Telugu kagɩja + Teso kagɩja + Tajikistan kagɩja + Taɩ kagɩja Tigrinyaa kagɩja - Tiigr kagɩja + Tiigri kagɩja Tirkmɛn kagɩja - Cʊwanaa kagɩja (Gɩcʊwanaja) - Tɔŋgaŋ kagɩja (Gɩtɔŋgaŋja) + Sʊwanaa kagɩja + Tɔŋga kagɩja Toki Ponaa kagɩja - TɔkPisin kagɩja + Tɔk Pisin kagɩja gɩturkiija - Taroko kagɩja (Gɩtarokoja) + Taroko kagɩja Tɔɔrwalii kagɩja - Sɔŋgaa kagɩja (Gɩsɔŋgaja) + Sɔŋgaa kagɩja Tatar kagɩja - Tasawak kagɩja (Gɩtasawakǝja) + Tasawaakɩ kagɩja Tufiniyaŋ kagɩja - Tamaasit Atlas kagɩcɩɩca kagɩja - gɩwigurja - Ukraɩnɩya kagɩja + Tamasiiti Atlaasɩ kagɩcɩɩca kagɩja + Ʊyiguur kagɩja + Ikrɛɛn kagɩja gɩkrǝ ŋgɩɖee kʊyɔʊ ʊ mana ma - Gɩurɖuja - Usbɛkɩ kagɩja - Gɩfayɩja - Fanɖa kagɩja + Urɖuu kagɩja + Usbeekistan kagɩja + Faɩ kagɩja + Fenɖa kagɩja Fenɛsiaŋ kagɩja - Gɩfɩɛtɩnamɛɛsɩja + Fɛtnam kagɩja Makʊwa kagɩja Folapuku kagɩja - Gɩfunjoja - Gɩwalɔnja - Gɩwalsaja - Gɩwolaɩtaja - Gɩwarpurija - Gɩwolofja - Gɩsoosaja + Funjo kagɩja + Waloon kagɩja + Walsa kagɩja + Wolaɩta kagɩja + Waripiri kagɩja + Woloofi kagɩja + Kaitaagɩ kagɩja + Soosa kagɩja Kaŋgrii kagɩja - sogaa kagɩja - Gɩyaŋgbɛnja - Gɩyiɖiishija - Gɩyorubaja - ŋyeeŋgatuu kagɩja - Kantonɛs kagɩja - Kantonɛs kagɩcaɩnaja - Gɩsʊaŋja - morooko tamsiik ka (tututu) kagɩja + Sogaa kagɩja + Yaŋgbɛn kagɩja + Yiɖiishi kagɩja + gɩyorubaja + Ŋyeeŋgatuu kagɩja + Kantonɛɛsɩ kagɩja + gɩcaɩnaja kantonɛɛsɩ + Sʊwaŋ kagɩja + Tamashiiki kagɩja ŋgɩɖee kǝ ba na fʊba na (Morooko) gɩcaɩnaja manɖarɛŋ - gɩcaɩnaja, manɖarɛŋ gɩcaɩnaja gɩburoka gɩcaɩnaja manɖarɛŋ gɩburoka gɩcaɩnaja tututu gɩcaɩnaja manɖarɛŋ tututu - Gɩsuluja + Sulu kagɩja gɩkrǝ kakoɖǝn ɩ mana + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -687,35 +752,71 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩshilé n’ɩŋɔrɔ ɩtʊrka + ɩtanɩ kʊŋɔn + ɩbii kʊnyaʊ + nɔmba kʊnyaʊ gɩtanɩ + ɩkɔɩ kʊkpatɩ ʊfaŋʊ kayaashɩ ɩnɔmba + gakɔŋkɔŋɔ̀ kansaʊ Buɖa kǝbaja bɩshilé na bɩŋɔrɔ ɩtʊrka + Buɖa kǝbaja bɩja Caɩna kɩshilé na kɩŋɔrɔ ɩtʊrka + Caɩna kɩja Kɔpǝt kǝbaja bɩshilé na bɩŋɔrɔ ɩtʊrka + Kɔpǝt kǝbaja bɩja ɖaŋgi kɩshilé na kɩŋɔrɔ ɩtʊrka + ɖaŋgi kɩja Etiyopii kɩshilé na kɩŋɔrɔ ɩtʊrka + Etiyopii kɩja Etiyopii kɩshilé na kɩŋɔrɔ ɩtʊrka (Amete Alɛm) + Etiyopii Amete Alɛm kɩja Gregɔɔ ‘ɩshilé n’‘ɩŋɔrɔ ɩtʊrka Gregɔɔ kaja Yahuuɖi kǝbaja bɩshilé na bɩŋɔrɔ ɩtʊrka + Yahuuɖi kǝbaja bɩja Inɖiya kɩshilé na kɩŋɔrɔ ɩtʊrka + Inɖiya kaatǝna kɩja gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka + gɩnǝma kɩja gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka aɖʊ (gatǝna kʊsǝu katam) + gɩnǝma kɩja aɖʊ (gatǝna kʊsǝu katam) gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka akʊn aŋɔrɔ (Sauɖiya) + gɩnǝma Sauɖiya kɩja akʊn aŋɔrɔ gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka aɖʊ (ɩŋɔripi ɩceuka katam) + gɩnǝma kɩja aɖʊ (ɩŋɔrɩpikiɖeka katam) gɩnǝma kɩshilé na kɩŋɔrɔ ɩtʊrka (Um al-Kra) + gɩnǝma kɩja (Um al-Kra) Gregɔɔ ‘ɩshilé n’‘ɩŋɔrɔ ɩtʊrka (asǝba na gaja) + Gregɔɔ kɩja Japaŋ kɩshilé na kɩŋɔrɔ ɩtʊrka + Japaŋ kɩja Pɛrs kǝbaja bɩshilé na kɩŋɔrɔ ɩtʊrka + Pɛrs kǝbaja bɩja miŋguwo kɩshilé na kɩŋɔrɔ ɩtʊrka + miŋguwo kɩja + emojii + Erɔɔpʊ kapɔ + pinyin + ʊyɛʊ ɩbii kʊnyaʊ ɖeiɖei ɖeiɖei + suyin + gɩtanɩ + nɔmba kɩpi + ʊfɔɔ + lamba mɛta kʊfaŋʊ kayaashɩ + mɛta kʊfaŋʊ Gɛɛshɩ kʊfaŋʊ kayaashɩ + Gɛɛshɩ kʊfaŋʊ Amalɩka kʊfaŋʊ kayaashɩ + Amalɩka kʊfaŋʊ + Ibrii kɩnɔmba + Japaŋ kɩnɔmba latɛŋ @@ -767,6 +868,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -799,8 +903,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/d/y G E, M/d/y G MMM y G - MMM d y G - E, MMM d y G + MMM d/y G + E, MMM d/y G h a mm h a mm:ss M/d @@ -812,14 +916,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/d/y G E, M/d/y G MMM y G - MMM d y G - E, MMM d y G + MMM d/y G + E, MMM d/y G MMMM y G QQQ y G QQQQ y G - {0} halɩ {1} d – d @@ -828,21 +931,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic y – y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y G – M/y G + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y G – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y G – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G MMM y G – MMM y G @@ -850,16 +953,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y – MMM y G - MMM d – d y G - MMM d y G – MMM d y G - MMM d – MMM d y G - MMM d y – MMM d y G + MMM d – d/y G + MMM d/y G – MMM d/y G + MMM d – MMM d/y G + MMM d/y – MMM d/y G - E, MMM d – E, MMM d y G - E, MMM d y G – E, MMM d y G - E, MMM d – E, MMM d y G - E, MMM d y – E, MMM d y G + E, MMM d – E, MMM d/y G + E, MMM d/y G – E, MMM d/y G + E, MMM d – E, MMM d/y G + E, MMM d/y – E, MMM d/y G M – M @@ -882,36 +985,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y – y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G MMM – MMM y G MMM y – MMM y G - MMM d – d y G - MMM d – MMM d y G - MMM d y – MMM d y G + MMM d – d/y G + MMM d – MMM d/y G + MMM d/y – MMM d/y G - E, MMM d – E, MMM d y G - E, MMM d – E, MMM d y G - E, MMM d y – E, MMM d y G + E, MMM d – E, MMM d/y G + E, MMM d – E, MMM d/y G + E, MMM d/y – E, MMM d/y G MMMM – MMMM y G @@ -1085,7 +1191,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - y MMMM d + MMMM d/y @@ -1122,6 +1228,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1151,8 +1260,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/d/y G E, M/d/y G MMM y G - MMM d y G - E, MMM d y G + MMM d/y G + E, MMM d/y G + MMMM y G + MMMM d/y G + E, MMMM d/y G h:mm a h:mm:ss a h:mm:ss a v @@ -1160,6 +1272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/d E, M/d E, MMM d + E, MMMM d MMMM 'abɔkɔɩ' W'ja' MMMM 'abɔkɔɩ' W'ja' MMMM 'abɔkɔɩ' W'ja' @@ -1170,6 +1283,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d/y E, MMM d/y MMMM y + MMMM d/y + E, MMMM d/y QQQ y QQQQ y Y 'kabɔkɔɩ' w'ja' @@ -1177,7 +1292,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y 'kabɔkɔɩ' w'ja' - {0} halɩ {1} + + {0} – {1} + {0} – {1} + d – d @@ -1208,27 +1326,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y – MMM y G - MMM d – d y G - MMM d y G – MMM d y G - MMM d – MMM d y G - MMM d y – MMM d y G + MMM d – d/y G + MMM d/y G – MMM d/y G + MMM d – MMM d/y G + MMM d/y – MMM d/y G - E, MMM d – E, MMM d y G - E, MMM d y G – E, MMM d y G - E, MMM d – E, MMM d y G - E, MMM d y – E, MMM d y G + E, MMM d – E, MMM d/y G + E, MMM d/y G – E, MMM d/y G + E, MMM d – E, MMM d/y G + E, MMM d/y – E, MMM d/y G - h a – h a + h – h a HH – HH h:mm a – h:mm a - h:mm a – h:mm a - h:mm a – h:mm a + h:mm – h:mm a + h:mm – h:mm a HH:mm – HH:mm @@ -1244,7 +1362,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic HH:mm – HH:mm v - h a – h a v + h – h a v HH – HH v @@ -1270,6 +1388,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y – y @@ -1292,14 +1413,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y – MMM y - MMM d – d y - MMM d – MMM d y - MMM d y – MMM d y + MMM d – d/y + MMM d – MMM d/y + MMM d/y – MMM d/y - E, MMM d – E, MMM d y - E, MMM d – E, MMM d y - E, MMM d y – E, MMM d y + E, MMM d – E, MMM d/y + E, MMM d – E, MMM d/y + E, MMM d/y – E, MMM d/y MMMM – MMMM y @@ -1313,59 +1434,165 @@ CLDR data files are interpreted according to the LDML specification (http://unic saamanɩ + + saa. + + + saa + gaja gaja gaboŋoka gaja ŋgaɖe gaja gafɔlɩ + + na ce bʊja {0} nɩ + na ce gaja {0} nɩ + na ce bʊja {0} nɩ + + + ɩ ɖoo bʊja {0} + ɩ ɖoo gaja {0} + ɩ ɖoo bʊja {0} + gj. gj. boŋo gj. ɖe gj. fɔlɩ + + na ce bʊja {0} nɩ + na ce gj. {0} nɩ + na ce bj. {0} nɩ + + + ɩ ɖoo bʊja {0} + ɩ ɖoo gj. {0} + ɩ ɖoo bj. {0} + gj gj boŋo gj ɖe gj fɔlɩ + + na ce bʊja {0} nɩ + na ce gj {0} nɩ + na ce bj {0} nɩ + + + ɩ ɖoo bʊja {0} + ɩ ɖoo gj {0} + ɩ ɖoo bj {0} + ɩŋɔrɩriu ɩŋɔrɩriu ɩboŋoka ɩŋɔrɩriu nnɖe ɩŋɔrɩriu ɩfɔlɩ + + na ce ɩŋɔrɩriu {0} nɩ + na ce ɩŋɔrɩriu {0} nɩ + na ce ɩŋɔrɩriu {0} nɩ + + + ɩ ɖoo ɩŋɔrɩriu {0} + ɩ ɖoo ɩŋɔrɩriu {0} + ɩ ɖoo ɩŋɔrɩriu {0} + ɩŋɔ. + + na ce ɩŋɩ {0} nɩ + na ce ɩŋɩ {0} nɩ + na ce ɩŋɩ {0} nɩ + + + ɩ ɖoo ɩŋɩ {0} + ɩ ɖoo ɩŋɩ {0} + ɩ ɖoo ɩŋɩ {0} + ɩŋɔ + + na ce ɩŋɩ {0} nɩ + na ce ɩŋɩ {0} nɩ + na ce ɩŋɩ {0} nɩ + + + ɩ ɖoo ɩŋɩ {0} + ɩ ɖoo ɩŋɩ {0} + ɩ ɖoo ɩŋɩ {0} + aŋɔrɔ aŋɔrɔ aboŋoka aŋɔrɔ nnɖe aŋɔrɔ afɔlɩ + + na ce ɩŋɔrɔ {0} nɩ + na ce aŋɔrɔ {0} nɩ + na ce ɩŋɔrɔ {0} nɩ + + + ɩ ɖoo ɩŋɔrɔ {0} + ɩ ɖoo aŋɔrɔ {0} + ɩ ɖoo ɩŋɔrɔ {0} + aŋ. - aŋ. boŋo - aŋ. ɖe - aŋ. fɔlɩ + aŋr. boŋo + aŋr. ɖe + aŋr. fɔlɩ + + na ce aŋr. {0} nɩ + na ce aŋr. {0} nɩ + na ce ɩŋr. {0} nɩ + + + ɩ ɖoo aŋr. {0} + ɩ ɖoo aŋr. {0} + ɩ ɖoo ɩŋr. {0} + aŋ - aŋ boŋo - aŋ ɖe - aŋ fɔlɩ + aŋr boŋo + aŋr ɖe + aŋr fɔlɩ + + na ce aŋr {0} nɩ + na ce aŋr {0} nɩ + na ce ɩŋr {0} nɩ + + + ɩ ɖoo aŋr {0} + ɩ ɖoo aŋr {0} + ɩ ɖoo ɩŋr {0} + bɔkɔɩ bɔkɔɩ aboŋoka bɔkɔɩ nnɖe bɔkɔɩ afɔlɩ + + na ce bɔkɔɩ {0} nɩ + na ce bɔkɔɩ {0} nɩ + na ce ɩbɔkɔɩ {0} nɩ + + + ɩ ɖoo bɔkɔɩ {0} + ɩ ɖoo bɔkɔɩ {0} + ɩ ɖoo ɩbɔkɔɩ {0} + {0} kabɔkɔɩ @@ -1373,34 +1600,113 @@ CLDR data files are interpreted according to the LDML specification (http://unic bk. boŋo bk. ɖe bk. fɔlɩ + + na ce bk. {0} nɩ + na ce bk. {0} nɩ + na ce ɩbk. {0} nɩ + + + ɩ ɖoo bk. {0} + ɩ ɖoo bk. {0} + ɩ ɖoo ɩbk. {0} + + {0} kabk. bk bk boŋo bk ɖe bk fɔlɩ + + na ce bk. {0} nɩ + na ce bk. {0} nɩ + na ce ɩbk {0} nɩ + + + ɩ ɖoo bk {0} + ɩ ɖoo bk {0} + ɩ ɖoo ɩbk {0} + + {0} kabk aŋɔrɔ kabɔkɔɩ + + aŋ. kabk. + + + aŋ kabk + ʊshilé galaɩ ʊrɔŋ gacǝŋ + + na ce ʊshilé {0} nɩ + na ce ʊshilé {0} nɩ + na ce ɩshilé {0} nɩ + + + ɩ ɖoo ʊshilé {0} + ɩ ɖoo ʊshilé {0} + ɩ ɖoo ɩshilé {0} + ʊsh. + + na ce ʊsh. {0} nɩ + na ce ʊsh. {0} nɩ + na ce ɩsh. {0} nɩ + + + ɩ ɖoo ʊsh. {0} + ɩ ɖoo ʊsh. {0} + ɩ ɖoo ɩsh. {0} + ʊsh + + na ce ʊsh {0} nɩ + na ce ʊsh {0} nɩ + na ce ɩsh {0} nɩ + + + ɩ ɖoo ʊsh {0} + ɩ ɖoo ʊsh {0} + ɩ ɖoo ɩsh {0} + gaja kʊshilé + + gj. kʊsh. + + + gj kʊsh + bɔkɔɩ kʊshilé + + bk. kʊsh. + + + bk kʊsh + + + aŋɔrɔ kabɔkɔɩ nɩ kʊshilé + + + aŋ. kabk. nɩ kʊsh. + + + aŋ kabk nɩ kʊsh + alahaɖɩ aboŋoka alahaɖɩ nnɖe @@ -1416,6 +1722,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo alahaɖɩ {0} + + alah aboŋoka + alah nnɖe + alah afɔlɩ + + na ce alah {0} nɩ + na ce alah {0} nɩ + na ce alah {0} nɩ + + + ɩ ɖoo alah {0} + ɩ ɖoo alah {0} + ɩ ɖoo alah {0} + + + + alh aboŋoka + alh nnɖe + alh afɔlɩ + + na ce alh {0} nɩ + na ce alh {0} nɩ + na ce alh {0} nɩ + + + ɩ ɖoo alh {0} + ɩ ɖoo alh {0} + ɩ ɖoo alh {0} + + aɖɩtɛnɛɛ aboŋoka aɖɩtɛnɛɛ nnɖe @@ -1431,6 +1767,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo aɖɩtɛnɛɛ {0} + + aɖɩt aboŋoka + aɖɩt nnɖe + aɖɩt afɔlɩ + + na ce aɖɩt {0} nɩ + na ce aɖɩt {0} nɩ + na ce aɖɩt {0} nɩ + + + ɩ ɖoo aɖɩt {0} + ɩ ɖoo aɖɩt {0} + ɩ ɖoo aɖɩt {0} + + + + aɖɩ aboŋoka + aɖɩ nnɖe + aɖɩ nnɖe + + aɖɩ afɔlɩ + na ce aɖɩ {0} nɩ + na ce aɖɩ {0} nɩ + + + ɩ ɖoo aɖɩ {0} + ɩ ɖoo aɖɩ {0} + ɩ ɖoo aɖɩ {0} + + atalaata aboŋoka atalaata nnɖe @@ -1446,6 +1812,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo atalaata {0} + + atal aboŋoka + atal nnɖe + atal afɔlɩ + + na ce atal {0} nɩ + na ce atal {0} nɩ + na ce atal {0} nɩ + + + ɩ ɖoo atal {0} + ɩ ɖoo atal {0} + ɩ ɖoo atal {0} + + + + ata aboŋoka + ata nnɖe + ata afɔlɩ + + na ce ata {0} nɩ + na ce ata {0} nɩ + na ce ata {0} nɩ + + + ɩ ɖoo ata {0} + ɩ ɖoo ata {0} + ɩ ɖoo ata {0} + + alaarba aboŋoka alaarba nnɖe @@ -1461,6 +1857,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo alaarba {0} + + alar aboŋoka + alar nnɖe + alar afɔlɩ + + na ce alar {0} nɩ + na ce alar {0} nɩ + na ce alar {0} nɩ + + + ɩ ɖoo alar {0} + ɩ ɖoo alar {0} + ɩ ɖoo alar {0} + + + + alr aboŋoka + alr nnɖe + alr afɔlɩ + + na ce alr {0} nɩ + na ce alr {0} nɩ + na ce alr {0} nɩ + + + ɩ ɖoo alr {0} + ɩ ɖoo alr {0} + ɩ ɖoo alr {0} + + alaamɩshɩ aboŋoka alaamɩshɩ nnɖe @@ -1476,6 +1902,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo alaamɩshɩ {0} + + alam aboŋoka + alam nnɖe + alam afɔlɩ + + na ce alam {0} nɩ + na ce alam {0} nɩ + na ce alam {0} nɩ + + + ɩ ɖoo alam {0} + ɩ ɖoo alam {0} + ɩ ɖoo alam {0} + + + + alm aboŋoka + alm nnɖe + alm afɔlɩ + + na ce alm {0} nɩ + na ce alm {0} nɩ + na ce alm {0} nɩ + + + ɩ ɖoo alm {0} + ɩ ɖoo alm {0} + ɩ ɖoo alm {0} + + arɩsǝma aboŋoka arɩsǝma nnɖe @@ -1491,6 +1947,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo arɩsǝma {0} + + arɩs aboŋoka + arɩs nnɖe + arɩs afɔlɩ + + na ce arɩs {0} nɩ + na ce arɩs {0} nɩ + na ce arɩs {0} nɩ + + + ɩ ɖoo arɩs {0} + ɩ ɖoo arɩs {0} + ɩ ɖoo arɩs {0} + + + + arɩ aboŋoka + arɩ nnɖe + arɩ afɔlɩ + + na ce arɩ {0} nɩ + na ce arɩ {0} nɩ + na ce arɩ {0} nɩ + + + ɩ ɖoo arɩ {0} + ɩ ɖoo arɩ {0} + ɩ ɖoo arɩ {0} + + asiibi aboŋoka asiibi nnɖe @@ -1506,46 +1992,179 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩ ɖoo asiibi {0} + + asib aboŋoka + asib nnɖe + asib afɔlɩ + + na ce asib {0} nɩ + na ce asib {0} nɩ + na ce asib {0} nɩ + + + ɩ ɖoo asib {0} + ɩ ɖoo asib {0} + ɩ ɖoo asib {0} + + + + asb aboŋoka + asb nnɖe + asb afɔlɩ + + na ce asb {0} nɩ + na ce asb {0} nɩ + na ce asb {0} nɩ + + + ɩ ɖoo asb {0} + ɩ ɖoo asb {0} + ɩ ɖoo asb {0} + + + + ʊsh. kaŋk. + ʊshilé kaŋkǝlǝ́ + + ʊsh kaŋk + gakɔŋkɔŋɔ̀ gakɔŋkɔŋɔ̀ ŋgaɖe + + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce bʊkɔŋɔkɔŋɔ̀ {0} nɩ + + + ɩ ɖoo gkk. {0} + ɩ ɖoo gakɔŋkɔŋɔ̀ {0} + ɩ ɖoo bʊkɔŋkɔŋɔ̀ {0} + gk. + + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce bʊkɔŋɔkɔŋɔ̀ {0} nɩ + + + ɩ ɖoo gkk. {0} + ɩ ɖoo gakɔŋkɔŋɔ̀ {0} + ɩ ɖoo bʊkɔŋkɔŋɔ̀ {0} + gk + + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce gakɔŋɔkɔŋɔ̀ {0} nɩ + na ce bʊkɔŋɔkɔŋɔ̀ {0} nɩ + + + ɩ ɖoo gkk. {0} + ɩ ɖoo gakɔŋkɔŋɔ̀ {0} + ɩ ɖoo bʊkɔŋkɔŋɔ̀ {0} + gʊnaŋa gʊnaŋa ŋgʊɖe + + na ce anaŋa {0} nɩ + na ce gʊnaŋa {0} nɩ + na ce anaŋa {0} nɩ + + + ɩ ɖoo anaŋa {0} + ɩ ɖoo gʊnaŋa {0} + ɩ ɖoo anaŋa {0} + gn. + + na ce anaŋa {0} nɩ + na ce gʊnaŋa {0} nɩ + na ce anaŋa {0} nɩ + + + ɩ ɖoo anaŋa {0} + ɩ ɖoo gʊnaŋa {0} + ɩ ɖoo anaŋa {0} + gn + + na ce anaŋa {0} nɩ + na ce gʊnaŋa {0} nɩ + na ce anaŋa {0} nɩ + + + ɩ ɖoo anaŋa {0} + ɩ ɖoo gʊnaŋa {0} + ɩ ɖoo anaŋa {0} + gɩpi nnyǝmǝ + + na ce ɩpi {0} nɩ + na ce gɩpi {0} nɩ + na ce ɩpi {0} nɩ + + + ɩ ɖoo ɩpi {0} + ɩ ɖoo gɩpi {0} + ɩ ɖoo ɩpi {0} + gp. + + na ce ɩpi {0} nɩ + na ce gɩpi {0} nɩ + na ce ɩpi {0} nɩ + + + ɩ ɖoo ɩpi {0} + ɩ ɖoo gɩpi {0} + ɩ ɖoo ɩpi {0} + gp + + na ce ɩpi {0} nɩ + na ce gɩpi {0} nɩ + na ce ɩpi {0} nɩ + + + ɩ ɖoo ɩpi {0} + ɩ ɖoo gɩpi {0} + ɩ ɖoo ɩpi {0} + gakɔŋkɔŋɔ̀ kansaʊ + + gk. kans. + + + gk kans + {0} Gk - Gk + {0} ƉAK + ƉAK+? {0} kaakɔŋkɔŋɔ̀ {0} kaakɔŋkɔŋɔ̀ gafʊbaka {0} kaakɔŋkɔŋɔ̀ ɖeiɖei @@ -1687,10 +2306,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brisbɛn - Makarii + Makarii kaAtukǝltǝna - Lɔrɖ Hoo + Lɔrɖ Hoo kaAtukǝltǝna Arubaa @@ -1777,7 +2396,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sao Pauloo - Bahiyaa + Bahiiya Fɔrtalɛsaa @@ -1876,7 +2495,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sɛŋ Jɔɔns - Kokoos + Kokoos kaBʊtukǝltǝna Kinshasaa @@ -1912,7 +2531,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Santiyagoo - Ɖuwalaa + Ɖuwala Urumkii @@ -1933,10 +2552,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kapfɛɛr - Kurasaawu + Kurasawuu - Nowɛl + Nowɛl kaAtukǝltǝna Nikosiya @@ -2008,7 +2627,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Cuuk - Poonpee + Poonpei Kɔsrɛɛ @@ -2023,9 +2642,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Librǝfil - - Gagɛɛshɩtǝna kaakɔŋkɔŋɔ̀ gafʊbaka - Lɔnɖɔn @@ -2067,9 +2683,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guwaɖeluupu - - Malaboo - Atɛn @@ -2116,9 +2729,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jayapuraa - - Irlanɖ kaakɔŋkɔŋɔ̀ - Ɖɔblɛŋ @@ -2167,7 +2777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nɔm Pɛn - Kantɔn + Kantɔn kaAtukǝltǝna Kirimatii @@ -2365,7 +2975,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nyɛmɛ - Nɔrfook + Nɔrfook kaAtukǝltǝna Legɔs @@ -2389,7 +2999,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Niwuye - Shatam + Shatam kaBʊtukǝltǝna Ɔɔklanɖ @@ -2407,7 +3017,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tahitii - Markesas + Markesas kaBʊtukǝltǝna Gambiyee @@ -2431,7 +3041,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Mikelɔŋ - Pɩtkɛɛn + Pɩtkɛɛn kaBʊtukǝltǝna Pɔrto Rikoo @@ -2599,7 +3209,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jubaa - Saotome kampá + Saotomee kampá Ɛl Salfaɖɔɔr @@ -2674,7 +3284,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Miɖwee - Week + Week kaAtukǝltǝna Aɖak @@ -2713,7 +3323,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Biula, Nɔɔr Ɖakoota - Niu Salɛm, Nɔɔr Ɖakota + Niu Salɛm, Nɔɔr Ɖakoota Sɛnta, Nɔɔr Ɖakoota @@ -2788,7 +3398,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Efatee - Walis + Walis na Futuna Apiya @@ -2808,6 +3418,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hararee + + + Akrǝ kaakɔŋkɔŋɔ̀ + Akrǝ kaakɔŋkɔŋɔ̀ ɖeiɖei + Akrǝ kaakɔŋkɔŋɔ̀ gafʊbaka + + Afganistan kaakɔŋkɔŋɔ̀ @@ -2983,6 +3600,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasiliya kaakɔŋkɔŋɔ̀ gafʊbaka + + + Gagɛɛshɩtǝna kaakɔŋkɔŋɔ̀ + Gagɛɛshɩtǝna kaakɔŋkɔŋɔ̀ gafʊbaka + + Brunɛɩ kaakɔŋkɔŋɔ̀ @@ -3159,6 +3782,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gk + + + Grinlanɖ kaakɔŋkɔŋɔ̀ + Grinlanɖ kaakɔŋkɔŋɔ̀ ɖeiɖei + Grinlanɖ kaakɔŋkɔŋɔ̀ gafʊbaka + + Grinlanɖ gajakalaŋ kaakɔŋkɔŋɔ̀ @@ -3173,11 +3803,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grinlanɖ gɩteŋshilelaŋ kaakɔŋkɔŋɔ̀ gafʊbaka - - - Guwam kaakɔŋkɔŋɔ̀ - - Gɔlf kaakɔŋkɔŋɔ̀ @@ -3190,7 +3815,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Awayɩɩ n’Alewutii kaakɔŋkɔŋɔ̀ ɖeiɖei + Awayɩɩ kaakɔŋkɔŋɔ̀ ɖeiɖei @@ -3251,6 +3876,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iraŋ kaakɔŋkɔŋɔ̀ gafʊbaka + + + Irlanɖ kaakɔŋkɔŋɔ̀ + Irlanɖ kaakɔŋkɔŋɔ̀ deidei + + Irkut kaakɔŋkɔŋɔ̀ @@ -3272,6 +3903,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Japaŋ kaakɔŋkɔŋɔ̀ gafʊbaka + + + Kamshatɩka kaakɔŋkɔŋɔ̀ + Kamshatɩka kaakɔŋkɔŋɔ̀ ɖeiɖei + Kamshatɩka kaakɔŋkɔŋɔ̀ gafʊbaka + + Kasastan kaakɔŋkɔŋɔ̀ @@ -3311,11 +3949,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kirgistan kaakɔŋkɔŋɔ̀ - - - Siri Laŋkaa kaakɔŋkɔŋɔ̀ - - Laɩn kaBʊtukǝltǝna kaakɔŋkɔŋɔ̀ @@ -3328,13 +3961,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lɔrɖ Hoo kaakɔŋkɔŋɔ̀ gafʊbaka - - - Makawoo kaakɔŋkɔŋɔ̀ - Makawoo kaakɔŋkɔŋɔ̀ ɖeiɖei - akawoo kaakɔŋkɔŋɔ̀ gafʊbaka - - Magaɖan kaakɔŋkɔŋɔ̀ @@ -3450,11 +4076,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fɛrnanɖo ɖe Norɔnya kaakɔŋkɔŋɔ̀ gafʊbaka - - - Mariyan kǝbʊtukǝltǝna gʊnyɩpɛnɛlaŋ kaakɔŋkɔŋɔ̀ - - Nofosibirk kaakɔŋkɔŋɔ̀ @@ -3551,11 +4172,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sakalin kaakɔŋkɔŋɔ̀ gafʊbaka + + + Samara kaakɔŋkɔŋɔ̀ + Samara kaakɔŋkɔŋɔ̀ ɖeiɖei + Samara kaakɔŋkɔŋɔ̀ gafʊbaka + + - Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀ Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀ ɖeiɖei - Samowa Amalɩka kaja kaakɔŋkɔŋɔ̀ gafʊbaka @@ -3622,6 +4248,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Cuuk kaakɔŋkɔŋɔ̀ + + + Turkii kaakɔŋkɔŋɔ̀ + Turkii kaakɔŋkɔŋɔ̀ ɖeiɖei + Turkii kaakɔŋkɔŋɔ gafʊbaka + + Turkmenistan kaakɔŋkɔŋɔ̀ @@ -3641,6 +4274,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Uruguwee kaakɔŋkɔŋɔ̀ gafʊbaka + + + Urumkii kaakɔŋkɔŋɔ̀ + + Usbeekistan kaakɔŋkɔŋɔ̀ @@ -3713,7 +4351,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic , -   +   @@ -3809,11 +4447,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤ #,##0.00;¤ -#,##0.00 ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 - - - ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 @@ -4826,7 +5459,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic baa ʊshilé {0} ʊshilé {0} ɩshilé {0} - Tɔ̂ɔ n’ʊnyɩŋca {0}ja na gʊnyɩsono. + Tɔ̂ɔ n’ʊnyɩŋca nnɖe na gʊnyɩsono. + Tɔ̂ɔ n’ʊnyɩŋca {0}ka na gʊnyɩsono. + Tɔ̂ɔ n’ʊnyɩŋca {0}ja na gʊnyɩsono. + Tɔ̂ɔ n’ʊnyɩŋca {0} kʊja na gʊnyɩsono @@ -4940,6 +5576,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} bʊye bʊriu {0} bʊye bʊriu + + {0}{1} + gatǝna kɩkashɩ bʊkɔ laŋ baa gatǝna kɩkashɩ bʊkɔ laŋ {0} @@ -4958,6 +5597,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ʊcǝpǝrʊ {0} ɩcǝpǝrʊ {0} + + ɩraɖɩyan + baa raɖɩyan {0} + raɖɩyan {0} + ɩraɖɩyan {0} + ɩɖegre baa ɖegre {0} @@ -4984,7 +5629,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kiloomɛta bʊyɛ bʊyɛ nɩ - ɩlɔ baa ʊlɔ {0} ʊlɔ {0} ɩlɔ {0} @@ -5010,6 +5654,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩmayɩl bʊyɛ bʊyɛ {0} {0} mayɩl bʊyɛ bʊyɛ nɩ + + ekaar mána + baa ekaar {0} + ekaar {0} + ekaar mána {0} + + + ɩyaar bʊyɛ bʊyɛ + baa yaar bʊyɛ bʊyɛ {0} + yaar bʊyɛ bʊyɛ {0} + ɩyaar bʊyɛ bʊyɛ {0} + anaŋcǝna bʊyɛ bʊyɛ baa gʊnaŋcǝna bʊyɛ bʊyɛ {0} @@ -5023,12 +5679,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic asǝkǝmǝ bʊyɛ bʊyɛ {0} {0} nsǝkǝmǝ bʊyɛ bʊyɛ nɩ - - ɩɖunam - baa ɖunam {0} - ɖunam {0} - ɩɖunam {0} - ɩkaraatɩ baa karaatɩ {0} @@ -5055,18 +5705,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩpaartɩ + baa paartɩ {0} + paartɩ {0} + ɩpaartɩ {0} + + + ɩpaartɩ gakʊlɩ nɩ + baa paartɩ gakʊlɩ nɩ {0} + paartɩ gakʊlɩ nɩ {0} + ɩpaartɩ gakʊlɩ nɩ {0} - ɩshɩnʊn nɩ - ɩshɩnʊn nɩ {0} - ɩshɩnʊn nɩ {0} - ɩshɩnʊn nɩ {0} + gasǝwa nɩ + baa gasǝwa nɩ {0} + gasǝwa nɩ {0} + gasǝwa nɩ {0} - miili nɩ - miili nɩ {0} - miili nɩ {0} - miili nɩ {0} + kotoku nɩ + baa kotoku nɩ {0} + kotoku nɩ {0} + kotoku nɩ {0} + + + ɩkotoku-tǝb nɩ + baa ɩkotoku-tǝb nɩ {0} + ɩkotoku-tǝb nɩ {0} + ɩkotoku-tǝb nɩ {0} ɩmol @@ -5104,52 +5769,157 @@ CLDR data files are interpreted according to the LDML specification (http://unic mayɩl gaalɔŋ Gɛɛshɩ kaja nɩ {0} ɩmayɩl gaalɔŋ Gɛɛshɩ kaja nɩ {0} + + ɩpetaabaɩt + baa petaabaɩt {0} + petaabaɩt {0} + ɩpetaabaɩt {0} + + + ɩtɛraabaɩt + baa tɛraabaɩt {0} + tɛraabaɩt {0} + ɩtɛraabaɩt {0} + + + ɩtɛraabɩt + baa tɛraabɩt {0} + tɛraabɩt {0} + ɩtɛraabɩt {0} + + + ɩjigaabaɩt + baa jigaabaɩt {0} + jigaabaɩt {0} + ɩjigaabaɩt {0} + + + ɩjigaabɩt + baa jigaabɩt {0} + jigaabɩt {0} + ɩjigaabɩt {0} + + + ɩmegaabaɩt + baa megaabaɩt {0} + megaabaɩt {0} + ɩmegaabaɩt {0} + + + ɩmegaabɩt + baa megaabɩt {0} + megaabɩt {0} + ɩmegaabɩt {0} + + + ɩkiloobaɩt + baa kiloobaɩt {0} + kiloobaɩt {0} + ɩkiloobaɩt {0} + + + ɩkiloobɩt + baa kiloobɩt {0} + kiloobɩt {0} + ɩkiloobɩt {0} + + + ɩbaɩt + baa baɩt {0} + baɩt {0} + ɩbaɩt {0} + + + ɩbɩt + baa bɩt {0} + bɩt {0} + ɩbɩt {0} + - bʊja-ɩshɩnʊn mána + bʊja-bʊsǝwa + baa bʊja-gasǝwa {0} + bʊja-gasǝwa {0} + bʊja-bʊsǝwa {0} bʊja-tǝb mána + baa bʊja-tǝb {0} + bʊja-tǝb {0} + bʊja-tǝb mána {0} bʊja + baa gaja {0} + gaja {0} + bʊja {0} {0} gaja nɩ ɩŋɔrɩriu mána + baa ɩŋɔrɩriu {0} + ɩŋɔrɩriu {0} + ɩŋɔrɩriu mána {0} {0} ɩŋɔrɩriu nɩ ɩŋɔrɔ + baa aŋɔrɔ {0} + aŋɔrɔ {0} + ɩŋɔrɔ {0} {0} aŋɔrɔ nɩ ɩbɔkɔɩ + baa bɔkɔɩ {0} + bɔkɔɩ {0} + ɩbɔkɔɩ {0} {0} bɔkɔɩ nɩ ɩshilé + baa ʊshilé {0} + ʊshilé {0} + ɩshilé {0} {0} ʊshilé nɩ bʊkɔŋkɔŋɔ̀ + baa gakɔŋkɔŋɔ̀ {0} + gakɔŋkɔŋɔ̀ {0} + bʊkɔŋkɔŋɔ̀ {0} {0} gakɔŋkɔŋɔ̀ nɩ anaŋa + baa gʊnaŋa {0} + gʊnaŋa {0} + anaŋa {0} {0} gʊnaŋa nɩ ɩpi + baa gɩpi {0} + gɩpi {0} + ɩpi {0} {0} gɩpi nɩ ɩsǝmpi + baa gɩsǝmpi {0} + gɩsǝmpi {0} + ɩsǝmpi {0} ɩmikroosǝmpi + baa mikroosǝmpi {0} + mikroosǝmpi {0} + ɩmikroosǝmpi {0} ɩnanoosǝmpi + baa nanoosǝmpi {0} + nanoosǝmpi {0} + ɩnanoosǝmpi {0} Ampɛɛr mána @@ -5194,7 +5964,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩkiloojul {0} - ɩjul baa jul {0} jul {0} ɩjul {0} @@ -5211,6 +5980,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic elɛtrɔŋ-Fɔltɩ {0} elɛtrɔŋ-Fɔltɩ mána {0} + + ɩtɛɛm Amalɩka kʊfaŋʊ kǝbaja + baa tɛɛm Amalɩka kʊfaŋʊ kaja {0} + tɛɛm Amalɩka kʊfaŋʊ kaja {0} + ɩtɛɛm Amalɩka kʊfaŋʊ kǝbaja {0} + + + ɩpɔŋ kɩkashɩ + baa pɔŋ kɩkashɩ {0} + pɔŋ kɩkashɩ {0} + ɩpɔŋ kɩkashɩ {0} + ɩNiutɔn baa Niutɔn {0} @@ -5249,18 +6030,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩfɔɔ ɛm - baa ʊfɔɔ ɛm - ʊfɔɔ ɛm {0} - ɩfɔɔ ɛm {0} - ɩpisɛl baa pisɛl pisɛl {0} ɩpisɛl {0} - ɩmegapisɛl baa megapisɛl megapisɛl {0} ɩmegapisɛl {0} @@ -5278,7 +6054,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩpisɛl {0} nsǝkǝmǝ bʊye bʊye nɩ - gatǝna gawalaka kʊfana baa gatǝna gawalaka kʊfana {0} gatǝna gawalaka kʊfana {0} gatǝna gawalaka kɩfana {0} @@ -5335,27 +6110,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩpikoomɛta {0} - ɩmayɩl baa mayɩl {0} mayɩl {0} ɩmayɩl {0} + + ɩyaar + baa yaar {0} + yaar {0} + ɩyaar {0} + - anaŋcǝna baa gʊnaŋcǝna {0} gʊnaŋcǝna {0} anaŋcǝna {0} {0}/gʊnaŋcǝna nɩ - asǝkǝmǝ baa nsǝkǝmǝ {0} nsǝkǝmǝ {0} asǝkǝmǝ {0} {0} nsǝkǝmǝ nɩ - ɩparsɛɛkɩ baa parsɛɛkɩ {0} parsɛɛkɩ {0} ɩparsɛɛkɩ {0} @@ -5373,13 +6150,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic atǝn-n’ʊshilè mána {0} - ɩfɛɛlɔŋ baa fɛɛlɔŋ {0} fɛɛlɔŋ {0} ɩfɛɛlɔŋ {0} - ɩfɛɛɖǝm baa fɛɛɖǝm {0} fɛɛɖǝm {0} ɩfɛɛɖǝm {0} @@ -5397,13 +6172,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic sǝkanɖɩnaf kɩmayɩl {0} - ɩpipi baa gɩpipi {0} gɩpipi {0} ɩpipi {0} - ʊshilè kɩfana baa ʊshilè kʊfana ʊshilè kʊfana {0} ʊshilè kɩfana {0} @@ -5426,6 +6199,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic lumɛn {0} ɩlumɛn {0} + + ɩshilè kɩfana kɩkashɩ + baa ʊshilè kɩfana kɩkashɩ {0} + ʊshilè {0} kɩfana kɩkashɩ + ɩshilè {0} kɩfana kɩkashɩ + ɩtɔn mɛta kʊfaŋʊ kɩja baa tɔn {0} @@ -5440,7 +6219,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kiloogram nɩ - ɩgram baa gram {0} gram {0} ɩgram {0} @@ -5477,8 +6255,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩpɔŋ {0} {0} pɔŋ nɩ + + unsiya mána + baa unsiya {0} + unsiya {0} + unsiya mána {0} + {0} unsiya nɩ + + + unsiya trɔɩ mána + baa unsiya trɔɩ {0} + unsiya trɔɩ {0} + unsiya trɔɩ mána {0} + wʊra karaatɩ mána + baa wʊra karaatɩ {0} + wʊra karaatɩ {0} + wʊra karaatɩ mána {0} + + + ɩɖaltɔn + baa ɖaltɔn {0} + ɖaltɔn {0} + ɩɖaltɔn {0} + + + bʊtǝna kʊyɔgʊ + baa gatǝna {0} kʊyɔgʊ + gatǝna {0} kʊyɔgʊ + bʊtǝna {0} kʊyɔgʊ + + + ɩshilè kʊyɔgʊ + baa ʊshilè {0} kʊyɔgʊ + ʊshilè {0} kʊyɔgʊ + ɩshilè {0} kʊyɔgʊ + + + ɩgren + baa gren {0} + gren {0} + ɩgren {0} ɩjigaa-Waatɩ @@ -5524,6 +6342,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic mɛrkiir kaja + baa mɛrkiir kaja {0} + mɛrkiir kaja {0} + mɛrkiir kaja {0} + + + pɔŋ kɩkashɩ nsǝkǝmǝ bʊyɛ bʊyɛ laŋ + baa pɔŋ kɩkashɩ nsǝkǝmǝ bʊyɛ bʊyɛ laŋ {0} + pɔŋ kɩkashɩ nsǝkǝmǝ bʊyɛ bʊyɛ laŋ {0} + ɩpɔŋ kɩkashɩ nsǝkǝmǝ bʊyɛ bʊyɛ laŋ {0} mɛrkiir kasǝkǝmǝ @@ -5597,6 +6424,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ŋkʊra {0} akʊra {0} + + Boofɔr + baa Boofɔr {0} + Boofɔr {0} + Boofɔr {0} + kpaʊ-na-sarasara kɩɖegre baa kpaʊ-na-sarasara kaɖegre {0} @@ -5621,6 +6454,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kɛlwin {0} ɩKɛlwin {0} + + ɩpɔŋ kɩkashɩ ashee anaŋcǝna + baa pɔŋ kɩkashɩ ashee gʊnaŋcǝna {0} + pɔŋ kɩkashɩ ashee gʊnaŋcǝna {0} + ɩpɔŋ kɩkashɩ ashee anaŋcǝna {0} + ɩNiutɔn-mɛta baa Niutɔn-mɛta {0} @@ -5653,6 +6492,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic mayɩl bʊyɛ bʊriu {0} ɩmayɩl bʊyɛ bʊriu {0} + + ɩyaar bʊyɛ bʊriu + baa yaar bʊyɛ bʊriu {0} + yaar bʊyɛ bʊriu {0} + ɩyaar bʊyɛ bʊriu {0} + anaŋcǝna bʊyɛ bʊriu baa gʊnaŋcǝna bʊyɛ bʊriu {0} @@ -5678,7 +6523,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩhɛktoolitri {0} - ɩlitri baa litri {0} litri {0} ɩlitri {0} @@ -5714,6 +6558,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic kɔɔpʊ mɛta kʊfaŋʊ kɩja {0} ɩkɔɔpʊ mɛta kʊfaŋʊ kɩja {0} + + unsiya mána bʊto bʊto mɛta kʊfaŋʊ kǝbaja + baa unsiya bʊto bʊto mɛta kʊfaŋʊ kaja {0} + unsiya bʊto bʊto mɛta kʊfaŋʊ kaja {0} + unsiya mána bʊto bʊto mɛta kʊfaŋʊ kǝbaja {0} + + + ekaar-anaŋcǝna + baa ekaar-gʊnaŋcǝna {0} + ekaar-gʊnaŋcǝna {0} + ekaar-anaŋcǝna {0} + ɩgaalɔŋ Amalɩka kʊfaŋʊ kɩja baa gaalɔŋ Amalɩka kʊfaŋʊ kaja {0} @@ -5728,17 +6584,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩgaalɔŋ gɛɛshɩ kɩja {0} {0} gaalɔŋ gɛɛshɩ kaja nɩ + + ɩkɔɔtɩ + baa kɔɔtɩ {0} + kɔɔtɩ {0} + ɩkɔɔtɩ {0} + + + ɩpaɩntɩ + baa paɩntɩ {0} + paɩntɩ {0} + ɩpaɩntɩ {0} + - ɩkɔɔpʊ baa kɔɔpʊ {0} kɔɔpʊ {0} ɩkɔɔpʊ {0} + + unsiya mána bʊto bʊto Amalɩka kʊfaŋʊ kǝbaja + baa unsiya bʊto bʊto Amalɩka kʊfaŋʊ kǝbaja {0} + unsiya bʊto bʊto Amalɩka kʊfaŋʊ kǝbaja {0} + unsiya mána bʊto bʊto Amalɩka kʊfaŋʊ kǝbaja {0} + + + unsiya mána bʊto bʊto Gɛɛshɩ kʊfaŋʊ kǝbaja + baa unsiya bʊto bʊto Gɛɛshɩ kʊfaŋʊ kaja {0} + unsiya bʊto bʊto Gɛɛshɩ kʊfaŋʊ kaja {0} + unsiya mána bʊto bʊto Gɛɛshɩ kʊfaŋʊ kaja {0} + - ɩtɩrɩɩ ʊnyɩʊ kɩja - baa tɩrɩɩ ʊnyɩʊ kaja {0} - tɩrɩɩ ʊnyɩʊ kaja {0} - ɩtɩrɩɩ ʊnyɩʊ kɩja {0} + ɩtɩrɩɩ ʊjɩʊ kɩja + baa tɩrɩɩ ʊjɩʊ kaja {0} + tɩrɩɩ ʊjɩʊ kaja + ɩtɩrɩɩ ʊjɩʊ kɩja {0} ɩtɩrɩɩ kafee kɩja @@ -5746,30 +6625,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic tɩrɩɩ kafee kaja {0} ɩtɩrɩɩ kafee kɩja {0} + + ɩbaril + baa baril {0} + baril {0} + ɩbaril {0} + + + ʊkǝm kɩtɩrɩɩ + baa ʊkǝm katɩrɩɩ {0} + ʊkǝm katɩrɩɩ {0} + ʊkǝm kɩtɩrɩɩ {0} + + + ʊkǝm kɩtɩrɩɩ Gɛɛshɩ kʊfaŋʊ kǝbaja + baa ʊkǝm katɩrɩɩ Gɛɛshɩ kʊfaŋʊ kaja {0} + ʊkǝm katɩrɩɩ Gɛɛshɩ kʊfaŋʊ kaja {0} + ʊkǝm kɩtɩrɩɩ Gɛɛshɩ kʊfaŋʊ kǝbaja {0} + - ɩsɔr baa ʊsɔr {0} ʊsɔr {0} ɩsɔr {0} - ɩɖraam baa ɖraam {0} ɖraam {0} ɩɖraam {0} - ɩjɩga baa jɩga {0} jɩga {0} ɩjɩga {0} - ɩkɩtɩʊ baa ʊkɩtɩʊ {0} ʊkɩtɩʊ {0} ɩkɩtɩʊ {0} + + ɩkɔɔtɩ Gɛɛshɩ kʊfaŋʊ kǝbaja + baa kɔɔtɩ Gɛɛshɩ kʊfaŋʊ kaja {0} + kɔɔtɩ Gɛɛshɩ kʊfaŋʊ kaja {0} + ɩkɔɔtɩ Gɛɛshɩ kʊfaŋʊ kǝbaja {0} + ɩsɩteraɖiyaan baa sɩteraɖiyaan {0} @@ -5778,41 +6677,92 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɩkataal + baa kataal {0} + kataal {0} + ɩkataal {0} ɩkʊlɔɔm + baa kʊlɔɔm {0} + kʊlɔɔm {0} + ɩkʊlɔɔm {0} ɩfaraaɖɩ + baa faraaɖɩ {0} + faraaɖɩ {0} + ɩfaraaɖɩ {0} ɩhɛnrii + baa hɛnrii {0} + hɛnrii {0} + ɩhɛnrii {0} ɩsimɛɛnsɩ + baa simɛɛnsɩ {0} + simɛɛnsɩ {0} + ɩsimɛɛnsɩ {0} + + + ɩkalorii-IT + baa kalorii-IT {0} + kalorii-IT {0} + ɩkalorii-IT {0} ɩbɛkɛrɛɛl + baa bɛkɛrɛɛl {0} + bɛkɛrɛɛl {0} + ɩbɛkɛrɛɛl {0} ɩsɩfɛɛrtɩ + baa sɩfɛɛrtɩ {0} + sɩfɛɛrtɩ {0} + ɩsɩfɛɛrtɩ {0} ɩgrɛɛ + baa grɛɛ {0} + grɛɛ {0} + ɩgrɛɛ {0} + + + ɩkiloogram kɩkashɩ + baa kiloogram kɩkashɩ {0} + kiloogram kɩkashɩ {0} + ɩkiloogram kɩkashɩ {0} ɩtɛsɩlaa + baa tɛsɩlaa {0} + tɛsɩlaa {0} + ɩtɛsɩlaa {0} ɩwɛbaasɩ + baa wɛbaasɩ {0} + wɛbaasɩ {0} + ɩwɛbaasɩ {0} - pɔɩɩ pɔɩɩ {0} pɔɩɩ {0} pɔɩɩ {0} + + ɩpaartɩ ŋkulo nɩ + baa paartɩ ŋkulo nɩ {0} + paartɩ ŋkulo nɩ {0} + ɩpaartɩ ŋkulo nɩ {0} + + ɩjibɔŋɔ + baa gɩjibɔŋɔ {0} + gɩjibɔŋɔ {0} + ɩjibɔŋɔ {0} {0} gɩjibɔŋɔ nɩ @@ -5823,6 +6773,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0}{1} + G {0} G {0} @@ -5885,7 +6838,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi² {0} mi² {0} + + ekaar mána + ac {0} + ac {0} + ac {0} + + ɩyaar² yd² {0} yd² {0} yd² {0} @@ -5926,6 +6886,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic item {0} item {0} + + paartɩ + part {0} + part {0} + part {0} + ppm {0} ppm {0} @@ -5953,6 +6919,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Glc + Glc {0} + Glc {0} + Glc {0} L/km {0} @@ -5974,6 +6943,158 @@ CLDR data files are interpreted according to the LDML specification (http://unic mpg Imp. {0} mpg Imp. {0} + + PBaɩt + PB {0} + PB {0} + PB {0} + + + TBaɩt + TB {0} + TB {0} + TB {0} + + + Tbɩt + Tb {0} + Tb {0} + Tb {0} + + + GBaɩt + GB {0} + GB {0} + GB {0} + + + Gbɩt + Gb {0} + Gb {0} + Gb {0} + + + MBaɩt + MB {0} + MB {0} + MB {0} + + + Mbɩt + Mb {0} + Mb {0} + Mb {0} + + + kBaɩt + kB {0} + kB {0} + kB {0} + + + kbɩt + kb {0} + kb {0} + kb {0} + + + baɩt + baa baɩt {0} + baɩt {0} + ɩbaɩt {0} + + + bɩt + baa bɩt {0} + bɩt {0} + ɩbɩt {0} + + + bjb. + bjb. {0} + bjb. {0} + bjb. {0} + + + bjt. + bjt {0} + bjt {0} + bjt {0} + + + bj. + gj. {0} + gj. {0} + bj. {0} + {0}/gj. + + + ɩŋɩ. + ɩŋɩ. {0} + ɩŋɩ. {0} + ɩŋɩ. {0} + {0}/ɩ + + + ɩŋr + aŋr {0} + aŋr {0} + ɩŋr {0} + {0}/aŋɔrɔ + + + ɩbk + bk {0} + bk {0} + ɩbk {0} + {0}/bk + + + ɩsh + ʊsh {0} + ʊsh {0} + ɩsh {0} + {0}/ʊsh + + + bkk + gkk {0} + gkk {0} + bkk {0} + {0}/gk + + + aŋ + gŋ {0} + gŋ {0} + aŋ {0} + {0}/gʊnaŋa + + + ɩp + gp {0} + gp {0} + ɩp {0} + {0}/gɩpi + + + ɩm + gm {0} + gm {0} + ɩm {0} + + + ɩμm + μm {0} + μm {0} + ɩμm {0} + + + ɩnm + nm {0} + nm {0} + ɩnm {0} + A {0} A {0} @@ -6035,6 +7156,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic US therm {0} US therm {0} + + lbf {0} + lbf {0} + lbf {0} + N {0} N {0} @@ -6130,6 +7256,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi {0} + ɩyaar yd {0} yd {0} yd {0} @@ -6211,6 +7338,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic lm {0} lm {0} + + ɩshilè kɩfana kɩkashɩ + L☉ {0} + L☉ {0} + L☉ {0} + t {0} t {0} @@ -6256,17 +7389,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic oz {0} oz {0} oz {0} + {0}/unsiya + oz troy oz t {0} oz t {0} oz t {0} + wʊra karaatɩ CD {0} CD {0} CD {0} + + ɩɖaltɔn + Da {0} + Da {0} + Da {0} + + + bʊtǝna kʊyɔgʊ + M⊕ {0} + M⊕ {0} + M⊕ {0} + + + ɩshilè kʊyɔgʊ + M☉ {0} + M☉ {0} + M☉ {0} + + + ɩgren + gr {0} + gr {0} + gr {0} + GW {0} GW {0} @@ -6302,6 +7462,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic mmHg {0} mmHg {0} + + mɛrkiir kaja + Hg {0} + Hg {0} + Hg {0} + psi {0} psi {0} @@ -6387,6 +7553,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic K {0} K {0} + + lbf⋅ft {0} + lbf⋅ft {0} + lbf⋅ft {0} + N⋅m {0} N⋅m {0} @@ -6413,6 +7584,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi³ {0} + ɩyaar³ yd³ {0} yd³ {0} yd³ {0} @@ -6423,6 +7595,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ft³ {0} + asǝkǝmǝ³ in³ {0} in³ {0} in³ {0} @@ -6468,6 +7641,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic mc {0} mc {0} + + fl oz m. {0} + fl oz m. {0} + fl oz m. {0} + ac ft {0} ac ft {0} @@ -6488,6 +7666,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic gal Imp. {0} gal Imp. {0} + + qt {0} + qt {0} + qt {0} + + + ɩpaɩntɩ + pt {0} + pt {0} + pt {0} + ɩkɔɔpʊ c {0} @@ -6515,11 +7704,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic tsp {0} + baril bbl {0} bbl {0} bbl {0} + ʊkǝm kɩtɩrɩɩ dstspn {0} dstspn {0} dstspn {0} @@ -6558,6 +7749,72 @@ CLDR data files are interpreted according to the LDML specification (http://unic qt Imp. {0} qt Imp. {0} + + sr {0} + sr {0} + sr {0} + + + kat {0} + kat {0} + kat {0} + + + C {0} + C {0} + C {0} + + + F {0} + F {0} + F {0} + + + H {0} + H {0} + H {0} + + + S {0} + S {0} + S {0} + + + cal-IT + cal-IT {0} + cal-IT {0} + cal-IT {0} + + + Bq {0} + Bq {0} + Bq {0} + + + Sv {0} + Sv {0} + Sv {0} + + + Gy {0} + Gy {0} + Gy {0} + + + kgf {0} + kgf {0} + kgf {0} + + + T {0} + T {0} + T {0} + + + Wb {0} + Wb {0} + Wb {0} + pɔɩɩ light {0} @@ -6571,6 +7828,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic gɩjibɔŋɔ + baa gɩjibɔŋɔ {0} + gɩjibɔŋɔ {0} + ɩjibɔŋɔ {0} + {0}/gɩjibɔŋɔ nɩ ʊtǝŋu @@ -6581,6 +7842,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0}{1} + G{0} G{0} @@ -6601,21 +7865,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic rad{0} rad{0} - - °{0} - °{0} - °{0} - - - ′{0} - ′{0} - ′{0} - - - ″{0} - ″{0} - ″{0} - km²{0} km²{0} @@ -6628,7 +7877,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ha{0} - ɩmɛta² m²{0} m²{0} m²{0} @@ -6643,6 +7891,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi²{0} mi²{0} + + ekaar + ac{0} + ac{0} + ac{0} + yd²{0} yd²{0} @@ -6684,33 +7938,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic item{0} item{0} + + part {0} + part {0} + part {0} + ppm{0} ppm{0} ppm{0} - - %{0} - %{0} - %{0} - - - ‰{0} - ‰{0} - ‰{0} - - - ‱{0} - ‱{0} - ‱{0} - mol{0} mol{0} mol{0} - Glc + Glc {0} + Glc {0} + Glc {0} L/km{0} @@ -6732,6 +7978,149 @@ CLDR data files are interpreted according to the LDML specification (http://unic mpg Imp.{0} mpg Imp.{0} + + PB{0} + PB{0} + PB{0} + + + TB{0} + TB{0} + TB{0} + + + Tb{0} + Tb{0} + Tb{0} + + + GB{0} + GB{0} + GB{0} + + + Gb{0} + Gb{0} + Gb{0} + + + MB{0} + MB{0} + MB{0} + + + Mb{0} + Mb{0} + Mb{0} + + + kB{0} + kB{0} + kB{0} + + + kb{0} + kb{0} + kb{0} + + + B + baa baɩt {0} + {0}B + {0}B + + + bɩt + baa bɩt{0} + bɩt{0} + ɩbɩt{0} + + + bjb + bjb{0} + bjb{0} + bjb{0} + + + bjt + bjt{0} + bjt{0} + bjt{0} + + + bj + gj{0} + gj{0} + bj{0} + {0}/gj + + + ɩŋɩ + ɩŋɩ{0} + ɩŋɩ{0} + ɩŋɩ{0} + {0}/ɩ + + + aŋr + aŋr{0} + aŋr{0} + ɩŋr{0} + {0}/aŋ + + + bk + bk{0} + bk{0} + ɩbk{0} + {0}/bk + + + ʊsh + ʊsh{0} + ʊsh{0} + ɩsh{0} + {0}/ʊsh + + + gkk + gkk{0} + gkk{0} + bkk{0} + {0}/gk + + + gŋ + gŋ{0} + gŋ{0} + aŋ{0} + {0}/gŋ + + + gp + gp{0} + gp{0} + ɩp{0} + {0}/gp + + + gm + gm{0} + gm{0} + ɩm{0} + + + μm + μm{0} + μm{0} + ɩμm{0} + + + nm + nm{0} + nm{0} + ɩnm {0} + A{0} A{0} @@ -6793,6 +8182,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic US therm{0} US therm{0} + + lbf {0} + lbf {0} + lbf {0} + N{0} N{0} @@ -6828,7 +8222,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic em {0} em {0} + + px + + + MP + + R⊕ R⊕{0} R⊕{0} R⊕{0} @@ -6839,7 +8240,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic km{0} - m m{0} m{0} m{0} @@ -6875,7 +8275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic pm{0} - ɩmayɩl + mi mi{0} mi{0} mi{0} @@ -6886,11 +8286,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic yd{0} + ft ′{0} ′{0} ′{0} + in ′′{0} ′′{0} ′′{0} @@ -6934,13 +8336,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic smi{0} - ɩpipi pt{0} pt{0} pt{0} - ʊshilè kɩfana + R☉ R☉{0} R☉{0} R☉{0} @@ -6960,6 +8361,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic lm{0} lm{0} + + ɩshilè kɩfana kɩkashɩ + L☉ {0} + L☉ {0} + L☉ {0} + t{0} t{0} @@ -6971,7 +8378,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic kg{0} - ɩgram g{0} g{0} g{0} @@ -7016,6 +8422,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic CD{0} CD{0} + + ɩɖaltɔn + Da{0} + Da{0} + Da{0} + + + bʊtǝna kʊyɔgʊ + M⊕{0} + M⊕{0} + M⊕{0} + + + ɩshilè kʊyɔgʊ + M☉{0} + M☉{0} + M☉{0} + + + gr + gr{0} + gr{0} + gr{0} + GW{0} GW{0} @@ -7051,6 +8481,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic mmHg{0} mmHg{0} + + Hg {0} + Hg {0} + Hg {0} + psi{0} psi{0} @@ -7117,25 +8552,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic kn{0} kn{0} - - °{0} - °{0} - °{0} - - - °C{0} - °C{0} - °C{0} - - - °F{0} - °F{0} - °F{0} - - - K {0} - K {0} - K {0} + + lbf⋅ft {0} + lbf⋅ft {0} + lbf⋅ft {0} N⋅m{0} @@ -7163,6 +8583,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi³{0} + ɩyaar³ yd³{0} yd³{0} yd³{0} @@ -7219,6 +8640,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic mc{0} mc{0} + + fl oz m. {0} + fl oz m. {0} + fl oz m. {0} + ac ft{0} ac ft{0} @@ -7239,6 +8665,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic gal Imp.{0} gal Imp.{0} + + qt{0} + qt{0} + qt{0} + + + ɩpaɩntɩ + pt{0} + pt{0} + pt{0} + kɔɔpʊ c{0} @@ -7281,7 +8718,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic dstspn Imp{0} - ɩsɔr dr{0} dr{0} dr{0} @@ -7299,7 +8735,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic jigger{0} - ɩkɩtɩʊ pn{0} pn{0} pn{0} @@ -7309,8 +8744,73 @@ CLDR data files are interpreted according to the LDML specification (http://unic qt Imp.{0} qt Imp.{0} + + sr {0} + sr {0} + sr {0} + + + kat {0} + kat {0} + kat {0} + + + C {0} + C {0} + C {0} + + + F {0} + F {0} + F {0} + + + H {0} + H {0} + H {0} + + + S {0} + S {0} + S {0} + + + cal-IT + cal-IT {0} + cal-IT {0} + cal-IT {0} + + + Bq {0} + Bq {0} + Bq {0} + + + Sv {0} + Sv {0} + Sv {0} + + + Gy {0} + Gy {0} + Gy {0} + + + kgf {0} + kgf {0} + kgf {0} + + + T {0} + T {0} + T {0} + + + Wb {0} + Wb {0} + Wb {0} + - pɔɩɩ light{0} light{0} light{0} @@ -7320,6 +8820,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ppb{0} ppb{0} + + ɩjibɔŋɔ + baa gɩjibɔŋɔ {0} + gɩjibɔŋɔ{0} + ɩjibɔŋɔ{0} + {0}/gɩjibɔŋɔ nɩ + @@ -7350,18 +8857,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {given-informal} {surname} - - {title} {credentials} {given} {surname} {given2} - {given-informal} {surname} {given-monogram-allCaps}{surname-monogram-allCaps} {given2-monogram-allCaps} - - {given-monogram-allCaps}{surname-monogram-allCaps} {given2-monogram-allCaps} - {title} {given} {surname} {given2} @@ -7404,18 +8905,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname} {given-informal} - - {title} {credentials} {surname} {surname2} {given2} {given} - {surname} {given-informal} {surname-monogram-allCaps}{given2-monogram-allCaps}{given-monogram-allCaps} - - {surname-monogram-allCaps}{given2-monogram-allCaps}{given-monogram-allCaps} - {title} {surname} {surname2} {given2} {given} @@ -7455,21 +8950,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname} {given2} {given} - - {surname} {given2} {given} - - - {surname} {given2} {given} - - - {surname} {given2} {given} - - - {surname} {given2} {given} - - - {surname} {given2} {given} - Muniiru diff --git a/make/data/cldr/common/main/blt.xml b/make/data/cldr/common/main/blt.xml deleted file mode 100644 index 7b5aa3a4c5c2..000000000000 --- a/make/data/cldr/common/main/blt.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - ꪼꪕꪒꪾ - - - - [꪿ ꫁ ꫝ ꪀ ꪁ ꪄ ꪅ ꪆ ꪇ ꪈ ꪉ ꪊ ꪋ ꪎ ꪏ ꪐ ꪑ ꪒ ꪓ ꪔ ꪕ ꪖ ꪗ ꪘ ꪙ ꪚ ꪛ ꪜ ꪝ ꪠ ꪡ ꪢ ꪣ ꪤ ꪥ ꪦ ꪧ ꪨ ꪩ ꪪ ꪫ ꪬ ꪭ ꪮ ꪯ ꪰ ꪱ ꪲ ꪳ ꪴ ꪵ ꪶ ꪷ ꪸ ꪹ ꪺ ꪻ ꪼ ꪽ ꪾ ꫀ ꫂ ꫛ ꫜ] - [. ꫞ ꫟] - - diff --git a/make/data/cldr/common/main/blt_VN.xml b/make/data/cldr/common/main/blt_VN.xml deleted file mode 100644 index 6f53ae7c0196..000000000000 --- a/make/data/cldr/common/main/blt_VN.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bm_Nkoo.xml b/make/data/cldr/common/main/bm_Nkoo.xml deleted file mode 100644 index 1319336005bc..000000000000 --- a/make/data/cldr/common/main/bm_Nkoo.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - + + @@ -615,15 +620,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - + + - + - + - + @@ -633,19 +638,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + + - + @@ -656,10 +662,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + + - + + + @@ -667,6 +676,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -696,16 +706,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + + + @@ -714,7 +726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -728,7 +740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ পূর্ব আফ্রিকা উত্তর আফ্রিকা মধ্য আফ্রিকা - দক্ষিন আফ্রিকা + দক্ষিণাঞ্চলীয় আফ্রিকা আমেরিকা উত্তরাঞ্চলীয় আমেরিকা ক্যারিবিয়ান @@ -803,7 +815,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ চীন কলম্বিয়া ক্লিপারটন দ্বীপপুঞ্জ - সার্ক দ্বীপ + সার্ক দ্বীপ কোস্টারিকা কিউবা কেপ ভার্দে @@ -832,7 +844,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ফিনল্যান্ড ফিজি ফকল্যান্ড দ্বীপপুঞ্জ - ফকল্যান্ড আইল্যান্ড ( ইসল্যাস মাসভেনিস) + ফকল্যান্ড দ্বীপপুঞ্জ (ইসল্যাস মাসভেনিস) মাইক্রোনেশিয়া ফ্যারো দ্বীপপুঞ্জ ফ্রান্স @@ -841,7 +853,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইউ কে গ্রেনাডা জর্জিয়া - ফরাসী গায়ানা + ফরাসি গায়ানা গার্নসি ঘানা জিব্রাল্টার @@ -850,13 +862,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ গিনি গুয়াদেলৌপ নিরক্ষীয় গিনি - গ্রীস + গ্রিস দক্ষিণ জর্জিয়া ও দক্ষিণ স্যান্ডউইচ দ্বীপপুঞ্জ গুয়াতেমালা গুয়াম গিনি-বিসাউ - গিয়ানা - হংকং এসএআর চীনা + গায়ানা + হংকং এসএআর চীন হংকং হার্ড এবং ম্যাকডোনাল্ড দ্বীপপুঞ্জ হন্ডুরাস @@ -880,7 +892,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জর্ডন জাপান কেনিয়া - কিরগিজিস্তান + কিরগিজস্তান কম্বোডিয়া কিরিবাতি কমোরোস @@ -941,7 +953,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ওমান পানামা পেরু - ফরাসী পলিনেশিয়া + ফরাসি পলিনেশিয়া পাপুয়া নিউ গিনি ফিলিপাইন পাকিস্তান @@ -949,13 +961,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ সেন্ট পিয়ের ও মিকুয়েলন পিটকেয়ার্ন দ্বীপপুঞ্জ পুয়ের্তো রিকো - প্যালেস্টাইন ভূখণ্ড + ফিলিস্তিনি ভূখণ্ড ফিলিস্তিন পর্তুগাল পালাউ প্যারাগুয়ে কাতার - আউটলাইনিং ওসানিয়া + প্রান্তীয় ওশেনিয়া রিইউনিয়ন রোমানিয়া সার্বিয়া @@ -968,7 +980,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ সুইডেন সিঙ্গাপুর সেন্ট হেলেনা - স্লোভানিয়া + স্লোভেনিয়া স্বালবার্ড ও জান মেয়েন স্লোভাকিয়া সিয়েরা লিওন @@ -986,7 +998,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ট্রিস্টান ডা কুনহা তুর্কস ও কাইকোস দ্বীপপুঞ্জ চাদ - ফরাসী দক্ষিণাঞ্চল + ফরাসি দক্ষিণ এবং অ্যান্টার্কটিক ভূমি টোগো থাইল্যান্ড তাজিকিস্তান @@ -1003,7 +1015,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ তাঞ্জানিয়া ইউক্রেন উগান্ডা - যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ + মার্কিন যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ জাতিসংঘ মার্কিন যুক্তরাষ্ট্র ইউ এস @@ -1034,8 +1046,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ওয়েল্স - পিনইন রোমানাইজেশন - ওয়াদে-গিলেস রোমানাইজেশন + পিনইন রোমানীকরণ + ওয়াদে-গিলেস রোমানীকরণ ক্যালেন্ডার @@ -1047,18 +1059,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ বাছাই বিন্যাস স্বাভাবিককৃত বাছাইকরণ সংখ্যাসূচক বাছাইকরণ + লিপি/ব্লকের পুনর্বিন্যাস বাছাইকরণ শক্তি মুদ্রা + রূপান্তরের গন্তব্য + অভিধান স্বীকৃত ছেদের বর্জন ইমোজি উপস্থাপনা + সপ্তাহের প্রথম দিন + মিশ্রিত সময়ের হিসাব (১২ বা ২৪) - লাইন বিভাজক শৈলী - শব্দদ্বয়ের মধ্যে লাইন বিভাজক + ইনপুট পদ্ধতি + কীবোর্ড + সর্বাপেক্ষা উপেক্ষিত + সিজেকে লাইন বিভাজক + শব্দদ্বয়ের মধ্যে লাইন বিভাজক + রূপান্তরের নিয়মাবলি পরিমাপ পদ্ধতি + পরিমাপের একক সংখ্যা + সম্পূরক তথ্যের জন্য অঞ্চল + রূপান্তরের উৎস + অঞ্চল বিভাজন শব্দ সংক্ষেপণের পর বাক্য ভাঙা + রূপান্তর + যন্ত্র দ্বারা অনূদিত সময় অঞ্চল স্থানীয় ভিন্নতা বক্তিগত- ব্যবহার + ব্যক্তিগত ব্যবহারের জন্য রূপান্তর বৌদ্ধ ক্যালেন্ডার @@ -1073,22 +1101,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইথিওপীয় ইথিওপিও আমেতে আলেম ক্যালেন্ডার ইথিওপীয় আমেতে আলেম - গ্রিগোরিয়ান ক্যালেন্ডার + গ্রেগরীয় ক্যালেন্ডার গ্রেগরীয় হিব্রু ক্যালেন্ডার হিব্রু - ভারতীয় জাতীয় বর্ষপঞ্জী + ভারতীয় জাতীয় বর্ষপঞ্জি ভারতীয় জাতীয় ইসলামিক ক্যালেন্ডার হিজরি - ইসলামিক ক্যালেন্ডার (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি) - হিজরি (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি) + হিজরি বর্ষপঞ্জি (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি) + হিজরি (ছকবদ্ধ, নাগরিক বর্ষপঞ্জি) ইসলামিক বর্ষপঞ্জী (সৌদি আরব, দৃশ্যমান) + হিজরি, সৌদি আরবে চাঁদ দেখা ইসলামিক বর্ষপঞ্জী (ছকবদ্ধ, জ্যোতির্বিদ্যীয় যুগ) - হিজরি (ছকবদ্ধ, জ্যোতির্বিদ্যীয় যুগ) - ইসলামিক বর্ষপঞ্জী (উম্মা আল-কুরআ) + হিজরি (ছকবদ্ধ, জ্যোতির্বিদ্যীয় যুগ) + হিজরি বর্ষপঞ্জি (উম্মা আল-কুরআ) হিজরি (উম্মা আল-কুরআ) - গ্রেগরীয় ক্যালেন্ডার (প্রথম বর্ষ) + গ্রেগরীয় ক্যালেন্ডার ( আইএসও 8601 সপ্তাহ ) + গ্রেগরীয় জাপানি ক্যালেন্ডার জাপানি ফারসি ক্যালেন্ডার @@ -1096,7 +1126,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ মিঙ্গুও ক্যালেন্ডার মিঙ্গুও হিসাবের মুদ্রা বিন্যাস - অ্যাকাউন্টিং + অ্যাকাউন্টিং মানক মুদ্রা বিন্যাস মানক প্রতীক বাছাই করুন @@ -1104,45 +1134,74 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ স্বরাঘাত সাধারণতভাবে বাছাই করুন স্বরাঘাত বিপরীত বাছাই করুন প্রথমে ছোট হাতের অক্ষর বাছাই করুন + ছোট হাতের অক্ষর সাধারন কেস ক্রম বাছাই করুন + ছোট হাতের অক্ষর প্রথমে বড়হাতের অক্ষর বাছাই করুন + বড় হাতের অক্ষর কেস অসংবেদী বাছাই করুন কেস সংবেদী বাছাই করুন আগের বাছাইয়ের ক্রম, সামঞ্জস্যের জন্য + সামঞ্জস্যতা অভিধান বাছাই বিন্যাস + অভিধান ডিফল্ট ইউনিকোড বাছাই বিন্যাস ডিফল্ট ইউনিকোড ইমোজি বাছাই ক্রম + ইমোজি ইউরোপীয় ক্রম বিন্যাসের নিয়মাবলী + ইউরোপীয় নিয়ম ফোনবুক সজ্জাক্রম + ফোনবুক ধ্বনি নির্দেশক বাছাই ক্রম + ধ্বনিভিত্তিক পিনিন সজ্জাক্রম + ফিনিন রিফর্মড বাছাই বিন্যাস সাধারণ-উদ্দেশ্যে অনুসন্ধান সার্চ হাঙ্গুল প্রাথমিক ব্যঞ্জনবর্ণ দ্বারা অনুসন্ধান করুন + কোরীয় প্রারম্ভিক ব্যঞ্জনবর্ণ আদর্শ বাছাই বিন্যাস মানক আবর্তিত সজ্জাক্রম + টান প্রথাগত বাছাই বিন্যাস প্রথাগত রাডিকেল স্ট্রোক বাছাই বিন্যাস + র‍্যাডিক্যাল-টান ঝুইন সজ্জাক্রম + ঝুয়িন স্বাভাবিক ছাড়া বাছাই করুন স্বাভাবিকৃত ইউনিকোড বাছাই করুন সংখ্যা পৃথকভাবে বাছাই করুন সংখ্যা সংখ্যাসূচকভাবে বাছাই করুন + মুদ্রা + মুদ্রা + সংখ্যা + যতিচিহ্ন + ফাঁক + চিহ্ন সমস্ত বাছাই করুন + সব কেবল বুনিয়াদি বর্ণ বাছাই করুন + শুধু বুনিয়াদি বর্ণ স্বরাঘাত/কেস/প্রস্থ/কানা বাছাই করুন + মূলরূপ, উচ্চারণের ধরণ, কারক, প্রকারভেদ, কানা স্বরাঘাত বাছাই করুন + মূলরূপ, উচ্চারণের ধরণ স্বরাঘাত/কেস/প্রস্থ বাছাই করুন + মূলরূপ, উচ্চারণের ধরণ, কারক, প্রকারভেদ পূর্ণপ্রস্থ পর্যন্ত অর্ধপ্রস্থ পর্যন্ত সাংখিক ডিফল্ট ইমোজি টেক্সট + ১২ ঘণ্টার হিসাবে + ১২ + ২৪ ঘণ্টার হিসাবে + ২৪ ১২ ঘণ্টার হিসাবে (০–১১) ১২ (০–১১) ১২ ঘণ্টার হিসাবে (১–১২) @@ -1151,16 +1210,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ২৪ (০–২৩) ২৪ ঘণ্টার হিসাবে (১–২৪) ২৪ (১–২৪) + শিফ্‌ট স্পেস, যতিচিহ্ন, সব চিহ্ন + শিফ্‌ট স্পেস, যতিচিহ্ন + শিফ্‌ট স্পেস, যতিচিহ্ন + শিফ্‌ট স্পেস, যতিচিহ্ন, অ-মুদ্রা চিহ্ন আলগা লাইন বিভাজক শৈলী - আলগা + আলগা সাধারণ লাইন বিভাজক শৈলী - সাধারণ + সাধারণ টাইট লাইন বিভাজক শৈলী টাইট - সবেতেই বিভাজক রাখুন - সব রেখে দিন - স্বাভাবিক - ব্যাক্যাংশে বিভাজক + সবেতেই বিভাজক রাখুন + সব রেখে দিন + স্বাভাবিক + ব্যাক্যাংশে বিভাজক ইউএস বিজিএন বর্ণান্তরণ ইউএন জিইজিএন বর্ণান্তরণ মেট্রিক পদ্ধতি @@ -1169,67 +1232,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ যুক্তরাজ্য মার্কিন যুক্তরাষ্ট্রের পরিমাপ সিস্টেম মার্কিন যুক্তরাষ্ট্র + সেলসিয়াস + ফারেনহাইট + কেলভিন অহম সংখ্যা আরবি-ভারতীয় সংখ্যা প্রসারিত আরবি -ভারতীয় সংখ্যা + প্রসারিত আরবি-ভারতীয় আর্মেনীয় সংখ্যা আর্মেনীয় ছোটহাতের সংখ্যা + আর্মেনীয় ছোট হাতের বালিনীয় সংখ্যা বাংলা সংখ্যা ব্রাহ্মী সংখ্যা চাকমা সংখ্যা চাম সংখ্যা সিরিলিক সংখ্যা - দেবনাগরি সংখ্যা + দেবনাগরী সংখ্যা ইথিয়োপিক সংখ্যা অর্থনৈতিক সংখ্যাসূচক - পূর্ণ চওড়া সংখ্যা + আর্থিক + পূর্ণ প্রস্থের সংখ্যা + পূর্ণ-প্রস্থ জর্জিয়ান সংখ্যা মাসারাম গন্ডি সংখ্যা গ্রিক সংখ্যা - গ্রীক ছোট হাতের সংখ্যা - গুজরাতি সংখ্যা - গুরুমুখি সংখ্যা + গ্রিক ছোট হাতের সংখ্যা + গ্রিক ছোট হাত + গুজরাটি সংখ্যা + গুরুমুখী সংখ্যা + ঐতিহ্যবাহী ক্যালেন্ডারের হান (চীনা) অক্ষর-ভিত্তিক দিন গণনা চৈনিক দশমিক সংখ্যা - সরলিকৃত চৈনিক সংখ্যা + চীনা সংখ্যা-চিহ্ন ভিত্তিক অবস্থানিক দশমিক পদ্ধতি + সরলীকৃত চীনা সংখ্যা সরলিকৃত চৈনিক আর্থিক সংখ্যা + সরলীকৃত চীনা আর্থিক ঐতিহ্যাবাহী চৈনিক সংখ্যা ঐতিহ্যবাহী চৈনিক আর্থিক সংখ্যা + ঐতিহ্যবাহী চীনা আর্থিক হিব্রু সংখ্যা পাহয়া মং সংখ্যা জাভানিজ সংখ্যা জাপানি সংখ্যা জাপানি আর্থিক সংখ্যা + জাপানি আর্থিক + জাপানি গানেন বর্ষ গণনা কায়াহ লি সংখ্যা খেমের সংখ্যা কন্নড় সংখ্যা টাই থাম হোরা সংখ্যা টাই থাম থাম সংখ্যা + তাই থাম থাম (ধর্মীয়) লাও সংখ্যা ওয়েস্টার্ন ডিজিট লেপচা সংখ্যা লিম্বু সংখ্যা গাণিতিক বোল্ড সংখ্যা + গাণিতিক বোল্ড গাণিতিক ডাবল-স্ট্রাক সংখ্যা + গাণিতিক দ্বিরেখ গাণিতিক মোনোস্পেস সংখ্যা + গাণিতিক মনোস্পেস গাণিতিক স্যান্স-শেরিফ বোল্ড সংখ্যা + গাণিতিক সান্স-সেরিফ বোল্ড গাণিতিক স্যান্স-শেরিফ সংখ্যা + গাণিতিক সান্স-সেরিফ মালয়ালম সংখ্যা মোদি সংখ্যা মঙ্গোলীয় সংখ্যা ম্রো সংখ্যা - মিটিই মায়েক সংখ্যা + মৈতৈ মায়েক সংখ্যা মায়ানমার সংখ্যা + মায়ানমার পূর্বাঞ্চলীয় পো কারেন + মায়ানমার পাও মায়ানমার শান সংখ্যা + মায়ানমার শান মায়ানমার থাই লেয়িং সংখ্যা + মায়ানমার তাই লাইং স্থানীয় সংখ্যা + স্থানীয় সংখ্যা এন’কো সংখ্যা অলচিকি সংখ্যা ওড়িয়া সংখ্যা ওসমানিয় সংখ্যা + আউটলাইন করা + হানিফি রোহিঙ্গা সংখ্যা রোমান সংখ্যা - রোমান ছোটহাতের সংখ্যা + রোমান বড় হাত + রোমান ছোট হাতের সংখ্যা + রোমান ছোট হাত সৌরাষ্ট্রের সংখ্যা + অংশে বিভক্ত সারদা সংখ্যা কুদয়াদি সংখ্যা সিংহলী লিথ সংখ্যা @@ -1239,16 +1332,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ নতুন তাই লিউ সংখ্যা ঐতিহ্যবাহী তামিল সংখ্যা তামিল সংখ্যা + আধুনিক তামিল তেলুগু সংখ্যা থাই সংখ্যা তিব্বতি সংখ্যা তিরহুতা সংখ্যা ঐতিহ্যগত সংখ্যাসূচক + ঐতিহ্যবাহী সংখ্যা ভাই সংখ্যা ওয়ারেং সিটি সংখ্যা বন্ধ চালু + অনির্দিষ্টভাবে যন্ত্র দ্বারা অনুবাদ + পজিক্স ভিন্নতা + + বন্ধ + চালু + মেট্রিক ইউকে @@ -1261,16 +1362,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - [় ৺ অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ং ঃ ঁ ক {ক্ষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড{ড়} ঢ{ঢ়} ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য{য়} র ল শ ষ স হ ঽ া ি ী ু ূ ৃ ৄ ৢ ৣ ে ৈ ো ৌ ্ ৗ] - [\u200C\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ] + [় অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ং ঃ ঁ ক {ক্ষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড{ড়} ঢ{ঢ়} ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য{য়} র ল শ ষ স হ ঽ া ি ী ু ূ ৃ ৄ ৢ ৣ ে ৈ ো ৌ ্ ৗ] + [\u200C\u200D ৺ ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ] [অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক্ষ} খ গ ঘ চ ছ জ ঝ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ] [\- ‑ , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯] [\- ‐‑ – — , ; \: ! ? . … । ॥ '‘’ "“” ( ) \[ \] § @ * / # † ‡ ′ ″] - [। ॥] + [। ॥] [\- ‑ , . /] - {0} … - … {0} - {0} … {1} [\: ∶] @@ -1284,6 +1382,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + ১ + ২ + ৩ + ৪ + ৫ + ৬ + ৭ + ৮ + ৯ + ১০ + ১১ + ১২ + + + + @@ -1393,7 +1511,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} এ {0} - {1}: {0} + {1}: {0} @@ -1404,7 +1522,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} এ {0} - {1}: {0} + {1}: {0} @@ -1412,7 +1530,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - {1}, {0} + {1}, {0} @@ -1420,21 +1538,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - {1}, {0} + {1}, {0} - E B h + E B h d E y G - M/y G + M/y G d/M/y GGGGG - E, d/M/y G + E, d/M/y G MMM y G d MMM, y G E, d MMM, y G d/M - E, d-M + E, d/M dd-MM d MMM E d MMM @@ -1460,7 +1578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y – y G - M/y GGGGG – M/y GGGGG + M/y G – M/y G M/y – M/y GGGGG M/y – M/y GGGGG @@ -1515,6 +1633,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -1597,7 +1719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আগস্ট সেপ্ট অক্টো - নভেম্বর + নভে ডিসে @@ -1614,20 +1736,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ন ডি - - জানুয়ারি - ফেব্রুয়ারি - মার্চ - এপ্রিল - মে - জুন - জুলাই - আগস্ট - সেপ্টেম্বর - অক্টোবর - নভেম্বর - ডিসেম্বর - @@ -1674,11 +1782,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + ১ম ত্রৈমাসিক + ২য় ত্রৈমাসিক + ৩য় ত্রৈমাসিক + ৪র্থ ত্রৈমাসিক + - ত্রৈমাসিক - দ্বিতীয় ত্রৈমাসিক - তৃতীয় ত্রৈমাসিক - চতুর্থ ত্রৈমাসিক + ১ম ত্রৈমাসিক + ২য় ত্রৈমাসিক + ৩য় ত্রৈমাসিক + ৪র্থ ত্রৈমাসিক @@ -1694,6 +1808,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ৩ ৪ + + ১ম ত্রৈমাসিক + ২য় ত্রৈমাসিক + ৩য় ত্রৈমাসিক + ৪র্থ ত্রৈমাসিক + @@ -1723,8 +1843,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ খ্রিস্টপূর্ব - "খ্রিঃপূঃ" - খৃষ্টাব্দ + খ্রিঃপূঃ + খ্রি. খ্রিষ্টাব্দ @@ -1778,6 +1898,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1805,7 +1928,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - {1}, {0} + {1}, {0} @@ -1816,26 +1939,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - {1}, {0} + {1}, {0} - E B h + E B h d E y G - MM-y G + MM-y G dd-MM-y GGGGG - E, dd-MM-y G + E, d/M/y G MMM y G d MMM, y G E, d MMM, y G + MMMM y G + d MMMM, y G + E, d MMMM, y G d/M - E, d-M + E, d/M dd-MM d MMM E d MMM d MMMM - E d MMMM + E, d MMMM MMMM এর Wয় সপ্তাহ MMMM এর Wয় সপ্তাহ M/y @@ -1846,12 +1972,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM, y E, d MMM, y MMMM y + d MMMM, y + E, d MMMM, y QQQ y QQQQ y Y এর wতম সপ্তাহ Y এর wতম সপ্তাহ + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + {0} – {1} y G – y G @@ -1913,6 +2049,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -1991,20 +2131,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - চৈত্র - বৈশাখ - জ্যৈষ্ঠ - আষাঢ় - শ্রাবণ - ভাদ্র - আশ্বিন - কার্তিক - অগ্রহায়ণ - পৌষ - মাঘ - ফাল্গুন - চৈত্র বৈশাখ @@ -2021,20 +2147,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - চৈত্র - বৈশাখ - জ্যৈষ্ঠ - আষাঢ় - শ্রাবণ - ভাদ্র - আশ্বিন - কার্তিক - অগ্রহায়ণ - পৌষ - মাঘ - ফাল্গুন - ১ ২ @@ -2049,20 +2161,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ১১ ১২ - - চৈত্র - বৈশাখ - জ্যৈষ্ঠ - আষাঢ় - শ্রাবণ - ভাদ্র - আশ্বিন - কার্তিক - অগ্রহায়ণ - পৌষ - মাঘ - ফাল্গুন - @@ -2104,20 +2202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - মুহররম - সফর - রবিউল আউয়াল - রবিউস সানি - জমাদিউল আউয়াল - জমাদিউস সানি - রজব - শা‘বান - রমজান - শাওয়াল - জ্বিলকদ - জ্বিলহজ্জ - ১ ২ @@ -2132,20 +2216,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ১১ ১২ - - মুহররম - সফর - রবিউল আউয়াল - রবিউস সানি - জমাদিউল আউয়াল - জমাদিউস সানি - রজব - শা‘বান - রমজান - শাওয়াল - জ্বিলকদ - জ্বিলহজ্জ - @@ -2153,12 +2223,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ যুগ - - - M/y G - E, d/M/y G - - @@ -2237,6 +2301,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} বছর পূর্বে + + + {0} বছর আগে + {0} বছর আগে + + + + + {0} বছর আগে + {0} বছর আগে + + ত্রৈমাসিক গত ত্রৈমাসিক @@ -2417,26 +2493,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ঘণ্টা আগে - - - {0} ঘণ্টায় - {0} ঘণ্টায় - - - {0} ঘণ্টা আগে - {0} ঘণ্টা আগে - - - - - {0} ঘণ্টায় - {0} ঘণ্টায় - - - {0} ঘণ্টা আগে - {0} ঘণ্টা আগে - - মিনিট এই মিনিট @@ -2458,7 +2514,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} সেকেন্ড আগে - {0} সেকেন্ড পূর্বে + {0} সেকেন্ড আগে @@ -2476,6 +2532,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT {0} + ইউটিসি{0} {0} সময় {0} দিবালোক সময় {0} মানক সময় @@ -2486,9 +2543,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ স্থানাংকিত আন্তর্জাতিক সময় + + ইউটিসি + - অজানা শহর + অচেনা লোকেশন অ্যান্ডোরা @@ -2623,7 +2683,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ লর্ড হাও - এরুবা + আরুবা মরিয়েহামেন @@ -2650,7 +2710,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ সোফিয়া - বাহারিন + বাহরাইন বুজুমবুরহু @@ -2833,7 +2893,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইস্টার - কোয়আইকে + কোয়আইকে পুন্টা আরেনাস @@ -2956,16 +3016,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ লিব্রুভিল - - ব্রিটিশ গ্রীষ্মকালীন সময় - লন্ডন গ্রেনাডা - সিবিলিশি + তিবিলিসি কাহেন @@ -3049,9 +3106,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জয়াপুরা - - আইরিশ মানক সময় - ডাবলিন @@ -3151,7 +3205,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ভিয়েনতায়েন - বেইরুট + বৈরুত সেন্ট. লুসিয়া @@ -3487,7 +3541,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কিগালি - রিয়াধ + রিয়াদ গোয়াদালকুনাল @@ -3544,7 +3598,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ লোয়ার প্রিন্সেস কোয়ার্টার - দামাস্কাস + দামেস্ক অমবাবান @@ -3786,13 +3840,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আলাস্কা দিবালোক সময় - - - আল্মাটি সময় - আল্মাটি মানক সময় - আল্মাটি গ্রীষ্মকাল সময় - - আমাজন সময় @@ -3837,30 +3884,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - অপিয়া সময় - অপিয়া মানক সময় - অপিয়া দিনের সময় - - - - - আকটাও সময় - আকটাও মানক সময় - আকটাও গ্রীষ্মকাল সময় - - - - - আকটোব সময় - আকটোব মানক সময় - আকটোব গ্রীষ্মকাল সময় + পশ্চিম সামোয়া সময় + পশ্চিম সামোয়া মানক সময় + পশ্চিম সামোয়া দিবালোক সময় - আরবি সময় - আরবি মানক সময় - আরবি দিবালোক সময় + আরব সময় + আরব মান সময় + আরব দিবালোক সময় @@ -3957,6 +3990,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ব্রাসিলিয়া গ্রীষ্মকালীন সময় + + + ব্রিটিশ সময় + ব্রিটিশ গ্রীষ্মকালীন সময় + + ব্রুনেই দারুসসালাম সময় @@ -4130,23 +4169,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ গ্রীনিচ মিন টাইম - + - পূর্ব গ্রীনল্যান্ড সময় - পূর্ব গ্রীনল্যান্ড মানক সময় - পূর্ব গ্রীনল্যান্ড গ্রীষ্মকালীন সময় + গ্রিনল্যান্ড সময় + গ্রিনল্যান্ড মানক সময় + গ্রিনল্যান্ড গ্রীষ্মকালীন সময় - + - পশ্চিম গ্রীনল্যান্ড সময় - পশ্চিম গ্রীনল্যান্ড মানক সময় - পশ্চিম গ্রীনল্যান্ড গ্রীষ্মকালীন সময় + পূর্ব গ্রিনল্যান্ড সময় + পূর্ব গ্রিনল্যান্ড মানক সময় + পূর্ব গ্রিনল্যান্ড গ্রীষ্মকালীন সময় - + - গুয়াম মান সময় + পশ্চিম গ্রিনল্যান্ড সময় + পশ্চিম গ্রীনল্যান্ড মানক সময় + পশ্চিম গ্রিনল্যান্ড গ্রীষ্মকালীন সময় @@ -4161,14 +4202,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - হাওয়াই-আলেউত মানক সময় + হাওয়াই সময় - হাওয়াই-আলেউত সময় + হাওয়াই-অ্যালিউশিয়ান সময় হাওয়াই-আলেউত মানক সময় - হাওয়াই-আলেউত দিবালোক সময় + হাওয়াই-অ্যালিউশিয়ান দিবালোক সময় @@ -4225,6 +4266,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইরান দিবালোক সময় + + + আইরিশ সময় + আইরিশ মানক সময় + + ইরকুটস্ক সময় @@ -4248,14 +4295,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - পিত্রেপ্যাভলস্ক- ক্যামচ্যাটস্কি সময় - পিত্রেপ্যাভলস্ক- ক্যামচ্যাটস্কি মান সময় - পিত্রেপ্যাভলস্ক- ক্যামচ্যাটস্কি গৃষ্মকালীন সময় + কামচাটকার সময় + কামচাটকার মানক সময় + কামচাটকার গৃষ্মকালীন সময় - কাজাখাস্তান সময় + কাজাখাস্তান সময় @@ -4292,11 +4339,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ কিরগিস্তান সময় - - - লঙ্কা সময় - - লাইন দ্বীপপুঞ্জ সময় @@ -4309,13 +4351,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ লর্ড হাওয়ে দিবালোক মসয় - - - মাকাও সময় - মাকাও মান সময় - মাকাও গ্রীষ্মকাল সময় - - ম্যাগাডান সময় @@ -4431,11 +4466,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ফার্নান্দো ডি নোরোনহা গ্রীষ্মকালীন সময় - - - উত্তর মেরিন দ্বীপপুঞ্জ সময় - - নোভোসিবির্স্ক সময় @@ -4515,13 +4545,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ পিয়ংইয়াং সময় - - - কিজিলোর্ডা সময় - কিজিলোর্ডা মান সময় - কিজিলোর্ডা গ্রীষ্মকাল সময় - - রিইউনিয়ন সময় @@ -4541,16 +4564,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - সামারা সময় - সামারা মান সময় - সামারা গৃষ্মকালীন সময় + সামারা সময় + সামারা মান সময় + সামারা গৃষ্মকালীন সময় - সামোয়া সময় সামোয়া মানক সময় - সামোয়া দিবালোক সময় @@ -4590,9 +4611,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - তাইপেই সময় - তাইপেই মানক সময় - তাইপেই দিবালোক সময় + তাইওয়ান সময় + তাইওয়ান মানক সময় + তাইওয়ান দিবালোক সময় @@ -4619,9 +4640,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - তুর্কী সময় - তুর্কী মান সময় - তুর্কী গ্রীষ্মকাল সময় + তুরস্ক সময় + তুরস্ক মানক সময় + তুরস্ক গ্রীষ্মকালীন সময় @@ -4643,6 +4664,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ উরুগুয়ে গ্রীষ্মকালীন সময় + + + উরুমচি সময় + + উজবেকিস্তান সময় @@ -4874,7 +4900,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ আফগান আফগানি - আলবেনিয়ান লেক + আলবেনীয় লেক + আলবেনীয় লেক + আলবেনীয় লেক আরমেনিয়ান দ্রাম @@ -4907,7 +4935,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ অস্ট্রিয়ান শিলিং - অস্ট্রেলিয়ান ডলার + অস্ট্রেলীয় ডলার + অস্ট্রেলীয় ডলার + অস্ট্রেলীয় ডলার আরুবা ফ্লোরিন @@ -4936,9 +4966,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ বেলজিয়ান ফ্রাঙ্ক + বেলজীয় ফ্রাঙ্ক + বেলজিয়ান ফ্রাঙ্ক বেলজিয়ান ফ্রাঙ্ক (আর্থিক) + বেলজীয় ফ্রাঙ্ক (আর্থিক) + বেলজীয় ফ্রাঙ্ক (আর্থিক) বুলগেরীয় হার্ড লেভ @@ -5034,10 +5068,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ চিলি পেসো - চাইনিজ ইউয়ান (অফশোর) + চীনা ইউয়ান (অফশোর) + চীনা ইউয়ান (অফশোর) + চীনা ইউয়ান (অফশোর) - চীনা য়ুয়ান + চীনা ইউয়ান + চীনা ইউয়ান + চীনা ইউয়ান কলোম্বিয়ান পেসো @@ -5067,7 +5105,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ সাইপ্রাস পাউন্ড - চেক প্রজাতন্ত্র কোরুনা + চেক কোরুনা + চেক কোরুনা + চেক কোরুনাস পূর্ব জার্মান মার্ক @@ -5215,12 +5255,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ইরাকি দিনার - ইরানিয়ান রিয়াল + ইরানি রিয়াল + ইরানি রিয়াল + ইরানি রিয়াল আইসল্যান্ডীয় ক্রোনা আইসল্যান্ডীয় ক্রোনা - আইসল্যান্ড ক্রৌন + আইসল্যান্ডীয় ক্রোনা ইতালীয় লিরা @@ -5307,7 +5349,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ মোরোক্কান ফ্রাঙ্ক - মোল্ডোভান লেয়ু + মোল্ডোভান লিউ + মোল্ডোভান লিউ + মোল্ডোভান লেই মাদাগাস্কার আরিয়ারি @@ -5570,10 +5614,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ তাঞ্জনিয়া শিলিং - ইউক্রেইন হৃভনিয়া + ইউক্রেনীয় রিভনিয়া + ইউক্রেনীয় রিভনিয়া + ইউক্রেনীয় রিভনিয়া ইউক্রেইন কার্বোভ্যান্টস + ইউক্রেনীয় কার্বোভ্যান্টস + ইউক্রেনীয় কার্বোভ্যান্টস উগান্ডান শিলিং (১৯৬৬–১৯৮৭) @@ -5612,7 +5660,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ভেনিজুয়েলীয় বলিভার - ভিয়েতনামি ডঙ্গ + ভিয়েতনামী ডং + ভিয়েতনামী ডং + ভিয়েতনামী ডং ভানুয়াতু ভাতু @@ -5636,9 +5686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ পূর্ব ক্যারাবিয়ান ডলার - ক্যারিবিয়ান গিল্ডার - ক্যারিবিয়ান গিল্ডার - ক্যারিবিয়ান গিল্ডার + ক্যারিবিয়ান গিল্ডার ইউরোপীয় মুদ্রা একক @@ -5703,9 +5751,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ জিম্বাবুয়ে ডলার (১৯৮০–২০০৮) - জিম্বাবায়েন গোল্ড + জিম্বাবায়েন গোল্ড জিম্বাবোয়েন গোল্ড - জিম্বাবোয়েন গোল্ড + জিম্বাবোয়েন গোল্ড জিম্বাবুয়ে ডলার (২০০৯) @@ -5720,11 +5768,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ সসে {0}টি আপেল খেল, সেটি ভাল সসে {0}টি আপেল খেল, সেগুলি ভাল + ডান দিকে {0}ম বাঁকটি নিন। + ডান দিকে {0}য় বাঁকটি নিন। ডান দিকে {0}র্থ বাঁকটি নিন। ডান দিকে {0}ষ্ঠ বাঁকটি নিন। - ডান দিকে {0}ম বাঁকটি নিন। ডান দিকে {0}তম বাঁকটি নিন। - ডান দিকে {0}য় বাঁকটি নিন। রবিবারকে আসার দিন হিসেবে ধরা হয় {0} রবিবারের সন্ধ্যায় {0} আসবে রবিবারে {0} টায় আসবে @@ -5872,7 +5920,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ প্রতি বর্গ মাইলে {0} - yd² {0} বর্গ গজ {0} বর্গ গজ @@ -5900,11 +5947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} মিলিমোল, প্রতি লিটারে {0} মিলিমোল, প্রতি লিটারে - - পার্ট - {0} পার্ট - {0} পার্ট - ভাগ, প্রতি মিলিয়নে {0} ভাগ, প্রতি মিলিয়নে @@ -5992,15 +6034,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} কিলোবিট {0} কিলোবিট - - শতাব্দী - {0} শতাব্দী - {0} শতাব্দী - - ঘণ্টা - {0} ঘণ্টা - {0} ঘণ্টা {0} প্রতি ঘণ্টা @@ -6181,7 +6215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} পিকোমিটার - পারসেক {0} পারসেক {0} পারসেক @@ -6210,7 +6243,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} লাক্স - ক্যান্ডেলা {0} ক্যান্ডেলা {0} ক্যান্ডেলা @@ -6221,7 +6253,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} সৌর ঔজ্জ্বল্য - {0} সৌর ঔজ্জ্বল্যতাগুলি + {0} সৌর ঔজ্জ্বল্য মেট্রিক টন @@ -6390,7 +6422,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ পাউন্ড-ফিট {0} পাউন্ড-ফোর্স-ফিট - {0} পাউন্ড-ফিট + {0} পাউন্ড-ফোর্স-ফিট নিউটন-একক @@ -6468,9 +6500,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} মেট্রিক কাপ - মেট্রিক ফ্লুইড আউন্স - {0} মেট্রিক ফ্লুইড আউন্স - {0} মেট্রিক ফ্লুইড আউন্স + মেট্রিক ফ্লুইড আউন্স + {0} মেট্রিক ফ্লুইড আউন্স + {0} মেট্রিক ফ্লুইড আউন্স একর-ফুট @@ -6514,8 +6546,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ফ্লুইড আউন্স - {0} Imp. fl oz - {0} Imp. fluid ounces + {0} ইম্পেরিয়াল ফ্লুইড আউন্স + {0} ইম্পেরিয়াল ফ্লুইড আউন্স টেবিল-চামচ @@ -6552,74 +6584,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Imp. quart - স্টেরেডিয়ান - {0} স্টেরেডিয়ান - {0} স্টেরেডিয়ান + স্টেরেডিয়ান + {0} স্টেরেডিয়ান + {0} স্টেরেডিয়ান - ক্যাটাল - {0} ক্যাটাল - {0} ক্যাটাল + ক্যাটাল + {0} ক্যাটাল + {0} ক্যাটাল - কুলম্ব - {0} কুলম্ব - {0} কুলম্ব + কুলম্ব + {0} কুলম্ব + {0} কুলম্ব - ফ্যারাড - {0} ফ্যারাড - {0} ফ্যারাড + ফ্যারাড + {0} ফ্যারাড + {0} ফ্যারাড - হেনরি - {0} হেনরি - {0} হেনরি + হেনরি + {0} হেনরি + {0} হেনরি - সিমেন্স - {0} সিমেন্স - {0} সিমেন্স + সিমেন্স + {0} সিমেন্স + {0} সিমেন্স - ক্যালোরি [IT] + ক্যালোরি [IT] {0} ক্যালোরি [IT] {0} ক্যালোরি [IT] - বেকেরেল - {0} বেকেরেল - {0} বেকেরেল + বেকেরেল + {0} বেকেরেল + {0} বেকেরেল - সিভার্ট - {0} সিভার্ট - {0} সিভার্ট + সিভার্ট + {0} সিভার্ট + {0} সিভার্ট - গ্রে + গ্রে {0} গ্রে {0} গ্রে - কিলোগ্রাম-ফোর্স - {0} কিলোগ্রাম-ফোর্স - {0} কিলোগ্রাম-ফোর্স + কিলোগ্রাম-ফোর্স + {0} কিলোগ্রাম-ফোর্স + {0} কিলোগ্রাম-ফোর্স - টেসলা - {0} টেসলা - {0} টেসলা + টেসলা + {0} টেসলা + {0} টেসলা - ওয়েবার - {0} ওয়েবার - {0} ওয়েবার - - - আলোক - {0} আলোক - {0} আলোক + ওয়েবার + {0} ওয়েবার + {0} ওয়েবার পার্ট প্রতি বিলিয়ন @@ -6953,17 +6980,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ডট {0} ডট + + পৃথিবীর ব্যাসার্ধ + কিলোমিটার {0} কিমি {0} কিমি - {0} প্রতি কিমি + {0}/কিমি মিটার {0} মি {0} মি - {0} প্রতি মি + {0}/মি ডেমি @@ -7003,13 +7033,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ফুট {0} ফুট {0} ফুট - {0} প্রতি ফুট + {0}/ফুট ইঞ্চি {0} ইঞ্চি {0} ইঞ্চি - {0} প্রতি ইঞ্চি + {0}/ইঞ্চি পারসেক @@ -7136,7 +7166,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} চিমটে - cal-IT + cal-IT {0} cal-IT {0} cal-IT @@ -7255,16 +7285,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} দুনাম - পার্ট {0} পার্ট {0} পার্ট ‰ - - Glc - mpg UK {0}m/gUK @@ -7284,7 +7310,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/সপ্তাহ - ঘণ্টা {0} ঘঃ {0} ঘঃ {0}/ঘ: @@ -7328,6 +7353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ডট + কিমি {0}/কিমি @@ -7339,12 +7365,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ μm + + {0}/ফুট + {0}/ইঞ্চি - - পারসেক - pts @@ -7401,7 +7427,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}m/s - মাইল/ঘণ্টা {0}mph {0}mph @@ -7426,8 +7451,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/gal - {0}galIm - {0}galIm + {0}gal-Im + {0}gal-Im {0}/galIm @@ -7457,14 +7482,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}fl.dr. {0}fl.dr. - - cal-IT - - - আলোক - {0} আলোক - {0} আলোক - {0}ppb {0} ppb diff --git a/make/data/cldr/common/main/bn_IN.xml b/make/data/cldr/common/main/bn_IN.xml index bc53369ba0a1..89c986c933fa 100644 --- a/make/data/cldr/common/main/bn_IN.xml +++ b/make/data/cldr/common/main/bn_IN.xml @@ -16,7 +16,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic কোলোনিয়ান - দক্ষিণাঞ্চলীয় আফ্রিকা সাহারা-নিম্ন আফ্রিকা কঙ্গো (DRC) আওটেয়ারোয়া নিউজিল্যান্ড @@ -132,6 +131,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + latn diff --git a/make/data/cldr/common/main/bqi.xml b/make/data/cldr/common/main/bqi.xml deleted file mode 100644 index 71490f565cfe..000000000000 --- a/make/data/cldr/common/main/bqi.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - - - {0}، {1} - - - عروی - عروی استاندارد مودرن - بنگلا - لوری بختیاری - آلمانی - آلمانی اوتریشی - آلمانی روء سوییس - اینگیلیسی - اینگیلیسی اوستورولیایی - اینگیلیسی کانادایی - اینگیلیسی بیریتانیایی - اینگیلیسی آمریکایی - اسپانیایی - اسپانیایی آمریکای لاتین - اسپانیایی اوروپایی - اسپانیایی مکزیکی - فرانسوی - فرانسوی کانادایی - فرانسوی سوییسی - هیندی لاتین - اندونزیایی - ایتالیایی - ژاپونی - کوره ای - هولندی - فلاندری - لهستووی - پورتقالی - پورتقالی بریزیلی - پورتقالی اوروپایی - روسی - تایلندی - تورکی - زوون نشناخته - چینی - چینی، ماندارین - چینی ساده وابیده - چینی ماندارین ساده وابیده - چینی سونتی - چینی سونتی ماندارین - - - - - - - - - - - - - - - - ایران - - - متریک - بریتانیایی - امریکایی - - - زوون: {0} - تور: {0} - ناحیه: {0} - - - - - right-to-left - - - - - [ً ٌ ٍ ّ ٔ ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی] - [ـ\u200C\u200D\u200E\u200F َ ُ ِ ْ ٖ ٰ إ ك ى ي] - [آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی] - [\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹] - [\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\] - - - « - » - ‹ - › - - - - - - - - ژانویه - فوریه - مارس - آوریل - مهٔ - ژوئن - ژوئیه - اوت - سپتامبر - اکتبر - نوامبر - دسامبر - - - - - - - یه شمبه - دوشمبه - سه شمبه - چار شمبه - پنجشمبه - جومه - شمبه - - - - - - - پیش ز ظهر - بعد ز ظهر - - - - - - y/M/d - d MMM y - - - {0} تا {1} - - - - - - - دوران - - - سال - سال گوذشته - امسال - سال نیایی - - - سال - سال گوذشته - امسال - سال نیایی - - - سال - سال گوذشته - امسال - سال نیایی - - - سه ماهه - - - سه ماهه - - - سه ماهه - - - ما - ما گوذشته - ای ما - ما نیایی - - - ما - ما گوذشته - ای ما - ما نیایی - - - ما - ما گوذشته - ای ما - ما نیایی - - - هفته - هفته گوذشته - ای هفته - هفته نیایی - هفته {0} - - - هفته - هفته گوذشته - ای هفته - هفته نیایی - هفته {0} - - - هفته - هفته گوذشته - ای هفته - هفته نیایی - هفته {0} - - - روز - دوش - امروز - صوه - - - روز - دوش - امروز - صوه - - - روز - دوش - امروز - صوه - - - روز هفته - - - پ.ظ/ب.ظ - - - ساعت - - - ساعت - - - ساعت - - - دیقه - - - دیقه - - - دیقه - - - ثانیه - - - ثانیه - - - ثانیه - - - جاگه زمووی - - - - ‎+HH:mm;‎−HH:mm - {0} گرینویچ - گرینویچ - مجال {0} - مجال توستووی {0} - مجال عادی {0} - - - مجال گرینویچ - - - - - - - ٪ - - - +‎ - ‎− - - - ‎+ - ‎− - - - - - ‎¤ #,##0.00 - ‎#,##0.00 - - - ‎¤ #,##0.00;‎(¤ #,##0.00) - ‎#,##0.00;‎(#,##0.00) - - - - - - - ‎¤ #,##0.00 - ‎¤ #,##0.00 - ‎#,##0.00 - - - ‎¤ #,##0.00;‎(¤ #,##0.00) - ‎¤ #,##0.00;‎(¤ #,##0.00) - ‎#,##0.00;‎(#,##0.00) - - - - - 0 هزار ¤ - 00 هزار ¤ - - - - - diff --git a/make/data/cldr/common/main/bqi_IR.xml b/make/data/cldr/common/main/bqi_IR.xml deleted file mode 100644 index 571426ad3762..000000000000 --- a/make/data/cldr/common/main/bqi_IR.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/br.xml b/make/data/cldr/common/main/br.xml index 9f563533838f..a166da3678b7 100644 --- a/make/data/cldr/common/main/br.xml +++ b/make/data/cldr/common/main/br.xml @@ -69,6 +69,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic bemba bena bulgareg + haryanveg baloutchi ar Cʼhornôg bhojpureg bislama @@ -218,8 +219,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic hawaieg haideg ar Su hebraeg - hindieg - hindieg (latin) + hindeg + hindeg (latin) Hinglish hiligaynon hmong @@ -302,6 +303,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic komieg kerneveureg kwakwaleg + kouveg kirgizeg latin ladino @@ -316,6 +318,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ligurieg lillooet lakota + lombardeg lingala laoseg mongo @@ -562,6 +565,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic vepseg vietnameg flandrezeg ar c’hornôg + makuaeg volapük votyakeg voroeg @@ -576,6 +580,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic kalmouk xhosaeg megreleg + kangreg sogaeg yao yapeg @@ -606,6 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -663,12 +669,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + - + + + @@ -680,6 +689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -688,6 +698,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -1132,7 +1143,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic kelcʼhiad eurioù stil torr linenn reizhiad vuzuliañ + unvez muzuliañ niveroù + torr frazenn goude ur berradur deiziadur boudaat @@ -1157,14 +1170,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic deiziadur islamek (Arabia Saoudat) deiziadur islamek steredoniel deiziadur islamek (Umm al-Qura) - deiziadur ISO-8601 + deiziadur gregorian (ISO-8601) + gregorian deiziadur japanat japanat deiziadur persek persek deiziadur Republik Sina Republik Sina - furmad unanenn jediñ + furmad moneiz kontouriezh + kontouriezh furmad moneiz standart standart urzh rummañ ar geriadur @@ -1184,6 +1199,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic dre ziouer emoji skrid + reizhiad 12 eurvezh + 12 + reizhiad 24 eurvezh + 24 reizhiad 12 eurvezh (0–11) 12 (0–11) reizhiad 12 eurvezh (1–12) @@ -1207,8 +1226,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic sifroù ahomek sifroù arabek indian sifroù arabek indian astennet + arabek indian astennet niveroù armenianek niveroù armenianek bihan + armenianek bihan sifroù balinek sifroù bengali sifroù brahmi @@ -1224,19 +1245,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic sifroù gondi Masaram niveroù gresianek niveroù gresianek bihan + gresianek bihan sifroù gujarati sifroù gurmukhi niveroù sinaek dekvedennek niveroù sinaek eeunaet niveroù sinaek eeunaet an arcʼhant + sinaek eeunaet an arcʼhant niveroù sinaek hengounel niveroù sinaek hengounel an arcʼhant + sinaek hengounel an arcʼhant niveroù hebraek sifroù Pahawh Hmong sifroù Nyiakeng Puachue Hmong sifroù javanek niveroù japanek niveroù japanek an arcʼhant + japanek an arcʼhant sifroù Kayah Li sifroù kawi sifroù khmer @@ -1259,7 +1284,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic sifroù oriya sifroù osmanya niveroù roman + roman bras niveroù roman bihan + roman bihan sifroù sharada sifroù khudawadi sifroù singhalek lith @@ -1269,15 +1296,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic sifroù tai lu nevez niveroù tamilek hengounel sifroù tamilek + tamilek modern sifroù telougou sifroù thai sifroù tibetan sifroù tirhuta sifroù tasek + niveroù hengounel sifroù vai sifroù warang sifroù wantcho + + diweredekaet + gweredekaet + metrek RU @@ -1576,6 +1609,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1640,26 +1676,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0}–{1} + y G – y G y – y G - MM/y GGGGG – MM/y GGGGG - MM/y – MM/y GGGGG - MM/y – MM/y GGGGG + MM/y G – MM/y G + MM/y – MM/y G + MM/y – MM/y G - dd/MM/y – dd/MM/y GGGGG - dd/MM/y GGGGG – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y G + dd/MM/y G – dd/MM/y G + dd/MM/y – dd/MM/y G + dd/MM/y – dd/MM/y G - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y GGGGG – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG + E dd/MM/y – E dd/MM/y G + E dd/MM/y G – E dd/MM/y G + E dd/MM/y – E dd/MM/y G + E dd/MM/y – E dd/MM/y G MMM y G – MMM y G @@ -1712,22 +1751,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM E d MMM – E d MMM + + d–d MMMM + d MMMM – d MMMM + y–y G - MM/y–MM/y GGGGG - MM/y–MM/y GGGGG + MM/y–MM/y G + MM/y–MM/y G - dd/MM/y–dd/MM/y GGGGG - dd/MM/y–dd/MM/y GGGGG - dd/MM/y–dd/MM/y GGGGG + dd/MM/y–dd/MM/y G + dd/MM/y–dd/MM/y G + dd/MM/y–dd/MM/y G - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG + E dd/MM/y – E dd/MM/y G + E dd/MM/y – E dd/MM/y G + E dd/MM/y – E dd/MM/y G MMM – MMM y G @@ -1919,6 +1962,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1968,6 +2014,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y G d MMM y G E d MMM y G + MMMM y G + d MMMM y G + E d MMMM y G h a h:mm a h:mm:ss a @@ -1980,6 +2029,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM E d MMM d MMMM + E d MMMM 'sizhun' W 'miz' MMMM 'sizhun' W 'miz' MMMM 'sizhun' W 'miz' MMMM @@ -1992,6 +2042,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'sizhun' w Y @@ -2000,6 +2052,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'sizhun' w Y 'sizhun' w Y + + {0} {1} + y G – y G @@ -2073,6 +2128,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM E d MMM – E d MMM + + d–d MMMM + d MMMM – d MMMM + MM/y – MM/y MM/y – MM/y @@ -2304,14 +2363,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic ar m. a zeu +{0} miz - +{0} miz + +{0} viz +{0} miz +{0} miz +{0} miz -{0} miz - -{0} miz + -{0} viz -{0} miz -{0} miz -{0} miz @@ -2583,11 +2642,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic Meu. diwezhañ Meu.-mañ Meu. a zeu + + a-benn {0} Meu. + a-benn {0} Meu. + a-benn {0} Meu. + a-benn {0} Meu. + a-benn {0} Meu. + + + {0} Meu. zo + {0} Meu. zo + {0} Meu. zo + {0} Meu. zo + {0} Meu. zo + Mz diwezhañ Mz-mañ Mz a zeu + + a-benn {0} Mz + a-benn {0} Mz + a-benn {0} Mz + a-benn {0} Mz + a-benn {0} Mz + + + {0} Mz zo + {0} Mz zo + {0} Mz zo + {0} Mz zo + {0} Mz zo + Dimercʼher diwezhañ @@ -2612,11 +2699,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic Mer. diwezhañ Mer.-mañ Mer. a zeu + + a-benn {0} Mer. + a-benn {0} Mer. + a-benn {0} Mer. + a-benn {0} Mer. + a-benn {0} Mer. + + + {0} Mer. zo + {0} Mer. zo + {0} Mer. zo + {0} Mer. zo + {0} Mer. zo + Mc diwezhañ Mc-mañ Mc a zeu + + a-benn {0} Mc + a-benn {0} Mc + a-benn {0} Mc + a-benn {0} Mc + a-benn {0} Mc + + + {0} Mc zo + {0} Mc zo + {0} Mc zo + {0} Mc zo + {0} Mc zo + Diriaou diwezhañ @@ -2645,14 +2760,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic a-benn {0} Yaou a-benn {0} Yaou a-benn {0} Yaou - a-benn {0} a Yaou. + a-benn {0} Yaou a-benn {0} Yaou {0} Yaou zo {0} Yaou zo {0} Yaou zo - {0} a Yaou. zo + {0} Yaou zo {0} Yaou zo @@ -2664,14 +2779,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic a-benn {0} Y a-benn {0} Y a-benn {0} Y - a-benn {0} a Yaou. + a-benn {0} Y a-benn {0} Y {0} Y zo {0} Y zo {0} Y zo - {0} a Y zo + {0} Y zo {0} Y zo @@ -2698,11 +2813,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gwe. diwezhañ Gwe.-mañ Gwe. a zeu + + a-benn {0} Gwe. + a-benn {0} Gwe. + a-benn {0} Gwe. + a-benn {0} Gwe. + a-benn {0} Gwe. + + + {0} Gwe. zo + {0} Gwe. zo + {0} Gwe. zo + {0} Gwe. zo + {0} Gwe. zo + G diwezhañ G-mañ G a zeu + + a-benn {0} G + a-benn {0} G + a-benn {0} G + a-benn {0} G + a-benn {0} G + + + {0} G zo + {0} G zo + {0} G zo + {0} G zo + {0} G zo + Disadorn diwezhañ @@ -2927,7 +3070,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic UTC{0} - UTC UTC+? eur {0} eur hañv {0} @@ -3022,9 +3164,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pariz - - eur hañv Breizh-Veur - Londrez @@ -3049,9 +3188,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Georgia ar Su - - eur cʼhoañv Iwerzhon - Dulenn @@ -3222,6 +3358,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wallis-ha-Futuna + + + eur Acre + eur cʼhoañv Acre + eur hañv Acre + + eur Afghanistan @@ -3254,13 +3397,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Alaska - - - eur Almaty - eur cʼhoañv Almaty - eur hañv Almaty - - eur an Amazon @@ -3411,6 +3547,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Brasília + + + eur Breizh-Veur + eur hañv Breizh-Veur + + eur Brunei @@ -3492,7 +3634,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - eur Timor ar Reter + eur Timor-Leste @@ -3584,6 +3726,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic amzer keitat Greenwich (AKG) + + + eur Greunland + eur cʼhoañv Greunland + eur hañv Greunland + + eur Greunland ar Reter @@ -3598,11 +3747,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Greunland ar Cʼhornôg - - - eur cʼhoañv Guam - - eur cʼhoañv ar Pleg-mor Arab-ha-Pers @@ -3615,7 +3759,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - eur cʼhoañv Hawaii hag an Aleouted + eur Hawaii @@ -3676,6 +3820,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Iran + + + eur Iwerzhon + eur cʼhoañv Iwerzhon + + eur Irkutsk @@ -3697,6 +3847,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Japan + + + eur Kamchatka + eur cʼhoañv Kamchatka + eur hañv Kamchatka + + eur Kazakstan @@ -3736,11 +3893,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur Kyrgyzstan - - - eur Sri Lanka - - eur Line Islands @@ -3753,13 +3905,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Lord Howe - - - eur Macau - eur cʼhoañv Macau - eur hañv Macau - - eur Magadan @@ -3875,11 +4020,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Fernando de Noronha - - - eur Mariana an Norzh - - eur Novosibirsk @@ -3976,11 +4116,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Sakhalin + + + eur Samara + eur cʼhoañv Samara + eur hañv Samara + + - eur Samoa Amerikan eur cʼhoañv Samoa Amerikan - eur hañv Samoa Amerikan @@ -4047,6 +4192,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur Chuuk + + + eur Turkia + eur cʼhoañv Turkia + eur hañv Turkia + + eur Turkmenistan @@ -4066,6 +4218,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic eur hañv Uruguay + + + eur Ürümqi + + eur Ouzbekistan @@ -4208,10 +4365,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0k + 0k + 0k + 0k 0k 00k + 00k + 00k + 00k 00k 000k + 000k + 000k + 000k 000k @@ -4759,14 +4925,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic a yuanoù Sina (diavaez) yuan Sina (diavaez) - - dollar Bank poblel Sina - dollar Bank poblel Sina - zollar Bank poblel Sina - dollar Bank poblel Sina - a zollaroù Bank poblel Sina - dollar Bank poblel Sina - yuan Sina yuan Sina @@ -6279,6 +6437,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic dollar Karib ar reter XCD + + florin karibean + florin karibean + florin karibean + florin karibean + a florinoù karibean + florin karibean + gwirioù tennañ arbennik @@ -6435,6 +6601,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic a zollaroù Zimbabwe (1980–2008) dollar Zimbabwe (1980–2008) + + aour Zimbabwe + aour Zimbabwe + aour Zimbabwe + aour Zimbabwe + a aour Zimbabwe + aour Zimbabwe + dollar Zimbabwe (2009) dollar Zimbabwe (2009) @@ -6493,6 +6667,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic yokto{0} + + ronto{0} + + + kwekto{0} + deka{0} @@ -6523,6 +6703,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic yota{0} + + ronna{0} + + + kweta{0} + kibi{0} @@ -7029,12 +7215,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kalorienn - kaloriennoù bras - {0} galorienn vras - {0} galorienn vras - {0} c'halorienn vras - {0} a galoriennoù bras - {0} kalorienn vras + kaloriennoù bras + {0} galorienn vras + {0} galorienn vras + {0} c'halorienn vras + {0} a galoriennoù bras + {0} kalorienn vras kilojouloù @@ -7061,11 +7247,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kilowatt-eur - elektronvoltoù + elektron-voltoù {0} elektronvolt {0} elektronvolt {0} elektronvolt - {0} a elektronvoltoù + {0} a elektron-voltoù {0} elektronvolt @@ -7125,7 +7311,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} hertz - esaouenn em + esaouennoù em {0} esaouenn em {0} esaouenn em {0} esaouenn em @@ -7165,27 +7351,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} piksel dre veutad - pikoù dre santimetr - {0} pik dre santimetr - {0} bik dre santimetr - {0} fik dre santimetr - {0} a bikoù dre santimetr - {0} pik dre santimetr + pikoù dre santimetr + {0} pik dre santimetr + {0} bik dre santimetr + {0} fik dre santimetr + {0} a bikoù dre santimetr + {0} pik dre santimetr - pikoù dre veutad - {0} pik dre veutad - {0} bik dre veutad - {0} fik dre veutad - {0} a bikoù dre veutad - {0} pik dre veutad + pikoù dre veutad + {0} pik dre veutad + {0} bik dre veutad + {0} fik dre veutad + {0} a bikoù dre veutad + {0} pik dre veutad - {0} pik - {0} bik - {0} fik - {0} a bikoù - {0} pik + pikoù + {0} pik + {0} bik + {0} fik + {0} a bikoù + {0} pik skin douar @@ -7392,6 +7579,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} a lumenoù {0} lumen + + sked heol + {0} sked heol + {0} sked heol + {0} sked heol + {0} a skedoù heol + {0} sked heol + tonennoù metrek {0} donenn vetrek @@ -7991,6 +8186,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} a gardoù impalaerel {0} kard impalaerel + + nozvezhioù + {0} nozvezh + {0} nozvezh + {0} nozvezh + {0} a nozvezhioù + {0} nozvezh + {0} dre nozvezh + {0} Reter {0} Norzh @@ -8257,12 +8461,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic V - Cal - {0} Cal - {0} Cal - {0} Cal - {0} Cal - {0} Cal + Cal + {0} Cal + {0} Cal + {0} Cal + {0} Cal + {0} Cal J @@ -8300,28 +8504,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} px/in - pdcm - {0} pdcm - {0} pdcm - {0} pdcm - {0} pdcm - {0} pdcm + pdcm + {0} pdcm + {0} pdcm + {0} pdcm + {0} pdcm + {0} pdcm - pdm - {0} pdm - {0} pdm - {0} pdm - {0} pdm - {0} pdm + pdm + {0} pdm + {0} pdm + {0} pdm + {0} pdm + {0} pdm - pik - {0} pik - {0} pik - {0} pik - {0} pik - {0} pik + pik + {0} pik + {0} pik + {0} pik + {0} pik + {0} pik m @@ -8337,6 +8541,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic fth + + sked heol + g @@ -8535,6 +8742,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic qt Imp. + + nozv. + {0} nozv. + {0} nozv. + {0} nozv. + {0} a nozv. + {0} nozv. + {0}/nozvezh + durcʼhadur {0} R @@ -8953,11 +9169,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}cal - {0}Cal - {0}Cal - {0}Cal - {0}Cal - {0}Cal + {0}Cal + {0}Cal + {0}Cal + {0}Cal + {0}Cal {0}kJ @@ -9080,25 +9296,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}px/in - {0}pdcm - {0}pdcm - {0}pdcm - {0}pdcm - {0}pdcm + {0}pdcm + {0}pdcm + {0}pdcm + {0}pdcm + {0}pdcm - {0}pdm - {0}pdm - {0}pdm - {0}pdm - {0}pdm + {0}pdm + {0}pdm + {0}pdm + {0}pdm + {0}pdm - {0}pik - {0}pik - {0}pik - {0}pik - {0}pik + {0}pik + {0}pik + {0}pik + {0}pik + {0}pik {0}R⊕ @@ -9280,6 +9496,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}lm + sked heol {0}L☉ {0}L☉ {0}L☉ @@ -9683,11 +9900,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic galIm - {0}galIm - {0}galIm - {0}galIm - {0}galIm - {0}galIm + {0}gal-Im + {0}gal-Im + {0}gal-Im + {0}gal-Im + {0}gal-Im {0}/galIm @@ -9797,6 +10014,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}qt Imp. {0}qt Imp. + + nozv. + {0}nozv. + {0}nozv. + {0}nozv. + {0}nozv. + {0}nozv. + {0}/nozv. + {0}R {0}N @@ -9835,6 +10061,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} — kenglotusted {0} — kelcʼhiet {0} — astennet + {0} tu kleiz + {0} tu dehoù {0} — istorel {0} — liesseurt {0} — all @@ -9863,6 +10091,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic sifr arouez Dingbat arouez divinouriezh + bir dʼan traoñ + bir dʼan traoñ ha dʼal laez skriturioù Azia ar Reter skritur europat benel @@ -9871,6 +10101,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic boued hag evaj furmad furmad hag esaouennoù + stumm geometrek arouezennoù han gwrizienn han arouezenn hanja @@ -9879,12 +10110,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic kalon skritur istorel kana japanek + stokell + bir tu kleiz + bir tu kleiz ha dehoù + implij bevennet gourel arouez matematikel skriturioù Reter-Kreiz liesseurt skritur modern kemmañ + arouez sonerezh natur niveroù tra @@ -9894,6 +10130,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic piktogramm lecʼh poentadur + bir tu dehoù sin pe arouez adstummoù bihan fromlun @@ -9902,8 +10139,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic skriturioù Azia ar Gevred arouez arouez teknikel + arouez ton beaj beaj pe lecʼh + bir dʼal laez adstumm bogalennoù jamo amzer @@ -9936,6 +10175,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic und br ko vi yue zh + + {title} {given} {given2} {surname-prefix} {surname-core} {surname2} {credentials} + + + {given-informal} {surname-prefix} {surname-core} + + + {title} {surname-prefix} {surname-core} + + + {given-informal} + + + {title} {given} {surname-prefix} {surname-core} {credentials} + + + {given-informal} {surname-prefix} {surname-core} + + + {title} {surname-prefix} {surname-core} + + + {given-informal} + + + {given} {surname-prefix} {surname-core} + + + {given-informal} {surname-initial} + + + {title} {surname-prefix} {surname-core} + + + {given-informal} + Yann @@ -9948,8 +10223,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic Erwan ar Go + + Ao. + Yann-Fañch + Yannig + Erwan + ar + Fur + Lagadeg + + + Asmar + + + Elizabeth + Smith + + + Alba + Carla + Pérez + - Prof. Dr. + Prof. Dr. + Ada Cornelia + Neele + César Martín + von + Brühl + González Domingo + Jr + MD DDS diff --git a/make/data/cldr/common/main/brx.xml b/make/data/cldr/common/main/brx.xml index d0788f358997..b38d345bebac 100644 --- a/make/data/cldr/common/main/brx.xml +++ b/make/data/cldr/common/main/brx.xml @@ -1066,6 +1066,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic थाखोआरि रोखोम फारि स्ट्रोक वर्गीकरण पारम्पारिक वर्गीकरण + 12 घन्टानि आदब + 24 घन्टानि आदब 12 घन्टानि आदब (0–11) 12 घन्टानि आदब (1–12) 24 घन्टानि आदब ( 0–23) @@ -1511,6 +1513,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + {1}, {0} @@ -1562,10 +1568,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, MMM d, y MMMM y + d MMMM y + EEE, MMMM d, y QQQ y QQQQ y + + {0}– {1} + {0}–{1} + {0}–{1} + Bनि h – Bनि h B नि h–h @@ -1949,7 +1962,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जि.एम.ति {0} - जि.एम.ति {0} सम {0} साननि सोरां सम {0} थाखोआरि सम @@ -1960,6 +1972,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic गोरोबहोनाय मुलुगनां सम + + इउ टि सि + मिथियै नोगोर @@ -2427,9 +2442,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic लिब्रेभिल - - ब्रीटीश दैज्लां सम - लन्दन @@ -2520,9 +2532,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जयापुरा - - आईरीश थाखोआरि सम - डाबलिन @@ -3254,13 +3263,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic आलास्कानि सानारि सम - - - अलमाटी टाईम - अलमाटी स्टैंडर्ड टाईम - अलमाटी समर टाईम - - आमाजन सम @@ -3310,20 +3312,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic आपिया सान सम - - - अक्टाऊ सम - अक़्टाऊ स्टैंडर्ड टाईम - अक़्टाऊ समर टाईम - - - - - आक्त’ब सम - अक़्टोबे स्टैंडर्ड टाईम - अक़्टोबे समर टाईम - - आराबीयान सम @@ -3425,6 +3413,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ब्राजीलिया दैज्लां सम + + + ब्रिटिश सम + ब्रीटीश दैज्लां सम + + ब्रुनेई दर उस सलाम स्टैंडर्ड टाईम @@ -3612,11 +3606,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic सेनाब ग्रीनलेण्ड दैज्लां सम - - - गुआम स्टैंडर्ड टाईम - - गाल्फ थाखोआरि सम @@ -3629,7 +3618,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - हावाई-एल्युतियान थाखोआरि सम + हावाइ एल्युतियान स्टेन्डार्ड सम @@ -3693,6 +3682,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic इरान सानारि सम + + + आइरिस सम + आईरीश थाखोआरि सम + + ईर्कुत्स्क सम @@ -3755,11 +3750,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic कीर्गीस्तान सम - - - लंका स्टैंडर्ड टाईम - - लाईन द्वीपफोरनि सम @@ -3772,13 +3762,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic लर्ड हावि सानारि सम - - - माकाऊ सम - माकाऊ स्टैंडर्ड टाईम - माकाऊ समर टाईम - - मागादान सम @@ -3894,11 +3877,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फेरनान्द’ दे नर’न्हा दैज्लां सम - - - नॉर्थ मारिआना स्टैंडर्ड टाईम - - नभ’सिबिर्स्क सम @@ -3978,13 +3956,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic प्यंयां सम - - - क़ीज़ीलोर्डा टाईम - क़ीज़ीलोर्डा स्टैंडर्ड टाईम - क़ीज़ीलोर्डा समर टाईम - - रियूनियन सम @@ -4011,9 +3982,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - साम’वा सम साम’वा थाखोआरि सम - साम’वा सानारि सम diff --git a/make/data/cldr/common/main/bs.xml b/make/data/cldr/common/main/bs.xml index a5062dc55261..b1b9338560c4 100644 --- a/make/data/cldr/common/main/bs.xml +++ b/make/data/cldr/common/main/bs.xml @@ -412,6 +412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pali pidžin poljski + pijemontski ponpejski malisit-pasamakvodi pruski @@ -941,7 +942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ostrvo Man Indija Britanska Teritorija u Indijskom Okeanu - arhipelag Chagos + Arhipelag Chagos Irak Iran Island @@ -1225,18 +1226,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortiranje Normalizirano sortiranje Numeričko sortiranje + Promjena redoslijeda pisma/bloka Jačina sortiranja Valuta - Emoji prezentacija + Transformacija odredišta + Izuzeci od pretraživanja rječnika + Prezentacija emojija + Prvi dan u sedmici + Mješovito Format vremena (12 ili 24) - Stil prijeloma reda + Način unosa + Tastatura + Najviše ignorirano + Stil preloma reda Prelom reda u riječi + Transformacija pravila Mjerni sistem + Mjerna jedinica Brojevi + Područje za dodatne podatke + Transformacija izvora + Pododjeljak područja Prelom rečenice nakon skraćenice + Transformacija + Mašinski prevedeno Vremenska zona Varijanta zemlje/jezika Privatna upotreba + Transformacija za privatnu upotrebu budistički kalendar @@ -1249,74 +1266,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dangi etiopski kalendar etiopski - etiopski kalendar "Amete Alem" + etiopski kalendar Amete Alem etiopski Amete Alem gregorijanski kalendar gregorijanski hebrejski kalendar hebrejski indijski nacionalni kalendar - islamski kalendar - islamski - islamski građanski kalendar, tabelarni - islamski (tabelarni, građanski) + indijski nacionalni + hidžretski kalendar + hidžretski + hidžretski kalendar (tabularni, građanska epoha) + hidžretski (tabularni, građanska epoha) islamski kalendar za Saudijsku Arabiju + hidžretski, Saudijska Arabija islamski kalendar, tabelarni, astronomska epoha - islamski kalendar, Umm al-Qura - islamski (Umm al-Qura) + hidžretski (tabularni, astronomska epoha) + hidžretski kalendar (Umm al-Qura) + hidžretski (Umm al-Qura) kalendar ISO-8601 + gregorijanski japanski kalendar japanski perzijski kalendar perzijski - kalendar Republike Kine - Republika Kina + minguo kalendar + minguo računovodstveni format valute - Računovodstvo + računovodstveni standardni format valute - Standardno + standardni Poredaj simbole Poredaj zanemarujući simbole Poredaj naglaske normalno Poredaj naglaske obrnuto Prvo poredaj mala slova + mala slova Poredaj po normalnom poretku veličine slova + mala slova Poredaj prvo velika slova + velika slova Poredaj zanemarujući veličinu Poredaj u skladu s veličinom slova Prethodno sortiranje radi usklađenosti + kompatibilnost Rječničko sortiranje + rječnik standardno Unicode sortiranje standardni Unicode Sortiranje po emoji sličicama + emodži Evropska pravila sortiranja + evropska pravila Sortiranje kao telefonski imenik + telefonski imenik Fonetsko sortiranje + fonetski Pinjin sortiranje + pinyin općenito pretraživanje - pretraga + pretraživanje Pretraživanje po početnom suglasniku hangula + korejski početni suglasnik standardno sortiranje standardno Sortiranje po broju crta + potez Tradicionalno sortiranje + tradicionalno sortiranje prema korijenu i potezu + korijen i potez zhuyin sortiranje + zhuyin Poredaj bez normalizacije Poredaj unikod normalizirano Poredaj cifre pojedinačno Poredaj cifre numerički + valuta + znamenke + interpunkcija + bjelina + simbol Poredaj sve + sve Poredaj samo po osnovnim slovima + samo osnovna slova Poredaj po naglascima/veličini/širini/pismu kana + osnova, naglasci, veličina, varijante, kana Poredaj po naglasku + osnova, naglasci Poredaj po naglascima/veličini/širini + osnova, naglasci, veličina, varijante Široki Uski Numerički Zadano Emoji Tekst + 12-satni format + 12 + 24-satni format + 24 12-satni format (0–11) 12 (0–11) 12-satni format (1–12) @@ -1325,91 +1375,121 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-satni format (1–24) 24 (1–24) - Slobodni stil prijeloma reda + Prebacivanje praznina, interpunkcija, svi simboli + Prebacivanje praznina, interpunkcija + Prebacivanje praznina, interpunkcija + Prebacivanje praznina, interpunkcija, simboli koji nisu valute + Slobodni stil preloma reda Slobodni - Normalni stil prijeloma reda + Normalni stil preloma reda Normalni - Strogi stil prijeloma reda + Strogi stil preloma reda Strogi - podijeli sve - zadrži sve - normalno - zadrži u fazama + Prelomi sve + Zadrži sve + Normalno + Zadrži u frazama US BGN transliteracija UN GEGN transliteracija - metrički sistem + Metrički sistem Metrički - britanski mjerni sistem + Imperijalni mjerni sistem UK - američki mjerni sistem - američki + Američki mjerni sistem + Američki ahom cifre - arapsko-indijski brojevi - prošireni arapsko-indijski brojevi + arapsko-indijske cifre + proširene arapsko-indijske cifre + prošireno arapsko-indijski armenski brojevi mali armenski brojevi + armenski mali balijske cifre - bengalski brojevi + bengalske cifre brahmi cifre čakma cifre čam cifre ćirilični brojevi - brojevi pisma devanagari + devanagari cifre dives akuru cifre etiopski brojevi Finansijski brojevi - široki brojevi + finansijski + široke cifre + puna širina gruzijski brojevi gundžala bondi cifre masaram gondi cifre grčki brojevi mali grčki brojevi - brojevi pisma gudžarati - brojevi pisma gurmuki + mali grčki + gudžarati cifre + gurmuki cifre + numeracija han znakova dana u mjesecu za tradicionalne kalendare kineski decimalni brojevi + pozicijski decimalni sistem koji koristi ideografe kineskih brojeva kao cifre pojednostavljeni kineski brojevi pojednostavljeni kineski finansijski brojevi + pojednostavljeni kineski finansijski tradicionalni kineski brojevi tradicionalni kineski finansijski brojevi + tradicionalni kineski finansijski hebrejski brojevi pahav hmong brojevi nijakeng punču hmnog brojevi javanski brojevi japanski brojevi japanski finansijski brojevi + japanski finansijski + japanska numeracija prve godine (Gannen) kajah li brojevi kawi cifre - kmerski brojevi - brojevi pisma kanada + kmerske cifre + kanada cifre tai tam hora brojevi tai tam tam brojevi - laoski brojevi - arapski brojevi + Tai Tham (liturgijsko pismo) + laoske cifre + arapske cifre lepča brojevi limbu brojevi matematički podebljani brojevi + matematički podebljano matematički dvostruko podebljani brojevi + matematički s dvostrukim crtama matematičke monospace cifre + matematički fiksne širine matematičke sans-serif podebljane cifre + matematički podebljani sans-serif matematičke sans-serif cifre - malajalamski brojevi + matematički sans-serif + malajalamske cifre modi cifre Mongolske cifre mro cifre mitei majek cifre - mijanmarski brojevi + mjanmarske cifre + mjanmarski istočni Pwo Karen + mjanmarski Pao mijanmarske šan cifre + mjanmarski Shan mijanmarske tai laing cifre + mjanmarski Tai Laing nag mundari cifre - izvorni brojevi + izvorne cifre + izvorne cifre n’ko cifre ol čiki cifre - orijski brojevi + orijske cifre osmanjske cifre + obrubljeno hanifi rohingaja cifre rimski brojevi + rimski veliki mali rimski brojevi + mali rimski sauraštra cifre + segmentirano šarada cifre kudavade cifre sinhala lit cifre @@ -1418,19 +1498,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ takri cifre nove tai lue cifre tradicionalni tamilski brojevi - tamilski brojevi - brojevi pisma telugu - tajlandski brojevi - tibetanski brojevi + tamilske cifre + moderni tamilski + telugu cifre + tajlandske cifre + tibetanske cifre tirhutanske cifre tangsa cifre Tradicionalni brojevi - Vai cifre + tradicionalni brojevi + vai cifre warang citi cifre vančo cifre Uključeno Isključeno + Neodređeni mašinski prevod + Varijanta POSIX-a + + isključeno + uključeno + metrički britanski @@ -1721,6 +1809,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL y. G + + {0} – {1} + h – h B @@ -1772,6 +1863,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd. – E, dd. MMM E, dd. MMM – E, dd. MMM + + d–d. MMMM + d. MMMM – d. MMMM + y. – y. G @@ -1831,7 +1926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feb mar apr - may + maj jun jul aug @@ -1957,8 +2052,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - prijepodne - popodne + AM + PM prijepodne @@ -2026,6 +2121,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -2070,16 +2168,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y. G + MM. y. G d. M. y. G + E, d. M. y. G MMM y. G d. MMM y. G E, d. MMM y. G - hh:mm a - hh:mm:ss a - h:mm:ss a (v) - HH:mm:ss (v) - h:mm a (v) - HH:mm (v) + MMMM y. G + d. MMMM y. G + E, d. MMMM y. G d. M. E, d. M. d. M. @@ -2091,7 +2188,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ W. 'sedmica' 'mjesec' MMMM W. 'sedmica' 'mjesec' MMMM y. - MM/y + MM. y. d. M. y. E, d. M. y. M. y. @@ -2099,6 +2196,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y. E, d. MMM y. LLLL y. + d. MMMM y. + E, d MMMM y. QQQ y. QQQQ y. w. 'sedmica' 'u' Y. @@ -2106,6 +2205,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w. 'sedmica' 'u' Y. + + {0} – {1} + h – h B @@ -2189,6 +2291,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. M – E, d. M. E, d. M – E, d. M. + + LLL – LLL + d–d. MMM d. MMM – d. MMM @@ -2197,6 +2302,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d. MMM E, d. MMM – E, d. MMM + + d–d. MMMM + d. MMMM – d. MMMM + + + y–y. + M. y – M. y. M. y – M. y. @@ -2497,31 +2609,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} sedm. - - sedm. - prošle sedm. - ove sedm. - sljedeće sedm. - - za {0} sedm. - za {0} sedm. - za {0} sedm. - - - prije {0} sedm. - prije {0} sedm. - prije {0} sedm. - - sedmica u mjesecu sedm. u mj. - - sedm. u mj. - dan prekjučer @@ -2540,18 +2633,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} dana - - - za {0} dan - za {0} dana - za {0} dana - - - prije {0} dan - prije {0} dana - prije {0} dana - - dan u godini @@ -2603,21 +2684,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} ned - - prošla ned - ova ned - sljedeća ned - - za {0} ned - za {0} ned - za {0} ned - - - prije {0} ned - prije {0} ned - prije {0} ned - - prošli ponedjeljak ovaj ponedjeljak @@ -2678,21 +2744,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} uto - - prošli uto - ovaj uto - sljedeći uto - - za {0} uto - za {0} uto - za {0} uto - - - prije {0} uto - prije {0} uto - prije {0} uto - - prošla srijeda ova srijeda @@ -2723,21 +2774,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} sri - - prošla sri - ova sri - sljedeća sri - - za {0} sri - za {0} sri - za {0} sri - - - prije {0} sri - prije {0} sri - prije {0} sri - - prošli četvrtak ovaj četvrtak @@ -2768,21 +2804,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} čet - - prošli čet - ovaj čet - sljedeći čet - - za {0} čet - za {0} čet - za {0} čet - - - prije {0} čet - prije {0} čet - prije {0} čet - - prošli petak ovaj petak @@ -2813,21 +2834,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} pet - - prošli pet - ovaj pet - sljedeći pet - - za {0} pet - za {0} pet - za {0} pet - - - prije {0} pet - prije {0} pet - prije {0} pet - - prošla subota ova subota @@ -2858,21 +2864,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} sub - - prošla sub - ova sub - sljedeća sub - - za {0} sub - za {0} sub - za {0} sub - - - prije {0} sub - prije {0} sub - prije {0} sub - - prijepodne/poslijepodne @@ -2920,18 +2911,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ prije {0} min - - - za {0} min - za {0} min - za {0} min - - - prije {0} min - prije {0} min - prije {0} min - - sekunda sada @@ -3078,11 +3057,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pariz - - - Britansko ljetno vrijeme - - Gernzi @@ -3108,9 +3082,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Džajapura - - Irsko standardno vrijeme - Dablin @@ -3392,13 +3363,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Aljaskansko ljetno vrijeme - - - Almatu vreme - Almatu standardno vreme - Almatu letnje računanje vremena - - Amazonsko vrijeme @@ -3448,20 +3412,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apijsko ljetno vrijeme - - - Akvtau vreme - Akvtau standardno vreme - Akvtau letnje računanje vremena - - - - - Akvtobe vreme - Akvtobe standardno vreme - Akvtobe letnje računanje vremena - - Arabijsko vrijeme @@ -3563,6 +3513,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brazilijsko ljetno vrijeme + + + Britansko vrijeme + Britansko ljetno vrijeme + + Brunejsko vrijeme @@ -3754,6 +3710,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Grenlandsko vrijeme + Grenlandsko standardno vrijeme + Grenlandsko ljetno vrijeme + + Istočnogrenlandsko vrijeme @@ -3768,11 +3731,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zapadnogrenlandsko ljetno vrijeme - - - Guam standardno vreme - - Zalivsko standardno vrijeme @@ -3785,7 +3743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havajsko-aleućansko standardno vrijeme + Havajsko vrijeme @@ -3846,6 +3804,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iransko ljetno vrijeme + + + Irsko vrijeme + Irsko standardno vrijeme + + Irkutsko vrijeme @@ -3913,11 +3877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kirgistansko vrijeme - - - Lanka vreme - - Vrijeme na Ostrvima Lajn @@ -3930,13 +3889,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ljetno vrijeme na Ostrvu Lord Hau - - - Makao vreme - Makao standardno vreme - Makao letnje računanje vremena - - Magadansko vrijeme @@ -4052,11 +4004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ljetno vrijeme na ostrvu Fernando di Noronja - - - Severna Marijanska Ostrva vreme - - Novosibirsko vrijeme @@ -4136,13 +4083,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pjongjanško vrijeme - - - Kizilorda vreme - Kizilorda standardno vreme - Kizilorda letnje računanje vremena - - Reunionsko vrijeme @@ -4169,9 +4109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoansko vrijeme Samoansko standardno vrijeme - Samoansko ljetno vrijeme @@ -4264,6 +4202,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugvajsko ljetno vrijeme + + + Urumčijsko vrijeme + + uzbekistansko vrijeme @@ -4383,28 +4326,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 hilj'.' + 0 hilj'.' 0 hilj'.' 00 hilj'.' + 00 hilj'.' 00 hilj'.' 000 hilj'.' + 000 hilj'.' 000 hilj'.' 0 mil'.' + 0 mil'.' 0 mil'.' 00 mil'.' + 00 mil'.' 00 mil'.' 000 mil'.' + 000 mil'.' 000 mil'.' 0 mlrd'.' + 0 mlrd'.' 0 mlrd'.' 00 mlrd'.' + 00 mlrd'.' 00 mlrd'.' 000 mlrd'.' + 000 mlrd'.' 000 mlrd'.' 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' 000 bil'.' @@ -5608,12 +5563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kineska juana (izvanteritorijalni) kineskih juana (izvanteritorijalni) - - Dolar kineske narodne banke - dolar kineske narodne banke - dolara kineske narodne banke - dolara kineske narodne banke - Kineski juan kineski juan @@ -7225,9 +7174,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dijelovi - {0} dio - {0} dijela - {0} dijelova dijelovi na milion @@ -8223,12 +8169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} vebera {0} vebera - - svjetlo - {0} svjetlo - {0} svjetla - {0} svjetala - dijelovi na milijardu {0} dio na milijardu @@ -8760,7 +8700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ aker - dio {0} dio {0} dijela {0} dijelova @@ -8768,12 +8707,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ppm - - Glc - {0} Glc - {0} Glc - {0} Glc - {0} B {0} B @@ -8891,11 +8824,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} gr {0} gr - - {0} Hg - {0} Hg - {0} Hg - {0} mb {0} mbar @@ -8918,58 +8846,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ imp. kvart - - {0} sr - {0} sr - {0} sr - - - {0} kat - {0} kat - {0} kat - - - {0} F - {0} F - {0} F - - - {0} S - {0} S - {0} S - - - cal [IT] - {0} cal IT - {0} cal IT - {0} cal IT - - - {0} Bq - {0} Bq - {0} Bq - - - {0} kgf - {0} kgf - {0} kgf - - - {0} T - {0} T - {0} T - - - {0} Wb - {0} Wb - {0} Wb - - - svjetlo - {0} svjetlo - {0} svjetla - {0} svjetala - {0}I {0}S diff --git a/make/data/cldr/common/main/bs_Cyrl.xml b/make/data/cldr/common/main/bs_Cyrl.xml index b88b070ef9c1..d2f98a837a59 100644 --- a/make/data/cldr/common/main/bs_Cyrl.xml +++ b/make/data/cldr/common/main/bs_Cyrl.xml @@ -1157,6 +1157,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic пуна ширина пола ширине Нумеричка + 12-сатни систем + 24-сатни систем 12-сатни систем (0–11) 12-сатни систем (1–12) 24-сатни систем (0–23) @@ -1668,6 +1670,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'седмица' w 'година' Y + + {0} – {1} + {0}–{1} + {0}–{1} + hh a – hh a hh–hh a @@ -1884,238 +1891,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Таика (645–650) - Хакучи (650–671) - Хакухо (672–686) - Шучо (686–701) - Таихо (701–704) - Кеиун (704–708) - Вадо (708–715) - Реики (715–717) - Јоро (717–724) - Јинки (724–729) - Темпио (729–749) - Темпио-кампо (749-749) - Темпио-шохо (749-757) - Темпио-хођи (757-765) - Темпо-ђинго (765-767) - Ђинго-кеиун (767-770) - Хоки (770–780) - Тен-о (781-782) - Енрјаку (782–806) - Даидо (806–810) - Конин (810–824) - Тенчо (824–834) - Шова (834–848) - Кајо (848–851) - Нињу (851–854) - Саико (854–857) - Тенан (857–859) - Јоган (859–877) - Генкеи (877–885) - Ниња (885–889) - Кампјо (889–898) - Шотаи (898–901) - Енђи (901–923) - Енчо (923–931) - Шохеи (931–938) - Тенгјо (938–947) - Тенриаку (947–957) - Тентоку (957–961) - Ова (961–964) - Кохо (964–968) - Ана (968–970) - Тенроку (970–973) - Тен-ен (973-976) - Јоген (976–978) - Тенген (978–983) - Еикан (983–985) - Кана (985–987) - Еи-ен (987-989) - Еисо (989–990) - Шорјаку (990–995) - Чотоку (995–999) - Чохо (999–1004) - Канко (1004–1012) - Чова (1012–1017) - Канин (1017–1021) - Ђиан (1021–1024) - Мању (1024–1028) - Чоген (1028–1037) - Чорјаку (1037–1040) - Чокју (1040–1044) - Кантоку (1044–1046) - Еишо (1046–1053) - Тенђи (1053–1058) - Кохеи (1058–1065) - Ђирјаку (1065–1069) - Енкју (1069–1074) - Шохо (1074–1077) - Шорјаку (1077–1081) - Еишо (1081–1084) - Отоку (1084–1087) - Канђи (1087–1094) - Кахо (1094–1096) - Еичо (1096–1097) - Шотоку (1097–1099) - Кова (1099–1104) - Чођи (1104–1106) - Кашо (1106–1108) - Тенин (1108–1110) - Тен-еи (1110-1113) - Еикју (1113–1118) - Ђен-еи (1118-1120) - Хоан (1120–1124) - Тенђи (1124–1126) - Даиђи (1126–1131) - Теншо (1131–1132) - Чошао (1132–1135) - Хоен (1135–1141) - Еиђи (1141–1142) - Кођи (1142–1144) - Тењо (1144–1145) - Кјуан (1145–1151) - Нинпеи (1151–1154) - Кјују (1154–1156) - Хоген (1156–1159) - Хеиђи (1159–1160) - Еирјаку (1160–1161) - Охо (1161–1163) - Чокан (1163–1165) - Еиман (1165–1166) - Нин-ан (1166-1169) - Као (1169–1171) - Шоан (1171–1175) - Анген (1175–1177) - Ђишо (1177–1181) - Јова (1181–1182) - Ђуеи (1182–1184) - Генрјуку (1184–1185) - Бунђи (1185–1190) - Кенкју (1190–1199) - Шођи (1199–1201) - Кенин (1201–1204) - Генкју (1204–1206) - Кен-еи (1206-1207) - Шоген (1207–1211) - Кенрјаку (1211–1213) - Кенпо (1213–1219) - Шокју (1219–1222) - Ђу (1222–1224) - Ђенин (1224–1225) - Кароку (1225–1227) - Антеи (1227–1229) - Канки (1229–1232) - Ђоеи (1232–1233) - Темпуку (1233–1234) - Бунрјаку (1234–1235) - Катеи (1235–1238) - Рјакунин (1238–1239) - Ен-о (1239-1240) - Нињи (1240–1243) - Канген (1243–1247) - Хођи (1247–1249) - Кенчо (1249–1256) - Коген (1256–1257) - Шока (1257–1259) - Шоген (1259–1260) - Бун-о (1260-1261) - Кочо (1261–1264) - Бун-еи (1264-1275) - Кенђи (1275–1278) - Коан (1278–1288) - Шу (1288–1293) - Еинин (1293–1299) - Шоан (1299–1302) - Кенген (1302–1303) - Каген (1303–1306) - Токуђи (1306–1308) - Енкеи (1308–1311) - Очо (1311–1312) - Шова (1312–1317) - Бунпо (1317–1319) - Ђено (1319–1321) - Ђенкјо (1321–1324) - Шочу (1324–1326) - Кареки (1326–1329) - Гентоку (1329–1331) - Генко (1331–1334) - Кему (1334–1336) - Енген (1336–1340) - Кококу (1340–1346) - Шохеи (1346–1370) - Кентоку (1370–1372) - Бучу (1372–1375) - Тењу (1375–1379) - Корјаку (1379–1381) - Кова (1381–1384) - Генчу (1384–1392) - Меитоку (1384–1387) - Какеи (1387–1389) - Ку (1389–1390) - Меитоку (1390–1394) - Оеи (1394–1428) - Шочо (1428–1429) - Еикјо (1429–1441) - Какитсу (1441–1444) - Бун-ан (1444-1449) - Хотоку (1449–1452) - Кјотоку (1452–1455) - Кошо (1455–1457) - Чороку (1457–1460) - Каншо (1460–1466) - Буншо (1466–1467) - Онин (1467–1469) - Бунмеи (1469–1487) - Чокјо (1487–1489) - Ентоку (1489–1492) - Меио (1492–1501) - Бунки (1501–1504) - Еишо (1504–1521) - Таиеи (1521–1528) - Кјороку (1528–1532) - Тенмон (1532–1555) - Кођи (1555–1558) - Еироку (1558–1570) - Генки (1570–1573) - Теншо (1573–1592) - Бунроку (1592–1596) - Кеичо (1596–1615) - Генва (1615–1624) - Кан-еи (1624-1644) - Шохо (1644–1648) - Кеиан (1648–1652) - Шу (1652–1655) - Меирјаку (1655–1658) - Мањи (1658–1661) - Канбун (1661–1673) - Енпо (1673–1681) - Тенва (1681–1684) - Јокјо (1684–1688) - Генроку (1688–1704) - Хоеи (1704–1711) - Шотоку (1711–1716) - Кјохо (1716–1736) - Генбун (1736–1741) - Канпо (1741–1744) - Енкјо (1744–1748) - Кан-ен (1748-1751) - Хорјаку (1751–1764) - Меива (1764–1772) - Ан-еи (1772-1781) - Тенмеи (1781–1789) - Кансеи (1789–1801) - Кјова (1801–1804) - Бунка (1804–1818) - Бунсеи (1818–1830) - Тенпо (1830–1844) - Кока (1844–1848) - Каеи (1848–1854) - Ансеи (1854–1860) - Ман-ен (1860-1861) - Бункју (1861–1864) - Генђи (1864–1865) - Кеико (1865–1868) Меиђи Таишо Шова @@ -3000,9 +2775,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Либревил - - Британско љетње вријеме - Лондон @@ -3093,9 +2865,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Џајапура - - Ирско стандардно вријеме - Даблин @@ -3824,13 +3593,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Аљаска љетње вријеме - - - Алмати време - Алмати стандардно време - Алмати летње рачунање времена - - Амазон вријеме @@ -3880,20 +3642,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Апија љетње рачунање времена - - - Акватау време - Акватау стандардно време - Акватау летње рачунање времена - - - - - Акутобе време - Акутобе стандардно време - Акутобе летње рачунање времена - - Арабијско вријеме @@ -3995,6 +3743,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Бразилија љетње рачунање времена + + + Британско љетње вријеме + + Брунеј Дарусалам вријеме @@ -4182,11 +3935,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Западни Гренланд љетње рачунање времена - - - Гуам стандардно време - - Заливско вријеме @@ -4260,6 +4008,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Иран љетње рачунање времена + + + Ирско стандардно вријеме + + Иркуцк вријеме @@ -4327,11 +4080,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Киргистан вријеме - - - Шри Ланка време - - Лине Острва вријеме @@ -4344,13 +4092,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Лорд Хов љетње рачунање времена - - - Макао време - Макао стандардно време - Макао летње рачунање вемена - - Магадан вријеме @@ -4466,11 +4207,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Фернандо де Нороња љетње рачунање времена - - - Северна Маријанска Острва време - - Новосибирско вријеме @@ -4550,13 +4286,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Пјонгјанг вријеме - - - Кизилорда време - Кизилорда стандардно време - Кизилорда летње рачунање времена - - Реинион вријеме @@ -4583,9 +4312,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Самоа вријеме Самоа стандардно вријеме - Самоа љетње рачунање времена @@ -4796,28 +4523,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0 + 0 0 00 хиљ + 00 хиљ 00 хиљ 000 хиљ + 000 хиљ 000 хиљ 0 мил + 0 мил 0 мил 00 мил + 00 мил 00 мил 000 мил + 000 мил 000 мил 0 млрд + 0 млрд 0 млрд 00 млрд + 00 млрд 00 млрд 000 млрд + 000 млрд 000 млрд 0 бил + 0 бил 0 бил 00 бил + 00 бил 00 бил 000 бил + 000 бил 000 бил @@ -5262,11 +5001,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic кинеска јуана (острвска) кинеских јуана (острвских) - - долар кинеске народне банке - долара кинеске народне банке - долара кинеске народне банке - Кинески јуан кинески јуан diff --git a/make/data/cldr/common/main/bss.xml b/make/data/cldr/common/main/bss.xml deleted file mode 100644 index 4b74b0dc1848..000000000000 --- a/make/data/cldr/common/main/bss.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - Akoose - Akáálé - Frɛnsé - - - - - - Kamerûn - - - mɔné - - - - [aáâǎā b c d eéêěē ə{ə́}{ə̂}{ə̌}{ə̄} ɛ{ɛ́}{ɛ̂}{ɛ̌}{ɛ̄} g h iíîǐī j k l mḿ nń ŋ oóôǒō ɔ{ɔ́}{ɔ̂}{ɔ̌}{ɔ̄} p s t uúûǔū w y z ʼ] - [f q r v x] - [A B C D E Ə Ɛ G H I J K L M N Ŋ O Ɔ P S T U W Y Z] - [, ; \: ! ? . ' "] - - - - - mwɛ̌ - - - ngɔn - - - sɔ̂ndé - - - mbwɛ - súúbɛ - chǎn ábe éʼtómé - chii - chǎn ábe éʼhúɛʼ - - - háwa - - - menúte - - - - - - - Frânke CFA - - - - - - {0} {1} - - - diff --git a/make/data/cldr/common/main/bss_CM.xml b/make/data/cldr/common/main/bss_CM.xml deleted file mode 100644 index 7deed242a9cd..000000000000 --- a/make/data/cldr/common/main/bss_CM.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/bua.xml b/make/data/cldr/common/main/bua.xml index 9955f8b2e775..63ad7c7f132e 100644 --- a/make/data/cldr/common/main/bua.xml +++ b/make/data/cldr/common/main/bua.xml @@ -94,6 +94,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic y 'оной' MMMM + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} G y MM 'һарын' d–d diff --git a/make/data/cldr/common/main/byn.xml b/make/data/cldr/common/main/byn.xml deleted file mode 100644 index 7eb6e0fc9a6d..000000000000 --- a/make/data/cldr/common/main/byn.xml +++ /dev/null @@ -1,525 +0,0 @@ - - - - - - - - - - - አፋርኛ - አብሐዚኛ - አፍሪቃንስኛ - አማርኛ - ዐርቢኛ - አሳሜዛዊ - አያማርኛ - አዜርባይጃንኛ - ባስኪርኛ - ቤላራሻኛ - ቡልጋሪኛ - ቢስላምኛ - በንጋሊኛ - ትበትንኛ - ብሬቶንኛ - ብሊን - ካታላንኛ - ኮርሲካኛ - ቼክኛ - ወልሽ - ዴኒሽ - ጀርመን - ድዞንግኻኛ - ግሪክኛ - እንግሊዝኛ - ኤስፐራንቶ - ስፓኒሽ - ኤስቶኒአን - ባስክኛ - ፐርሲያኛ - ፊኒሽ - ፊጂኛ - ፋሮኛ - ፈረንሳይኛ - ፍሪስኛ - አይሪሽ - እስኮትስ ጌልክኛ - ግዕዝኛ - ጋለጋኛ - ጓራኒኛ - ጉጃርቲኛ - ሃውሳኛ - ዕብራስጥ - ሐንድኛ - ክሮሽያንኛ - ሀንጋሪኛ - አርመናዊ - ኢንቴርሊንጓ - እንዶኒሲኛ - እንተርሊንግወ - እኑፒያቅኛ - አይስላንድኛ - ጣሊያንኛ - እኑክቲቱትኛ - ጃፓንኛ - ጃቫንኛ - ጊዮርጊያን - ካዛክኛ - ካላሊሱትኛ - ክመርኛ - ካናዳኛ - ኮሪያኛ - ካሽሚርኛ - ኩርድሽኛ - ኪርጊዝኛ - ላቲንኛ - ሊንጋላኛ - ላውስኛ - ሊቱአኒያን - ላትቪያን - ማላጋስኛ - ማዮሪኛ - ማከዶኒኛ - ማላያላምኛ - ሞንጎላዊኛ - ማራዚኛ - ማላይኛ - ማልቲስኛ - ቡርማኛ - ናኡሩ - ኔፓሊኛ - ደች - ኖርዌጂያን - ኦኪታንኛ - ኦሮምኛ - ኦሪያኛ - ፓንጃቢኛ - ፖሊሽ - ፑሽቶኛ - ፖርቱጋሊኛ - ኵቿኛ - ሮማንስ - ሩንዲኛ - ሮማኒያን - ሞልዳቫዊና - ራሽኛ - ኪንያርዋንድኛ - ሳንስክሪትኛ - ሲንድሂኛ - ሳንጎኛ - ስንሃልኛ - ሲዳምኛ - ስሎቫክኛ - ስሎቪኛ - ሳሞአኛ - ሾናኛ - ሱማልኛ - ልቤኒኛ - ሰርቢኛ - ስዋቲኛ - ሶዞኛ - ሱዳንኛ - ስዊድንኛ - ስዋሂሊኛ - ታሚልኛ - ተሉጉኛ - ታጂኪኛ - ታይኛ - ትግርኛ - ትግረ - ቱርክመንኛ - ታጋሎገኛ - ጽዋናዊኛ - ቶንጋ - ቱርክኛ - ጾንጋኛ - ታታርኛ - ትዊኛ - ኡዊግሁርኛ - ዩክረኒኛ - ኡርዱኛ - ኡዝበክኛ - ቪትናምኛ - ቮላፑክኛ - ዎሎፍኛ - ዞሳኛ - ይዲሻዊኛ - ዮሩባዊኛ - ዡዋንግኛ - ቻይንኛ - ዙሉኛ - - - - - - አንዶራ - የተባበሩት አረብ ኤምሬትስ - አልባኒያ - አርሜኒያ - አርጀንቲና - ኦስትሪያ - አውስትሬሊያ - አዘርባጃን - ቦስኒያ እና ሄርዞጎቪኒያ - ባርቤዶስ - ቤልጄም - ቡልጌሪያ - ባህሬን - ቤርሙዳ - ቦሊቪያ - ብራዚል - ቡህታን - ቤላሩስ - ቤሊዘ - ኮንጎ - የመካከለኛው አፍሪካ ሪፐብሊክ - ስዊዘርላንድ - ቺሊ - ካሜሩን - ቻይና - ኮሎምቢያ - ኬፕ ቬርዴ - ሳይፕረስ - ቼክ ሪፑብሊክ - ጀርመን - ዴንማርክ - ዶሚኒካ - ዶሚኒክ ሪፑብሊክ - አልጄሪያ - ኢኳዶር - ኤስቶኒያ - ግብጽ - ምዕራባዊ ሳህራ - ኤርትራ - ስፔን - ኢትዮጵያ - ፊንላንድ - ፊጂ - ሚክሮኔዢያ - ፈረንሳይ - እንግሊዝ - ጆርጂያ - የፈረንሳይ ጉዊአና - ጋምቢያ - ጊኒ - ኢኳቶሪያል ጊኒ - ግሪክ - ቢሳዎ - ጉያና - ሆንግ ኮንግ - ክሮኤሽያ - ሀይቲ - ሀንጋሪ - ኢንዶኔዢያ - አየርላንድ - እስራኤል - ህንድ - ኢራቅ - አይስላንድ - ጣሊያን - ጃማይካ - ጆርዳን - ጃፓን - ካምቦዲያ - ኮሞሮስ - ሰሜን ኮሪያ - ደቡብ ኮሪያ - ክዌት - ሊባኖስ - ሊቱዌኒያ - ላትቪያ - ሊቢያ - ሞሮኮ - ሞልዶቫ - ማከዶኒያ - ሞንጎሊያ - ማካዎ - ሞሪቴኒያ - ማልታ - ማሩሸስ - ሜክሲኮ - ማሌዢያ - ናሚቢያ - ኒው ካሌዶኒያ - ናይጄሪያ - ኔዘርላንድ - ኖርዌ - ኔፓል - ኒው ዚላንድ - ፔሩ - የፈረንሳይ ፖሊኔዢያ - ፓፑዋ ኒው ጊኒ - ፖላንድ - ፖርታ ሪኮ - ሮሜኒያ - ራሺያ - ሳውድአረቢያ - ሱዳን - ስዊድን - ሲንጋፖር - ስሎቬኒያ - ስሎቫኪያ - ሴኔጋል - ሱማሌ - ሲሪያ - ቻድ - የፈረንሳይ ደቡባዊ ግዛቶች - ታይላንድ - ታጃኪስታን - ምስራቅ ቲሞር - ቱኒዚያ - ቱርክ - ትሪኒዳድ እና ቶባጎ - ታንዛኒያ - ዩጋንዳ - አሜሪካ - ዩዝበኪስታን - ቬንዙዌላ - የእንግሊዝ ድንግል ደሴቶች - የአሜሪካ ቨርጂን ደሴቶች - የመን - ደቡብ አፍሪካ - ዛምቢያ - - - - [፟ ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ] - [᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ⶏ ⶐ ⶑ ፇ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ] - [ሀ ለ ሐ መ ረ ሰ ሸ ቀ ቈ ቐ ቘ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ዀ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጘ ⶓ ⶔ ⶕ ⶖ ጠ ጨ ጸ ፈ ፐ] - - - - - - - - EEEE፡ dd MMMM ግርጋ y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - - - ልደት - ካብኽ - ክብላ - ፋጅኺ - ክቢቅ - ም/ት - ኰር - ማርያ - ያኸኒ - መተሉ - ም/ም - ተሕሳ - - - ልደትሪ - ካብኽብቲ - ክብላ - ፋጅኺሪ - ክቢቅሪ - ምኪኤል ትጟኒሪ - ኰርኩ - ማርያም ትሪ - ያኸኒ መሳቅለሪ - መተሉ - ምኪኤል መሽወሪ - ተሕሳስሪ - - - - - ል - ካ - ክ - ፋ - ክ - ም - ኰ - ማ - ያ - መ - ም - ተ - - - - - - - ሰ/ቅ - ሰኑ - ሰሊጝ - ለጓ - ኣምድ - ኣርብ - ሰ/ሽ - - - ሰንበር ቅዳዅ - ሰኑ - ሰሊጝ - ለጓ ወሪ ለብዋ - ኣምድ - ኣርብ - ሰንበር ሽጓዅ - - - - - ሰ - ሰ - ሰ - ለ - ኣ - ኣ - ሰ - - - - - - - ፋዱስ ጃብ - ፋዱስ ደምቢ - - - ፋዱስ ጃብ - ፋዱስ ደምቢ - - - - - - ይጅ - ኣድ - - - - - - EEEE፡ dd MMMM ግርጋ y G - GyMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - ethi - - - - - ¤#,##0.00 - - - - - - የብራዚል ሪል - - - የቻይና ዩአን ረንሚንቢ - - - Nfk - - - የኢትዮጵያ ብር - - - አውሮ - - - የእንግሊዝ ፓውንድ ስተርሊንግ - - - የሕንድ ሩፒ - - - የጃፓን የን - - - የራሻ ሩብል - - - የአሜሪካን ዶላር - - - - diff --git a/make/data/cldr/common/main/byn_ER.xml b/make/data/cldr/common/main/byn_ER.xml deleted file mode 100644 index ffb31267f147..000000000000 --- a/make/data/cldr/common/main/byn_ER.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ca.xml b/make/data/cldr/common/main/ca.xml index 95d79dfebe6c..ba306fcbcd66 100644 --- a/make/data/cldr/common/main/ca.xml +++ b/make/data/cldr/common/main/ca.xml @@ -388,7 +388,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ malai maltès mundang - llengües vàries + diverses llengües creek mirandès marwari @@ -853,7 +853,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Europa occidental Àfrica subsahariana Amèrica Llatina - Illa de l’Ascensió + illa de l’Ascensió Andorra Emirats Àrabs Units Afganistan @@ -868,7 +868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Àustria Austràlia Aruba - Illes Åland + illes Åland Azerbaidjan Bòsnia i Hercegovina Barbados @@ -887,12 +887,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasil Bahames Bhutan - Illa Bouvet + illa Bouvet Botswana Belarús Belize Canadà - Illes Cocos (Keeling) + illes Cocos (Keeling) Congo - Kinshasa República Democràtica del Congo República Centreafricana @@ -901,18 +901,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Suïssa Côte d’Ivoire Costa d’Ivori - Illes Cook + illes Cook Xile Camerun Xina Colòmbia - Illa Clipperton + illa Clipperton Sark Costa Rica Cuba Cap Verd Curaçao - Illa Christmas + illa Christmas Xipre Txèquia República Txeca @@ -935,10 +935,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zona euro Finlàndia Fiji - Illes Falkland - Illes Falkland (Illes Malvines) + illes Falkland + illes Falkland (illes Malvines) Micronèsia - Illes Fèroe + illes Fèroe França Gabon Regne Unit @@ -955,26 +955,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guadalupe Guinea Equatorial Grècia - Illes Geòrgia del Sud i Sandwich del Sud + illes Geòrgia del Sud i Sandwich del Sud Guatemala Guam Guinea Bissau Guyana Hong Kong (RAE Xina) Hong Kong - Illes Heard i McDonald + illes Heard i McDonald Hondures Croàcia Haití Hongria - Illes Canàries + illes Canàries Indonèsia Irlanda Israel - Illa de Man + illa de Man Índia Territori Britànic de l’Oceà Índic - Illes Chagos + illes Chagos Iraq Iran Islàndia @@ -992,7 +992,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Corea del Nord Corea del Sud Kuwait - Illes Caiman + illes Caiman Kazakhstan Lao Líban @@ -1011,14 +1011,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Montenegro Saint Martin Madagascar - Illes Marshall + illes Marshall Macedònia del Nord Mali Myanmar (Birmània) Mongòlia Macau (RAE Xina) Macau - Illes Marianes del Nord + illes Marianes del Nord Martinica Mauritània Montserrat @@ -1032,7 +1032,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Namíbia Nova Caledònia Níger - Illa Norfolk + illa Norfolk Nigèria Nicaragua Països Baixos @@ -1051,7 +1051,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pakistan Polònia Saint-Pierre-et-Miquelon - Illes Pitcairn + illes Pitcairn Puerto Rico Territoris palestins Palestina @@ -1060,13 +1060,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Paraguai Qatar Territoris allunyats d’Oceania - Illa de la Reunió + Reunió Romania Sèrbia Rússia Ruanda Aràbia Saudí - Illes Salomó + illes Salomó Seychelles Sudan Suècia @@ -1088,7 +1088,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Eswatini Swazilàndia Tristan da Cunha - Illes Turks i Caicos + illes Turks i Caicos Txad Terres Australs Antàrtiques Franceses Togo @@ -1107,7 +1107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tanzània Ucraïna Uganda - Illes Menors Allunyades dels Estats Units + illes Menors Allunyades dels Estats Units Nacions Unides ONU Estats Units @@ -1117,8 +1117,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ciutat del Vaticà Saint Vincent i les Grenadines Veneçuela - Illes Verges Britàniques - Illes Verges dels Estats Units + illes Verges Britàniques + illes Verges dels Estats Units Vietnam Vanuatu Wallis i Futuna @@ -1206,18 +1206,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordre ordre normalitzat ordre numèric + reordenació d’escriptures/blocs força de l’ordre moneda + destinació de transformació + exclusions de particions del diccionari presentació de l’emoji + primer dia de la setmana + mixt sistema horari (12 h o 24 h) + mètode d’entrada + teclat + màxim ignorat estil de salt de línia salt de línia entre paraules + regles de transformació sistema de mesures + unitat de mesura xifres + regió per a dades suplementàries + origen de transformació + subdivisió de regió pausa després de les abreviatures + transformació + traducció automàtica zona horària variant local ús privat + transformació d’ús privat calendari budista @@ -1237,13 +1253,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendari hebreu hebreu calendari hindú + nacional hindú calendari islàmic civil islàmic calendari civil islàmic civil islàmic + calendari islàmic, observació de la lluna a Aràbia Saudí + calendari islàmic (tabular, època astronòmica) calendari islàmic (Umm al-Qura) islàmic (Umm al-Qura) - calendari ISO-8601 + calendari gregorià (setmanes ISO 8601) + gregorià calendari japonès japonès calendari persa @@ -1259,8 +1279,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordena els accents de manera normal Ordena amb ordre invers dels accents Mostra primer les minúscules + minúscules Ordena per tipus de lletra normal + minúscules Ordena amb majúscules primer + majúscules Ordena sense distingir majúscules i minúscules Ordena amb detecció de majúscules i minúscules ordre anterior, per a compatibilitat @@ -1269,7 +1292,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ diccionari ordre Unicode predeterminat unicode predeterminat + emoji normes europees d’ordenació + normes europees ordre de la guia telefònica guia telefònica ordre fonètic @@ -1279,6 +1304,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cerca de propòsit general cerca cerca per consonant inicial del hangul + consonant inicial coreana ordre estàndard estàndard ordre dels traços @@ -1293,17 +1319,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordena per caràcters Unicode normalitzats Ordena els dígits individualment Ordena els dígits numèricament + moneda + dígits + puntuació + espai en blanc + símbol Ordena-ho tot + tot Ordena només les lletres de base + només lletres de base Ordena per accents/majúscules/amplada/kana + base, accents, cas, variants, kana Ordena els accents + base, accents Ordena per accent/majúscules/amplada + base, accents, cas, variants amplada completa amplada mitjana Numèric predeterminada emoji text + sistema de 12 hores + 12 + sistema de 24 hores + 24 sistema de 12 hores (0–11) 12 (0–11) sistema de 12 hores (1–12) @@ -1312,6 +1352,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) sistema de 24 hores (1–24) 24 (1–24) + espais de desplaçament, puntuació, tots els símbols + espais de desplaçament, puntuació + espais de desplaçament, puntuació + espais de desplaçament, puntuació, símbols no monetaris salt de línia flexible flexible salt de línia normal @@ -1332,8 +1376,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ EUA xifres indoaràbigues xifres indoaràbigues ampliades + indoaràbigues ampliades nombres armenis nombres armenis en minúscula + armenis en minúscula dígits balinesos dígits bengalins dígits chakma @@ -1341,54 +1387,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dígits devanagaris nombres etiòpics Numerals financers + financers dígits d’amplada completa + amplada completa nombres georgians nombres grecs nombres grecs en minúscula + grecs en minúscula dígits gujarati dígits gurmukhi + numeració del dia del mes en caràcters Han per als calendaris tradicionals nombres decimals xinesos + sistema decimal posicional que utilitza ideogrames numèrics xinesos com a dígits nombres xinesos simplificats nombres financers xinesos simplificats + financers xinesos simplificats nombres xinesos tradicionals nombres financers xinesos tradicionals + financers xinesos tradicionals nombres hebreus dígits javanesos nombres japonesos nombres financers japonesos + financers japonesos + numeració Gannen del primer any de la nova era imperial del Japó dígits kayah dígits khmer dígits kannada dígits tai tham hora dígits tai tham tham + Tai Tham Tham (eclesiàstic) dígits lao dígits aràbics dígits lepcha dígits limbu + dígits matemàtics en negreta + dígits matemàtics amb ratlla doble + dígits matemàtics de pal sec monoespaiats + dígits matemàtics de pal sec en negreta + dígits matemàtics de pal sec dígits malaiàlam dígits mongols dígits meitei mayek dígits de Myanmar + pwo de l’Est de Myanmar + pao de Myanmar dígits shan de Myanmar + shan de Myanmar + tai laing de Myanmar dígits natius + dígits natius dígits n’ko dígits ol chiki dígits oriya + delineats nombres romans + nombres romans en majúscula nombres romans en minúscula + nombres romans en minúscula dígits saurashtra + segmentats dígits sudanesos dígits tai lue nous nombres tamils tradicionals dígits tamils + nombres tamils moderns dígits telugu dígits tai dígits tibetans Numerals tradicionals + nombres tradicionals dígits vai desactivada activada + traducció automàtica no especificada + variant POSIX + + desactivada + activada + mètric RU @@ -1526,11 +1604,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - d/M/y + d/M/y yMd + + + - + + + dd-MM-r + + + + + + + - + + @@ -1713,6 +1806,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y–y G @@ -1976,6 +2073,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -2060,6 +2160,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'setmana' w 'del' Y 'setmana' w 'del' Y + + {0} {1} + {1}, {0} + y G – y G @@ -2145,6 +2249,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2194,7 +2302,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Abans de ROC - ROC @@ -2707,9 +2814,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ París - - Hora d’estiu britànica - Londres @@ -2718,6 +2822,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Scoresbysund + + Guadalupe + Atenes @@ -2728,9 +2835,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jaipur - - Hora estàndard d’Irlanda - Dublín @@ -2952,6 +3056,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hồ Chí Minh + + + Hora d’Acre + Hora estàndard d’Acre + Hora d’estiu d’Acre + + Hora de l’Afganistan @@ -3049,9 +3160,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de l’oest de l’Argentina - Hora estàndard de l’oest de l’Argentina - Hora d’estiu de l’oest de l’Argentina + Hora de l’Argentina occidental + Hora estàndard de l’Argentina occidental + Hora d’estiu de l’Argentina occidental @@ -3134,6 +3245,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora d’estiu de Brasília + + + Hora del Regne Unit + Hora d’estiu del Regne Unit + + Hora de Brunei Darussalam @@ -3215,7 +3332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Timor Oriental + Hora de Timor-Leste @@ -3327,23 +3444,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Groenlàndia - Hora estàndard de Groenlàndia - Hora d’estiu de Groenlàndia + Hora de Groenlàndia + Hora estàndard de Groenlàndia + Hora d’estiu de Groenlàndia - Hora de l’Est de Groenlàndia - Hora estàndard de l’Est de Groenlàndia - Hora d’estiu de l’Est de Groenlàndia + Hora de Groenlàndia oriental + Hora estàndard de Groenlàndia oriental + Hora d’estiu de Groenlàndia oriental - Hora de l’Oest de Groenlàndia - Hora estàndard de l’Oest de Groenlàndia - Hora d’estiu de l’Oest de Groenlàndia + Hora de Groenlàndia occidental + Hora estàndard de Groenlàndia occidental + Hora d’estiu de Groenlàndia occidental @@ -3358,7 +3475,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora estàndard de Hawaii-Aleutianes + Hora estàndard de Hawaii @@ -3404,12 +3521,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de l’est d’Indonèsia + Hora d’Indonèsia oriental - Hora de l’oest d’Indonèsia + Hora d’Indonèsia occidental @@ -3419,6 +3536,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora d’estiu de l’Iran + + + Hora d’Irlanda + Hora estàndard d’Irlanda + + Hora d’Irkutsk @@ -3442,9 +3565,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Kamtxatka - Hora estàndard de Petropavlovsk de Kamtxatka - Horari d’estiu de Petropavlovsk de Kamtxatka + Hora de Kamtxatka + Hora estàndard de Kamtxatka + Hora d’estiu de Kamtxatka @@ -3454,12 +3577,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de l’est del Kazakhstan + Hora del Kazakhstan oriental - Hora de l’oest del Kazakhstan + Hora del Kazakhstan occidental @@ -3498,13 +3621,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horari d’estiu de Lord Howe - - - Hora de Macau - Hora estàndard de Macau - Hora d’estiu de Macau - - Hora de Magadan @@ -3725,9 +3841,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Samoa Hora estàndard de Samoa - Hora d’estiu de Samoa @@ -3820,6 +3934,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora d’estiu de l’Uruguai + + + Hora d’Ürümchi + + Hora de l’Uzbekistan @@ -4343,10 +4462,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ iuan xinès extracontinental iuans xinesos extracontinentals - - dòlar del Banc Popular Xinès - dòlars del Banc Popular Xinès - iuan iuan @@ -5507,8 +5622,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ or de Zimbàbue - or de Zimbàbue - or de Zimbàbue dòlar zimbabuès (2009) @@ -5529,10 +5642,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} dia {0} de dies {0} dies - Agafa el {0}t a la dreta. Agafa el {0}r a la dreta. - Agafa el {0}è a la dreta. Agafa el {0}n a la dreta. + Agafa el {0}t a la dreta. + Agafa el {0}è a la dreta. La {0} és El {0} és @@ -5666,7 +5779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine - revolució + revolucions {0} revolució {0} revolucions @@ -5763,6 +5876,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine + ítems parts @@ -6057,25 +6171,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - gigahertz + gigahertzs {0} gigahertz {0} gigahertzs masculine - megahertz + megahertzs {0} megahertz {0} megahertzs masculine - quilohertz + quilohertzs {0} quilohertz {0} quilohertzs masculine - hertz + hertzs {0} hertz {0} hertzs @@ -6119,7 +6233,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} píxels - radi terrestre + radis terrestres {0} radi terrestre {0} radis terrestres @@ -6238,20 +6352,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine + luxs {0} lux {0} luxs feminine - candela + candeles {0} candela {0} candeles masculine - lumen + lúmens {0} lumen - {0} lumens + {0} lúmens {0} lluminositat solar @@ -6338,6 +6453,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ grans + {0} gra + {0} grans masculine @@ -6464,7 +6581,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - grau + graus {0} grau {0} graus @@ -6591,7 +6708,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} unces líquides mètriques - acre-peu + acres-peus {0} acre-peu {0} acres-peus @@ -6650,7 +6767,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} barrils - culleradeta de postres + culleradetes de postres {0} culleradeta de postres {0} culleradetes de postres @@ -6745,8 +6862,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine - {0} llums - {0} llums feminine @@ -7280,9 +7395,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - s. {0} s. @@ -7368,18 +7480,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ gr - {0} gr - {0} gr {0}kW {0}kW - - d‘Hg - {0} d‘Hg - {0} d‘Hg - {0} mbar {0} mbars @@ -7410,37 +7515,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt imp {0} qt imp - - {0} sr - {0} sr - - - {0} kat - {0} kat - - - {0} C - {0} C - - - {0} F - {0} F - - - cal-IT - - - {0} Bq - {0} Bq - - - {0} Sv - {0} Sv - - - {0} llums - {0} llums - ppb diff --git a/make/data/cldr/common/main/ca_ES_VALENCIA.xml b/make/data/cldr/common/main/ca_ES_VALENCIA.xml index d3b1f2428f9a..01e8b766dbde 100644 --- a/make/data/cldr/common/main/ca_ES_VALENCIA.xml +++ b/make/data/cldr/common/main/ca_ES_VALENCIA.xml @@ -194,11 +194,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic iuan xinés extracontinental iuan xinés extracontinental - - dòlar del Banc Popular Xinés - dòlar del Banc Popular Xinés - dòlars del Banc Popular Xinés - iuan xinés iuan xinés diff --git a/make/data/cldr/common/main/cad.xml b/make/data/cldr/common/main/cad.xml deleted file mode 100644 index 276783cec819..000000000000 --- a/make/data/cldr/common/main/cad.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - Caddo - - - United States - - - - [aáà {aː}{áː}{àː} b {ch} {chʼ} d eéè {eː}{éː}{èː} h iíì {iː}{íː}{ìː} k {kʼ} m n oóò {oː}{óː}{òː} p s t {tsʼ} {tʼ} uúù {uː}{úː}{ùː} w y ˀ ʼ] - [c f g j l q r v x z] - [A B {CH} D E H I K M N O P S {SH} T {TS} U W Y] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - EEEE, MMMM d, y G - - - - - MMMM d, y G - - - - - MMM d, y G - - - - - M/d/y GGGGG - GGGGGyMd - - - - - - - - - Cháykáhday Haˀimay - Tsahkápbiˀ - Wánit - Háshnihtiˀtiˀ - Háshnih Haˀimay - Háshnihtsiˀ - Násˀahˀatsus - Dahósikah nish - Híisikah nish - Nípbaatiˀtiˀ - Nípbaa Haˀimay - Cháykáhdaytiˀtiˀ - - - - - - - Inikuˀ - Wísts’i hayashuh - Bít hayashuh - Dahó hayashuh - Hiwí hayashuh - Dissik’an hayashuh - Inikuˀtiˀtiˀ - - - - - - - EEEE, MMMM d, y - - - - - MMMM d, y - - - - - MMM d, y - - - - - M/d/yy - yyMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - $ - - - - - - - Nish - Nish {0} - - - Wísts’iˀ inikuˀ - Wísts’iˀ inikuˀ {0} - - - Kaˀisch’áyˀah - {0} Kaˀisch’áyˀah - - - - diff --git a/make/data/cldr/common/main/cad_US.xml b/make/data/cldr/common/main/cad_US.xml deleted file mode 100644 index 95714affbd7a..000000000000 --- a/make/data/cldr/common/main/cad_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/cch.xml b/make/data/cldr/common/main/cch.xml deleted file mode 100644 index 951d5b275368..000000000000 --- a/make/data/cldr/common/main/cch.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - Atsam - - - - [a{a̱} b c {ch} d {dy} e f g{g̱} {gb} {gw} {gy} h {hy} i j kḵ {kp} {kw} l {ly} m nṉ {ny} o p {ph} {py} r {ry} s {sh} t u v w {wh} y{y̱} z ʼ] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ʼ] - - - - - - - - EEEE, G y MMMM dd - GyMMMMEEEEdd - - - - - G y MMMM d - - - - - G y MMM d - - - - - GGGGG yy/MM/dd - GGGGGyyMMdd - - - - - - - - - Dyon - Baa - Atat - Anas - Atyo - Achi - Atar - Awur - Shad - Shak - Naba - Nata - - - Pen Dyon - Pen Baʼa - Pen Atat - Pen Anas - Pen Atyon - Pen Achirim - Pen Atariba - Pen Awurr - Pen Shadon - Pen Shakur - Pen Kur Naba - Pen Kur Natat - - - - - - - Yok - Tung - Gitung - Tsan - Nas - Nat - Chir - - - Wai Yoka Bawai - Wai Tunga - Toki Gitung - Tsam Kasuwa - Wai Na Nas - Wai Na Tiyon - Wai Na Chirim - - - - - - Gabanin Miladi - Miladi - - - GM - M - - - - - - EEEE, y MMMM dd - yMMMMEEEEdd - - - - - y MMMM d - - - - - y MMM d - - - - - yy/MM/dd - yyMMdd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - - - - Aman - ₦ - - - - diff --git a/make/data/cldr/common/main/cch_NG.xml b/make/data/cldr/common/main/cch_NG.xml deleted file mode 100644 index e2476701f33e..000000000000 --- a/make/data/cldr/common/main/cch_NG.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ccp.xml b/make/data/cldr/common/main/ccp.xml index 77c895337f95..e3a057511dae 100644 --- a/make/data/cldr/common/main/ccp.xml +++ b/make/data/cldr/common/main/ccp.xml @@ -1058,6 +1058,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄛𑄪𑄢𑄮𑄃𑄮𑄏𑄢𑄴 𑄃𑄧𑄖𑄴𑄘𑄬𑄇𑄴 𑄃𑄮𑄏𑄢𑄴 𑄚𑄘𑄝𑄝𑄧𑄖𑄳𑄠 + 𑄷𑄸 𑄊𑄧𑄚𑄴𑄑𑄢𑄴 𑄦𑄨𑄏𑄬𑄛𑄴 + 𑄸𑄺 𑄊𑄧𑄚𑄴𑄑𑄢𑄴 𑄦𑄨𑄏𑄬𑄛𑄴 𑄷𑄸 𑄊𑄧𑄚𑄴𑄑𑄢𑄴 𑄦𑄨𑄏𑄬𑄛𑄴 (𑄶-𑄷𑄷) 𑄷𑄸 𑄊𑄧𑄚𑄴𑄑𑄢𑄴 𑄦𑄨𑄏𑄬𑄛𑄴 (𑄷-𑄷𑄸) 𑄸𑄺 𑄊𑄧𑄚𑄴𑄑𑄢𑄴 𑄦𑄨𑄏𑄬𑄛𑄴 (𑄷-𑄸𑄹) @@ -1517,6 +1519,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y 𑄃𑄬𑄢𑄴 𑄖𑄧𑄟𑄴 𑄥𑄛𑄴𑄖 w + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} M–M @@ -2397,9 +2404,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄣𑄨𑄝𑄳𑄢𑄪𑄞𑄨𑄣𑄴 - - 𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄉𑄧𑄢𑄧𑄟𑄧 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄣𑄧𑄚𑄴𑄓𑄧𑄚𑄴 @@ -2490,9 +2494,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄎𑄧𑄠𑄛𑄪𑄢 - - 𑄃𑄭𑄢𑄨𑄌𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄓𑄛𑄴𑄣𑄨𑄚𑄴 @@ -3215,13 +3216,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄃𑄣𑄌𑄴𑄇 𑄘𑄨𑄚𑄮𑄃𑄣𑄮 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄃𑄣𑄴𑄟𑄑𑄨 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄣𑄴𑄟𑄑𑄨 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄣𑄴𑄟𑄑𑄨 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄃𑄳𑄠𑄟𑄎𑄧𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3271,20 +3265,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄃𑄧𑄛𑄨𑄠 𑄘𑄨𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄃𑄇𑄴𑄑𑄃𑄮 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄇𑄴𑄑𑄃𑄮 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄇𑄴𑄑𑄃𑄮 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - - - 𑄃𑄇𑄴𑄑𑄮𑄝𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄇𑄴𑄑𑄮𑄝𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄃𑄇𑄴𑄑𑄮𑄝𑄴 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄃𑄢𑄧𑄝𑄨 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3379,6 +3359,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄝𑄳𑄢𑄥𑄨𑄣𑄨𑄠 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 + + + 𑄝𑄳𑄢𑄨𑄑𑄨𑄌𑄴 𑄉𑄧𑄢𑄧𑄟𑄧 𑄃𑄧𑄇𑄴𑄖𑄧 + + 𑄝𑄳𑄢𑄪𑄚𑄬𑄭 𑄘𑄢𑄪𑄌𑄴𑄥𑄣𑄟𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3566,11 +3551,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄛𑄧𑄏𑄨𑄟𑄬𑄘𑄨 𑄉𑄳𑄢𑄨𑄚𑄴𑄣𑄳𑄠𑄚𑄴𑄓𑄴 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄉𑄪𑄠𑄟𑄴 𑄟𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄃𑄪𑄛𑄧𑄥𑄉𑄧𑄢𑄨𑄠𑄧 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3647,6 +3627,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄃𑄨𑄢𑄚𑄴 𑄘𑄨𑄚𑄬𑄃𑄣𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 + + + 𑄃𑄭𑄢𑄨𑄌𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 + + 𑄃𑄨𑄢𑄴𑄖𑄪𑄑𑄴𑄥𑄴𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3709,11 +3694,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄇𑄨𑄢𑄴𑄉𑄨𑄥𑄴𑄖𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄣𑄧𑄁𑄇 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄣𑄭𑄚𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3726,13 +3706,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄣𑄧𑄢𑄴𑄓𑄴 𑄦𑄤𑄬 𑄘𑄨𑄚𑄮𑄃𑄣𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄟𑄇𑄃𑄮 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄟𑄇𑄃𑄮 𑄟𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄟𑄇𑄃𑄮 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄟𑄳𑄠𑄉𑄓𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3848,11 +3821,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄜𑄢𑄴𑄚𑄚𑄴𑄘𑄮𑄓𑄨 𑄚𑄮𑄢𑄮𑄚𑄴𑄦 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄅𑄪𑄖𑄴𑄖𑄮𑄢𑄴 𑄟𑄬𑄢𑄨𑄚𑄴 𑄉𑄭 𑄉𑄭 𑄞𑄨𑄘𑄬𑄉𑄪𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄚𑄮𑄞𑄮𑄥𑄨𑄝𑄨𑄢𑄴𑄥𑄴𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3932,13 +3900,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𑄛𑄨𑄠𑄧𑄁 𑄃𑄨𑄠𑄁 𑄃𑄧𑄇𑄴𑄖𑄧 - - - 𑄇𑄨𑄎𑄨𑄣𑄮𑄢𑄴𑄓 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄇𑄨𑄎𑄨𑄣𑄮𑄢𑄴𑄓 𑄟𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄇𑄨𑄎𑄨𑄣𑄮𑄢𑄴𑄓 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - - 𑄢𑄨𑄃𑄨𑄃𑄪𑄚𑄨𑄠𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 @@ -3965,9 +3926,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 𑄥𑄟𑄮𑄠 𑄃𑄧𑄇𑄴𑄖𑄧 𑄥𑄟𑄮𑄠 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 - 𑄥𑄟𑄮𑄠 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧 diff --git a/make/data/cldr/common/main/ce.xml b/make/data/cldr/common/main/ce.xml index 35f0ef420b19..ed61d334eebc 100644 --- a/make/data/cldr/common/main/ce.xml +++ b/make/data/cldr/common/main/ce.xml @@ -1719,9 +1719,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Либревиль - - Британин, аьхкенан хан - Лондон @@ -1812,9 +1809,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Джайпур - - Ирланди, аьхкенан хан - Дублин @@ -2676,6 +2670,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Бразили, аьхкенан хан + + + Британин, аьхкенан хан + + Бруней-Даруссалам @@ -2936,6 +2935,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ГӀажарийчоь, аьхкенан хан + + + Ирланди, аьхкенан хан + + Иркутск @@ -3216,9 +3220,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Самоа Самоа, стандартан хан - Самоа, аьхкенан хан diff --git a/make/data/cldr/common/main/ceb.xml b/make/data/cldr/common/main/ceb.xml index 593ce4686186..3bde7c0d2e0d 100644 --- a/make/data/cldr/common/main/ceb.xml +++ b/make/data/cldr/common/main/ceb.xml @@ -31,8 +31,6 @@ the LDML specification (http://unicode.org/reports/tr35/) Spanish (Europe) Spanish (Mexico) French - French (Canada) - French (Switzerland) Hindi Hinglish Indonesian @@ -43,6 +41,7 @@ the LDML specification (http://unicode.org/reports/tr35/) Flemish Polish Portuguese + Portuguese (Europe) Russian Thai Turkish @@ -387,7 +386,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Gregorian nga Kalendaryo Gregorian - Gregorian nga Kalendaryo (Tuig Una) + Gregorian nga Kalendaryo (pag-ihap sa mga semana sumala sa ISO 8601) + Gregorian Standard nga Paagi sa Paghan-ay Standard Mga Western Digit @@ -482,6 +482,10 @@ the LDML specification (http://unicode.org/reports/tr35/) QQQQ y G + + {0}–{1} + {0}–{1} + d – d @@ -490,21 +494,21 @@ the LDML specification (http://unicode.org/reports/tr35/) y – y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y G – M/y G + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G M/d/y – M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y G – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G MMM y G – MMM y G @@ -544,21 +548,24 @@ the LDML specification (http://unicode.org/reports/tr35/) E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y – y G - M/y – M/y GGGGG + M/y – M/y G M/y – M/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y – M/d/y G M/d/y – M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G E, M/d/y – E, M/d/y GGGGG @@ -629,20 +636,6 @@ the LDML specification (http://unicode.org/reports/tr35/) N D - - Enero - Pebrero - Marso - Abril - Mayo - Hunyo - Hulyo - Agosto - Septiyembre - Oktubre - Nobyembre - Disyembre - @@ -693,14 +686,6 @@ the LDML specification (http://unicode.org/reports/tr35/) ika-4 nga quarter - - - ika-1 nga quarter - ika-2 nga quarter - ika-3 nga quarter - ika-4 nga quarter - - @@ -774,6 +759,9 @@ the LDML specification (http://unicode.org/reports/tr35/) + + / + {1}, {0} @@ -805,10 +793,14 @@ the LDML specification (http://unicode.org/reports/tr35/) E h:mm a E h:mm:ss a y G + M/y G M/d/y G MMM y G MMM d, y G E, MMM d, y G + MMMM y G + MMMM d, y G + E, MMMM d, y G h:mm a h:mm:ss a h:mm:ss a v @@ -816,6 +808,7 @@ the LDML specification (http://unicode.org/reports/tr35/) M/d E, M/d E, MMM d + E, MMMM d 'semana' W 'sa' MMMM 'semana' W 'sa' MMMM M/y @@ -825,12 +818,22 @@ the LDML specification (http://unicode.org/reports/tr35/) MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'semana' w 'sa' Y 'semana' w 'sa' Y + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + d – d @@ -921,6 +924,9 @@ the LDML specification (http://unicode.org/reports/tr35/) E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y – y @@ -989,9 +995,6 @@ the LDML specification (http://unicode.org/reports/tr35/) sunod nga semana sa semana sa {0} - - sa semana sa {0} - sa seman sa {0} @@ -1045,19 +1048,16 @@ the LDML specification (http://unicode.org/reports/tr35/) Wala Mailhing Lokasyon - - - British Summer Time - - - - - Irish Standard Time - - Ho Chi Minh City + + + Acre Time + Acre Standard Time + Acre Summer Time + + Oras sa Afghanistan @@ -1075,7 +1075,7 @@ the LDML specification (http://unicode.org/reports/tr35/) - South Africa Standard Time + Standard nga Oras sa South Africa @@ -1205,8 +1205,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Azores - Azores Standard Time - Azores Summer Time + Standard nga Oras sa Azores + Oras sa Ting-init sa Azores @@ -1233,6 +1233,12 @@ the LDML specification (http://unicode.org/reports/tr35/) Brasilia Summer Time + + + Oras sa Britanya + Oras sa Ting-init sa Britanya + + Oras sa Brunei Darussalam @@ -1267,8 +1273,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa China - China Standard Time - China Daylight Time + Standard nga Oras sa China + Daylight Time sa China @@ -1332,15 +1338,15 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Central Europe - Central European Standard Time - Central European Summer Time + Standard nga Oras sa Central Europe + Oras sa Ting-init sa Central Europe Oras sa Eastern Europe - Eastern European Standard Time - Eastern European Summer Time + Standard nga Oras sa Eastern Europe + Oras sa Ting-init sa Eastern Europe @@ -1351,8 +1357,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Western Europe - Western European Standard Time - Western European Summer Time + Standard nga Oras sa Western Europe + Oras sa Ting-init sa Western Europe @@ -1406,6 +1412,13 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Greenwich Mean + + + Greenland Time + Greenland Standard Time + Greenland Summer Time + + Oras sa East Greenland @@ -1432,28 +1445,28 @@ the LDML specification (http://unicode.org/reports/tr35/) - Hawaii-Aleutian Standard Time + Oras sa Hawaii Oras sa Hawaii-Aleutian - Hawaii-Aleutian Standard Time + Standard nga Oras saHawaii-Aleutian Hawaii-Aleutian Daylight Time Oras sa Hong Kong - Hong Kong Standard Time - Hong Kong Summer Time + Standard nga Oras sa Hong Kong + Oras sa Ting-init sa Hong Kong Oras sa Hovd - Khovd Standard Time - Khovd Summer Time + Standard nga Oras sa Khovd + Oras sa Ting-init sa Khovd @@ -1493,6 +1506,12 @@ the LDML specification (http://unicode.org/reports/tr35/) Iran Daylight Time + + + Oras sa Ireland + Standard nga Oras sa Ireland + + Oras sa Irkutsk @@ -1510,8 +1529,15 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Japan - Japan Standard Time - Japan Daylight Time + Standard nga Oras sa Japan + Daylight Time sa Japan + + + + + Kamchatka Time + Kamchatka Standard Time + Kamchatka Summer Time @@ -1532,8 +1558,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Korea - Korean Standard Time - Korean Daylight Time + Standard nga Oras sa Korea + Daylight Time sa Korea @@ -1614,8 +1640,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Ulaanbaatar - Ulaanbaatar Standard Time - Ulaanbaatar Summer Time + Standard nga Oras sa Ulaanbaatar + Oras sa Ting-init sa Ulaanbaatar @@ -1776,11 +1802,16 @@ the LDML specification (http://unicode.org/reports/tr35/) Sakhalin Summer Time + + + Samara Time + Samara Standard Time + Samara Summer Time + + - Oras sa Samoa American Samoa Standard Time - American Samoa Daylight Time @@ -1821,8 +1852,8 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Taiwan - Taiwan Standard Time - Taiwan Daylight Time + Standard nga Oras sa Taiwan + Daylight Time sa Taiwan @@ -1847,6 +1878,13 @@ the LDML specification (http://unicode.org/reports/tr35/) Oras sa Chuuk + + + Oras sa Türkiye + Standard nga Oras sa Türkiye + Oras sa Ting-init sa Türkiye + + Oras sa Turkmenistan @@ -1866,6 +1904,11 @@ the LDML specification (http://unicode.org/reports/tr35/) Uruguay Summer Time + + + Oras sa Ürümqi + + Oras sa Uzbekistan @@ -2040,7 +2083,7 @@ the LDML specification (http://unicode.org/reports/tr35/) {0} {1} - {1} {0} + {0} {1} @@ -2806,8 +2849,6 @@ the LDML specification (http://unicode.org/reports/tr35/) Carribean guilder - Carribean guilder - Carribean guilder West African CFA Franc @@ -2841,8 +2882,6 @@ the LDML specification (http://unicode.org/reports/tr35/) Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold diff --git a/make/data/cldr/common/main/cho.xml b/make/data/cldr/common/main/cho.xml deleted file mode 100644 index 303aba29f816..000000000000 --- a/make/data/cldr/common/main/cho.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - Chahta - English - - - - - - United States - - - Anumpa: {0} - - - - [a{a̱} b {ch} e f h {hl} i{i̱} k l m n o{o̱} p s {sh} t u v ʋ w y] - [cč d g j q r š x z] - [A{A̱} B {CH} E F H {HL} I{I̱} K L M N O{O̱} P S {SH} T U V Ʋ W Z] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - diff --git a/make/data/cldr/common/main/cho_US.xml b/make/data/cldr/common/main/cho_US.xml deleted file mode 100644 index ab7567d874b4..000000000000 --- a/make/data/cldr/common/main/cho_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/chr.xml b/make/data/cldr/common/main/chr.xml index 829b2b88a00a..edbcc0d06805 100644 --- a/make/data/cldr/common/main/chr.xml +++ b/make/data/cldr/common/main/chr.xml @@ -334,6 +334,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎾᎩᎵᎠᏂ ᏈᏥᏂ ᏈᏥᎾ ᏉᎵᏍ + ᏈᏕᎼᏖᏎ ᎹᎵᏏᏘ-ᏇᏌᎹᏉᏗ ᏡᏏᎠᏂ ᏆᏍᏙ @@ -525,7 +526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -657,6 +658,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎦᎸᏥᏱ ᎦᏉᏂ ᎩᎵᏏᏲ + UK ᏋᎾᏓ ᏣᎠᏥᎢ ᎠᏂᎦᎸᏥ ᎩᎠ @@ -674,7 +676,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏆᎻ ᎩᎢᏂ-ᏈᏌᎤᏫ ᎦᏯᎾ - ᎰᏂᎩ ᎪᏂᎩ ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ ᏓᎶᏂᎨᏍᏛ + ᎰᏂᎩ ᎪᏂᎩ SAR ᏓᎶᏂᎨᏍᏛ ᎰᏂᎩ ᎪᏂᎩ ᎲᏗ ᎤᎦᏚᏛᎢ ᎠᎴ ᎺᎩᏓᎾᎵᏗ ᏚᎦᏚᏛᎢ ᎭᏂᏚᎳᏍ @@ -688,6 +690,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᏍᏗ ᎤᎦᏚᏛᎢ ᎾᎿ ᎠᏍᎦᏯ ᎢᏅᏗᎾ ᏈᏗᏏ ᏴᏫᏯ ᎠᎺᏉ ᎢᎬᎾᏕᏅ + ᏣᎪᏍ ᎠᎩᏇᎳᎪ ᎢᎳᎩ ᎢᎴᏂ ᏧᏁᏍᏓᎸᎯ @@ -729,7 +732,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎹᎵ ᎹᏯᎹᎵ (ᏇᎵᎹ) ᎹᏂᎪᎵᎠ - ᎹᎧᎣ (ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ) ᏣᎢ + ᎹᎧᎣ SAR ᏓᎶᏂᎨᏍᏛ ᎹᎧᎣ ᏧᏴᏢ ᏗᏜ ᎹᎵᎠᎾ ᏚᎦᏚᏛᎢ ᎹᏘᏂᎨ @@ -784,7 +787,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏑᏕᏂ ᏍᏫᏕᏂ ᏏᏂᎦᏉᎵ - ᎤᏓᏅᏘ ᎮᎵᎾ + ᎤᏓᏅᏘ ᎮᎵᎾ, ᎠᏍᏏᎣᏂ & ᏘᏍᏔᏂ Ꮣ ᎫᎭ ᏍᎶᏫᏂᎠ ᏍᏩᎵᏆᎵᏗ ᎠᎴ ᏤᏂ ᎹᏰᏂ ᏍᎶᏩᎩᎠ @@ -813,7 +816,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏛᎵᎩᎺᏂᏍᏔᏂ ᏚᏂᏏᏍᎠ ᏙᎾᎦ - ᎬᏃ + ᏘᎩᏰ ᎬᎩᏰ ᏟᏂᏕᏗ ᎠᎴ ᏙᏆᎪ ᏚᏩᎷ @@ -849,15 +852,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏅᏙ ᏗᏎᏍᏗ ᎠᏕᎳ ᏱᎬᏁᎸᎯ + ᎠᏓᎦᏎᏍᏙᏗ ᏂᎨᏒᎾ ᎪᏪᎸ ᏗᏟᎶᏍᏔᏅ ᎤᎾᏙᏢᏗ + ᎠᏨᏍᏙᏗ ᎬᏁᏗ ᎧᏁᎢᏍᏗ ᎤᎾᏙᏢᏗ + ᎤᏔᎾ/ᎤᏍᏗ ᏗᎪᏪᎳᏅᎢ + ᏗᎪᏪᎳᏅᎢ ᎢᏳᏍᏗ ᎬᏗ ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ + ᎤᏓᏙᏢᏅᎯ ᏄᎶᏒᏍᏔᏅ + ᏗᏎᏍᏗ ᎤᏓᏙᏢᏅᎯ + ᎪᏪᎸ/ᏅᎩ ᏧᏅᏏᏱ ᏏᏊ ᎤᏓᏙᏢᏅᎯ + ᏄᎵᏂᎬᎬ ᎤᏓᏙᏢᏅᎯ ᎠᏕᎳ + ᏭᎦᏛᎢ ᎠᏁᏟᏴᏛ + ᎧᏃᎮᏓ ᎦᏛᎬᎢ ᏗᎪᏪᎵ ᎤᏜᏅᏛ ᏗᎦᏘᎴᎬ ᎢᎼᏥ ᏓᎾᏓᏁᎲᎢ + ᎢᎬᏱ ᎢᎦ ᎾᎿ ᏒᎾᏙᏓᏆᏍᏗ + ᎦᏟᏌᏅ ᏑᏟᎶᏓ ᎠᏓᏁᏟᏴᏎᎬ (12 vs 24) - ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ + ᎪᏣᎵᏗᏱ ᎬᏗ + ᏗᏐᏅᏍᏙᏗ + ᎦᎸᎳᏗ ᎠᏓᎦᏎᏍᏙᏗ ᏂᎨᏒᎾ + CJK ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ ᎠᏍᏓᏅᏅ ᎠᏍᏆᎵᏍᏗ ᎪᏪᎵ + ᎠᏁᏟᏴᏛ ᏗᎧᎿᏩᏛᏍᏗ ᎠᏟᎶᏛ ᏄᏍᏗᏓᏅᎢ + ᏗᏟᎶᏛ ᏗᏎᏍᏗ ᏗᏎᏍᏗ + ᎢᎬᎾᏕᎾ ᎤᏤᎵᏛ ᎾᎯᏳ ᎢᎪᎯ + ᎠᏁᏟᏴᏛ ᎠᎴᏅᏗᏍᎬ + ᎢᎬᎾᏕᎾ ᎢᎦᏓ ᏗᏒᏍᏙᏗ ᎠᏍᏆᎵᏍᏗ ᎠᏂᏬ + ᎠᏁᏟᏴᏛ + ᎪᏢᏅᏙᏗ ᎠᏁᏢᏔᏅᎯ + ᎠᎵᎢᎵᏒ ᎢᎬᎾᏕᎾ + ᎦᏬᏂᎯᏍᏗ ᎢᎬᎾᏕᎾ ᎠᏁᏟᏴᏍᏗ + ᎤᏤᎵᏓ-ᎬᏗ + ᎤᏤᎵᏓ-ᎬᏗ ᎠᏁᏟᏴᏛ ᏊᏗᏍᏘ ᏅᏙ ᏗᏎᏍᏗ @@ -876,13 +905,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎩᎴᎪᎵᎠᏂ ᎠᏂᏈᎷ ᏅᏙ ᏗᏎᏍᏗ ᎠᏂᏈᎷ + ᎢᏂᏗᎠ ᎠᏰᎵ ᎢᏍᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ ᎢᏌᎳᎻᎩ ᎢᏌᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ (ᏴᏫ ᎡᏆᎩ) ᎢᏌᎳᎻᎩ (ᏴᏫ ᎡᏆᎩ) + ᎢᏌᎳᎻᎩ, ᏌᏗ ᎠᎳᏈᎠ ᎠᎪᏩᏘᎭ + ᎢᏌᎳᎻᎩ (ᏅᏯ, ᏃᏈᏏ ᎢᏳᏍᏗ) ᎢᏌᎳᎻᎩ ᏅᏙ ᏗᏎᏍᏗ (ᎥᎻ ᎠᎵ-ᏊᎳ) ᎢᏌᎳᎻᎩ (ᎥᎻ ᎠᎵ-ᏊᎳ) - ISO-8601 ᏅᏙ ᏗᏎᏍᏗ + ᎩᎴᎪᎵᎠᏂ ᏅᏙ ᏗᏎᏍᏗ (ISO 8601) + ᎩᎴᎪᎵᎠᏂ ᏣᏆᏂᏏ ᏅᏙ ᏗᏎᏍᏗ ᏣᏆᏂᏏ ᏇᏏᎠᏂ ᏅᏙ ᏗᏎᏍᏗ @@ -893,23 +926,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎠᏕᎳ ᏗᏎᎯᎯ ᎠᏟᎶᏍᏗ ᎠᏕᎳ ᏱᎬᏁᎸᎯ ᎠᏟᎶᏍᏗ + ᎤᏍᏗ ᏗᎪᏪᎳᏅᎢ + ᎤᏍᏗ ᏗᎪᏪᎳᏅᎢ + ᎤᏔᎾ ᏗᎪᏪᎳᏅᎢ + ᎢᏧᎳᎭᏍ + ᎧᏃᎮᏓ ᎦᏛᎬᎢ ᏗᎪᏪᎵ ᎠᏓᏁᏟᏴᏗᏍᎩ Unicode ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ ᎠᏓᏁᏟᏴᏗᏍᎩ Unicode + ᎢᎼᏥ + ᏳᎳᏈ ᏗᎧᎿᏩᏛᏍᏗ + ᏗᏟᏃᎮᏗ ᏗᏎᏍᏗ ᏗᎪᏪᎵ + ᎠᏂᏲᏁᏓ ᏧᏲᎱᏒ + ᏓᏃᏂᎨᏍᏛ ᎪᏪᎸ ᏂᎦᎥ-ᎢᏳᏱᎸᏗ ᎠᏱᏍᏗ ᎠᏱᏍᏗ + ᎪᎵᎳ ᎠᎬᏱ ᎪᏪᎸ ᎠᏟᎶᏍᏗ ᏗᎦᏅᏃᏙᏗ ᏕᎦᏅᏃᏛᎢ ᎠᏟᎶᏍᏗ + ᎪᏪᎸ ᎠᏍᏓᏅᏅ + ᎧᏃᎮᎸᎯ + ᏍᎦᏍᏗ ᎪᏪᎸ ᎠᏍᏓᏅᏅ + ᏑᏱᏂ + ᎠᏕᎳ + ᏗᏎᏍᏗ + ᎣᏂ ᎪᏪᎸ ᎠᏓᏓᎸ + ᎤᏁᎦ ᎢᎬᎾᏕᎾ + ᎪᏪᎸ ᏗᏟᎶᏍᏔᏅ + ᏂᎦᏓ + ᎦᏬᎯᏂᏍᏗ ᎪᏪᎸ ᎤᏩᏌ + ᏄᎶᏒᏍᏛᎾ, ᎬᏁᏗ ᎧᏁᎢᏍᏗ, ᎪᏪᎸ ᏂᎬᎢ, ᏄᏓᎴ, ᎧᎾ + ᏄᎶᏒᏍᏛᎾ, ᎬᏁᏗ ᎧᏁᎢᏍᏗ + ᏄᎶᏒᏍᏛᎾ, ᎬᏁᏗ ᎧᏁᎢᏍᏗ, ᎪᏪᎸ ᏂᎬᎢ, ᏄᏓᎴ + ᎾᎿ ᎧᎵᎢ + ᎾᎿ ᎠᏰᏟ ᎠᏓᏁᏟᏴᏗᏍᎩ ᎢᎼᏥ ᏕᎪᏪᎸ - 12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0–11) + 12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ + 12 + 24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ + 24 + 12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0 - 11) 12 (0–11) - 12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1–12) + 12 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1 - 12) 12 (1–12) - 24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0–23) - 24 (0–23) - 24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1–24) + 24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (0 -23) + 24 (0 - 23) + 24 ᎢᏳᏟᎶᏓ ᏄᏍᏗᏓᏅᎢ (1 - 24) 24 (1–24) + ᎤᏜᏅᏛ, ᎣᏂ ᎪᏪᎸ ᎠᏓᏓᎸ, ᏂᎦᏓ ᎪᏪᎸ ᏗᏟᎶᏍᏔᏅ + ᎤᏜᏅᏛ, ᎣᏂ ᎪᏪᎸ ᎠᏓᏓᎸ + ᎤᏜᏅᏛ, ᎣᏂ ᎪᏪᎸ ᎠᏓᏓᎸ + ᎤᏜᏅᏛ, ᎣᏂ ᎪᏪᎸ ᎠᏓᏓᎸ, Ꮭ ᎠᏕᎳ ᎪᏪᎸ ᏗᏟᎶᏍᏔᏅ ᏱᎩ ᏩᎾᎢ ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ ᏩᎾᎢ ᎠᏍᏓᏅᏅ ᏱᎬᏍᏗᎭᏊ ᎠᏍᏓᏅᏅ ᎠᏲᏍᏔᏅᎩ ᏂᏚᏍᏛ @@ -920,6 +988,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎠᏍᏆᏂᎪᏙᏗ ᏂᎦᏓ ᏱᎬᏍᏗᎭᏊ ᎠᏍᏆᏂᎪᏙᏗ ᎾᎿ ᎪᏪᎵ + US BGN ᎪᏪᎳ ᏧᏃᏴᎬ ᎤᏩᏌ + UN GEGN ᎪᏪᎳ ᏧᏃᏴᎬ ᎤᏩᏌ ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏄᏍᏗᏓᏅᎢ ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎠᏟᎶᏛ ᏄᏍᏗᏓᏅᎢ @@ -928,47 +998,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic US ᎠᎳᏈ-ᎡᏂᏗᎩ ᏗᏎᏍᏗ ᎦᏅᎯᏛ ᎠᎳᏈ-ᎡᏂᏗᎩ ᏗᏎᏍᏗ + ᎦᏅᎯᏛ ᎠᎳᏈ-ᎡᏂᏗᎩ ᎠᎳᎻᎠᏂ ᏗᏎᏍᏗ ᎠᎳᎻᎠᏂ ᏧᏍᏗ ᏗᎪᏪᎵ ᏗᏎᏍᏗ + ᎠᎳᎻᎠᏂ ᏧᏍᏗ ᏗᎪᏪᎵ ᏇᏂᎦᎳ ᏗᏎᏍᏗ ᏣᎩᎹ ᏗᏎᏍᏗ ᏕᏫᎾᎦᎵ ᏗᏎᏍᏗ ᎢᏗᏯᏈᎩ ᏗᏎᏍᏗ + ᎠᏕᎳ ᎧᎵᎢ-ᎾᏯᏛᏒ ᏗᏎᏍᏗ + ᎧᎵᎢ-ᎾᏯᏛᏒ ᎩᎴᎪᎵᎠᏂ ᏗᏎᏍᏗ ᎠᏂᎪᎢ ᏗᏎᏍᏗ ᎠᏂᎪᎢ ᏧᏍᏗ ᏗᎪᏪᎵ ᏗᏎᏍᏗ + ᎠᏂᎪᎢ ᏧᏍᏗ ᏗᎪᏪᎵ ᎫᏣᎳᏘ ᏗᏎᏍᏗ ᎬᎹᎩ ᏗᏎᏍᏗ + ᎭᏂ-ᎪᏪᎸ ᎢᎦ-ᎾᎿ-ᎧᎸᎢ ᎠᏎᏍᏗ ᎾᏍᎩ ᏄᎵᎶᏍᏔᏅ ᏅᏓ ᏗᏎᏍᏗ ᏓᎶᏂᎨ ᏕᏏᎹᎵ ᏗᏎᏍᏗ + ᎠᏓᏓᏅ ᎬᏗ ᏓᎶᏂᎨᏒ ᎠᏎᏍᏗ ᏗᎵᎶᏍᏔᏅ ᎠᎯᏗᎨ ᏓᎶᏂᎨ ᏗᏎᏍᏗ ᎠᎯᏗᎨ ᏓᎶᏂᎨ ᎠᏕᎳ ᏗᏎᏍᏗ + ᎠᎯᏗᎨ ᏓᎶᏂᎨ ᎠᏕᎳ ᎤᏦᏍᏗ ᏓᎶᏂᎨ ᏗᏎᏍᏗ ᎤᏦᏍᏗ ᏓᎶᏂᎨ ᎠᏕᎳ ᏗᏎᏍᏗ + ᎤᏦᏍᏗ ᏓᎶᏂᎨ ᎠᏕᎳ ᎠᏂᏈᎷ ᏗᏎᏍᏗ ᏣᏩᏂᏎ ᏗᏎᏍᏗ ᏣᏆᏂᏏ ᏗᏎᏍᏗ ᏣᏆᏂᏏ ᎠᏕᎳ ᏗᏎᏍᏗ + ᏣᏆᏂᏏ ᎠᏕᎳ + ᏣᏆᏂᏏ ᎢᎬᏱ-ᎤᏕᏘᏴᏓ ᎦᏁᏂ ᏗᏎᏍᏗ ᎬᏗ ᎩᎻᎷ ᏗᏎᏍᏗ ᎧᎾᏓ ᏗᏎᏍᏗ + ᏔᏱ ᏝᎻ ᏝᎻ ᎳᎣ ᏗᏎᏍᏗ ᏭᏗᎵᎬ ᏗᏜ ᏗᏎᏍᏗ + ᏗᏎᏍᏗ ᎦᎨᏓ + ᏗᏎᏍᏗ ᏔᎵᏊ ᎠᏓᏓᏅ + ᏗᏎᏍᏗ ᏌᏊᏱ ᎤᏜᏅᏛ + ᏗᏎᏍᏗ Ꮭ ᎠᏓᏓᏅ ᎦᎨᏓ ᎪᏪᎸ + ᏗᏎᏍᏗ Ꮭ ᎠᏓᏓᏅ ᎪᏪᎸ ᎹᎳᏯᎳᎻ ᏗᏎᏍᏗ ᎻᏖ ᎹᏰᎩ ᏗᏎᏍᏗ ᎹᏯᎹᎵ ᏗᏎᏍᏗ + ᎻᏯᏂᎹᎵ ᏗᎧᎸᎬ ᏗᏢ ᏉᎧᎴᏂ + ᎻᏯᏂᎹᎵ ᏆᎣ + ᎻᏯᏂᎹᎵ ᏌᎾ + ᎻᏯᏂᎹᎵ ᏔᏱ ᎳᏂᎩ + ᎠᏁᎯᏯ ᏗᏎᏍᏗ + ᎠᏁᎯᏯ ᏗᏎᏍᏗ ᎣᎵ ᏥᎩ ᏗᏎᏍᏗ ᎣᏗᎠ ᏗᏎᏍᏗ + ᏙᏱ ᎠᏍᏓᏓᏅ ᎠᏂᎶᎻ ᏗᏎᏍᏗ + ᎠᏂᎶᎻ ᎤᏔᎾ ᎪᏪᎸ ᎠᏂᎶᎻ ᏧᏍᏗ ᏗᎪᏪᎵ ᏗᏎᏍᏗ + ᎠᏂᎶᎻ ᏧᏍᏗ ᏗᎪᏪᎵ + ᏗᎬᎭᎷᏴᎯ ᎤᏦᏍᏗ ᏔᎻᎵ ᏗᏎᏍᏗ ᏔᎻᎵ ᏗᏎᏍᏗ + ᏄᎵᎶᏒᏍᏛ ᏔᎻᎵ ᏖᎷᎦ ᏗᏎᏍᏗ ᏔᏱ ᏗᏎᏍᏗ ᏘᏇᏔᏂ ᏗᏎᏍᏗ + ᎤᏦᏍᏗ ᏗᏎᏍᏗ ᏩᏱ ᏗᏎᏍᏗ ᎤᏣᏘᎾ ᎾᎿ + Ꮭ ᎬᏂᎨᏒ ᎢᎬᏁᎸ ᏱᎩ ᎪᏢᏅᏙᏗ ᎠᏁᏢᏔᏅᎯ + POSIX ᎠᏁᏟᏴᏍᏗ + + ᎤᏣᏘᎾ + ᎾᎿ + ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ @@ -1020,6 +1125,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1027,6 +1135,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} ᎤᎾᎢ {0} + + {1} ᎤᎾᎢ {0} + @@ -1035,6 +1146,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} ᎤᎾᎢ {0} + + {1} ᎤᎾᎢ {0} + @@ -1050,11 +1164,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic d E y G M/y G - M/d/y GGGGG + M/d/y G E, M/d/y G MMM y G MMM d, y G E, MMM d, y G + h:mm a H:mm H:mm:ss M/d @@ -1073,110 +1188,115 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} - h – h B + h – h B - h:mm – h:mm B - h:mm – h:mm B + h:mm – h:mm B + h:mm – h:mm B - d – d + d – d - y G – y G - y – y G + y G – y G + y – y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y G – M/y G + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y G – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y G – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G + MMM y G – MMM y G + MMM – MMM y G + MMM y – MMM y G - MMM d – d, y G - MMM d, y G – MMM d, y G - MMM d – MMM d, y G - MMM d, y – MMM d, y G + MMM d – d, y G + MMM d, y G – MMM d, y G + MMM d – MMM d, y G + MMM d, y – MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y G – E, MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y – E, MMM d, y G + E, MMM d – E, MMM d, y G + E, MMM d, y G – E, MMM d, y G + E, MMM d – E, MMM d, y G + E, MMM d, y – E, MMM d, y G - M – M + M – M - M/d – M/d - M/d – M/d + M/d – M/d + M/d – M/d - E, M/d – E, M/d - E, M/d – E, M/d + E, M/d – E, M/d + E, M/d – E, M/d - MMM – MMM + MMM – MMM - MMM d – d + MMM d – d - E, MMM d – E, MMM d - E, MMM d – E, MMM d + E, MMM d – E, MMM d + E, MMM d – E, MMM d - y – y G + y – y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G - MMM – MMM y G - MMM y – MMM y G + MMM – MMM y G + MMM y – MMM y G - MMM d – d, y G - MMM d – MMM d, y G - MMM d, y – MMM d, y G + MMM d – d, y G + MMM d – MMM d, y G + MMM d, y – MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y – E, MMM d, y G + E, MMM d – E, MMM d, y G + E, MMM d – E, MMM d, y G + E, MMM d, y – E, MMM d, y G - MMMM – MMMM y G - MMMM y – MMMM y G + MMMM – MMMM y G + MMMM y – MMMM y G @@ -1380,6 +1500,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1416,14 +1539,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic d E y G M/y G - M/d/y GGGGG + M/d/y G E, M/d/y G MMM y G MMM d, y G E, MMM d, y G + MMMM y G + MMMM d, y G + E, MMMM d, y G M/d E, M/d E, MMM d + E, MMMM d ᏒᎾᏙᏓᏆᏍᏗ W ᎾᎿ MMMM ᏒᎾᏙᏓᏆᏍᏗ W ᎾᎿ MMMM M/y @@ -1433,6 +1560,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y ’ᏒᎾᏙᏓᏆᏍᏗ’ w ’ᎾᎿ’ Y @@ -1582,9 +1711,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᏕᏘᏴᏌᏗᏒᎢ - ᎡᏘ ᏥᎨᏒ - ᎯᎠ ᏧᏕᏘᏴᏒᏘ - ᎡᏘᏴᎢ + ᏥᎨᏒ ᎤᏕᏘᏴᏌᏗᏒᎢ + ᎯᎠ ᎤᏕᏘᏴᏌᏗᏒᎢ + ᏴᎢ ᎤᏕᏘᏴᏌᏗᏒᎢ ᎾᎿ {0} ᎤᏕᏘᏴᏌᏗᏒᎢ ᎾᎿ {0} ᎢᏧᏕᏘᏴᏌᏗᏒᎢ @@ -1596,9 +1725,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᏕ. - ᎡᏘ. ᏥᎨᏒ - ᎯᎠ ᏧᏕᏘᏴᏒᏘ. - ᎡᏘᏴᎢ. + ᎤᏕ. ᏥᎨᏒ + ᎯᎠ ᎤᏕ. + ᎤᏕ. ᏴᎢ ᎾᎿ {0} ᎤᏕ. ᎾᎿ {0} ᎤᏕ. @@ -1608,11 +1737,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎤᏕ. ᏥᎨᏒ + + ᎤᏕ + ᎤᏕ. ᏥᎨᏒ + ᎯᎠ ᎤᏕ. + ᎤᏕ. ᏴᎢ + + ᎾᎿ {0}ᎤᏕ. + ᎾᎿ {0}ᎤᏕ. + + + {0}ᎤᏕ. ᏥᎨᏒ + {0}ᎤᏕ. ᏥᎨᏒ + + ᎩᏄᏙᏗ ᎩᏄᏙᏗ ᏥᎨᏒ ᎯᎠ ᎩᏄᏙᏗ - ᏔᎵᏁ ᎩᏄᏙᏗ + ᏴᎢ ᎩᏄᏙᏗ ᎾᎿ {0} ᎩᏄᏙᏗ ᎾᎿ {0} ᎩᏄᏙᏗ @@ -1633,11 +1776,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎩᏄᏘ. ᏥᎨᏒ + + ᎩᏄᏘ + + ᎾᎿ {0}ᎩᏄᏘ + ᎾᎿ {0}ᎩᏄᏘ + + + {0}ᎩᏄᏘ ᏥᎨᏒ + {0}ᎩᏄᏘ ᏥᎨᏒ + + ᎧᎸᎢ ᎧᎸᎢ ᏥᎨᏒ ᎯᎠ ᎧᎸᎢ - ᏔᎵᏁ ᎧᎸᎢ + BᎢ ᎧᎸᎢ ᎾᎿ {0} ᎧᎸᎢ ᎾᎿ {0} ᏗᎧᎸᎢ @@ -1651,7 +1805,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎧᎸ. ᎧᎸ. ᏥᎨᏒ ᎯᎠ ᎧᎸ. - ᎯᎠ ᎧᎸ. + ᏴᎢ ᎧᎸ. ᎾᎿ {0} ᎧᎸ. ᎾᎿ {0} ᎧᎸ. @@ -1662,15 +1816,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic + ᎧᎸ ᎧᎸ. ᏥᎨᏒ ᎯᎠ ᎧᎸ. - ᏔᎵᏁ ᎧᎸ. + ᏴᎢ ᎧᎸ. + + ᎾᎿ {0}ᎧᎸ + ᎾᎿ {0}ᎧᎸ + + + {0}ᎧᎸ ᏥᎨᏒ + {0}ᎧᎸ ᏥᎨᏒ + ᏒᎾᏙᏓᏆᏍᏗ - ᏥᏛᎵᏱᎵᏒᎢ - ᎯᎠ ᎠᎵᎵᏌ - ᏐᏆᎴᏅᎲ + ᏥᎨᏒ ᏒᎾᏙᏓᏆᏍᏗ + ᎯᎠ ᏒᎾᏙᏓᏆᏍᏗ + ᏴᎢ ᏒᎾᏙᏓᏆᏍᏗ ᎾᎿ {0} ᏒᎾᏙᏓᏆᏍᏗ ᎾᎿ {0} ᎢᏳᎾᏙᏓᏆᏍᏗ @@ -1683,9 +1846,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏒᎾ. - ᏥᏛᎵᏱᎵᏒᎢ. - ᎯᎠ ᎠᎵᎵᏌ. - ᏐᏆᎴᏅᎲ. + ᏥᎨᏒ ᏒᎾ. + ᎯᎠ ᏒᎾ. + ᏴᎢ ᏒᎾ. ᎾᎿ {0} ᏒᎾ. ᎾᎿ {0} ᏒᎾ. @@ -1695,6 +1858,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᏒᎾ. ᏥᎨᏒ + + ᏒᎾ + ᏥᎨᏒ ᏒᎾ. + ᎯᎠ ᏒᎾ. + ᏴᎢ ᏒᎾ. + + ᎾᎿ {0}ᏒᎾ + ᎾᎿ {0}ᏒᎾ + + + {0}ᏒᎾ ᏥᎨᏒ + {0}ᏒᎾ ᏥᎨᏒ + + ᏒᎾᏙᏓᏆᏍᏗ ᎧᎸᎢ @@ -1715,6 +1892,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎯᎸᏍᎩ ᏧᏒᎯᏛ ᏥᎨᏒ + + + ᎾᎿ {0}ᎢᎦ + ᎾᎿ {0}ᎢᎦ + + + {0}ᎢᎦ ᏥᎨᏒ + {0}ᎢᎦ ᏥᎨᏒ + + ᎢᎦ ᎤᏕᏘᏴᏌᏗᏒᎢ @@ -1736,7 +1923,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᎾᏙᏓᏆᏍᎬ ᏥᎨᏒ ᎯᎠ ᎤᎾᏙᏓᏆᏍᎬ - ᏔᎵᏁ ᎤᎾᏙᏓᏆᏍᎬ + ᏴᎢ ᎤᎾᏙᏓᏆᏍᎬ ᎾᎿ {0} ᎤᎾᏙᏓᏆᏍᎬ ᎾᎿ {0} ᎤᎾᏙᏓᏆᏍᎬ @@ -1749,7 +1936,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏆᏍᎬ. ᏥᎨᏒ ᎯᎠ ᏆᏍᎬ. - ᏔᎵᏁ ᏆᏍᎬ. + ᏴᎢ ᏆᏍᎬ. ᎾᎿ {0} ᏆᏍᎬ. ᎾᎿ {0} ᏆᏍᎬ. @@ -1762,7 +1949,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏍᎬ ᏥᎨᏒ ᎯᎠ ᏍᎬ - ᏔᎵᏁ ᏍᎬ + ᏴᎢ ᏍᎬ ᎾᎿ {0} ᏍᎬ ᎾᎿ {0} ᏍᎬ @@ -1775,7 +1962,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᎾᏙᏓᏉᏅᎯ ᏥᎨᏒ ᎯᎠ ᎤᎾᏙᏓᏉᏅᎯ - ᏔᎵᏁ ᎤᎾᏙᏓᏉᏅᎯ + ᏴᎢ ᎤᎾᏙᏓᏉᏅᎯ ᎾᎿ {0} ᎤᎾᏙᏓᏉᏅᎯ ᎾᎿ {0} ᎤᎾᏙᏓᏉᏅᎯ @@ -1788,7 +1975,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏉᏅᎯ. ᏥᎨᏒ ᎯᎠ ᏉᏅᎯ. - ᏔᎵᏁ ᏉᏅᎯ. + ᏴᎢ ᏉᏅᎯ. ᎾᎿ {0} ᏉᏅᎯ. ᎾᎿ {0} ᏉᏅᎯ. @@ -1801,7 +1988,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ꮙ ᏥᎨᏒ ᎯᎠ Ꮙ - ᏔᎵᏁ Ꮙ + ᏴᎢ Ꮙ ᎾᎿ {0} Ꮙ ᎾᎿ {0} Ꮙ @@ -1814,7 +2001,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏔᎵᏁ ᎢᎦ ᏥᎨᏒ ᎯᎠ ᏔᎵᏁ ᎢᎦ - ᏔᎵᏁ ᏔᎵᏁ ᎢᎦ + ᏴᎢ ᏔᎵᏁ ᎢᎦ ᎾᎿ {0} ᏔᎵᏁ ᎢᎦ ᎾᎿ {0} ᏔᎵᏁ ᎢᎦ @@ -1827,7 +2014,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏔᎵᏁ. ᏥᎨᏒ ᎯᎠ ᏔᎵᏁ. - ᏔᎵᏁ ᏔᎵᏁ. + ᏴᎢ ᏔᎵᏁ. ᎾᎿ {0} ᏔᎵᏁ. ᎾᎿ {0} ᏔᎵᏁ. @@ -1840,7 +2027,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏔᎵ ᏥᎨᏒ ᎯᎠ ᏔᎵ - ᏔᎵᏁ ᏔᎵ + ᏴᎢ ᏔᎵ ᎾᎿ {0} ᏔᎵ ᎾᎿ {0} ᏔᎵ @@ -1853,7 +2040,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏦᎢᏁ ᎢᎦ ᏥᎨᏒ ᎯᎠ ᏦᎢᏁ ᎢᎦ - ᏔᎵᏁ ᏦᎢᏁ ᎢᎦ + ᏴᎢ ᏦᎢᏁ ᎢᎦ ᎾᎿ {0} ᏦᎢᏁ ᎢᎦ ᎾᎿ {0} ᏦᎢᏁ ᎢᎦ @@ -1866,7 +2053,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏦᎢᏁ. ᏥᎨᏒ ᎯᎠ ᏦᎢᏁ. - ᏔᎵᏁ ᏦᎢᏁ. + ᏴᎢ ᏦᎢᏁ. ᎾᎿ {0} ᏦᎢᏁ. ᎾᎿ {0} ᏦᎢᏁ. @@ -1879,7 +2066,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ꮶ ᏥᎨᏒ ᎯᎠ Ꮶ - ᏔᎵᏁ Ꮶ + ᏴᎢ Ꮶ ᎾᎿ {0} Ꮶ ᎾᎿ {0} Ꮶ @@ -1892,7 +2079,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏅᎩᏁ ᎢᎦ ᏥᎨᏒ ᎯᎠ ᏅᎩᏁ ᎢᎦ - ᏔᎵᏁ ᏅᎩᏁ ᎢᎦ + ᏴᎢ ᏅᎩᏁ ᎢᎦ ᎾᎿ {0} ᏅᎩᏁ ᎢᎦ ᎾᎿ {0} ᏅᎩᏁ ᎢᎦ @@ -1905,7 +2092,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏅᎩᏁ. ᏥᎨᏒ ᎯᎠ ᏅᎩᏁ. - ᏔᎵᏁ ᏅᎩᏁ. + ᏴᎢ ᏅᎩᏁ. ᎾᎿ {0} ᏅᎩᏁ. ᎾᎿ {0} ᏅᎩᏁ. @@ -1918,7 +2105,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏅᎩ ᏥᎨᏒ ᎯᎠ ᏅᎩ - ᏔᎵᏁ ᏅᎩ + ᏴᎢ ᏅᎩ ᎾᎿ {0} ᏅᎩ ᎾᎿ {0} ᏅᎩ @@ -1931,7 +2118,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏧᎾᎩᎶᏍᏗ ᏥᎨᏒ ᎯᎠ ᏧᎾᎩᎶᏍᏗ - ᏔᎵᏁ ᏧᎾᎩᎶᏍᏗ + ᏴᎢ ᏧᎾᎩᎶᏍᏗ ᎾᎿ {0} ᏧᎾᎩᎶᏍᏗ ᎾᎿ {0} ᏧᎾᎩᎶᏍᏗ @@ -1944,7 +2131,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏧᎾᎩ. ᏥᎨᏒ ᎯᎠ ᏧᎾᎩ. - ᏔᎵᏁ ᏧᎾᎩ. + ᏴᎢ ᏧᎾᎩ. ᎾᎿ {0} ᏧᎾᎩ. ᎾᎿ {0} ᏧᎾᎩ. @@ -1957,7 +2144,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ꮷ ᏥᎨᏒ ᎯᎠ Ꮷ - ᏔᎵᏁ Ꮷ + ᏴᎢ Ꮷ ᎾᎿ {0} Ꮷ ᎾᎿ {0} Ꮷ @@ -1970,7 +2157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᎾᏙᏓᏈᏕᎾ ᏥᎨᏒ ᎯᎠ ᎤᎾᏙᏓᏈᏕᎾ - ᏔᎵᏁ ᎤᎾᏙᏓᏈᏕᎾ + ᏴᎢ ᎤᎾᏙᏓᏈᏕᎾ ᎾᎿ {0} ᎤᎾᏙᏓᏈᏕᎾ ᎾᎿ {0} ᎤᎾᏙᏓᏈᏕᎾ @@ -1983,7 +2170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏈᏕᎾ. ᏥᎨᏒ ᎯᎠ ᏈᏕᎾ. - ᏔᎵᏁ ᏈᏕᎾ. + ᏴᎢ ᏈᏕᎾ. ᎾᎿ {0} ᏈᏕᎾ. ᎾᎿ {0} ᏈᏕᎾ. @@ -1996,7 +2183,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏕᎾ ᏥᎨᏒ ᎯᎠ ᏕᎾ - ᏔᎵᏁ ᏕᎾ + ᏴᎢ ᏕᎾ ᎾᎿ {0} ᏕᎾ ᎾᎿ {0} ᏕᎾ @@ -2032,6 +2219,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᏑᏟ. ᏥᎨᏒ + + ᏑᏟ + + ᎾᎿ {0}ᏑᏟ + ᎾᎿ {0}ᏑᏟ + + + {0}ᏑᏟ ᏥᎨᏒ + {0}ᏑᏟ ᏥᎨᏒ + + ᎢᏯᏔᏬᏍᏔᏅ ᎯᎠ ᎢᏯᏔᏬᏍᏔᏅ @@ -2055,6 +2253,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎢᏯᏔ. ᏥᎨᏒ + + ᎢᏯᏔ + + ᎾᎿ {0}ᎢᏯᏔ + ᎾᎿ {0}ᎢᏯᏔ + + + {0}ᎢᏯᏔ ᏥᎨᏒ + {0}ᎢᏯᏔ ᏥᎨᏒ + + ᎠᏎᏢ ᏃᏊ @@ -2078,6 +2287,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎠᏎ. ᏥᎨᏒ + + ᎠᏎ + + ᎾᎿ {0}ᎠᏎ + ᎾᎿ {0}ᎠᏎ + + + {0}ᎠᏎ ᏥᎨᏒ + {0}ᎠᏎ ᏥᎨᏒ + + ᏂᎬᎾᏛ ᏧᏓᎴᏅᏓ ᏓᏟᎢᎵᏍᏒᎢ @@ -2566,9 +2786,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎵᏇᏫᎵ - - ᏈᏗᏏ ᎪᎩ ᎠᏟᎢᎵᏒ - ᎸᏂᏓᏂ @@ -2659,9 +2876,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏣᏯᏋᎳ - - ᎨᎵᎩ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ - ᏛᎵᏂ @@ -3357,6 +3571,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎭᎳᎴ + + + ᎢᏳᏟᎶᏓ ᎠᏟᎢᎵᏒ + ᎢᏳᏟᎶᏓ ᏄᎶᏒᏔᏅ ᎠᏟᎢᎵᏒ + ᎢᏳᏟᎶᏓ ᎪᎩ ᎠᏟᎢᎵᏒ + + ᎠᏫᎨᏂᏍᏖᏂ ᎠᏟᎢᎵᏒ @@ -3562,6 +3783,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏆᏏᎵᏯ ᎪᎩ ᎠᏟᎢᎵᏒ + + + ᏈᏗᏏ ᎠᏟᎢᎵᏒ + ᏈᏗᏏ ᎪᎩ ᎠᏟᎢᎵᏒ + + ᏊᎾᎢ ᏓᎷᏌᎳᎻ ᎠᏟᎢᎵᏒ @@ -3735,6 +3962,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎢᏤ ᎢᏳᏍᏗ ᎠᏟᎢᎵᏒ + + + ᎢᏤᏍᏛᏱ ᎠᏟᎢᎵᏒ + ᎢᏤᏍᏛᏱ ᏄᎶᏒᏍᏔᏅ ᎠᏟᎢᎵᏒ + ᎢᏤᏍᏛᏱ ᎪᎩ ᎠᏟᎢᎵᏒ + + ᏗᎧᎸᎬ ᎢᏤᏍᏛᏱ ᎠᎵᎢᎵᏒ @@ -3761,7 +3995,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ᎭᏩᏱ-ᎠᎵᏳᏏᎠᏂ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ + ᎭᏩᏱ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ HAST @@ -3830,6 +4064,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎢᎳᏂ ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ + + + ᎨᎵᎩ ᎠᏟᎢᎵᏒ + ᎨᎵᎩ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ + + ᎢᎫᏥᎧ ᎠᏟᎢᎵᏒ @@ -3851,6 +4091,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏣᏩᏂᏏ ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ + + + ᎧᎻᏣᎦ ᎠᏟᎢᎵᏒ + ᎧᎻᏣᎦ ᏄᎶᏒᏔᏅ ᎠᏟᎢᎵᏒ + ᎧᎻᏣᎦ ᎪᎩ ᎠᏟᎢᎵᏒ + + ᎧᏎᎧᏍᏕᏂ ᎠᏟᎢᎵᏒ @@ -4113,11 +4360,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏌᎧᎵᏂ ᎪᎩ ᎠᏟᎢᎵᏒ + + + ᏌᎹᎳ ᎠᏟᎢᎵᏒ + ᏌᎹᎳ ᏄᎶᏒᏔᏅ ᎠᏟᎢᎵᏒ + ᏌᎹᎳ ᎪᎩ ᎠᏟᎢᎵᏒ + + - ᏌᎼᎠ ᎠᏟᎢᎵᏒ ᏌᎼᎠ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ - ᏌᎼᎠ ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ @@ -4184,6 +4436,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏧᎩ ᎠᏟᎢᎵᏒ + + + ᎬᎾ ᎠᏟᎢᎵᏒ + ᎬᎾ ᏄᎶᏒᏔᏅ ᎠᏟᎢᎵᏒ + ᎬᎾ ᎪᎩ ᎠᏟᎢᎵᏒ + + ᏛᎵᎩᎺᏂᏍᏔᏂ ᎠᏟᎢᎵᏒ @@ -4203,6 +4462,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏳᎷᏇ ᎪᎩ ᎠᏟᎢᎵᏒ + + + ᎤᏉᏈ ᎠᏟᎢᎵᏒ + + ᎤᏍᏇᎩᏍᏖᏂ ᎠᏟᎢᎵᏒ @@ -5105,7 +5369,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏂᎼᎵ ᎵᏔᎢ ᎢᏳᏓᎵ - ᎢᎦᏛ {0} ᎢᎦᏛ {0} ᎢᎦᏛᎭ @@ -5369,7 +5632,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᎭᏥ - ᎪᏪᎸ em + ᎪᏪᎸ ems + {0} em + {0} ems {0} ᏇᎦᏎᎵ @@ -5429,7 +5694,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏍᏗ - ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏍᏗ + {0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏍᏗ {0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏍᏗ @@ -5798,7 +6063,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎢᏯᎣᏂᏏ - ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎣᏂᏏ + {0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎣᏂᏏ {0} ᎠᏂᎩᎸᏥ ᏂᏓᏳᏓᎴᏅᎯ ᏗᏎᏍᏗ ᎤᏓᏁᎯ ᎢᏯᎣᏂᏏ @@ -6167,6 +6432,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic μᏗᏎᏢ + {0} μᏗ + {0} μᏗ ᎾᏃᏗᏎᏢ @@ -6232,6 +6499,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} dpi {0} dpi + + ᎡᎶᎯ ᏯᏗ + ᎠᏗ {0} ᎠᏗ @@ -6249,6 +6519,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ᏌᏟ {0} ᏌᏟ + + ᎢᏳ + {0} ᎢᏳ + {0} ᎢᏳ + {0}/ᎢᏳ + ᏌᎢᎠ {0} ᏌᎢᎠ @@ -6367,6 +6643,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎢᏧᏆᏗᏅᏛ {0} L {0} L + {0}/L ᏑᏟᎶᏛ-ᎢᏗᎳᏏᏗ @@ -6375,12 +6652,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᎤᎧᏲᏗ ᏑᏟᎶᏓ - ᎢᏧᎵᎶᏓ + ᎢᏧ {0} gal {0} gal ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏳᎵᎶᏓ ᎢᏳᏓᎵ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏧᎵᎶᏓ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏧᎵᎶᏓ + {0}/ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏳᎵᎶᏓ ᎢᏳᏓᎵ qts @@ -6396,9 +6676,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} fl oz {0} fl oz + + Imp. ᎤᏓᏁᎯ ᎣᏂᏏ + {0} Imp. ᎤᏓᏁᎯ ᎣᏂᏏ + {0} Imp. ᎤᏓᏁᎯ ᎣᏂᏏ + ᏒᏙᏂ + + ᎤᎦᎾᏍᏓ ᎠᏗᏙᏗ + {0} dsp + {0} dsp + + + ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎤᎦᎾᏍᏓ ᎠᏗᏙᏗ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎤᎦᎾᏍᏓ-ᎠᏗᏙᏗ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎤᎦᎾᏍᏓ-ᎠᏗᏙᏗ + ᎪᎭᏍᎬ {0} ᎪᎭᏍᎬ @@ -6406,7 +6701,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏜᎹ ᎠᎹ - {0} ᏜᎹ ᎠᎹ + {0} ᏜᎹ {0} ᏜᎹ ᎠᎹ @@ -6416,8 +6711,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᏗᏓᏇᏄᎩᏍᏗ - {0} ᏗᏓᏇᏄᎩᏍᏗ - {0} ᏗᏓᏇᏄᎩᏍᏗ + {0} ᏗᏓᏇ + {0} ᏗᏓᏇ + + + ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ {0} kat @@ -6544,11 +6844,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mmol/L {0}mmol/L - - ᎢᎦᏛ - {0} ᎢᎦᏛ - {0} ᎢᎦᏛ - ppm {0}ppm @@ -6695,8 +6990,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ᏌᎠ - {0}μs - {0}μs + {0}μᏗ + {0}μᏗ {0}ᎾᏃ @@ -6792,6 +7087,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}Hz {0}Hz + + {0}em + {0}em + px {0}px @@ -6819,6 +7118,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}dpi + ᎡᎶᎯ ᏯᏗ {0}R⊕ {0}R⊕ @@ -6835,8 +7135,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ᏌᏟ - {0}cm - {0}cm + ᎢᏳ + {0}ᎢᏳ + {0}ᎢᏳ + {0}/ᎢᏳ {0}ᏌᎢᎠ @@ -7167,8 +7469,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mL - {0}mp - {0}mp + {0}mpt + {0}mpt {0}mc @@ -7183,16 +7485,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}bu - gal + ᎢᏧ {0}gal {0}gal {0}/gal Imp gal - {0}galIm - {0}galIm - {0}/galIm + {0} ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ-ᎢᏧᎵᎶᏓ + {0}ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏧᎵᎶᏓ + {0}/ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎢᏧᎵᎶᏓ qt @@ -7237,8 +7539,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic dsp Imp - {0}dsp-Imp - {0}dsp-Imp + {0}ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎤᎦᎾᏍᏓ-ᎠᏗᏙᏗ + {0}ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᎤᎦᎾᏍᏓ-ᎠᏗᏙᏗ dr @@ -7255,22 +7557,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ᏥᎩᎳ - pn - {0}pn - {0}pn + ᏗᏓᏇ + {0}ᏗᏓᏇ + {0}ᏗᏓᏇ - {0}qt-Imp. - {0}qt-Imp. - - - {0} kat - {0} kat - - - cal-IT - {0} cal-IT - {0} cal-IT + ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ + {0}ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ + {0}ᏂᎬᎾᏛᎢ ᎤᏓᏤᎵᎦᏯ ᏅᎩ ᎢᏗᎧᎵᎢ {0}ᎠᏨᏍᏗ diff --git a/make/data/cldr/common/main/cic.xml b/make/data/cldr/common/main/cic.xml deleted file mode 100644 index 5309c701c613..000000000000 --- a/make/data/cldr/common/main/cic.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - Chikashshanompaʼ - - - United States - - - - [a{a̱} b {ch} f h i{i̱} k l {lh} m n {ng} o{o̱} p s {sh} t w y ʼ] - [á{á̱} c d e g í{í̱} j ó{ó̱} q r u v x z] - [A{A̱} B {CH} D E F H I{I̱} K L {LH} M N O{O̱} P S {SH} T V W Y] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - EEEE, MMMM d, y G - - - - - MMMM d, y G - - - - - MMM d, y G - - - - - M/d/y GGGGG - GGGGGyMd - - - - - - - - - Hashiʼ Ammoʼnaʼ - Hashiʼ Atokloʼ - Hashiʼ Atochchíʼnaʼ - Iiplal - Mih - Choon - Choola - Akaas - Siptimpaʼ - Aaktopaʼ - Nofimpaʼ - Tiisimpaʼ - - - - - - - Nittak Holloʼ - Mantiʼ - Chostiʼ - Winstiʼ - Soistiʼ - Nannalhchifaʼ Nittak - Nittak Holloʼ Nakfish - - - - - - - EEEE, MMMM d, y - - - - - MMMM d, y - - - - - MMM d, y - - - - - M/d/yy - yyMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - $ - - - - - - - Afammi - Afammi {0} - - - Hashiʼ alhpisaʼ - Hashiʼ alhpisaʼ {0} - - - Nittak hollo ittataklaʼ - Nittak hollo ittataklaʼ {0} - - - Nittak - {0} Nittak - - - Hashiʼ kanalli chaffaʼ - Hashiʼ kanalli chaffaʼ {0} - - - Hashiʼ kanallloshiʼ - Hashiʼ kanallloshiʼ {0} - - - - diff --git a/make/data/cldr/common/main/cic_US.xml b/make/data/cldr/common/main/cic_US.xml deleted file mode 100644 index 256407e3a825..000000000000 --- a/make/data/cldr/common/main/cic_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ckb.xml b/make/data/cldr/common/main/ckb.xml index 54a96aa49d32..135f991e0ff1 100644 --- a/make/data/cldr/common/main/ckb.xml +++ b/make/data/cldr/common/main/ckb.xml @@ -42,6 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ئازەربایجانی ئازەربایجانی باشووری باشکیەر + بەلوچی بالی باسا بیلاڕووسی @@ -52,6 +53,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic بیسلاما بینی سیکسیکا + ئەنیی بامبارا بەنگلادێشی تەبەتی @@ -71,7 +73,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic چێرۆکی شایان کوردیی ناوەندی - کوردیی، سۆرانی + کوردیی، سۆرانی کۆرسیکی فەرەنسیی سیشێلی چێکی @@ -194,12 +196,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic بافیا کۆلۆنی کوردی - کوردی - کرمانجی + کوردی + کرمانجی کوومیک کۆمی کۆڕنی - کوڤی + کوڤی كرگیزی لاتینی لادینۆ @@ -268,7 +270,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic کواسیۆ نەرویژیی نینۆرسک نگیمبوون - نۆروێژی + نەرویجی نۆگای نکۆ ئندێبێلێی باشوور @@ -334,7 +336,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic شۆنا سۆنینکێ سۆمالی - ئەڵبانی + ئەلبانی سربی سرانان تۆنگۆ سواتی @@ -398,6 +400,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ییدیش یۆرووبا کانتۆنی + ژوانگ ئەمازیغیی مەغریب چینی جینی، مەنداری @@ -788,14 +791,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic ژمارە میانمارییەکان - مەتریک - بەڕیتانی - ئەمەریکی + مەتریک + بەڕیتانی + ئەمەریکی - زمان: {0} - نووسە:{0} - ناوچە: {0} + زمان: {0} + نووسە:{0} + ناوچە: {0} @@ -1104,6 +1107,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic هەفتەی w ی Y + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} E، M/d – E، M/d @@ -1142,34 +1150,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic - موحەرەم - سەفەر - رەبیعی یەکەم - ڕەبیعی دووەم - جەمادی یەکەم - جەمادی دووەم - ڕەجەب - شەعبان - ڕەمەزان - شەوال - زولقەعدە - زولحجە - - - - - موحەرەم - سەفەر - رەبیعی یەکەم - ڕەبیعی دووەم - جەمادی یەکەم - جەمادی دووەم - ڕەجەب - شەعبان - ڕەمەزان - شەوال - زولقەعدە - زولحجە + موحەرەم + سەفەر + رەبیعی یەکەم + ڕەبیعی دووەم + جەمادی یەکەم + جەمادی دووەم + ڕەجەب + شەعبان + ڕەمەزان + شەوال + زولقەعدە + زولحجە @@ -1202,7 +1194,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - دەم + سەردەم ساڵ @@ -1210,6 +1202,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic ئەم ساڵ ساڵی داهاتوو + + ساڵی پێشوو + ئەم ساڵ + ساڵی داهاتوو + + چارەگ @@ -1252,13 +1255,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic گرینیچ {0} - گرینیچ بەکاتی {0} کاتی {0} هاوینە کاتی {0} فەرمی شوێنی نەناسراو + + + کاتی گرینیچ + + @@ -1281,6 +1288,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + #,##0 % + + + + + + + #,##0.00 ¤ + + + {0} {1} {0} {1} @@ -1375,13 +1396,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ڕیالی کەمبۆدی - دیناری کووەیتی + دیناری کووەیتی تەنگەی کازاخستانی - لیرەی کوبنانی + لیرەی لوبنانی ڕوپیەی سریلانکی diff --git a/make/data/cldr/common/main/co.xml b/make/data/cldr/common/main/co.xml deleted file mode 100644 index 6a90b8d96e85..000000000000 --- a/make/data/cldr/common/main/co.xml +++ /dev/null @@ -1,933 +0,0 @@ - - - - - - - - - - - {0} : {1} - - - arabu - arabu mudernu - corsu - ceccu - danese - tedescu - tedescu austriacu - tedescu sguizzeru - grecu - inglese - inglese australianu - inglese canadianu - inglese (S.U.) - spagnolu - estone - finlandese - francese - francese canadianu - francese sguizzeru - hindì (latinu) - ungarese - indunesianu - talianu - giappunese - cureanu - lettone - maltese - neerlandese - fiammingu - pulunese - purtughese - purtughese brasilianu - purtughese europeanu - russiu - sluvaccu - sluvenu - svedese - tailandese - turcu - lingua scunnisciuta - chinese - chinese mandarinu - chinese simplificatu - mandarinu simplificatu - chinese tradiziunale - mandarinu tradiziunale - - - - - - - - - - - - - Mondu - Africa - Oceania - America Centrale - Americhe - Australasia - Melanesia - Regione Micronesiana - Pulinesia - Asia - Europa - America latina - Isula Ascension - Andorra - Emirati Arabi Uniti - Antigua è Barbuda - Anguilla - Albania - Armenia - Angola - Antarticu - Argentina - Samoa Americana - Austria - Australia - Aruba - Bosnia è Herzegovina - Barbados - Belgica - Bulgaria - Burundi - San Bartulumeu - Bermuda - Bolivia - Brasile - Belize - Canada - Isule Cocos (Keeling) - Congo - Kinshasa - Congo (DRC) - Republica d’Africa Centrale - Congo - Brazzaville - Republica di u Congo - Svizzera - Isule Cook - Cile - China - Isula Clipperton - Costa Rica - Cuba - Isula Christmas - Cecchia - Alemagna - Diego Garcia - Danimarca - Dominica - Republica Duminicana - Algeria - Estonia - Egittu - Spagna - Unione europea - Eurozona - Finlandia - Isule Falkland - Micronesia - Isule Faroe - Francia - Reame Unitu - R.U. - Grenada - Georgia - Guiana francese - Gambia - Guadalupe - Grecia - Guatemala - Guiana - Isule Heard è McDonald - Croazia - Ungheria - Irlanda - Israele - Isula di Man - India - Iran - Islanda - Italia - Jamaica - Giappone - Comore - St. Kitts è Nevis - Libanu - Santa Lucia - Liberia - Lituania - Lettonia - LIbia - Monaco - Montenegro - San Martinu - Isule Marshall - Mali - Mungulia - Macao SAR China - Macao - Martinica - Mauritania - Malta - Messicu - Malesia - Namibia - Nova Caledunia - Isula Norfolk - Nigeria - Nicaragua - Nederlanda - Nurvegia - Nauru - Niue - Nova Zelanda - Nova Zelanda Aotearoa - Panama - Perù - Pulinesia Francese - Papuasia Nova Guinea - Filippine - St. Pierre è Miquelon - Isule Pitcairn - Puerto Rico - Palestina - Portugallu - Palau - Rumania - Serbia - Russia - Isule Solomon - Svezia - Slovenia - Sluvacchia - Sierra Leone - San Marino - Somalia - Suriname - El Salvadore - Siria - Tristan da Cunha - Isule Turks è Caicos - Togo - Tunisia - Tonga - Turchia - Trinidad è Tobago - Tuvalu - Tanzania - Ucrania - Uganda - Isule U.S. Outlying - Nazioni Unite - Stati Uniti - S.U. - Cità di u Vaticanu - Venezuela - Isule Vergine Britaniche - Isule Vergine Americane - Vanuatu - Wallis è Futuna - Samoa - Kosovo - Zambia - regione scunnisciuta - - - calendariu gregurianu - gregorianu - calendariu ISO 8601 - ordine di classificazione standardizatu - cifri occidentale - - - metricu - imperiale - americanu - - - lingua : {0} - scrittura : {0} - regione : {0} - - - - [aà b c {chj} d eè f g {ghj} h iìï j l m n oò p q r s {sc} {sg} t uùü v z] - [â æ ç éêë î k ñ ô œ úû w x yÿ] - [A B C {CHJ} D E F G {GHJ} H I J L M N O P Q R S {SC} {SG} T U V Z] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” « » ( ) \[ \] § @ * / \& # † ‡ ′ ″] - ? - - - « - » - « - » - - - - - - - - EEEE d LLLL 'di' 'u' y G - - - - - d LLLL 'di' 'u' y G - - - - - d MMM y G - - - - - dd/MM/y GGGGG - - - - - - - {1} 'à' {0} - - - - - {1} 'à' {0} - - - - - {1} 'à' {0} - - - - - {1} {0} - - - - E d - E h 'ore' - y G - MM-y G - dd-MM-y G - E dd-MM-y G - d MMM y G - E d MMM y G - dd-MM - E dd/MM - d MMM - E d MMM - d MMMM - MM/y G - dd/MM/y G - E dd/MM/y G - MMM y G - MMM d, y G - E d MMM y G - MMMM y G - QQQ y G - QQQQ y G - - - - - - - - ghj. - fer. - mar. - apr. - mag. - ghju. - lug. - aos. - sit. - ott. - nuv. - dic. - - - di ghjennaghju - di ferraghju - di marzu - d’aprile - di maghju - di ghjugnu - di lugliu - d’aostu - di sittembre - d’ottobre - di nuvembre - di dicembre - - - - - G - F - M - A - M - G - L - A - S - O - N - D - - - ghjennaghju - ferraghju - marzu - aprile - maghju - ghjugnu - lugliu - aostu - sittembre - ottobre - nuvembre - dicembre - - - - - - - dum. - lun. - mar. - mer. - ghj. - ven. - sab. - - - du - lu - ma - me - gh - ve - sa - - - dumenica - luni - marti - mercuri - ghjovi - venneri - sabbatu - - - - - D - L - M - M - G - V - S - - - - - - - T1 - T2 - T3 - T4 - - - 1u trimestru - 2u trimestru - 3u trimestru - 4u trimestru - - - - - - nanzu à Cristu - nanzu l’era cumuna - dopu à Cristu - di l’era cumuna - - - nz à C. - NEC - dp à C. - EC - - - - - - EEEE d MMMM 'di' 'u' y - - - - - d MMMM 'di' 'u' y - - - - - d MMM y - - - - - dd/MM/y - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1} 'à' {0} - - - {1} 'à' {0} - - - {1} 'à' {0} - - - - - {1} 'à' {0} - - - {1} 'à' {0} - - - {1} 'à' {0} - - - - - {1} 'à' {0} - - - - - {1} 'à' {0} - - - {1} 'à' {0} - - - {1} 'à' {0} - - - - E - E d - E h:mm a - E h:mm:ss a - y G - MM/y G - dd/MM/y G - E dd/MM/y G - MMM 'di' 'u' y G - d MMM 'di' 'u' y G - E d MMM 'di' 'u' y G - HH'o' - h:mm a - h:mm:ss a - h:mm:ss a v - h:mm a v - HH'o' v - dd/MM - E dd/MM - d 'di' MMM - E d MMM - d MMMM - 'settimana' W MMMM - MM/y - dd/MM/y - E dd/MM/y - MMM 'di' 'u' y - d 'di' MMM 'di' 'u' y - E d 'di' MMM 'di' 'u' y - LLLL 'di' 'u' y - QQQ y - QQQQ 'di' 'u' y - 'settimana' w 'di' 'u' Y - - - - y G – y G - y – y G - - - M/y G – M/y G - M/y – M/y G - M/y – M/y G - - - dd/MM/y – dd/MM/y G - dd/MM/y G – dd/MM/y G - dd/MM/y – dd/MM/y G - dd/MM/y – dd/MM/y G - - - E dd/MM/y – E dd/MM/y G - E dd/MM/y G – E dd/MM/y G - E dd/MM/y – E dd/MM/y G - E dd/MM/y – E dd/MM/y G - - - MMM 'di' 'u' y G – MMM 'di' 'u' y G - MMM – MMM 'di' 'u' y G - MMM 'di' 'u' y – MMM 'di' 'u' y G - - - d – d MMM 'di' 'u' y G - d MMM 'di' 'u' y G – d MMM 'di' 'u' y G - d MMM – d MMM 'di' 'u' y G - d MMM 'di' 'u' y – d MMM 'di' 'u' y G - - - E d MMM – E d MMM 'di' 'u' y G - E d MMM 'di' 'u' y G – E d MMM 'di' 'u' y G - E d MMM – E d MMM 'di' 'u' y G - E d MMM 'di' 'u' y – E d MMM 'di' 'u' y G - - - h a – h a - h – h a - - - HH – HH 'o' - - - h:mm a – h:mm a - h:mm – h:mm a - h:mm – h:mm a - - - HH:mm – HH:mm - HH:mm – HH:mm - - - h:mm a – h:mm a v - h:mm – h:mm a v - h:mm – h:mm a v - - - HH:mm – HH:mm v - HH:mm – HH:mm v - - - h a – h a v - h – h a v - - - HH – HH v - - - dd/MM – dd/MM - dd/MM – dd/MM - - - E dd/MM – E dd/MM - E dd/MM – E dd/MM - - - LLL – LLL - - - d–d 'di' LLL - d 'di' LLL – d 'di' LLL - - - E d 'di' MMM – E d 'di' MMM - E d 'di' MMM – E d 'di' MMM - - - MM/y – MM/y - MM/y – MM/y - - - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - - - E dd/MM/y – E dd/MM/y - E dd/MM/y – E dd/MM/y - E dd/MM/y – E dd/MM/y - - - MMM – MMM 'di' 'u' y - MMM 'di' 'u' y – MMM 'di' 'u' y - - - d – d MMM 'di' 'u' y - d MMM – d MMM 'di' 'u' y - d MMM – d MMM 'di' 'u' y - - - E d 'di' LLL – E d 'di' LLL 'di' 'u' y - E d 'di' LLL – E d 'di' LLL 'di' 'u' y - E d 'di' LLL 'di' 'u' y – E d 'di' LLL 'di' 'u' y - - - LLLL–LLLL 'di' 'u' y - LLLL 'di' 'u' y – LLLL 'di' 'u' y - - - - - - - - era - - - annu - l’annu scorsu - quist’annu - l’annu chì vene - - - an. - - - a. - - - trimestru - - - trim. - - - tr. - - - mese - u mese scorsu - stu mese - u mese chì vene - - - m. - - - settimana - a settimana scorsa - sta settimana - a settimana chì vene - a settimana di u {0} - - - sett. - settim. scorsa - sta settim. - settim. chì vene - - - st. - settim. scorsa - sta settim. - settim. chì vene - - - ghjornu - eri - oghje - dumane - - - ghj. - - - g - - - ghjornu di a settimana - - - ora - - - o. - - - minutu - - - min. - - - m. - - - seconda - - - sec. - - - s. - - - fusu orariu - - - - UTC{0} - UTC - ora : {0} - {0} (ora d’estate) - {0} (ora usuale) - - - Tempu universale cuurdinatu - - - - - ora mediana di Greenwich - - - - - - - , -   - - - - - #,##0 % - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00) ¤ - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00) ¤ - #,##0.00 ¤;(#,##0.00) ¤ - #,##0.00;(#,##0.00) - - - {0} {1} - - - - yuan chinese - - - euro - EUR - - - libra sterlina - libre sterline - £GB - - - rupia indiana - rupie indiane - INR - - - yen giappunese - - - rublu russiu - rubli russii - - - $US - - - muneta scunnisciuta - munete scunnisciute - - - - ≈{0} - - - - - {0} è {1} - {0} è {1} - - - {0} o {1} - {0} o {1} - - - - - iè:i - innò:n - - - diff --git a/make/data/cldr/common/main/co_FR.xml b/make/data/cldr/common/main/co_FR.xml deleted file mode 100644 index 9e05dc3212d4..000000000000 --- a/make/data/cldr/common/main/co_FR.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/cop.xml b/make/data/cldr/common/main/cop.xml index 0b5efbad0f2f..59e2c5d3282c 100644 --- a/make/data/cldr/common/main/cop.xml +++ b/make/data/cldr/common/main/cop.xml @@ -12,603 +12,676 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ϯⲙⲉⲧⲁϥⲣⲓⲕⲁⲛⲍ - ϯⲙⲉⲧⲁⲕⲁⲛ - ϯⲙⲉⲧⲁⲙϩⲁⲣⲓ - ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ - ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ - ϯⲙⲉⲧⲁⲥⲥⲁⲙⲉⲥ - ϯⲙⲉⲧⲁⲥⲧⲟⲩⲣⲓ - ϯⲙⲉⲧⲁⲍⲉⲣⲃⲁϫⲁⲛⲓ - ϯⲙⲉⲧⲁⲍⲉⲣⲓ - ϯⲙⲉⲧⲃⲁⲗⲟⲩϣⲓ - ϯⲙⲉⲧⲃⲉⲗⲁⲣⲟⲩⲥⲓ - ϯⲙⲉⲧⲃⲟⲩⲗⲅⲁⲣⲓ - ϯⲙⲉⲧϩⲁⲣⲓⲁⲛⲃⲓ - ϯⲙⲉⲧⲃⲟϫⲡⲟⲩⲣⲓ - ϯⲙⲉⲧⲁⲛⲓⲓ - ϯⲙⲉⲧⲃⲁⲛⲅⲗⲓ - ϯⲙⲉⲧⲃⲣⲉⲧⲟⲛ - ϯⲙⲉⲧⲃⲟⲇⲟ - ϯⲙⲉⲧⲃⲟⲥⲛⲓ - ϯⲙⲉⲧⲕⲁⲧⲁⲗⲁⲛ - ϯⲙⲉⲧⲥⲉⲃⲟⲩⲁⲛ - ϯⲙⲉⲧϭⲉⲣⲟⲩⲕⲓ - ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲭⲏⲙⲓ - ϯⲙⲉⲧϭⲉⲕⲓ - ϯⲙⲉⲧⲥⲟⲩⲁⲙⲡⲓ ⲕⲣⲓ - ϯⲙⲉⲧϭⲟⲩⲃⲁϣ - ϯⲙⲉⲧⲟⲩⲉⲗϣⲓ - ϯⲙⲉⲧⲇⲁⲛⲙⲁⲣⲕ - ϯⲙⲉⲧϫⲉⲣⲙⲁⲛⲓⲟⲥ - ϯⲙⲉⲧⲁⲗⲙⲁⲛⲓ ⲛ̀ⲁⲩⲥⲑⲣⲓⲁ - ϯⲙⲉⲧⲁⲗⲙⲁⲛⲓ ⲛ̀ⲥⲟⲩⲓⲥⲣⲁ ⲉⲧϭⲟⲥⲓ - ϯⲙⲉⲧⲇⲟⲣⲓ - ϯⲙⲉⲧⲥⲏⲧⲥⲟⲣⲃⲓ - ϯⲙⲉⲧⲉⲩⲉ - ⲙⲉⲧⲟⲩⲉⲓⲛⲓⲛ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲕⲁⲛⲁⲇⲁ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲙ̀ⲃⲣⲓⲑⲁⲛⲓⲁ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲱⲧⲡ - ϯⲙⲉⲧⲁⲅⲅⲗⲉⲕⲟⲥ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁ - ϯⲙⲉⲧⲉⲥⲡⲉⲣⲁⲛⲑⲟ - ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ - ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲁⲙⲣⲓⲕⲁ ⲗⲁⲑⲓⲛⲓ - ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ - ϯⲙⲉⲧⲉⲥⲑⲟⲛⲓⲁ - ϯⲙⲉⲧⲃⲁⲥⲕ - ϯⲙⲉⲧⲡⲉⲣⲥⲓⲥ - ϯⲙⲉⲧϥⲟⲩⲗⲁ - ϯⲙⲉⲧϥⲓⲛⲗⲁⲛⲇ - ϯⲙⲉⲧⲫⲓⲗⲓⲡⲓⲛ - ϯⲙⲉⲧϥⲁⲣⲟⲥⲉ - ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ - ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ ⲛ̀ⲕⲁⲛⲁⲇⲁ - ϯⲙⲉⲧϥⲉⲣⲉⲛⲥⲉⲟⲥ ⲛ̀ⲥⲟⲩⲓⲥⲣⲁ - ϯⲙⲉⲧϥⲣⲓⲍⲓ ⲛ̀ⲉⲙⲉⲛⲧ - ϯⲙⲉⲧⲁⲓⲉⲣⲗⲁⲛⲇⲓ - ϯⲙⲉⲧϫⲁ - ϯⲙⲉⲧⲥⲕⲟⲧⲗⲁⲛⲇ ⲅⲁⲗⲓⲕⲓ - ϯⲙⲉⲧⲅⲁⲗⲉⲕⲟⲥ - ϯⲙⲉⲧⲅⲟⲩϫⲁⲣⲁⲑⲓ - ϯⲙⲉⲧϩⲁⲩⲍⲁ - ϯⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ - ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ - ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ ⲛ̀ⲗⲁⲧⲓⲛⲓ - ϯⲙⲉⲧϩⲓⲛⲅⲗⲓϣ - ϯⲙⲉⲧⲕⲣⲟⲩⲁⲑⲓ - ϯⲙⲉⲧⲥⲟⲣⲃⲓ ⲛ̀ϣⲱⲓ - ϯⲙⲉⲧϩⲁⲛⲅⲁⲣⲓ - ϯⲙⲉⲧⲁⲣⲙⲉⲛⲓⲟⲥ - ϯⲙⲉⲧⲓⲛⲑⲉⲣⲗⲓⲛⲅⲟⲩⲓ - ϯⲙⲉⲧⲓⲛⲇⲟⲛⲓⲥⲓ - ϯⲙⲉⲧⲓⲛⲑⲉⲣⲗⲓⲛⲅⲟⲩⲓ - ϯⲙⲉⲧⲓⲅⲃⲟ - ϯⲙⲉⲧⲥⲓϣⲟⲩⲁⲛ - ϯⲙⲉⲧⲁⲓⲥⲗⲁⲛⲇ - ϯⲙⲉⲧϩⲓⲧⲁⲗⲓⲕⲟⲥ - ϯⲙⲉⲧⲓⲁⲡⲁⲛⲓ - ϯⲙⲉⲧϫⲁⲃⲁⲛⲓ - ϯⲙⲉⲧⲅⲉⲟⲣⲅⲓⲟⲥ - ϯⲙⲉⲧⲕⲁⲃⲟⲩⲃⲉⲣⲇⲓⲁⲛⲟⲩ - ϯⲙⲉⲧⲕⲁⲓⲛⲅⲁⲛⲅⲓ - ϯⲙⲉⲧⲕⲁⲍⲁϧⲓ - ϯⲙⲉⲧϧⲙⲉⲣⲓ - ϯⲙⲉⲧⲕⲁⲛⲛⲁⲇⲓ - ϯⲙⲉⲧⲕⲟⲣⲓ - ϯⲙⲉⲧⲕⲟⲛⲕⲁⲛⲓ - ϯⲙⲉⲧⲕⲁϣⲙⲓⲣⲓ - ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓ - ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓ - ϯⲙⲉⲧⲕⲩⲣⲙⲁⲛϫⲓ - ϯⲙⲉⲧⲕⲟⲩⲓ - ϯⲙⲉⲧⲕⲩⲣⲅⲩⲍⲓ - ϯⲙⲉⲧⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲓ - ϯⲙⲉⲧⲗⲓⲅⲟⲩⲣⲓ - ϯⲙⲉⲧⲗⲟⲙⲃⲁⲣⲇⲓ - ϯⲙⲉⲧⲗⲁⲟ - ϯⲙⲉⲧⲗⲓⲑⲟⲩⲁⲛⲓ - ϯⲙⲉⲧⲗⲁⲧⲃⲓ - ϯⲙⲉⲧⲙⲁⲓⲑⲓⲗⲓ - ϯⲙⲉⲧⲙⲁⲟⲣⲓ - ϯⲙⲉⲧⲙⲁⲕⲉⲇⲟⲛⲓ - ϯⲙⲉⲧⲙⲁⲗⲁⲓⲁⲗⲁⲙ - ϯⲙⲉⲧⲙⲟⲛⲅⲟⲗⲓ - ϯⲙⲉⲧⲙⲁⲛⲓⲡⲟⲩⲣⲓ - ϯⲙⲉⲧⲙⲁⲣⲁⲑⲓ - ϯⲙⲉⲧⲙⲁⲗⲁⲓ - ϯⲙⲉⲧⲙⲁⲗⲑⲓ - ϩⲁⲛⲙⲏϣ ⲛ̀ⲁⲥⲡⲓ - ϯⲙⲉⲧⲃⲟⲩⲣⲙⲓ - ϯⲙⲉⲧⲥⲏⲧϫⲉⲣⲙⲁⲛⲓ - ϯⲙⲉⲧⲛⲉⲡⲁⲗⲓ - ϯⲙⲉⲧϩⲟⲗⲁⲛⲇ - ϯⲙⲉϥⲗⲁⲙⲁⲛⲕ - ϯⲙⲉⲧⲛⲟⲣⲟⲩⲓⲅⲓ ⲛⲩⲛⲟⲣⲥⲕ - ϯⲙⲉⲧⲛⲟⲣⲟⲩⲓⲅⲓ - ϯⲙⲉⲧⲛ̀ⲕⲟ - ϯⲙⲉⲧⲥⲟⲑⲟⲛ̀ϩⲏⲧ - ϯⲙⲉⲧⲟⲕⲥⲓⲧⲁⲛ - ϯⲙⲉⲧⲟⲣⲟⲙⲟ - ϯⲙⲉⲧⲟⲇⲓ - ϯⲙⲉⲧⲡⲟⲩⲛϫⲁⲃⲓ - ϯⲙⲉⲧⲛⲁⲓϫⲓⲣⲓ - ϯⲙⲉⲧⲡⲟⲗⲁⲛⲇⲓ - ϯⲙⲉⲧⲡⲣⲟⲩⲥⲓ - ϯⲙⲉⲧⲡⲁϣⲑⲟ - ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ - ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲙ̀ⲃⲣⲁⲍⲓⲗ - ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ϯⲙⲉⲧⲕⲟⲩⲉϣⲟⲩⲁ - ϯⲙⲉⲧⲣⲁϫⲁⲥⲑⲁⲛⲓ - ϯⲙⲉⲧⲣⲟⲙⲁⲛϣⲓ - ϯⲙⲉⲧⲣⲟⲙⲁⲛⲓ - ϯⲙⲉⲧⲣⲟⲩⲥⲓ - ϯⲙⲉⲧⲕⲓⲛⲓⲁⲣⲟⲩⲁⲛⲇⲓ - ϯⲙⲉⲧⲥⲁⲛⲥⲕⲣⲓⲑ - ϯⲙⲉⲧⲓⲁⲕⲟⲩⲧ - ϯⲙⲉⲧⲥⲁⲛⲑⲁⲗⲓ - ϯⲙⲉⲧⲥⲁⲣⲇⲓⲛⲓ - ϯⲙⲉⲧⲥⲓⲛⲇⲓ - ϯⲙⲉⲧⲥⲓⲛϩⲁⲗⲁ - ϯⲙⲉⲧⲥⲗⲟⲃⲁⲕ - ϯⲙⲉⲧⲥⲗⲟⲃⲉⲛⲓ - ϯⲙⲉⲧⲥⲟⲙⲁⲗⲓ - ϯⲙⲉⲧⲁⲗⲃⲁⲛⲓⲁ - ϯⲙⲉⲧⲥⲉⲣⲃⲓ - ϯⲙⲉⲧⲥⲟⲑⲟ ⲛ̀ⲣⲏⲥ - ϯⲙⲉⲧⲥⲟⲩⲇⲁⲛⲓ - ϯⲙⲉⲧⲥⲟⲩⲓⲇⲓ - ϯⲙⲉⲧⲥⲟⲩⲁϩⲓⲗⲓ - ϯⲙⲉⲧⲁⲥⲥⲩⲣⲟⲥ - ϯⲙⲉⲧⲥⲓⲗⲉⲥⲓⲁⲛ - ϯⲙⲉⲧⲑⲁⲙⲓⲗⲓ - ϯⲙⲉⲧⲑⲉⲗⲟⲩⲅⲟⲩ - ϯⲙⲉⲧⲑⲁϫⲓⲕⲓ - ϯⲙⲉⲧⲑⲁⲓⲗⲁⲛⲇⲓ - ϯⲙⲉⲧⲑⲓⲅⲣⲓⲛⲓ - ϯⲙⲉⲧⲑⲟⲩⲣⲕⲙⲁⲛⲓ - ϯⲙⲉⲧⲑ̀ⲥⲟⲩⲁⲛⲓ - ϯⲙⲉⲧⲑⲟⲛⲅⲁⲛⲓ - ϯⲙⲉⲧⲭⲟⲝⲓⲥ - ϯⲙⲉⲧⲑⲁⲣⲑⲁⲣ - ϯⲙⲉⲧⲟⲩⲏⲅⲟⲩⲣ - ϯⲙⲉⲧⲟⲩⲕⲣⲁⲛⲓ - ⲟⲩⲁⲥⲡⲓ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ - ϯⲙⲉⲧⲟⲩⲣⲇⲟⲩ - ϯⲙⲉⲧⲟⲩⲍⲃⲉⲕⲓ - ϯⲙⲉⲧⲃⲉⲛⲉⲑⲓ - ϯⲙⲉⲧⲃⲓⲉⲑⲛⲁⲙⲓ - ϯⲙⲉⲧⲙⲁϧⲟⲩⲁ - ϯⲙⲉⲧⲟⲩⲟⲗⲟϥ - ϯⲙⲉⲧⲝⲟⲍⲁ - ϯⲙⲉⲧⲕⲁⲛⲅⲣⲓ - ϯⲙⲉⲧⲓⲟⲣⲟⲩⲃⲁ - ϯⲙⲉⲧⲛⲓⲛⲅⲁⲧⲟⲩ - ϯⲙⲉⲧⲕⲁⲛⲑⲟⲛⲓ - ϯⲙⲉⲧϭⲓⲛⲁ, ϯⲙⲉⲧⲕⲁⲛⲑⲟⲛⲓ - ϯⲙⲉⲧⲍⲟⲩⲁⲛⲅ - ϯⲙⲉⲧϭⲓⲛⲁ - ϯⲙⲉⲧϭⲓⲛⲁ, ⲙⲁⲛⲇⲁⲣⲓⲛ - ϯⲙⲉⲧϭⲓⲛⲁ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ - ϯⲙⲉⲧⲙⲁⲛⲇⲁⲣⲓⲛ ⲛ̀ϭⲓⲛⲁ ⲛ̀ⲁⲡⲗⲟⲩⲥ - ϯⲙⲉⲧϭⲛⲓⲁ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ - ϯⲙⲉⲧⲙⲁⲛⲇⲁⲣⲓⲛ ⲛ̀ϭⲓⲛⲁ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ - ϯⲙⲉⲧⲍⲟⲩⲗⲟⲩ - ⲙ̀ⲙⲟⲛ ⲁⲥⲡⲓ + ϯⲙⲉⲧⲁⲫⲣⲓⲕⲁⲛⲟⲥ + ϯⲙⲉⲧⲁⲭⲁⲛ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲁⲙϩⲁⲣⲁ + ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ + ϯⲙⲉⲧⲁⲣⲁⲃⲟⲥ ⲛ̀ⲅⲗⲱⲧⲑⲓⲁ̀ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲁⲥⲥⲁⲙ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲁ̀ⲥⲧⲟⲩⲣⲓⲁ̀ + ϯⲙⲉⲧⲣⲉⲙⲛⲁⲇⲟⲩⲣⲃⲁⲇⲁⲅⲁⲛ + ϯⲙⲉⲧⲁⲍⲉⲣⲓ + ϯⲙⲉⲑⲃⲁⲗⲟⲩϫ + ϯⲙⲉⲑⲃⲉⲗⲟⲣⲱⲥ + ϯⲙⲉⲑⲃⲟⲩⲗⲅⲁⲣⲟⲥ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϩⲁⲣⲓⲁⲛⲁ + ϯⲙⲉⲧⲣⲉⲙⲃϩⲟϫⲫⲟⲩⲣ + ⲁ̀ⲛⲓⲓ̀ + ϯⲙⲉⲧⲣⲉⲙⲃⲁⲅⲅⲗⲁ + ϯⲙⲉⲑⲃⲣⲉⲧⲁⲛⲟⲥ + ϯⲙⲉⲧⲃⲟⲇⲟ + ϯⲙⲉⲧⲣⲉⲙⲃⲱⲥⲛⲁ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲕⲁⲧⲁⲗⲱⲛ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲥⲉⲫⲟⲩ + ϯⲙⲉⲧϭⲉⲣⲟⲕⲏ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲭⲏⲙⲓ + ϯⲙⲉⲧϭⲏⲕ + ϯⲙⲉⲧⲥⲟⲩⲁⲙⲡⲓ ⲕⲣⲓ + ϯⲙⲉⲧϭⲟⲩⲃⲁϣ + ϯⲙⲉⲧⲕⲓⲙⲃⲣⲟⲥ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲇⲁⲛⲉⲙⲁⲣⲕⲁ + ϯⲙⲉⲧⲅⲉⲣⲙⲁⲛⲟⲥ + ⲑⲙⲉⲧⲅⲉⲣⲙⲁⲛⲟⲥ ⲛ̀ⲛⲉⲙϭⲏ + ϯⲙⲉⲧⲫⲣⲁⲅⲅⲟⲥ ⲛⲧⲉⲉⲗⲃⲉⲧⲓⲁ ⲉⲧϭⲟⲥⲓ + ϯⲙⲉⲧⲇⲟⲅⲣⲁ + ϯⲙⲉⲧⲥⲏⲧⲥⲟⲣⲃⲓ + ϯⲙⲉⲑⲏⲟⲩⲉ + ϯⲙⲉⲧⲟⲩⲉⲓⲛⲓⲛ + ϯⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ + ⲑⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ̀ + ⲑⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ ⲛ̀ⲕⲁⲛⲁⲇⲁ + ϯⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ ⲛ̀ⲣⲉⲙⲃⲣⲉⲧⲁⲛⲓⲁ̀ + ϯⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ ⲑⲁ ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲟⲧⲡ + ⲑⲙⲉⲧⲓⲅⲅⲗⲓⲛⲟⲥ ⲛ̀ⲁ̀ⲙⲉⲣⲓⲕⲏ + ⲉⲥⲡⲉⲣⲁⲛⲧⲟ + ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ + ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲁⲙⲣⲓⲕⲁ ⲗⲁⲑⲓⲛⲓ + ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ϯⲙⲉⲧⲉⲥⲡⲁⲛⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲉⲥⲑⲱⲛⲓⲁ̀ + ϯⲙⲉⲑⲃⲁⲥⲕⲱⲛ + ϯⲙⲉⲧⲡⲉⲣⲥⲏⲥ + ϯⲙⲉⲧⲡⲉⲣⲥⲏⲥ (ⲁⲃⲅⲁⲛⲓⲥⲧⲁⲛⲏ) + ϯⲙⲉⲧⲫⲟⲩⲗⲁ + ϯⲙⲉⲧⲫⲓⲛⲛⲟⲥ + ϯⲙⲉⲧⲣⲉⲙⲫⲓⲗⲓⲡⲡⲓⲛⲉⲥ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϥⲉⲣⲱ + ϯⲙⲉⲧⲫⲣⲁⲅⲅⲟⲥ + ϯⲙⲉⲧⲫⲣⲁⲅⲅⲟⲥ ⲛ̀ⲧⲉϯⲕⲁⲛⲁⲇⲁ + ϯⲙⲉⲧⲫⲣⲁⲅⲅⲟⲥ ⲛⲧⲉⲉⲗⲃⲉⲧⲓⲁ + ϯⲙⲉⲧϥⲣⲓⲍⲓ ⲛ̀ⲉⲙⲉⲛⲧ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲓⲗ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲅⲁ + ϯⲙⲉⲧⲥⲕⲟⲧⲗⲁⲛⲇ ⲅⲁⲗⲓⲕⲓ + ϯⲙⲉⲧⲅⲁⲗⲗⲓⲕⲓⲟⲥ + ϯⲙⲉⲧⲅⲟⲩϫⲁⲣⲁϯ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϩⲁⲩⲥⲁ + ϯⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ + ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ + ϯⲙⲉⲧϩⲉⲛⲧⲟⲩ ⲛ̀ⲗⲁϯⲛⲟⲥ + ϩⲓⲅⲅⲗⲓϣ + ϯⲙⲉⲧⲭⲣⲱⲃⲁⲧⲟⲥ + ϯⲙⲉⲧⲥⲟⲣⲃⲓ ⲛ̀ϣⲱⲓ + ϯⲙⲉⲧⲟⲩⲅⲅⲣⲟⲥ + ϯⲙⲉⲧⲁⲣⲙⲉⲛⲓⲟⲥ + ⲓⲛⲧⲉⲣⲗⲓⲛⲅⲟⲩⲁ̀ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲏⲥⲓⲁ̀ + ⲓⲛⲧⲉⲣⲗⲓⲛⲅⲟⲩⲉ̀ + ϯⲙⲉⲧⲓⲅⲃⲟ + ϯⲙⲉⲧⲥⲓϣⲟⲩⲁⲛ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲏⲥⲗⲁⲛⲧ + ϯⲙⲉⲧϩⲩⲧⲁⲗⲟⲥ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲓ̀ⲏ̀ⲗⲓⲟ̀ⲡⲟⲛ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϭⲁⲩⲁ + ϯⲙⲉⲧⲕⲉⲣⲅⲓⲟⲥ + ϯⲙⲉⲧⲕⲁⲃⲟⲩⲃⲉⲣⲇⲓⲁⲛⲟⲩ + ϯⲙⲉⲧⲕⲁⲓⲛⲅⲁⲛⲅⲓ + ϯⲙⲉⲧⲕⲁⲍⲁϧⲓ + ϯⲙⲉⲧϧⲙⲉⲣⲓ + ϯⲙⲉⲧⲕⲁⲛⲛⲁⲇⲓ + ϯⲙⲉⲧⲕⲟⲣⲓ + ϯⲙⲉⲧⲕⲟⲛⲕⲁⲛⲓ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲕⲁϣⲙⲓⲣ + ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓⲧⲏⲥ + ϯⲙⲉⲧⲕⲟⲩⲣⲇⲓⲧⲏⲥ + ϯⲙⲉⲧⲕⲟⲩⲣⲙⲁⲛϭⲏⲥ + ⲕⲟⲩⲃⲓ + ϯⲙⲉⲧⲕⲓⲣⲅⲓⲍ + ϯⲙⲉⲧⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲓ + ϯⲙⲉⲧⲗⲓⲅⲟⲩⲣⲓ + ϯⲙⲉⲧⲗⲟⲙⲃⲁⲣⲇⲓ + ϯⲙⲉⲧⲗⲁⲟ + ϯⲙⲉⲧⲗⲓⲑⲟⲩⲁⲛⲓ + ϯⲙⲉⲧⲗⲁⲧⲃⲓ + ϯⲙⲉⲧⲙⲁⲓⲑⲓⲗⲓ + ϯⲙⲉⲧⲙⲁⲟⲣⲓ + ϯⲙⲉⲧⲙⲁⲕⲉⲇⲱⲛ + ϯⲙⲉⲧⲙⲁⲗⲁⲓⲁⲗⲁⲙ + ϯⲙⲉⲧⲙⲟⲛⲅⲟⲗⲓ + ϯⲙⲉⲧⲙⲁⲛⲓⲡⲟⲩⲣⲓ + ϯⲙⲉⲧⲙⲁⲣⲁⲑⲓ + ϯⲙⲉⲧⲙⲁⲗⲁⲓ + ϯⲙⲉⲧⲙⲉⲗⲓⲧⲉⲟⲥ + ϩⲁⲛⲅⲉⲛⲟⲥ ⲛ̀ⲁⲥⲡⲓ + ϯⲙⲉⲧⲣⲉⲙⲃⲟⲩⲣⲙⲁ + ϯⲙⲉⲧⲥⲏⲧϫⲉⲣⲙⲁⲛⲓ + ϯⲙⲉⲧⲥⲏⲧϫⲉⲣⲙⲁⲛⲓ (ⲛⲓⲕⲁⲧⲟ ⲛ̀ⲭⲱⲣⲁ) + ϯⲙⲉⲧⲛⲉⲡⲁⲗⲓ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϩⲱⲗⲁⲛⲇ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ϥⲗⲁⲛⲇⲉⲣ + ϯⲙⲉⲧⲟⲝⲓⲧⲁⲛⲓⲕⲟⲥ + ϯⲙⲉⲧⲛⲟⲣⲟⲩⲓⲅⲓ + ϯⲙⲉⲧⲛ̀ⲕⲟ + ϯⲙⲉⲧⲥⲟⲑⲟⲛ̀ϩⲏⲧ + ϯⲙⲉⲧⲟⲕⲥⲓⲧⲁⲛ + ϯⲙⲉⲧⲟⲣⲟⲙⲟ + ϯⲙⲉⲧⲟⲇⲓ + ϯⲙⲉⲧⲡⲟⲩⲛϫⲁⲃⲓ + ϯⲙⲉⲧⲛⲁⲓϫⲓⲣⲓ + ϯⲙⲉⲧⲡⲟⲗⲱⲛⲓⲕⲟⲥ + ϯⲙⲉⲧⲡⲣⲟⲩⲥⲓ + ϯⲙⲉⲧⲡⲁϣⲑⲟ + ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ + ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲙ̀ⲃⲣⲁⲍⲓⲗ + ϯⲙⲉⲧⲡⲟⲣⲧⲟⲩⲅⲁⲗⲓ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ϯⲙⲉⲧⲕⲟⲩⲉϣⲟⲩⲁ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲣⲁϫⲁⲥⲧⲁⲛⲏ + ϯⲙⲉⲧⲣⲟⲙⲁⲛϣⲓ + ϯⲙⲉⲧⲣⲟⲩⲙⲉⲟⲥ + ϯⲙⲉⲧⲣⲟⲩⲙⲉⲟⲥ (ⲙⲟⲗⲇⲁⲃⲓⲁ̀) + ϯⲙⲉⲧⲣⲱⲥ + ϯⲙⲉⲧⲕⲓⲛⲓⲁⲣⲟⲩⲁⲛⲇⲓ + ⲥⲁⲛⲥⲕⲣⲉⲧ + ϯⲙⲉⲧⲓⲁⲕⲟⲩⲧ + ϯⲙⲉⲧⲥⲁⲛⲑⲁⲗⲓ + ϯⲙⲉⲧⲥⲁⲣⲇⲓⲛⲓ + ϯⲙⲉⲧⲥⲓⲛⲇⲓ + ϯⲙⲉⲧⲥⲓⲛϩⲁⲗⲁ + ϯⲙⲉⲧⲥⲗⲟⲃⲁⲕ + ϯⲙⲉⲧⲥⲗⲟⲃⲉⲛⲓ + ϯⲙⲉⲧⲥⲟⲙⲁⲗⲓ + ϯⲙⲉⲧⲁⲣⲃⲁⲛⲟⲥ + ϯⲙⲉⲧⲥⲉⲣⲃⲓ + ϯⲙⲉⲧⲥⲟⲑⲟ ⲛ̀ⲣⲏⲥ + ϯⲙⲉⲧⲥⲟⲩⲇⲁⲛⲓ + ϯⲙⲉⲧⲥⲟⲩⲓⲇⲓ + ϯⲙⲉⲧⲥⲟⲩⲁϩⲓⲗⲓ + ϯⲙⲉⲧⲥⲟⲩⲁϩⲓⲗⲓ (ⲭⲱⲅⲅⲟ ⲕⲓⲛϣⲁⲥⲁ) + ϯⲙⲉⲧⲥⲩⲣⲟⲥ + ϯⲙⲉⲧⲥⲓⲗⲉⲥⲓⲁⲛ + ϯⲙⲉⲧⲑⲁⲙⲓⲗⲓ + ϯⲙⲉⲧⲑⲉⲗⲟⲩⲅⲟⲩ + ϯⲙⲉⲧⲑⲁϫⲓⲕⲓ + ϯⲙⲉⲧⲑⲁⲓⲗⲁⲛⲇⲓ + ϯⲙⲉⲧⲑⲓⲅⲣⲓⲛⲓ + ϯⲙⲉⲧⲑⲟⲩⲣⲕⲙⲁⲛⲓ + ϯⲙⲉⲧⲑ̀ⲥⲟⲩⲁⲛⲓ + ϯⲙⲉⲧⲑⲟⲛⲅⲁⲛⲓ + ϯⲙⲉⲧⲧⲟⲩⲣⲕⲟⲥ + ϯⲙⲉⲧⲧⲉⲣⲧⲟⲩⲣⲟⲥ + ϯⲙⲉⲧⲟⲩⲏⲅⲟⲩⲣ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲟⲩⲭⲣⲁⲛⲓⲁ̀ + ⲟⲩⲁⲥⲡⲓ ⲛ̀ⲁ̀ⲅⲛⲱⲧⲟⲛ + ⲟⲩⲣⲇⲟⲩ + ϯⲙⲉⲧⲟⲩⲍⲃⲉⲕⲓ + ϯⲙⲉⲧⲃⲉⲛⲉⲑⲓ + ϯⲙⲉⲧⲃⲓⲉⲑⲛⲁⲙⲓ + ϯⲙⲉⲧⲙⲁϧⲟⲩⲁ + ϯⲙⲉⲧⲟⲩⲟⲗⲟϥ + ϯⲙⲉⲑⲣⲉⲙⲛ̀ⲝⲟⲥⲁ + ϯⲙⲉⲧⲕⲁⲛⲅⲣⲓ + ϯⲙⲉⲧⲓⲟⲣⲟⲩⲃⲁ + ϯⲙⲉⲧⲛⲓⲛⲅⲁⲧⲟⲩ + ϯⲙⲉⲧⲣⲉⲙⲛ̀ⲕⲁⲛⲧⲟⲛ + ϯⲙⲉⲧⲥⲓⲛⲓⲕⲟⲥ ⲙ̀ⲙⲉⲧⲣⲉⲙⲛ̀ⲕⲁⲛⲧⲟⲛ + ϯⲙⲉⲧⲍⲟⲩⲁⲛⲅ + ϯⲙⲉⲧⲥⲓⲛⲓⲕⲟⲥ + ϯⲙⲉⲑⲙⲁⲛⲇⲁⲣⲓⲛⲟⲥ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ + ϯⲙⲉⲧⲥⲓⲛⲓⲕⲟⲥ ⲉ̀ⲧⲁⲩⲁⲓⲥ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ + ϯⲙⲉⲑⲙⲁⲛⲇⲁⲣⲓⲛⲟⲥ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ + ϯⲙⲉⲧⲥⲓⲛⲓⲕⲟⲥ ⲑⲁ ϯⲡⲁⲣⲁⲇⲟⲥⲓⲥ + ϯⲙⲉⲑⲙⲁⲛⲇⲁⲣⲓⲛⲟⲥ ⲙ̀ⲡⲁⲣⲁⲇⲟⲥⲓⲥ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ + ϯⲙⲉⲧⲍⲟⲩⲗⲟⲩ + ⲙ̀ⲙⲟⲛ ⲁⲥⲡⲓ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ⲡⲓⲑⲟ - ϯⲫⲣⲓⲕⲓⲁ - ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ϯⲟⲥⲉⲁⲛⲓⲁ - ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ - ϯⲁⲙⲉⲣⲓⲕⲁ ⲛ̀ⲑⲙⲏϯ - ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ - ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲛⲓⲁⲙⲉⲣⲓⲕⲁ - ϯⲁⲙⲉⲣⲓⲕⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϯⲕⲁⲣⲓⲃⲓ - ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ ⲓⲉⲃⲧ - ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ϯⲁⲩⲥⲧⲣⲁⲗⲁⲍⲓⲁ - ϯⲙⲁⲉⲗⲁⲛⲉⲍⲓⲁ - ϯⲙⲓⲕⲣⲟⲛⲉⲍⲓⲁ - ϯⲡⲟⲗⲩⲛⲉⲍⲓⲁ - ϯⲁⲥⲓⲁ - ϯⲁⲥⲓⲁ ⲛ̀ⲑⲙⲏϯ - ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ - ϯⲉⲩⲣⲟⲡⲁ - ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ - ϯⲫⲣⲓⲕⲓⲁ ⲉⲧⲥⲏⲧ ⲙ̀ⲡϣⲁϥⲉ - ϯⲁⲙⲉⲣⲓⲕⲁ ⲛ̀ⲗⲁⲑⲓⲛⲓ - ϯⲙⲟⲩⲓ ⲛ̀ⲁⲥⲉⲛϣⲓⲟⲛ - ϯⲁⲛⲇⲟⲣⲁ - ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ - ϯⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ - ⲁⲛⲧⲓⲅⲟⲩⲁ & ⲃⲁⲣⲃⲟⲩⲇⲁ - ϯⲁⲛⲅⲟⲩⲓⲗⲗⲁ - ϯⲁⲗⲃⲁⲛⲓⲁ - ϯⲁⲣⲙⲉⲛⲓⲁ - ϯⲁⲛⲅⲟⲗⲁ - ⲁⲛⲑⲁⲣⲕⲧⲓⲕⲁ - ϯⲁⲣϫⲉⲛⲧⲓⲛ - ⲥⲁⲙⲟⲩⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ϯⲁⲩⲥⲑⲣⲓⲁ - ϯⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ - ϯⲁⲣⲟⲩⲃⲁ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲁⲗⲁⲛⲇ - ⲁⲇⲟⲩⲣⲃⲁⲇⲁⲅⲁⲛ - ϯⲃⲟⲥⲛⲓⲁ & ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ - ϯⲃⲁⲣⲃⲁⲇⲟⲥ - ϯⲃⲁⲛⲅⲗⲁⲇⲉϣ - ϯⲃⲉⲗϫⲓⲕⲁ - ⲃⲟⲩⲣⲕⲓⲛⲁ ϥⲁⲥⲟ - ϯⲃⲟⲩⲗⲅⲁⲣⲓⲁ - ϯⲃⲁϩⲣⲉⲛ - ϯⲃⲟⲩⲣⲟⲩⲛⲇⲓ - ϯⲃⲉⲛⲓⲛ - ⲥⲁⲛⲧ ⲃⲁⲣⲑⲉⲗⲉⲙⲓ - ϯⲃⲉⲣⲙⲟⲩⲇⲁ - ϯⲃⲣⲟⲩⲛⲉⲓ - ϯⲃⲟⲗⲓⲃⲓⲁ - ϯⲕⲁⲣⲓⲃⲓ ⲛ̀ϩⲟⲗⲗⲁⲛⲇⲁ - ϯⲃⲣⲁⲍⲓⲗ - ϯⲃⲁϩⲁⲙⲁ - ϯⲃϩⲟⲩⲑⲁⲛ - ϯⲙⲟⲩⲓ ⲛ̀ⲃⲟⲩⲃⲉⲧ - ϯⲃⲟⲑⲥⲟⲩⲁⲛⲁ - ϯⲃⲉⲗⲁⲣⲟⲩⲥ - ϯⲃⲉⲗⲓⲍⲉ - ϯⲕⲁⲛⲁⲇⲁ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ - ⲕⲟⲛⲅⲟ ⲕⲓⲛϣⲁⲥⲁ - ⲕⲟⲛⲅⲟ ⲇⲣⲥ - ϯⲙⲉⲧϣ̀ⲗⲟⲗ ⲙ̀ⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ - ⲕⲟⲛⲅⲟ - ⲃⲣⲁⲍⲁⲃⲓⲗ - ϯⲕⲟⲛⲅⲟ - ϯⲥⲟⲩⲓⲥⲣⲁ - ϯⲕⲟⲧ ⲇⲓⲃⲟⲩⲁⲣ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ - ϯϭⲓⲗⲉ - ϯⲕⲁⲙⲉⲣⲟⲩⲛ - ϯϭⲓⲛⲁ - ϯⲕⲟⲗⲟⲙⲃⲓⲁ - ϯⲙⲟⲩⲓ ⲛ̀ⲕⲗⲓⲡⲉⲣⲑⲟⲛ - ⲥⲁⲣⲕ - ⲕⲟⲥⲑⲁ ⲣⲓⲕⲁ - ϯⲕⲟⲩⲃⲁ - ϯⲕⲁⲡ ⲃⲉⲣⲇⲉ - ϯⲕⲟⲩⲣⲁⲥⲁⲟ - ϯⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ - ⲕⲩⲡⲣⲟⲥ - ϯϭⲉⲕⲓⲁ - ϯⲙⲉⲧϣ̀ⲗⲟⲗ ⲛ̀ϭⲉⲕ - ϯⲁⲗⲙⲁⲛⲓⲁ - ⲇⲓⲉⲅⲟ ⲅⲁⲣⲥⲓⲁ - ϯⲇϫⲓⲃⲟⲩⲑⲓ - ϯⲇⲉⲛⲙⲁⲣⲕ - ϯⲇⲟⲙⲓⲛⲓⲕⲁ - ϯⲇⲟⲙⲓⲛⲓⲕⲁⲛ - ϯⲁⲗϫⲉⲣⲓⲁ - ⲥⲉⲩⲑⲁ & ⲙⲉⲗⲓⲗⲗⲁ - ϯⲉⲕⲟⲩⲁⲇⲟⲣ - ϯⲉⲥⲑⲟⲛⲓⲁ - ⲭⲏⲙⲓ - ⲡⲓϣⲁϥⲉ ⲙ̀ⲡⲉⲙⲉⲛⲧ - ϯⲉⲣⲓⲑⲣⲓⲁ - ⲉⲥⲡⲁⲛⲓⲁ - ⲉⲑⲁⲩϣ - ϯⲙⲉⲧⲣⲉⲙⲉⲩⲣⲟⲡⲁ ⲉⲧϩⲱⲧⲡ - ϯⲉⲩⲣⲟⲍⲟⲛ - ϯϥⲓⲛⲗⲁⲛⲇ - ϥⲓⲇϫⲓ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ (ⲓⲥⲗⲁⲥ ⲙⲁⲗⲃⲓⲛⲁⲥ) - ⲙⲓⲕⲣⲟⲛⲉⲍⲓⲁ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲁⲣⲟⲉ - ϯϥⲉⲣⲉⲛⲥⲁ - ϯⲅⲁⲃⲟⲛ - ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲱⲧⲡ - ϯⲅⲣⲉⲛⲁⲇⲁ - ϯⲅⲉⲟⲣⲅⲓⲁ - ϯⲅⲟⲩⲓⲁⲛⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲉⲟⲥ - ϯⲅⲟⲩⲉⲣⲛⲉⲥⲓ - ϯⲅⲁⲛⲁ - ϯϫⲓⲃⲣⲁⲗⲑⲁⲣ - ϯⲅⲣⲓⲛⲗⲁⲛⲇ - ϯⲅⲁⲙⲃⲓⲁ - ϯⲅⲓⲛⲉⲁ - ϯⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ - ⲅⲓⲛⲉⲁ ⲛ̀ⲉⲕⲟⲩⲁⲑⲱⲣ - ϯⲉⲗⲗⲁⲥ - ϫⲉⲟⲣϫⲓⲁ ⲛ̀ⲣⲏⲥ & ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲁⲛⲇⲟⲩⲓϭ - ϯⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ - ⲅⲟⲩⲁⲙ - ϯⲅⲓⲛⲉⲁ ⲃⲓⲥⲁⲩ - ϯⲅⲩⲁⲛⲁ - ϩⲟⲛⲅ ⲕⲟⲛⲅ ⲥⲁⲣ ϭⲓⲛⲁ - ϯϩⲟⲛⲅ ⲕⲟⲛⲅ - ϩⲉⲣⲇ & ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲇⲟⲛⲁⲗⲇ - ϯϩⲟⲛⲇⲟⲩⲣⲁⲥ - ϯⲕⲣⲟⲁⲑⲓⲁ - ϯϩⲁⲓⲑⲓ - ϯϩⲁⲛⲅⲁⲣⲓⲁ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲛⲁⲣⲓ - ϯⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ϯⲁⲓⲉⲣⲗⲁⲛⲇⲁ - ⲡⲓⲥⲣⲁⲏⲗ - ⲅⲟⲩⲉⲣⲛⲥⲓ - ϯϩⲉⲛⲧⲟⲩ - ⲛⲓⲑⲱϣ ⲙⲃⲣⲓⲑⲁⲛⲓⲁ ⲛ̀ⲱⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ - ⲡⲓⲁⲣⲭⲏⲡⲉⲗⲁⲅⲟ ⲛ̀ϭⲁⲅⲟⲥ - ⲓⲣⲁⲕ - ϯⲡⲉⲣⲥⲓⲁ - ϯⲁⲓⲥⲗⲁⲛⲇⲁ - ϯϩⲩⲧⲁⲗⲓⲁ - ϯϫⲉⲣⲥⲓ - ϯϫⲁⲙⲁⲓⲕⲁ - ⲡⲓⲓⲟⲣⲇⲁⲛⲏⲥ - ϯⲓⲁⲡⲁⲛ - ϯⲕⲉⲛⲓⲁ - ϯⲕⲩⲣⲅⲩⲥⲑⲁⲛ - ϯⲕⲁⲙⲃⲟⲇⲓⲁ - ⲕⲓⲣⲓⲃⲁⲑⲓ - ϯⲕⲟⲙⲟⲣⲟⲥ - ⲥⲁⲛⲧ ⲕⲓⲧⲥ & ⲛⲉⲃⲓⲥ - ϯⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϯⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲕⲟⲩⲉⲧ - ϯⲕⲁⲓⲙⲁⲛ ⲙⲟⲩⲓ - ϯⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ϯⲗⲁⲟⲥ - ⲡⲓⲖⲓⲃⲁⲛⲟⲥ - ⲥⲁⲛⲧ ⲗⲟⲩϭⲓⲁ - ϯⲗⲓϣⲑⲉⲛϣⲑⲁⲓⲛ - ϯⲥⲣⲓⲗⲁⲛⲕⲁ - ϯⲗⲓⲃⲉⲣⲓⲁ - ϯⲗⲉⲥⲟⲑⲟ - ϯⲗⲓⲑⲟⲩⲁⲛⲓⲁ - ϯⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲅ - ϯⲗⲁⲑⲃⲓⲁ - ⲗⲩⲃⲓⲏ - ϯⲙⲁⲣⲁⲕⲉϣ - ϯⲙⲟⲛⲁⲕⲟ - ϯⲙⲟⲗⲇⲟⲃⲁ - ϯⲙⲟⲛⲑⲉⲛⲉⲅⲣⲟ - ⲥⲁⲛⲧ ⲙⲁⲣⲑⲓⲛ - ϯⲙⲁⲇⲁⲅⲁⲥⲕⲁⲣ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲙⲁⲣϣⲁⲗ - ϯⲙⲁⲕⲉⲇⲟⲛⲓⲁ ⲛ̀ⲉⲙϩⲓⲧ - ϯⲙⲁⲗⲓ - ϯⲙⲩⲁⲛⲙⲁⲣ - ϯⲙⲁⲛⲅⲟⲗⲓⲁ - ⲙⲁⲕⲁⲟ ⲥⲁⲣ ϭⲓⲛⲁ - ϯⲙⲁⲕⲁⲟ - ⲛⲓⲙⲟⲓ ⲙ̀ⲡⲉⲙϩⲓⲧ ⲙ̀ⲙⲁⲣⲓⲁⲛⲁ - ϯⲙⲁⲣⲑⲓⲛⲓⲕ - ϯⲙⲁⲩⲣⲓⲑⲁⲛⲓⲁ - ϯⲙⲟⲛⲥⲉⲣⲁⲧ - ϯⲙⲁⲗⲑⲁ - ϯⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲙⲁⲗⲇⲓⲃ - ϯⲙⲁⲗⲁⲩⲓ - ϯⲙⲉⲝⲓⲕⲟ - ϯⲙⲁⲗⲉⲍⲓⲁ - ϯⲙⲟⲍⲁⲙⲃⲓⲕ - ϯⲛⲁⲙⲓⲃⲓⲁ - ⲛⲓⲟⲩ ⲕⲁⲗⲉⲇⲟⲛⲓⲁ - ϯⲛⲓϫⲉⲣ - ϯⲙⲟⲩⲓ ⲛⲛ̀ⲟⲣϥⲟⲕ - ϯⲛⲓϫⲉⲣⲓⲁ - ϯⲛⲓⲕⲁⲣⲁⲅⲩⲟⲁ - ϯϩⲟⲗⲁⲛⲇⲁ - ϯⲛⲟⲣⲟⲩⲓϫⲓⲁ - ϯⲛⲉⲡⲁⲗ - ⲛⲁⲩⲣⲟⲩ - ⲛⲓⲟⲩⲉ - ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲁⲟⲑⲉⲁⲣⲟⲁ ⲛⲓⲟⲩ ⲍⲓⲗⲁⲛⲇⲁ - ⲟⲙⲁⲛ - ϯⲡⲁⲛⲁⲙⲁ - ϯⲡⲉⲣⲟⲩ - ⲡⲟⲗⲓⲛⲉⲍⲓⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ - ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ - ϯⲫⲓⲗⲓⲡⲡⲓⲛ - ϯⲡⲁⲕⲓⲥⲑⲁⲛ - ϯⲡⲟⲗⲁⲛⲇⲁ - ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ - ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ - ⲡⲟⲩⲉⲣⲑⲟ ⲣⲓⲕⲟ - ⲫⲩⲗⲓⲥⲧⲓⲓⲙ - ϯⲡⲟⲣⲑⲟⲩⲅⲁⲗ - ⲡⲁⲗⲁⲩ - ϯⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲕⲁⲑⲁⲣ - ϯⲟⲥⲉⲁⲛⲓⲁ - ϯⲣⲉⲓⲟⲩⲛⲓⲟⲛ - ϯⲣⲟⲙⲁⲛⲓⲁ - ϯⲥⲉⲣⲃⲓⲁ - ϯⲣⲟⲩⲥⲓⲁ - ϯⲣⲟⲩⲁⲛⲇⲁ - ϯⲥⲁⲟⲩⲇⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ - ϯⲥⲓϭⲉⲗ - ϯⲥⲟⲩⲇⲁⲛ - ϯⲥⲟⲩⲉⲇ - ϯⲥⲓⲛⲅⲁⲡⲟⲣ - ⲥⲁⲛⲧ ϩⲉⲗⲁⲛⲁ - ϯⲥⲗⲟⲃⲉⲛⲓⲁ - ⲥⲃⲁⲗⲃⲁⲣⲇ & ⲓⲁⲛ ⲙⲁⲩⲉⲛ - ϯⲥⲗⲟⲃⲁⲕⲓⲁ - ϯⲥⲓⲉⲣⲁ ⲗⲉⲟⲛ - ⲥⲁⲛ ⲙⲁⲣⲓⲛⲟ - ϯⲥⲉⲛⲉⲅⲁⲗ - ϯⲥⲟⲙⲁⲗⲓⲁ - ϯⲥⲟⲩⲣⲓⲛⲁⲙ - ϯⲥⲟⲩⲇⲁⲛ ⲛ̀ⲣⲏⲥ - ⲥⲁⲟ ⲑⲟⲙⲉ & ⲡⲣⲓⲛⲥⲓⲡ - ⲉⲗ ⲥⲁⲗⲃⲁⲇⲟⲣ - ⲥⲓⲛⲧ ⲙⲁⲁⲣⲑⲉⲛ - ϯⲥⲩⲣⲓⲁ - ϯⲉⲥⲟⲩⲁⲑⲓⲛⲓ - ϯⲥⲟⲩⲁⲍⲓⲗⲁⲛⲇ - ⲑⲣⲓⲥⲑⲁⲛ ⲇⲁ ⲕⲟⲩⲛϩⲁ - ⲑⲟⲩⲣⲕϣ & ⲕⲁⲓⲕⲟⲥ - ϯϭⲁⲇ - ⲛⲓⲑⲱϣ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ ⲙ̀ⲙⲁⲣⲏⲥ - ϯⲑⲟⲅⲟ - ϯⲑⲁⲓⲗⲁⲛⲇ - ϯⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ - ⲑⲟⲕⲉⲗⲁⲩ - ϯⲑⲙⲟⲣ - ⲗⲉⲥⲑⲉ - ϯⲑⲓⲙⲟⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ϯⲑⲟⲩⲣⲕⲙⲁⲛⲓⲥⲑⲁⲛ - ϯⲑⲟⲩⲛⲓⲥ - ⲑⲟⲛⲅⲁ - ϯⲑⲟⲩⲣⲕⲓⲁ - ⲧⲣⲓⲛⲓⲇⲁⲇ & ⲧⲟⲃⲁⲅⲟ - ⲑⲟⲩⲃⲁⲗⲟⲩ - ϯⲑⲁⲓⲟⲩⲁⲛ - ϯⲑⲁⲛⲍⲁⲛⲓⲁ - ϯⲟⲩⲕⲣⲁⲛⲓⲁ - ϯⲟⲩⲅⲁⲛⲇⲁ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲁⲩⲑⲗⲁⲓⲛⲅ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁ - ⲛⲓϣ̀ⲗⲟⲗ ⲉⲧϩⲱⲧⲡ - ⲛⲓⲑⲱϣ ⲉⲧϩⲱⲧⲡ - ϯⲟⲩⲣⲟⲅⲟⲩⲁⲓ - ϯⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ϯⲃⲁⲧⲓⲕⲁⲛ - ⲥⲁⲛ ⲃⲓⲛⲥⲉⲛⲧ & ⲅⲣⲉⲛⲁⲇⲓⲛⲍ - ϯⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ - ⲃⲓⲣϫⲓⲛ ⲙⲟⲩⲓ ⲃⲣⲓⲑⲁⲛⲓⲁ - ⲃⲓⲣϫⲓⲛ ⲙⲟⲩⲓ ⲁⲙⲉⲣⲓⲕⲁ - ϯⲃⲓⲉⲑⲛⲁⲙ - ⲃⲁⲛⲁⲑⲟⲩ - ⲟⲩⲁⲗⲗⲓⲥ & ϥⲟⲩⲧⲟⲩⲛⲁ - ⲥⲁⲙⲟⲁ - ⲯⲉⲩⲇⲟ ϫⲓⲛⲧⲁⲟⲩⲟ - ⲯⲉⲩⲇⲟ ⲃⲓⲇⲓ - ϯⲕⲟⲥⲟⲃⲟ - ⲓⲉⲙⲉⲛ - ϯⲙⲁⲓⲟⲧ - ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲣⲏⲥ - ϯⲍⲁⲙⲃⲓⲁ - ϯⲍⲓⲙⲃⲁⲃⲟⲩⲉ - ⲟⲩⲙⲁ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ + ⲡⲕⲟⲥⲙⲟⲥ + ϯⲁ̀ⲫⲣⲓⲕⲏ + ϯⲁ̀ⲙⲉⲣⲓⲕⲏ ⲙ̀ⲡⲉⲙϩⲓⲧ + ϯⲁ̀ⲙⲉⲣⲓⲕⲏ ⲙ̀ⲫⲣⲏⲥ + ϯⲱ̀ⲕⲉⲁ̀ⲛⲓⲁ̀ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ϯⲁ̀ⲙⲉⲣⲓⲕⲏ ⲉⲧϧⲉⲛⲑⲙⲏϯ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲙ̀ⲡⲉⲙϩⲓⲧ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲉⲧϧⲉⲛⲑⲙⲏϯ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲉⲧⲥⲁⲣⲏⲥ + ⲛⲓⲁ̀ⲙⲉⲣⲓⲕⲏ + ϯⲁ̀ⲙⲉⲣⲓⲕⲏ ⲉⲧⲥⲁⲡⲉⲙϩⲓⲧ + ϯⲕⲁⲣⲓⲃⲓ + ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ + ϯⲁⲥⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ ⲓⲉⲃⲧ + ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲓⲣⲏⲥ + ϯⲁⲩⲥⲧⲣⲁⲗⲁⲍⲓⲁ + ϯⲙⲁⲉⲗⲁⲛⲉⲍⲓⲁ + ϯⲙⲓⲕⲣⲟⲛⲉⲍⲓⲁ + ϯⲡⲟⲗⲩⲛⲉⲍⲓⲁ + ϯⲁ̀ⲥⲓⲁ̀ + ϯⲁⲥⲓⲁ ⲛ̀ⲑⲙⲏϯ + ϯⲁⲥⲓⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ϯⲉⲩⲣⲱⲡⲏ + ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ϯⲉⲩⲣⲟⲡⲁ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ϯⲫⲣⲓⲕⲓⲁ ⲉⲧⲥⲏⲧ ⲙ̀ⲡϣⲁϥⲉ + ϯⲁ̀ⲙⲉⲣⲓⲕⲏ ⲛ̀ⲗⲁϯⲛⲟⲥ + ϯⲙⲟⲩⲓ ⲛ̀ⲁⲥⲉⲛϣⲓⲟⲛ + ⲁⲛⲇⲱⲣⲁ + ⲛⲓⲙⲉⲧⲁⲙⲓⲣⲁ ⲛ̀ⲁ̀ⲣⲁⲃⲟⲥ ⲉⲧϩⲟⲧⲡ + ⲁⲃⲅⲁⲛⲓⲥⲧⲁⲛⲏ + ⲁⲛⲧⲓⲕⲟⲩⲁ̀ ⲛⲉⲙⲃⲁⲣⲫⲟⲩⲇⲁ + ⲁⲛⲕⲟⲩⲓⲗⲁ + ⲁⲣⲃⲁⲛⲱⲛ + ϯⲁⲣⲙⲉⲛⲓⲁ̀ + ⲁⲅⲅⲱⲗⲁ + ⲁⲛⲧⲁⲣⲕⲧⲓⲕⲏ + ⲁⲣⲅⲉⲛⲧⲓⲛⲁ + ⲥⲁⲙⲟⲩⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ + ⲛⲉⲙⲓⲧⲍⲓⲁ̀ + ⲁⲩⲥⲑⲣⲏⲗⲓⲁ̀ + ⲁ̀ⲣⲟⲩⲃⲁ + ⲛⲓⲙⲟⲩⲓ̀ ⲛ̀ⲱ̀ⲗⲁⲛⲇ + ⲁ̀ⲇⲟⲩⲣⲃⲁⲇⲁⲅⲁⲛ + ⲃⲟⲥⲛⲓⲁ ⲛⲉⲙ ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲏ + ⲃⲁⲣⲃⲁⲇⲟⲥ + ⲃⲁⲅⲅⲗⲁⲇⲏϣ + ⲃⲉⲗⲅⲓⲁ̀ + ⲃⲟⲩⲣⲕⲓⲛⲁ ϥⲁⲥⲱ + ⲃⲟⲩⲗⲅⲁⲣⲓⲁ̀ + ⲡⲓⲃⲁϩⲣⲏⲓⲛ + ⲡⲟⲩⲣⲟⲩⲛϯ + ⲃⲉⲛⲓⲛ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲃⲁⲣⲑⲟⲗⲟⲙⲉⲟⲥ + ⲃⲉⲣⲉⲙⲟⲩⲇⲁ + ⲃⲣⲟⲩⲛⲏⲓ + ⲃⲟⲗⲏⲃⲓⲁ̀ + ⲛⲓⲕⲁⲧⲟ ⲛ̀ⲭⲱⲣⲁ ⲛ̀ⲕⲁⲣⲁⲓⲃ + ⲃⲣⲁⲍⲓⲗ + ⲛⲓⲡⲁϩⲁⲙⲁ + ⲡⲟⲩⲑⲁⲛ + ⲑⲙⲟⲩⲓ ⲙ̀ⲡⲟⲩⲃⲏ + ⲃⲟⲧⲥⲟⲩⲁ̀ⲛⲁ + ⲃⲉⲗⲟⲣⲱⲥⲓⲁ̀ + ⲃⲉⲗⲓⲥ + ⲕⲁⲛⲁⲇⲁ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ + ⲭⲱⲅⲅⲟ ⲕⲓⲛϣⲁⲥⲁ + ⲡⲓϩⲉⲃⲇⲏⲙⲱⲥⲓⲟⲛ ⲛ̀ⲇⲉⲙⲟⲕⲣⲁⲧⲓⲕⲟⲥ ⲭⲱⲅⲅⲟ + ⲡⲓϩⲉⲃⲇⲏⲙⲱⲥⲓⲟⲛ ⲛ̀ⲁⲫⲣⲓⲕⲁⲛⲟⲥ ⲉⲧϧⲉⲛⲑⲙⲏϯ + ⲭⲱⲅⲅⲟ ⲃⲣⲁⲍⲁⲃⲓⲗ + ⲭⲱⲅⲅⲟ + ϩⲉⲗⲃⲉⲧⲓⲁ̀ + ⲕⲟⲧ ⲇⲓⲃⲟⲩⲁⲣ + ϯⲡⲁⲣⲁⲗⲓⲁ̀ ⲛ̀ⲉ̀ⲗⲉⲫⲁⲛⲧⲓⲛⲟⲛ + ⲛⲉⲛⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ + ϭⲓⲗⲓ + ⲕⲁⲙⲙⲁⲣⲱⲛ + ⲧⲥⲓⲛⲁ + ⲕⲟⲗⲟⲙⲃⲓⲁ̀ + ϯⲙⲟⲩⲓ ⲛ̀ⲕⲗⲓⲡⲉⲣⲑⲟⲛ + ⲥⲁⲣⲕ + ⲭⲟⲥⲧⲁ ⲣⲓⲕⲁ + ⲭⲟⲩⲃⲁ + ϯⲁ̀ⲫⲉ ⲉⲧⲟⲩⲉⲧⲟⲩⲱⲧ + ⲕⲟⲩⲣⲁⲥⲁⲟ̀ + ϯⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ + ⲕⲩⲡⲣⲟⲥ + ϭⲏⲕⲓⲁ̀ + ⲡⲓϩⲉⲃⲇⲏⲙⲟⲥⲓⲱⲛ ⲛ̀ϭⲏⲕ + ⲅⲉⲣⲙⲁⲛⲓⲁ̀ + ⲇⲓⲉⲅⲟ ⲅⲁⲣⲥⲓⲁ + ϫⲓⲃⲟⲩϯ + ⲇⲁⲛⲓⲁ̀ + ⲇⲟⲙⲓⲛⲓⲕⲁ + ⲑⲇⲏⲙⲟⲕⲣⲁⲧⲓⲁ ⲛ̀ⲧⲉⲇⲟⲙⲓⲛⲓⲕⲁ + ⲛⲓⲛⲏⲥⲟⲥ + ⲥⲉⲡⲧⲏ ⳤ ⲙⲉⲗⲓⲗⲓⲁ̀ + ⲡⲓⲉⲕⲟⲩⲁⲇⲱⲣ + ⲉⲥⲧⲱⲛⲓⲁ̀ + ⲭⲏⲙⲓ + ⲡϣⲁϥⲉ ⲛ̀ⲧⲉ ⲡⲉⲙⲉⲛⲧ + ⲉ̀ⲣⲩⲑⲣⲉⲁ̀ + ϯⲥⲡⲁⲛⲓⲁ̀ + ⲉ̀ⲑⲓⲟ̀ⲡⲓⲁ̀ + ϯⲙⲉⲧϩⲱⲧⲡ ⲛ̀ⲉⲩⲣⲱⲡⲉⲟⲥ + ⲧⲍⲱⲛⲏ ⲛ̀ⲉⲩⲣⲱⲡⲏ + ⲫⲓⲛⲗⲁⲛⲇⲓⲁ + ϥⲓϫⲓ + ϥⲱⲗⲕⲗⲁⲛⲇ ⲛⲓⲙⲟⲩⲓ + ϥⲱⲗⲕⲗⲁⲛⲇ ⲛⲓⲙⲟⲩⲓ (ⲛⲉⲛⲙⲟⲩⲓ ⲙ̀ⲙⲁⲗⲟⲩⲓ̀ⲛⲁⲥ) + ⲙⲓⲕⲣⲟⲛⲏⲥⲓⲁ + ⲛⲓⲛⲏⲥⲟⲥ ⲙ̀ⲫⲉⲣⲟⲉ + ⲫⲣⲁⲅⲅⲓⲁ̀ + ⲅⲁⲃⲟⲛ + ϯⲙⲉⲧⲟⲩⲣⲟ ⲉⲧϩⲟⲧⲡ + ⲅⲉⲣⲛⲁⲇⲁ + ⲕⲉⲣⲅⲓⲁ̀ + ⲅⲟⲩⲓⲁ̀ⲛⲁ ⲙ̀ⲫⲣⲁⲅⲅⲟⲥ + ⲅⲉⲣⲛⲉⲥⲓ + ⲅⲁⲛⲁ + ⲅⲓⲃⲣⲁⲗⲧⲁⲣ + ⲅⲣⲓⲛⲗⲁⲛⲧⲏ + ⲅⲁⲙⲃⲓⲁ̀ + ⲅⲓⲛⲉⲁ + ⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ + ⲅⲓⲛⲉⲁ ⲙ̀ⲫⲏ ⲉⲧⲉⲣϣⲏϣ + ⲉⲗⲗⲁⲇⲁ + ⲛⲓⲛⲏⲥⲟⲥ ⲙ̀ⲫⲣⲏⲥ ⲛ̀ⲧⲉⲅⲉⲱⲣⲅⲓⲁ̀ ⳤ ⲥⲁⲛⲇⲟⲩⲓϭ + ⲅⲟⲩⲁ̀ⲧⲉⲙⲁⲗⲁ + ⲅⲟⲩⲁⲙ + ⲅⲓⲛⲉⲁ ⲃⲓⲥⲁⲩ + ⲅⲟⲩⲓⲁ̀ⲛⲁ + ϩⲱⲅⲅ ⲭⲱⲅⲅ + ⲑⲛⲏⲥⲟⲥ ⲛ̀ϩⲉⲣⲇ ⳤ ⲛⲉⲛⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲇⲟⲛⲁⲗⲇ + ϩⲟⲛⲇⲟⲩⲣⲁⲥ + ⲭⲣⲱⲃⲁⲧⲓⲁ̀ + ϩⲁⲓ̀ϯ + ⲟⲩⲅⲅⲣⲓⲁ̀ + ⲛⲓⲛⲏⲥⲟⲥ ⲛ̀ⲕⲁⲛⲁⲣⲓⲁ̀ + ⲓⲛⲇⲟⲛⲏⲥⲓⲁ + ⲓⲉⲣⲛⲏ + ⲡⲓⲥⲣⲁⲏⲗ + ⲑⲛⲏⲥⲟⲥ ⲙ̀ⲙⲁⲛ + ⲡⲓϩⲉⲛⲧⲟⲩ + ⲛⲉⲛⲕⲁϩⲓ ⲙ̀ⲃⲣⲉⲧⲁⲛⲓⲁ̀ ⲛⲁ ⲡⲓⲱ̀ⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ + ⲡⲓⲁⲣⲭⲏⲡⲉⲗⲁⲅⲟ ⲛ̀ϭⲁⲅⲟⲥ + ⲓⲉⲣⲁⲕ + ⲓ̀ⲣⲁⲛ + ⲓⲥⲗⲁⲛⲧⲏ + ϯϩⲩⲧⲁⲗⲓⲁ̀ + ϫⲏⲣⲥⲓ + ϫⲁⲙⲏⲓⲕⲁ + ⲡⲓⲟⲣⲇⲁⲛⲏⲥ + ⲓ̀ⲏ̀ⲗⲓⲟ̀ⲡⲟⲛ + ϯⲕⲉⲛⲩⲁ + ⲕⲓⲣⲕⲓⲥⲧⲁⲛⲏ + ⲕⲁⲙⲡⲟⲧⲍⲏ + ⲕⲓⲣⲓⲃⲁⲧⲓ + ⲛⲓⲕⲟⲙⲉⲣⲟⲥ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲭⲣⲓⲥⲧⲟⲫⲟⲣⲟⲥ ⲛⲉⲙⲛⲓⲉ̀ⲃⲉⲥ + ⲕⲟⲣⲉⲁ ⲙⲡⲉⲙϩⲓⲧ + ⲕⲟⲣⲉⲁ ⲙⲙⲁⲣⲏⲥ + ⲡⲓⲁⲗⲕⲟⲩⲏⲓⲧ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ + ⲕⲁⲍⲁⲕⲓⲥⲧⲁⲛⲏ + ⲗⲁⲟⲥ + ⲡⲓⲗⲓⲃⲁⲛⲟⲥ + ϯⲁ̀ⲅⲓⲁ̀ ⲗⲟⲩⲕⲓⲁ̀ + ⲗⲓϧⲧⲉⲛϣⲑⲏⲓⲛ + ϣⲉⲣⲓⲗⲁⲛⲕⲏ + ⲗⲓⲃⲉⲣⲓⲁ̀ + ⲗⲉⲥⲟⲧⲟ + ⲗⲓⲧⲟⲩⲁ̀ⲛⲓⲁ̀ + ⲗⲟⲩⲕⲥⲉⲙⲃⲟⲩⲣⲅⲟⲥ + ⲗⲁⲧⲟⲩⲓⲁ̀ + ϯⲗⲩⲃⲏ + ⲙⲁⲩⲣⲟⲕⲟⲥ + ⲙⲟⲛⲁⲭⲱ + ⲙⲟⲗⲇⲁⲃⲓⲁ̀ + ⲡⲧⲱⲟⲩ ⲛ̀ⲭⲁⲙⲉ + ⲡⲓⲁ̅ⲥ̅ ⲙⲁⲣⲧⲓⲛⲟⲥ + ϯⲙⲁⲇⲁⲅⲁⲥⲕⲁⲣⲓ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲙⲁⲣϣⲁⲗ + ⲑⲙⲁⲕⲉⲇⲟⲛⲓⲁ̀ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲙⲁⲗⲓ + ⲙⲓⲁⲛⲙⲁ + ⲙⲟⲅⲅⲱⲗⲓⲁ̀ + ⲙⲁⲕⲁⲟ + ⲛⲓⲙⲟⲓ ⲙ̀ⲡⲉⲙϩⲓⲧ ⲙ̀ⲙⲁⲣⲓⲁⲛⲁ + ⲙⲁⲣⲧⲓⲛⲓⲕⲁ + ⲙⲁⲩⲣⲓⲧⲁⲛⲓⲁ̀ + ⲙⲟⲛⲥⲉⲣⲁⲧ + ⲙⲉⲗⲓⲧⲏ + ⲡⲓⲙⲁⲩⲣⲓⲕⲓⲟⲥ + ⲙⲁⲗⲇⲏϥ + ⲙⲁⲗⲁⲩⲓ + ⲙⲏⲝⲓⲕⲟ + ⲙⲁⲗⲁⲓⲥⲓⲁ̀ + ⲙⲟⲥⲁⲙⲃⲓⲕ + ⲛⲁⲙⲓⲃⲓⲁ̀ + ⲛⲓⲟⲩ ⲕⲁⲗⲉⲇⲟⲛⲓⲁ + ⲛⲓϫⲏⲣ + ϯⲛⲏⲥⲟⲥ ⲛⲱϥⲟⲗⲕ + ⲛⲓⲅⲩⲣⲓⲁ + ⲛⲓⲕⲁⲣⲁⲕⲟⲩⲁ + ⲛⲓⲕⲁⲧⲟ ⲛ̀ⲭⲱⲣⲁ + ⲛⲟⲣⲃⲏⲅⲓⲁ̀ + ⲛⲉⲫⲁⲗ + ⲛⲁⲩⲣⲟⲩ + ⲛⲓⲟⲩⲉ + ⲍⲏⲗⲁⲛⲧ ⲙ̀ⲃⲉⲣⲓ + ⲁⲟⲧⲉⲁⲣⲟⲁ ⲛⲉⲁ ⲍⲏⲗⲁⲛⲇⲓⲁ + ⲟ̀ⲙⲁⲛ + ⲡⲁⲛⲁⲙⲁ + ⲡⲉⲣⲟⲩ + ⲡⲟⲗⲩⲛⲏⲥⲓⲁ ⲛⲅⲁⲗⲗⲓⲕⲏ + ⲡⲁⲡⲟⲩⲟⲥ ⲛⲉⲁ̀ ⲅⲟⲩⲓ̀ⲛⲉⲁ̀ + ⲫⲓⲗⲓⲡⲡⲓⲛⲉⲥ + ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲡⲟⲗⲱⲛⲓⲁ̀ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲡⲉⲧⲣⲟⲥ ⲛⲉⲙⲙⲓⲕⲉⲗⲱⲛ + ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ + ⲡⲟⲩⲏⲣⲧⲟ ⲣⲓⲕⲟ + ⲫⲩⲗⲓⲥⲧⲓⲓⲙ + ϯⲡⲁⲗⲉⲥⲧⲓⲛⲏ + ⲡⲟⲣⲧⲟⲩⲅⲁⲗⲗⲓⲁ + ⲡⲁⲗⲁⲩ + ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲕⲁⲑⲁⲣ + ϯⲟⲥⲉⲁⲛⲓⲁ + ⲣⲉⲓⲟⲩⲛⲓⲟⲛ + ⲣⲟⲩⲙⲁⲛⲓⲁ̀ + ⲥⲉⲣⲃⲓⲁ̀ + ⲣⲱⲥⲓⲁ̀ + ⲣⲟⲩⲁⲛⲇⲁ + ϯⲙⲉⲧⲟⲩⲣⲟ ⲛ̀ⲧⲁⲣⲁⲃⲓⲁ̀ ⲛ̀ⲛⲓϣⲉⲛ̀ⲥⲁⲩⲟⲩⲧ + ⲛⲉⲛⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲱⲛ + ⲥⲉⲩⲭⲉⲗⲗⲉⲥ + ⲥⲟⲩⲇⲁⲛ + ⲥⲟⲩⲏ̀ⲧⲍⲓⲁ̀ + ⲥⲓⲅⲕⲁⲡⲟⲩⲣⲏ + ϯⲁ̀ⲅⲓⲁ̀ ⲉ̀ⲗⲉⲛⲏ + ⲥⲗⲟⲃⲏⲛⲓⲁ̀ + ⲥⲃⲁⲗⲃⲁⲣⲇ ⳤ ⲅⲓⲁⲛ ⲙⲁⲅⲉⲛ + ⲥⲗⲟⲃⲁⲕⲓⲁ̀ + ⲥⲓⲉⲣⲁ ⲗⲉⲟⲛⲉ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲙⲁⲣⲓⲛⲟⲥ + ϯⲥⲁⲣⲅⲁⲛⲓⲁ̀ + ⲥⲱⲙⲁⲗⲓⲁ̀ + ⲥⲟⲩⲣⲓⲛⲁⲙ + ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲫⲣⲏⲥ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲑⲱⲙⲁⲥ ⳤ ⲡⲣⲓⲛⲕⲓⲡⲟⲥ + ⲉⲗⲥⲁⲗⲃⲁⲇⲟⲣ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲙⲁⲣⲧⲓⲛⲟⲥ + ϯⲥⲩⲣⲓⲁ̀ + ⲉ̀ⲥⲟⲩⲁ̀ϯⲛⲓ + ⲥⲟⲩⲁ̀ⲍⲓⲗⲉⲛⲇ + ⲑⲣⲓⲥⲑⲁⲛ ⲇⲁ ⲕⲟⲩⲛϩⲁ + ⲛⲉⲛⲙⲟⲩⲓ ⲛ̀ⲛⲓⲧⲟⲩⲣⲕⲥ ⲛⲉⲙⲛⲓⲭⲏⲓⲕⲟⲥ + ϭⲁⲇ + ⲛⲉⲛⲕⲁϩⲓ ⲙ̀ⲫⲣⲁⲅⲅⲓⲁ̀ ⲉⲧⲥⲁⲣⲏⲥ + ⲧⲟⲅⲟ + ⲑⲁⲓ + ⲧⲁϭⲓⲕⲓⲥⲧⲁⲛⲏ + ⲧⲟⲕⲉⲗⲁⲩ + ⲧⲓⲙⲟⲣ + ⲧⲓⲙⲟⲣ ⲛⲧⲉ ⲡⲓⲓⲉⲃⲧ + ⲧⲟⲩⲣⲕⲙⲉⲛⲓⲥⲧⲁⲛⲏ + ⲧⲟⲩⲛⲓⲥ + ⲧⲟⲅⲅⲁ + ⲧⲓⲟⲩⲣⲕⲓⲏ + ⲧⲟⲩⲣⲕⲓⲁ̀ + ⲧⲣⲓⲛⲓⲧⲁⲇ ⲛⲉⲙⲧⲟⲃⲁⲕⲟ + ⲧⲟⲩⲃⲁⲗⲟⲩ + ⲑⲁⲓ̀ⲟⲩⲁⲛ + ⲧⲁⲛⲍⲁⲛⲓⲁ̀ + ⲟⲩⲭⲣⲁⲛⲓⲁ̀ + ⲟⲩⲅⲁⲛⲧⲁ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲁⲩⲑⲗⲁⲓⲛⲅ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁ + ⲛⲓⲉⲑⲛⲟⲥ ⲉⲧϩⲟⲣⲡ + ⲛⲓⲉ̀ⲝⲟⲩⲥⲓⲁ̀ ⲉⲧϩⲟⲧⲡ + ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + ⲟⲩⲥⲃⲉⲕⲓⲥⲧⲁⲛⲏ + ⲃⲁⲧⲓⲕⲁⲛⲟⲥ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲃⲓⲕⲉⲛⲧⲓⲟⲥ ⲛⲉⲙⲛⲓⲙⲟⲩⲓ ⲛ̀ⲅⲉⲣⲛⲁⲇⲓⲟⲥ + ⲃⲉⲛⲉⲥⲟⲩⲏ̀ⲗⲁ + ⲛⲉⲛⲙⲟⲩⲓ ⲛ̀ⲛⲓⲡⲁⲣⲑⲉⲛⲟⲥ ⲙ̀ⲃⲣⲉⲧⲁⲛⲟⲥ + ⲛⲉⲛⲙⲟⲩⲓ ⲛ̀ⲛⲓⲡⲁⲣⲑⲉⲛⲟⲥ ⲛ̀ⲁ̀ⲙⲉⲣⲓⲕⲁⲛⲟⲥ + ⲃⲓⲉⲧⲛⲁⲙ + ⲟⲩⲁⲛⲟⲩⲁ̀ⲧⲟⲩ + ⲟⲩⲁⲗⲗⲓⲥ & ϥⲟⲩⲧⲟⲩⲛⲁ + ⲥⲁⲙⲟⲁ + ϩⲁⲛⲯⲉⲩⲇⲟ ⲛ̀ϫⲓⲛⲥⲁϫⲓ + ⲯⲉⲩⲇⲟ ⲃⲓⲇⲓ + ⲭⲱⲥⲟⲩⲟ̀ + ⲓⲏⲙⲉⲛ + ⲙⲁⲓⲱⲧ + ϯⲁ̀ⲫⲣⲓⲕⲏ ⲙ̀ⲫⲣⲏⲥ + ⲍⲁⲙⲃⲓⲁ̀ + ⲍⲓⲙⲫⲁⲡⲟⲩⲓ + ⲟⲩⲙⲁ ⲛ̀ⲁⲧⲉⲙⲓ ⲉⲣⲟϥ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ + ⲑⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ + ⲡⲓⲥ̀ⲙⲟⲧ ⲙ̀ⲡⲓϩⲁⲧ + ⲭⲣⲏⲙⲁ + ⲧⲕⲩⲕⲗⲟⲥ ⲛ̀ⲧⲉ ϯⲟⲩⲛⲟⲩ + ϯⲙⲉⲧⲑⲱϣ ⲙ̀ⲡⲕⲱϣ ⲙ̀ⲡⲓϧⲓⲣ + ⲡϣⲓ + ϯⲏⲡⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲇⲁ - ⲣⲉⲙⲛ̀ⲃⲟⲩⲇⲁ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ - ⲣⲉⲙⲛ̀ϭⲓⲛⲁ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ - ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲅⲓ - ⲣⲉⲙⲛ̀ⲇⲁⲛⲅⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ - ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ - ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ - ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲉⲃⲣⲉⲟⲥ - ⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ - ϯⲙⲉⲧϩⲓϫⲣⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲁ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ) - ⲣⲉⲙⲛⲛ̀ϩⲓϫⲣⲓ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ) - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ - ϯⲙⲉⲧϩⲓϫⲣⲓ (ⲟⲩⲙ ⲁⲗ ⲕⲟⲩⲣⲁ) - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ (ⲣⲟⲙⲡⲓ ⲛ̀ϣⲱⲣⲡ) - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ - ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲥⲟⲥ - ⲣⲉⲙⲛ̀ⲡⲉⲣⲥⲟⲥ - ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲓⲛⲅⲟⲩⲟ - ⲙⲓⲛⲅⲟⲩⲟ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϣⲁⲙϣⲉⲃⲟⲩⲇⲇⲁⲥ + ⲙⲃⲟⲩⲇⲓⲥⲧⲏⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ + ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ + ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛⲇⲁⲅⲅⲓ + ⲛⲇⲁⲅⲅⲓ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ + ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ + ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ ⲛ̀ⲁⲙⲉⲑⲉ ⲁⲗⲉⲙ + ⲑⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲅⲣⲏⲅⲟⲣⲓⲟⲥ + ⲛⲅⲣⲏⲅⲟⲣⲓⲟⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲉⲃⲣⲉⲟⲥ + ⲙⲉⲧϩⲉⲃⲣⲉⲟⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ + ϯⲙⲉⲧϩⲓϫⲣⲓ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲁ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ) + ⲣⲉⲙⲛⲛ̀ϩⲓϫⲣⲓ (ⲑⲁⲃⲩⲗⲁⲣ, ⲉⲡⲟϧ) + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ϩⲓϫⲣⲓ + ϯⲙⲉⲧϩⲓϫⲣⲓ (ⲟⲩⲙ ⲁⲗ ⲕⲟⲩⲣⲁ) + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲉⲧⲅⲣⲩⲅⲟⲣⲓⲟⲥ (ⲣⲟⲙⲡⲓ ⲛ̀ϣⲱⲣⲡ) + ⲛⲅⲣⲏⲅⲟⲣⲓⲟⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ + ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛⲓ + ⲑⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲡⲉⲣⲥⲏⲥ + ⲣⲉⲙⲛ̀ⲡⲉⲣⲥⲟⲥ + ϯⲙⲉⲧⲥⲱⲟⲩⲧⲉⲛ ⲙ̀ⲙⲓⲛⲅⲟⲩⲟ + ⲙⲓⲛⲅⲟⲩⲟ + ϯⲙⲉⲧⲱⲡ ⲙ̀ⲡⲓⲥ̀ⲙⲟⲧ ⲙ̀ⲡⲓϩⲁⲧ + ϯⲙⲉⲧⲱⲡ + ⲡⲓⲥ̀ⲙⲟⲧ ⲙ̀ⲡⲓϩⲁⲧ ⲛ̀ϩⲟⲣⲟⲥ + ϩⲟⲣⲟⲥ + ⲫⲙⲟⲩϣⲧ + ⲡⲓⲥⲟⲃϯ ⲙ̀ⲡϩⲟⲣⲟⲥ + ϩⲟⲣⲟⲥ + ⲉ̀ⲙⲱϫⲓ + ⲡⲥϧⲁⲓ + ⲡ̀ϫⲓⲛⲥⲟⲃϯ ⲛ̀ⲧⲉ ϯⲟⲩⲛⲟⲩ (0–11) + ⲡ̀ϫⲓⲛⲥⲟⲃϯ ⲛ̀ⲧⲉ ϯⲟⲩⲛⲟⲩ (1 - 12) + ⲡ̀ϫⲓⲛⲥⲟⲃϯ ⲛ̀ⲧⲉ ϯⲟⲩⲛⲟⲩ (0–23) + ⲡ̀ϫⲓⲛⲥⲟⲃϯ ⲛ̀ⲧⲉ ϯⲟⲩⲛⲟⲩ (1–24) + ⲡ̀ⲃⲟⲃⲉⲣ ⲙ̀ⲡⲕⲱϣ ⲙ̀ⲡⲓϧⲓⲣ + ⲃⲟⲣⲃⲉⲣ + ⲡ̀ⲕⲱϣ ⲙ̀ⲡⲓϧⲓⲣ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ + ⲉⲧϧⲉⲛⲟⲩⲧⲁⲡⲥ + ⲡⲕⲱϣ ⲙ̀ⲡⲓϧⲓⲣ ⲉⲧⲑⲏϣ + ⲑⲱϣ + ⲭⲁⲙⲁ ⲙⲡⲧⲏⲣϥ + ⲟⲓⲕⲟⲛⲟⲙⲓ ⲙⲡⲧⲏⲣϥ + ⲉⲧϧⲉⲛⲟⲩⲧⲁⲡⲥ + ⲭⲁϥ ϧⲉⲛϩⲁⲛⲗⲉⲝⲓⲥ + ⲡϣⲓ ⲙ̀ⲙⲉⲧⲣⲟⲛ + ⲡϣⲓ ⲙ̀ⲙⲉⲧⲣⲟⲛ + ⲡϣⲓ ⲙ̀ⲙⲉⲧⲁⲩⲧⲟⲕⲣⲁⲧⲱⲣ + ⲡϣⲓ ⲛ̀ⲁ̀ⲙⲉⲣⲓⲕⲏ + ϯⲏⲡⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲛⲉⲙϩⲉⲛⲧⲟⲩ + ϯⲏⲡⲓ ⲛ̀ⲁⲣⲙⲉⲛⲓⲟⲥ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲃⲁⲅⲅⲗⲁ + ⲛⲓⲧⲏⲃ ⲛ̀ϭⲁⲕⲙⲁ + ⲛⲓⲧⲏⲃ ⲛ̀ⲇⲉⲃⲁⲛⲁⲅⲁⲣⲓ + ⲛⲓⲏⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ + ϯⲏⲡⲓ ⲛ̀ⲅⲣⲏⲅⲟⲣⲓⲟⲥ + ϯⲏⲡⲓ ⲛ̀ⲟⲩⲉⲓⲛⲓⲛ + ⲛⲓⲏⲡⲓ ⲛ̀ⲅⲟⲩϫⲁⲣⲁⲑⲓ + ⲛⲓⲏⲡⲓ ⲛ̀ⲅⲟⲩⲣⲙⲟⲩϧⲓ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧϭⲓⲛⲁ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧϭⲓⲛⲁ ⲙ̀ⲙⲉⲧⲣⲉϥϯϩⲁⲧ ⲛ̀ϩⲁⲡⲗⲟⲩⲥ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧϭⲓⲛⲁ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧϭⲓⲛⲁ ⲙ̀ⲙⲉⲧⲣⲉϥϯϩⲁⲧ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ + ϯⲏⲡⲓ ⲛ̀ϩⲉⲃⲣⲉⲟⲥ + ⲛⲓⲧⲏⲃ ⲙ̀ⲙⲉⲧϫⲁⲃⲁⲛⲓ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧⲓⲁⲡⲁⲛⲓ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧⲣⲉϥϯϩⲁⲧ ⲙ̀ⲙⲉⲧⲓⲁⲡⲁⲛⲓ + ⲛⲓⲧⲏⲃ ⲙ̀ⲙⲉⲧϧⲙⲉⲣ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲧⲕⲁⲛⲛⲁⲇⲁ + ⲛⲓⲧⲏⲃ ⲙ̀ⲙⲉⲧⲗⲁⲟ + ⲛⲓⲧⲏⲃ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲁⲗⲁⲓⲁⲗⲁⲙ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲉⲑⲉⲓ ⲙⲁⲓⲉⲕ + ⲛⲓⲏⲡⲓ ⲙ̀ⲙⲓⲁⲛⲙⲁⲣ + ⲛⲓⲏⲡⲓ ⲛ̀ⲟⲗ ϭⲓⲕⲓ + ⲛⲓⲏⲡⲓ ⲛ̀ⲟⲇⲓⲁ + ϯⲏⲡⲓ ⲛ̀ⲣⲱⲙⲉⲟⲥ + ⲛⲓⲏⲡⲓ ⲛ̀ⲣⲉⲙⲑⲁⲙⲓⲗ ⲛ̀ⲣⲉⲙⲕⲁϩⲥ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲑⲁⲙⲓⲗ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲑⲉⲗⲟⲩⲅⲟⲩ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲑⲁⲓ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲑⲓⲃⲉⲧ + ⲛⲓⲧⲏⲃ ⲛ̀ⲣⲉⲙⲃⲁⲓ - ϯⲁⲥⲡⲓ: {0} - ⲡ̀ϫⲓⲛⲥ̀ϧⲁⲓ: {0} - ϯⲭⲱⲣⲁ: {0} + ϯⲁⲥⲡⲓ: {0} + ϯⲓ̀ⲉⲡⲥϧⲁⲓ: {0} + ⲡⲓⲙⲉⲣⲟⲥ: {0} @@ -622,3587 +695,4106 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ⲑⲱⲟⲩⲧ - Ⲡⲁⲟⲡⲓ - Ⲁⲑⲱⲣ - Ⲭⲟⲓⲁⲕ - Ⲧⲱⲃⲓ - Ⲙⲉϣⲓⲣ - Ⲡⲁⲣⲉⲙϩⲁⲧ - Ⲫⲁⲣⲙⲟⲩⲑⲓ - Ⲡⲁϣⲟⲛⲥ - Ⲡⲁⲱⲛⲓ - Ⲉⲡⲓⲡ - Ⲙⲉⲥⲱⲣⲓ - Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ - - - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ - ⲉ̅ - ⲋ̅ - ⲍ̅ - ⲏ̅ - ⲑ̅ - ⲓ̅ - ⲓ̅ⲁ̅ - ⲓ̅ⲃ̅ - ⲓ̅ⲅ̅ + ⲑⲱⲟⲩⲧ + ⲡⲁⲟ̀ⲡⲓ + ⲁ̀ⲑⲱⲣ + ⲭⲟⲓⲁⲕ + ⲧⲱⲃⲓ + ⲙⲉⲭⲓⲣ + ⲫⲁⲙⲉⲛⲱⲑ + ⲫⲁⲣⲙⲟⲩⲑⲓ + ⲡⲁϣⲱⲛⲥ + ⲡⲁⲱ̀ⲛⲓ + ⲉ̀ⲡⲏⲡ + ⲙⲉⲥⲱⲣⲏ + ⲡⲓⲉ̅ ⲛ̀ⲧⲉⲡⲓⲧⲉⲩⲧⲉⲣⲟⲛ - Ⲑⲱⲟⲩⲧ - Ⲡⲁⲟⲡⲓ - Ⲁⲑⲱⲣ - Ⲭⲟⲓⲁⲕ - Ⲧⲱⲃⲓ - Ⲙⲉϣⲓⲣ - Ⲡⲁⲣⲉⲙϩⲁⲧ - Ⲫⲁⲣⲙⲟⲩⲑⲓ - Ⲡⲁϣⲟⲛⲥ - Ⲡⲁⲱⲛⲓ - Ⲉⲡⲓⲡ - Ⲙⲉⲥⲱⲣⲓ - Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ + ⲑⲱⲟⲩⲧ + ⲡⲁⲟⲡⲓ + ⲁⲑⲱⲣ + ⲭⲟⲓⲁⲕ + ⲧⲱⲃⲓ + ⲙⲉⲭⲓⲣ + ⲫⲁⲙⲉⲛⲱⲑ + ⲫⲁⲣⲙⲟⲩⲑⲓ + ⲡⲁϣⲱⲛⲥ + ⲡⲁⲱⲛⲓ + ⲉⲡⲏⲡ + ⲙⲉⲥⲱⲣⲏ + ⲡⲓⲉ̅ ⲛ̀ⲧⲉⲡⲓⲧⲉⲩⲧⲉⲣⲟⲛ - Ⲑⲱⲟⲩⲧ - Ⲡⲁⲟⲡⲓ - Ⲁⲑⲱⲣ - Ⲭⲟⲓⲁⲕ - Ⲧⲱⲃⲓ - Ⲙⲉϣⲓⲣ - Ⲡⲁⲣⲉⲙϩⲁⲧ - Ⲫⲁⲣⲙⲟⲩⲑⲓ - Ⲡⲁϣⲟⲛⲥ - Ⲡⲁⲱⲛⲓ - Ⲉⲡⲓⲡ - Ⲙⲉⲥⲱⲣⲓ - Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ + ⲑⲱⲟⲩⲧ + ⲡⲁⲟ̀ⲡⲓ + ⲁ̀ⲑⲱⲣ + ⲭⲟⲓⲁⲕ + ⲧⲱⲃⲓ + ⲙⲉⲭⲓⲣ + ⲫⲁⲙⲉⲛⲱⲑ + ⲫⲁⲣⲙⲟⲩⲑⲓ + ⲡⲁϣⲱⲛⲥ + ⲡⲁⲱ̀ⲛⲓ + ⲉ̀ⲡⲏⲡ + ⲙⲉⲥⲱⲣⲏ + ⲡⲓⲉ̅ ⲛ̀ⲧⲉⲡⲓⲧⲉⲩⲧⲉⲣⲟⲛ - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ - ⲉ̅ - ⲋ̅ - ⲍ̅ - ⲏ̅ - ⲑ̅ - ⲓ̅ - ⲓ̅ⲁ̅ - ⲓ̅ⲃ̅ - ⲓ̅ⲅ̅ + ⲁ̅ + ⲃ̅ + ⲅ̅ + ⲇ̅ + ⲉ̅ + ⲋ̅ + ⲍ̅ + ⲏ̅ + ⲑ̅ + ⲓ̅ + ⲓ̅ⲁ̅ + ⲓ̅ⲃ̅ + ⲓ̅ⲅ̅ - Ⲑⲱⲟⲩⲧ - Ⲡⲁⲟⲡⲓ - Ⲁⲑⲱⲣ - Ⲭⲟⲓⲁⲕ - Ⲧⲱⲃⲓ - Ⲙⲉϣⲓⲣ - Ⲡⲁⲣⲉⲙϩⲁⲧ - Ⲫⲁⲣⲙⲟⲩⲑⲓ - Ⲡⲁϣⲟⲛⲥ - Ⲡⲁⲱⲛⲓ - Ⲉⲡⲓⲡ - Ⲙⲉⲥⲱⲣⲓ - Ⲡⲓⲕⲟⲩϫⲓ ⲛ̀ⲁ̀ⲃⲟⲧ + ⲑⲱⲟⲩⲧ + ⲡⲁⲟⲡⲓ + ⲁⲑⲱⲣ + ⲭⲟⲓⲁⲕ + ⲧⲱⲃⲓ + ⲙⲉⲭⲓⲣ + ⲫⲁⲙⲉⲛⲱⲑ + ⲫⲁⲣⲙⲟⲩⲑⲓ + ⲡⲁϣⲱⲛⲥ + ⲡⲁⲱⲛⲓ + ⲉⲡⲏⲡ + ⲙⲉⲥⲱⲣⲏ + ⲡⲓⲉ̅ ⲛ̀ⲧⲉⲡⲓⲧⲉⲩⲧⲉⲣⲟⲛ + + + + + G y MMMM d, EEEE + + + + + G y MMMM d + + + + + G y MMM d + + + + + GGGGG y-MM-dd + + + + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + + GGGGG y-MM-dd + GGGGG y-MM + GGGGG y-MM-dd + GGGGG y-MM-dd, E + + + + GGGGG y-MM – GGGGG y-MM + GGGGG y-MM – y-MM + GGGGG y-MM – y-MM + + + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – GGGGG y-MM-dd + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + + + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – GGGGG y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + + + GGGGG y-MM – y-MM + GGGGG y-MM – y-MM + + + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + + + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + + + + - ⲓⲁⲛⲟⲩⲁⲣⲓ - ⲫⲉⲃⲣⲟⲩⲁⲣⲓ - ⲙⲁⲣⲧⲓ - ⲁⲡⲣⲓⲗⲓ - ⲙⲁⲓⲟ - ⲓⲟⲩⲛⲓⲟⲩ - ⲓⲟⲩⲗⲓⲟⲩ - ⲁⲩⲅⲟⲩⲥⲑⲟⲩ - ⲥⲉⲡⲧⲉⲙⲃⲣⲓ - ⲟⲕⲧⲱⲃⲣⲓ - ⲛⲟⲉⲙⲃⲣⲓ - ⲇⲉⲕⲉⲙⲃⲣⲓ + ⲓ̅ⲁ̅ⲛ̅ + ⲫ̅ⲉ̅ⲃ̅ + ⲙ̅ⲁ̅ⲣ̅ + ⲁ̅ⲡ̅ⲣ̅ + ⲙ̅ⲁ̅ⲓ̅ + ⲓ̅ⲩ̅ⲛ̅ + ⲓ̅ⲩ̅ⲗ̅ + ⲁ̅ⲩ̅ⲅ̅ + ⲥ̅ⲉ̅ⲡ̅ + ⲟ̅ⲕ̅ⲧ̅ + ⲛ̅ⲟ̅ⲉ̅ + ⲇ̅ⲉ̅ⲕ̅ - Ⲓ - Ⲫ - Ⲙ - Ⲁ - Ⲙ - Ⲓ - Ⲓ - Ⲁ - Ⲥ - Ⲟ - Ⲛ - Ⲇ + J + F + M + A + M + J + J + A + S + O + N + D - ⲓⲁⲛⲟⲩⲁⲣⲓ - ⲫⲉⲃⲣⲟⲩⲁⲣⲓ - ⲙⲁⲣⲧⲓ - ⲁⲡⲣⲓⲗⲓ - ⲙⲁⲓⲟ - ⲓⲟⲩⲛⲓⲟⲩ - ⲓⲟⲩⲗⲓⲟⲩ - ⲁⲩⲅⲟⲩⲥⲑⲟⲩ - ⲥⲉⲡⲧⲉⲙⲃⲣⲓ - ⲟⲕⲧⲱⲃⲣⲓ - ⲛⲟⲉⲙⲃⲣⲓ - ⲇⲉⲕⲉⲙⲃⲣⲓ + ⲓⲁⲛⲟⲩⲁ̀ⲣⲓⲟⲥ + ⲫⲉⲃⲣⲟⲩⲁ̀ⲣⲓⲟⲥ + ⲙⲁⲣⲧⲟⲥ + ⲁ̀ⲡⲣⲓⲗⲓⲟⲥ + ⲙⲁⲓⲟⲥ + ⲓⲟⲩⲛⲓⲟⲥ + ⲓⲟⲩⲗⲓⲟⲥ + ⲁⲩⲅⲟⲩⲥⲧⲟⲥ + ⲥⲉⲡⲧⲉⲙⲃⲣⲓⲟⲥ + ⲟ̀ⲕⲧⲟⲙⲃⲣⲓⲟⲥ + ⲛⲟⲉⲙⲃⲣⲓⲟⲥ + ⲇⲉⲕⲉⲙⲃⲣⲓⲟⲥ - ⲓⲁⲛⲟⲩⲁⲣⲓ - ⲫⲉⲃⲣⲟⲩⲁⲣⲓ - ⲙⲁⲣⲧⲓ - ⲁⲡⲣⲓⲗⲓ - ⲙⲁⲓⲟ - ⲓⲟⲩⲛⲓⲟⲩ - ⲓⲟⲩⲗⲓⲟⲩ - ⲁⲩⲅⲟⲩⲥⲑⲟⲩ - ⲥⲉⲡⲧⲉⲙⲃⲣⲓ - ⲟⲕⲧⲱⲃⲣⲓ - ⲛⲟⲉⲙⲃⲣⲓ - ⲇⲉⲕⲉⲙⲃⲣⲓ + ⲓ̅ⲁ̅ⲛ̅ + ⲫ̅ⲉ̅ⲃ̅ + ⲙ̅ⲁ̅ⲣ̅ + ⲁ̅ⲡ̅ⲣ̅ + ⲙ̅ⲁ̅ⲓ̅ + ⲓ̅ⲩ̅ⲛ̅ + ⲓ̅ⲩ̅ⲗ̅ + ⲁ̅ⲩ̅ⲅ̅ + ⲥ̅ⲉ̅ⲡ̅ + ⲟ̅ⲕ̅ⲧ̅ + ⲛ̅ⲟ̅ⲉ̅ + ⲇ̅ⲉ̅ⲕ̅ - Ⲓ - Ⲫ - Ⲙ - Ⲁ - Ⲙ - Ⲓ - Ⲓ - Ⲁ - Ⲥ - Ⲟ - Ⲛ - Ⲇ + J + F + M + A + M + J + J + A + S + O + N + D - ⲓⲁⲛⲟⲩⲁⲣⲓ - ⲫⲉⲃⲣⲟⲩⲁⲣⲓ - ⲙⲁⲣⲧⲓ - ⲁⲡⲣⲓⲗⲓ - ⲙⲁⲓⲟ - ⲓⲟⲩⲛⲓⲟⲩ - ⲓⲟⲩⲗⲓⲟⲩ - ⲁⲩⲅⲟⲩⲥⲑⲟⲩ - ⲥⲉⲡⲧⲉⲙⲃⲣⲓ - ⲟⲕⲧⲱⲃⲣⲓ - ⲛⲟⲉⲙⲃⲣⲓ - ⲇⲉⲕⲉⲙⲃⲣⲓ + ⲓⲁⲛⲟⲩⲁ̀ⲣⲓⲟⲥ + ⲫⲉⲃⲣⲟⲩⲁ̀ⲣⲓⲟⲥ + ⲙⲁⲣⲧⲟⲥ + ⲁ̀ⲡⲣⲓⲗⲓⲟⲥ + ⲙⲁⲓⲟⲥ + ⲓⲟⲩⲛⲓⲟⲥ + ⲓⲟⲩⲗⲓⲟⲥ + ⲁⲩⲅⲟⲩⲥⲧⲟⲥ + ⲥⲉⲡⲧⲉⲙⲃⲣⲓⲟⲥ + ⲟ̀ⲕⲧⲟⲙⲃⲣⲓⲟⲥ + ⲛⲟⲉⲙⲃⲣⲓⲟⲥ + ⲇⲉⲕⲉⲙⲃⲣⲓⲟⲥ - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ - - - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ - - - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ + ⲡⲓⲁ̅ + ⲡⲓⲃ̅ + ⲡⲓⲅ̅ + ⲡⲓⲇ̅ + ⲡⲓⲉ̅ + ⲡⲓⲋ̅ + ⲡⲓⲍ̅ - ⲡⲓⲟⲩⲁⲓ - ⲡⲓⲥ̀ⲛⲁⲩ - ⲡⲓϣⲟⲙⲧ - ⲡⲓϥ̀ⲧⲟⲩ - ⲡⲓⲧ̀ⲓⲟⲩ - ⲡⲓⲥⲟⲟⲩ - ⲡⲓϣⲁϣϥ + ϯⲕⲩⲣⲓⲁ̀ⲕⲏ + ⲡⲓⲥⲛⲁⲩ + ⲡⲓϣⲟⲙⲧ + ⲡⲓϥⲧⲱⲟⲩ + ⲡⲓⲧⲓⲟⲩ + ϯⲡⲁⲣⲁⲥⲕⲉⲩⲏ̀ + ⲡⲓⲥⲁⲃⲃⲁⲧⲟⲛ - - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ - - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ - - - ⲡⲓⲁ̅ - ⲡⲓⲃ̅ - ⲡⲓⲅ̅ - ⲡⲓⲇ̅ - ⲡⲓⲉ̅ - ⲡⲓⲋ̅ - ⲡⲓⲍ̅ + ⲡⲓⲁ̅ + ⲡⲓⲃ̅ + ⲡⲓⲅ̅ + ⲡⲓⲇ̅ + ⲡⲓⲉ̅ + ⲡⲓⲋ̅ + ⲡⲓⲍ̅ - ⲡⲓⲟⲩⲁⲓ - ⲡⲓⲥ̀ⲛⲁⲩ - ⲡⲓϣⲟⲙⲧ - ⲡⲓϥ̀ⲧⲟⲩ - ⲡⲓⲧ̀ⲓⲟⲩ - ⲡⲓⲥⲟⲟⲩ - ⲡⲓϣⲁϣϥ + ϯⲕⲩⲣⲓⲁ̀ⲕⲏ + ⲡⲓⲥⲛⲁⲩ + ⲡⲓϣⲟⲙⲧ + ⲡⲓϥⲧⲱⲟⲩ + ⲡⲓⲧⲓⲟⲩ + ϯⲡⲁⲣⲁⲥⲕⲉⲩⲏ̀ + ⲡⲓⲥⲁⲃⲃⲁⲧⲟⲛ - ⲡⲓⲁ̅ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲃ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲅ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲇ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - - - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ + ⲡⲓⲁ̅ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩⲃ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩⲅ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩⲇ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓϩⲟⲩⲓⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲥ̀ⲛⲁⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩϣⲟⲙⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩϥ̀ⲧⲟⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓϩⲟⲩⲓⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩⲥ̀ⲛⲁⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩϣⲟⲙⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲡⲓⲙⲁϩϥ̀ⲧⲟⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ - - ⲡⲓⲁ̅ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲃ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲅ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲇ︦ ⲛ̀ⲣⲉϥⲧⲟⲩ - - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ - - - ⲡⲓϩⲟⲩⲓⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩⲥ̀ⲛⲁⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩϣⲟⲙⲧ ⲛ̀ⲣⲉϥⲧⲟⲩ - ⲡⲓⲙⲁϩϥ̀ⲧⲟⲩ ⲛ̀ⲣⲉϥⲧⲟⲩ + ⲁ̅ + ⲃ̅ + ⲅ̅ + ⲇ̅ - Ϧ︦Ⲙ︦ - Ⲙ︦Ⲙ︦ + ϧⲙ + ⲙⲙ - Ϧ︦Ⲙ︦ - Ⲙ︦Ⲙ︦ + ϧ + ⲙ - ϧⲁϫⲉⲛ ⲙⲉⲣⲓ - ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ + ϧⲙ + ⲙⲙ - Ϧ︦Ⲙ︦ - Ⲙ︦Ⲙ︦ + ϧⲙ + ⲙⲙ - Ϧ︦Ⲙ︦ - Ⲙ︦Ⲙ︦ + ϧⲙ + ⲙⲙ - ϧⲁϫⲉⲛ ⲙⲉⲣⲓ - ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ + ϧⲙ + ⲙⲙ - ϧⲁϫⲉⲛ ⲡⲓⲭⲣⲓⲥⲧⲟⲥ - ϧⲁϫⲉⲛ ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲓⲛⲟⲛ - ⲙⲉⲛⲉⲛⲥⲁ ⲡⲓⲭⲣⲓⲥⲧⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲓⲛⲟⲛ + ϧⲁϫⲉⲛ ⲡⲓⲭⲣⲓⲥⲧⲟⲥ + ϧⲁϫⲉⲛ ⲡⲓⲉⲱⲛ ⲛ̀ⲕⲓⲛⲟⲛ + ⲛ̀ϯⲣⲟⲙⲡⲓ ⲛ̀ⲧⲉⲡ⳪︦ + ⲡⲓⲉⲱⲛ ⲛ̀ⲕⲓⲛⲟⲛ - ϧⲁϫⲉⲛ ⲡⲭ︦ⲥ︦ - Ϧ︦Ⲥ︦Ⲕ︦ - ⲙⲉⲛⲉⲛⲥⲁ ⲡⲭ︦ⲥ︦ - Ⲥ︦Ⲕ︦ + ϧⲁϫⲉⲛ ⲡⲭ︦ⲥ︦ + Ϧ︦Ⲥ︦Ⲕ︦ + ⳪︦ + Ⲥ︦Ⲕ︦ + + ⳪︦ + + + + + EEEE, MMMM d, y + + + + + MMMM d, y + + + + + MMM d, y + + + + + M/d/yy + + + + + + + h:mm:ss a zzzz + + + + + h:mm:ss a z + + + + + h:mm:ss a + + + + + h:mm a + + + - {1}, {0} + {1}, {0} + + + {1} 'at' {0} + + + {1} 'at' {0} - {1}, {0} + {1}, {0} + + + {1} 'at' {0} + + + {1} 'at' {0} - {1}, {0} + {1}, {0} - {1}, {0} + {1}, {0} - E h:mm a - E h:mm:ss a - h:mm a - h:mm:ss a - h:mm:ss a v - h:mm a v + GGGGG y-MM-dd + + + GGGGG y-MM – GGGGG y-MM + GGGGG y-MM – y-MM + GGGGG y-MM – y-MM + + + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – GGGGG y-MM-dd + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + + + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – GGGGG y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + GGGGG y-MM-dd, E – y-MM-dd, E + + - ⲙⲟⲩϩ. - ⲥⲁϥ. - ⲣⲁⲃ. I - ⲣⲁⲃ. II - ϫⲟⲩⲙ. I - ϫⲟⲩⲙ. II - ⲣⲁϫ. - ϣⲁ. - ⲣⲁⲙ. - ϣⲁⲩ. - ⲇⲟⲩⲗ-ⲕ. - ⲇⲟⲩⲗ-ϩ. - - - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ - ⲉ̅ - ⲋ̅ - ⲍ̅ - ⲏ̅ - ⲑ̅ - ⲓ̅ - ⲓ̅ⲁ̅ - ⲓ̅ⲃ̅ + ⲁ̅ⲛ̅ⲑ̅ + ⲥ̅ⲃ̅ⲣ̅ + ⲑ̅ⲩ̅ⲛ̅ ⲁ̅ + ⲑ̅ⲩ̅ⲛ̅ ⲃ̅ + ⲇ̅ⲓ̅ⲧ̅ ⲁ̅ + ⲇ̅ⲓ̅ⲧ̅ ⲃ̅ + ⲣ̅ⲓ̅ⲃ̅ + ⲥ̅ⲃ̅ⲕ̅ + ⲣ̅ⲁ̅ⲃ̅ + ⲍ̅ⲁ̅ⲃ̅ + ⲁ̅ⲑ̅ⲣ̅ + ⲁ̅ⲣ̅ⲃ̅ - ⲙⲟⲩϩⲁⲣⲣⲁⲙ - ⲥⲁϥⲁⲣ - ⲣⲁⲃⲓʻ I - ⲣⲁⲃⲓʻ II - ϫⲟⲩⲙⲁⲇⲁ I - ϫⲟⲩⲙⲁⲇⲁ II - ⲣⲁϫⲁⲃ - ϣⲁʻⲃⲁⲛ - ⲣⲁⲙⲁⲇⲁⲛ - ϣⲁⲟⲩⲁⲗ - ⲇⲟⲩⲗ-ⲕⲓʻⲇⲁϩ - ⲇⲟⲩⲗ-ϩⲓϫϫⲁ + ⲁⲛⲑⲩⲙⲟⲥ + ⲥⲓⲃⲓⲣ + ⲑⲩⲛⲓⲡⲟⲣⲓⲥ ⲁ̅ + ⲑⲩⲛⲓⲡⲟⲣⲓⲥ ⲃ̅ + ⲇⲓⲧⲓⲟⲥ ⲁ̅ + ⲇⲓⲧⲓⲟⲥ ⲃ̅ + ⲣⲓⲃⲟⲥ + ⲥⲓⲃⲓⲕⲟⲛ + ⲣⲁⲃⲓⲍⲱⲛ + ⲍⲁⲃⲓⲗⲟⲥ + ⲁⲑⲣⲓⲟⲥ + ⲁⲣⲃⲓⲕⲟⲥ - ⲙⲟⲩϩ. - ⲥⲁϥ. - ⲣⲁⲃ. I - ⲣⲁⲃ. II - ϫⲟⲩⲙ. I - ϫⲟⲩⲙ. II - ⲣⲁϫ. - ϣⲁ. - ⲣⲁⲙ. - ϣⲁⲩ. - ⲇⲟⲩⲗ-ⲕ. - ⲇⲟⲩⲗ-ϩ. + ⲁ̅ⲛ̅ⲑ̅ + ⲥ̅ⲃ̅ⲣ̅ + ⲑ̅ⲩ̅ⲛ̅ ⲁ̅ + ⲑ̅ⲩ̅ⲛ̅ ⲃ̅ + ⲇ̅ⲓ̅ⲧ̅ ⲁ̅ + ⲇ̅ⲓ̅ⲧ̅ ⲃ̅ + ⲣ̅ⲓ̅ⲃ̅ + ⲥ̅ⲃ̅ⲕ̅ + ⲣ̅ⲁ̅ⲃ̅ + ⲍ̅ⲁ̅ⲃ̅ + ⲁ̅ⲑ̅ⲣ̅ + ⲁ̅ⲣ̅ⲃ̅ - ⲁ̅ - ⲃ̅ - ⲅ̅ - ⲇ̅ - ⲉ̅ - ⲋ̅ - ⲍ̅ - ⲏ̅ - ⲑ̅ - ⲓ̅ - ⲓ̅ⲁ̅ - ⲓ̅ⲃ̅ + ⲁ̅ + ⲃ̅ + ⲅ̅ + ⲇ̅ + ⲉ̅ + ⲋ̅ + ⲍ̅ + ⲏ̅ + ⲑ̅ + ⲓ̅ + ⲓ̅ⲁ̅ + ⲓ̅ⲃ̅ - ⲙⲟⲩϩⲁⲣⲣⲁⲙ - ⲥⲁϥⲁⲣ - ⲣⲁⲃⲓʻ I - ⲣⲁⲃⲓʻ II - ϫⲟⲩⲙⲁⲇⲁ I - ϫⲟⲩⲙⲁⲇⲁ II - ⲣⲁϫⲁⲃ - ϣⲁʻⲃⲁⲛ - ⲣⲁⲙⲁⲇⲁⲛ - ϣⲁⲟⲩⲁⲗ - ⲇⲟⲩⲗ-ⲕⲓʻⲇⲁϩ - ⲇⲟⲩⲗ-ϩⲓϫϫⲁ + ⲁⲛⲑⲩⲙⲟⲥ + ⲥⲓⲃⲓⲣ + ⲑⲩⲛⲓⲡⲟⲣⲓⲥ ⲁ̅ + ⲑⲩⲛⲓⲡⲟⲣⲓⲥ ⲃ̅ + ⲇⲓⲧⲓⲟⲥ ⲁ̅ + ⲇⲓⲧⲓⲟⲥ ⲃ̅ + ⲣⲓⲃⲟⲥ + ⲥⲓⲃⲓⲕⲟⲛ + ⲣⲁⲃⲓⲍⲱⲛ + ⲍⲁⲃⲓⲗⲟⲥ + ⲁⲑⲣⲓⲟⲥ + ⲁⲣⲃⲓⲕⲟⲥ - ⲁϩ + ⲁϩ + + + + EEEE, MMMM d, y G + + + + + MMMM d, y G + + + + + MMM d, y G + + + + + M/d/y GGGGG + + + + + + d E + y G + M/d/y GGGGG + MMM y G + MMM d, y G + E, MMM d, y G + M/d + E, M/d + E, MMM d + y G + y G + M/y GGGGG + M/d/y GGGGG + E, M/d/y GGGGG + MMM y G + MMM d, y G + E, MMM d, y G + MMMM y G + QQQ y G + QQQQ y G + + - ⲡ̀ⲥⲏⲟⲩ + ⲡⲉⲱⲛ - ⲡ̀ⲥⲏⲟⲩ + ⲡⲉⲱⲛ - ⲡ̀ⲥⲏⲟⲩ + ⲡⲉⲱⲛ - ⲣⲟⲙⲡⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ - ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ + ⲑⲣⲟⲙⲡⲓ + ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ + ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ + + in {0} years + + + {0} years ago + - ⲣⲟⲙⲡⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ - ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ + ⲑⲣⲟⲙⲡⲓ + + in {0} yr. + + + {0} yr. ago + - ⲣⲟⲙⲡⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲧⲁⲥⲥⲓⲛⲓ - ⲧⲁⲓⲣⲟⲙⲡⲓ ⲑⲁⲓ - ϯⲣⲟⲙⲡⲓ ⲉⲑⲛⲏⲟⲩ + ⲑⲣⲟⲙⲡⲓ + + in {0}y + + + {0}y ago + - ⲣⲉϥⲧⲟⲩ - ⲡⲓⲣⲉϥⲧⲟⲩ ⲛ̀ϧⲁⲉ - ⲡⲁⲓⲣⲉϥⲧⲟⲩ - ⲡⲓⲣⲉϥⲧⲟⲩ ⲉⲑⲛⲏⲟⲩ + ⲧⲉⲧⲣⲁⲧⲟⲛ + ⲡⲓⲣⲉϥⲧⲟⲩ ⲛ̀ϧⲁⲉ + ⲡⲁⲓⲣⲉϥⲧⲟⲩ + ⲡⲓⲣⲉϥⲧⲟⲩ ⲉⲑⲛⲏⲟⲩ + + in {0} quarters + + + {0} quarters ago + - ⲣⲉϥⲧⲟⲩ + ⲧⲉⲧⲣⲁⲧⲟⲛ + + in {0} qtrs. + + + {0} qtrs. ago + - ⲣⲉϥⲧⲟⲩ + ⲧⲉⲧⲣⲁⲧⲟⲛ + + in {0}q + + + {0}q ago + - ⲁⲃⲟⲧ - ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ - ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ + ⲡⲁⲃⲟⲧ + ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ + ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ + + in {0} months + + + {0} months ago + - ⲁⲃⲟⲧ - ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ - ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ + ⲡⲁⲃⲟⲧ + + in {0} mo. + + + {0} mo. ago + - ⲁⲃⲟⲧ - ⲡⲓⲁⲃⲟⲧ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲃⲟⲧ ⲫⲁⲓ - ⲡⲓⲁⲃⲟⲧ ⲉⲑⲛⲏⲟⲩ + ⲡⲁⲃⲟⲧ + + in {0}mo + + + {0}mo ago + - ⲁⲛϣⲁϣϥ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ + ⲧⲉⲃⲇⲱⲙⲁⲥ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲑⲁⲓⲉⲃⲇⲱⲙⲁⲥ ⲑⲁⲓ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲑⲛⲏⲟⲩ + + in {0} weeks + + + {0} weeks ago + - ⲁⲛϣⲁϣϥ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ + ⲧⲉⲃⲇⲱⲙⲁⲥ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲑⲁⲓⲉⲃⲇⲱⲙⲁⲥ ⲑⲁⲓ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲑⲛⲏⲟⲩ + + in {0} wk. + + + {0} wk. ago + - ⲁⲛϣⲁϣϥ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁⲛϣⲁϣϥ ⲫⲁⲓ - ⲡⲓⲁⲛϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ + ⲧⲉⲃⲇⲱⲙⲁⲥ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲑⲁⲓⲉⲃⲇⲱⲙⲁⲥ ⲑⲁⲓ + ϯⲉⲃⲇⲱⲙⲁⲥ ⲉⲑⲛⲏⲟⲩ + + in {0}w + + + {0}w ago + - ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ + ⲧⲉⲃⲇⲱⲙⲁⲥ ⲛ̀ⲧⲉⲡⲓⲁ̀ⲃⲟⲧ - ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ + ⲧⲉⲃⲇⲱⲙⲁⲥ ⲛ̀ⲧⲉⲡⲓⲁ̀ⲃⲟⲧ - ⲁⲛϣⲁϣϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ + ⲧⲉⲃⲇⲱⲙⲁⲥ ⲛ̀ⲧⲉⲡⲓⲁ̀ⲃⲟⲧ - ⲉϩⲟⲟⲩ - ⲛ̀ⲥⲁϥ - ⲙ̀ⲫⲟⲟⲩ - ⲛ̀ⲣⲁⲥϯ + ⲡⲉϩⲟⲟⲩ + ⲥⲁϥ + ⲫⲟⲟⲩ + ⲣⲁⲥϯ + + in {0} days + + + {0} days ago + - ⲉϩⲟⲟⲩ - ⲛ̀ⲥⲁϥ - ⲙ̀ⲫⲟⲟⲩ - ⲛ̀ⲣⲁⲥϯ + ⲡⲉϩⲟⲟⲩ + ⲥⲁϥ + ⲫⲟⲟⲩ + ⲣⲁⲥϯ + + in {0} days + + + {0} days ago + - ⲉϩⲟⲟⲩ - ⲛ̀ⲥⲁϥ - ⲙ̀ⲫⲟⲟⲩ - ⲛ̀ⲣⲁⲥϯ + ⲡⲉϩⲟⲟⲩ + ⲥⲁϥ + ⲫⲟⲟⲩ + ⲣⲁⲥϯ + + in {0}d + + + {0}d ago + - ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲣⲟⲙⲡⲓ - ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲣⲟⲙⲡⲓ - ⲉϩⲟⲟⲩ ⲛ̀ϯⲣⲟⲙⲡⲓ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲣⲟⲙⲡⲓ - ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲉⲃⲇⲱⲙⲁⲥ - ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲉⲃⲇⲱⲙⲁⲥ - ⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϣϥ + ⲡⲉϩⲟⲟⲩ ⲛ̀ⲧⲉϯⲉⲃⲇⲱⲙⲁⲥ - ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ - - - ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ - - - ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ + ⲛⲓⲉϩⲟⲟⲩ ⲙ̀ⲡⲓⲁⲛϣⲁϥ ⲙ̀ⲡⲓⲁⲃⲟⲧ - ⲡⲓⲟⲩⲁⲓ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲟⲩⲁⲓ ⲫⲁⲓ - ⲡⲓⲟⲩⲁⲓ ⲉⲑⲛⲏⲟⲩ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲧⲁⲓⲕⲩⲣⲓⲁⲕⲏ ⲑⲁⲓ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲑⲛⲏⲟⲩ + + in {0} Sundays + + + {0} Sundays ago + - ⲡⲓⲁ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁ̅ ⲫⲁⲓ - ⲡⲓⲁ̅ ⲉⲑⲛⲏⲟⲩ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲧⲁⲓⲕⲩⲣⲓⲁⲕⲏ ⲑⲁⲓ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲑⲛⲏⲟⲩ + + in {0} Sun. + + + {0} Sun. ago + - ⲡⲓⲁ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲁ̅ ⲫⲁⲓ - ⲡⲓⲁ̅ ⲉⲑⲛⲏⲟⲩ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲧⲁⲓⲕⲩⲣⲓⲁⲕⲏ ⲑⲁⲓ + ϯⲕⲩⲣⲓⲁⲕⲏ ⲉⲑⲛⲏⲟⲩ + + in {0} Su + + + {0} Su ago + - ⲡⲓⲥ̀ⲛⲁⲩ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲥⲛⲁⲩ ⲫⲁⲓ - ⲡⲓⲥ̀ⲛⲁⲩ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲥⲛⲁⲩ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲥⲛⲁⲩ ⲫⲁⲓ + ⲡⲓⲥⲛⲁⲩ ⲉⲑⲛⲏⲟⲩ + + in {0} Mondays + + + {0} Mondays ago + - ⲡⲓⲃ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲃ̅ ⲫⲁⲓ - ⲡⲓⲃ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲃ̅ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲃ̅ ⲫⲁⲓ + ⲡⲓⲃ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Mon. + + + {0} Mon. ago + - ⲡⲓⲃ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲃ̅ ⲫⲁⲓ - ⲡⲓⲃ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} M + + + {0} M ago + - ⲡⲓϣⲟⲙⲧ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓϣⲟⲙⲧ ⲫⲁⲓ - ⲡⲓϣⲟⲙⲧ ⲉⲑⲛⲏⲟⲩ + ⲡⲓϣⲟⲙⲧ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓϣⲟⲙⲧ ⲫⲁⲓ + ⲡⲓϣⲟⲙⲧ ⲉⲑⲛⲏⲟⲩ + + in {0} Tuesdays + + + {0} Tuesdays ago + - ⲡⲓⲅ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲅ̅ ⲫⲁⲓ - ⲡⲓⲅ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲅ̅ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲅ̅ ⲫⲁⲓ + ⲡⲓⲅ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Tue. + + + {0} Tue. ago + - ⲡⲓⲅ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲅ̅ ⲫⲁⲓ - ⲡⲓⲅ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Tu + + + {0} Tu ago + - ⲡⲓϥ̀ⲧⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓϥ̀ⲧⲟⲩ ⲫⲁⲓ - ⲡⲓϥ̀ⲧⲟⲩ ⲉⲑⲛⲏⲟⲩ + ⲡⲓϥⲧⲱⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓϥⲧⲱⲟⲩ ⲫⲁⲓ + ⲡⲓϥⲧⲱⲟⲩ ⲉⲑⲛⲏⲟⲩ + + in {0} Wednesdays + + + {0} Wednesdays ago + - ⲡⲓⲇ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲇ̅ ⲫⲁⲓ - ⲡⲓⲇ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓϥⲧⲱⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓϥⲧⲱⲟⲩ ⲫⲁⲓ + ⲡⲓϥⲧⲱⲟⲩ ⲉⲑⲛⲏⲟⲩ + + in {0} Wed. + + + {0} Wed. ago + - ⲡⲓⲇ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲇ̅ ⲫⲁⲓ - ⲡⲓⲇ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} W + + + {0} W ago + - ⲡⲓⲧ̀ⲓⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲧ̀ⲓⲟⲩ ⲫⲁⲓ - ⲡⲓⲧ̀ⲓⲟⲩ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲧⲓⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲧⲓⲟⲩ ⲫⲁⲓ + ⲡⲓⲧⲓⲟⲩⲥ ⲉⲑⲛⲏⲟⲩ + + in {0} Thursdays + + + {0} Thursdays ago + - ⲡⲓⲉ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲉ̅ ⲫⲁⲓ - ⲡⲓⲉ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲉ̅ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲉ̅ ⲫⲁⲓ + ⲡⲓⲉ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Thu. + + + {0} Thu. ago + - ⲡⲓⲉ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲉ̅ ⲫⲁⲓ - ⲡⲓⲉ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Th + + + {0} Th ago + - ⲡⲓⲥⲟⲟⲩ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲥⲟⲟⲩ ⲫⲁⲓ - ⲡⲓⲥⲟⲟⲩ ⲉⲑⲛⲏⲟⲩ + ϯⲡⲁⲣⲁⲥⲕⲉⲩⲏ ⲉⲧⲁⲥⲥⲓⲛⲓ + ⲧⲁⲓⲡⲁⲣⲁⲥⲕⲉⲩⲏ ⲑⲁⲓ + ϯⲡⲁⲣⲁⲥⲕⲉⲩⲏ ⲉⲑⲛⲏⲟⲩ + + in {0} Fridays + + + {0} Fridays ago + - ⲡⲓⲋ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲋ̅ ⲫⲁⲓ - ⲡⲓⲋ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲋ̅ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲋ̅ ⲫⲁⲓ + ⲡⲓⲋ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Fri. + + + {0} Fri. ago + - ⲡⲓⲋ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲋ̅ ⲫⲁⲓ - ⲡⲓⲋ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} F + + + {0} F ago + - ⲡⲓϣⲁϣϥ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓϣⲁϣϥ ⲫⲁⲓ - ⲡⲓϣⲁϣϥ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲥⲁⲃⲃⲁⲧⲟⲛ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲥⲁⲃⲃⲁⲧⲟⲛ ⲫⲁⲓ + ⲡⲓⲥⲁⲃⲃⲁⲧⲟⲛ ⲉⲑⲛⲏⲟⲩ + + in {0} Saturdays + + + {0} Saturdays ago + - ⲡⲓⲍ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲍ̅ ⲫⲁⲓ - ⲡⲓⲍ̅ ⲉⲑⲛⲏⲟⲩ + ⲡⲓⲍ̅ ⲉⲧⲁϥⲥⲓⲛⲓ + ⲡⲁⲓⲍ̅ ⲫⲁⲓ + ⲡⲓⲍ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Sat. + + + {0} Sat. ago + - ⲡⲓⲍ̅ ⲉⲧⲁϥⲥⲓⲛⲓ - ⲡⲁⲓⲍ̅ ⲫⲁⲓ - ⲡⲓⲍ̅ ⲉⲑⲛⲏⲟⲩ + + in {0} Sa + + + {0} Sa ago + - ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ + ϧⲁϫⲉⲛ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ/ⲙⲉⲛⲉⲛⲥⲁ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ - ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ + ϧⲁϫⲉⲛ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ/ⲙⲉⲛⲉⲛⲥⲁ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ - ϧⲁϫⲉⲛ ⲙⲉⲣⲓ/ⲙⲉⲛⲉⲛⲥⲁ ⲙⲉⲣⲓ + ϧⲁϫⲉⲛ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ/ⲙⲉⲛⲉⲛⲥⲁ ⲧⲫⲁϣⲓ ⲙ̀ⲡⲓⲉϩⲟⲟⲩ - ⲟⲩⲛⲟⲩ - ⲧⲁⲓⲟⲩⲛⲟⲩ ⲑⲁⲓ + ⲟⲩⲟⲩⲛⲟⲩ + ⲧⲁⲓⲟⲩⲛⲟⲩ ⲑⲁⲓ + + in {0} hours + + + {0} hours ago + - ⲟⲩⲛⲟⲩ + ⲟⲩⲟⲩⲛⲟⲩ + + in {0} hr. + + + {0} hr. ago + - ⲟⲩⲛⲟⲩ + ⲟⲩⲟⲩⲛⲟⲩ + + in {0}h + + + {0}h ago + - ⲥⲟⲩⲥⲟⲩ - ⲡⲁⲓⲥⲟⲩⲥⲟⲩ ⲫⲁⲓ + ⲟⲩⲥⲟⲩⲥⲟⲩ + ⲡⲁⲓⲥⲟⲩⲥⲟⲩ ⲫⲁⲓ + + in {0} minutes + + + {0} minutes ago + - ⲥⲟⲩⲥⲟⲩ + ⲟⲩⲥⲟⲩⲥⲟⲩ + + in {0} min. + + + {0} min. ago + - ⲥⲟⲩⲥⲟⲩ + ⲟⲩⲇⲉⲩⲧⲉⲣⲟⲥⲟⲩⲥⲟⲩ + + in {0}m + + + {0}m ago + - ⲙⲁϩⲥ̀ⲛⲁⲩ - ϯⲛⲟⲩ + ⲟⲩⲇⲉⲩⲧⲉⲣⲟⲥⲟⲩⲥⲟⲩ + ϯⲛⲟⲩ + + in {0} seconds + + + {0} seconds ago + - ⲙⲁϩⲥ̀ⲛⲁⲩ + ⲟⲩⲇⲉⲩⲧⲉⲣⲟⲥⲟⲩⲥⲟⲩ + + in {0} sec. + + + {0} sec. ago + - ⲙⲁϩⲥ̀ⲛⲁⲩ + ⲟⲩⲇⲉⲩⲧⲉⲣⲟⲥⲟⲩⲥⲟⲩ + + in {0}s + + + {0}s ago + - ϯⲍⲱⲛⲏ ⲙ̀ⲡⲓⲥⲏⲟⲩ + ⲡⲭⲣⲟⲛⲟⲥ ⲛ̀ⲧⲉϯⲍⲱⲛⲏ - ϯⲍⲱⲛⲏ + ⲧⲍⲱⲛⲏ - ϯⲍⲱⲛⲏ + ⲧⲍⲱⲛⲏ - ⲡ̀ⲥⲏⲟⲩ {0} - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ {0} - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ {0} + ⲡⲥⲏⲟⲩ {0} + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ {0} + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ {0} - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲑⲟⲗⲓⲕⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲁⲑⲟⲗⲓⲕⲟⲛ - ⲁⲧⲥⲱⲟⲩⲛ + ⲁⲧⲥⲱⲟⲩⲛ - ⲁⲛⲇⲟⲣⲣⲁ + ⲁⲛⲇⲱⲣⲁ - ⲇⲟⲩⲃⲁⲓ + ⲇⲟⲃⲁⲓ - ⲕⲁⲃⲟⲩⲗ + ⲕⲁⲃⲟⲩⲗ - ⲁⲛⲑⲓⲅⲁ + ⲁⲛⲧⲓⲅⲟⲩⲁ̀ - ⲁⲛⲅⲓⲗⲁ + ⲁⲛⲕⲟⲩⲓⲗⲁ - ⲑⲓⲣⲁⲛⲁ + ⲧⲓⲣⲁⲛⲁ - ⲓⲉⲣⲉⲃⲁⲛ + ⲓⲉⲣⲉⲃⲁⲛ - ⲗⲟⲩⲁⲛⲇⲁ + ⲗⲟⲩⲁⲛⲇⲁ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲣⲟⲑⲉⲣⲁ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲛ̀ⲣⲟⲑⲣⲉⲁ - ⲡⲁⲗⲙⲉⲣ ⲗⲁⲛⲇ + ⲡⲁⲗⲙⲉⲣ ⲗⲁⲛⲇ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲑⲣⲟⲗⲗ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲛ̀ⲧⲣⲟⲗ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ϣⲟⲩⲁ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲛ̀ϣⲟⲩⲁ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲙⲁⲩⲥⲟⲛ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲙ̀ⲙⲁⲩⲥⲟⲛ - ⲇⲁⲃⲓⲥ + ⲇⲁⲩⲓⲥ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲃⲟⲥⲑⲟⲕ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲙ̀ⲃⲟⲥⲧⲟⲕ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲕⲁⲍⲉⲓ + ⲫⲙⲁⲛϫⲱⲓⲗⲓ ⲛ̀ⲕⲏⲥⲓ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲇⲟⲩⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ + ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲇⲟⲩⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ - ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲙⲕⲙⲟⲩⲣⲇⲟ + ⲡⲓⲙⲁⲛ̀ⲟϩⲓ ⲛ̀ⲙⲕⲙⲟⲩⲣⲇⲟ - ⲣⲓⲟ ⲅⲁⲗⲗⲉⲅⲟⲥ + ⲣⲓⲟ ⲅⲁⲗⲗⲉⲅⲟⲥ - ⲙⲉⲛⲇⲟⲍⲁ + ⲙⲉⲛⲇⲟⲍⲁ - ⲥⲁⲛ ⲓⲟⲩⲁⲛ + ⲥⲁⲛ ⲓⲟⲩⲁⲛ - ⲟⲩϣⲟⲩⲟⲩⲁⲓⲁ + ⲟⲩϣⲟⲩⲟⲩⲁⲓⲁ - ⲗⲁ ⲣⲓⲟϫⲁ + ⲗⲁ ⲣⲓⲟϫⲁ - ⲥⲁⲛ ⲗⲟⲩⲓⲥ + ⲥⲁⲛ ⲗⲟⲩⲓⲥ - ⲕⲁⲑⲁⲙⲁⲣⲕⲁ + ⲕⲁⲑⲁⲙⲁⲣⲕⲁ - ⲥⲁⲗⲑⲁ + ⲥⲁⲗⲑⲁ - ϫⲟⲩϫⲟⲩⲓ + ϫⲟⲩϫⲟⲩⲓ - ⲑⲟⲩⲕⲟⲩⲙⲁⲛ + ⲑⲟⲩⲕⲟⲩⲙⲁⲛ - ⲕⲟⲣⲇⲟⲃⲁ + ⲕⲟⲣⲇⲟⲃⲁ - ⲃⲟⲩⲉⲛⲟⲥ ⲁⲓⲣⲉⲥ + ⲃⲟⲩⲉⲛⲟⲥ ⲁⲓⲣⲉⲥ - ⲡⲁⲅⲟ ⲡⲁⲅⲟ + ⲡⲁⲅⲟ ⲡⲁⲅⲟ - ⲃⲓⲉⲛⲛⲁ + ⲟⲩⲓⲏⲛⲛⲁ - ⲡⲉⲣⲑ + ⲡⲉⲣⲑ - ⲉⲩⲕⲗⲁ + ⲉⲩⲕⲗⲁ - ⲇⲁⲣⲟⲩⲓⲛ + ⲇⲁⲣⲟⲩⲓⲛ - ⲁⲇⲉⲗⲁⲓⲇ + ⲁⲇⲉⲗⲁⲓⲇ - ⲃⲣⲟⲕⲉⲛ ϩⲓⲗ + ⲃⲣⲟⲕⲉⲛ ϩⲓⲗ - ⲙⲉⲗⲃⲟⲩⲣⲛ + ⲙⲉⲗⲃⲟⲩⲣⲛ - ϩⲟⲃⲁⲣⲧ + ϩⲟⲃⲁⲣⲧ - ⲗⲓⲛⲇⲉⲙⲁⲛ + ⲗⲓⲛⲇⲉⲙⲁⲛ - ⲥⲓⲇⲛⲉⲓ + ⲥⲓⲇⲛⲉⲓ - ⲃⲣⲓⲥⲃⲁⲛ + ⲃⲣⲓⲥⲃⲁⲛ - ϯⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲟⲩⲁⲣⲓ + ϯⲙⲟⲩⲓ ⲙ̀ⲙⲁⲕⲟⲩⲁⲣⲓ - ϯⲙⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ + ϯⲙⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ - ⲁⲣⲟⲩⲃⲁ + ⲁⲣⲟⲩⲃⲁ - ⲙⲁⲣⲓⲉϩⲁⲙⲛ + ⲙⲁⲣⲓⲉϩⲁⲙⲛ - ⲃⲁⲕⲟⲩ + ⲃⲁⲭⲟⲩ - ⲥⲁⲣⲁⲓⲉⲃⲟ + ⲥⲁⲣⲁⲓⲉⲃⲟ - ⲃⲁⲣⲃⲁⲇⲟⲥ + ⲃⲁⲣⲃⲁⲇⲟⲥ - ⲇⲁⲕⲁ + ⲇⲁⲕⲁ - ⲃⲣⲟⲩⲝⲉⲗ + ⲃⲣⲟⲩⲥⲏⲗ - ⲟⲩⲁⲅⲁⲇⲟⲩⲅⲟⲩ + ⲟⲩⲁⲅⲁⲇⲟⲩⲅⲟⲩ - ⲥⲟϥⲓⲁ + ⲧⲥⲟⲫⲓⲁ - ⲃⲁϩⲣⲁⲓⲛ + ⲃⲁϩⲣⲏⲓⲛ - ⲃⲟⲩϫⲟⲩⲙⲃⲟⲩⲣⲁ + ⲃⲟⲩϫⲟⲩⲙⲃⲟⲩⲣⲁ - ⲡⲟⲣⲑⲟ-ⲛⲟⲃⲟ + ⲡⲟⲣⲑⲟ-ⲛⲟⲃⲟ - ⲥⲁⲛⲧ ⲃⲁⲣⲑⲉⲗⲉⲙⲓ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲃⲁⲣⲑⲟⲗⲟⲙⲁⲓⲟⲥ - ⲃⲉⲣⲙⲟⲩⲇⲁ + ⲃⲉⲣⲙⲟⲩⲇⲁ - ⲃⲣⲟⲩⲛⲉⲓ + ⲃⲣⲟⲩⲛⲉⲓ - ⲗⲁ ⲡⲁⲍ + ⲗⲁ ⲡⲁⲍ - ⲕⲣⲁⲗⲉⲛⲇⲓⲕ + ⲕⲣⲁⲗⲉⲛⲇⲓⲕ - ⲉⲓⲣⲟⲩⲛⲉⲡⲉ + ⲉⲓⲣⲟⲩⲛⲉⲡⲉ - ⲣⲓⲟ ⲃⲣⲁⲛⲕⲟ + ⲣⲓⲟ ⲃⲣⲁⲛⲕⲟ - ⲡⲟⲣⲑⲟ ⲃⲉⲗϩⲟ + ⲡⲟⲣⲑⲟ ⲃⲉⲗϩⲟ - ⲃⲟⲁ ⲃⲓⲥⲑⲁ + ⲃⲟⲁ ⲃⲓⲥⲑⲁ - ⲙⲁⲛⲁⲩⲥ + ⲙⲁⲛⲁⲩⲥ - ⲕⲟⲩⲓⲁⲃⲁ + ⲕⲟⲩⲓⲁⲃⲁ - ⲥⲁⲛⲑⲁⲣⲉⲙ + ⲥⲁⲛⲑⲁⲣⲉⲙ - ⲕⲁⲙⲡⲟ ⲅⲣⲁⲛⲇⲉ + ⲕⲁⲙⲡⲟ ⲅⲣⲁⲛⲇⲉ - ⲃⲉⲗⲉⲙ + ⲃⲉⲗⲉⲙ - ⲁⲣⲁⲅⲟⲩⲁⲓⲛⲁ + ⲁⲣⲁⲅⲟⲩⲁⲓⲛⲁ - ⲥⲁⲟ ⲡⲁⲩⲗⲟ + ⲥⲁⲟ ⲡⲁⲩⲗⲟ - ⲃⲁϩⲓⲁ + ⲃⲁϩⲓⲁ - ϥⲟⲣⲑⲁⲗⲉⲍⲁ + ϥⲟⲣⲑⲁⲗⲉⲍⲁ - ⲙⲁⲥⲉⲓⲟ + ⲙⲁⲥⲉⲓⲟ - ⲣⲉⲥⲓϥⲉ + ⲣⲉⲥⲓϥⲉ - ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ + ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ - ⲛⲁⲥⲥⲁⲩ + ⲛⲁⲥⲥⲁⲩ - ⲑⲓⲙⲫⲟⲩ + ⲑⲓⲙⲫⲟⲩ - ⲅⲁⲃⲟⲣⲟⲛ + ⲅⲁⲃⲟⲣⲟⲛ - ⲙⲓⲛⲥⲕ + ⲙⲓⲛⲥⲉⲕ - ⲃⲉⲗⲓⲍⲉ + ⲃⲉⲗⲓⲥ - ⲇⲁⲩⲥⲟⲛ + ⲇⲁⲩⲥⲟⲛ - ⲟⲩⲁⲓⲑϩⲱⲣⲥ + ⲟⲩⲁⲓⲑϩⲱⲣⲥ - ⲓⲛⲟⲩⲃⲓⲕ + ⲓⲛⲟⲩⲃⲓⲕ - ⲃⲁⲛⲕⲟⲩⲃⲉⲣ + ⲃⲁⲛⲕⲟⲩⲃⲉⲣ - ϥⲟⲣⲧ ⲛⲉⲗⲥⲟⲛ + ϥⲟⲣⲧ ⲛⲉⲗⲥⲟⲛ - ⲇⲁⲩⲥⲟⲛ ⲕⲣⲓⲕ + ⲇⲁⲩⲥⲟⲛ ⲕⲣⲓⲕ - ⲕⲣⲉⲥⲑⲟⲛ + ⲕⲣⲉⲥⲑⲟⲛ - ⲉⲇⲙⲟⲛⲑⲟⲛ + ⲉⲇⲙⲟⲛⲑⲟⲛ - ⲥⲟⲩⲓϥⲧ ⲕⲁⲣⲉⲛⲧ + ⲥⲟⲩⲓϥⲧ ⲕⲁⲣⲉⲛⲧ - ⲧ̀ⲕⲟⲧⲥⲓ ⲛ̀ⲕⲁⲙⲃⲣⲓⲇϫ + ⲧ̀ⲕⲟⲧⲥⲓ ⲛ̀ⲕⲁⲙⲃⲣⲓⲇϫ - ⲣⲉϫⲓⲛⲁ + ⲣⲉϫⲓⲛⲁ - ⲟⲩⲓⲛⲛⲓⲡⲉⲅ + ⲟⲩⲓⲛⲛⲓⲡⲉⲅ - ⲣⲉⲍⲟⲗⲟⲩⲑⲉ + ⲣⲉⲍⲟⲗⲟⲩⲑⲉ - ⲣⲁⲛⲕⲓⲛ ⲓⲛⲗⲉⲧ + ⲣⲁⲛⲕⲓⲛ ⲓⲛⲗⲉⲧ - ⲁⲑⲓⲕⲟⲕⲁⲛ + ⲁⲑⲓⲕⲟⲕⲁⲛ - ⲑⲟⲣⲟⲛⲑⲟ + ⲑⲟⲣⲟⲛⲑⲟ - ⲓⲕⲁⲗⲟⲩⲓⲧ + ⲓⲕⲁⲗⲟⲩⲓⲧ - ⲙⲟⲛⲕⲑⲟⲛ + ⲙⲟⲛⲕⲑⲟⲛ - ϩⲁⲗⲓϥⲁⲝ + ϩⲁⲗⲓϥⲁⲝ - ⲅⲟⲩⲥ ⲃⲁⲓ + ⲅⲟⲩⲥ ⲃⲁⲓ - ⲅⲗⲁⲥ ⲃⲁⲓ + ⲅⲗⲁⲥ ⲃⲁⲓ - ⲃⲗⲁⲛⲕ-ⲥⲁⲃⲗⲟⲛ + ⲃⲗⲁⲛⲕ-ⲥⲁⲃⲗⲟⲛ - ⲥⲁⲛⲧ ϫⲟⲛⲍ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲓⲱⲁⲛⲛⲏⲥ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ - ⲕⲓⲛϣⲁⲥⲁ + ⲕⲓⲛϣⲁⲥⲁ - ⲗⲟⲩⲃⲟⲩⲙⲃⲁϣⲓ + ⲗⲟⲩⲃⲟⲩⲙⲃⲁϣⲓ - ⲃⲁⲛⲅⲟⲩⲓ + ⲃⲁⲛⲅⲟⲩⲓ - ⲃⲣⲁⲍⲁⲃⲓⲗ + ⲃⲣⲁⲍⲁⲃⲓⲗ - ⲍⲟⲩⲣⲓϧ + ⲧⲍⲟⲩⲣⲓⲕ - ⲁⲃⲓϫⲓⲁⲛ + ⲁ̀ⲃⲓϫⲁⲛ - ⲣⲁⲣⲟⲑⲟⲛⲅⲁ + ⲣⲁⲣⲟⲑⲟⲛⲅⲁ - ⲙⲟⲩⲓ ⲛ̀ⲓⲥⲑⲉⲣ + ⲑⲙⲟⲩⲓ̀ ⲙ̀ⲡⲓⲡⲁⲥⲭⲁ - ⲕⲟⲩϩⲁⲓⲕ + ⲕⲟⲩϩⲁⲓⲕ - ⲡⲟⲩⲛⲑⲁ ⲁⲣⲉⲛⲁⲥ + ⲡⲟⲩⲛⲑⲁ ⲁⲣⲉⲛⲁⲥ - ⲥⲁⲛⲑⲓⲁⲅⲟ + ⲥⲁⲛⲑⲓⲁⲅⲟ - ⲇⲟⲩⲁⲗⲁ + ⲇⲟⲩⲁⲗⲁ - ⲟⲩⲣⲟⲩⲙⲕⲓ + ⲟⲩⲣⲟⲩⲙϭⲓ - ϣⲁⲛⲅⲁⲓ + ϣⲁⲛⲅⲁⲓ - ⲃⲟⲅⲟⲑⲁ + ⲃⲟⲅⲟⲑⲁ - ⲕⲟⲥⲑⲁ ⲣⲓⲕⲁ + ⲕⲟⲥⲑⲁ ⲣⲓⲕⲁ - ϩⲁⲃⲁⲛⲁ + ϩⲁⲃⲁⲛⲁ - ⲕⲁⲡ ⲃⲉⲣⲇ + ϯⲁⲫⲉ ⲉⲧⲟⲩⲉⲧⲟⲩⲱⲧ - ⲕⲟⲩⲣⲁⲕⲁⲟ + ⲕⲟⲩⲣⲁⲕⲁⲟ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲣⲓⲥⲧⲙⲁⲥ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲣⲓⲥⲧⲙⲁⲥ - ⲛⲓⲕⲟⲥⲓⲁ + ⲗⲉⲩⲕⲟⲩⲥⲓⲁ̀ - ϥⲁⲙⲁⲅⲟⲩⲥⲑⲁ + ⲁⲙⲙⲟⲭⲱⲥⲧⲟⲥ - ⲡⲣⲁⲅ + ⲫⲣⲁⲅ - ⲃⲟⲩⲍⲓⲛⲅⲉⲛ + ⲃⲓⲟⲩⲍⲓⲛⲅⲉⲛ - ⲃⲉⲣⲗⲓⲛ + ⲃⲉⲣⲗⲓⲛ - ϫⲓⲃⲟⲩⲑⲓ + ϫⲓⲃⲟⲩⲑⲓ - ⲕⲟⲡⲉⲛϩⲁⲅⲉⲛ + ⲕⲟⲩⲡⲁⲛⲁⲃⲉ - ⲇⲟⲙⲓⲛⲓⲕⲁ + ⲇⲟⲙⲓⲛⲓⲕⲁ - ⲥⲁⲛⲑⲟ ⲇⲟⲙⲓⲛⲅⲟ + ⲥⲁⲛⲑⲟ ⲇⲟⲙⲓⲛⲅⲟ - ⲁⲗϫⲓⲉⲣ + ⲛⲓⲛⲏⲥⲟⲥ - ⲙⲟⲩⲓ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ + ⲙⲟⲩⲓ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ - ⲅⲟⲩⲁⲓⲁⲕⲓⲗ + ⲅⲟⲩⲁⲓⲁⲕⲓⲗ - ⲑⲁⲗⲗⲓⲛ + ⲣⲉⲃⲟⲩⲗⲉ - ⲕⲁϩⲓⲣⲁ + ⲃⲁⲃⲩⲗⲱⲛ - ⲉⲗ ⲁⲓⲟⲩⲛ + ⲉⲗ ⲁⲓⲟⲩⲛ - ⲁⲥⲙⲁⲣⲁ + ⲁⲥⲙⲁⲣⲁ - ⲕⲁⲛⲁⲣⲓⲥ + ⲕⲁⲛⲁⲣⲓⲁ̀ - ⲥⲉⲩⲑⲁ + ⲥⲉⲡⲧⲟⲛ - ⲙⲁⲇⲣⲓⲇ + ⲙⲁⲇⲣⲓⲧⲏ - ⲁⲇⲓⲥ ⲁⲃⲁⲃⲁ + ⲁⲇⲓⲥ ⲁⲃⲁⲃⲁ - ϩⲉⲗⲥⲉⲛⲕⲓ + ϩⲉⲗⲥⲉⲛⲕⲓ - ϥⲓϫⲓ + ϥⲓϫⲓ - ⲥⲑⲁⲛⲗⲓ + ⲥⲑⲁⲛⲗⲓ - ϭⲟⲩⲕ + ϭⲟⲩⲕ - ⲡⲟⲛϩⲡⲉⲓ + ⲡⲟⲛϩⲡⲉⲓ - ⲕⲟⲥⲣⲁⲉ + ⲕⲟⲥⲣⲁⲉ - ϥⲁⲣⲟⲉⲥ + ϥⲁⲣⲟⲉⲥ - ⲡⲁⲣⲓⲥ + ⲡⲁⲣⲓⲥ - ⲗⲓⲃⲣⲉⲃⲓⲗ + ⲗⲓⲃⲣⲉⲃⲓⲗ - - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲃⲣⲓⲑⲁⲛⲓⲁ - - ⲗⲟⲛⲇⲟⲛ + ⲗⲟⲛⲇⲟⲛ - ⲅⲣⲉⲛⲁⲇⲁ + ⲅⲣⲉⲛⲁⲇⲁ - ⲑⲉⲃⲗⲓⲥⲓ + ⲧⲓⲫⲗⲓⲥ - ⲕⲁⲓⲉⲛⲛⲉ + ⲕⲁⲓⲉⲛⲛⲉ - ⲅⲟⲩⲉⲣⲛⲥⲓ + ⲅⲟⲩⲉⲣⲛⲥⲓ - ⲁⲕⲣⲁ + ⲁⲭⲣⲁ - ϫⲓⲃⲣⲁⲗⲑⲁⲣ + ⲅⲓⲃⲣⲁⲗⲧⲁⲣ - ⲑⲟⲩⲗⲉ + ⲑⲟⲩⲗⲉ - ⲛⲟⲩⲟⲩⲕ + ⲛⲟⲩⲟⲩⲕ - ⲓⲑⲟⲕⲟⲣⲧⲟⲣⲙⲓⲧ + ⲓⲑⲟⲕⲟⲣⲧⲟⲣⲙⲓⲧ - ⲇⲁⲛⲙⲁⲣⲕϣⲁⲃⲛ + ⲇⲁⲛⲙⲁⲣⲕϣⲁⲃⲛ - ⲃⲁⲛϫⲟⲩⲗ + ⲃⲁⲛϫⲟⲩⲗ - ⲕⲟⲛⲁⲕⲣⲓ + ⲕⲟⲛⲁⲕⲣⲓ - ⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ + ⲅⲟⲩⲁⲇⲉⲗⲟⲩⲡ - ⲙⲁⲗⲁⲃⲟ + ⲙⲁⲗⲁⲃⲟ - ⲁⲑⲏⲛⲁⲥ + ⲁ̀ⲑⲏⲛⲁⲥ - ⲅⲉⲟⲣⲅⲓⲁ ⲙ̀ⲙⲁⲣⲏⲥ + ⲅⲉⲟⲣⲅⲓⲁ ⲙ̀ⲙⲁⲣⲏⲥ - ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ + ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ - ⲅⲟⲩⲁⲙ + ⲅⲟⲩⲁⲙ - ⲃⲓⲥⲥⲁⲩ + ⲃⲓⲥⲥⲁⲩ - ⲅⲓⲁⲛⲁ + ⲅⲓⲁⲛⲁ - ϩⲟⲛⲅ ⲕⲟⲛⲅ + ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲑⲉⲅⲟⲩⲥⲓⲅⲁⲗⲡⲁ + ⲑⲉⲅⲟⲩⲥⲓⲅⲁⲗⲡⲁ - ⲍⲁⲅⲣⲉⲃ + ⲍⲁⲅⲣⲉⲃ - ⲡⲟⲣⲧ-ⲁⲩ-ⲡⲣⲓⲛⲥ + ⲫⲱⲣ ⲱ̀ ⲫⲣⲁⲛⲥ - ⲃⲟⲩⲇⲁⲡⲉⲥⲧ + ⲃⲟⲩⲇⲁⲡⲉϣⲧ - ϫⲁⲕⲁⲣⲑⲁ + ϫⲁⲕⲁⲣⲧⲁ - ⲡⲟⲛⲑⲓⲁⲛⲁⲕ + ⲡⲟⲛⲑⲓⲁⲛⲁⲕ - ⲙⲁⲕⲁⲥⲥⲁⲣ + ⲙⲁⲕⲁⲥⲥⲁⲣ - ϫⲁⲓⲁⲡⲟⲩⲣⲁ + ϫⲁⲓⲁⲡⲟⲩⲣⲁ - - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲓⲉⲣⲗⲁⲛⲇⲁ - - ⲇⲟⲩⲃⲗⲓⲛ + ⲇⲟⲩⲃⲗⲓⲛ - ⲓⲉⲣⲟⲩⲥⲁⲗⲏⲙ + ⲓⲉⲣⲟⲩⲥⲁⲗⲏⲙ - ⲁⲓⲥⲉⲗ ⲛ̀ⲙⲁⲛ + ⲑⲛⲏⲥⲟⲥ ⲙ̀ⲙⲁⲛ - ⲕⲁⲗⲕⲟⲑⲁ + ⲕⲁⲗⲕⲟⲑⲁ - ϣⲁⲅⲟⲥ + ϣⲁⲅⲟⲥ - ⲃⲁⲅⲇⲁⲇ + ⲃⲁⲅⲇⲁⲛ - ⲑⲉϩⲣⲁⲛ + ⲑⲉϩⲣⲁⲛ - ⲣⲉⲕⲓⲁⲃⲓⲕ + ⲣⲉⲕⲓⲁⲃⲓⲕ - ⲣⲱⲙⲏ + ⲣⲱⲙⲏ - ϫⲉⲣⲥⲓ + ϫⲉⲣⲥⲓ - ϫⲁⲙⲁⲓⲕⲁ + ϫⲁⲙⲁⲓⲕⲁ - ⲁⲙⲙⲁⲛ + ⲁⲙⲙⲱⲛ - ⲑⲟⲕⲓⲟ + ⲑⲱⲕⲓⲟ̀ - ⲛⲁⲓⲣⲟⲃⲓ + ⲛⲁⲓⲣⲟⲃⲓ - ⲃⲓϣⲕⲉⲕ + ⲡⲓϣⲭⲏⲕ - ⲫⲛⲟⲙ ⲡⲉⲛϩ + ⲫⲛⲟⲙ ⲡⲉⲛϩ - ⲕⲁⲛⲑⲟⲛ + ⲕⲁⲛⲑⲟⲛ - ⲕⲓⲣⲓⲑⲙⲁⲑⲓ + ⲕⲓⲣⲓⲑⲙⲁⲑⲓ - ⲑⲁⲣⲁⲟⲩⲁ + ⲑⲁⲣⲁⲟⲩⲁ - ⲕⲟⲙⲟⲣⲉⲥ + ⲕⲟⲙⲟⲣⲉⲥ - ⲥⲁⲛⲧ ⲕⲓⲑⲥ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲭⲣⲓⲥⲧⲟⲫⲟⲣⲟⲥ - ⲡⲓⲟⲛⲅⲓⲁⲛⲅ + ⲡⲓⲟⲛⲅⲓⲁⲛⲅ - ⲥⲉⲟⲩⲗ + ⲥⲉⲟⲩⲗ - ⲕⲟⲩⲁⲓⲧ + ⲕⲟⲩⲏⲓⲧ - ⲕⲁⲓⲙⲁⲛ + ⲕⲁⲓⲙⲁⲛ - ⲁⲕⲑⲁⲩ + ⲁⲕⲑⲁⲩ - ⲟⲣⲁⲗ + ⲟⲣⲁⲗ - ⲁⲑⲓⲣⲁⲩ + ⲁⲧⲓⲣⲁⲩ - ⲁⲕⲑⲟⲃ + ⲁⲕⲧⲟⲃⲏ - ⲕⲟⲥⲑⲁⲛⲁⲩ + ⲕⲟⲥⲧⲁⲛⲁⲓ - ⲕⲓⲍⲓⲗⲟⲣⲇⲁ + ⲕⲓⲍⲓⲗⲟⲣⲇⲁ - ⲁⲗⲙⲁⲑⲓ + ⲁⲗⲙⲁⲧⲓ - ⲃⲓⲉⲛⲑⲓⲁⲛ + ⲃⲓⲉⲛⲑⲓⲁⲛ - ⲃⲉⲓⲣⲟⲩⲧ + ⲃⲉⲣⲉⲧⲟⲥ - ⲥⲁⲛⲧ ⲗⲟⲩϭⲓⲁ + ϯⲁ̀ⲅⲓⲁ̀ ⲗⲟⲩⲕⲓⲁ̀ - ⲃⲁⲇⲟⲩⲍ + ϥⲁⲇⲟⲩⲧⲍ - ⲕⲟⲗⲟⲙⲃⲟ + ⲕⲟⲗⲟⲙⲃⲟ - ⲙⲟⲛⲣⲟⲃⲓⲁ + ⲙⲟⲛⲣⲟⲃⲓⲁ - ⲙⲁⲥⲉⲣⲟⲩ + ⲙⲁⲥⲉⲣⲟⲩ - ⲃⲓⲗⲛⲓⲟⲩⲥ + ⲟⲩⲓⲗⲛⲓⲟⲥ - ⲗⲟⲩⲝⲟⲙⲃⲟⲩⲣⲅ + ⲗⲟⲩⲕⲥⲉⲙⲃⲟⲩⲣⲅⲟⲥ - ⲣⲓⲅⲁ + ⲣⲏⲅⲁ - ⲑⲣⲓⲡⲟⲗⲓⲥ + ⲧⲣⲓⲡⲟⲗⲓⲥ - ⲕⲁⲍⲁⲃⲗⲁⲛⲕⲁ + ⲕⲁⲥⲁⲃⲗⲁⲛⲕⲁ - ⲙⲟⲛⲁⲕⲟ + ⲙⲟⲛⲏⲕⲟⲩ - ϭⲓⲍⲓⲛⲁⲩ + ⲕⲓϣⲓⲛⲁⲩ - ⲡⲟⲇⲅⲟⲣⲓⲕⲁ + ⲡⲟⲇⲅⲟⲣⲓⲧⲍⲁ - ⲙⲁⲣⲓⲅⲟⲧ + ⲙⲁⲣⲓⲅⲟⲧ - ⲁⲛⲑⲁⲛⲁⲛⲁⲣⲓⲃⲟ + ⲁⲛⲧⲁⲛⲁⲛⲁⲣⲓⲃⲟ - ⲕⲟⲩⲁϫⲁⲗⲉⲓⲛ ⲁⲑⲟⲗⲗ + ⲕⲟⲩⲁϫⲁⲗⲉⲓⲛ ⲁⲑⲟⲗⲗ - ⲙⲁϫⲟⲩⲣⲟ + ⲙⲁϫⲟⲩⲣⲟ - ⲥⲕⲟⲡⲓⲉ + ⲥⲕⲟⲩⲡⲏ - ⲃⲁⲙⲁⲕⲟ + ⲃⲁⲙⲁⲕⲟ - ⲓⲁⲛⲅⲟⲛ + ⲓⲁⲛⲅⲟⲛ - ϧⲟⲃⲇ + ϧⲟⲃⲇ - ⲟⲩⲗⲁⲛⲃⲁⲑⲁⲣ + ⲟⲩⲗⲁⲛⲃⲁⲑⲁⲣ - ⲙⲁⲕⲁⲩ + ⲙⲁⲕⲁⲩ - ⲥⲁⲓⲡⲁⲛ + ⲥⲁⲓⲡⲁⲛ - ⲙⲁⲣⲑⲓⲛⲓⲕ + ⲙⲁⲣⲑⲓⲛⲓⲕ - ⲛⲟⲩⲁⲕϣⲟⲧ + ⲛⲟⲩⲁⲕϣⲟⲧ - ⲙⲟⲛⲑⲥⲉⲣⲁⲧ + ⲙⲟⲛⲑⲥⲉⲣⲁⲧ - ⲙⲁⲗⲑⲁ + ⲙⲉⲗⲓⲧⲏ - ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲙⲁⲗⲇⲓⲃ + ⲙⲁⲗⲇⲓⲃ - ⲃⲗⲁⲛⲑⲓⲣ + ⲃⲗⲁⲛⲑⲓⲣ - ⲑⲓϫⲟⲩⲁⲛⲁ + ⲑⲓϫⲟⲩⲁⲛⲁ - ϩⲉⲣⲙⲟⲍⲓⲗⲗⲟ + ϩⲉⲣⲙⲟⲍⲓⲗⲗⲟ - ⲥⲓⲟⲩⲇⲁⲇ ⲓⲟⲩⲁⲣⲉⲍ + ⲥⲓⲟⲩⲇⲁⲇ ⲓⲟⲩⲁⲣⲉⲍ - ⲙⲁⲍⲁⲑⲗⲁⲛ + ⲙⲁⲍⲁⲑⲗⲁⲛ - ϣⲓϩⲟⲩⲁϩⲟⲩⲁ + ϣⲓϩⲟⲩⲁϩⲟⲩⲁ - ⲃⲁⲓⲁ ⲇⲉ ⲃⲁⲛⲇⲉⲣⲁⲥ + ⲃⲁⲓⲁ ⲇⲉ ⲃⲁⲛⲇⲉⲣⲁⲥ - ⲟϫⲓⲛⲁⲅⲁ + ⲟϫⲓⲛⲁⲅⲁ - ⲙⲟⲛⲑⲉⲣⲉⲓ + ⲙⲟⲛⲑⲉⲣⲉⲓ - ⲙⲉⲝⲓⲕⲟ ⲡⲟⲗⲓⲥ + ⲙⲉⲝⲓⲕⲟ ⲡⲟⲗⲓⲥ - ⲙⲁⲑⲁⲙⲟⲣⲟⲥ + ⲙⲁⲑⲁⲙⲟⲣⲟⲥ - ⲙⲉⲣⲓⲇⲁ + ⲙⲉⲣⲓⲇⲁ - ⲕⲁⲛⲕⲟⲩⲛ + ⲕⲁⲛⲕⲟⲩⲛ - ⲕⲟⲩⲁⲗⲁ ⲗⲟⲩⲙⲡⲟⲩⲣ + ⲕⲟⲩⲁⲗⲁ ⲗⲟⲩⲙⲡⲟⲩⲣ - ⲕⲟⲩϭⲓⲛⲅ + ⲕⲟⲩϭⲓⲛⲅ - ⲙⲁⲡⲟⲩⲑⲟ + ⲙⲁⲡⲟⲩⲑⲟ - ⲟⲩⲓⲛⲇϩⲟⲕ + ⲟⲩⲓⲛⲇϩⲟⲕ - ⲛⲟⲩⲙⲉⲁ + ⲛⲟⲩⲙⲉⲁ - ⲛⲓⲁⲙⲉⲓ + ⲛⲓⲁⲙⲉⲓ - ϯⲙⲟⲩⲓ ⲛⲛ̀ⲟⲣϥⲟⲗⲕ + ϯⲙⲟⲩⲓ ⲛⲛ̀ⲟⲣϥⲟⲗⲕ - ⲗⲁⲅⲟⲥ + ⲗⲁⲅⲟⲥ - ⲙⲁⲛⲁⲅⲟⲩⲁ + ⲙⲁⲛⲁⲅⲟⲩⲁ - ⲁⲙⲥⲑⲉⲣⲇⲁⲙ + ⲁⲙⲥⲧⲉⲣⲇⲁⲙ - ⲟⲥⲗⲟ + ⲟⲥⲗⲟ - ⲕⲁⲑⲙⲁⲛⲇⲟⲩ + ⲕⲁⲑⲙⲁⲛⲇⲟⲩ - ⲛⲁⲩⲣⲟⲩ + ⲛⲁⲩⲣⲟⲩ - ⲛⲓⲟⲩⲉ + ⲛⲓⲟⲩⲉ - ⲛⲓⲙⲟⲩⲓ ⲛ̀ϭⲁⲑⲁⲙ + ⲛⲓⲙⲟⲩⲓ ⲛ̀ϭⲁⲑⲁⲙ - ⲁⲩⲕⲗⲁⲛⲇ + ⲁⲩⲕⲗⲁⲛⲇ - ⲙⲁⲥⲕⲁⲧ + ⲙⲟⲥⲭⲁⲧ - ⲡⲁⲛⲁⲙⲁ + ⲡⲁⲛⲁⲙⲁ - ⲗⲓⲙⲁ + ⲗⲓⲙⲁ - ⲑⲁϩⲓⲑⲓ + ⲑⲁϩⲓⲑⲓ - ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ + ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ - ⲅⲁⲙⲃⲓⲉⲣ + ⲅⲁⲙⲃⲓⲉⲣ - ⲡⲟⲣⲑ ⲙⲟⲣⲉⲥⲃⲓ + ⲡⲟⲣⲑ ⲙⲟⲣⲉⲥⲃⲓ - ⲃⲟⲩⲅⲁⲓⲛⲃⲓⲗ + ⲃⲟⲩⲅⲁⲓⲛⲃⲓⲗ - ⲙⲁⲛⲓⲗⲁ + ⲙⲁⲛⲓⲗⲁ - ⲕⲁⲣⲁϭⲓ + ⲕⲁⲣⲁϭⲓ - ⲟⲩⲁⲣⲥⲟ + ⲃⲁⲣⲥⲱ - ⲥⲁⲛ-ⲡⲓⲉⲣ + ⲥⲁⲛ-ⲡⲓⲉⲣ - ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ + ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲡⲓⲑⲕⲉⲣⲛ - ⲡⲟⲩⲉⲣⲑⲟ ⲣⲓⲕⲟ + ⲡⲟⲩⲉⲣⲧⲟ ⲣⲓⲕⲟ - ⲅⲁⲍⲁ + ⲅⲁⲍⲁ - ϩⲉⲃⲣⲟⲛ + ⲭⲉⲃⲣⲱⲛ - ⲁⲍⲟⲣⲉⲥ + ⲛⲓⲁ̀ⲥⲟⲣ - ⲙⲁⲇⲉⲓⲣⲁ + ⲙⲁⲇⲏⲣⲁ - ⲗⲓϣⲃⲟⲛⲁ + ⲗⲓⲥⲥⲁⲃⲱⲛⲁ - ⲡⲁⲗⲁⲩ + ⲡⲁⲗⲁⲩ - ⲁⲥⲟⲩⲛⲥⲓⲟⲛ + ⲁⲥⲟⲩⲛⲥⲓⲟⲛ - ⲕⲁⲑⲁⲣ + ⲕⲁⲑⲁⲣ - ⲣⲉⲓⲟⲩⲛⲓⲟⲛ + ⲣⲉⲓⲟⲩⲛⲓⲟⲛ - ⲃⲟⲩϧⲁⲣⲉⲥⲧ + ⲃⲟⲩⲕⲁⲣⲏⲥⲧ - ⲃⲉⲗⲅⲣⲁⲇ + ⲃⲉⲗⲉⲅⲣⲁⲇⲁ - ⲕⲁⲗⲓⲛⲓⲛⲅⲣⲁⲇ + ⲕⲁⲗⲓⲛⲓⲛⲅⲣⲁⲇ - ⲙⲟⲥⲕⲟ + ⲙⲟⲥⲭⲱⲟⲩ - ⲃⲟⲗⲅⲟⲅⲣⲁⲇ + ⲟⲩⲟⲗⲕⲟⲅⲣⲁⲇ - ⲥⲁⲣⲁⲑⲟⲃ + ⲥⲁⲣⲁⲧⲟϥ - ⲁⲥⲑⲣⲁϧⲁⲛ + ⲁⲥⲧⲣⲁϧⲁⲛ - ⲟⲩⲗⲓⲁⲛⲟⲃⲥⲕ + ⲟⲩⲗⲓⲁ̀ⲛⲟϥⲥⲕ - ⲕⲓⲣⲟⲃ + ⲕⲩⲣⲟϥ - ⲥⲁⲙⲁⲣⲁ + ⲥⲁⲙⲁⲣⲁ - ⲓⲉⲕⲁⲑⲣⲓⲛⲃⲟⲩⲣⲅ + ⲉ̀ⲕⲁⲑⲉⲣⲓⲛⲫⲟⲩⲣⲅ - ⲟⲙⲥⲕ + ⲱⲙⲥⲕ - ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ + ⲛⲟⲩⲟⲥⲓⲃⲓⲣⲥⲕ - ⲃⲁⲣⲛⲁⲩⲗ + ⲃⲁⲣⲛⲁⲟⲩⲗ - ⲑⲟⲙⲥⲕ + ⲑⲱⲙⲥⲕ - ⲛⲟⲃⲟⲕⲟⲩⲍⲛⲉⲑⲥⲕ + ⲛⲟⲩⲟⲕⲟⲩⲍⲛⲏⲧⲥⲕ - ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ + ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ - ⲓⲣⲕⲟⲩⲑⲥⲕ + ⲓⲣⲭⲟⲩⲧⲥⲕ - ϭⲓⲑⲁ + ϭⲓⲑⲁ - ⲓⲁⲕⲟⲩⲑⲥⲕ + ⲓⲉⲭⲟⲩⲧⲥⲕ - ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ + ⲃⲗⲁⲇⲓⲟⲩⲟⲥⲑⲱⲕ - ϧⲁⲛⲇⲓⲅⲁ + ϧⲁⲛⲇⲓⲅⲁ - ⲥⲁϧⲁⲗⲓⲛ + ⲥⲁϧⲁⲗⲓⲛ - ⲟⲩⲥⲧ-ⲛⲉⲣⲁ + ⲟⲩⲥⲧ ⲛⲏⲣⲁ - ⲙⲁⲅⲁⲇⲁⲛ + ⲙⲁⲅⲁⲇⲁⲛ - ⲥⲣⲉⲇⲛⲉⲕⲟⲗⲓⲙⲥⲕ + ⲥⲣⲉⲇⲛⲉⲕⲟⲗⲓⲙⲥⲕ - ⲕⲁⲙϭⲁⲑⲕⲁ + ⲕⲁⲙϭⲁⲧⲕⲁ - ⲁⲛⲁⲇⲓⲣ + ⲁ̀ⲛⲁⲇⲓⲣ - ⲕⲓⲅⲁⲗⲓ + ⲕⲓⲅⲁⲗⲓ - ⲣⲓⲁⲇ + ⲣⲓⲁⲇ - ⲅⲟⲩⲁⲇⲁⲗⲕⲁⲛⲁⲗ + ⲅⲟⲩⲁⲇⲁⲗⲕⲁⲛⲁⲗ - ⲙⲁϩⲉ + ⲙⲁϩⲉ - ϧⲁⲣⲑⲟⲩⲙ + ϧⲁⲣⲧⲟⲩⲙ - ⲥⲑⲟⲕϩⲟⲗⲙ + ⲥⲧⲟⲕⲟⲗⲙⲟ - ⲥⲓⲛⲅⲁⲡⲟⲣ + ⲥⲓⲛⲅⲁⲡⲟⲣ - ⲥⲁⲛⲧ ϩⲉⲗⲁⲛⲁ + ⲥⲁⲛⲧ ϩⲉⲗⲁⲛⲁ - ⲗϫⲟⲩⲃⲗϫⲁⲛⲁ + ⲗⲩⲡⲗⲓⲁ̀ⲛⲉ - ⲗⲟⲛⲅⲓⲏⲣⲃⲁⲓⲉⲛ + ⲗⲟⲛⲅⲓⲏⲣⲃⲁⲓⲉⲛ - ⲃⲣⲁⲑⲓⲥⲗⲁⲃⲁ + ⲃⲣⲁⲧⲓⲥⲗⲁⲃⲁ - ϥⲣⲓⲑⲁⲩⲛ + ϥⲣⲓⲑⲁⲩⲛ - ⲥⲁⲛ ⲙⲁⲣⲓⲛⲟ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲙⲁⲣⲓⲛⲟⲥ - ⲇⲁⲕⲁⲣ + ⲇⲁⲕⲁⲣ - ⲙⲟⲅⲁⲇⲓϣⲟ + ⲙⲟⲅⲁⲇⲓϣⲟ - ⲡⲁⲣⲁⲙⲁⲣⲓⲃⲟ + ⲡⲁⲣⲁⲙⲁⲣⲓⲃⲟ - ϫⲟⲩⲃⲁ + ϫⲟⲩⲃⲁ - ⲥⲁⲟ ⲑⲟⲙⲉ + ⲥⲁⲟ ⲑⲟⲙⲉ - ⲉⲗ ⲥⲁⲗⲃⲁⲇⲟⲣ + ⲉⲗ ⲥⲁⲗⲃⲁⲇⲟⲣ - ⲗⲟⲩⲉⲣ ⲡⲣⲓⲛⲥ + ⲗⲟⲩⲉⲣ ⲡⲣⲓⲛⲥ - ⲇⲁⲙⲁⲥⲕⲟⲥ + ⲇⲁⲙⲁⲥⲕⲟⲥ - ⲙⲃⲁⲃⲁⲛ + ⲙⲃⲁⲃⲁⲛ - ⲅⲣⲁⲛⲇ ⲑⲟⲩⲣⲕ + ⲅⲣⲁⲛⲇ ⲑⲟⲩⲣⲕ - ⲛϫⲁⲙⲉⲛⲁ + ⲛϫⲁⲙⲉⲛⲁ - ⲙⲟⲩⲓ ⲛ̀ⲕⲉⲣⲅⲉⲗⲉⲛ + ⲙⲟⲩⲓ ⲛ̀ⲕⲉⲣⲅⲉⲗⲉⲛ - ⲗⲟⲙⲉ + ⲗⲟⲙⲉ - ⲃⲁⲛⲕⲟⲕ + ⲃⲁⲛⲕⲟⲕ - ⲇⲟⲩϣⲁⲛⲃ + ⲇⲟⲩϣⲁⲛⲃⲏ - ϥⲁⲕⲁⲟϥⲟ + ϥⲁⲕⲁⲟϥⲟ - ⲇⲓⲗⲓ + ⲇⲓⲗⲓ - ⲁϣⲅⲁⲃⲁⲧ + ⲁϣⲅⲁⲃⲁⲇ - ⲑⲟⲩⲛⲓⲥ + ⲧⲟⲩⲛⲓⲥ - ⲑⲟⲛⲅⲁⲑⲁⲡⲟⲩ + ⲑⲟⲛⲅⲁⲑⲁⲡⲟⲩ - ⲓⲥⲑⲁⲙⲃⲟⲩⲗ + ⲕⲱⲥⲧⲁⲛⲧⲓⲛⲟⲩⲡⲟⲗⲓⲥ - ⲡⲟⲣⲧ ⲛ̀ⲉⲥⲡⲁⲛⲓⲁ + ⲡⲓⲡⲟⲣⲧⲟⲥ ⲛ̀ⲥⲡⲁⲛⲟⲥ - ϥⲟⲩⲛⲁϥⲟⲩⲑⲓ + ϥⲟⲩⲛⲁϥⲟⲩⲑⲓ - ⲑⲁⲓⲡⲉⲓ + ⲑⲁⲓⲡⲉⲓ - ⲇⲁⲣ ⲉⲥ ⲥⲁⲗⲁⲙ + ⲇⲁⲣ ⲉⲥⲥⲁⲗⲁⲙ - ⲕⲓⲉⲃ + ⲕⲓⲟ̀ⲃⲁ - ⲥⲓⲙϥⲉⲣⲟⲡⲟⲗ + ⲥⲓⲙⲫⲉⲣⲟⲡⲟⲗⲓⲥ - ⲕⲁⲙⲡⲁⲗⲁ + ⲕⲁⲙⲡⲁⲗⲁ - ⲙⲓⲇⲟⲩⲁⲓ ⲁⲑⲟⲗⲗ + ⲙⲓⲇⲟⲩⲁⲓ ⲁⲑⲟⲗⲗ - ϯⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ + ϯⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ - ⲁⲇⲁⲕ + ⲁⲇⲁⲕ - ⲛⲟⲙⲉ + ⲛⲟⲙⲉ - ⲁⲛⲕⲟⲣⲁϫ + ⲁⲛⲕⲟⲣⲓϫ - ⲓⲁⲕⲟⲩⲑⲁⲧ + ⲓⲁⲕⲟⲩⲑⲁⲧ - ⲥⲓⲑⲕⲁ + ⲥⲓⲑⲕⲁ - ϫⲟⲩⲛⲉⲁⲩ + ϫⲟⲩⲛⲉⲁⲩ - ⲙⲉⲧⲗⲁⲕⲁⲗⲑⲁ + ⲙⲉⲧⲗⲁⲕⲁⲗⲑⲁ - ⲗⲟⲥ ⲁⲅⲅⲉⲗⲉⲥ + ⲗⲟⲥ ⲁⲅⲅⲉⲗⲉⲥ - ⲃⲟⲓⲍⲉ + ⲃⲟⲓⲍⲉ - ⲫⲓⲛⲓⲝ + ⲫⲟⲓⲛⲓⲝ - ⲇⲉⲛⲃⲉⲣ + ⲇⲉⲛⲃⲉⲣ - ⲃⲉⲩⲗⲁ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲃⲉⲩⲗⲁ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ⲛⲓⲟⲩ ⲥⲁⲗⲉⲙ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲛⲓⲟⲩ ⲥⲁⲗⲉⲙ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ⲥⲉⲛⲑⲉⲣ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲥⲉⲛⲑⲉⲣ, ⲇⲁⲕⲟⲑⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ϣⲓⲕⲁⲅⲟ + ϣⲓⲕⲁⲅⲟ - ⲙⲉⲛⲟⲙⲓⲛⲓ + ⲙⲉⲛⲟⲙⲓⲛⲓ - ⲃⲓⲛⲥⲉⲛⲛⲉⲥ, ⲓⲛⲇⲓⲁⲛⲁ + ⲃⲓⲛⲥⲉⲛⲛⲉⲥ, ⲓⲛⲇⲓⲁⲛⲁ - ⲡⲉⲑⲉⲣⲥⲃⲟⲩⲣⲅ, ⲓⲛⲇⲓⲁⲛⲁ + ⲡⲉⲑⲉⲣⲥⲃⲟⲩⲣⲅ, ⲓⲛⲇⲓⲁⲛⲁ - ⲑⲉⲗ ⲥⲓⲑⲓ, ⲓⲛⲇⲓⲁⲛⲁ + ⲑⲉⲗ ⲥⲓⲑⲓ, ⲓⲛⲇⲓⲁⲛⲁ - ⲛⲟⲝ, ⲓⲛⲇⲓⲁⲛⲁ + ⲛⲟⲝ, ⲓⲛⲇⲓⲁⲛⲁ - ⲟⲩⲓⲛⲁⲙⲁⲕ, ⲓⲛⲇⲓⲁⲛⲁ + ⲟⲩⲓⲛⲁⲙⲁⲕ, ⲓⲛⲇⲓⲁⲛⲁ - ⲙⲁⲣⲉⲛⲅⲟ, ⲓⲛⲇⲓⲁⲛⲁ + ⲙⲁⲣⲉⲛⲅⲟ, ⲓⲛⲇⲓⲁⲛⲁ - ⲓⲛⲇⲓⲁⲛⲁⲡⲟⲗⲓⲥ + ⲓⲛⲇⲓⲁⲛⲁⲡⲟⲗⲓⲥ - ⲗⲟⲓⲥⲃⲓⲗ + ⲗⲟⲓⲥⲃⲓⲗ - ⲃⲉⲃⲉⲁⲓ, ⲓⲛⲇⲓⲁⲛⲁ + ⲃⲉⲃⲉⲁⲓ, ⲓⲛⲇⲓⲁⲛⲁ - ⲙⲟⲛⲑⲓⲥⲉⲗⲗⲟ, ⲕⲉⲛⲧⲁⲕⲓ + ⲙⲟⲛⲑⲓⲥⲉⲗⲗⲟ, ⲕⲉⲛⲧⲁⲕⲓ - ⲇⲉⲑⲣⲟⲓⲧ + ⲇⲉⲑⲣⲟⲓⲧ - ⲛⲓⲟⲩ ⲓⲟⲣⲕ + ⲛⲓⲟⲩ ⲓⲟⲣⲕ - ⲙⲟⲛⲑⲉⲃⲓⲇⲉⲟ + ⲙⲟⲛⲑⲉⲃⲓⲇⲉⲟ - ⲥⲁⲙⲁⲣⲕⲁⲛⲇ + ⲥⲁⲙⲁⲣⲁⲕⲁⲛⲇⲁ - ⲑⲁϣⲕⲉⲛⲧ + ⲧⲁϣⲕⲏⲛⲧ - ⲃⲁⲑⲓⲕⲁⲛ + ⲃⲁⲧⲓⲕⲁⲛⲟⲥ - ⲥⲁⲛⲧ ⲃⲓⲛⲥⲉⲛⲧ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲃⲓⲕⲉⲛⲧⲓⲟⲥ - ⲕⲁⲣⲁⲕⲁⲥ + ⲕⲁⲣⲁⲕⲁⲥ - ⲑⲟⲣⲟⲗⲁ + ⲑⲟⲣⲟⲗⲁ - ⲥⲁⲛⲧ ⲑⲟⲙⲁⲥ + ⲡⲓⲁ̀ⲅⲓⲟⲥ ⲑⲱⲙⲁⲥ - ϩⲟ ϭⲓ ⲙⲓⲛϩ + ϩⲟ ϣⲓ ⲙⲓⲛ - ⲉϥⲁⲧ + ⲉϥⲁⲧ - ⲟⲩⲁⲗⲗⲓⲥ & ϥⲟⲩⲑⲟⲩⲛⲁ + ⲟⲩⲁⲗⲗⲓⲥ & ϥⲟⲩⲑⲟⲩⲛⲁ - ⲁⲡⲓⲁ + ⲁⲡⲓⲁ - ⲁⲇⲁⲛ + ⲉ̀ⲇⲉⲛ - ⲙⲁⲓⲟⲧ + ⲙⲁⲓⲟⲧ - ⲓⲟϩⲁⲛⲥⲃⲟⲩⲣⲅ + ⲓⲱϩⲁⲛⲛⲏⲥⲃⲟⲩⲣⲅⲟⲥ - ⲗⲟⲩⲍⲁⲕⲁ + ⲗⲟⲩⲍⲁⲕⲁ - ϩⲁⲣⲁⲣⲉ + ϩⲁⲣⲁⲣⲉ + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲁ̀ⲕⲟ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲁ̀ⲕⲟ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲁⲕⲟ + + - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ + ⲡⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟϩⲣⲟⲥ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟϩⲣⲟⲥ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲗⲁⲥⲕⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲗⲁⲥⲕⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲗⲁⲥⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲗⲁⲥⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲗⲁⲥⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲗⲁⲥⲕⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲙⲁⲍⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲙⲁⲍⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲙⲁⲍⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲙⲁⲍⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲙⲁⲍⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲙⲁⲍⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲙⲏϯ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲙⲏϯ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲙⲏϯ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲙⲏϯ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲧⲱⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲧⲱⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲧⲱⲟⲩ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲧⲱⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲧⲱⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲧⲱⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲙⲟⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲙⲟⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲁ̀ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲥⲁⲙⲟⲁ̀ ⲙ̀ⲡⲉⲙⲉⲛⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲥⲁⲙⲟⲁ̀ ⲙ̀ⲡⲉⲙⲉⲛⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣⲁⲃⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲁⲃⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ + ⲡⲭⲣⲟⲛⲟⲥ ⲛ̀ⲁⲣⲁⲃⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲁⲃⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲣⲁⲃⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲣⲙⲉⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲁⲑⲗⲁⲛⲑⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲁⲩⲥⲧⲣⲁⲗⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲍⲟⲣⲉⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲟⲣⲉⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲟⲣⲉⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲍⲟⲣⲉⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲍⲟⲣⲉⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲁⲍⲟⲣⲉⲥ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲩⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲟⲩⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲓⲃⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲓⲃⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲣⲁⲍⲓⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲣⲁⲍⲓⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲣⲁⲍⲓⲗ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲣⲁⲍⲓⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲣⲁⲍⲓⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲣⲁⲍⲓⲗ + + + + + ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲃⲣⲓⲑⲁⲛⲓⲁ + ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲃⲣⲓⲑⲁⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲣⲟⲩⲛⲉⲓ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲣⲟⲩⲛⲉⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲁⲡ ⲃⲉⲣⲇⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲁⲙⲟⲣⲟ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲁⲙⲟⲣⲟ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲁⲑⲁⲙ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϣⲁⲑⲁⲙ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϣⲁⲑⲁⲙ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲁⲑⲁⲙ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϣⲁⲑⲁⲙ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϣⲁⲑⲁⲙ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲓⲗⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲗⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϭⲓⲗⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϭⲓⲗⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲗⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϭⲓⲗⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲓⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛⲧⲟⲟⲩⲓ ⲛ̀ϭⲓⲛⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϭⲓⲛⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϭⲓⲛⲁ + ⲡⲥⲏⲟⲩ ⲛⲧⲟⲟⲩⲓ ⲛ̀ϭⲓⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲭⲣⲓⲥⲧⲙⲁⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲕⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲟⲩⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲧⲉ ⲕⲟⲩⲃⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲇⲁⲩⲓⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲇⲁⲩⲓⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲇⲟⲩⲣⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ⲇⲟⲩⲣⲙⲟⲛⲧ ⲇⲟⲩⲣⲃⲓⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲓⲙⲟⲣ-ⲗⲉⲥⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲓⲙⲟⲣ-ⲗⲉⲥⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲥⲑⲉⲣ ⲁⲓⲥⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲉⲕⲟⲩⲁⲇⲟⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ⲉⲕⲟⲩⲁⲇⲟⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲉⲩⲣⲱⲡⲉⲟⲥ ⲉⲧϧⲉⲛⲑⲙⲏϯ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲟⲩⲕⲉ ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲟⲩⲕⲉ ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲉⲩⲣⲟⲡⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲓⲇϫⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲓⲇϫⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲓⲇϫⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϥⲓⲇϫⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲓⲇϫⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲓⲇϫⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲉⲣⲉⲛⲥⲟⲥ ⲙ̀ⲡⲓⲣⲏⲥ & ⲁⲛⲧⲁⲣⲕⲑⲓⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲕⲁϩⲓ ⲙ̀ⲫⲣⲁⲅⲅⲟⲥ ⲉⲧⲥⲁⲣⲏⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲁⲗⲁⲡⲁⲅⲟⲥ - ̀ⲡⲥⲟⲏⲩ ⲛ̀ⲅⲁⲙⲃⲓⲉⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲁⲙⲃⲓⲉⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϫⲓⲗⲃⲉⲣⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ϫⲓⲗⲃⲉⲣⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲅⲣⲓⲛⲓϭ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲅⲣⲓⲛⲓϭ + + + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲣⲓⲛⲗⲁⲛⲧⲏ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲅⲣⲓⲛⲗⲁⲛⲧⲏ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲅⲣⲓⲛⲗⲁⲛⲧⲏ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ̀ⲡⲥⲏⲟⲩ ⲙ̀̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡϣⲱⲙ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲧⲉ ⲅⲣⲓⲛⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲅⲟⲗϥ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲅⲟⲗϥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲅⲩⲁⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲁⲩⲁⲓ̀ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϩⲁⲟⲩⲁⲓ-ⲁⲗⲉⲩⲑⲓⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲁⲩⲁⲓ̀-ⲁⲗⲉⲩⲑⲓⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲁⲩⲁⲓ̀-ⲁⲗⲉⲩⲑⲓⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ϩⲁⲩⲁⲓ̀-ⲁⲗⲉⲩⲑⲓⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϧⲟⲃⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϧⲟⲃⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϧⲟⲃⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϧⲟⲃⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϧⲟⲃⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϧⲟⲃⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲱⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲱⲕⲉⲁⲛⲟⲥ ⲛ̀ϩⲉⲛⲧⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲛⲇⲟϭⲓⲛⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲛⲇⲟϭⲓⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀̀ⲑⲙⲏϯ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲙⲏϯ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲣⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲣⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲣⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲣⲁⲛ + + + + + ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲓⲉⲣⲗⲁⲛⲇⲁ + ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲁⲓⲉⲣⲗⲁⲛⲇⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲕⲁⲧⲁⲓⲣⲭⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲣⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲁⲡⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲡⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲁⲡⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲁⲡⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲡⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲓⲁⲡⲁⲛ + + + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲁⲙϭⲁⲧⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲕⲁⲙϭⲁⲧⲕⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲕⲁⲙϭⲁⲧⲕⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲣⲉⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲕⲟⲣⲉⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲟⲣⲉⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲕⲟⲣⲉⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲥⲣⲁⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲟⲥⲣⲁⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲕⲣⲁⲥⲛⲟⲓⲁⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲗⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲗⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲗⲟⲣⲇ ϩⲟⲩⲉ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲅⲁⲇⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲉⲍⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲉⲍⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲇⲓⲃ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲗⲇⲓⲃ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲣⲕⲉⲥⲁⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣϣⲁⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲙⲁⲣϣⲁⲗ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲥⲟⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲁⲩⲥⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲙ̀ⲙⲉⲝⲓⲕⲟ ⲙ̀ⲡⲁⲥⲓϥⲓⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲗⲁⲛⲃⲁⲧⲁⲣ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲟⲥⲕⲟ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲟⲥⲕⲟ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲟⲥⲕⲟ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲟⲥⲕⲟ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲙⲟⲥⲕⲟ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲙⲟⲥⲕⲟ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲓⲁⲛⲙⲁⲣ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲓⲁⲛⲙⲁⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲁⲩⲣⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ⲁⲩⲣⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲉⲡⲁⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲉⲡⲁⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲓⲟⲩⲕⲁⲗⲉⲇⲟⲛⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛⲛ̀ⲓⲟⲩϥⲁⲩⲛⲇⲗⲁⲛⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲉ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲟⲩⲉ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲛⲟⲣϥⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ϥⲉⲣⲛⲁⲛⲇⲟ ⲇⲉ ⲛⲟⲣⲟⲛϩⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲛⲟⲃⲟⲥⲓⲃⲓⲣⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲙⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲙⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲙⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲙⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲙⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲙⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲙⲡⲁⲗⲁⲩ + ⲡⲥⲏⲟⲩ ⲙ̀ⲙⲡⲁⲗⲁⲩ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩⲅⲓⲛⲉⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩⲅⲓⲛⲉⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲉⲣⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲣⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲣⲟⲩ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲉⲣⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲡⲉⲣⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲡⲉⲣⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲫⲓⲗⲓⲡⲡⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲫⲓⲛⲓⲝ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲙ̀ⲫⲓⲛⲓⲝ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲛⲧ ⲡⲓⲉⲣ & ⲙⲓⲕⲉⲗⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲑⲕⲁⲓⲣⲛ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲑⲕⲁⲓⲣⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲟϩⲛⲡⲉⲓ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲟϩⲛⲡⲉⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲡⲥⲏⲟⲩ ⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲣⲉⲓⲟⲩⲛⲓⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲣⲉⲓⲟⲩⲛⲓⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲣⲟⲑⲉⲣⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲣⲟⲑⲉⲣⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲥⲁϧⲁⲗⲓⲛ + + + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲁⲣⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲥⲁⲙⲁⲣⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲥⲁⲙⲁⲣⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲥⲁⲙⲟⲣⲁ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲁⲙⲟⲁ̀ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲩϣⲉⲗ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲩϣⲉⲗ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲣⲏⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲣⲏⲥ ⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲥⲩⲟⲩⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲥⲩⲟⲩⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁϩⲓⲑⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲁϩⲓⲑⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲟⲩⲓ ⲛ̀ⲑⲁⲓⲟⲩⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲕⲉⲗⲁⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲟⲕⲉⲗⲁⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲛⲅⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲛⲅⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲛⲅⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲟⲛⲅⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲛⲅⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲛⲅⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϭⲟⲩⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϭⲟⲩⲕ + + + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲧⲟⲩⲣⲕⲓⲁ̀ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲧⲉⲧⲟⲩⲣⲕⲓⲁ̀ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲧⲉⲧⲟⲩⲣⲕⲓⲁ̀ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲃⲁⲗⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ⲑⲟⲩⲃⲁⲗⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲣⲟⲩⲅⲩⲟⲁⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲩⲣⲟⲩⲅⲩⲟⲁⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + + + + + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲩⲣⲟⲩⲙϭⲓ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲁⲛⲁⲑⲟⲩ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲗⲁⲇⲓⲃⲟⲥⲑⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ + ⲡⲥⲏⲟⲩ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲙ̀ⲃⲟⲗⲅⲟⲅⲣⲁⲇ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲃⲟⲥⲑⲟⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲃⲟⲥⲑⲟⲕ - ⲡ̀ⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ + ⲡⲥⲏⲟⲩ ⲙ̀ⲡⲓⲙⲟⲩⲓ ⲛ̀ⲟⲩⲁⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲟⲩⲁⲗⲓⲥ & ϥⲟⲩⲑⲟⲩⲛⲁ + ⲡⲥⲏⲟⲩ ⲛ̀ⲟⲩⲁⲗⲓⲥ & ϥⲟⲩⲑⲟⲩⲛⲁ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲁⲕⲟⲩⲧⲥⲕ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ϩⲟⲣⲟⲥ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ + ⲡⲥⲏⲟⲩ ⲛ̀ϣⲱⲙ ⲛ̀ⲓⲉⲕⲁⲑⲉⲣⲓⲛⲃⲟⲩⲣⲅ - ⲡ̀ⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲟⲛ + ⲡⲥⲏⲟⲩ ⲛ̀ⲓⲟⲩⲕⲟⲛ + + + + 0 thousand + 00 thousand + 000 thousand + 0 million + 00 million + 000 million + 0 billion + 00 billion + 000 billion + 0 trillion + 00 trillion + 000 trillion + + + + + 0B + 00B + 000B + + + + + + + ¤#,##0.00 + + + ¤#,##0.00;(¤#,##0.00) + ¤ #,##0.00;(¤ #,##0.00) + #,##0.00;(#,##0.00) + + + + + ¤0K + ¤00K + ¤000K + ¤0M + ¤00M + ¤000M + ¤0B + ¤00B + ¤000B + ¤0T + ¤00T + ¤000T + + + - ⲡⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ - nⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ + ⲡⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ + nⲓⲇⲉⲣϩⲁⲙ ⲛ̀ⲧⲉ ⲛⲓⲉⲙⲁⲣⲁⲧ ⲛ̀ⲁⲣⲁⲃⲟⲥ ⲉⲧϩⲱⲧⲡ - ⲡⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ - ⲛⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ + ⲡⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ + ⲛⲓⲁϥⲅⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁϥⲅⲁⲛⲓⲥⲑⲁⲛ - ⲡⲓⲗⲉⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗⲃⲁⲛⲓⲁ - ⲡⲓⲗⲉⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗⲃⲁⲛⲓⲁ + ⲡⲓⲗⲉⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗⲃⲁⲛⲓⲁ - ⲡⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ - ⲛⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ + ⲡⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ + ⲛⲓⲇⲣⲁⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲙⲉⲛⲓⲁ - ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ - ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ + ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ + ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲗⲁⲛⲇⲁ ⲁⲛⲑⲓⲗⲉⲁ - ⲡⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ - ⲛⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ + ⲡⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ + ⲛⲓⲕⲟⲩⲁⲛⲍⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲛⲅⲟⲗⲁ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣϫⲉⲛⲑⲓⲛ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲩⲥⲑⲧⲣⲁⲗⲓⲁ - ⲡⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ - ⲛⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ + ⲡⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ + ⲛⲓϥⲗⲟⲣⲓⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲣⲟⲩⲃⲁ - ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ - ⲛⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ + ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ + ⲛⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲍⲉⲣⲃⲁⲓϫⲁⲛ - ⲡⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ - ⲛⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ + ⲡⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ + ⲛⲓⲙⲁⲣⲕ ⲛ̀ⲧⲉ ⲃⲟⲥⲛⲓⲁ-ϩⲉⲣⲍⲉⲅⲟⲃⲓⲛⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲣⲃⲁⲇⲓⲁ - ⲡⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ - ⲛⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ + ⲡⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ + ⲛⲓⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁⲛⲅⲗⲁⲇⲉϣ - ⲡⲓⲗⲉⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲗⲅⲁⲣⲓⲁ - ⲡⲓⲗⲉⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲗⲅⲁⲣⲓⲁ + ⲡⲓⲗⲉⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲗⲅⲁⲣⲓⲁ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ + ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲣⲁⲓⲛ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲣⲟⲩⲛⲇⲓ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲣⲙⲟⲩⲇⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲃⲣⲟⲩⲛⲉⲓ - ⲡⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ - ⲛⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ + ⲡⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ + ⲛⲓⲃⲟⲗⲓⲃⲓⲁⲛⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲗⲓⲃⲓⲁ - ⲡⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ - ⲛⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ + ⲡⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ + ⲛⲓⲣⲉⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲁⲍⲓⲗ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲁϩⲁⲙⲁ - ⲡⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ - ⲛⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ + ⲡⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ + ⲛⲓⲛⲅⲟⲩⲗⲑⲣⲟⲩⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲩⲑⲁⲛⲁ - ⲡⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ - ⲛⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ + ⲡⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ + ⲛⲓⲡⲟⲩⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲟⲑⲥⲟⲩⲁⲛⲁ - ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ - ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ + ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ + ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲗⲁⲣⲟⲩⲥ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲃⲉⲗⲓⲍⲉ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲛⲁⲇⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲛⲅⲟ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲥⲣⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲥⲣⲁ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲥⲣⲁ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲗⲉ - ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ - ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ + ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ ⲉⲧϩⲓⲙⲏⲣ + ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ ⲉⲧϩⲓⲙⲏⲣ - ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ - ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲣⲉⲙⲛ̀ϭⲓⲛⲁ + ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ + ⲡⲓⲓⲟⲩⲁⲛ ⲛ̀ⲥⲓⲛⲓⲕⲟⲥ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲗⲟⲙⲃⲓⲁ - ⲡⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ - ⲛⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ + ⲡⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ + ⲛⲓⲕⲟⲗⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲥⲑⲁⲣⲓⲕⲁ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ̀ⲛⲣⲉϥϣⲓⲃϯ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ̀ⲛⲣⲉϥϣⲓⲃϯ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ⲛ̀ⲣⲉϥϣⲓⲃϯ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ ̀ⲛⲣⲉϥϣⲓⲃϯ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲃⲁ - ⲡⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ - ⲛⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ + ⲡⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ + ⲛⲓⲉⲥⲕⲟⲩⲇⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲡⲃⲉⲣⲇⲉ - ⲡⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ - ⲛⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ + ⲡⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ + ⲛⲓⲕⲟⲣⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ϭⲉⲕ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲉⲣⲉⲙⲛ̀ⲇϫⲓⲃⲟⲩⲑⲓ - ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲙⲁⲣⲕ - ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲙⲁⲣⲕ + ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲁⲛⲙⲁⲣⲕ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲇⲟⲙⲓⲛⲓⲕⲁⲛ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗϫⲉⲣⲓⲁ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗϫⲉⲣⲓⲁ + ⲡⲓⲇⲏⲛⲁⲣⲓⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲏⲥⲟⲥ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲗϫⲉⲣⲓⲁ - ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ - ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ + ϯⲗⲩⲧⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ + ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲭⲏⲙⲓ - ⲡⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ - ⲛⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ + ⲡⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ + ⲛⲓⲛⲁⲕϥⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲣⲓⲑⲣⲓⲁ - ⲡⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ - ⲛⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ + ⲡⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ + ⲛⲓⲃⲓⲣⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲉⲑⲁⲩϣ - ⲉⲩⲣⲟ - ⲉⲩⲣⲟ + ⲉⲩⲣⲟ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϥⲓⲇϫⲓ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲛⲙⲟⲩⲓ ⲛ̀ϥⲟⲕⲗⲁⲛⲇ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲣⲓⲑⲁⲛⲓⲁ - ⲡⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲛⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲡⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ + ⲛⲓⲗⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲉⲟⲣⲅⲓⲁ - ⲡⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ - ⲛⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ + ⲡⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ + ⲛⲓⲥⲉⲇⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲛⲁ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲅⲓⲃⲣⲁⲗⲑⲁⲣ - ⲡⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ - ⲛⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ + ⲡⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ + ⲛⲓⲇⲁⲗⲁⲥⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲁⲙⲃⲓⲁ - ⲡⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ - ⲛⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ + ⲡⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ + ⲛⲓⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲓⲛⲉⲁ - ⲡⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ - ⲛⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ + ⲡⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ + ⲛⲓⲕⲉⲑⲍⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲟⲩⲁⲑⲉⲙⲁⲗⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲅⲩⲁⲛⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ϩⲟⲛⲅ ⲕⲟⲛⲅ - ⲡⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ - ⲛⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ + ⲡⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ + ⲛⲓⲗⲉⲙⲡⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ϩⲟⲛⲇⲟⲩⲣⲁ - ⲡⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ - ⲛⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ + ⲡⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ + ⲛⲓⲕⲟⲩⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲣⲟⲩⲁⲑⲓⲁ - ⲡⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ - ⲛⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ + ⲡⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ + ⲛⲓⲅⲟⲩⲣⲇ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲓⲑⲓ - ⲡⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ - ⲛⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ + ⲡⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ + ⲛⲓϥⲟⲣⲓⲛⲧ ⲛ̀ⲣⲉⲙⲛ̀ϩⲁⲛⲅⲁⲣⲓⲁ - ⲡⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ⲛⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ + ⲡⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ + ⲛⲓⲣⲟⲩⲡⲓⲁϩ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲛⲇⲟⲛⲉⲥⲓⲁ - ⲡⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ - ⲛⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ + ⲡⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ + ⲛⲓϣⲉⲕⲉⲗ ⲙ̀ⲃⲉⲣⲓ ⲙ̀ⲡⲓⲥⲣⲁⲏⲗ - ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ - ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ + ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ + ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙ̀ⲛ̀ϩⲉⲛⲧⲟⲩ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ + ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲕ - ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ - ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ + ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ + ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲣⲁⲛ - ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲓⲥⲗⲁⲛⲇⲁ - ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲓⲥⲗⲁⲛⲇⲁ + ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲁⲓⲥⲗⲁⲛⲇⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ϫⲁⲙⲁⲓⲕⲁ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ + ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲟⲣⲇⲁⲛⲏⲥ - ⲡⲓⲓⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛ - ⲡⲓⲓⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛ + ⲡⲓⲓⲉⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲁⲡⲁⲛ - ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ - ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ + ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ + ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲉⲛⲓⲁ - ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ - ⲛⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ + ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ + ⲛⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲩⲣⲅⲩⲥⲑⲁⲛ - ⲡⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ - ⲛⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ + ⲡⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ + ⲛⲓⲣⲓⲉⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲙⲃⲟⲩⲇⲓⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲙⲟⲣⲓ - ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ + ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲉⲙϩⲓⲧ - ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ + ⲡⲓⲟⲩⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲣⲉⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ + ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲟⲩⲁⲓⲧ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲕⲁⲓⲙⲁⲛ - ⲡⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ⲛⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ + ⲡⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ + ⲛⲓⲑⲉⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲍⲁϧⲉⲥⲑⲁⲛ - ⲡⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ - ⲛⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ + ⲡⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ + ⲛⲓⲕⲓⲡ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲟ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲁⲛⲟⲛ - ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ - ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ + ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ + ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲣⲓⲗⲁⲛⲕⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲁⲓⲃⲉⲣⲓⲁ - ⲡⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ - ⲛⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ + ⲡⲓⲗⲟⲑⲓ ⲛ̀ⲧⲉ ⲗⲉⲥⲟⲑⲟ + ⲛⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲓⲁ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲓⲁ + ⲡⲓⲇⲏⲛⲁⲣⲓⲟⲛ ⲛ̀ϯⲗⲓⲃⲏ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲗⲓⲃⲓⲁ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲣⲁⲕⲉϣ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲣⲁⲕⲉϣ + ⲡⲓⲧⲉⲣϩⲁⲙ ⲙ̀ⲙⲁⲩⲣⲟⲕⲟⲥ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲣⲁⲕⲉϣ - ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲗⲇⲟⲃⲁ - ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲗⲇⲟⲃⲁ + ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲗⲇⲟⲃⲁ - ⲡⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ - ⲛⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ + ⲡⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ + ⲛⲓⲁⲣⲓⲁⲣⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲁⲅⲁⲥ - ⲡⲓⲇⲉⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲉⲇⲟⲛⲓⲁ - ⲡⲓⲇⲉⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲉⲇⲟⲛⲓⲁ + ⲡⲓⲇⲉⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲉⲇⲟⲛⲓⲁ - ⲡⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ - ⲛⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ + ⲡⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ + ⲛⲓⲕⲩⲁⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲩⲁⲛⲙⲁⲣ - ⲡⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ - ⲛⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ + ⲡⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ + ⲛⲓⲑⲟⲩⲅⲣⲓⲕ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲟⲛⲅⲟⲗⲓⲁ - ⲡⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ - ⲛⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ + ⲡⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ + ⲛⲓⲡⲁⲑⲁⲕⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲕⲁⲛⲓ - ⲡⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ - ⲛⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ + ⲡⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ + ⲛⲓⲟⲩⲅⲟⲩⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲁⲛⲓⲁ - ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ + ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲩⲣⲓⲑⲓⲟⲩⲥ - ⲡⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ - ⲛⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ + ⲡⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ + ⲛⲓⲣⲟⲩϥⲓⲁ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲇⲓⲃ - ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ - ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ + ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ + ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲙⲁⲗⲁⲩⲓ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲙⲉⲝⲓⲕⲟ - ⲡⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ - ⲛⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ + ⲡⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ + ⲛⲓⲣⲓⲛⲅⲓⲧ ⲛ̀ⲣⲉⲙⲛⲙ̀ⲁⲗⲉⲍⲓⲁ - ⲡⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ - ⲛⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ + ⲡⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ + ⲛⲓⲙⲉⲑⲓⲕⲁⲗ ⲛ̀ⲣⲉⲛⲙ̀ⲟⲍⲁⲙⲃⲓⲕ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲙⲓⲃⲓⲁ - ⲡⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ - ⲛⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ + ⲡⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ + ⲛⲓⲛⲁⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲁⲓⲅⲉⲣⲓⲁ - ⲡⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ - ⲛⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ + ⲡⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ + ⲛⲓⲕⲟⲣⲇⲟⲃⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲕⲁⲣⲁⲅⲟⲩⲁ - ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲟⲣⲟⲩⲓⲅ - ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲟⲣⲟⲩⲓⲅ + ⲡⲓⲕⲣⲟⲛ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲟⲣⲟⲩⲓⲅ - ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ - ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ + ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ + ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲉⲡⲁⲗ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲛⲓⲟⲩⲍⲓⲗⲁⲛⲇⲁ - ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ - ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ + ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ + ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲙⲁⲛ - ⲡⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ - ⲛⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ + ⲡⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ + ⲛⲓⲃⲁⲗⲃⲟⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲛⲁⲙⲁ - ⲡⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲛⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲡⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ + ⲛⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ - ⲡⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ - ⲛⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ + ⲡⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ + ⲛⲓⲕⲓⲛⲁ ⲛ̀ⲧⲉ ⲡⲁⲡⲟⲩⲁ ⲛⲓⲟⲩ ⲅⲓⲛⲉⲁ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲫⲓⲗⲓⲡⲡⲓⲛ - ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ - ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲡⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ + ⲛⲓⲣⲟⲩⲡⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲕⲓⲥⲑⲁⲛ - ⲡⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ - ⲛⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ + ⲡⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ + ⲛⲓⲍⲗⲟⲑⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲟⲗⲁⲛⲇⲁ - ⲡⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ - ⲛⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ + ⲡⲓⲅⲟⲩⲁⲣⲁⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲁⲣⲁⲅⲟⲩⲁⲓ + ⲛⲓⲥⲟⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲡⲉⲣⲟⲩ - ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ - ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ + ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ + ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲑⲁⲣ - ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲙⲁⲛⲓⲁ - ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲙⲁⲛⲓⲁ + ⲡⲓⲗⲉⲩ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲙⲁⲛⲓⲁ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ + ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲉⲣⲃⲓⲁ - ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ - ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ + ⲡⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ + ⲛⲓⲣⲟⲩⲃⲉⲗ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲣⲟⲩⲥⲓⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ⲣⲉⲙⲛ̀ⲣⲟⲩⲁⲛⲇⲁ - ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ - ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ + ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ + ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲟⲩⲇⲓ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲙⲟⲩⲓ ⲛ̀ⲥⲟⲗⲟⲙⲟⲛ - ⲡⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ - ⲛⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ + ⲡⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ + ⲛⲓⲣⲟⲩⲡⲓ ⲣ̀ⲉⲙⲛ̀ⲥⲓϣⲉⲗ - ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ - ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ + ϯⲗⲩⲧⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ + ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ - ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲇ - ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲇ + ⲡⲓⲕⲣⲟⲛⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲓⲇ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲓⲛⲅⲁⲡⲟⲣ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲧⲉ ⲥⲁⲛⲧ ϩⲉⲗⲉⲛⲁ - ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ - ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ + ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ + ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ - ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022) - ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022) + ⲡⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022) + ⲛⲓⲗⲉⲟⲛ ⲛ̀ⲧⲉ ⲥⲓⲉⲣⲁⲗⲉⲟⲛ (1964—2022) - ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ - ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ + ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ + ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲙⲁⲗⲓⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲣⲓⲛⲁⲙ - ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ - ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ + ⲡⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ + ⲛⲓⲅⲉⲛⲉϩ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲇⲁⲛ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ & ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ - ⲛⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ & ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ + ⲡⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ & ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ + ⲛⲓⲇⲟⲃⲣⲁ ⲛ̀ⲧⲉ ⲥⲁⲟ ⲑⲟⲙⲉ & ⲡⲣⲓⲛⲥⲓⲡ ⲇⲟⲃⲣⲁ - ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ - ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ + ⲡⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ + ⲛⲓⲡⲁⲩⲛⲇ ⲛ̀ⲣⲉⲙ̀ⲛ̀ⲁⲥⲥⲩⲣⲟⲥ - ⲡⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ - ⲡⲓⲉ̀ⲙⲁⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ + ⲡⲓⲗⲓⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ + ⲡⲓⲉ̀ⲙⲁⲗⲁⲛⲅⲉⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲟⲩⲁⲍⲓ - ⲡⲓⲃⲁϩⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲓⲗⲁⲛⲇ - ⲡⲓⲃⲁϩⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲓⲗⲁⲛⲇ + ⲡⲓⲃⲁϩⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲓⲗⲁⲛⲇ - ⲡⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ - ⲛⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ + ⲡⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ + ⲛⲓⲥⲟⲙⲟⲛⲓ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁϫⲓⲕⲓⲥⲑⲁⲛ - ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ - ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ + ⲡⲓⲙⲁⲛⲁⲧ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲙⲉⲛⲓⲥⲑⲁⲛ - ⲡⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲛⲓⲥ - ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲛⲓⲥ + ⲡⲓⲇⲏⲛⲁⲣⲓⲟⲛ ⲛ̀ⲧⲟⲩⲛⲓⲥ + ⲛⲓⲇⲓⲛⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲛⲓⲥ - ⲡⲓⲡⲁʻⲁⲛⲅⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲛⲅⲁ - ⲡⲓⲡⲁʻⲁⲛⲅⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲛⲅⲁ + ⲡⲓⲡⲁʻⲁⲛⲅⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲛⲅⲁ - ⲡⲓⲗⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲓⲁ - ⲡⲓⲗⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲓⲁ + ⲡⲓⲗⲓⲣⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲟⲩⲣⲕⲓⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ & ⲑⲟⲃⲁⲅⲟ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ & ⲑⲟⲃⲁⲅⲟ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ & ⲑⲟⲃⲁⲅⲟ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲑⲣⲓⲛⲓⲇⲁⲇ & ⲑⲟⲃⲁⲅⲟ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲧⲉ ⲛⲓⲟⲩ ⲑⲁⲓⲟⲩⲁⲛ - ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ - ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ + ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ + ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲑⲁⲛⲍⲁⲛⲓⲁ - ⲡⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ - ⲛⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ + ⲡⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ + ⲛⲓϩⲣⲩⲃⲛⲓⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲕⲣⲁⲛⲓⲁ - ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ - ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ + ⲡⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ + ⲛⲓϣⲓⲗⲓⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲅⲁⲛⲇⲁ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲛ̀ⲁⲙⲉⲣⲓⲕⲁⲛⲟⲥ - ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ - ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + ⲡⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ + ⲛⲓⲡⲉⲥⲟ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲣⲟⲩⲅⲟⲩⲁⲓ - ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ + ⲡⲓⲥⲟⲙ ⲛ̀ⲣⲉⲙⲛ̀ⲟⲩⲍⲃⲉⲕⲓⲥⲑⲁⲛ - ⲡⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ - ⲛⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ + ⲡⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ + ⲛⲓⲃⲟⲗⲓⲃⲁⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲉⲛⲉⲍⲟⲩⲉⲗⲁ - ⲡⲓⲇⲟⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲓⲉⲑⲛⲁⲙ - ⲡⲓⲇⲟⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲓⲉⲑⲛⲁⲙ + ⲡⲓⲇⲟⲛⲅ ⲛ̀ⲣⲉⲙⲛ̀ⲃⲓⲉⲑⲛⲁⲙ - ⲡⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ - ⲛⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ + ⲡⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ + ⲛⲓⲃⲁⲑⲟⲩ ⲛ̀ⲧⲉ ⲃⲁⲛⲁⲑⲟⲩ - ⲡⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ - ⲛⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ + ⲡⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ + ⲛⲓⲑⲁⲗⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲥⲁⲙⲟⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ - ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ + ⲡⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀ⲑⲙⲏϯ + ⲛⲓϥⲣⲁⲛⲕ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲛ̀̀ⲑⲙⲏϯ - ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ - ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ + ⲡⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ + ⲛⲓⲇⲟⲗⲗⲁⲣ ⲙ̀ⲡⲉⲓⲉⲃⲧ ⲛ̀ⲕⲁⲣⲓⲃⲓ - ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ - ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ + ⲡⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ + ⲛⲓⲅⲓⲗⲇⲉⲣ ⲛ̀ⲣⲉⲙⲛ̀ⲕⲁⲣⲓⲃⲓ - ⲡⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ - ⲛⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ + ⲡⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ + ⲛⲓϥⲣⲁⲛⲕ ⲙ̀ⲡⲉⲙⲉⲛⲧ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ - ⲡⲓϥⲣⲁⲛⲕ ⲥϥⲡ - ⲛⲓϥⲣⲁⲛⲕ ⲥϥⲡ + ⲡⲓϥⲣⲁⲛⲕ ⲥϥⲡ + ⲛⲓϥⲣⲁⲛⲕ ⲥϥⲡ - ⲟⲩϩⲁⲧ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ - (ⲟⲩϩⲁⲧ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ) + ⲟⲩⲭⲣⲏⲙⲁ ⲛ̀ⲁⲅⲛⲱⲧⲟⲛ + (ⲟⲩϩⲁⲧ ⲛ̀ⲁⲧⲥⲟⲩⲏⲛ) - ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ - ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ + ⲡⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ + ⲛⲓⲣⲓⲁⲗ ⲛ̀ⲣⲉⲙⲛ̀ⲓⲉⲙⲉⲛ - ⲡⲓⲣⲁⲛⲇ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡⲓⲣⲁⲛⲇ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ + ⲡⲓⲣⲁⲛⲇ ⲛ̀ϯⲫⲣⲓⲕⲓⲁ ⲙ̀ⲡⲓⲣⲏⲥ - ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ - ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ + ⲡⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ + ⲛⲓⲕⲟⲩⲁϭⲁ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲁⲙⲃⲓⲁ - ⲡⲓⲛⲟⲩⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲓⲙⲃⲁⲃⲟⲩⲉⲓ - ⲡⲓⲛⲟⲩⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲓⲙⲃⲁⲃⲟⲩⲉⲓ + ⲡⲓⲛⲟⲩⲃ ⲛ̀ⲣⲉⲙⲛ̀ⲍⲓⲙⲃⲁⲃⲟⲩⲉⲓ + + {0}+ + - {0} ⲛⲓⲉϩⲟⲟⲩ + {0}? + {0}? + + + + ⲡⲓⲧⲉⲧⲣⲁⲅⲱⲛⲟⲛ ⲛ̀ⲧⲉ {0} + + + ⲡⲓⲕⲩⲃⲟⲥ ⲛ̀ⲧⲉ {0} + + + ⲥⲉⲑⲓⲟ̀ϩⲓ + {0} ⲛ̀ⲥⲉⲑⲓⲟ̀ϩⲓ + + + ϩⲁⲛⲣⲟⲙⲡⲓ + {0} ⲕⲁⲧⲁ ⲣⲟⲙⲡⲓ + + + ⲛⲓⲉⲃⲇⲱⲙⲁⲥ + {0} ⲛⲓⲉⲃⲇⲱⲙⲁⲥ + {0} ⲕⲁⲧⲁ ⲉⲃⲇⲱⲙⲁⲥ + + + ϩⲁⲛⲉϩⲟⲟⲩ + + + ϩⲁⲛⲥⲟⲩⲥⲟⲩ + + + ϩⲁⲛⲛⲁⲫⲣⲓ + + + ⲟⲩⲙⲓⲥⲧⲣⲁⲛⲟⲥ + + + ϩⲁⲛⲉϫⲱⲣϩ + + + + + ϩⲁⲛⲣⲟⲙⲡⲓ + + + ⲛⲓⲉⲃⲇⲱⲙⲁⲥ + + + ϩⲁⲛⲉϩⲟⲟⲩ + + + ϩⲁⲛⲥⲟⲩⲥⲟⲩ + + + ϩⲁⲛⲛⲁⲫⲣⲓ + + + ϩⲁⲛⲉϫⲱⲣϩ + + + + + ϩⲁⲛⲣⲟⲙⲡⲓ + + + ⲛⲓⲉⲃⲇⲱⲙⲁⲥ + + + ϩⲁⲛⲉϩⲟⲟⲩ + + + ϩⲁⲛⲥⲟⲩⲥⲟⲩ + + + ϩⲁⲛⲛⲁⲫⲣⲓ + + + ϩⲁⲛⲉϫⲱⲣϩ + + + - - {0}, ⲛⲉⲙ {1} - {0} ⲛⲉⲙ {1} - - - {0}, ⲓⲉ {1} - {0} ⲓⲉ {1} - - {0}, ⲓⲉ {1} - {0} ⲓⲉ {1} + {0}, or {1} + {0} or {1} - {0}, ⲓⲉ {1} - {0} ⲓⲉ {1} + {0}, or {1} + {0} or {1} + + + {0}, {1} + {0}, {1} - {0}, & {1} - {0} & {1} + {0}, {1} + {0}, {1} + + + {0}, {1} + {0}, {1} - {0} {1} - {0} {1} - {0} {1} - {0} {1} + {0}, {1} + {0}, {1} + + + {0}, {1} + {0}, {1} + + + ⲫⲛⲏⲃ + + diff --git a/make/data/cldr/common/main/cs.xml b/make/data/cldr/common/main/cs.xml index 5968175413d3..926a9d7d71ff 100644 --- a/make/data/cldr/common/main/cs.xml +++ b/make/data/cldr/common/main/cs.xml @@ -334,7 +334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kúvi kyrgyzština latina - ladinština + ladino langi lahndština lambština @@ -347,7 +347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lillooetština livonština lakotština - ladinština + ladinština lombardština lingalština laoština @@ -1180,18 +1180,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Řazení Normalizované řazení Číselné řazení + Přeuspořádání skriptů/bloků Míra řazení Měna + Cílový formát + Výjimky slovníkového dělení Zobrazení emodži + První den týdne + Smíšené Hodinový cyklus (12 vs. 24) + Vstupní metoda + Klávesnice + Ignorování nejvyššího Styl zalamování řádků Zalamování řádků uprostřed slova + Transformační pravidla Měrná soustava + Měrná jednotka Čísla + Oblast pro doplňující data + Transformační zdroj + Rozdělení oblastí Zlom věty za zkratkou + Transformace + Strojový překlad Časové pásmo Varianta národního prostředí Soukromé použití + Soukromá transformace Buddhistický kalendář @@ -1211,13 +1227,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hebrejský kalendář Hebrejský Indický národní kalendář + Indický národní Kalendář podle hidžry Podle hidžry Kalendář podle hidžry (občanský) Podle hidždy (občanský) + Kalendář podle hidžry (pozorování Měsíce v Saúdské Arábii) + Kalendář podle hidžry (tabulkový, astronomická epocha) Kalendář podle hidžry (Umm al-Qura) Podle hidžry (Umm al-Qura) Kalendář ISO-8601 + Gregoriánský Japonský kalendář Japonský Perský kalendář @@ -1233,8 +1253,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Normální řazení akcentů Řadit akcenty opačně Nejdříve řadit malá písmena + Malá písmena Běžné řazení velkých a malých písmen + Malá písmena Nejdříve řadit velká písmena + Velká písmena Nerozlišovat při řazení velká a malá písmena Rozlišovat při řazení velká a malá písmena Předchozí řazení, kompatibilita @@ -1243,7 +1266,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Slovník Výchozí řazení Unicode Výchozí Unicode + Emoji Evropské řazení + Evropská pravidla Řazení telefonního seznamu Telefonní seznam Fonetické řazení @@ -1253,6 +1278,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Obecné hledání Hledání Vyhledávat podle počáteční souhlásky písma hangul + Počáteční souhláska v korejštině Standardní řazení Standardní Řazení podle tahů @@ -1267,17 +1293,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Řadit podle normalizovaného kódování Unicode Řadit číslice jednotlivě Řadit číslice numericky + Měna + Číslice + Interpunkce + Prázdné znaky + Symbol Řadit vše + Vše Řadit pouze základní písmena + Pouze základní písmena Řadit akcenty/velká a malá písmena/šířku/kana + Základní písmena, diakritika, velikost písmen, varianty znaků, kana Řadit akcenty + Základní písmena, diakritika Řadit akcenty/velká a malá písmena/šířku + Základní písmena, diakritika, velikost písmen, varianty znaků Plná šířka Poloviční šířka Numerický Výchozí - Emodži + Emoji Text + 12hodinový systém + 12 + 24hodinový systém + 24 12hodinový systém (0–11) 12 (0–11) 12hodinový systém (1–12) @@ -1286,6 +1326,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24hodinový systém (1–24) 24 (1–24) + posunutí mezer, interpunkce, všech symbolů + posunutí mezer, interpunkce + posunutí mezer, interpunkce + posunutí mezer, interpunkce, jiných než měnových symbolů Volný styl zalamování řádků Volný Běžný styl zalamování řádků @@ -1306,55 +1350,92 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Americká Arabsko-indické číslice Rozšířené arabsko-indické číslice + Rozšířené arabsko-indické Arménské číslice - Malé arménské číslice + Arménské malé číslice + Arménské malé Balijské číslice Bengálské číslice + Bráhmí číslice Čakmské číslice - Číslice písma dévanágarí + Čamské číslice + Dévanágaríjské číslice Etiopské číslice Finanční zápis čísel + Finanční Číslice – plná šířka + Plná šířka Gruzínské číslice Řecké číslice - Malé řecké číslice + Řecké malé číslice + Řecké malé Gudžarátské číslice Číslice gurmukhí + Číslování dne v měsíci znakem han v tradičním kalendáři Čínské desítkové číslice + Poziční desítkový systém používající čínské číselné ideogramy jako číslice Číslice zjednodušené čínštiny Finanční číslice zjednodušené čínštiny + Finanční znaky zjednodušené čínštiny Číslice tradiční čínštiny Finanční číslice tradiční čínštiny + Finanční znaky tradiční čínštiny Hebrejské číslice Javánské číslice Japonské číslice Japonské finanční číslice + Japonské finanční + Japonské číslování prvního roku éry (Gannen) Khmerské číslice Kannadské číslice + Sada čísel Tai Tham (církevní) Laoské číslice Západní číslice + Matematické znaky tučné + Matematické znaky dvojité + Matematické znaky s pevnou šířkou + Matematické znaky s pevnou šířkou + Matematické znaky bezpatkové tučné + Matematické znaky bezpatkové Malajálamské číslice Mongolské číslice Manipurské číslice Myanmarské číslice + Myanmarské východní číslice pwo karen + Myanmarské číslice pao + Myanmarské číslice shan + Myanmarské číslice tai laing Nativní číslice + Nativní číslice Santálské číslice Urijské číslice Somálské číslice + Konturové Římské číslice - Malé římské číslice + Římské velké číslice + Římské malé číslice + Římské malé Saurášterské číslice + Segmentované Sundské číslice Tamilské tradiční číslice Tamilské číslice + Tamilské moderní Telugské číslice Thajské číslice Tibetské číslice Tradiční číslovky + Tradiční číslice Vaiské číslice Ne Ano + Nespecifikovaný strojový překlad + POSIX varianta + + Ne + Ano + metrický Velká Británie @@ -1789,6 +1870,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d. M. – E d. M. E d. M. – E d. M. + + d.–d. MMMM + d. MMMM – d. MMMM + y–y G @@ -2081,10 +2166,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y G M/y G d. M. y GGGGG - E, d. M. y G + E d. M. y G LLLL y G d. M. y G E d. M. y G + LLLL y G d. MMMM y G E d. MMMM y G H @@ -2228,6 +2314,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d. M. – E d. M. E d. M. – E d. M. + + d.–d. MMMM + d. MMMM – d. MMMM + M/y – M/y M/y – M/y @@ -2345,28 +2435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Ten-ei (1110-1113) - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Ten-ei (1110-1113) - - @@ -2436,7 +2504,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ před ROC - ROC @@ -2979,6 +3046,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Káhira + + Al-‘Ajún + Kanárské ostrovy @@ -3001,9 +3071,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Paříž - - britský letní čas - Londýn @@ -3021,11 +3088,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Budapešť - - - irský letní čas - - Jeruzalém @@ -3035,6 +3097,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kalkata + + Čagoské ostrovy + Bagdád @@ -3122,6 +3187,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rangún + + Chovd + Ulánbátar @@ -3137,12 +3205,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Maledivy - - Bahia Banderas - - - Merida - Kučing @@ -3296,6 +3358,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Éfaté + + Wallis a Futuna + acrejský čas @@ -3334,18 +3399,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ aljašský standardní čas aljašský letní čas - - AKT - AKST - AKDT - - - - - Almatský čas - Almatský standardní čas - Almatský letní čas - @@ -3360,11 +3413,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ severoamerický centrální standardní čas severoamerický centrální letní čas - - CT - CST - CDT - @@ -3372,11 +3420,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ severoamerický východní standardní čas severoamerický východní letní čas - - ET - EST - EDT - @@ -3384,11 +3427,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ severoamerický horský standardní čas severoamerický horský letní čas - - MT - MST - MDT - @@ -3396,11 +3434,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ severoamerický pacifický standardní čas severoamerický pacifický letní čas - - PT - PST - PDT - @@ -3416,20 +3449,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ apijský letní čas - - - Aktauský čas - Aktauský standardní čas - Aktauský letní čas - - - - - Aktobský čas - Aktobský standardní čas - Aktobský letní čas - - arabský čas @@ -3464,11 +3483,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ atlantický standardní čas atlantický letní čas - - AT - AST - ADT - @@ -3536,6 +3550,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ brasilijský letní čas + + + britský čas + britský letní čas + + brunejský čas @@ -3719,6 +3739,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ greenwichský střední čas + + + grónský čas + grónský standardní čas + grónský letní čas + + východogrónský čas @@ -3733,11 +3760,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ západogrónský letní čas - - - Guamský čas - - standardní čas Perského zálivu @@ -3750,7 +3772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - havajsko-aleutský standardní čas + havajský čas @@ -3769,9 +3791,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hovdský čas - hovdský standardní čas - hovdský letní čas + chovdský čas + chovdský standardní čas + chovdský letní čas @@ -3811,6 +3833,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ íránský letní čas + + + irský čas + irský letní čas + + irkutský čas @@ -3878,11 +3906,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kyrgyzský čas - - - Srílanský čas - - čas Rovníkových ostrovů @@ -3895,13 +3918,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ letní čas ostrova lorda Howa - - - Macajský čas - Macajský standardní čas - Macajský letní čas - - magadanský čas @@ -4017,11 +4033,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ letní čas souostroví Fernando de Noronha - - - Severomariánský čas - - novosibirský čas @@ -4101,13 +4112,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pchjongjangský čas - - - Kyzylordský čas - Kyzylordský standardní čas - Kyzylordský letní čas - - réunionský čas @@ -4134,9 +4138,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - samojský čas samojský standardní čas - samojský letní čas @@ -4205,9 +4207,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Turecký čas - Turecký standardní čas - Turecký letní čas + turecký čas + turecký standardní čas + turecký letní čas @@ -4229,6 +4231,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguayský letní čas + + + urumčijský čas + + uzbecký čas @@ -4359,28 +4366,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 tis'.' + 0 tis'.' + 0 tis'.' 0 tis'.' 00 tis'.' + 00 tis'.' + 00 tis'.' 00 tis'.' 000 tis'.' + 000 tis'.' + 000 tis'.' 000 tis'.' 0 mil'.' + 0 mil'.' + 0 mil'.' 0 mil'.' 00 mil'.' + 00 mil'.' + 00 mil'.' 00 mil'.' 000 mil'.' + 000 mil'.' + 000 mil'.' 000 mil'.' 0 mld'.' + 0 mld'.' + 0 mld'.' 0 mld'.' 00 mld'.' + 00 mld'.' + 00 mld'.' 00 mld'.' 000 mld'.' + 000 mld'.' + 000 mld'.' 000 mld'.' 0 bil'.' + 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' + 000 bil'.' 000 bil'.' @@ -4398,9 +4429,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4921,13 +4949,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ čínského jüanu (offshore) čínských jüanů (offshore) - - čínský dolar ČLB - čínský dolar ČLB - čínské dolary ČLB - čínského dolaru ČLB - čínských dolarů ČLB - čínský jüan čínský jüan @@ -7314,10 +7335,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ díly - {0} díl - {0} díly - {0} dílu - {0} dílů inanimate @@ -11228,16 +11245,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} pol. {0} pol. - - díl - {0} díl - {0} díly - {0} dílu - {0} dílů - - - Glc - l/100km {0} l/100km @@ -11375,25 +11382,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} šp. {0} šp. - - {0} kat - {0} kat - {0} kat - {0} kat - - - cal-IT - {0} cal-IT - {0} cal-IT - {0} cal-IT - {0} cal-IT - - - {0} Bq - {0} Bq - {0} Bq - {0} Bq - {0} Sv {0} Sv @@ -11406,12 +11394,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} sv. {0} sv. - - {0} částice na mld - {0} částice na mld - {0} částice na mld - {0} částic na mld - {0}E {0}N diff --git a/make/data/cldr/common/main/cu.xml b/make/data/cldr/common/main/cu.xml deleted file mode 100644 index 26f21f48cf91..000000000000 --- a/make/data/cldr/common/main/cu.xml +++ /dev/null @@ -1,768 +0,0 @@ - - - - - - - - - - - а҆бха́зскїй - а҆ра́вскїй - а҆зербайджа́нскїй - бѣлорꙋ́сскїй - бо́лгарскїй - церковнослове́нскїй - нѣме́цкїй - а҆ѵстрі́йскїй нѣме́цкїй - є҆лветі́йскїй нѣме́цкїй - є҆́ллинскїй - а҆нглі́йскїй - а҆ѵстралі́йскїй а҆нглі́йскїй - кана́дскїй а҆нглі́йскїй - брїта́нскїй а҆нглі́йскїй - а҆нглі́йскїй (вели́каѧ брїта́нїа) - а҆мерїка́нскїй а҆нглі́йскїй - а҆нглі́йскїй (асд) - і҆спа́нскїй - латїноамерїка́нскїй і҆спа́нскїй - є҆ѵрѡпе́йскїй і҆спа́нскїй - і҆спанскїй (ме́ѯїка) - є҆сто́нскїй - фі́нскїй - францꙋ́зскїй - кана́дскїй францꙋ́зскїй - є҆лветі́йскїй францꙋ́зскїй - є҆вре́йскїй - а҆рме́нскїй - і҆талїа́нскїй - ꙗ҆пѡ́нскїй - і҆́верскїй - каза́хскїй - латі́нскїй - лїто́вскїй - латві́йскїй - портога́льскїй - бразі́льскїй портога́льскїй - є҆ѵрѡпе́йскїй портога́льскїй - дакорꙋмы́нскїй - молда́вскїй - рꙋ́сскїй - се́рбскїй - ᲂу҆краи́нскїй - невѣ́домый ѧ҆зы́къ - хи́нскїй - ᲂу҆проще́нный хи́нскїй - традїцїо́нный хи́нскїй - - - - - - - - - - - - - А҆ѵстралі́ѧ - бразі́лїа - бѣ́лаѧ рꙋ́сь - Кана́да - хи́нскаѧ страна̀ - герма́нїа - Дані́ѧ - га́ллїа - Вели́каѧ брїта́нїа - і҆́ндїа - і҆та́лїа - ꙗ҆пѡ́нїа - кирги́зїа - казахста́нъ - Ме́ѯїко - рѡссі́а - ᲂу҆краи́на - а҆мерїка̑нскїѧ соединє́нныѧ держа̑вы - невѣ́домаѧ страна̀ - - - григорїа́нскїй мѣсѧцесло́въ - канѡни́ческое ᲂу҆порѧ́доченїе - а҆раві́йстїи числові́и зна́цы - - - метрі́ческаѧ - а҆нглі́йскаѧ - а҆мерїка́нскаѧ - - - - [҇ ꙽ ҃ ҂ а б ⷠ в ⷡ г ⷢ д ⷣ еє ж ⷤ ⷥ ѕ зꙁ ий ії к ⷦ л ⷧ м ⷨ н ⷩ ѻо ⷪ п р ⷬ с ⷭ т у ꙋ ф х ⷯ ѡ ѿ ꙍ ѽ ц ч ⷱ ш щ ⸯ ꙿ ъ ы ь ѣ ю ѫ ꙗѧ ѯ ѱ ѳ ѵѷ ⷴ] - [҈ ҉\u200C\u200D ꙰ ꙱ ꙲ ︯ ҄ ︮ ꙯ ⷶ ꙣ ⷷ ꙴ ꙃ ꙅ ꙵ ꙶ ꙇ ꙉ ⷸ ꙥ ꙧ ҥ ꙩꙫꙭꙮꚙꚛ ⷫ ҁ ⷵ ⷮ ꙷ ⷹ ꚞ ꙻ ⷰ ꙡ џ ⷲ ⷳ ꙏ ꙸ ꙑ ꙹ ꙺ ⷺ ꙓ ⷻ ꙕ ⷼ ѥ ꚟ ⷽ ꙙ ⷾ ꙛ ѩ ꙝ ѭ ⷿ ꙟ] - [А Б В Г Д Є Ж Ѕ З И І К Л М Н ѺО П Р С Т Ꙋ Ф Х Ѡ Ѿ Ц Ч Ш Щ Ъ Ы Ь Ѣ Ю Ѫ ꙖѦ Ѯ Ѱ Ѳ Ѵ] - [  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9] - [_ \- ‐‑ – — ⹃ , ; \: ! ? . ( ) ꙳ / ꙾] - - - « - » - „ - “ - - - - - - - {0} – {1} - - - - - - - - і҆аⷩ҇ - феⷡ҇ - маⷬ҇ - а҆пⷬ҇ - маꙵ - і҆ꙋⷩ҇ - і҆ꙋⷧ҇ - а҆́ѵⷢ҇ - сеⷫ҇ - ѻ҆кⷮ - ноеⷨ - деⷦ҇ - - - і҆аннꙋа́рїа - феврꙋа́рїа - ма́рта - а҆прі́ллїа - ма́їа - і҆ꙋ́нїа - і҆ꙋ́лїа - а҆́ѵгꙋста - септе́мврїа - ѻ҆ктѡ́врїа - ное́мврїа - деке́мврїа - - - - - І҆ - Ф - М - А҆ - М - І҆ - І҆ - А҆ - С - Ѻ҆ - Н - Д - - - і҆аннꙋа́рїй - феврꙋа́рїй - ма́ртъ - а҆прі́ллїй - ма́їй - і҆ꙋ́нїй - і҆ꙋ́лїй - а҆́ѵгꙋстъ - септе́мврїй - ѻ҆ктѡ́врїй - ное́мврїй - деке́мврїй - - - - - - - ндⷧ҇ѧ - пнⷣе - втоⷬ҇ - срⷣе - чеⷦ҇ - пѧⷦ҇ - сꙋⷠ҇ - - - недѣ́лѧ - понедѣ́льникъ - вто́рникъ - среда̀ - четверто́къ - пѧто́къ - сꙋббѡ́та - - - - - Н - П - В - С - Ч - П - С - - - - - - - а҃_ѧ че́тверть - в҃_ѧ че́тверть - г҃_ѧ че́тверть - д҃_ѧ че́тверть - - - - - а҃ - в҃ - г҃ - д҃ - - - а҃ - в҃ - г҃ - д҃ - - - - - - - ДП - ПП - - - - - - по р. х. - - - пре́дъ р. х. - пре́дъ р. х. - ѿ р. х. - ѿ р. х. - - - - - - EEEE, d MMMM 'л'. y. - - - - - y MMMM d - - - - - y MMM d - - - - - y.MM.dd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - {0} – {1} - - - - - - - вѣ́къ - - - лѣ́то - - - л. - - - че́тверть - - - чеⷡ҇ - - - мѣ́сѧцъ - - - мцⷭ҇ъ - - - седми́ца - - - сеⷣ - - - де́нь - вчера̀ - дне́сь - наꙋ́трїе - - - деⷩ҇ - - - де́нь седми́цы - - - ДП/ПП - - - ча́съ - - - чаⷭ҇ - - - минꙋ́та - - - миⷩ҇ - - - секꙋ́нда - - - сеⷦ҇ - - - по́ѧсъ часовѡ́мъ - - - - {0} (вре́мѧ) - {0} (лѣ́тнее вре́мѧ) - {0} (зи́мнее вре́мѧ) - - - всемі́рное сѷгхронїзи́рованное вре́мѧ - - - - невѣ́домый гра́дъ - - - ми́нскъ - - - бишке́къ - - - а҆кта́ꙋ - - - ᲂу҆ра́льскъ - - - а҆ктю́бинскъ - - - кызылѻрда̀ - - - а҆лматы̀ - - - калинингра́дъ - - - москва̀ - - - волгогра́дъ - - - сама́ра - - - є҆катерїнбꙋ́ргъ - - - ѻ҆́мскъ - - - новосиби́рскъ - - - новокꙋзне́цкъ - - - красноѧ́рскъ - - - и҆ркꙋ́тскъ - - - чита̀ - - - ꙗ҆кꙋ́тскъ - - - владивосто́къ - - - ха́ндыга - - - сахали́нъ - - - ᲂу҆́сть_не́ра - - - магада́нъ - - - среднеколы́мскъ - - - петропа́ѵловскъ_камча́тскїй - - - а҆на́дырь - - - кі́евъ - - - сѷмферꙋ́поль - - - - среднеамерїка́нское вре́мѧ - среднеамерїка́нское зи́мнее вре́мѧ - среднеамерїка́нское лѣ́тнее вре́мѧ - - - - - восточноамерїка́нское вре́мѧ - восточноамерїка́нское зи́мнее вре́мѧ - восточноамерїка́нское лѣ́тнее вре́мѧ - - - - - а҆мерїка́нское наго́рнее вре́мѧ - а҆мерїка́нское наго́рнее зи́мнее вре́мѧ - а҆мерїка́нское наго́рнее лѣ́тнее вре́мѧ - - - - - тихоѻкеа́нское вре́мѧ - тихоѻкеа́нское зи́мнее вре́мѧ - тихоѻкеа́нское лѣ́тнее вре́мѧ - - - - - а҆тланті́ческое вре́мѧ - а҆тланті́ческое зи́мнее вре́мѧ - а҆тланті́ческое лѣ́тнее вре́мѧ - - - - - среднеєѵрѡпе́йское вре́мѧ - среднеєѵрѡпе́йское зи́мнее вре́мѧ - среднеєѵрѡпе́йское лѣ́тнее вре́мѧ - - - - - восточноєѵрѡпе́йское вре́мѧ - восточноєѵрѡпе́йское зи́мнее вре́мѧ - восточноєѵрѡпе́йское лѣ́тнее вре́мѧ - - - - - вре́мѧ въ калинингра́дѣ и҆ ми́нскѣ - - - - - западноєѵрѡпе́йское вре́мѧ - западноєѵрѡпе́йское зи́мнее вре́мѧ - западноєѵрѡпе́йское лѣ́тнее вре́мѧ - - - - - сре́днее вре́мѧ по грі́нꙋичꙋ - - - - - и҆ркꙋ́тское вре́мѧ - и҆ркꙋ́тское зи́мнее вре́мѧ - и҆ркꙋ́тское лѣ́тнее вре́мѧ - - - - - восто́чный казахста́нъ - - - - - за́падный казахста́нъ - - - - - красноѧ́рское вре́мѧ - красноѧ́рское зи́мнее вре́мѧ - красноѧ́рское лѣ́тнее вре́мѧ - - - - - кирги́зїа - - - - - магада́нское вре́мѧ - магада́нское зи́мнее вре́мѧ - магада́нское лѣ́тнее вре́мѧ - - - - - моско́вское вре́мѧ - моско́вское зи́мнее вре́мѧ - моско́вское лѣ́тнее вре́мѧ - - - - - новосиби́рское вре́мѧ - новосиби́рское зи́мнее вре́мѧ - новосиби́рское лѣ́тнее вре́мѧ - - - - - ѻ҆́мское вре́мѧ - ѻ҆́мское зи́мнее вре́мѧ - ѻ҆́мское лѣ́тнее вре́мѧ - - - - - вре́мѧ на сахали́нѣ - зи́мнее вре́мѧ на сахали́нѣ - лѣ́тнее вре́мѧ на сахали́нѣ - - - - - владивосто́цкое вре́мѧ - владивосто́цкое зи́мнее вре́мѧ - владивосто́цкое лѣ́тнее вре́мѧ - - - - - волгогра́дское вре́мѧ - волгогра́дское зи́мнее вре́мѧ - волгогра́дское лѣ́тнее вре́мѧ - - - - - ꙗ҆кꙋ́тское вре́мѧ - ꙗ҆кꙋ́тское зи́мнее вре́мѧ - ꙗ҆кꙋ́тское лѣ́тнее вре́мѧ - - - - - є҆катерїнбꙋ́ржское вре́мѧ - є҆катерїнбꙋ́ржское зи́мнее вре́мѧ - є҆катерїнбꙋ́ржское лѣ́тнее вре́мѧ - - - - - - - cyrl - - - , -   - - - - - #,##0 % - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤ - - - {0} {1} - - - - бразі́льскїй реа́лъ - бразі́льскагѡ реа́ла - - - бѣлорꙋ́сскїй рꙋ́бль - бѣлорꙋ́сскагѡ рꙋблѧ̀ - р. - - - бѣлорꙋ́сскїй рꙋ́бль (2000–2016) - бѣлорꙋ́сскагѡ рꙋблѧ̀ (2000–2016) - - - хи́нскїй ю҆а́нь - хи́нскагѡ ю҆а́нѧ - - - є҆́ѵрѡ - є҆́ѵра - - - а҆нглі́йскїй фꙋ́нтъ сте́рлингѡвъ - а҆нглі́йскагѡ фꙋ́нта сте́рлингѡвъ - - - і҆нді́йскаѧ рꙋ́пїѧ - і҆нді́йскїѧ рꙋ́пїи - - - ꙗ҆пѡ́нскаѧ і҆е́на - ꙗ҆пѡ́нскїѧ і҆е́ны - - - кирги́зскїй сꙋ́мъ - кирги́зскагѡ сꙋ́ма - - - каза́хскаѧ деньга̀ - каза́хскїѧ деньгѝ - ₸ - - - рѡссі́йскїй рꙋ́бль - рѡссі́йскагѡ рꙋблѧ̀ - ₽ - - - ᲂу҆краи́нскаѧ гри́вна - ᲂу҆краи́нскїѧ гри́вны - ₴ - - - а҆мерїка́нскїй до́лларъ - а҆мерїка́нскагѡ до́ллара - $ - - - невѣ́домое пла́тное сре́дство - невѣ́домагѡ пла́тнагѡ сре́дства - - - - - - {0} и҆ {1} - {0} и҆ {1} - - - {0}, {1} - {0}, {1} - - - - - є҆́й:є - нѝ:н - - - diff --git a/make/data/cldr/common/main/cu_RU.xml b/make/data/cldr/common/main/cu_RU.xml deleted file mode 100644 index f7abd7620143..000000000000 --- a/make/data/cldr/common/main/cu_RU.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/cv.xml b/make/data/cldr/common/main/cv.xml index df588cfd11d8..99e34de36e90 100644 --- a/make/data/cldr/common/main/cv.xml +++ b/make/data/cldr/common/main/cv.xml @@ -14,6 +14,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic афар чӗлхи абхаз чӗлхи + адыгей чӗлхи африкаанс чӗлхи агем чӗлхи акан чӗлхи @@ -21,9 +22,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic арагон чӗлхи оболо чӗлхи левант арап чӗлхи + анӑҫ апачи чӗлхи араб чӗлхи хальхи стандартлӑ араб чӗлхи мапуче чӗлхи + марокко араб чӗлхи ассам чӗлхи асу чӗлхи астури чӗлхи @@ -46,6 +49,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic тибет чӗлхи бахтияр чӗлхи бретон чӗлхи + брауи чӗлхи бодо чӗлхи босни чӗлхи акоосе чӗлхи @@ -125,10 +129,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic гавай чӗлхи иврит чӗлхи хинди чӗлхи - хинди чӗлхи (латин ҫырулӑхӗ) хинглиш чӗлхи хмонг-ну чӗлхи хорват чӗлхи + хунсрик чӗлхи тури лужица чӗлхи гаитян чӗлхи венгер чӗлхи @@ -140,6 +144,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic носу чӗлхи идо чӗлхи исланд чӗлхи + интерславян чӗлхи итальян чӗлхи инуктитут чӗлхи япон чӗлхи @@ -152,6 +157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic кабил чӗлхи каджи чӗлхи камба чӗлхи + кабардин-черкес чӗлхи тьяп чӗлхи маконде чӗлхи кабувердьяну чӗлхи @@ -209,12 +215,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic мокен чӗлхи маори чӗлхи микмак чӗлхи + мандей чӗлхи македон чӗлхи малаялам чӗлхи монгол чӗлхи манипур чӗлхи мохаук чӗлхи маратхи чӗлхи + мара чин чӗлхи малай чӗлхи мальта чӗлхи мунданг чӗлхи @@ -236,6 +244,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic квасио чӗлхи нюнорск норвег чӗлхи нгиембунд чӗлхи + ванчо чӗлхи норвег чӗлхи нко чӗлхи кӑнтӑр ндебеле чӗлхи @@ -265,6 +274,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic кечуа чӗлхи киче чӗлхи раджастхани чӗлхи + реджанг чӗлхи рохинджа чӗлхи риф чӗлхи романш чӗлхи @@ -293,6 +303,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic шан чӗлхи сингал чӗлхи сидама чӗлхи + килдин саам чӗлхи + пите-саам чӗлхи + уме-саам чӗлхи словак чӗлхи сирайки чӗлхи словен чӗлхи @@ -308,6 +321,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic сахо чӗлхи кӑнтӑр сото чӗлхи сундан чӗлхи + сусу чӗлхи сунвар чӗлхи швед чӗлхи суахили чӗлхи @@ -351,6 +365,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic воламо чӗлхи вальбири чӗлхи волоф чӗлхи + кайтаг чӗлхи коса чӗлхи кангри чӗлхи сога чӗлхи @@ -434,12 +449,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + @@ -496,6 +513,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -510,6 +528,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -681,7 +700,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Фиджи Фолкленд утравӗсем Фолкленд утравӗсем (Мальвина утравӗсем) - Микронези + Микронезин Федеративлă Штачĕсем Фарер утравӗсем Франци Габон @@ -884,6 +903,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Француз ирхи çĕнĕ вăхăт Академи 1943 ҫулхи орфографийӗ + AKHMIMIC локализаци AKUAPEM локализаци ALALC97 локализаци Алукулу диалекчӗ @@ -903,6 +923,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic BISCAYAN локализаци Сан-Гиоргио диалекчӗ BLASL локализаци + BOHAIRIC локализаци Бохорич алфавичӗ Бунтлинг BORNHOLM локализаци @@ -914,6 +935,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic EKAVSK локализаци EMODENG локализаци FASCIA локализаци + FAYYUMIC локализаци FODOM локализаци Тӗнчери фонетика алфавичӗ FONKIRSH локализаци @@ -948,8 +970,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic LTG1929 локализаци LTG2007 локализаци LUNA1918 локализаци + LYCOPOL локализаци MDCEGYP локализаци MDCTRANS локализаци + MESOKEM локализаци METELKO локализаци Пӗр кĕвĕллĕ NDYUKA локализаци @@ -977,6 +1001,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Резьян RUMGR локализаци Сахо + SAHIDIC локализаци SAIGON локализаци Англо-шотланди Ливерпуль @@ -1001,6 +1026,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Валенси VALLADER локализаци VECDRUKA локализаци + VIENNESE локализаци VIVARAUP локализаци Уэйд – Джайлз системи XSISTEMO локализаци @@ -1008,15 +1034,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic календарь валюта формачӗ + паллисем шута илмесӗр сортлани + акцентсене каялла сортласси + ҫӳлти/кӗҫӗн регистр сортлани + регистра шута илсе сортлани сортлав йӗрки + йӗркене кӗртнӗ сортлани + шутлӑ сортлани + ҫӗнӗрен йӗркелени (ҫыру/блоксем) + сортлани тухӑҫлӑхӗ валюта + палӑртнӑ вырӑна улӑштарас + сӑмахсене куҫару правилӑсенчен кӑларнисем эмодзи кӑтартӑвӗ + эрнен пӗрремӗш кунӗ + хутӑш вӑхӑт формачӗ (12 е 24 сехетлӗ) + кӗртмелли меслет + клавиатура + пысӑк саспаллисене шута илмеҫҫӗ йӗрке куҫарӑвӗн стилӗ сӑмах куҫарӑвӗн стилӗ + улшӑну правилисем виҫе системи + виҫе единици хисеп паллисем + хушма даннӑйсем валли регион + улшӑнусен ҫӑлкуҫӗ + регион подразделенийӗ кӗсекетӳ хыҫҫӑнхи предложени татӑлӑвӗ + улшӑну + машшин куçарăвĕ + сехет тӑрӑхӗ + регион настройкисен варианчӗ + уйрӑммӑн усӑ курни + уйрӑм ҫын усӑ курмалли улшӑну буддистсен календарӗ @@ -1042,11 +1094,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic хиджра календарӗ (таблицӑллӑ, граждан) хиджра (таблицӑллӑ, граждан) хиджра календарӗ (Сауд Аравийӗ) + хиджра (Сауд Аравийӗ, ҫур уйӑха сӑнанине тӗпе хурса) хиджра календарӗ (таблицӑллӑ, астрономи тапхӑрӗ) хиджра (таблицӑллӑ, астрономи тапхӑрӗ) хиджра календарӗ (Умм аль-Кура) хиджра (Умм аль-Кура) ISO-8601 календарӗ + григориан япон календарӗ япон перс календарӗ @@ -1057,6 +1111,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic финанс стандартлӑ валюта формачӗ стандартлӑ + сортлани символӗсем + символсене шута илмесӗр сортлани + акцентсене ахаль сортласси + акцентсене пачах урӑхла вырнаҫтармалла + малтан пӗчӗк саспаллисене сортлӑр + кӗҫӗн регистр + cтандартлӑ правилӑсемпе сортласси + кӗҫӗн регистр + малтан пысӑк саспаллисене сортлӑр + ҫӳлти регистр + регистра шута илмесӗр сортлани + регистра шута илсе сортлани килӗшӳллӗ сортлав йӗрки килӗшӳллӗ словарь сортлав йӗрки @@ -1064,15 +1130,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic стандартлӑ Юникод сортлав йӗрки стандартлӑ Юникод эмодзи сортлав йӗрки + эмодзи европа сортлав правилисем + Европа правилисем телефон кӗнеки сортлав йӗрки телефон кӗнеки + сортламалли фонетика йӗрки фонетика пиньинь сортлав йӗрки пиньинь шырав шырав хангылӗн пӗрремӗш хупӑ сас палли тӑрӑх шырав + корей пуҫламӑш хупӑ сасӑсем стандартлӑ сортлав йӗрки стандартлӑ йӗрсемпе сортлав йӗрки @@ -1083,9 +1153,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic уҫӑ-йӗрпе чжуинь сортлав йӗрки чжуинь + нормализацисӗр сортлани + юникод тӑрӑх сортлани + цифрӑсене уйрӑммӑн сортласси + цифрӑсене хисеп йӗркипе сортласси + укҫа единици + укҫа единици + цифрӑсем + цифрӑсем + пунктуаци + пунктуаци + сикчĕ + сикчӗ + символ + символ + пурне те сортламалла + пурте + тӗп саспаллисем ҫеҫ сортламалла + тӗп саспаллисем ҫеҫ + акцентсем/регистр/сарлакӑш/кане тӑрӑх сортлани + тӗп, акцентсем, регистр, вариантсем, кана + акцентсем тӑрӑх сортлани + тӗп, акцентсем + акцентсем/регистр/сарлакӑш тӑрӑх сортлани + тӗп, акцентсем, регистр, вариантсем + диакритика паллиллӗ символсене ASCII йӗркине куҫарни + хуҫлатса + юникодри символсен ячӗсем патне + пусӑмӑн цифра форми патне + юникод FCC + юникод FCD + пӗтӗм сарлакӑш + вунулттӑллӑ кодсем патне + ҫур сарлакӑш таран + Морзе азбуки патне + юникод NFC + юникод NFD + юникод NFKC + юникод NFKD + пиньинь ҫинче цифра тонӗсемпе + нимӗнле улшӑну та ҫук + ASCII символӗсене пичетлеме + пушӑ йӗрке патне + Зауджи Мьянма кодировкӑна яланхилле эмодзи текст + гибридлӑ + 12 сехетлӗ вӑхӑт формачӗ + 12 + 24 сехетлӗ вӑхӑт формачӗ + 24 12 сехетлӗ вӑхӑт формачӗ (0–11) 12 (0–11) 12 сехетлӗ вӑхӑт формачӗ (1–12) @@ -1094,6 +1212,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 сехетлӗ вӑхӑт формачӗ (1–24) 24 (1–24) + алӑпа ҫырса кӗртмелли меслет + пиньинь кӗртмелли меслет + кӗртмелли паллӑ мар меслет + вуби кӗртмелли меслет + 101 клавишлӑ клавиатура + 1021 клавишлӑ клавиатура + 600 пӑнчӑллӑ клавиатура + 768 пӑнчӑллӑ клавиатура + Андроид валли клавиатура + AZERTY никӗслӗ клавиатура + ХромОС клавиатура + Colemak клавиатура + Дворак клавиатура + сулахай алӑ валли Дворак клавиатура + сылтӑм алӑ валли Дворак клавиатура + грек 220 клавиатура + грек 319 клавиатура + хушма символсем нумай клавиатура + Гугл виртуаллӑ клавиатура + перс ISIRI клавиатура + кивелнӗ клавиатура + литва LST 1205 клавиатура + литва LST 1582 клавиатура + Nutaaq инуктитут клавиатура + МакОС клавиатура + тай Pattachote клавиатура + QWERTY никӗслӗ клавиатура + QWERTZ никӗслӗ клавиатура + тамил 99 клавиатура + палӑртман клавиатура + клавиатура варианчӗ + вьетнам VIQR клавиатура + Windows клавиатура + символсене шута илменни сикчĕ, чарӑну паллисене, пур символсене те витӗм кӳрет + пысӑк саспаллисем, пунктуаци, пурте символсем + символсене шута илменни сикчĕ тата чарӑну паллисене ҫеҫ пырса тивет + пысӑк саспаллисем, пунктуаци + символсене шута илменни сикчĕ ҫеҫ витӗм кӳрет + пысӑк саспаллисем, пунктуаци + Символсене шута илменни сикчĕ, чарӑну паллисене, валюта мар символсене витӗм кӳрет + пысӑк саспаллисем, пунктуаци, валюта мар символсене йӗрке куҫарӑвӗн ирӗклӗ стилӗ ирӗклӗ йӗрке куҫарӑвӗн йӗркеллӗ стилӗ @@ -1104,17 +1263,53 @@ CLDR data files are interpreted according to the LDML specification (http://unic пурне те упрамалла йӗркеллӗ сӑмах ҫаврӑнӑшӗсенче упрамалла + Эфиопика энциклопеди транслитерациӗ + АПШ ALA-LOC транслитерацийӗ + бета машадфт транслитерацийӗ + АПШ географи ячӗсен канашӗ транслитераци системи + букуолтер араб транслитерацийӗ + C11 синтаксиспа усӑ курса вунулттӑллӑ улшӑну + CSS синтаксиспа усӑ курса вунулттӑллӑ улшӑну + нимӗҫ DIN транслитерацийӗ + эфиопи стандартизаци агентстви ES 3842:2014 эфиопи-латин транслитерацийӗ + уайли транслитерацийӗн анлӑ схеми + СНГ ҫӗршывӗсен гост транслитерацийӗ + гураж еткерӗ хальхи транслитерацире + Ярос Гутгартс эфиопирен кириллица транслитерацийӗ + санскрит транслитерацийӗн пӗтӗм тӗнчери алфавичӗ + транслитераци амхар чӗлхипе IES/JES + ISO транслитерацийӗ + Java синтаксисӗпе усӑ курса вунулттӑллӑ улшӑну + Томас Оден Лямбдин эфиопи-латин транслитерацийӗ + MCST корей транслитерацийӗ + монгол наци стандартлӑ транслитерацийӗ + процент синтаксисӗпе усӑ курса вунулттӑллӑ улшӑну + Perl синтаксиспа усӑ курса вунулттӑллӑ улшӑну + таврари синтаксиссӑр вунулттӑллӑ улшӑну + араб чӗлхипе стандартлӑ техника транслитерацийӗ + эфиоп чӗлхине ASCII форматпа кӑтартмалли тытӑм + Теки Алибекит блин-латин транслитерацийӗ + ПНУ транслитераци системи + юникод синтаксиспа усӑ курса вунулттӑллӑ улшӑну + эритрея вӗренӳ министерстви блин-латин транслитерацийӗ + XML синтаксиспа усӑ курса вунулттӑллӑ улшӑну + XML вуннӑллӑ синтаксиспа усӑ курса вунулттӑллӑ улшӑну метрла виҫе системи метрла акӑлчанла виҫе системи акӑлчанла америкӑлла виҫе системи америкӑлла + цельсипе + фаренгейт + кельвин ахом хисеп паллисем араб-инди хисеп паллисем анлӑ араб-инди хисеп паллисем + анлӑ араб-инди паллисем эрмен хисеп паллисем эрмен пӗчӗк хисеп паллисем + эрмен пӗчӗк паллисем бали хисеп паллисем бенгал хисеп паллисем брахма хисеп паллисем @@ -1124,27 +1319,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic деванагари хисеп паллисем дивехи-акуру хисеп паллисем эфиоп хисеп паллисем + финанс кӑтартӑвӗсем + финанс паллисем тулли сарлакӑш хисеп паллисем + пӗтӗм сарлакӑш паллисем гарай хисеп паллисем грузин хисеп паллисем гунджала-гонди хисеп паллисем масарам-гонди хисеп паллисем грек хисеп паллисем грек пӗчӗк хисеп паллисем + грек пӗчӗк паллисем гуджарати хисеп паллисем кхема хисеп паллисем гурмукхи хисеп паллисем + китай календарӗнчи уйӑх кунне пӗлтерекен паллисем + уйӑх кунӗсене хань иероглифӗсемпе йӑлана кӗнӗ календарьсем валли ҫырни паллисем китай вуншарлӑ хисеп паллисем + позициллӗ вуннӑллӑ шутлав системи, унта цифрӑсем вырӑнне китай хисеп иероглифӗсемпе усӑ кураҫҫӗ паллисем ҫӑмӑлатнӑ китай хисеп паллисем ҫӑмӑлатнӑ китай финанс хисеп паллисем + ҫӑмӑлатнӑ китай финанс паллисем йӑлана кӗнӗ китай хисеп паллисем йӑлана кӗнӗ китай финанс хисеп паллисем + йӑлана кӗнӗ китай финанс паллисем иврит хисеп паллисем пахау хисеп паллисем ньякенг-пуачуэ хисеп паллисем яван хисеп паллисем япон хисеп паллисем япон финанс хисеп паллисем + япон финанс паллисем + япони календарӗпе Ганнен ҫулталӑкӗн хисеп паллисем + япони эрин пӗрремӗш ҫулне "ганнэн"сӑмахпа палӑртни кая-ли хисеп паллисем кави хисеп паллисем кхмер хисеп паллисем @@ -1152,15 +1359,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic кират-рай хисеп паллисем ланна хисеп паллисем тхам хисеп паллисем + Тай Там Там (тӗн) паллисем лаос хисеп паллисем хальхи араб хисеп паллисем лепча хисеп паллисем лимбу хисеп паллисем хулӑн математика хисеп паллисем + математикӑлла хулăн паллисем чӗнтӗрлӗ математика хисеп паллисем + математикӑлла икӗ йӗрлӗ паллисем пӗр сарлакӑшлӑ математика хисеп паллисем + математикӑлла пӗр пек сарлакӑш паллисем гротеск математика хисеп паллисем + математикӑлла хулăн засечкӑсӑр паллисем хулӑн гротеск математика хисеп паллисем + математикӑлла засечкӑсӑр паллисем малаялам хисеп паллисем моди хисеп паллисем монгол хисеп паллисем @@ -1168,20 +1381,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic манипури хисеп паллисем мьянма хисеп паллисем тухӑҫ пво-карен мьянма хисеп паллисем + мьянма карен тухӑҫ пво паллисем пао мьянма хисеп паллисем + мьянма пао паллисем шан мьянма хисеп паллисем + мьянма шан паллисем тай-лаи мьянма хисеп паллисем + мьянма тай-лай паллисем наг-мундари хисеп паллисем + хамӑр цифрӑсем + хамӑр цифрӑсем нко хисеп паллисем ол-чики хисеп паллисем ол-онал хисеп паллисем ори хисеп паллисем осман хисеп паллисем ӗлкеллӗ хисеп паллисем + контурлӑ паллисем ханифи хисеп паллисем рим хисеп паллисем + рим ҫӳлти регистрӗ рим пӗчӗк хисеп паллисем + рим пӗчӗк паллисем саураштра хисеп паллисем + сегментланӑ хисеп паллисем + сегментлӑ паллисем шарада хисеп паллисем худавади хисеп паллисем сингал хисеп паллисем @@ -1192,18 +1416,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic ҫӗнӗ тай-ныа хисеп паллисем йӑлана кӗнӗ тамил хисеп паллисем тамил хисеп паллисем + хальхи тамил паллисем телугу хисеп паллисем тай хисеп паллисем тибет хисеп паллисем тирхута хисеп паллисем тангса хисеп паллисем толонг-сики хисеп паллисем + йӑлана кӗнӗ паллисем + йӑлана кӗнӗ паллисем ваи хисеп паллисем варанг-кшити хисеп паллисем ванчо хисеп паллисем + диакритика паллиллӗ символсенчен ASCII йӗркине + ASCII-ран + вунулттӑллӑ кодсенчен + Морзе азбукинчен + пиньиньӑран цифра тонӗсемпе + чарӑну паллисене пичетленинчен ASCII патне + Зауджирен Мьянма кодировка сӳнтернӗ ҫутнӑ + машинӑн паллӑ мар куҫарӑвӗ + POSIX-па килӗшсе тӑракан регион настройкисен + POSIX варианчӗ + + сӳнтернӗ + ҫутнӑ + Метрла Акӑлчанла @@ -1245,9 +1486,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic б. с. - - б. с. - @@ -1272,6 +1510,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1}, {0} @@ -1292,162 +1533,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1}, {0} - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - HH–HH (v) - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - @@ -1483,45 +1572,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic вун иккӗмӗш уйӑх - - - 1-мӗш уйӑх - 2-мӗш уйӑх - 3-мӗш уйӑх - 4-мӗш уйӑх - 5-мӗш уйӑх - 6-мӗш уйӑх - 7-мӗш уйӑх - 8-мӗш уйӑх - 9-мӗш уйӑх - 10-мӗш уйӑх - 11-мӗш уйӑх - 12-мӗш уйӑх - - - пӗрремӗш уйӑх - иккӗмӗш уйӑх - виҫҫӗмӗш уйӑх - тӑваттӑмӗш уйӑх - пиллӗкмӗш уйӑх - улттӑмӗш уйӑх - ҫиччӗмӗш уйӑх - саккӑрмӗш уйӑх - тӑххӑрмӗш уйӑх - вуннӑмӗш уйӑх - вун пӗрмӗш уйӑх - вун иккӗмӗш уйӑх - - - - йӗкӗр {0} - - - йӗкӗр {0} - йӗкӗр {0} @@ -1532,15 +1585,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - йӗкӗр {0} - йӗкӗр {0} - - йӗкӗр {0} - @@ -1560,37 +1607,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic сюй хай - - цзы - чоу - инь - мао - чэнь - сы - у - вэй - шэнь - ю - сюй - хай - - - цзы - чоу - инь - мао - чэнь - сы - у - вэй - шэнь - ю - сюй - хай + + + + + + личунь + юйшуй + цзинчжэ + чуньфэнь + цинмин + гуюй + лися + сяомань + манчжун + сячжи + сяошу + дашу + лицю + чушу + байлу + цюфэнь + ханьлу + шуанцзян + лидун + сяосюэ + дасюэ + дунчжи + сяохань + дахань - + цзя-цзы @@ -1654,14408 +1703,7620 @@ CLDR data files are interpreted according to the LDML specification (http://unic жэнь-сюй гуй-хай - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - - - - - личунь - юйшуй - цзинчжэ - чуньфэнь - цинмин - гуюй - лися - сяомань - манчжун - сячжи - сяошу - дашу - лицю - чушу - байлу - цюфэнь - ханьлу - шуанцзян - лидун - сяосюэ - дасюэ - дунчжи - сяохань - дахань - - - личунь - юйшуй - цзинчжэ - чуньфэнь - цинмин - гуюй - лися - сяомань - манчжун - сячжи - сяошу - дашу - лицю - чушу - байлу - цюфэнь - ханьлу - шуанцзян - лидун - сяосюэ - дасюэ - дунчжи - сяохань - дахань - - - личунь - юйшуй - цзинчжэ - чуньфэнь - цинмин - гуюй - лися - сяомань - манчжун - сячжи - сяошу - дашу - лицю - чушу - байлу - цюфэнь - ханьлу - шуанцзян - лидун - сяосюэ - дасюэ - дунчжи - сяохань - дахань - - - - - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - цзя-цзы - и-чоу - бин-инь - дин-мао - у-чэнь - цзи-сы - гэн-у - синь-вэй - жэнь-шэнь - гуй-ю - цзя-сюй - и-хай - бин-цзы - дин-чоу - у-инь - цзи-мао - гэн-чэнь - синь-сы - жэнь-у - гуй-вэй - цзя-шэнь - и-ю - бин-сюй - дин-хай - у-цзы - цзи-чоу - гэн-инь - синь-мао - жэнь-чэнь - гуй-сы - цзя-у - и-вэй - бин-шэнь - дин-ю - у-сюй - цзи-хай - гэн-цзы - синь-чоу - жэнь-инь - гуй-мао - цзя-чэнь - и-сы - бин-у - дин-вэй - у-шэнь - цзи-ю - гэн-сюй - синь-хай - жэнь-цзы - гуй-чоу - цзя-инь - и-мао - бин-чэнь - дин-сы - у-у - цзи-вэй - гэн-шэнь - синь-ю - жэнь-сюй - гуй-хай - - - - - - - цзы - чоу - инь - мао - чэнь - сы - у - вэй - шэнь - ю - сюй - хай - - - цзы - чоу - инь - мао - чэнь - сы - у - вэй - шэнь - ю - сюй - хай - - - цзы - чоу - инь - мао - чэнь - сы - у - вэй - шэнь - ю - сюй - хай - - - - - - - - r (U), MMMM, d, EEEE - - - - - r (U), MMMM, d - - - - - r, MMM, d - - - - - r.MM.dd - - - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - B h - B h:mm - B h:mm:ss - E, B h - E, B h:mm - E, B h:mm:ss - r (U) - r, MMM - r, MMM, d - r, MMM, d, E - r (U), MMMM - r (U), MMMM, d - r (U), MMMM, d, E - a h - HH 'сех' - a h:mm - a h:mm:ss - a h (v) - HH 'сех' (v) - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - U, MM - U, MM.dd - U, MMM - U, MMM, d - r (U) - r (U) - r.MM - r.MM.dd - r.MM.dd (E) - r, MMM - r, MMM, d - r, MMM, d, E - r (U), MMMM - r (U), MMMM, d - r (U), MMMM, d, E - r (U), QQQ - r (U), QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' v - - - M–M - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - U – U - - - y.MM – y.MM - y.MM – y.MM - - - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - - - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - - - U, MMM – MMM - U, MMM – U, MMM - - - U, MMM, d–d - U, MMM, d – MMM, d - U, MMM, d – U, MMM, d - - - U, MMM, d, E – MMM, d, E - U, MMM, d, E – MMM, d, E - U, MMM, d, E – U, MMM, d, E - - - U, MMMM – MMMM - U, MMMM – U, MMMM - - - - - - - - - тот - бабэ - хатур - кихак - тубэ - амшир - барамхат - бармуда - башнас - бауна - абиб - мисра - наси - - - - - - Диоклетиантан - - - Диокл-т. - - - Д-т. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - - 1-мӗш уйӑх - 2-мӗш уйӑх - 3-мӗш уйӑх - 4-мӗш уйӑх - 5-мӗш уйӑх - 6-мӗш уйӑх - 7-мӗш уйӑх - 8-мӗш уйӑх - 9-мӗш уйӑх - 10-мӗш уйӑх - 11-мӗш уйӑх - 12-мӗш уйӑх - - - пӗрремӗш уйӑх - иккӗмӗш уйӑх - виҫҫӗмӗш уйӑх - тӑваттӑмӗш уйӑх - пиллӗкмӗш уйӑх - улттӑмӗш уйӑх - ҫиччӗмӗш уйӑх - саккӑрмӗш уйӑх - тӑххӑрмӗш уйӑх - вуннӑмӗш уйӑх - вун пӗрмӗш уйӑх - вун иккӗмӗш уйӑх - - - - - 1-мӗш уйӑх - 2-мӗш уйӑх - 3-мӗш уйӑх - 4-мӗш уйӑх - 5-мӗш уйӑх - 6-мӗш уйӑх - 7-мӗш уйӑх - 8-мӗш уйӑх - 9-мӗш уйӑх - 10-мӗш уйӑх - 11-мӗш уйӑх - 12-мӗш уйӑх - - - пӗрремӗш уйӑх - иккӗмӗш уйӑх - виҫҫӗмӗш уйӑх - тӑваттӑмӗш уйӑх - пиллӗкмӗш уйӑх - улттӑмӗш уйӑх - ҫиччӗмӗш уйӑх - саккӑрмӗш уйӑх - тӑххӑрмӗш уйӑх - вуннӑмӗш уйӑх - вун пӗрмӗш уйӑх - вун иккӗмӗш уйӑх - - - - - - - йӗкӗр {0} - - - йӗкӗр {0} - - - йӗкӗр {0} - - - - - йӗкӗр {0} - - - - - йӗкӗр {0} - - - йӗкӗр {0} - - - йӗкӗр {0} - - - - - - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - - - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - - - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - - - - - ипчхун - усу - кёнъчхип - чхунбун - чхёнъмён - когу - ипха - соман - манъджон - хачи - сосо - дэсо - ипхчху - чхосо - пэкхро - чхупун - халло - санъган - ипдон - сосоль - дэсоль - тонъджи - сохан - дэхан - - - ипчхун - усу - кёнъчхип - чхунбун - чхёнъмён - когу - ипха - соман - манъджон - хачи - сосо - дэсо - ипхчху - чхосо - пэкхро - чхупун - халло - санъган - ипдон - сосоль - дэсоль - тонъджи - сохан - дэхан - - - ипчхун - усу - кёнъчхип - чхунбун - чхёнъмён - когу - ипха - соман - манъджон - хачи - сосо - дэсо - ипхчху - чхосо - пэкхро - чхупун - халло - санъган - ипдон - сосоль - дэсоль - тонъджи - сохан - дэхан - - - - - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - кап-ча - ыль-чхук - пёнъ-ин - чонъ-мё - му-чин - ки-са - кёнъ-о - син-ми - им-син - ке-ю - кап-суль - ыль-хэ - пёнъ-ча - чонъ-чхук - му-ин - ки-мё - кёнъ-чин - син-са - им-о - ке-ми - кап-син - ыль-ю - пёнъ-суль - чонъ-хэ - му-ча - ки-чхук - кёнъ-ин - син-мё - им-чин - ке-са - кап-о - ыль-ми - пёнъ-син - чонъ-ю - му-суль - ки-хэ - кёнъ-ча - син-чхук - им-ин - ке-мё - кап-чин - ыль-са - пёнъ-о - чонъ-ми - му-син - ки-ю - кёнъ-суль - син-хэ - им-ча - ке-чхук - кап-ин - ыль-мё - пёнъ-чин - чонъ-са - му-о - ки-ми - кёнъ-син - син-ю - им-суль - ке-хэ - - - - - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - ча - чхук - ин - мё - чин - са - о - ми - син - ю - суль - хэ - - - - - - - - r (U), MMMM, d, EEEE - - - - - r (U), MMMM, d - - - - - r, MMM, d - - - - - r.MM.dd - - - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - r (U) - r, MMM - r, MMM, d - r, MMM, d, E - r (U), MMMM - r (U), MMMM, d - r (U), MMMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - U, MM - U, MM.dd - U, MMM - U, MMM, d - r (U) - r (U) - r.MM - r.MM.dd - r.MM.dd (E) - r, MMM - r, MMM, d - r, MMM, d, E - r (U), MMMM - r (U), MMMM, d - r (U), MMMM, d, E - r (U), QQQ - r (U), QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' v - - - M–M - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - U – U - - - y.MM – y.MM - y.MM – y.MM - - - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - - - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - - - U, MMM – MMM - U, MMM – U, MMM - - - U, MMM, d–d - U, MMM, d – MMM, d - U, MMM, d – U, MMM, d - - - U, MMM, d, E – MMM, d, E - U, MMM, d, E – MMM, d, E - U, MMM, d, E – U, MMM, d, E - - - U, MMMM – MMMM - U, MMMM – U, MMMM - - - - - - - - - мескерем - текемт - хедар - тахсас - тер - якатит - магабит - миазия - генбот - сэнэ - хамлэ - нахасэ - эпагомен - - - - - - тӗнче пуҫланнӑран - - - т. п-р. - - - т. п-р. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - тӗнче пуҫланнӑран - - - т. п-р. - - - т. п-р. - - - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - B h - B h:mm - B h:mm:ss - E, B h - E, B h:mm - E, B h:mm:ss - E, a h - E, a h:mm - E, HH:mm - E, a h:mm:ss - E, HH:mm:ss - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - a h - HH 'сех' - a h:mm - a h:mm:ss - a h (v) - HH 'сех' (v) - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - M–M - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - - кӑр. - нар. - пуш - ака - ҫу - ҫӗрт. - утӑ - ҫур. - авӑн - юпа - чӳк - раш. - - - кӑрлач - нарӑс - пуш - ака - ҫу - ҫӗртме - утӑ - ҫурла - авӑн - юпа - чӳк - раштав - - - - - кӑр. - нар. - пуш - ака - ҫу - ҫӗрт. - утӑ - ҫур. - авӑн - юпа - чӳк - раш. - - - К - Н - П - А - Ҫ - Ҫ - У - Ҫ - А - Ю - Ч - Р - - - - - - - вр - тн - ыт - юн - кҫ - эр - шм - - - вр - тн - ыт - юн - кҫ - эр - шм - - - вырсарни кун - тунти кун - ытлари кун - юн кун - кӗҫнерни кун - эрне кун - шӑмат кун - - - - - вр - тн - ыт - юн - кҫ - эр - шм - - - В - Т - Ы - Ю - К - Э - Ш - - - вр - тн - ыт - юн - кҫ - эр - шм - - - вырсарни кун - тунти кун - ытлари кун - юн кун - кӗҫнерни кун - эрне кун - шӑмат кун - - - - - - - 1-мӗш чӗр. - 2-мӗш чӗр. - 3-мӗш чӗр. - 4-мӗш чӗр. - - - 1-мӗш чӗрӗк - 2-мӗш чӗрӗк - 3-мӗш чӗрӗк - 4-мӗш чӗрӗк - - - - - 1-мӗш чӗр. - 2-мӗш чӗр. - 3-мӗш чӗр. - 4-мӗш чӗр. - - - 1-мӗш чӗрӗк - 2-мӗш чӗрӗк - 3-мӗш чӗрӗк - 4-мӗш чӗрӗк - - - - - - - к. у. - к. х. - - - к. у. - к. х. - - - к. у. - к. х. - - - - - к. у. - к. х. - - - к. у. - к. х. - - - к. у. - к. х. - - - - - - хальхи саманачченхи - хальхи саманачченхи - хальхи саманари - хальхи саманари - - - х. с-ч. - х. с. - - - х. с-ч. - х. с-ч. - х. с. - х. с. - - - - - - y, MMMM, d, EEEE - - - - - y, MMMM, d - - - - - y, MMM, d - - - - - y.MM.dd - - - - - - - HH:mm:ss (zzzz) - - - - - HH:mm:ss (z) - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - B h - B h:mm - B h:mm:ss - E, B h - ccc, B h:mm - ccc, B h:mm:ss - d, ccc - E, a h - E, a h:mm - E, HH:mm - E, a h:mm:ss - E, HH:mm:ss - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - a h - HH 'сех' - a h:mm - a h:mm:ss - a h:mm:ss (v) - HH:mm:ss (v) - a h:mm (v) - HH:mm (v) - a h (v) - HH 'сех' (v) - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - MMMM, W-'мӗш' 'эрне' - MMMM, W-'мӗш' 'эрне' - MMMM, W-'мӗш' 'эрне' - y.MM - y.MM.dd - y.MM.dd (ccc) - y, MMM - y, MMM, d - y, MMM, d, E - y, MMMM - y, QQQ - y, QQQQ - Y, w-'мӗш' 'эрне' - Y, w-'мӗш' 'эрне' - Y, w-'мӗш' 'эрне' - - - {0} ({1}) - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - M–M - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - y.MM – y.MM - y.MM – y.MM - - - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - y.MM.dd – y.MM.dd - - - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - y.MM.dd (E) – y.MM.dd (E) - - - y, MMM – MMM - y, MMM – y, MMM - - - y, MMM, d–d - y, MMM, d – MMM, d - y, MMM, d – y, MMM, d - - - y, MMM, d, E – MMM, d, E - y, MMM, d, E – MMM, d, E - y, MMM, d, E – y, MMM, d, E - - - y, MMMM – MMMM - y, MMMM – y, MMMM - - - - - - - - - тишрей - хешван - кислев - тевет - шеват - адар-алеф - адар - адар-бет - нисан - ияр - сиван - таммуз - ав - элул - - - - - тишрей - хешван - кислев - тевет - шеват - адар-алеф - адар - адар-бет - нисан - ияр - сиван - таммуз - ав - элул - - - - - - тӗнче пуҫланнӑран - - - т. п-р. - - - т. п-р. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - - чайтра - ваисакха - джанштха - асадха - сравана - бхадра - азвина - картика - аграхайана - пауза - магха - пхалгуна - - - - - - Сака саманари - - - Сака с. - - - Сака с. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - - мух. - саф. - раб. I - раб. II - джум. I - джум. II - радж. - шааб. - рам. - шав. - зуль-к. - зуль-х. - - - мухаррам - сафар - раби-уль-авваль - раби-уль-ахир - джумад-уль-авваль - джумад-уль-ахир - раджаб - шаабан - рамадан - шавваль - зуль-каада - зуль-хиджжа - - - - - - хиджра хыҫҫӑнхи - хиджрӑччен - - - х. х. - х-ч. - - - х. х. - х-ч. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - Тайка (645–650) - Хакути (650–671) - Хакухо (672–686) - Сютё (686–701) - Тайхо (701–704) - Кёун (704–708) - Вадо (708–715) - Рэйки (715–717) - Ёро (717–724) - Дзинки (724–729) - Тэмпьё (729–749) - Тэмпьё-Канпо (749–749) - Тэмпьё-Сёхо (749-757) - Тэмпьё-Ходзи (757-765) - Тэмпьё-Дзинго (765-767) - Дзинго-Кёун (767-770) - Хоки (770–781) - Тэнъо (781–782) - Энряку (782–806) - Дайдо (806–810) - Конин (810–824) - Тэнтьё (824–834) - Дзёва (834–848) - Касё (848–851) - Ниндзю (851–854) - Сайко (854–857) - Тэнъан (857–859) - Дзёган (859–877) - Гангё (877–885) - Нинна (885–889) - Канпё (889–898) - Сётай (898–901) - Энги (901–923) - Энтё (923–931) - Дзёхей (931–938) - Тэнгё (938–947) - Тэнряку (947–957) - Тэнтоку (957–961) - Ова (961–964) - Кохо (964–968) - Анна (968–970) - Тэнроку (970–973) - Тэнъэн (973–976) - Дзёгэн (976–978) - Тэнгэн (978–983) - Эйкан (983–985) - Канна (985–987) - Эйэн (987–989) - Эйсо (989–990) - Сёряку (990–995) - Тётоку (995–999) - Тёхо (999–1004) - Канко (1004–1012) - Тёва (1012–1017) - Каннин (1017–1021) - Дзиан (1021–1024) - Мандзю (1024–1028) - Тёгэн (1028–1037) - Тёряку (1037–1040) - Тёкю (1040–1044) - Кантоку (1044–1046) - Эйсё (1046–1053) - Тэнги (1053–1058) - Кохэй (1058–1065) - Дзиряку (1065–1069) - Энкю (1069–1074) - Дзюхо (1074–1077) - Дзёряку (1077–1081) - Эйхо (1081–1084) - Отоку (1084–1087) - Кандзи (1087–1094) - Кахо (1094–1096) - Эйтё (1096–1097) - Дзётоку (1097–1099) - Кова (1099–1104) - Тёдзи (1104–1106) - Кадзё (1106–1108) - Тэннин (1108–1110) - Тэнъэй (1110–1113) - Эйкю (1113–1118) - Гэнъэй (1118–1120) - Хоан (1120–1124) - Тэндзи (1124–1126) - Дайдзи (1126–1131) - Тэнсё (1131–1132) - Тёсё (1132–1135) - Хоэн (1135–1141) - Эйдзи (1141–1142) - Кодзи (1142–1144) - Тэнъё (1144–1145) - Кюан (1145–1151) - Нимпэй (1151–1154) - Кюдзю (1154–1156) - Хогэн (1156–1159) - Хэйдзи (1159–1160) - Эйряку (1160–1161) - Охо (1161–1163) - Тёкан (1163–1165) - Эйман (1165–1166) - Нинъан (1166–1169) - Као (1169–1171) - Дзёан (1171–1175) - Ангэн (1175–1177) - Дзисё (1177–1181) - Ёва (1181–1182) - Дзюэй (1182–1184) - Гэнрюку (1184–1185) - Бундзи (1185–1190) - Кэнкю (1190–1199) - Сёдзи (1199–1201) - Кэннин (1201–1204) - Гэнкю (1204–1206) - Кэнъэй (1206–1207) - Дзёгэн (1207–1211) - Кэнряку (1211–1213) - Кэмпо (1213–1219) - Дзёкю (1219–1222) - Дзёо (1222–1224) - Гэннин (1224–1225) - Кароку (1225–1227) - Антэй (1227–1229) - Канги (1229–1232) - Дзёэй (1232–1233) - Тэмпуку (1233–1234) - Бунряку (1234–1235) - Катэй (1235–1238) - Рякунин (1238–1239) - Энъо (1239–1240) - Ниндзи (1240–1243) - Кангэн (1243–1247) - Ходзи (1247–1249) - Кэнтё (1249–1256) - Когэн (1256–1257) - Сёка (1257–1259) - Сёгэн (1259–1260) - Бунъо (1260–1261) - Котё (1261–1264) - Бунъэй (1264–1275) - Кэндзи (1275–1278) - Коан (1278–1288) - Сёо (1288–1293) - Эйнин (1293–1299) - Сёан (1299–1302) - Кэнгэн (1302–1303) - Кагэн (1303–1306) - Токудзи (1306–1308) - Энкё (1308–1311) - Отё (1311–1312) - Сёва (1312–1317) - Бумпо (1317–1319) - Гэнъо (1319–1321) - Гэнко (1321–1324) - Сётю (1324–1326) - Каряку (1326–1329) - Гэнтоку (1329–1331) - Гэнко (1331–1334) - Кэнму (1334–1336) - Энгэн (1336–1340) - Кококу (1340–1346) - Сёхэй (1346–1370) - Кэнтоку (1370–1372) - Бунтю (1372–1375) - Тэндзю (1375–1379) - Коряку (1379–1381) - Кова (1381–1384) - Гэнтю (1384–1392) - Ситоку (1384–1387) - Какэй (1387–1389) - Коо (1389–1390) - Мэйтоку (1390–1394) - Оэй (1394–1428) - Сётё (1428–1429) - Эйкё (1429–1441) - Какицу (1441–1444) - Бунъан (1444–1449) - Хотоку (1449–1452) - Кётоку (1452–1455) - Кёсё (1455–1457) - Тёроку (1457–1460) - Кансё (1460–1466) - Бунсё (1466–1467) - Онин (1467–1469) - Бунмэй (1469–1487) - Тёкё (1487–1489) - Энтоку (1489–1492) - Мэйо (1492–1501) - Бунки (1501–1504) - Эйсё (1504–1521) - Дайэй (1521–1528) - Кёроку (1528–1532) - Тэнбун (1532–1555) - Кодзи (1555–1558) - Эйроку (1558–1570) - Гэнки (1570–1573) - Тэнсё (1573–1592) - Бунроку (1592–1596) - Кэйтё (1596–1615) - Гэнна (1615–1624) - Канъэй (1624–1644) - Сёхё (1644–1648) - Кэйан (1648–1652) - Дзёо (1652–1655) - Мэйрэки (1655–1658) - Мандзи (1658–1661) - Камбун (1661–1673) - Эмпо (1673–1681) - Тэнна (1681–1684) - Дзёкё (1684–1688) - Гэнроку (1688–1704) - Хоэй (1704–1711) - Сётоку (1711–1716) - Кёхо (1716–1736) - Гэмбун (1736–1741) - Кампо (1741–1744) - Энкё (1744–1748) - Канъэн (1748–1751) - Хореки (1751–1764) - Мэйва (1764–1772) - Анъэй (1772–1781) - Тэнмэй (1781–1789) - Кансэй (1789–1801) - Кёва (1801–1804) - Бунка (1804–1818) - Бунсэй (1818–1830) - Тэнпо (1830–1844) - Кока (1844–1848) - Каэй (1848–1854) - Ансэй (1854–1860) - Манъэн (1860–1861) - Бункю (1861–1864) - Гэндзи (1864–1865) - Кейо (1865–1868) - Мэйдзи - Тайсё - Сёва - Хэйсэй - Рэйва - - - Тайка (645–650) - Хакути (650–671) - Хакухо (672–686) - Сютё (686–701) - Тайхо (701–704) - Кёун (704–708) - Вадо (708–715) - Рэйки (715–717) - Ёро (717–724) - Дзинки (724–729) - Тэмпьё (729–749) - Тэмпьё-Канпо (749–749) - Тэмпьё-Сёхо (749-757) - Тэмпьё-Ходзи (757-765) - Тэмпьё-Дзинго (765-767) - Дзинго-Кёун (767-770) - Хоки (770–781) - Тэнъо (781–782) - Энряку (782–806) - Дайдо (806–810) - Конин (810–824) - Тэнтьё (824–834) - Дзёва (834–848) - Касё (848–851) - Ниндзю (851–854) - Сайко (854–857) - Тэнъан (857–859) - Дзёган (859–877) - Гангё (877–885) - Нинна (885–889) - Канпё (889–898) - Сётай (898–901) - Энги (901–923) - Энтё (923–931) - Дзёхей (931–938) - Тэнгё (938–947) - Тэнряку (947–957) - Тэнтоку (957–961) - Ова (961–964) - Кохо (964–968) - Анна (968–970) - Тэнроку (970–973) - Тэнъэн (973–976) - Дзёгэн (976–978) - Тэнгэн (978–983) - Эйкан (983–985) - Канна (985–987) - Эйэн (987–989) - Эйсо (989–990) - Сёряку (990–995) - Тётоку (995–999) - Тёхо (999–1004) - Канко (1004–1012) - Тёва (1012–1017) - Каннин (1017–1021) - Дзиан (1021–1024) - Мандзю (1024–1028) - Тёгэн (1028–1037) - Тёряку (1037–1040) - Тёкю (1040–1044) - Кантоку (1044–1046) - Эйсё (1046–1053) - Тэнги (1053–1058) - Кохэй (1058–1065) - Дзиряку (1065–1069) - Энкю (1069–1074) - Дзюхо (1074–1077) - Дзёряку (1077–1081) - Эйхо (1081–1084) - Отоку (1084–1087) - Кандзи (1087–1094) - Кахо (1094–1096) - Эйтё (1096–1097) - Дзётоку (1097–1099) - Кова (1099–1104) - Тёдзи (1104–1106) - Кадзё (1106–1108) - Тэннин (1108–1110) - Тэнъэй (1110–1113) - Эйкю (1113–1118) - Гэнъэй (1118–1120) - Хоан (1120–1124) - Тэндзи (1124–1126) - Дайдзи (1126–1131) - Тэнсё (1131–1132) - Тёсё (1132–1135) - Хоэн (1135–1141) - Эйдзи (1141–1142) - Кодзи (1142–1144) - Тэнъё (1144–1145) - Кюан (1145–1151) - Нимпэй (1151–1154) - Кюдзю (1154–1156) - Хогэн (1156–1159) - Хэйдзи (1159–1160) - Эйряку (1160–1161) - Охо (1161–1163) - Тёкан (1163–1165) - Эйман (1165–1166) - Нинъан (1166–1169) - Као (1169–1171) - Дзёан (1171–1175) - Ангэн (1175–1177) - Дзисё (1177–1181) - Ёва (1181–1182) - Дзюэй (1182–1184) - Гэнрюку (1184–1185) - Бундзи (1185–1190) - Кэнкю (1190–1199) - Сёдзи (1199–1201) - Кэннин (1201–1204) - Гэнкю (1204–1206) - Кэнъэй (1206–1207) - Дзёгэн (1207–1211) - Кэнряку (1211–1213) - Кэмпо (1213–1219) - Дзёкю (1219–1222) - Дзёо (1222–1224) - Гэннин (1224–1225) - Кароку (1225–1227) - Антэй (1227–1229) - Канги (1229–1232) - Дзёэй (1232–1233) - Тэмпуку (1233–1234) - Бунряку (1234–1235) - Катэй (1235–1238) - Рякунин (1238–1239) - Энъо (1239–1240) - Ниндзи (1240–1243) - Кангэн (1243–1247) - Ходзи (1247–1249) - Кэнтё (1249–1256) - Когэн (1256–1257) - Сёка (1257–1259) - Сёгэн (1259–1260) - Бунъо (1260–1261) - Котё (1261–1264) - Бунъэй (1264–1275) - Кэндзи (1275–1278) - Коан (1278–1288) - Сёо (1288–1293) - Эйнин (1293–1299) - Сёан (1299–1302) - Кэнгэн (1302–1303) - Кагэн (1303–1306) - Токудзи (1306–1308) - Энкё (1308–1311) - Отё (1311–1312) - Сёва (1312–1317) - Бумпо (1317–1319) - Гэнъо (1319–1321) - Гэнко (1321–1324) - Сётю (1324–1326) - Каряку (1326–1329) - Гэнтоку (1329–1331) - Гэнко (1331–1334) - Кэнму (1334–1336) - Энгэн (1336–1340) - Кококу (1340–1346) - Сёхэй (1346–1370) - Кэнтоку (1370–1372) - Бунтю (1372–1375) - Тэндзю (1375–1379) - Коряку (1379–1381) - Кова (1381–1384) - Гэнтю (1384–1392) - Ситоку (1384–1387) - Какэй (1387–1389) - Коо (1389–1390) - Мэйтоку (1390–1394) - Оэй (1394–1428) - Сётё (1428–1429) - Эйкё (1429–1441) - Какицу (1441–1444) - Бунъан (1444–1449) - Хотоку (1449–1452) - Кётоку (1452–1455) - Кёсё (1455–1457) - Тёроку (1457–1460) - Кансё (1460–1466) - Бунсё (1466–1467) - Онин (1467–1469) - Бунмэй (1469–1487) - Тёкё (1487–1489) - Энтоку (1489–1492) - Мэйо (1492–1501) - Бунки (1501–1504) - Эйсё (1504–1521) - Дайэй (1521–1528) - Кёроку (1528–1532) - Тэнбун (1532–1555) - Кодзи (1555–1558) - Эйроку (1558–1570) - Гэнки (1570–1573) - Тэнсё (1573–1592) - Бунроку (1592–1596) - Кэйтё (1596–1615) - Гэнна (1615–1624) - Канъэй (1624–1644) - Сёхё (1644–1648) - Кэйан (1648–1652) - Дзёо (1652–1655) - Мэйрэки (1655–1658) - Мандзи (1658–1661) - Камбун (1661–1673) - Эмпо (1673–1681) - Тэнна (1681–1684) - Дзёкё (1684–1688) - Гэнроку (1688–1704) - Хоэй (1704–1711) - Сётоку (1711–1716) - Кёхо (1716–1736) - Гэмбун (1736–1741) - Кампо (1741–1744) - Энкё (1744–1748) - Канъэн (1748–1751) - Хореки (1751–1764) - Мэйва (1764–1772) - Анъэй (1772–1781) - Тэнмэй (1781–1789) - Кансэй (1789–1801) - Кёва (1801–1804) - Бунка (1804–1818) - Бунсэй (1818–1830) - Тэнпо (1830–1844) - Кока (1844–1848) - Каэй (1848–1854) - Ансэй (1854–1860) - Манъэн (1860–1861) - Бункю (1861–1864) - Гэндзи (1864–1865) - Кейо (1865–1868) - Мэйдзи - Тайсё - Сёва - Хэйсэй - Рэйва - - - Тайка - Хакути - Хакухо - Сютё - Тайхо - Кэйун - Вадо - Рэйки - Ёро - Дзинки - Тэмпьё - Тэмпьё-Канпо - Тэмпьё-Сёхо - Тэмпьё-Ходзи - Тэмпьё-Дзинго - Дзинго-Кэйун - Хоки - Тэнъо - Энряку - Дайдо - Конин - Тэнтьё - Дзёва - Касё - Ниндзю - Сайко - Тэнъан - Дзёган - Гангё - Нинна - Канпё - Сётай - Энги - Энтё - Дзёхей - Тэнгё - Тэнряку - Тэнтоку - Ова - Кохо - Анна - Тэнроку - Тэнъэн - Дзёгэн - Тэнгэн - Эйкан - Канна - Эйэн - Эйсо - Сёряку - Тётоку - Тёхо - Канко - Тёва - Каннин - Дзиан - Мандзю - Тёгэн - Тёряку - Тёкю - Кантоку - Эйсё - Тэнги - Кохэй - Дзиряку - Энкю - Дзюхо - Дзёряку - Эйхо - Отоку - Кандзи - Кахо - Эйтё - Дзётоку - Кова - Тёдзи - Кадзё - Тэннин - Тэнъэй - Эйкю - Гэнъэй - Хоан - Тэндзи - Дайдзи - Тэнсё - Тёсё - Хоэн - Эйдзи - Кодзи - Тэнъё - Кюан - Нимпэй - Кюдзю - Хогэн - Хэйдзи - Эйряку - Охо - Тёкан - Эйман - Нинъан - Као - Дзёан - Ангэн - Дзисё - Ёва - Дзюэй - Гэнрюку - Бундзи - Кэнкю - Сёдзи - Кэннин - Гэнкю - Кэнъэй - Дзёгэн - Кэнряку - Кэмпо - Дзёкю - Дзёо - Гэннин - Кароку - Антэй - Канги - Дзёэй - Тэмпуку - Бунряку - Катэй - Рякунин - Энъо - Ниндзи - Кангэн - Ходзи - Кэнтё - Когэн - Сёка - Сёгэн - Бунъо - Котё - Бунъэй - Кэндзи - Коан - Сёо - Эйнин - Сёан - Кэнгэн - Кагэн - Токудзи - Энкё - Отё - Сёва - Бумпо - Гэнъо - Гэнко - Сётю - Каряку - Гэнтоку - Гэнко - Кэнму - Энгэн - Кококу - Сёхэй - Кэнтоку - Бунтю - Тэндзю - Коряку - Кова - Гэнтю - Ситоку - Какэй - Коо - Мэйтоку - Оэй - Сётё - Эйкё - Какицу - Бунъан - Хотоку - Кётоку - Кёсё - Тёроку - Кансё - Бунсё - Онин - Бунмэй - Тёкё - Энтоку - Мэйо - Бунки - Эйсё - Дайэй - Кёроку - Тэнбун - Кодзи - Эйроку - Гэнки - Тэнсё - Бунроку - Кэйтё - Гэнна - Канъэй - Сёхё - Кэйан - Дзёо - Мэйрэки - Мандзи - Камбун - Эмпо - Тэнна - Дзёкё - Гэнроку - Хоэй - Сётоку - Кёхо - Гэмбун - Кампо - Энкё - Канъэн - Хореки - Мэйва - Анъэй - Тэнмэй - Кансэй - Кёва - Бунка - Бунсэй - Тэнпо - Кока - Каэй - Ансэй - Манъэн - Бункю - Гэндзи - Кейо - Мэйдзи - Тайсё - Сёва - Хэйсэй - Рэйва - - - - - - G, y, MMMM, d, EEEE - - - - - G, y, MMMM, d - - - - - G, y, MMM, d - - - - - GGGGG, y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G, y - G, y.MM - G, y.MM.dd - G, y.MM.dd (E) - G, y, MMM - G, y, MMM, d - G, y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G, y - G, y - G, y.MM - G, y.MM.dd - G, y.MM.dd (E) - G, y, MMM - G, y, MMM, d - G, y, MMM, d, E - G, y, MMMM - G, y, QQQ - G, y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G, y – G, y - G, y–y - - - G, y.MM – G, y.MM - G, y.MM – y.MM - G, y.MM – y.MM - - - G, y.MM.dd – y.MM.dd - G, y.MM.dd – G, y.MM.dd - G, y.MM.dd – y.MM.dd - G, y.MM.dd – y.MM.dd - - - G, y.MM.dd (E) – y.MM.dd (E) - G, y.MM.dd (E) – G, y.MM.dd (E) - G, y.MM.dd (E) – y.MM.dd (E) - G, y.MM.dd (E) – y.MM.dd (E) - - - G, y, MMM – G, y, MMM - G, y, MMM – MMM - G, y, MMM – y, MMM - - - G, y, MMM, d–d - G, y, MMM, d – G, y, MMM, d - G, y, MMM, d – MMM, d - G, y, MMM, d – y, MMM, d - - - G, y, MMM, d, E – MMM, d, E - G, y, MMM, d, E – G, y, MMM, d, E - G, y, MMM, d, E – MMM, d, E - G, y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G, y–y - - - G, y.MM – y.MM - G, y.MM – y.MM - - - G, y.MM.dd – y.MM.dd - G, y.MM.dd – y.MM.dd - G, y.MM.dd – y.MM.dd - - - G, y.MM.dd (E) – y.MM.dd (E) - G, y.MM.dd (E) – y.MM.dd (E) - G, y.MM.dd (E) – y.MM.dd (E) - - - G, y, MMM – MMM - G, y, MMM – y, MMM - - - G, y, MMM, d–d - G, y, MMM, d – MMM, d - G, y, MMM, d – y, MMM, d - - - G, y, MMM, d, E – MMM, d, E - G, y, MMM, d, E – MMM, d, E - G, y, MMM, d, E – y, MMM, d, E - - - G, y, MMMM – MMMM - G, y, MMMM – y, MMMM - - - - - - - - - фарвардин - ордибехешт - хордад - тир - мордад - шахривер - мехр - абан - азер - дей - бахман - эсфанд - - - - - - хиджра хыҫҫӑнхи - - - х. х. - - - х. х. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH 'сех' - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH 'сех' (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - Китай Республики йӗркеличченхи - Китай Республики йӗркеленӗрен - - - респ. й-ч. - респ. й-р. - - - р. й-ч. - р. й-р. - - - - - - G y, MMMM, d, EEEE - - - - - G y, MMMM, d - - - - - G y, MMM, d - - - - - GGGGG y.MM.dd - - - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d, E - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - MM.dd - MM.dd (E) - MMM, d - MMM, d, E - MMMM, d - G y - G y - G y.MM - G y.MM.dd - G y.MM.dd (E) - G y, MMM - G y, MMM, d - G y, MMM, d, E - G y, MMMM - G y, QQQ - G y, QQQQ - - - - B h – B h - B h–h - - - B h:mm – B h:mm - B h:mm–h:mm - B h:mm–h:mm - - - G y – G y - G y–y - - - G y.MM – G y.MM - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – G y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – G y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – G y, MMM - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – G y, MMM, d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – G y, MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - a h – a h - a h–h - - - HH–HH - - - a h:mm – a h:mm - a h:mm–h:mm - a h:mm–h:mm - - - a h:mm – a h:mm (v) - a h:mm–h:mm (v) - a h:mm–h:mm (v) - - - HH:mm–HH:mm (v) - HH:mm–HH:mm (v) - - - a h – a h (v) - a h–h (v) - - - HH–HH (v) - - - MM.dd – MM.dd - MM.dd – MM.dd - - - MM.dd (E) – MM.dd (E) - MM.dd (E) – MM.dd (E) - - - MMM – MMM - - - MMM, d–d - MMM, d – MMM, d - - - MMM, d, E – MMM, d, E - MMM, d, E – MMM, d, E - - - G y–y - - - G y.MM – y.MM - G y.MM – y.MM - - - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - G y.MM.dd – y.MM.dd - - - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - G y.MM.dd (E) – y.MM.dd (E) - - - G y, MMM – MMM - G y, MMM – y, MMM - - - G y, MMM, d–d - G y, MMM, d – MMM, d - G y, MMM, d – y, MMM, d - - - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – MMM, d, E - G y, MMM, d, E – y, MMM, d, E - - - G y, MMMM – MMMM - G y, MMMM – y, MMMM - - - - - - - - самана - - - сам. - - - сам. - - - ҫул - пӗлтӗр - кӑҫал - ҫитес ҫулта - - {0} ҫултан - {0} ҫултан - {0} ҫултан - - - {0} ҫул каялла - {0} ҫул каялла - {0} ҫул каялла - - - - пӗлтӗр - кӑҫал - ҫитес ҫулта - - {0} ҫултан - {0} ҫултан - {0} ҫултан - - - {0} ҫул каялла - {0} ҫул каялла - {0} ҫул каялла - - - - ҫул - пӗлтӗр - кӑҫал - ҫитес ҫулта - - {0} ҫултан - {0} ҫултан - {0} ҫултан - - - {0} ҫул каялла - {0} ҫул каялла - {0} ҫул каялла - - - - чӗрӗк - иртнӗ чӗрӗкре - ку чӗрӗкре - ҫитес чӗрӗкре - - {0} чӗрӗкрен - {0} чӗрӗкрен - {0} чӗрӗкрен - - - {0} чӗрӗк каялла - {0} чӗрӗк каялла - {0} чӗрӗк каялла - - - - чӗр. - иртнӗ чӗр. - ку чӗр. - ҫитес чӗр. - - {0} чӗрӗкрен - {0} чӗрӗкрен - {0} чӗрӗкрен - - - {0} чӗрӗк каялла - {0} чӗрӗк каялла - {0} чӗр. каялла - - - - чӗр. - иртнӗ чӗр. - ку чӗр. - ҫитес чӗр. - - {0} чӗрӗкрен - {0} чӗрӗкрен - {0} чӗрӗкрен - - - {0} чӗрӗк каялла - {0} чӗрӗк каялла - {0} чӗр. каялла - - - - уйӑх - иртнӗ уйӑхра - ку уйӑхра - ҫитес уйӑхра - - {0} уйӑхран - {0} уйӑхран - {0} уйӑхран - - - {0} уйӑх каялла - {0} уйӑх каялла - {0} уйӑх каялла - - - - - {0} уйӑхран - {0} уйӑхран - {0} уйӑхран - - - {0} уйӑх каялла - {0} уйӑх каялла - {0} уй. каялла - - - - уйӑх - - {0} уйӑхран - {0} уйӑхран - {0} уйӑхран - - - {0} уйӑх каялла - {0} уйӑх каялла - {0} уй. каялла - - - - эрне - иртнӗ эрнере - ку эрнере - ҫитес эрнере - - {0} эрнерен - {0} эрнерен - {0} эрнерен - - - {0} эрне каялла - {0} эрне каялла - {0} эрне каялла - - {0} эрнинче - - - иртнӗ эрн. - ку эрн. - ҫитес эрн. - - {0} эрнерен - {0} эрнерен - {0} эрнерен - - - {0} эрне каялла - {0} эрне каялла - {0} эрн. каялла - - {0} эрнинче - - - эрне - иртнӗ эрн. - ку эрн. - ҫитес эрн. - - {0} эрнерен - {0} эрнерен - {0} эрнерен - - - {0} эрне каялла - {0} эрне каялла - {0} эрн. каялла - - {0} эрнинче - - - уйӑхӑн эрни - - - кун - ӗнер - паян - ыран - - {0} кунтан - {0} кунтан - {0} кунтан - - - {0} кун каялла - {0} кун каялла - {0} кун каялла - - - - - {0} кунтан - {0} кунтан - {0} кунтан - - - {0} кун каялла - {0} кун каялла - {0} кун каялла - - - - кун - - {0} кунтан - {0} кунтан - {0} кунтан - - - {0} кун каялла - {0} кун каялла - {0} кун каялла - - - - ҫулталӑкӑн кунӗ - - - ҫул. кунӗ - - - эрнен кунӗ - - - эрн. кунӗ - - - эрн. кунӗ - - - уйӑхӑн кунӗ - - - уйӑхӑн кунӗ - - - уй. кунӗ - - - иртнӗ вырсарни кун - ку вырсарни кун - ҫитес вырсарни кун - - {0} вырсарни кунтан - {0} вырсарни кунтан - {0} вырсарни кунтан - - - {0} вырсарни кун каялла - {0} вырсарни кун каялла - {0} вырсарни кун каялла - - - - иртнӗ вр - ку вр - ҫитес вр - - {0} вырсарни кунтан - {0} вырсарни кунтан - {0} вр-тан - - - {0} вырсарни кун каялла - {0} вырсарни кун каялла - {0} вр каялла - - - - иртнӗ вр - ку вр - ҫитес вр - - {0} вырсарни кунтан - {0} вырсарни кунтан - {0} вр-тан - - - {0} вырсарни кун каялла - {0} вырсарни кун каялла - {0} вр каялла - - - - иртнӗ тунти кун - ку тунти кун - ҫитес тунти кун - - {0} тунти кунтан - {0} тунти кунтан - {0} тунти кунтан - - - {0} тунти кун каялла - {0} тунти кун каялла - {0} тунти кун каялла - - - - иртнӗ тн - ку тн - ҫитес тн - - {0} тунти кунтан - {0} тунти кунтан - {0} тн-тан - - - {0} тунти кун каялла - {0} тунти кун каялла - {0} тн каялла - - - - иртнӗ тн - ку тн - ҫитес тн - - {0} тунти кунтан - {0} тунти кунтан - {0} тн-тан - - - {0} тунти кун каялла - {0} тунти кун каялла - {0} тн каялла - - - - иртнӗ ытлари кун - ку ытлари кун - ҫитес ытлари кун - - {0} ытлари кунтан - {0} ытлари кунтан - {0} ытлари кунтан - - - {0} ытлари кун каялла - {0} ытлари кун каялла - {0} ытлари кун каялла - - - - иртнӗ ыт - ку ыт - ҫитес ыт - - {0} ытлари кунтан - {0} ытлари кунтан - {0} ыт-тан - - - {0} ытлари кун каялла - {0} ытлари кун каялла - {0} ыт каялла - - - - иртнӗ ыт - ку ыт - ҫитес ыт - - {0} ытлари кунтан - {0} ытлари кунтан - {0} ыт-тан - - - {0} ытлари кун каялла - {0} ытлари кун каялла - {0} ыт каялла - - - - иртнӗ юн кун - ку юн кун - ҫитес юн кун - - {0} юн кунтан - {0} юн кунтан - {0} юн кунтан - - - {0} юн кун каялла - {0} юн кун каялла - {0} юн кун каялла - - - - иртнӗ юн - ку юн - ҫитес юн - - {0} юн кунтан - {0} юн кунтан - {0} юн-тан - - - {0} юн кун каялла - {0} юн кун каялла - {0} юн каялла - - - - - {0} юн кунтан - {0} юн кунтан - {0} юн-тан - - - {0} юн кун каялла - {0} юн кун каялла - {0} юн каялла - - - - иртнӗ кӗҫнерни кун - ку кӗҫнерни кун - ҫитес кӗҫнерни кун - - {0} кӗҫнерни кунтан - {0} кӗҫнерни кунтан - {0} кӗҫнерни кунтан - - - {0} кӗҫнерни кун каялла - {0} кӗҫнерни кун каялла - {0} кӗҫнерни кун каялла - - - - иртнӗ кҫ - ку кҫ - ҫитес кҫ - - {0} кӗҫнерни кунтан - {0} кӗҫнерни кунтан - {0} кҫ-тан - - - {0} кӗҫнерни кун каялла - {0} кӗҫнерни кун каялла - {0} кҫ каялла - - - - иртнӗ кҫ - ку кҫ - ҫитес кҫ - - {0} кӗҫнерни кунтан - {0} кӗҫнерни кунтан - {0} кҫ-тан - - - {0} кӗҫнерни кун каялла - {0} кӗҫнерни кун каялла - {0} кҫ каялла - - - - иртнӗ эрне кун - ку эрне кун - ҫитес эрне кун - - {0} эрне кунтан - {0} эрне кунтан - {0} эрне кунтан - - - {0} эрне кун каялла - {0} эрне кун каялла - {0} эрне кун каялла - - - - иртнӗ эр - ку эр - ҫитес эр - - {0} эрне кунтан - {0} эрне кунтан - {0} эр-тан - - - {0} эрне кун каялла - {0} эрне кун каялла - {0} эр каялла - - - - иртнӗ эр - ку эр - ҫитес эр - - {0} эрне кунтан - {0} эрне кунтан - {0} эр-тан - - - {0} эрне кун каялла - {0} эрне кун каялла - {0} эр каялла - - - - иртнӗ шӑмат кун - ку шӑмат кун - ҫитес шӑмат кун - - {0} шӑмат кунтан - {0} шӑмат кунтан - {0} шӑмат кунтан - - - {0} шӑмат кун каялла - {0} шӑмат кун каялла - {0} шӑмат кун каялла - - - - иртнӗ шм - ку шм - ҫитес шм - - {0} шӑмат кунтан - {0} шӑмат кунтан - {0} шм-тан - - - {0} шӑмат кун каялла - {0} шӑмат кун каялла - {0} шм каялла - - - - иртнӗ шм - ку шм - ҫитес шм - - {0} шӑмат кунтан - {0} шӑмат кунтан - {0} шм-тан - - - {0} шӑмат кун каялла - {0} шӑмат кун каялла - {0} шм каялла - - - - к. у./к. х. - - - к. у./к. х. - - - КУ/КХ - - - сехет - ку сехетре - - {0} сехетрен - {0} сехетрен - {0} сехетрен - - - {0} сехет каялла - {0} сехет каялла - {0} сехет каялла - - - - сех. - ку сех. - - {0} сехетрен - {0} сехетрен - {0} сехетрен - - - {0} сехет каялла - {0} сехет каялла - {0} сех. каялла - - - - сех - ку сех. - - {0} сехетрен - {0} сехетрен - {0} сехетрен - - - {0} сехет каялла - {0} сехет каялла - {0} сех. каялла - - - - минут - ку минутра - - {0} минутран - {0} минутран - {0} минутран - - - {0} минут каялла - {0} минут каялла - {0} минут каялла - - - - мин. - ку мин. - - {0} минутран - {0} минутран - {0} минутран - - - {0} минут каялла - {0} минут каялла - {0} мин. каялла - - - - мин - ку мин. - - {0} минутран - {0} минутран - {0} минутран - - - {0} минут каялла - {0} минут каялла - {0} мин. каялла - - - - ҫеккунт - халь - - {0} ҫеккунтран - {0} ҫеккунтран - {0} ҫеккунтран - - - {0} ҫеккунт каялла - {0} ҫеккунт каялла - {0} ҫеккунт каялла - - - - ҫек. - халь - - {0} ҫеккунтран - {0} ҫеккунтран - {0} ҫеккунтран - - - {0} ҫеккунт каялла - {0} ҫеккунт каялла - {0} ҫек. каялла - - - - ҫ - халь - - {0} ҫеккунтран - {0} ҫеккунтран - {0} ҫ-ран - - - {0} ҫеккунт каялла - {0} ҫеккунт каялла - {0} ҫ каялла - - - - вӑхӑт тӑрӑхӗ - - - вӑх. тӑрӑхӗ - - - вӑх. тӑрӑхӗ - - - - {0} вӑхӑчӗ - {0} ҫуллахи вӑхӑчӗ - {0} стандартлӑ вӑхӑчӗ - - - Пӗтӗм тӗнчери килӗштернӗ вӑхӑт - - - - Паллӑ мар хула - - - Андорра - - - Дубай - - - Кабул - - - Антигуа - - - Ангилья - - - Тирана - - - Ереван - - - Луанда - - - Ротера - - - Палмер - - - Тролль - - - Сёва - - - Моусон - - - Дейвис - - - Восток - - - Кейси - - - Дюмон-д’Юрвиль - - - Мак-Мердо - - - Рио-Гальегос - - - Мендоса - - - Сан-Хуан - - - Ушуая - - - Ла-Риоха - - - Сан-Луис - - - Катамарка - - - Сальта - - - Жужуй - - - Тукуман - - - Кордова - - - Буэнос-Айрес - - - Паго-Паго - - - Вена - - - Перт - - - Юкла - - - Дарвин - - - Аделаида - - - Брокен-Хилл - - - Мельбурн - - - Хобарт - - - Линдеман - - - Сидней - - - Брисбен - - - Маккуори - - - Лорд-Хау - - - Аруба - - - Мариехамн - - - Баку - - - Сараево - - - Барбадос - - - Дакка - - - Брюссель - - - Уагадугу - - - Софи - - - Бахрейн - - - Бужумбура - - - Порто-Ново - - - Сен-Бартелеми - - - Бермуда - - - Бруней - - - Ла-Пас - - - Кралендейк - - - Эйрунепе - - - Риу-Бранку - - - Порту-Велью - - - Боа-Виста - - - Манаус - - - Куяба - - - Сантарен - - - Кампу-Гранди - - - Белен - - - Арагуаина - - - Сан-Паулу - - - Баия - - - Форталеза - - - Масейо - - - Ресифи - - - Норонья - - - Нассау - - - Тхимпху - - - Габороне - - - Минск - - - Белиз - - - Доусон - - - Уайтхорс - - - Инувик - - - Ванкувер - - - Форт-Нельсон - - - Доусон-Крик - - - Крестон - - - Эдмонтон - - - Свифт-Керрент - - - Кеймбридж-Бей - - - Реджайна - - - Виннипег - - - Резольют - - - Ранкин-Инлет - - - Корал-Харбор - - - Торонто - - - Икалуит - - - Монктон - - - Галифакс - - - Гус-Бей - - - Глейс-Бей - - - Бланк-Саблон - - - Сент-Джонс - - - Кокос утравӗсем - - - Киншаса - - - Лубумбаши - - - Банги - - - Браззавиль - - - Цюрих - - - Абиджан - - - Раротонга - - - Мӑн кун утравӗ - - - Койхик - - - Пунта-Аренас - - - Сантьяго - - - Дуала - - - Урумчи - - - Шанхай - - - Богота - - - Коста-Рика - - - Гавана - - - Кабо-Верде - - - Кюрасао - - - Раштав утравӗ - - - Никоси - - - Фамагуста - - - Прага - - - Бюзинген - - - Берлин - - - Джибути - - - Копенгаген - - - Доминика - - - Санто-Доминго - - - Алжир - - - Галапагос утравӗсем - - - Гуаякиль - - - Таллин - - - Каир - - - Эль-Аюн - - - Асмэра - - - Канар утравӗсем - - - Сеута - - - Мадрид - - - Аддис-Абеба - - - Хельсинки - - - Фиджи - - - Стэнли - - - Чуук - - - Понпеи - - - Косрае - - - Фарер утравӗсем - - - Париж - - - Либревиль - - - - Британи ҫуллахи вӑхӑчӗ - - Лондон - - - Гренада - - - Тбилиси - - - Кайенна - - - Гернси - - - Аккра - - - Гибралтар - - - Туле - - - Нуук - - - Скорсбисунн - - - Денмарксхавн - - - Банжул - - - Конакри - - - Гваделупа - - - Малабо - - - Афина - - - Кӑнтӑр Георги - - - Гватемала - - - Гуам - - - Бисау - - - Гайана - - - Гонконг - - - Тегусигальпа - - - Загреб - - - Порт-о-Пренс - - - Будапешт - - - Джакарта - - - Понтианак - - - Макасар - - - Джаяпура - - - - Ирланди стандартлӑ вӑхӑчӗ - - Дублин - - - Иерусалим - - - Мэн утравӗ - - - Калькутта - - - Чагос - - - Багдад - - - Тегеран - - - Рейкьявик - - - Рим - - - Джерси - - - Ямайка - - - Амман - - - Токио - - - Найроби - - - Бишкек - - - Пномпень - - - Кантон - - - Киритимати - - - Тарава - - - Комор утравӗсем - - - Сент-Китс - - - Пхеньян - - - Сеул - - - Кувейт - - - Кайман утравӗсем - - - Актау - - - Уральск - - - Атырау - - - Актобе - - - Костанай - - - Кызылорда - - - Алматы - - - Вьентьян - - - Бейрут - - - Сент-Люсия - - - Вадуц - - - Коломбо - - - Монрови - - - Масеру - - - Вильнюс - - - Люксембург - - - Рига - - - Триполи - - - Касабланка - - - Монако - - - Кишинёв - - - Подгорица - - - Мариго - - - Антананариву - - - Кваджалейн - - - Маджуро - - - Скопье - - - Бамако - - - Янгон - - - Ховд - - - Улан-Батор - - - Макао - - - Сайпан - - - Мартиника - - - Нуакшот - - - Монтсеррат - - - Мальта - - - Маврики - - - Мальдива - - - Блантайр - - - Тихуана - - - Эрмосильо - - - Сьюдад-Хуарес - - - Масатлан - - - Чиуауа - - - Баия-де-Бандерас - - - Охинага - - - Монтеррей - - - Мехико - - - Матаморос - - - Мерида - - - Канкун - - - Куала-Лумпур - - - Кучинг - - - Мапуту - - - Виндхук - - - Нумеа - - - Ниамей - - - Норфолк - - - Лагос - - - Манагуа - - - Амстердам - - - Осло - - - Катманду - - - Науру - - - Ниуэ - - - Чатем - - - Окленд - - - Маскат - - - Панама - - - Лима - - - Таити - - - Маркизас утравӗсем - - - Гамбье - - - Порт-Морсби - - - Бугенвиль - - - Манила - - - Карачи - - - Варшава - - - Микелон - - - Питкэрн - - - Пуэрто-Рико - - - Газа - - - Хеврон - - - Азор утравӗсем - - - Мадейра - - - Лиссабон - - - Палау - - - Асунсьон - - - Катар - - - Реюньон - - - Бухарест - - - Белград - - - Калининград - - - Мускав - - - Волгоград - - - Сарӑту - - - Аҫтӑрхан - - - Чӗмпӗр - - - Киров - - - Самар - - - Екатеринбург - - - Омск - - - Новосибирск - - - Барнаул - - - Томск - - - Новокузнецк - - - Красноярск - - - Иркутск - - - Чита - - - Якутск - - - Владивосток - - - Хандыга - - - Сахалин - - - Усть-Нера - - - Магадан - - - Среднеколымск - - - Петропавловск-Камчатский - - - Анадырь - - - Кигали - - - Эр-Рияд - - - Гуадалканал - - - Маэ - - - Хартум - - - Стокгольм - - - Сингапур - - - Сӑваплӑ Елена утравӗ - - - Любляна - - - Лонгйир - - - Братислава - - - Фритаун - - - Сан-Марино - - - Дакар - - - Могадишо - - - Парамарибо - - - Джуба - - - Сан-Томе - - - Сальвадор - - - Лоуэр-Принс-Куотер - - - Дамаск - - - Мбабане - - - Гранд-Терк - - - Нджамена - - - Кергелен - - - Ломе - - - Бангкок - - - Душанбе - - - Факаофо - - - Дили - - - Ашхабад - - - Тунис - - - Тонгатапу - - - Стамбул - - - Порт-оф-Спейн - - - Фунафути - - - Тайбэй - - - Дар-эс-Салам - - - Кийӳ - - - Симферополь - - - Кампала - - - Мидуэй - - - Уэйк утравӗ - - - Адак - - - Ном - - - Анкоридж - - - Якутат - - - Ситка - - - Джуно - - - Метлакатла - - - Лос-Анджелес - - - Бойсе - - - Финикс - - - Денвер - - - Бойла, Ҫур ҫӗр Дакота - - - Нью-Сейлем, Ҫур ҫӗр Дакота - - - Сентер, Ҫурҫӗр Дакота - - - Чикаго - - - Меномини - - - Винсеннес, Индиана - - - Питерсберг, Индиана - - - Телл-Сити, Индиана - - - Нокс, Индиана - - - Уинамак, Индиана - - - Маренго, Индиана - - - Индианаполис - - - Луисвилл - - - Вевей, Индиана - - - Монтиселло, Кентукки - - - Детройт - - - Нью-Йорк - - - Монтевидео - - - Самарканд - - - Ташкент - - - Ватикан - - - Сент-Винсент - - - Каракас - - - Тортола - - - Сент-Томас - - - Хошимин - - - Эфате - - - Уоллиспа Футуна - - - Апиа - - - Аден - - - Майотта - - - Йоханнесбург - - - Лусака - - - Хараре - - - - Акри вӑхӑчӗ - Акри стандартлӑ вӑхӑчӗ - Акри ҫуллахи вӑхӑчӗ - - - ACT Acre - ACT Acre - ACST Acre - - - - - Афганистан вӑхӑчӗ - - - AFT - - - - - Вӑта Африка вӑхӑчӗ - - - CAT - - - - - Тухӑҫ Африка вӑхӑчӗ - - - EAT - - - - - Кӑнтӑр Африка вӑхӑчӗ - - - SAST - - - - - Анӑҫ Африка вӑхӑчӗ - - - WAT - - - - - Аляска вӑхӑчӗ - Аляска стандартлӑ вӑхӑчӗ - Аляска ҫуллахи вӑхӑчӗ - - - AKT - AKST - AKDT - - - - - Алматы вӑхӑчӗ - Алматы стандартлӑ вӑхӑчӗ - Алматы ҫуллахи вӑхӑчӗ - - - ALMT - ALMT - ALMT DST - - - - - Амазонка вӑхӑчӗ - Амазонка стандартлӑ вӑхӑчӗ - Амазонка ҫуллахи вӑхӑчӗ - - - AMT - AMT - AMST - - - - - Вӑта Америка вӑхӑчӗ - Вӑта Америка стандартлӑ вӑхӑчӗ - Вӑта Америка ҫуллахи вӑхӑчӗ - - - CT - CST - CDT - - - - - Тухӑҫ Америка вӑхӑчӗ - Тухӑҫ Америка стандартлӑ вӑхӑчӗ - Тухӑҫ Америка ҫуллахи вӑхӑчӗ - - - ET - EST - EDT - - - - - Ту вӑхӑчӗ - Ту стандартлӑ вӑхӑчӗ - Ту ҫуллахи вӑхӑчӗ - - - MT - MST - MDT - - - - - Лӑпкӑ океан вӑхӑчӗ - Лӑпкӑ океан стандартлӑ вӑхӑчӗ - Лӑпкӑ океан ҫуллахи вӑхӑчӗ - - - PT - PST - PDT - - - - - Анадырь вӑхӑчӗ - Анадырь стандартлӑ вӑхӑчӗ - Анадырь ҫуллахи вӑхӑчӗ - - - ANAT - ANAT - ANAST - - - - - Апиа вӑхӑчӗ - Апиа стандартлӑ вӑхӑчӗ - Апиа ҫуллахи вӑхӑчӗ - - - SST Samoa Apia - SST Samoa Apia - SST Samoa Apia DST - - - - - Актау вӑхӑчӗ - Актау стандартлӑ вӑхӑчӗ - Актау ҫуллахи вӑхӑчӗ - - - ALMT Aktau - ALMT Aktau - ALMT Aktau DST - - - - - Актобе вӑхӑчӗ - Актобе стандартлӑ вӑхӑчӗ - Актобе ҫуллахи вӑхӑчӗ - - - AQTT - AQTT - AQTT DST - - - - - Сауд Аравийӗ вӑхӑчӗ - Сауд Аравийӗ стандартлӑ вӑхӑчӗ - Сауд Аравийӗ ҫуллахи вӑхӑчӗ - - - AST Arabia - AST Arabia - ADT Arabia - - - - - Аргентина вӑхӑчӗ - Аргентина стандартлӑ вӑхӑчӗ - Аргентина ҫуллахи вӑхӑчӗ - - - ART - ART - ARST - - - - - Анӑҫ Аргентина вӑхӑчӗ - Анӑҫ Аргентина стандартлӑ вӑхӑчӗ - Анӑҫ Аргентина ҫуллахи вӑхӑчӗ - - - WART - WART - WARST - - - - - Армени вӑхӑчӗ - Армени стандартлӑ вӑхӑчӗ - Армени ҫуллахи вӑхӑчӗ - - - AMT Armenia - AMT Armenia - AMST Armenia - - - - - Атлантика вӑхӑчӗ - Атлантика стандартлӑ вӑхӑчӗ - Атлантика ҫуллахи вӑхӑчӗ - - - AT - AST - ADT - - - - - Вӑта Австрали вӑхӑчӗ - Вӑта Австрали стандартлӑ вӑхӑчӗ - Вӑта Австрали ҫуллахи вӑхӑчӗ - - - ACST - ACST - ACDT - - - - - Анӑҫ Вӑта Австрали вӑхӑчӗ - Анӑҫ Вӑта Австрали стандартлӑ вӑхӑчӗ - Анӑҫ Вӑта Австрали ҫуллахи вӑхӑчӗ - - - ACWST - ACWST - ACWDT - - - - - Тухӑҫ Австрали вӑхӑчӗ - Тухӑҫ Австрали стандартлӑ вӑхӑчӗ - Тухӑҫ Австрали ҫуллахи вӑхӑчӗ - - - AEST - AEST - AEDT - - - - - Анӑҫ Австрали вӑхӑчӗ - Анӑҫ Австрали стандартлӑ вӑхӑчӗ - Анӑҫ Австрали ҫуллахи вӑхӑчӗ - - - AWST - AWST - AWDT - - - - - Азербайджан вӑхӑчӗ - Азербайджан стандартлӑ вӑхӑчӗ - Азербайджан ҫуллахи вӑхӑчӗ - - - AZT - AZT - AZST - - - - - Азор утравӗсен вӑхӑчӗ - Азор утравӗсен стандартлӑ вӑхӑчӗ - Азор утравӗсен ҫуллахи вӑхӑчӗ - - - AZOT - AZOT - AZOST - - - - - Бангладеш вӑхӑчӗ - Бангладеш стандартлӑ вӑхӑчӗ - Бангладеш ҫуллахи вӑхӑчӗ - - - BST Bangladesh - BST Bangladesh - BDT Bangladesh - - - - - Бутан вӑхӑчӗ - - - BTT - - - - - Боливи вӑхӑчӗ - - - BOT - - - - - Бразили вӑхӑчӗ - Бразили стандартлӑ вӑхӑчӗ - Бразили ҫуллахи вӑхӑчӗ - - - BRT - BRT - BRST - - - - - Бруней вӑхӑчӗ - - - BNT - - - - - Кабо-Верде вӑхӑчӗ - Кабо-Верде стандартлӑ вӑхӑчӗ - Кабо-Верде ҫуллахи вӑхӑчӗ - - - CVT - CVT - CVST - - - - - Кейси вӑхӑчӗ - - - CAST - - - - - Чаморро вӑхӑчӗ - - - ChST - - - - - Чатем вӑхӑчӗ - Чатем стандартлӑ вӑхӑчӗ - Чатем ҫуллахи вӑхӑчӗ - - - CHAST - CHAST - CHADT - - - - - Чили вӑхӑчӗ - Чили стандартлӑ вӑхӑчӗ - Чили ҫуллахи вӑхӑчӗ - - - CLT - CLT - CLST - - - - - Китай вӑхӑчӗ - Китай стандартлӑ вӑхӑчӗ - Китай ҫуллахи вӑхӑчӗ - - - CST China - CST China - CST China DST - - - - - Раштав утравӗ вӑхӑчӗ - - - CXT - - - - - Кокос утравӗсен вӑхӑчӗ - - - CCT - - - - - Колумби вӑхӑчӗ - Колумби стандартлӑ вӑхӑчӗ - Колумби ҫуллахи вӑхӑчӗ - - - COT - COT - COST - - - - - Кук утравӗсен вӑхӑчӗ - Кук утравӗсен стандартлӑ вӑхӑчӗ - Кук утравӗсен ҫуллахи вӑхӑчӗ - - - CKT - CKT - CKT DST - - - - - Куба вӑхӑчӗ - Куба стандартлӑ вӑхӑчӗ - Куба ҫуллахи вӑхӑчӗ - - - CST Cuba - CST Cuba - CDT Cuba - - - - - Дейвис вӑхӑчӗ - - - DAVT - - - - - Дюмон-д’Юрвиль вӑхӑчӗ - - - DDUT - - - - - Тухӑҫ Тимор вӑхӑчӗ - - - TLT - - - - - Мӑн кун утравӗн вӑхӑчӗ - Мӑн кун утравӗн стандартлӑ вӑхӑчӗ - Мӑн кун утравӗн ҫуллахи вӑхӑчӗ - - - EAST - EAST - EASST - - - - - Эквадор вӑхӑчӗ - - - ECT Ecuador - - - - - Вӑта Европа вӑхӑчӗ - Вӑта Европа стандартлӑ вӑхӑчӗ - Вӑта Европа ҫуллахи вӑхӑчӗ - - - CET - CET - CEST - - - - - Тухӑҫ Европа вӑхӑчӗ - Тухӑҫ Европа стандартлӑ вӑхӑчӗ - Тухӑҫ Европа ҫуллахи вӑхӑчӗ - - - EET - EET - EEST - - - - - Инҫет Тухӑҫ Европа вӑхӑчӗ - - - FEET - - - - - Анӑҫ Европа вӑхӑчӗ - Анӑҫ Европа стандартлӑ вӑхӑчӗ - Анӑҫ Европа ҫуллахи вӑхӑчӗ - - - WET - WET - WEST - - - - - Фолкленд утравӗсен вӑхӑчӗ - Фолкленд утравӗсен стандартлӑ вӑхӑчӗ - Фолкленд утравӗсен ҫуллахи вӑхӑчӗ - - - FKT - FKT - FKST - - - - - Фиджи вӑхӑчӗ - Фиджи стандартлӑ вӑхӑчӗ - Фиджи ҫуллахи вӑхӑчӗ - - - FJT - FJT - FJT Summer - - - - - Франци Гвианин вӑхӑчӗ - - - GFT - - - - - Франци Кӑнтӑрпа Антарктика территорийӗсен вӑхӑчӗ - - - TAAF - - - - - Галапагос вӑхӑчӗ - - - GALT - - - - - Гамбье вӑхӑчӗ - - - GAMT - - - - - Грузи вӑхӑчӗ - Грузи стандартлӑ вӑхӑчӗ - Грузи ҫуллахи вӑхӑчӗ - - - GET - GET - GEST - - - - - Гилберт утравӗсен вӑхӑчӗ - - - GIT - - - - - Гринвич вӑхӑчӗ - - - GMT - - - - - Гренланди вӑхӑчӗ - Гренланди стандартлӑ вӑхӑчӗ - Гренланди ҫуллахи вӑхӑчӗ - - - GNST - GNST - GNSST - - - - - Тухӑҫ Гренланди вӑхӑчӗ - Тухӑҫ Гренланди стандартлӑ вӑхӑчӗ - Тухӑҫ Гренланди ҫуллахи вӑхӑчӗ - - - EGT - EGT - EGST - - - - - Анӑҫ Гринланди вӑхӑчӗ - Анӑҫ Гринланди стандартлӑ вӑхӑчӗ - Анӑҫ ҫуллахи вӑхӑчӗ - - - WGT - WGT - WGST - - - - - Гуам стандартлӑ вӑхӑчӗ - - - GST Guam - - - - - Перс кӳлмекӗн вӑхӑчӗ - - - GST Gulf - - - - - Гайана вӑхӑчӗ - - - GYT - - - - - Гавайи-Алеут стандартлӑ вӑхӑчӗ - - - HST - - - - - Гавайи-Алеут вӑхӑчӗ - Гавайи-Алеут стандартлӑ вӑхӑчӗ - Гавайи-Алеут ҫуллахи вӑхӑчӗ - - - HST - HST - HDT - - - - - Гонконг вӑхӑчӗ - Гонконг стандартлӑ вӑхӑчӗ - Гонконг ҫуллахи вӑхӑчӗ - - - HKT - HKT - HKT DST - - - - - Ховд вӑхӑчӗ - Ховд стандартлӑ вӑхӑчӗ - Ховд ҫуллахи вӑхӑчӗ - - - HOVT - HOVT - HOVST - - - - - Инди вӑхӑчӗ - - - IST Indian - - - - - Инди океанӗ вӑхӑчӗ - - - IOT - - - - - Индокитай вӑхӑчӗ - - - ICT - - - - - Вӑта Индонези вӑхӑчӗ - - - CIT - - - - - Тухӑҫ Индонези вӑхӑчӗ - - - EIT - - - - - Анӑҫ Индонези вӑхӑчӗ - - - WIT - - - - - Иран вӑхӑчӗ - Иран стандартлӑ вӑхӑчӗ - Иран ҫуллахи вӑхӑчӗ - - - IRST - IRST - IRST DST - - - - - Иркутск вӑхӑчӗ - Иркутск стандартлӑ вӑхӑчӗ - Иркутск ҫуллахи вӑхӑчӗ - - - IRKT - IRKT - IRKST - - - - - Израиль вӑхӑчӗ - Израиль стандартлӑ вӑхӑчӗ - Израиль ҫуллахи вӑхӑчӗ - - - IST Israel - IST Israel - IDT - - - - - Япони вӑхӑчӗ - Япони стандартлӑ вӑхӑчӗ - Япони ҫуллахи вӑхӑчӗ - - - JST - JST - JST DST - - - - - Петропавловск-Камчатский вӑхӑчӗ - Петропавловск-Камчатский стандартлӑ вӑхӑчӗ - Петропавловск-Камчатский ҫуллахи вӑхӑчӗ - - - PETT - PETST - PETDT - - - - - Казахстан вӑхӑчӗ - - - Казахстан вхч - - - - - Тухӑҫ Казахстан вӑхӑчӗ - - - Хӗвелтухӑҫ Казахстан вхч - - - - - Анӑҫ Казахстан вӑхӑчӗ - - - Анӑҫ Казахстан вхч - - - - - Корея вӑхӑчӗ - Корея стандартлӑ вӑхӑчӗ - Корея ҫуллахи вӑхӑчӗ - - - KST - KST - KST DST - - - - - Косрае вӑхӑчӗ - - - KOST - - - - - Красноярск вӑхӑчӗ - Красноярск стандартлӑ вӑхӑчӗ - Красноярск ҫуллахи вӑхӑчӗ - - - KRAT - KRAT - KRAST - - - - - Кӑркӑстан вӑхӑчӗ - - - KGT - - - - - Шри-Ланка вӑхӑчӗ - - - SLST - - - - - Лайн утравӗсен вӑхӑчӗ - - - LINT - - - - - Лорд-Хау вӑхӑчӗ - Лорд-Хау стандартлӑ вӑхӑчӗ - Лорд-Хау ҫуллахи вӑхӑчӗ - - - LHST - LHST - LHST Summer - - - - - Макао вӑхӑчӗ - Макао стандартлӑ вӑхӑчӗ - Макао ҫуллахи вӑхӑчӗ - - - MST Macao - MST Macao - MST Macao DST - - - - - Магадан вӑхӑчӗ - Магадан стандартлӑ вӑхӑчӗ - Магадан ҫуллахи вӑхӑчӗ - - - MAGT - MAGT - MAGST - - - - - Малайзи вӑхӑчӗ - - - MYT - - - - - Мальдива вӑхӑчӗ - - - MVT - - - - - Маркизас утравӗсен вӑхӑчӗ - - - MART - - - - - Маршалл утравӗсен вӑхӑчӗ - - - MHT - - - - - Маврики вӑхӑчӗ - Маврики стандартлӑ вӑхӑчӗ - Маврики ҫуллахи вӑхӑчӗ - - - MUT - MUT - MUST - - - - - Моусон вӑхӑчӗ - - - MAWT - - - - - Мексика Лӑпкӑ океан вӑхӑчӗ - Мексика Лӑпкӑ океан стандартлӑ вӑхӑчӗ - Мексика Лӑпкӑ океан ҫуллахи вӑхӑчӗ - - - PSTM - PSTM - PDTM - - - - - Улан-Батор вӑхӑчӗ - Улан-Батор стандартлӑ вӑхӑчӗ - Улан-Батор ҫуллахи вӑхӑчӗ - - - ULAT - ULAT - ULAST - - - - - Мускав вӑхӑчӗ - Мускав стандартлӑ вӑхӑчӗ - Мускав ҫуллахи вӑхӑчӗ - - - MSK - МСК - MSD - - - - - Мьянма вӑхӑчӗ - - - MMT - - - - - Науру вӑхӑчӗ - - - NRT - - - - - Непал вӑхӑчӗ - - - NPT - - - - - Ҫӗнӗ Каледони вӑхӑчӗ - Ҫӗнӗ Каледони стандартлӑ вӑхӑчӗ - Ҫӗнӗ Каледони ҫуллахи вӑхӑчӗ - - - NCT - NCT - NDT New Caledonia - - - - - Ҫӗнӗ Зеланди вӑхӑчӗ - Ҫӗнӗ Зеланди стандартлӑ вӑхӑчӗ - Ҫӗнӗ Зеланди ҫуллахи вӑхӑчӗ - - - NZST - NZST - NZDT - - - - - Ньюфаундленд вӑхӑчӗ - Ньюфаундленд стандартлӑ вӑхӑчӗ - Ньюфаундленд ҫуллахи вӑхӑчӗ - - - NST - NST - NDT - - - - - Ниуэ вӑхӑчӗ - - - NUT - - - - - Норфолк вӑхӑчӗ - Норфолк стандартлӑ вӑхӑчӗ - Норфолк ҫуллахи вӑхӑчӗ - - - NFT - NFT - NFDT - - - - - Фернанду-ди-Норонья вӑхӑчӗ - Фернанду-ди-Норонья стандартлӑ вӑхӑчӗ - Фернанду-ди-Норонья ҫуллахи вӑхӑчӗ - - - FNT - FNT - FNST - - - - - Ҫур ҫӗр Мариана утравӗсен вӑхӑчӗ - - - ChST NMI - - - - - Новосибирск вӑхӑчӗ - Новосибирск стандартлӑ вӑхӑчӗ - Новосибирск ҫуллахи вӑхӑчӗ - - - NOVT - NOVT - NOVST - - - - - Омск вӑхӑчӗ - Омск стандартлӑ вӑхӑчӗ - Омск ҫуллахи вӑхӑчӗ - - - OMST - OMST - OMSST - - - - - Пакистан вӑхӑчӗ - Пакистан стандартлӑ вӑхӑчӗ - Пакистан ҫуллахи вӑхӑчӗ - - - PKT - PKT - PKT DST - - - - - Палау вӑхӑчӗ - - - PWT - - - - - Папуа — Ҫӗнӗ Гвинея вӑхӑчӗ - - - PGT - - - - - Парагвай вӑхӑчӗ - Парагвай стандартлӑ вӑхӑчӗ - Парагвай ҫуллахи вӑхӑчӗ - - - PYT - PYT - PYST - - - - - Перу вӑхӑчӗ - Перу стандартлӑ вӑхӑчӗ - Перу ҫуллахи вӑхӑчӗ - - - PET - PET - EDT Peru - - - - - Филиппин вӑхӑчӗ - Филиппин стандартлӑ вӑхӑчӗ - Филиппин ҫуллахи вӑхӑчӗ - - - PST Philippine - PST Philippine - PST Philippine DST - - - - - Феникс утравӗсен вӑхӑчӗ - - - PHOT - - - - - Сен-Пьерпа Микелон вӑхӑчӗ - Сен-Пьерпа Микелон стандартлӑ вӑхӑчӗ - Сен-Пьерпа Микелон ҫуллахи вӑхӑчӗ - - - PMST - PMST - PMDT - - - - - Питкэрн вӑхӑчӗ - - - PST Pitcairn - - - - - Понпеи вӑхӑчӗ - - - PONT - - - - - Ҫур ҫӗр Корея вӑхӑчӗ - - - PYT Korea - - - - - Кызылорда вӑхӑчӗ - Кызылорда стандартлӑ вӑхӑчӗ - Кызылорда ҫуллахи вӑхӑчӗ - - - QYZT - QYZT - QYZT DST - - - - - Реюньон вӑхӑчӗ - - - RET - - - - - Ротера вӑхӑчӗ - - - ROTT - - - - - Сахалин вӑхӑчӗ - Сахалин стандартлӑ вӑхӑчӗ - Сахалин ҫуллахи вӑхӑчӗ - - - SAKT - SAKT - SAKST - - - - - Самар вӑхӑчӗ - Самар стандартлӑ вӑхӑчӗ - Самар ҫуллахи вӑхӑчӗ - - - SAMT - SAMT - SAMST - - - - - Самоа вӑхӑчӗ - Самоа стандартлӑ вӑхӑчӗ - Самоа ҫуллахи вӑхӑчӗ - - - SST Samoa - SST Samoa - SST Samoa DST - - - - - Сейшел утравӗсен вӑхӑчӗ - - - SCT - - - - - Сингапур вӑхӑчӗ - - - SGT - - - - - Соломон вӑхӑчӗ - - - SBT - - - - - Кӑнтӑр Георги вӑхӑчӗ - - - GST - - - - - Суринам вӑхӑчӗ - - - SRT - - - - - Сёва вӑхӑчӗ - - - SYOT - - - - - Таити вӑхӑчӗ - - - TAHT - - - - - Тайвань вӑхӑчӗ - Тайвань стандартлӑ вӑхӑчӗ - Тайвань ҫуллахи вӑхӑчӗ - - - TWT - TWT - TWT DST - - - - - Таджикистан вӑхӑчӗ - - - TJT - - - - - Токелау вӑхӑчӗ - - - TKT - - - - - Тонга вӑхӑчӗ - Тонга стандартлӑ вӑхӑчӗ - Тонга ҫуллахи вӑхӑчӗ - - - TOT - TOT - TOST - - - - - Чуук вӑхӑчӗ - - - CHUT - - - - - Туркменистан вӑхӑчӗ - Туркменистан стандартлӑ вӑхӑчӗ - Туркменистан ҫуллахи вӑхӑчӗ - - - TMT - TMT - TMT DST - - - - - Тувалу вӑхӑчӗ - - - TVT - - - - - Уругвай вӑхӑчӗ - Уругвай стандартлӑ вӑхӑчӗ - Уругвай ҫуллахи вӑхӑчӗ - - - UYT - UYT - UYST - - - - - Узбекистан вӑхӑчӗ - Узбекистан стандартлӑ вӑхӑчӗ - Узбекистан ҫуллахи вӑхӑчӗ - - - UZT - UZT - UZT DST - - - - - Вануату вӑхӑчӗ - Вануату стандартлӑ вӑхӑчӗ - Вануату ҫуллахи вӑхӑчӗ - - - VUT - VUT - VUT DST - - - - - Венесуэла вӑхӑчӗ - - - VnzlT - - - - - Владивосток вӑхӑчӗ - Владивосток стандартлӑ вӑхӑчӗ - Владивосток ҫуллахи вӑхӑчӗ - - - VLAT - VLAT - VLAST - - - - - Волгоград вӑхӑчӗ - Волгоград стандартлӑ вӑхӑчӗ - Волгоград ҫуллахи вӑхӑчӗ - - - VOLT - VOLT - VOLST - - - - - Восток вӑхӑчӗ - - - VOST - - - - - Уэйк утравӗ вӑхӑчӗ - - - WAKT - - - - - Уоллиспа Футуна вӑхӑчӗ - - - WFT - - - - - Якутск вӑхӑчӗ - Якутск стандартлӑ вӑхӑчӗ - Якутск ҫуллахи вӑхӑчӗ - - - YAKT - YAKT - YAKST - - - - - Екатеринбург вӑхӑчӗ - Екатеринбург стандартлӑ вӑхӑчӗ - Екатеринбург ҫуллахи вӑхӑчӗ - - - YEKT - YEKT - YEKST - - - - - Юкон вӑхӑчӗ - - - YST - - - - - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - , -   - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - хисеп мар - - - - - 0 пин - 0 пин - 0 пин - 00 пин - 00 пин - 00 пин - 000 пин - 000 пин - 000 пин - 0 млн - 0 млн - 0 млн - 00 млн - 00 млн - 00 млн - 000 млн - 000 млн - 000 млн - 0 млрд - 0 млрд - 0 млрд - 00 млрд - 00 млрд - 00 млрд - 000 млрд - 000 млрд - 000 млрд - 0 трлн - 0 трлн - 0 трлн - 00 трлн - 00 трлн - 00 трлн - 000 трлн - 000 трлн - 000 трлн - - - - - 0 пин - 0 пин - 00 пин - 00 пин - 000 пин - 000 пин - 0 млн - 0 млн - 00 млн - 00 млн - 000 млн - 000 млн - 0 млрд - 0 млрд - 00 млрд - 00 млрд - 000 млрд - 000 млрд - 0 трлн - 0 трлн - 00 трлн - 00 трлн - 000 трлн - 000 трлн - - - - - - - #,##0 % - - - - - - - #,##0 % - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - 0 пин ¤ - 0 пин ¤ - 0 пин ¤ - 00 пин ¤ - 00 пин ¤ - 00 пин ¤ - 000 пин ¤ - 000 пин ¤ - 000 пин ¤ - 0 млн ¤ - 0 млн ¤ - 0 млн ¤ - 00 млн ¤ - 00 млн ¤ - 00 млн ¤ - 000 млн ¤ - 000 млн ¤ - 000 млн ¤ - 0 млрд ¤ - 0 млрд ¤ - 0 млрд ¤ - 00 млрд ¤ - 00 млрд ¤ - 00 млрд ¤ - 000 млрд ¤ - 000 млрд ¤ - 000 млрд ¤ - 0 трлн ¤ - 0 трлн ¤ - 0 трлн ¤ - 00 трлн ¤ - 00 трлн ¤ - 00 трлн ¤ - 000 трлн ¤ - 000 трлн ¤ - 000 трлн ¤ - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - - #,##0.00 ¤ - - - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) - - - - - - Андорра песи - Андорра песи - Андорра песи - Андорра песи - - - Пӗрлешнӗ Араб Эмирачӗсен дирхамӗ - ПАЭ дирхамӗ - ПАЭ дирхамӗ - ПАЭ дирхамӗ - - - Афганистан афганийӗ (1927–2002) - Афганистан афганийӗ (1927–2002) - Афганистан афганийӗ (1927–2002) - Афганистан афганийӗ (1927–2002) - - - Афганистан афганийӗ - Афганистан афганийӗ - Афганистан афганийӗ - Афганистан афганийӗ - - - Албани лекӗ (1946–1965) - Албани лекӗ (1946–1965) - Албани лекӗ (1946–1965) - Албани лекӗ (1946–1965) - - - Албани лекӗ - - - Армени драмӗ - Армени драмӗ - Армени драмӗ - Армени драмӗ - - - Нидерланд Антилӗн гульденӗ - Нидерланд Антилӗн гульденӗ - Нидерланд Антилӗн гульденӗ - Нидерланд Антилӗн гульденӗ - - - Ангола кванзи - Ангола кванзи - Ангола кванзи - Ангола кванзи - - - Ангола кванзи (1977–1991) - Ангола кванзи (1977–1991) - Ангола кванзи (1977–1991) - Ангола кванзи (1977–1991) - - - Ангола ҫӗнӗ кванзи (1990–2000) - Ангола ҫӗнӗ кванзи (1990–2000) - Ангола ҫӗнӗ кванзи (1990–2000) - Ангола ҫӗнӗ кванзи (1990–2000) - - - Ангола реюстадо кванзӗ (1995–1999) - Ангола реюстадо кванзӗ (1995–1999) - Ангола реюстадо кванзӗ (1995–1999) - Ангола реюстадо кванзӗ (1995–1999) - - - Аргентина аустралӗ - Аргентина аустралӗ - Аргентина аустралӗ - Аргентина аустралӗ - - - Аргентина песо-лейӗ (1970–1983) - Аргентина песо-лейӗ (1970–1983) - Аргентина песо-лейӗ (1970–1983) - Аргентина песо-лейӗ (1970–1983) - - - Аргентина песи (1881–1970) - Аргентина песи (1881–1970) - Аргентина песи (1881–1970) - Аргентина песи (1881–1970) - - - Аргентина песи (1983–1985) - Аргентина песи (1983–1985) - Аргентина песи (1983–1985) - Аргентина песи (1983–1985) - - - Аргентина песи - Аргентина песи - Аргентина песи - Аргентина песи - - - Австри шиллингӗ - Австри шиллингӗ - Австри шиллингӗ - Австри шиллингӗ - - - Австрали долларӗ - - - Аруба флоринӗ - - - Азербайджан маначӗ (1993–2006) - - - Азербайджан маначӗ - - - Боснипе Герцеговина динарӗ (1992–1994) - Боснипе Герцеговина динарӗ (1992–1994) - Боснипе Герцеговина динарӗ (1992–1994) - Боснипе Герцеговина динарӗ (1992–1994) - - - Боснипе Герцеговина конверсиленекен марки - Боснипе Герцеговина конверсиленекен марки - Боснипе Герцеговина конверсиленекен марки - Боснипе Герцеговина конверсиленекен марки - - - Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997) - Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997) - Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997) - Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997) - - - Барбадос долларӗ - - - Бангладеш таки - - - Бельги конверсиленекен франкӗ - Бельги конверсиленекен франкӗ - Бельги конверсиленекен франкӗ - Бельги конверсиленекен франкӗ - - - Бельги франкӗ - Бельги франкӗ - Бельги франкӗ - Бельги франкӗ - - - Бельги франкӗ (финанс) - Бельги франкӗ (финанс) - Бельги франкӗ (финанс) - Бельги франкӗ (финанс) - - - Болгари хытӑ левӗ - - - Болгари социалистсен левӗ - - - Болгари левӗ - - - Болгари левӗ (1879–1952) - - - Бахрейн динарӗ - - - Бурунди франкӗ - - - Бермуд долларӗ - - - Бруней долларӗ - - - Боливи боливианӗ - - - Боливи боливианӗ (1863–1963) - - - Боливи песи - Боливи песи - Боливи песи - Боливи песи - - - Боливи мвдолӗ - Боливи мвдолӗ - Боливи мвдолӗ - Боливи мвдолӗ - - - Бразили ҫӗнӗ крузейри (1967–1986) - Бразили ҫӗнӗ крузейри (1967–1986) - Бразили ҫӗнӗ крузейри (1967–1986) - Бразили ҫӗнӗ крузейри (1967–1986) - - - Бразили крузади (1986–1989) - Бразили крузади (1986–1989) - Бразили крузади (1986–1989) - Бразили крузади (1986–1989) - - - Бразили крузейри (1990–1993) - Бразили крузейри (1990–1993) - Бразили крузейри (1990–1993) - Бразили крузейри (1990–1993) - - - Бразили реалӗ - - - Бразили ҫӗнӗ крузади (1989–1990) - Бразили ҫӗнӗ крузади (1989–1990) - Бразили ҫӗнӗ крузади (1989–1990) - Бразили ҫӗнӗ крузади (1989–1990) - - - Бразили крузейри (1993–1994) - Бразили крузейри (1993–1994) - Бразили крузейри (1993–1994) - Бразили крузейри (1993–1994) - - - Бразили крузейри (1942–1967) - Бразили крузейри (1942–1967) - Бразили крузейри (1942–1967) - Бразили крузейри (1942–1967) - - - Багама долларӗ - Багама долларӗ - Багама долларӗ - Багама долларӗ - - - Бутан нгултрумӗ - - - Бирман кьячӗ - Бирман кьячӗ - Бирман кьячӗ - Бирман кьячӗ - - - Ботсвана пули - - - Беларусь рублӗ (1994–1999) - Беларусь рублӗ (1994–1999) - Беларусь рублӗ (1994–1999) - Беларусь рублӗ (1994–1999) - - - Беларусь рублӗ - Беларусь рублӗ - Беларусь рублӗ - Беларусь рублӗ - - - Беларусь рублӗ (2000–2016) - Беларусь рублӗ (2000–2016) - Беларусь рублӗ (2000–2016) - Беларусь рублӗ (2000–2016) - - - Белиз долларӗ - - - Канада долларӗ - - - Конго франкӗ - Конго франкӗ - Конго франкӗ - Конго франкӗ - - - WIR еври - WIR еври - WIR еври - WIR еври - - - Швейцари франкӗ - - - WIR франкӗ - WIR франкӗ - WIR франкӗ - WIR франкӗ - - - Чили эскуди - Чили эскуди - Чили эскуди - Чили эскуди - - - Чили татӑлу единици (UF) - Чили татӑлу единици (UF) - Чили татӑлу единици (UF) - Чили татӑлу единици (UF) - - - Чили песи - Чили песи - Чили песи - Чили песи - - - Китай юанӗ (офшор) - Китай юанӗ (офшор) - Китай юанӗ (офшор) - Китай юанӗ (офшор) - - - Китай халӑх банкӗн долларӗ - Китай халӑх банкӗн долларӗ - Китай халӑх банкӗн долларӗ - Китай халӑх банкӗн долларӗ - - - Китай юанӗ - - - Колумби песи - Колумби песи - Колумби песи - Колумби песи - - - Колумби чӑн хаклӑх единици - Колумби чӑн хаклӑх единици - Колумби чӑн хаклӑх единици - Колумби чӑн хаклӑх единици - - - Коста-Рика колонӗ - - - Серби динарӗ (2002–2006) - - - Чехословаки хытӑ кронӗ - Чехословаки хытӑ кронӗ - Чехословаки хытӑ кронӗ - Чехословаки хытӑ кронӗ - - - Куба конверсиленекен песи - Куба конверсиленекен песи - Куба конверсиленекен песи - Куба конверсиленекен песи - - - Куба песи - Куба песи - Куба песи - Куба песи - - - Кабо-Верде эскуди - Кабо-Верде эскуди - Кабо-Верде эскуди - Кабо-Верде эскуди - - - Кипр фунчӗ - - - Чехи крони - Чехи крони - Чехи крони - Чехи крони - - - Тухӑҫ Германи марки - Тухӑҫ Германи марки - Тухӑҫ Германи марки - Тухӑҫ Германи марки - - - Германи марки - - - Джибути франкӗ - - - Дани крони - Дани крони - Дани крони - Дани крони - - - Доминика песи - Доминика песи - Доминика песи - Доминика песи - - - Алжир динарӗ - - - Эквадор сукри - Эквадор сукри - Эквадор сукри - Эквадор сукри - - - Эквадор яланхи хаклӑх единици - Эквадор яланхи хаклӑх единици - Эквадор яланхи хаклӑх единици - Эквадор яланхи хаклӑх единици - - - Эстон крони - Эстон крони - Эстон крони - Эстон крони - - - Египет фунчӗ - - - Эритрей накфи - Эритрей накфи - Эритрей накфи - Эритрей накфи - - - Испани песети (А) - Испани песети (А) - Испани песети (А) - Испани песети (А) - - - Испани конверсиленекен песети - Испани конверсиленекен песети - Испани конверсиленекен песети - Испани конверсиленекен песети - - - Испани песети - Испани песети - Испани песети - Испани песети - - - Эфиопи бырӗ - - - евро - - - Финлянди марки - Финлянди марки - Финлянди марки - Финлянди марки - - - Фиджи долларӗ - - - Фолкленд утравӗсен фунчӗ - Фолкленд утравӗсен фунчӗ - Фолкленд утравӗсен фунчӗ - Фолкленд утравӗсен фунчӗ - - - Франци франкӗ - Франци франкӗ - Франци франкӗ - Франци франкӗ - - - Британи фунчӗ - - - Грузи купонӗ - Грузи купонӗ - Грузи купонӗ - Грузи купонӗ - - - Грузи ларийӗ - - - Гана седийӗ (1979–2007) - Гана седийӗ (1979–2007) - Гана седийӗ (1979–2007) - Гана седийӗ (1979–2007) - - - Гана седийӗ - - - Гибралтар фунчӗ - - - Гамби даласийӗ - - - Гвиней франкӗ - - - Гвиней силийӗ - Гвиней силийӗ - Гвиней силийӗ - Гвиней силийӗ - - - Экваторти Гвиней эквелӗ - Экваторти Гвиней эквелӗ - Экваторти Гвиней эквелӗ - Экваторти Гвиней эквелӗ - - - Греци драхми - Греци драхми - Греци драхми - Греци драхми - - - Гватемала кетцалӗ - Гватемала кетцалӗ - Гватемала кетцалӗ - Гватемала кетцалӗ - - - Гвиней-Бисау эскуди - Гвиней-Бисау эскуди - Гвиней-Бисау эскуди - Гвиней-Бисау эскуди - - - Гвиней-Бисау песи - Гвиней-Бисау песи - Гвиней-Бисау песи - Гвиней-Бисау песи - - - Гайана долларӗ - - - Гонконг долларӗ - - - Гондурас лемпири - Гондурас лемпири - Гондурас лемпири - Гондурас лемпири - - - Хорвати динарӗ - Хорвати динарӗ - Хорвати динарӗ - Хорвати динарӗ - - - Хорвати куни - - - Гаити гурдӗ - - - Венгри форинчӗ - - - Индонези рупийӗ - - - Ирланди фунчӗ - - - Израиль фунчӗ - - - Израиль шекелӗ (1980–1985) - Израиль шекелӗ (1980–1985) - Израиль шекелӗ (1980–1985) - Израиль шекелӗ (1980–1985) - - - Израиль ҫӗнӗ шекелӗ - Израиль ҫӗнӗ шекелӗ - Израиль ҫӗнӗ шекелӗ - Израиль ҫӗнӗ шекелӗ - - - Инди рупийӗ - - - Ирак динарӗ - - - Иран риалӗ - - - Исланди крони (1918–1981) - Исланди крони (1918–1981) - Исланди крони (1918–1981) - Исланди крони (1918–1981) - - - Исланди крони - Исланди крони - Исланди крони - Исланди крони - - - Итали лири - Итали лири - Итали лири - Итали лири - - - Ямайка долларӗ - - - Иордан динарӗ - - - Япони иени - - - Кени шиллингӗ - - - Кӑркӑсстан сомӗ - Кӑркӑсстан сомӗ - Кӑркӑсстан сомӗ - Кӑркӑсстан сомӗ - - - Камбоджа риелӗ - - - Комор франкӗ - Комор франкӗ - Комор франкӗ - Комор франкӗ - - - Ҫур ҫӗр Корей вони - Ҫур ҫӗр Корей вони - Ҫур ҫӗр Корей вони - Ҫур ҫӗр Корей вони - - - Кӑнтӑр Корея хванӗ (1953–1962) - Кӑнтӑр Корея хванӗ (1953–1962) - Кӑнтӑр Корея хванӗ (1953–1962) - Кӑнтӑр Корея хванӗ (1953–1962) - - - Кӑнтӑр Корей вони (1945–1953) - Кӑнтӑр Корей вони (1945–1953) - Кӑнтӑр Корей вони (1945–1953) - Кӑнтӑр Корей вони (1945–1953) - - - Кӑнтӑр Корей вони - Кӑнтӑр Корей вони - Кӑнтӑр Корей вони - Кӑнтӑр Корей вони - - - Кувейт динарӗ - - - Кайман утравӗсен долларӗ - - - Казахстан тенги - Казахстан тенги - Казахстан тенги - Казахстан тенги - - - Лаос кипӗ - - - Ливан фунчӗ - - - Шри-Ланка рупийӗ - Шри-Ланка рупийӗ - Шри-Ланка рупийӗ - Шри-Ланка рупийӗ - - - Либери долларӗ - - - Лесото лотийӗ - - - Литва личӗ - Литва личӗ - Литва личӗ - Литва личӗ - - - Литва талонӗ - Литва талонӗ - Литва талонӗ - Литва талонӗ - - - Люксембург конверсиленекен франкӗ - Люксембург конверсиленекен франкӗ - Люксембург конверсиленекен франкӗ - Люксембург конверсиленекен франкӗ - - - Люксембург франкӗ - Люксембург франкӗ - Люксембург франкӗ - Люксембург франкӗ - - - Люксембург финанс франкӗ - Люксембург финанс франкӗ - Люксембург финанс франкӗ - Люксембург финанс франкӗ - - - Латви лачӗ - Латви лачӗ - Латви лачӗ - Латви лачӗ - - - Латви рублӗ - Латви рублӗ - Латви рублӗ - Латви рублӗ - - - Ливи динарӗ - - - Марокко дирхамӗ - - - Марокко франкӗ - Марокко франкӗ - Марокко франкӗ - Марокко франкӗ - - - Монако франкӗ - Монако франкӗ - Монако франкӗ - Монако франкӗ - - - Молдова купонӗ - Молдова купонӗ - Молдова купонӗ - Молдова купонӗ - - - Молдова лайӗ - - - Мадагаскар ариарийӗ - Мадагаскар ариарийӗ - Мадагаскар ариарийӗ - Мадагаскар ариарийӗ - - - Мадагаскар франкӗ - Мадагаскар франкӗ - Мадагаскар франкӗ - Мадагаскар франкӗ - - - Македони денарӗ - - - Македони денарӗ (1992–1993) - Македони денарӗ (1992–1993) - Македони денарӗ (1992–1993) - Македони денарӗ (1992–1993) - - - Мали франкӗ - Мали франкӗ - Мали франкӗ - Мали франкӗ - - - Мьянма кьячӗ - Мьянма кьячӗ - Мьянма кьячӗ - Мьянма кьячӗ - - - Монголи тугрикӗ - - - Макао патаки - - - Мавритани угийӗ (1973–2017) - - - Мавритани угийӗ - - - Мальта лири - Мальта лири - Мальта лири - Мальта лири - - - Мальта фунчӗ - - - Маврики рупийӗ - - - Мальдив рупийӗ (1947–1981) - - - Мальдив руфийӗ - Мальдив руфийӗ - Мальдив руфийӗ - Мальдив руфийӗ - - - Малави квачи - Малави квачи - Малави квачи - Малави квачи - - - Мексика песи - Мексика песи - Мексика песи - Мексика песи - - - Мексика кӗмӗл песи (1861–1992) - Мексика кӗмӗл песи (1861–1992) - Мексика кӗмӗл песи (1861–1992) - Мексика кӗмӗл песи (1861–1992) - - - Мексика инвестици единици - Мексика инвестици единици - Мексика инвестици единици - Мексика инвестици единици - - - Малайзи ринггичӗ - - - Мозамбик эскуди - Мозамбик эскуди - Мозамбик эскуди - Мозамбик эскуди - - - Мозамбик метикалӗ (1980–2006) - Мозамбик метикалӗ (1980–2006) - Мозамбик метикалӗ (1980–2006) - Мозамбик метикалӗ (1980–2006) - - - Мозамбик метикалӗ - - - Намиби долларӗ - - - Нигери найри - Нигери найри - Нигери найри - Нигери найри - - - Никарагуа кордоби (1988–1991) - Никарагуа кордоби (1988–1991) - Никарагуа кордоби (1988–1991) - Никарагуа кордоби (1988–1991) - - - Никарагуа кордоби - Никарагуа кордоби - Никарагуа кордоби - Никарагуа кордоби - - - Нидерланд гульденӗ - Нидерланд гульденӗ - Нидерланд гульденӗ - Нидерланд гульденӗ - - - Норвеги крони - Норвеги крони - Норвеги крони - Норвеги крони - - - Непал рупийӗ - - - Ҫӗнӗ Зеланди долларӗ - - - Оман риалӗ - - - Панама бальбойи - Панама бальбойи - Панама бальбойи - Панама бальбойи - - - Перу интийӗ - Перу интийӗ - Перу интийӗ - Перу интийӗ - - - Перу солӗ - - - Перу солӗ (1863–1965) - Перу солӗ (1863–1965) - Перу солӗ (1863–1965) - Перу солӗ (1863–1965) - - - Папуа – Ҫӗнӗ Гвинея кини - Папуа – Ҫӗнӗ Гвинея кини - Папуа – Ҫӗнӗ Гвинея кини - Папуа – Ҫӗнӗ Гвинея кини - - - Филиппин песи - Филиппин песи - Филиппин песи - Филиппин песи - - - Пакистан рупийӗ - Пакистан рупийӗ - Пакистан рупийӗ - Пакистан рупийӗ - - - Польша злотӑйӗ - Польша злотӑйӗ - Польша злотӑйӗ - Польша злотӑйӗ - - - Польша злотӑйӗ (1950–1995) - Польша злотӑйӗ (1950–1995) - Польша злотӑйӗ (1950–1995) - Польша злотӑйӗ (1950–1995) - - - Португали эскуди - Португали эскуди - Португали эскуди - Португали эскуди - - - Парагвай гуаранӗ - - - Катар риалӗ - - - Родези долларӗ - Родези долларӗ - Родези долларӗ - Родези долларӗ - - - Румыни лейӗ (1952–2006) - - - Румыни лейӗ - - - Серби динарӗ - - - Раҫҫей рублӗ - Раҫҫей рублӗ - Раҫҫей рублӗ - Раҫҫей рублӗ - ₽ - - - Раҫҫей рублӗ (1991–1998) - Раҫҫей рублӗ (1991–1998) - Раҫҫей рублӗ (1991–1998) - Раҫҫей рублӗ (1991–1998) - - - Руанда франкӗ - - - Сауд Аравийӗ риялӗ - Сауд Аравийӗ риялӗ - Сауд Аравийӗ риялӗ - Сауд Аравийӗ риялӗ - - - Соломон утравӗсен долларӗ - - - Сейшел рупийӗ - - - Судан динарӗ (1992–2007) - Судан динарӗ (1992–2007) - Судан динарӗ (1992–2007) - Судан динарӗ (1992–2007) - - - Судан фунчӗ - - - Судан фунчӗ (1957–1998) - - - Швеци крони - Швеци крони - Швеци крони - Швеци крони - - - Сингапур долларӗ - - - Сӑваплӑ Елена утравӗн фунчӗ - - - Словени толарӗ - Словени толарӗ - Словени толарӗ - Словени толарӗ - - - Словаки крони - Словаки крони - Словаки крони - Словаки крони - - - Сьерра-Леоне леони - Сьерра-Леоне леони - Сьерра-Леоне леони - Сьерра-Леоне леони - - - Сьерра-Леоне леони (1964–2022) - Сьерра-Леоне леони (1964–2022) - Сьерра-Леоне леони (1964–2022) - Сьерра-Леоне леони (1964–2022) - - - Сомали шиллингӗ - - - Суринам долларӗ - - - Суринам гульденӗ - Суринам гульденӗ - Суринам гульденӗ - Суринам гульденӗ - - - Кӑнтӑр Судан фунчӗ - - - Сан-Томепе Принсипи добри (1977–2017) - Сан-Томепе Принсипи добри (1977–2017) - Сан-Томепе Принсипи добри (1977–2017) - Сан-Томепе Принсипи добри (1977–2017) - - - Сан-Томепе Принсипи добри - Сан-Томепе Принсипи добри - Сан-Томепе Принсипи добри - Сан-Томепе Принсипи добри - - - ССРП рублӗ - ССРП рублӗ - ССРП рублӗ - ССРП рублӗ - - - Сальвадор колонӗ - Сальвадор колонӗ - Сальвадор колонӗ - Сальвадор колонӗ - - - Сири фунчӗ - - - Эсватини лилангенийӗ - Эсватини лилангенийӗ - Эсватини лилангенийӗ - Эсватини лилангенийӗ - - - Таиланд бачӗ - Таиланд бачӗ - Таиланд бачӗ - Таиланд бачӗ - - - Таджикистан рублӗ - Таджикистан рублӗ - Таджикистан рублӗ - Таджикистан рублӗ - - - Таджикистан сомонийӗ - Таджикистан сомонийӗ - Таджикистан сомонийӗ - Таджикистан сомонийӗ - - - Туркменистан маначӗ (1993–2009) - Туркменистан маначӗ (1993–2009) - Туркменистан маначӗ (1993–2009) - Туркменистан маначӗ (1993–2009) - - - Туркменистан маначӗ - Туркменистан маначӗ - Туркменистан маначӗ - Туркменистан маначӗ - - - Тунис динарӗ - Тунис динарӗ - Тунис динарӗ - Тунис динарӗ - - - Тонга паанги - Тонга паанги - Тонга паанги - Тонга паанги - - - Тимор эскуди - Тимор эскуди - Тимор эскуди - Тимор эскуди - - - Турци лири (1922–2005) - Турци лири (1922–2005) - Турци лири (1922–2005) - Турци лири (1922–2005) - - - Турци лири - - - Тринидадпа Тобаго долларӗ - Тринидадпа Тобаго долларӗ - Тринидадпа Тобаго долларӗ - Тринидадпа Тобаго долларӗ - - - Тайвань ҫӗнӗ долларӗ - Тайвань ҫӗнӗ долларӗ - Тайвань ҫӗнӗ долларӗ - Тайвань ҫӗнӗ долларӗ - - - Танзани шиллингӗ - - - Украина гривни - - - Украина карбованецӗ - Украина карбованецӗ - Украина карбованецӗ - Украина карбованецӗ - - - Уганда шиллингӗ (1966–1987) - Уганда шиллингӗ (1966–1987) - Уганда шиллингӗ (1966–1987) - Уганда шиллингӗ (1966–1987) - - - Уганда шиллингӗ - - - АПШ долларӗ - $ - - - АПШ долларӗ (ҫитес кун) - АПШ долларӗ (ҫитес кун) - АПШ долларӗ (ҫитес кун) - АПШ долларӗ (ҫитес кун) - - - АПШ долларӗ (ҫак кун) - АПШ долларӗ (ҫак кун) - АПШ долларӗ (ҫак кун) - АПШ долларӗ (ҫак кун) - - - Уругвай песи (индексациленӗ единица) - Уругвай песи (индексациленӗ единица) - Уругвай песи (индексациленӗ единица) - Уругвай песи (индексациленӗ единица) - - - Уругвай песи (1975–1993) - Уругвай песи (1975–1993) - Уругвай песи (1975–1993) - Уругвай песи (1975–1993) - - - Уругвай песи - Уругвай песи - Уругвай песи - Уругвай песи - - - Уругвай номинал ӗҫ хакӗн индексӗн единици - Уругвай номинал ӗҫ хакӗн индексӗн единици - Уругвай номинал ӗҫ хакӗн индексӗн единици - Уругвай номинал ӗҫ хакӗн индексӗн единици - - - Узбекистан сумӗ - Узбекистан сумӗ - Узбекистан сумӗ - Узбекистан сумӗ - - - Венесуэла боливарӗ (1871–2008) - - - Венесуэла суверенлӑ боливарӗ - Венесуэла суверенлӑ боливарӗ - Венесуэла суверенлӑ боливарӗ - Венесуэла суверенлӑ боливарӗ - - - Венесуэла боливарӗ (2008–2018) - Венесуэла боливарӗ (2008–2018) - Венесуэла боливарӗ (2008–2018) - Венесуэла боливарӗ (2008–2018) - - - Венесуэла боливарӗ - - - Вьетнам донгӗ - - - Вьетнам донгӗ (1978–1985) - Вьетнам донгӗ (1978–1985) - Вьетнам донгӗ (1978–1985) - Вьетнам донгӗ (1978–1985) - - - Вануату ватувӗ - Вануату ватувӗ - Вануату ватувӗ - Вануату ватувӗ - - - Самоа тали - - - Вӑта Африка КФА франкӗ - Вӑта Африка КФА франкӗ - Вӑта Африка КФА франкӗ - Вӑта Африка КФА франкӗ - - - кӗмӗл - Троя унцийӗ кӗмӗлпе - Троя унцийӗ кӗмӗлпе - Троя унцийӗ кӗмӗлпе - - - ылтӑн - Троя унцийӗ ылтӑнпа - Троя унцийӗ ылтӑнпа - Троя унцийӗ ылтӑнпа - - - Европа сыпӑнчӑк единици - Европа сыпӑнчӑк единици - Европа сыпӑнчӑк единици - Европа сыпӑнчӑк единици - - - Европа укҫа единици - - - Европа тӳлев единици (XBС) - Европа тӳлев единици (XBС) - Европа тӳлев единици (XBС) - Европа тӳлев единици (XBС) - - - Европа тӳлев единици (XBD) - Европа тӳлев единици (XBD) - Европа тӳлев единици (XBD) - Европа тӳлев единици (XBD) - - - Тухӑҫ Кариб долларӗ - Тухӑҫ Кариб долларӗ - Тухӑҫ Кариб долларӗ - Тухӑҫ Кариб долларӗ - - - Кариб гульденӗ - Кариб гульденӗ - Кариб гульденӗ - Кариб гульденӗ - - - ятарлӑ йышӑну прависем (СДР) - ятарлӑ йышӑну прависем (СДР) - ятарлӑ йышӑну прависем (СДР) - ятарлӑ йышӑну прависем (СДР) - - - Европа валюта единици - - - Франци ылтӑн франкӗ - Франци ылтӑн франкӗ - Франци ылтӑн франкӗ - Франци ылтӑн франкӗ - - - Франци UIC франкӗ - Франци UIC франкӗ - Франци UIC франкӗ - Франци UIC франкӗ - - - Анӑҫ Африка КФА франкӗ - Анӑҫ Африка КФА франкӗ - Анӑҫ Африка КФА франкӗ - Анӑҫ Африка КФА франкӗ - - - паллади - Троя унцийӗ палладипе - Троя унцийӗ палладипе - Троя унцийӗ палладипе - - - КФП франкӗ - КФП франкӗ - КФП франкӗ - КФП франкӗ - - - платина - Троя унцийӗ платинӑпа - Троя унцийӗ платинӑпа - Троя унцийӗ платинӑпа - - - RINET фонд единици - - - сукре - - - тӗрӗслев валют кочӗ - тӗрӗслев валют кочӗ - тӗрӗслев валют кочӗ - тӗрӗслев валют кочӗ - - - ADB тӳлев единици - ADB тӳлев единици - ADB тӳлев единици - ADB тӳлев единици - - - паллӑ мар валюта - - - Йемен динарӗ - Йемен динарӗ - Йемен динарӗ - Йемен динарӗ - - - Йемен риалӗ - - - Югослави хытӑ динарӗ (1966–1990) - - - Югослави ҫӗнӗ динарӗ (1994–2002) - - - Югослави конверсиленекен динарӗ (1990–1992) - Югослави конверсиленекен динарӗ (1990–1992) - Югослави конверсиленекен динарӗ (1990–1992) - Югослави конверсиленекен динарӗ (1990–1992) - - - Югослави реформӑланӑ динарӗ (1992–1993) - - - Кӑнтӑр Африка рэнчӗ (финанс) - Кӑнтӑр Африка рэнчӗ (финанс) - Кӑнтӑр Африка рэнчӗ (финанс) - Кӑнтӑр Африка рэнчӗ (финанс) - - - Кӑнтӑр Африка рэнчӗ - Кӑнтӑр Африка рэнчӗ - Кӑнтӑр Африка рэнчӗ - Кӑнтӑр Африка рэнчӗ - - - Замби квачи (1968–2012) - - - Замби квачи - - - Заир ҫӗнӗ заирӗ (1993–1998) - Заир ҫӗнӗ заирӗ (1993–1998) - Заир ҫӗнӗ заирӗ (1993–1998) - Заир ҫӗнӗ заирӗ (1993–1998) - - - Заир заирӗ (1971–1993) - Заир заирӗ (1971–1993) - Заир заирӗ (1971–1993) - Заир заирӗ (1971–1993) - - - Зимбабве долларӗ (1980–2008) - Зимбабве долларӗ (1980–2008) - Зимбабве долларӗ (1980–2008) - Зимбабве долларӗ (1980–2008) - - - Зимбабве ылтӑнӗ - Зимбабве ылтӑнӗ - Зимбабве ылтӑнӗ - Зимбабве ылтӑнӗ - - - Зимбабве долларӗ (2009–2024) - Зимбабве долларӗ (2009–2024) - Зимбабве долларӗ (2009–2024) - Зимбабве долларӗ (2009–2024) - - - Зимбабве долларӗ (2008) - Зимбабве долларӗ (2008) - Зимбабве долларӗ (2008) - Зимбабве долларӗ (2008) - - - - ≈{0} - - - Пан улми ҫук. - {0} пан улми пур. Ӑна илесшӗн-и? - {0} пан улми пур. Вӗсене илесшӗн-и? - {0}-мӗш пан улми выртать. - - - - - - деци{0} - - - санти{0} - - - милли{0} - - - микро{0} - - - нано{0} - - - пико{0} - - - фемто{0} - - - атто{0} - - - зепто{0} - - - иокто{0} - - - ронто{0} - - - квекто{0} - - - дека{0} - - - гекто{0} - - - кило{0} - - - мега{0} - - - гига{0} - - - тера{0} - - - пета{0} - - - экса{0} - - - зетта{0} - - - иотта{0} - - - ронна{0} - - - кветта{0} - - - киби{0} - - - меби{0} - - - гиби{0} - - - теби{0} - - - пеби{0} - - - эксби{0} - - - зеби{0} - - - йоби{0} - - - тӑваткал {0} - тӑваткал {0} - тӑваткал {0} - - - куб {0} - куб {0} - куб {0} - - - {0}-{1} - - - ирӗклӗ ӳкни хӑвӑртланӑвӗ - {0} g - {0} g - {0} ирӗклӗ ӳкни хӑвӑртланӑвӗ - - - метр/тӑваткал ҫеккунт - {0} м/ҫ² - {0} м/ҫ² - {0} метр/тӑваткал ҫеккунт - - - {0} рад - {0} рад - {0} рад - - - {0}° - {0}° - {0}° - - - пӗкӗ минучӗ - {0}′ - {0}′ - {0} пӗкӗ минучӗ - - - пӗкӗ ҫеккунчӗ - {0}″ - {0}″ - {0} пӗкӗ ҫеккунчӗ - - - тӑваткал километр - {0} км² - {0} км² - {0} тӑваткал километр - {0}/тӑваткал километр - - - гектар - {0} га - {0} га - {0} гектар - - - тӑваткал метр - {0} м² - {0} м² - {0} тӑваткал метр - {0}/тӑваткал метр - - - тӑваткал сантиметр - {0} см² - {0} см² - {0} тӑваткал сантиметр - {0}/тӑваткал сантиметр - - - тӑваткал миля - {0} ми² - {0} ми² - {0} тӑваткал миля - {0}/тӑваткал миля - - - тӑваткал ярд - {0} ярд² - {0} ярд² - {0} тӑваткал ярд - - - тӑваткал фут - {0} фт² - {0} фт² - {0} тӑваткал фут - - - тӑваткал дюйм - {0} дюйм² - {0} дюйм² - {0} тӑваткал дюйм - {0}/тӑваткал дюйм - - - {0} кар - {0} кар - {0} кар - - - миллиграмм/децилитр - {0} мг/дл - {0} мг/дл - {0} миллиграмм/децилитр - - - миллимоль/литр - {0} ммоль/л - {0} ммоль/л - {0} миллимоль/литр - - - япала - {0} япала - {0} япала - {0} япала - - - пай - {0} пай - {0} пай - {0} пай - - - миллионмĕш пайĕ - {0} млн⁻¹ - {0} млн⁻¹ - {0} миллионмĕш пайĕ - - - процент - {0} % - {0} % - {0} процент - - - промилле - {0} ‰ - {0} ‰ - {0} промилле - - - промириад - {0} ‱ - {0} ‱ - {0} промириад - - - глюкоза - {0} Глк - {0} Глк - {0} глюкоза - - - литр/километр - {0} л/км - {0} л/км - {0} литр/километр - - - литр/100 километр - {0} л/100 км - {0} л/100 км - {0} литр/100 километр - - - миля/галлон - {0} ми/гал - {0} ми/гал - {0} миля/галлон - - - миля/империлле галлон - {0} ми/имп. гал - {0} ми/имп. гал - {0} миля/империлле галлон - - - петабайт - {0} Пбайт - {0} Пбайт - {0} петабайт - - - терабайт - {0} Тбайт - {0} Тбайт - {0} терабайт - - - терабит - {0} Тбит - {0} Тбит - {0} терабит - - - гигабайт - {0} Гбайт - {0} Гбайт - {0} гигабайт - - - гигабит - {0} Гбит - {0} Гбит - {0} гигабит - - - мегабайт - {0} Мбайт - {0} Мбайт - {0} мегабайт - - - мегабит - {0} Мбит - {0} Мбит - {0} мегабит - - - килобайт - {0} кбайт - {0} кбайт - {0} килобайт - - - килобит - {0} кбит - {0} кбит - {0} килобит - - - вунӑ ҫуллӑх - {0} вунӑ ҫ. - {0} вунӑ ҫ. - {0} вунӑ ҫуллӑх - - - ҫул - {0} ҫул - {0} ҫул - {0} ҫул - - - {0} чӗр. - {0} чӗр. - {0} чӗр. - - - {0} сех - {0} сех - {0} сех - - - минут - {0} мин - {0} мин - {0} минут - {0}/минут - - - ҫеккунт - {0} ҫ - {0} ҫ - {0} ҫеккунт - {0}/ҫеккунт - - - миллиҫеккунт - {0} мҫ - {0} мҫ - {0} миллиҫеккунт - - - микроҫеккунт - {0} мкҫ - {0} мкҫ - {0} микроҫеккунт - - - наноҫеккунт - {0} нҫ - {0} нҫ - {0} наноҫеккунт - - - ампер - {0} А - {0} А - {0} ампер - - - миллиампер - {0} мА - {0} мА - {0} миллиампер - - - ом - {0} Ом - {0} Ом - {0} ом - - - вольт - {0} В - {0} В - {0} вольт - - - килокалори - {0} ккал - {0} ккал - {0} килокалори - - - калори - {0} кал - {0} кал - {0} калори - - - килоджоуль - {0} кДж - {0} кДж - {0} килоджоуль - - - джоуль - {0} Дж - {0} Дж - {0} джоуль - - - киловатт-сехет - {0} кВт⋅сех - {0} кВт⋅сех - {0} киловатт-сехет - - - электронвольт - {0} эВ - {0} эВ - {0} электронвольт - - - Британи ӑшӑ виҫи - {0} БӐВ - {0} БӐВ - {0} Британи ӑшӑ виҫи - - - АПШ термӗ - {0} АПШ термӗ - {0} АПШ термӗ - {0} АПШ термӗ - - - фунт-вӑй - {0} фнтв - {0} фнтв - {0} фунт-вӑй - - - ньютон - {0} Н - {0} Н - {0} ньютон - - - киловатт-сехет/100 километр - {0} кВт⋅сех/100 км - {0} кВт⋅сех/100 км - {0} киловатт-сехет/100 километр - - - гигагерц - {0} ГГц - {0} ГГц - {0} гигагерц - - - мегагерц - {0} МГц - {0} МГц - {0} мегагерц - - - килогерц - {0} кГц - {0} кГц - {0} килогерц - - - герц - {0} Гц - {0} Гц - {0} герц - - - пиксель - {0} пкс - {0} пкс - {0} пиксель - - - мегапиксель - {0} Мпкс - {0} Мпкс - {0} мегапиксель - - - пиксель/сантиметр - {0} пкс/см - {0} пкс/см - {0} пиксель/сантиметр - - - пиксель/дюйм - {0} пкс/дюйм - {0} пкс/дюйм - {0} пиксель/дюйм - - - Ҫӗр радиусӗ - {0} R⊕ - {0} R⊕ - {0} Ҫӗр радиусӗ - - - километр - {0} км - {0} км - {0} километр - {0}/километр - - - метр - {0} м - {0} м - {0} метр - {0}/метр - - - дециметр - {0} дм - {0} дм - {0} дециметр - - - сантиметр - {0} см - {0} см - {0} сантиметр - {0}/сантиметр - - - миллиметр - {0} мм - {0} мм - {0} миллиметр - - - микрометр - {0} мкм - {0} мкм - {0} микрометр - - - нанометр - {0} нм - {0} нм - {0} нанометр - - - пикометр - {0} пм - {0} пм - {0} пикометр - - - миля - {0} ми - {0} ми - {0} миля - - - фут - {0} фт - {0} фт - {0} фут - {0}/фут - - - парсек - {0} пк - {0} пк - {0} парсек - - - ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ - - - астрономи виҫи - {0} а. в. - {0} а. в. - {0} астрономи виҫи - - - фурлонг - {0} фрл - {0} фрл - {0} фурлонг - - - тинӗс хӑлаҫӗ - {0} тинӗс хӑл. - {0} тинӗс хӑл. - {0} тинӗс хӑлаҫӗ - - - тинӗс мили - {0} тинӗс ми - {0} тинӗс ми - {0} тинӗс мили - - - скандинави мили - {0} ск. ми - {0} ск. ми - {0} скандинави мили - - - пункт - {0} пкт - {0} пкт - {0} пункт - - - Хӗвел радиусӗ - {0} R☉ - {0} R☉ - {0} Хӗвел радиусӗ - - - люкс - {0} лк - {0} лк - {0} люкс - - - кандела - {0} кд - {0} кд - {0} кандела - - - люмен - {0} лм - {0} лм - {0} люмен - - - Хӗвел ҫутатаслӑхӗ - {0} L☉ - {0} L☉ - {0} Хӗвел ҫутатаслӑхӗ - - - {0} т - {0} т - {0} т - - - килограмм - {0} кг - {0} кг - {0} килограмм - {0}/килограмм - - - грамм - {0} г - {0} г - {0} грамм - {0}/грамм - - - миллиграмм - {0} мг - {0} мг - {0} миллиграмм - - - микрограмм - {0} мкг - {0} мкг - {0} микрограмм - - - америкӑлла тонна - {0} ам. тонна - {0} ам. тонна - {0} америкӑлла тонна - - - {0} стн - {0} стн - {0} стн - - - фунт - {0} фнт - {0} фнт - {0} фунт - {0}/фунт - - - троя унцийӗ - {0} тр. унц. - {0} тр. унц. - {0} троя унцийӗ - - - {0} кар - {0} кар - {0} кар - - - {0} Да - {0} Да - {0} Да - - - {0} M⊕ - {0} M⊕ - {0} M⊕ - - - {0} M☉ - {0} M☉ - {0} M☉ - - - гигаватт - {0} ГВт - {0} ГВт - {0} гигаватт - - - мегаватт - {0} МВт - {0} МВт - {0} мегаватт - - - киловатт - {0} кВт - {0} кВт - {0} киловатт - - - ватт - {0} Вт - {0} Вт - {0} ватт - - - милливатт - {0} мВт - {0} мВт - {0} милливатт - - - лаша вӑйӗ - {0} л. в. - {0} л. в. - {0} лаша вӑйӗ - - - миллиметр чĕр кĕмĕл юпипе - {0} мм ч. к. ю. - {0} мм ч. к. ю. - {0} миллиметр чĕр кĕмĕл юпипе - - - чĕр кĕмĕл юпипе - {0} ч. к. ю. - {0} ч. к. ю. - {0} чĕр кĕмĕл юпипе - - - фунт-вӑй/тӑваткал дюйм - {0} фнтв/дюйм² - {0} фнтв/дюйм² - {0} фунт-вӑй/тӑваткал дюйм - - - дюйм чĕр кĕмĕл юпипе - {0} дюйм ч. к. ю. - {0} дюйм ч. к. ю. - {0} дюйм чĕр кĕмĕл юпипе - - - миллибар - {0} мбар - {0} мбар - {0} миллибар - - - {0} атм - {0} атм - {0} атм - - - паскаль - {0} Па - {0} Па - {0} паскаль - - - гектопаскаль - {0} гПа - {0} гПа - {0} гектопаскаль - - - килопаскаль - {0} кПа - {0} кПа - {0} килопаскаль - - - мегапаскаль - {0} МПа - {0} МПа - {0} мегапаскаль - - - километр/сехет - {0} км/сех - {0} км/сех - {0} километр/сехет - - - метр/ҫеккунт - {0} м/ҫ - {0} м/ҫ - {0} метр/ҫеккунт - - - миля/сехет - {0} ми/сех - {0} ми/сех - {0} миля/сехет - - - узел - {0} уз - {0} уз - {0} узел - - - Бофорт балӗ - {0} Бфт - {0} Бфт - {0} Бофорт балӗ - - - Цельсий градусĕ - {0}°C - {0}°C - {0} Цельсий градусĕ - - - Фаренгейт градусĕ - {0}°F - {0}°F - {0} Фаренгейт градусĕ - - - кельвин - {0} К - {0} К - {0} кельвин - - - фунт-вӑй-фут - {0} фнтв⋅фт - {0} фнтв⋅фт - {0} фунт-вӑй-фут - - - ньютон-метр - {0} Н⋅м - {0} Н⋅м - {0} ньютон-метр - - - куб километр - {0} км³ - {0} км³ - {0} куб километр - - - куб метр - {0} м³ - {0} м³ - {0} куб метр - {0}/куб метр - - - куб сантиметр - {0} см³ - {0} см³ - {0} куб сантиметр - {0}/куб сантиметр - - - куб миля - {0} ми³ - {0} ми³ - {0} куб миля - - - куб ярд - {0} ярд³ - {0} ярд³ - {0} куб ярд - - - куб фут - {0} фт³ - {0} фт³ - {0} куб фут - - - куб дюйм - {0} дюйм³ - {0} дюйм³ - {0} куб дюйм - - - {0} Мл - {0} Мл - {0} Мл - - - гектолитр - {0} гл - {0} гл - {0} гектолитр - - - литр - {0} л - {0} л - {0} литр - {0}/литр - - - децилитр - {0} дл - {0} дл - {0} децилитр - - - сантилитр - {0} сл - {0} сл - {0} сантилитр - - - миллилитр - {0} мл - {0} мл - {0} миллилитр - - - метрла пинт - {0} мпт - {0} мпт - {0} метрла пинт - - - метрла курка - {0} м. курка - {0} м. курка - {0} метрла курка - - - метрла шӗвӗ унци - {0} м. шӗвӗ унци - {0} м. шӗвӗ унци - {0} метрла шӗвӗ унци - - - {0} акр-фт - {0} акр-фт - {0} акр-фт - - - бушель - {0} бушель - {0} бушель - {0} бушель - - - америкӑлла галлон - {0} ам. гал. - {0} ам. гал. - {0} америкӑлла галлон - {0}/америкӑлла галлон - - - империлле галлон - {0} имп. гал. - {0} имп. гал. - {0} империлле галлон - {0}/империлле галлон - - - америкӑлла кварт - {0} ам. кварт - {0} ам. кварт - {0} америкӑлла кварт - - - америкӑлла пинт - {0} ам. пинт - {0} ам. пинт - {0} америкӑлла пинт - - - империлле пинт - {0} имп. пинт - {0} имп. пинт - {0} империлле пинт - - - америкӑлла курка - {0} ам. курка - {0} ам. курка - {0} америкӑлла курка - - - империлле курка - {0} имп. курка - {0} имп. курка - {0} империлле курка - - - америкӑлла шӗвӗ унци - {0} ам. шӗвӗ унци - {0} ам. шӗвӗ унци - {0} америкӑлла шӗвӗ унци - - - империлле шӗвӗ унци - {0} имп. шӗвӗ унц. - {0} имп. шӗвӗ унц. - {0} империлле шӗвӗ унци - - - {0} апат каш. - {0} апат каш. - {0} апат каш. - - - {0} чей каш. - {0} чей каш. - {0} чей каш. - - - баррель - {0} барр. - {0} барр. - {0} баррель - - - пылак апат кашӑкӗ - {0} пыл. апат каш. - {0} пыл. апат каш. - {0} пылак апат кашӑкӗ - - - империлле пылак апат кашӑкӗ - {0} имп. пыл. апат каш. - {0} имп. пыл. апат каш. - {0} империлле пылак апат кашӑкӗ - - - {0} тумл. - {0} тумл. - {0} тумл. - - - {0} шӗвӗ др. - {0} шӗвӗ др. - {0} шӗвӗ драхма - - - {0} чӗпт. - {0} чӗпт. - {0} чӗптӗм - - - империлле кварт - {0} имп. кварт - {0} имп. кварт - {0} империлле кварт - - - стерадиан - {0} ср - {0} ср - {0} стерадиан - - - катал - {0} кат - {0} кат - {0} катал - - - кулон - {0} Кл - {0} Кл - {0} кулон - - - фарад - {0} Ф - {0} Ф - {0} фарад - - - генри - {0} Гн - {0} Гн - {0} генри - - - сименс - {0} См - {0} См - {0} сименс - - - калори-IT - {0} кал-IT - {0} кал-IT - {0} калори-IT - - - Британи ӑшӑ виҫи-IT - {0} БӐВ-IT - {0} БӐВ-IT - {0} Британи ӑшӑ виҫи-IT - - - беккерель - {0} Бк - {0} Бк - {0} беккерель - - - зиверт - {0} Зв - {0} Зв - {0} зиверт - - - грей - {0} Гр - {0} Гр - {0} грей - - - килограмм-вӑй - {0} кгв - {0} кгв - {0} килограмм-вӑй - - - род - {0} род - {0} род - {0} род - - - чейн - {0} чейн - {0} чейн - {0} чейн - - - тесла - {0} Тл - {0} Тл - {0} тесла - - - вебер - {0} Вб - {0} Вб - {0} вебер - - - Ранкин градусӗ - {0} °R - {0} °R - {0} Ранкин градусӗ - - - икӗ эрнелӗх - {0} икӗ эрн. - {0} икӗ эрн. - {0} икӗ эрнелӗх - - - слаг - {0} слаг - {0} слаг - {0} слаг - - - бензин танлӑхӗпе - {0} бенз. тан. - {0} бенз. тан. - {0} бензин танлӑхӗпе - - - рин - {0} рин - {0} рин - {0} рин - - - сун - {0} сун - {0} сун - {0} сун - - - сяку - {0} сяку - {0} сяку - {0} сяку - - - кудзирадзяку - {0} кудзирадзяку - {0} кудзирадзяку - {0} кудзирадзяку - - - кэн - {0} кэн - {0} кэн - {0} кэн - - - дзё - {0} дзё - {0} дзё - {0} дзё - - - ри - {0} ри - {0} ри - {0} ри - - - бу - {0} бу - {0} бу - {0} бу - - - сэ - {0} сэ - {0} сэ - {0} сэ - - - тё - {0} тё - {0} тё - {0} тё - - - косадзи - {0} косадзи - {0} косадзи - {0} косадзи - - - осадзи - {0} осадзи - {0} осадзи - {0} осадзи - - - каппу - {0} каппу - {0} каппу - {0} каппу - - - секи - {0} секи - {0} секи - {0} секи - - - сай - {0} сай - {0} сай - {0} сай - - - то - {0} то - {0} то - {0} то - - - коку - {0} коку - {0} коку - {0} коку - - - ҫутӑ - {0} ҫутӑ - {0} ҫутӑ - {0} ҫутӑ - - - фун - {0} фун - {0} фун - {0} фун - - - миллиардмĕш пайĕ - {0} млрд⁻¹ - {0} млрд⁻¹ - {0} миллиардмĕш пайĕ - - - каҫ - {0} каҫ - {0} каҫ - {0} каҫ - {0}/каҫ - - - ен - тухӑҫ еннелле {0} - ҫур ҫӗр еннелле {0} - кӑнтӑр еннелле {0} - анӑҫ еннелле {0} - - - + + + + + r (U), MMMM, d, EEEE + + + + + r (U), MMMM, d + + + + + r, MMM, d + + + + + r.MM.dd + + + + + + . + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + B h + B h:mm + B h:mm:ss + E, B h + E, B h:mm + E, B h:mm:ss + r (U) + r, MMM + r, MMM, d + r, MMM, d, E + r (U), MMMM + r (U), MMMM, d + r (U), MMMM, d, E + a h + HH 'сех' + a h:mm + a h:mm:ss + a h (v) + HH 'сех' (v) + MM.dd + MM.dd (E) + MMM, d + MMM, d, E + MMMM, d + U, MM + U, MM.dd + U, MMM + U, MMM, d + r (U) + r (U) + r.MM + r.MM.dd + r.MM.dd (E) + r, MMM + r, MMM, d + r, MMM, d, E + r (U), MMMM + r (U), MMMM, d + r (U), MMMM, d, E + r (U), QQQ + r (U), QQQQ + + + + B h – B h + B h–h + + + B h:mm – B h:mm + B h:mm–h:mm + B h:mm–h:mm + + + a h – a h + a h–h + + + HH–HH 'сех' + + + a h:mm – a h:mm + a h:mm–h:mm + a h:mm–h:mm + + + a h:mm – a h:mm (v) + a h:mm–h:mm (v) + a h:mm–h:mm (v) + + + HH:mm–HH:mm (v) + HH:mm–HH:mm (v) + + + a h – a h (v) + a h–h (v) + + + HH–HH 'сех' v + + + M–M + + + MM.dd – MM.dd + MM.dd – MM.dd + + + MM.dd (E) – MM.dd (E) + MM.dd (E) – MM.dd (E) + + + MMM – MMM + + + MMM, d–d + MMM, d – MMM, d + + + MMM, d, E – MMM, d, E + MMM, d, E – MMM, d, E + + + U – U + + + y.MM – y.MM + y.MM – y.MM + + + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + + + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + + + U, MMM – MMM + U, MMM – U, MMM + + + U, MMM, d–d + U, MMM, d – MMM, d + U, MMM, d – U, MMM, d + + + U, MMM, d, E – MMM, d, E + U, MMM, d, E – MMM, d, E + U, MMM, d, E – U, MMM, d, E + + + U, MMMM – MMMM + U, MMMM – U, MMMM + + + + + + + + + тот + бабэ + хатур + кихак + тубэ + амшир + барамхат + бармуда + башнас + бауна + абиб + мисра + наси + + + + + + Диоклетиантан + + + Диокл-т. + + + Д-т. + + + + + . + + + + + + + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + + + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + + + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + + + + + ипчхун + усу + кёнъчхип + чхунбун + чхёнъмён + когу + ипха + соман + манъджон + хачи + сосо + дэсо + ипхчху + чхосо + пэкхро + чхупун + халло + санъган + ипдон + сосоль + дэсоль + тонъджи + сохан + дэхан + + + ипчхун + усу + кёнъчхип + чхунбун + чхёнъмён + когу + ипха + соман + манъджон + хачи + сосо + дэсо + ипхчху + чхосо + пэкхро + чхупун + халло + санъган + ипдон + сосоль + дэсоль + тонъджи + сохан + дэхан + + + ипчхун + усу + кёнъчхип + чхунбун + чхёнъмён + когу + ипха + соман + манъджон + хачи + сосо + дэсо + ипхчху + чхосо + пэкхро + чхупун + халло + санъган + ипдон + сосоль + дэсоль + тонъджи + сохан + дэхан + + + + + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + кап-ча + ыль-чхук + пёнъ-ин + чонъ-мё + му-чин + ки-са + кёнъ-о + син-ми + им-син + ке-ю + кап-суль + ыль-хэ + пёнъ-ча + чонъ-чхук + му-ин + ки-мё + кёнъ-чин + син-са + им-о + ке-ми + кап-син + ыль-ю + пёнъ-суль + чонъ-хэ + му-ча + ки-чхук + кёнъ-ин + син-мё + им-чин + ке-са + кап-о + ыль-ми + пёнъ-син + чонъ-ю + му-суль + ки-хэ + кёнъ-ча + син-чхук + им-ин + ке-мё + кап-чин + ыль-са + пёнъ-о + чонъ-ми + му-син + ки-ю + кёнъ-суль + син-хэ + им-ча + ке-чхук + кап-ин + ыль-мё + пёнъ-чин + чонъ-са + му-о + ки-ми + кёнъ-син + син-ю + им-суль + ке-хэ + + + + + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + ча + чхук + ин + мё + чин + са + о + ми + син + суль + хэ + + + + + + + . + + + + + + + + мескерем + текемт + хедар + тахсас + тер + якатит + магабит + миазия + генбот + сэнэ + хамлэ + нахасэ + эпагомен + + + + + + Христос ҫураличченхи + Христос ҫуралнӑран + + + Х. ҫ-ч. + Х. ҫ-р. + + + Х. ҫ-ч. + Х. ҫ-р. + + + + + . + + + + + + + + G y, MMMM, d, EEEE + + + + + G y, MMMM, d + + + + + G y, MMM, d + + + + + GGGGG y.MM.dd + + + + + + . + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + B h + B h:mm + B h:mm:ss + E, B h + E, B h:mm + E, B h:mm:ss + E, a h + E, a h:mm + E, HH:mm + E, a h:mm:ss + E, HH:mm:ss + G y.MM + G y.MM.dd + G y.MM.dd (E) + G y, MMM + G y, MMM, d + G y, MMM, d, E + a h + a h:mm + a h:mm:ss + a h (v) + HH (v) + MM.dd + MM.dd (E) + MMM, d + MMM, d, E + MMMM, d + G y.MM + G y.MM.dd + G y.MM.dd (E) + G y, MMM + G y, MMM, d + G y, MMM, d, E + G y, MMMM + G y, QQQ + G y, QQQQ + + + + B h – B h + B h–h + + + B h:mm – B h:mm + B h:mm–h:mm + B h:mm–h:mm + + + G y.MM – G y.MM + G y.MM – y.MM + G y.MM – y.MM + + + G y.MM.dd – y.MM.dd + G y.MM.dd – G y.MM.dd + G y.MM.dd – y.MM.dd + G y.MM.dd – y.MM.dd + + + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – G y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + + + G y, MMM – G y, MMM + G y, MMM – MMM + G y, MMM – y, MMM + + + G y, MMM, d–d + G y, MMM, d – G y, MMM, d + G y, MMM, d – MMM, d + G y, MMM, d – y, MMM, d + + + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – G y, MMM, d, E + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – y, MMM, d, E + + + a h – a h + a h–h + + + HH–HH 'сех' + + + a h:mm – a h:mm + a h:mm–h:mm + a h:mm–h:mm + + + a h:mm – a h:mm (v) + a h:mm–h:mm (v) + a h:mm–h:mm (v) + + + HH:mm–HH:mm (v) + HH:mm–HH:mm (v) + + + a h – a h (v) + a h–h (v) + + + HH–HH 'сех' (v) + + + M–M + + + MM.dd – MM.dd + MM.dd – MM.dd + + + MM.dd (E) – MM.dd (E) + MM.dd (E) – MM.dd (E) + + + MMM – MMM + + + MMM, d–d + MMM, d – MMM, d + + + MMM, d, E – MMM, d, E + MMM, d, E – MMM, d, E + + + G y.MM – y.MM + G y.MM – y.MM + + + G y.MM.dd – y.MM.dd + G y.MM.dd – y.MM.dd + G y.MM.dd – y.MM.dd + + + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + + + G y, MMM – MMM + G y, MMM – y, MMM + + + G y, MMM, d–d + G y, MMM, d – MMM, d + G y, MMM, d – y, MMM, d + + + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – y, MMM, d, E + + + G y, MMMM – MMMM + G y, MMMM – y, MMMM + + + + + + + + + кӑр. + нар. + пуш + ака + ҫу + ҫӗрт. + утӑ + ҫур. + авӑн + юпа + чӳк + раш. + + + кӑрлач + нарӑс + пуш + ака + ҫу + ҫӗртме + утӑ + ҫурла + авӑн + юпа + чӳк + раштав + + + + + К + Н + П + А + Ҫ + Ҫ + У + Ҫ + А + Ю + Ч + Р + + + + + + + вр + тн + ыт + юн + кҫ + эр + шм + + + вырсарни кун + тунти кун + ытлари кун + юн кун + кӗҫнерни кун + эрне кун + шӑмат кун + + + + + В + Т + Ы + Ю + К + Э + Ш + + + + + + + 1-мӗш чӗр. + 2-мӗш чӗр. + 3-мӗш чӗр. + 4-мӗш чӗр. + + + 1-мӗш чӗрӗк + 2-мӗш чӗрӗк + 3-мӗш чӗрӗк + 4-мӗш чӗрӗк + + + + + + + к. у. + к. х. + + + + + + хальхи саманачченхи + хальхи саманачченхи + хальхи саманари + хальхи саманари + + + х. с-ч. + х. с. + + + + + + y, MMMM, d, EEEE + + + + + y, MMMM, d + + + + + y, MMM, d + + + + + y.MM.dd + + + + + + + HH:mm:ss (zzzz) + + + + + HH:mm:ss (z) + + + + + HH:mm:ss + + + + + HH:mm + + + + + + . + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + B h + B h:mm + B h:mm:ss + E, B h + ccc, B h:mm + ccc, B h:mm:ss + d, ccc + E, a h + E, a h:mm + E, HH:mm + E, a h:mm:ss + E, HH:mm:ss + G y.MM + G y.MM.dd + G y.MM.dd (E) + G y, MMM + G y, MMM, d + G y, MMM, d, E + G y, MMMM + G y, MMMM, d + G y, MMMM, d, E + a h + HH 'сех' + a h:mm + a h:mm:ss + a h:mm:ss (v) + HH:mm:ss (v) + a h:mm (v) + HH:mm (v) + a h (v) + HH 'сех' (v) + MM.dd + MM.dd (E) + MMM, d + MMM, d, E + MMMM, d + MMMM, d, E + MMMM, W-'мӗш' 'эрне' + MMMM, W-'мӗш' 'эрне' + MMMM, W-'мӗш' 'эрне' + y.MM + y.MM.dd + y.MM.dd (ccc) + y, MMM + y, MMM, d + y, MMM, d, E + y, MMMM + y, MMMM, d + y, MMMM, d, E + y, QQQ + y, QQQQ + Y, w-'мӗш' 'эрне' + Y, w-'мӗш' 'эрне' + Y, w-'мӗш' 'эрне' + + + {0} ({1}) + + + + {0} – {1} + + + B h – B h + B h–h + + + B h:mm – B h:mm + B h:mm–h:mm + B h:mm–h:mm + + + G y.MM – G y.MM + G y.MM – y.MM + G y.MM – y.MM + + + G y.MM.dd – y.MM.dd + G y.MM.dd – G y.MM.dd + G y.MM.dd – y.MM.dd + G y.MM.dd – y.MM.dd + + + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – G y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + + + G y, MMM – G y, MMM + G y, MMM – MMM + G y, MMM – y, MMM + + + G y, MMM, d–d + G y, MMM, d – G y, MMM, d + G y, MMM, d – MMM, d + G y, MMM, d – y, MMM, d + + + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – G y, MMM, d, E + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – y, MMM, d, E + + + a h – a h + a h–h + + + HH–HH 'сех' + + + a h:mm – a h:mm + a h:mm–h:mm + a h:mm–h:mm + + + a h:mm – a h:mm (v) + a h:mm–h:mm (v) + a h:mm–h:mm (v) + + + HH:mm–HH:mm (v) + HH:mm–HH:mm (v) + + + a h – a h (v) + a h–h (v) + + + HH–HH 'сех' (v) + + + M–M + + + MM.dd – MM.dd + MM.dd – MM.dd + + + MM.dd (E) – MM.dd (E) + MM.dd (E) – MM.dd (E) + + + MMM – MMM + + + MMM, d–d + MMM, d – MMM, d + + + MMM, d, E – MMM, d, E + MMM, d, E – MMM, d, E + + + y.MM – y.MM + y.MM – y.MM + + + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + + + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + + + y, MMM – MMM + y, MMM – y, MMM + + + y, MMM, d–d + y, MMM, d – MMM, d + y, MMM, d – y, MMM, d + + + y, MMM, d, E – MMM, d, E + y, MMM, d, E – MMM, d, E + y, MMM, d, E – y, MMM, d, E + + + y, MMMM – MMMM + y, MMMM – y, MMMM + + + + + + + + + тишрей + хешван + кислев + тевет + шеват + адар I + адар + адар II + нисан + ияр + сиван + таммуз + ав + элул + + + тишрей + хешван + кислев + тевет + шеват + адар-алеф + адар + адар-бет + нисан + ияр + сиван + таммуз + ав + элул + + + + + тишрей + хешван + кислев + тевет + шеват + адар I + адар + адар II + нисан + ияр + сиван + таммуз + ав + элул + + + + + + тӗнче пуҫланнӑран + + + т. п-р. + + + + + . + + + + + + + + чайтра + ваисакха + джанштха + асадха + сравана + бхадра + азвина + картика + аграхайана + пауза + магха + пхалгуна + + + + + + Сака саманари + + + Сака с. + + + + + . + + + + + + + + мух. + саф. + раб. I + раб. II + джум. I + джум. II + радж. + шааб. + рам. + шав. + зуль-к. + зуль-х. + + + мухаррам + сафар + раби-уль-авваль + раби-уль-ахир + джумад-уль-авваль + джумад-уль-ахир + раджаб + шаабан + рамадан + шавваль + зуль-каада + зуль-хиджжа + + + + + + хиджра хыҫҫӑнхи + хиджрӑччен + + + х. х. + х-ч. + + + + + . + + + + HH–HH + + + HH–HH (v) + + + + + + + + + y, MMMM, d, EEEE + + + + + y, MMMM, d + + + + + y, MMM, d + + + + + y.MM.dd + + + + + + + HH:mm:ss (zzzz) + + + + + HH:mm:ss (z) + + + + + HH:mm:ss + + + + + HH:mm + + + + + + . + + + + {1}, {0} + + + {1}, {0} + + + + + {1}, {0} + + + {1}, {0} + + + + + {1}, {0} + + + {1}, {0} + + + + + {1}, {0} + + + {1}, {0} + + + + E, h:mm B + E, h:mm:ss B + E, h:mm a + E, HH:mm + E, h:mm:ss a + E, HH:mm:ss + G y.MM.dd + G y, MMM + G y, MMM, d + G y, MMM, d, E + HH 'сех' + h:mm:ss a (v) + HH:mm:ss (v) + h:mm a (v) + HH:mm (v) + MM.dd + MM.dd (E) + MMM, d + MMM, d, E + MMMM, d + MMMM, W-'мӗш' 'эрне' + MMMM, W-'мӗш' 'эрне' + MMMM, W-'мӗш' 'эрне' + y.MM + y.MM.dd + y.MM.dd (E) + y, MMM + y, MMM, d + y, MMM, d, E + y, MMMM + y, QQQ + y, QQQQ + Y, w-'мӗш' 'эрне' + Y, w-'мӗш' 'эрне' + Y, w-'мӗш' 'эрне' + + + + G y.MM – G y.MM + G y.MM – y.MM + G y.MM – y.MM + + + G y.MM.dd – y.MM.dd + G y.MM.dd – G y.MM.dd + G y.MM.dd – y.MM.dd + G y.MM.dd – y.MM.dd + + + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – G y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + G y.MM.dd (E) – y.MM.dd (E) + + + G y, MMM – G y, MMM + G y, MMM – MMM + G y, MMM – y, MMM + + + G y, MMM, d–d + G y, MMM, d – G y, MMM, d + G y, MMM, d – MMM, d + G y, MMM, d – y, MMM, d + + + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – G y, MMM, d, E + G y, MMM, d, E – MMM, d, E + G y, MMM, d, E – y, MMM, d, E + + + HH–HH 'сех' + + + h:mm a – h:mm a (v) + h:mm–h:mm a (v) + h:mm–h:mm a (v) + + + HH:mm–HH:mm (v) + HH:mm–HH:mm (v) + + + h a – h a (v) + h–h a (v) + + + HH–HH 'сех' (v) + + + MM.dd – MM.dd + MM.dd – MM.dd + + + MM.dd (E) – MM.dd (E) + MM.dd (E) – MM.dd (E) + + + MMM, d–d + MMM, d – MMM, d + + + MMM, d, E – MMM, d, E + MMM, d, E – MMM, d, E + + + y.MM – y.MM + y.MM – y.MM + + + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + y.MM.dd – y.MM.dd + + + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + y.MM.dd (E) – y.MM.dd (E) + + + y, MMM – MMM + y, MMM – y, MMM + + + y, MMM, d–d + y, MMM, d – MMM, d + y, MMM, d – y, MMM, d + + + y, MMM, d, E – MMM, d, E + y, MMM, d, E – MMM, d, E + y, MMM, d, E – y, MMM, d, E + + + y, MMMM – MMMM + y, MMMM – y, MMMM + + + + + + + + Мэйдзи + Тайсё + Сёва + Хэйсэй + Рэйва + + + Мэйдзи + Тайсё + Сёва + Хэйсэй + Рэйва + + + + + + G, y, MMMM, d, EEEE + + + + + G, y, MMMM, d + + + + + G, y, MMM, d + + + + + GGGGG, y.MM.dd + + + + + + . + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + G, y + G, y.MM + G, y.MM.dd + G, y.MM.dd (E) + G, y, MMM + G, y, MMM, d + G, y, MMM, d, E + G, y + G, y + G, y.MM + G, y.MM.dd + G, y.MM.dd (E) + G, y, MMM + G, y, MMM, d + G, y, MMM, d, E + G, y, MMMM + G, y, QQQ + G, y, QQQQ + + + + G, y – G, y + G, y–y + + + G, y.MM – G, y.MM + G, y.MM – y.MM + G, y.MM – y.MM + + + G, y.MM.dd – y.MM.dd + G, y.MM.dd – G, y.MM.dd + G, y.MM.dd – y.MM.dd + G, y.MM.dd – y.MM.dd + + + G, y.MM.dd (E) – y.MM.dd (E) + G, y.MM.dd (E) – G, y.MM.dd (E) + G, y.MM.dd (E) – y.MM.dd (E) + G, y.MM.dd (E) – y.MM.dd (E) + + + G, y, MMM – G, y, MMM + G, y, MMM – MMM + G, y, MMM – y, MMM + + + G, y, MMM, d–d + G, y, MMM, d – G, y, MMM, d + G, y, MMM, d – MMM, d + G, y, MMM, d – y, MMM, d + + + G, y, MMM, d, E – MMM, d, E + G, y, MMM, d, E – G, y, MMM, d, E + G, y, MMM, d, E – MMM, d, E + G, y, MMM, d, E – y, MMM, d, E + + + G, y–y + + + G, y.MM – y.MM + G, y.MM – y.MM + + + G, y.MM.dd – y.MM.dd + G, y.MM.dd – y.MM.dd + G, y.MM.dd – y.MM.dd + + + G, y.MM.dd (E) – y.MM.dd (E) + G, y.MM.dd (E) – y.MM.dd (E) + G, y.MM.dd (E) – y.MM.dd (E) + + + G, y, MMM – MMM + G, y, MMM – y, MMM + + + G, y, MMM, d–d + G, y, MMM, d – MMM, d + G, y, MMM, d – y, MMM, d + + + G, y, MMM, d, E – MMM, d, E + G, y, MMM, d, E – MMM, d, E + G, y, MMM, d, E – y, MMM, d, E + + + G, y, MMMM – MMMM + G, y, MMMM – y, MMMM + + + + + + + + + фарвардин + ордибехешт + хордад + тир + мордад + шахривер + мехр + абан + азер + дей + бахман + эсфанд + + + + + + хиджра хыҫҫӑнхи + + + х. х. + + + + + . + + + + + + + Китай Республики йӗркеличченхи + Китай Республики йӗркеленӗрен + + + респ. й-ч. + респ. й-р. + + + р. й-ч. + р. й-р. + + + + + . + + + + HH–HH + + + HH–HH (v) + + + + + + + + самана + + + сам. + + + ҫул + пӗлтӗр + кӑҫал + ҫитес ҫулта + + {0} ҫултан + {0} ҫултан + {0} ҫултан + + + {0} ҫул каялла + {0} ҫул каялла + {0} ҫул каялла + + + + чӗрӗк + иртнӗ чӗрӗкре + ку чӗрӗкре + ҫитес чӗрӗкре + + {0} чӗрӗкрен + {0} чӗрӗкрен + {0} чӗрӗкрен + + + {0} чӗрӗк каялла + {0} чӗрӗк каялла + {0} чӗрӗк каялла + + + + чӗр. + иртнӗ чӗр. + ку чӗр. + ҫитес чӗр. + + {0} чӗрӗк каялла + {0} чӗрӗк каялла + {0} чӗр. каялла + + + + уйӑх + иртнӗ уйӑхра + ку уйӑхра + ҫитес уйӑхра + + {0} уйӑхран + {0} уйӑхран + {0} уйӑхран + + + {0} уйӑх каялла + {0} уйӑх каялла + {0} уйӑх каялла + + + + + {0} уйӑх каялла + {0} уйӑх каялла + {0} уй. каялла + + + + иртнӗ уй. + ку уй. + ҫитес уй. + + + эрне + иртнӗ эрнере + ку эрнере + ҫитес эрнере + + {0} эрнерен + {0} эрнерен + {0} эрнерен + + + {0} эрне каялла + {0} эрне каялла + {0} эрне каялла + + {0} эрнинче + + + иртнӗ эрн. + ку эрн. + ҫитес эрн. + + {0} эрне каялла + {0} эрне каялла + {0} эрн. каялла + + + + + {0} эрн. каялла + {0} эрн. каялла + {0} эрн. каялла + + + + уйӑхӑн эрни + + + уй. эрни + + + кун + ӗнер + паян + ыран + + {0} кунтан + {0} кунтан + {0} кунтан + + + {0} кун каялла + {0} кун каялла + {0} кун каялла + + + + ҫулталӑкӑн кунӗ + + + ҫул. кунӗ + + + эрнен кунӗ + + + эрн. кунӗ + + + уйӑхӑн кунӗ + + + уй. кунӗ + + + иртнӗ вырсарни кун + ку вырсарни кун + ҫитес вырсарни кун + + {0} вырсарни кунтан + {0} вырсарни кунтан + {0} вырсарни кунтан + + + {0} вырсарни кун каялла + {0} вырсарни кун каялла + {0} вырсарни кун каялла + + + + иртнӗ вр + ку вр + ҫитес вр + + {0} вр-тан + {0} вр-тан + {0} вр-тан + + + {0} вр каялла + {0} вр каялла + {0} вр каялла + + + + + {0} вр-тан + {0} вр-тан + {0} вр-тан + + + {0} вр каялла + {0} вр каялла + {0} вр каялла + + + + иртнӗ тунти кун + ку тунти кун + ҫитес тунти кун + + {0} тунти кунтан + {0} тунти кунтан + {0} тунти кунтан + + + {0} тунти кун каялла + {0} тунти кун каялла + {0} тунти кун каялла + + + + иртнӗ тн + ку тн + ҫитес тн + + {0} тн-тан + {0} тн-тан + {0} тн-тан + + + {0} тн каялла + {0} тн каялла + {0} тн каялла + + + + + {0} тн-тан + {0} тн-тан + {0} тн-тан + + + {0} тн каялла + {0} тн каялла + {0} тн каялла + + + + иртнӗ ытлари кун + ку ытлари кун + ҫитес ытлари кун + + {0} ытлари кунтан + {0} ытлари кунтан + {0} ытлари кунтан + + + {0} ытлари кун каялла + {0} ытлари кун каялла + {0} ытлари кун каялла + + + + иртнӗ ыт + ку ыт + ҫитес ыт + + {0} ыт-тан + {0} ыт-тан + {0} ыт-тан + + + {0} ыт каялла + {0} ыт каялла + {0} ыт каялла + + + + + {0} ыт-тан + {0} ыт-тан + {0} ыт-тан + + + {0} ыт каялла + {0} ыт каялла + {0} ыт каялла + + + + иртнӗ юн кун + ку юн кун + ҫитес юн кун + + {0} юн кунтан + {0} юн кунтан + {0} юн кунтан + + + {0} юн кун каялла + {0} юн кун каялла + {0} юн кун каялла + + + + иртнӗ юн + ку юн + ҫитес юн + + {0} юн-тан + {0} юн-тан + {0} юн-тан + + + {0} юн каялла + {0} юн каялла + {0} юн каялла + + + + + {0} юн-тан + {0} юн-тан + {0} юн-тан + + + {0} юн каялла + {0} юн каялла + {0} юн каялла + + + + иртнӗ кӗҫнерни кун + ку кӗҫнерни кун + ҫитес кӗҫнерни кун + + {0} кӗҫнерни кунтан + {0} кӗҫнерни кунтан + {0} кӗҫнерни кунтан + + + {0} кӗҫнерни кун каялла + {0} кӗҫнерни кун каялла + {0} кӗҫнерни кун каялла + + + + иртнӗ кҫ + ку кҫ + ҫитес кҫ + + {0} кҫ-тан + {0} кҫ-тан + {0} кҫ-тан + + + {0} кҫ каялла + {0} кҫ каялла + {0} кҫ каялла + + + + + {0} кҫ-тан + {0} кҫ-тан + {0} кҫ-тан + + + {0} кҫ каялла + {0} кҫ каялла + {0} кҫ каялла + + + + иртнӗ эрне кун + ку эрне кун + ҫитес эрне кун + + {0} эрне кунтан + {0} эрне кунтан + {0} эрне кунтан + + + {0} эрне кун каялла + {0} эрне кун каялла + {0} эрне кун каялла + + + + иртнӗ эр + ку эр + ҫитес эр + + {0} эр-тан + {0} эр-тан + {0} эр-тан + + + {0} эр каялла + {0} эр каялла + {0} эр каялла + + + + + {0} эр-тан + {0} эр-тан + {0} эр-тан + + + {0} эр каялла + {0} эр каялла + {0} эр каялла + + + + иртнӗ шӑмат кун + ку шӑмат кун + ҫитес шӑмат кун + + {0} шӑмат кунтан + {0} шӑмат кунтан + {0} шӑмат кунтан + + + {0} шӑмат кун каялла + {0} шӑмат кун каялла + {0} шӑмат кун каялла + + + + иртнӗ шм + ку шм + ҫитес шм + + {0} шм-тан + {0} шм-тан + {0} шм-тан + + + {0} шм-тан + {0} шм-тан + {0} шм каялла + + + + + {0} шм-тан + {0} шм-тан + {0} шм-тан + + + {0} шм каялла + {0} шм каялла + {0} шм каялла + + + + к. у./к. х. + + + КУ/КХ + + + сехет + ку сехетре + + {0} сехетрен + {0} сехетрен + {0} сехетрен + + + {0} сехет каялла + {0} сехет каялла + {0} сехет каялла + + + + сех. + ку сех. + + {0} сехет каялла + {0} сехет каялла + {0} сех. каялла + + + + сех + + + минут + ку минутра + + {0} минутран + {0} минутран + {0} минутран + + + {0} минут каялла + {0} минут каялла + {0} минут каялла + + + + мин. + ку мин. + + {0} минут каялла + {0} минут каялла + {0} мин. каялла + + + + мин + + + ҫеккунт + халь + + {0} ҫеккунтран + {0} ҫеккунтран + {0} ҫеккунтран + + + {0} ҫеккунт каялла + {0} ҫеккунт каялла + {0} ҫеккунт каялла + + + + ҫек. + + {0} ҫек. каялла + {0} ҫек. каялла + {0} ҫек. каялла + + + + ҫ + + {0} ҫ-ран + {0} ҫ-ран + {0} ҫ-ран + + + {0} ҫ каялла + {0} ҫ каялла + {0} ҫ каялла + + + + вӑхӑт тӑрӑхӗ + + + вӑх. тӑрӑхӗ + + + + {0} вӑхӑчӗ + {0} ҫуллахи вӑхӑчӗ + {0} стандартлӑ вӑхӑчӗ + + + Пӗтӗм тӗнчери килӗштернӗ вӑхӑт + + + + Паллӑ мар хула + + + Андорра + + + Дубай + + + Кабул + + + Антигуа + + + Ангилья + + + Тирана + + + Ереван + + + Луанда + + + Ротера + + + Палмер + + + Тролль + + + Сёва + + + Моусон + + + Дейвис + + + Восток + + + Кейси + + + Дюмон-д’Юрвиль + + + Мак-Мердо + + + Рио-Гальегос + + + Мендоса + + + Сан-Хуан + + + Ушуая + + + Ла-Риоха + + + Сан-Луис + + + Катамарка + + + Сальта + + + Жужуй + + + Тукуман + + + Кордова + + + Буэнос-Айрес + + + Паго-Паго + + + Вена + + + Перт + + + Юкла + + + Дарвин + + + Аделаида + + + Брокен-Хилл + + + Мельбурн + + + Хобарт + + + Линдеман + + + Сидней + + + Брисбен + + + Маккуори + + + Лорд-Хау + + + Аруба + + + Мариехамн + + + Баку + + + Сараево + + + Барбадос + + + Дакка + + + Брюссель + + + Уагадугу + + + Софи + + + Бахрейн + + + Бужумбура + + + Порто-Ново + + + Сен-Бартелеми + + + Бермуда + + + Бруней + + + Ла-Пас + + + Кралендейк + + + Эйрунепе + + + Риу-Бранку + + + Порту-Велью + + + Боа-Виста + + + Манаус + + + Куяба + + + Сантарен + + + Кампу-Гранди + + + Белен + + + Арагуаина + + + Сан-Паулу + + + Баия + + + Форталеза + + + Масейо + + + Ресифи + + + Норонья + + + Нассау + + + Тхимпху + + + Габороне + + + Минск + + + Белиз + + + Доусон + + + Уайтхорс + + + Инувик + + + Ванкувер + + + Форт-Нельсон + + + Доусон-Крик + + + Крестон + + + Эдмонтон + + + Свифт-Керрент + + + Кеймбридж-Бей + + + Реджайна + + + Виннипег + + + Резольют + + + Ранкин-Инлет + + + Корал-Харбор + + + Торонто + + + Икалуит + + + Монктон + + + Галифакс + + + Гус-Бей + + + Глейс-Бей + + + Бланк-Саблон + + + Сент-Джонс + + + Кокос утравӗсем + + + Киншаса + + + Лубумбаши + + + Банги + + + Браззавиль + + + Цюрих + + + Абиджан + + + Раротонга + + + Мӑн кун утравӗ + + + Койхик + + + Пунта-Аренас + + + Сантьяго + + + Дуала + + + Урумчи + + + Шанхай + + + Богота + + + Коста-Рика + + + Гавана + + + Кабо-Верде + + + Кюрасао + + + Раштав утравӗ + + + Никоси + + + Фамагуста + + + Прага + + + Бюзинген + + + Берлин + + + Джибути + + + Копенгаген + + + Доминика + + + Санто-Доминго + + + Алжир + + + Галапагос утравӗсем + + + Гуаякиль + + + Таллин + + + Каир + + + Эль-Аюн + + + Асмэра + + + Канар утравӗсем + + + Сеута + + + Мадрид + + + Аддис-Абеба + + + Хельсинки + + + Фиджи + + + Стэнли + + + Чуук + + + Понпеи + + + Косрае + + + Фарер утравӗсем + + + Париж + + + Либревиль + + + Лондон + + + Гренада + + + Тбилиси + + + Кайенна + + + Гернси + + + Аккра + + + Гибралтар + + + Туле + + + Нуук + + + Скорсбисунн + + + Денмарксхавн + + + Банжул + + + Конакри + + + Гваделупа + + + Малабо + + + Афина + + + Кӑнтӑр Георги + + + Гватемала + + + Гуам + + + Бисау + + + Гайана + + + Гонконг + + + Тегусигальпа + + + Загреб + + + Порт-о-Пренс + + + Будапешт + + + Джакарта + + + Понтианак + + + Макасар + + + Джаяпура + + + Дублин + + + Иерусалим + + + Мэн утравӗ + + + Калькутта + + + Чагос + + + Багдад + + + Тегеран + + + Рейкьявик + + + Рим + + + Джерси + + + Ямайка + + + Амман + + + Токио + + + Найроби + + + Бишкек + + + Пномпень + + + Кантон + + + Киритимати + + + Тарава + + + Комор утравӗсем + + + Сент-Китс + + + Пхеньян + + + Сеул + + + Кувейт + + + Кайман утравӗсем + + + Актау + + + Уральск + + + Атырау + + + Актобе + + + Костанай + + + Кызылорда + + + Алматы + + + Вьентьян + + + Бейрут + + + Сент-Люсия + + + Вадуц + + + Коломбо + + + Монрови + + + Масеру + + + Вильнюс + + + Люксембург + + + Рига + + + Триполи + + + Касабланка + + + Монако + + + Кишинёв + + + Подгорица + + + Мариго + + + Антананариву + + + Кваджалейн + + + Маджуро + + + Скопье + + + Бамако + + + Янгон + + + Ховд + + + Улан-Батор + + + Макао + + + Сайпан + + + Мартиника + + + Нуакшот + + + Монтсеррат + + + Мальта + + + Маврики + + + Мальдива + + + Блантайр + + + Тихуана + + + Эрмосильо + + + Сьюдад-Хуарес + + + Масатлан + + + Чиуауа + + + Баия-де-Бандерас + + + Охинага + + + Монтеррей + + + Мехико + + + Матаморос + + + Мерида + + + Канкун + + + Куала-Лумпур + + + Кучинг + + + Мапуту + + + Виндхук + + + Нумеа + + + Ниамей + + + Норфолк + + + Лагос + + + Манагуа + + + Амстердам + + + Осло + + + Катманду + + + Науру + + + Ниуэ + + + Чатем + + + Окленд + + + Маскат + + + Панама + + + Лима + + + Таити + + + Маркизас утравӗсем + + + Гамбье + + + Порт-Морсби + + + Бугенвиль + + + Манила + + + Карачи + + + Варшава + + + Микелон + + + Питкэрн + + + Пуэрто-Рико + + + Газа + + + Хеврон + + + Азор утравӗсем + + + Мадейра + + + Лиссабон + + + Палау + + + Асунсьон + + + Катар + + + Реюньон + + + Бухарест + + + Белград + + + Калининград + + + Мускав + + + Волгоград + + + Сарӑту + + + Аҫтӑрхан + + + Чӗмпӗр + + + Киров + + + Самар + + + Екатеринбург + + + Омск + + + Новосибирск + + + Барнаул + + + Томск + + + Новокузнецк + + + Красноярск + + + Иркутск + + + Чита + + + Якутск + + + Владивосток + + + Хандыга + + + Сахалин + + + Усть-Нера + + + Магадан + + + Среднеколымск + + + Петропавловск-Камчатский + + + Анадырь + + + Кигали + + + Эр-Рияд + + + Гуадалканал + + + Маэ + + + Хартум + + + Стокгольм + + + Сингапур + + + Сӑваплӑ Елена утравӗ + + + Любляна + + + Лонгйир + + + Братислава + + + Фритаун + + + Сан-Марино + + + Дакар + + + Могадишо + + + Парамарибо + + + Джуба + + + Сан-Томе + + + Сальвадор + + + Лоуэр-Принс-Куотер + + + Дамаск + + + Мбабане + + + Гранд-Терк + + + Нджамена + + + Кергелен + + + Ломе + + + Бангкок + + + Душанбе + + + Факаофо + + + Дили + + + Ашхабад + + + Тунис + + + Тонгатапу + + + Стамбул + + + Порт-оф-Спейн + + + Фунафути + + + Тайбэй + + + Дар-эс-Салам + + + Кийӳ + + + Симферополь + + + Кампала + + + Мидуэй + + + Уэйк утравӗ + + + Адак + + + Ном + + + Анкоридж + + + Якутат + + + Ситка + + + Джуно + + + Метлакатла + + + Лос-Анджелес + + + Бойсе + + + Финикс + + + Денвер + + + Бойла, Ҫур ҫӗр Дакота + + + Нью-Сейлем, Ҫур ҫӗр Дакота + + + Сентер, Ҫурҫӗр Дакота + + + Чикаго + + + Меномини + + + Винсеннес, Индиана + + + Питерсберг, Индиана + + + Телл-Сити, Индиана + + + Нокс, Индиана + + + Уинамак, Индиана + + + Маренго, Индиана + + + Индианаполис + + + Луисвилл + + + Вевей, Индиана + + + Монтиселло, Кентукки + + + Детройт + + + Нью-Йорк + + + Монтевидео + + + Самарканд + + + Ташкент + + + Ватикан + + + Сент-Винсент + + + Каракас + + + Тортола + + + Сент-Томас + + + Хошимин + + + Эфате + + + Уоллиспа Футуна + + + Апиа + + + Аден + + + Майотта + + + Йоханнесбург + + + Лусака + + + Хараре + + + + Акри вӑхӑчӗ + Акри стандартлӑ вӑхӑчӗ + Акри ҫуллахи вӑхӑчӗ + + + + + Афганистан вӑхӑчӗ + + + + + Вӑта Африка вӑхӑчӗ + + + + + Тухӑҫ Африка вӑхӑчӗ + + + + + Кӑнтӑр Африка вӑхӑчӗ + + + + + Анӑҫ Африка стандартлӑ вӑхӑчӗ + + + + + Аляска вӑхӑчӗ + Аляска стандартлӑ вӑхӑчӗ + Аляска ҫуллахи вӑхӑчӗ + + + + + Амазонка вӑхӑчӗ + Амазонка стандартлӑ вӑхӑчӗ + Амазонка ҫуллахи вӑхӑчӗ + + + + + Вӑта Америка вӑхӑчӗ + Вӑта Америка стандартлӑ вӑхӑчӗ + Вӑта Америка ҫуллахи вӑхӑчӗ + + + + + Тухӑҫ Америка вӑхӑчӗ + Тухӑҫ Америка стандартлӑ вӑхӑчӗ + Тухӑҫ Америка ҫуллахи вӑхӑчӗ + + + + + Ту вӑхӑчӗ + Ту стандартлӑ вӑхӑчӗ + Ту ҫуллахи вӑхӑчӗ + + + + + Лӑпкӑ океан вӑхӑчӗ + Лӑпкӑ океан стандартлӑ вӑхӑчӗ + Лӑпкӑ океан ҫуллахи вӑхӑчӗ + + + + + Анадырь вӑхӑчӗ + Анадырь стандартлӑ вӑхӑчӗ + Анадырь ҫуллахи вӑхӑчӗ + + + ANAT + ANAT + ANAST + + + + + Апиа вӑхӑчӗ + Апиа стандартлӑ вӑхӑчӗ + Апиа ҫуллахи вӑхӑчӗ + + + + + Сауд Аравийӗ вӑхӑчӗ + Сауд Аравийӗ стандартлӑ вӑхӑчӗ + Сауд Аравийӗ ҫуллахи вӑхӑчӗ + + + + + Аргентина вӑхӑчӗ + Аргентина стандартлӑ вӑхӑчӗ + Аргентина ҫуллахи вӑхӑчӗ + + + + + Анӑҫ Аргентина вӑхӑчӗ + Анӑҫ Аргентина стандартлӑ вӑхӑчӗ + Анӑҫ Аргентина ҫуллахи вӑхӑчӗ + + + + + Армени вӑхӑчӗ + Армени стандартлӑ вӑхӑчӗ + Армени ҫуллахи вӑхӑчӗ + + + + + Атлантика вӑхӑчӗ + Атлантика стандартлӑ вӑхӑчӗ + Атлантика ҫуллахи вӑхӑчӗ + + + + + Вӑта Австрали вӑхӑчӗ + Вӑта Австрали стандартлӑ вӑхӑчӗ + Вӑта Австрали ҫуллахи вӑхӑчӗ + + + + + Анӑҫ Вӑта Австрали вӑхӑчӗ + Анӑҫ Вӑта Австрали стандартлӑ вӑхӑчӗ + Анӑҫ Вӑта Австрали ҫуллахи вӑхӑчӗ + + + + + Тухӑҫ Австрали вӑхӑчӗ + Тухӑҫ Австрали стандартлӑ вӑхӑчӗ + Тухӑҫ Австрали ҫуллахи вӑхӑчӗ + + + + + Анӑҫ Австрали вӑхӑчӗ + Анӑҫ Австрали стандартлӑ вӑхӑчӗ + Анӑҫ Австрали ҫуллахи вӑхӑчӗ + + + + + Азербайджан вӑхӑчӗ + Азербайджан стандартлӑ вӑхӑчӗ + Азербайджан ҫуллахи вӑхӑчӗ + + + + + Азор утравӗсен вӑхӑчӗ + Азор утравӗсен стандартлӑ вӑхӑчӗ + Азор утравӗсен ҫуллахи вӑхӑчӗ + + + + + Бангладеш вӑхӑчӗ + Бангладеш стандартлӑ вӑхӑчӗ + Бангладеш ҫуллахи вӑхӑчӗ + + + + + Бутан вӑхӑчӗ + + + + + Боливи вӑхӑчӗ + + + + + Бразили вӑхӑчӗ + Бразили стандартлӑ вӑхӑчӗ + Бразили ҫуллахи вӑхӑчӗ + + + + + Британи вӑхӑчӗ + Британи ҫуллахи вӑхӑчӗ + + + + + Бруней вӑхӑчӗ + + + + + Кабо-Верде вӑхӑчӗ + Кабо-Верде стандартлӑ вӑхӑчӗ + Кабо-Верде ҫуллахи вӑхӑчӗ + + + + + Кейси вӑхӑчӗ + + + + + Чаморро вӑхӑчӗ + + + + + Чатем вӑхӑчӗ + Чатем стандартлӑ вӑхӑчӗ + Чатем ҫуллахи вӑхӑчӗ + + + + + Чили вӑхӑчӗ + Чили стандартлӑ вӑхӑчӗ + Чили ҫуллахи вӑхӑчӗ + + + + + Китай вӑхӑчӗ + Китай стандартлӑ вӑхӑчӗ + Китай ҫуллахи вӑхӑчӗ + + + + + Раштав утравӗ вӑхӑчӗ + + + + + Кокос утравӗсен вӑхӑчӗ + + + + + Колумби вӑхӑчӗ + Колумби стандартлӑ вӑхӑчӗ + Колумби ҫуллахи вӑхӑчӗ + + + + + Кук утравӗсен вӑхӑчӗ + Кук утравӗсен стандартлӑ вӑхӑчӗ + Кук утравӗсен ҫуллахи вӑхӑчӗ + + + + + Куба вӑхӑчӗ + Куба стандартлӑ вӑхӑчӗ + Куба ҫуллахи вӑхӑчӗ + + + + + Дейвис вӑхӑчӗ + + + + + Дюмон-д’Юрвиль вӑхӑчӗ + + + + + Тухӑҫ Тимор вӑхӑчӗ + + + + + Мӑн кун утравӗн вӑхӑчӗ + Мӑн кун утравӗн стандартлӑ вӑхӑчӗ + Мӑн кун утравӗн ҫуллахи вӑхӑчӗ + + + + + Эквадор вӑхӑчӗ + + + + + Вӑта Европа вӑхӑчӗ + Вӑта Европа стандартлӑ вӑхӑчӗ + Вӑта Европа ҫуллахи вӑхӑчӗ + + + CET + CET + CEST + + + + + Тухӑҫ Европа вӑхӑчӗ + Тухӑҫ Европа стандартлӑ вӑхӑчӗ + Тухӑҫ Европа ҫуллахи вӑхӑчӗ + + + EET + EET + EEST + + + + + Инҫет Тухӑҫ Европа вӑхӑчӗ + + + FEET + + + + + Анӑҫ Европа вӑхӑчӗ + Анӑҫ Европа стандартлӑ вӑхӑчӗ + Анӑҫ Европа ҫуллахи вӑхӑчӗ + + + WET + WET + WEST + + + + + Фолкленд утравӗсен вӑхӑчӗ + Фолкленд утравӗсен стандартлӑ вӑхӑчӗ + Фолкленд утравӗсен ҫуллахи вӑхӑчӗ + + + + + Фиджи вӑхӑчӗ + Фиджи стандартлӑ вӑхӑчӗ + Фиджи ҫуллахи вӑхӑчӗ + + + + + Франци Гвианин вӑхӑчӗ + + + + + Франци Кӑнтӑрпа Антарктика территорийӗсен вӑхӑчӗ + + + + + Галапагос вӑхӑчӗ + + + + + Гамбье вӑхӑчӗ + + + + + Грузи вӑхӑчӗ + Грузи стандартлӑ вӑхӑчӗ + Грузи ҫуллахи вӑхӑчӗ + + + + + Гилберт утравӗсен вӑхӑчӗ + + + + + Гринвич вӑхӑчӗ + + + GMT + + + + + Гренланди вӑхӑчӗ + Гренланди стандартлӑ вӑхӑчӗ + Гренланди ҫуллахи вӑхӑчӗ + + + + + Тухӑҫ Гренланди вӑхӑчӗ + Тухӑҫ Гренланди стандартлӑ вӑхӑчӗ + Тухӑҫ Гренланди ҫуллахи вӑхӑчӗ + + + + + Анӑҫ Гринланди вӑхӑчӗ + Анӑҫ Гринланди стандартлӑ вӑхӑчӗ + Анӑҫ ҫуллахи вӑхӑчӗ + + + + + Перс кӳлмекӗн вӑхӑчӗ + + + + + Гайана вӑхӑчӗ + + + + + Гавайи стандартлӑ вӑхӑчӗ + + + + + Гавайи-Алеут вӑхӑчӗ + Гавайи-Алеут стандартлӑ вӑхӑчӗ + Гавайи-Алеут ҫуллахи вӑхӑчӗ + + + + + Гонконг вӑхӑчӗ + Гонконг стандартлӑ вӑхӑчӗ + Гонконг ҫуллахи вӑхӑчӗ + + + + + Ховд вӑхӑчӗ + Ховд стандартлӑ вӑхӑчӗ + Ховд ҫуллахи вӑхӑчӗ + + + + + Инди вӑхӑчӗ + + + + + Инди океанӗ вӑхӑчӗ + + + + + Индокитай вӑхӑчӗ + + + + + Вӑта Индонези вӑхӑчӗ + + + + + Тухӑҫ Индонези вӑхӑчӗ + + + + + Анӑҫ Индонези вӑхӑчӗ + + + + + Иран вӑхӑчӗ + Иран стандартлӑ вӑхӑчӗ + Иран ҫуллахи вӑхӑчӗ + + + + + Ирланди вӑхӑчӗ + Ирланди стандартлӑ вӑхӑчӗ + + + + + Иркутск вӑхӑчӗ + Иркутск стандартлӑ вӑхӑчӗ + Иркутск ҫуллахи вӑхӑчӗ + + + IRKT + IRKT + IRKST + + + + + Израиль вӑхӑчӗ + Израиль стандартлӑ вӑхӑчӗ + Израиль ҫуллахи вӑхӑчӗ + + + + + Япони вӑхӑчӗ + Япони стандартлӑ вӑхӑчӗ + Япони ҫуллахи вӑхӑчӗ + + + + + Петропавловск-Камчатский вӑхӑчӗ + Петропавловск-Камчатский стандартлӑ вӑхӑчӗ + Петропавловск-Камчатский ҫуллахи вӑхӑчӗ + + + PETT + PETST + PETDT + + + + + Казахстан вӑхӑчӗ + + + Казахстан вхч + + + + + Тухӑҫ Казахстан вӑхӑчӗ + + + Хӗвелтухӑҫ Казахстан вхч + + + + + Анӑҫ Казахстан вӑхӑчӗ + + + Анӑҫ Казахстан вхч + + + + + Корея вӑхӑчӗ + Корея стандартлӑ вӑхӑчӗ + Корея ҫуллахи вӑхӑчӗ + + + + + Косрае вӑхӑчӗ + + + + + Красноярск вӑхӑчӗ + Красноярск стандартлӑ вӑхӑчӗ + Красноярск ҫуллахи вӑхӑчӗ + + + KRAT + KRAT + KRAST + + + + + Кӑркӑстан вӑхӑчӗ + + + + + Лайн утравӗсен вӑхӑчӗ + + + + + Лорд-Хау вӑхӑчӗ + Лорд-Хау стандартлӑ вӑхӑчӗ + Лорд-Хау ҫуллахи вӑхӑчӗ + + + + + Магадан вӑхӑчӗ + Магадан стандартлӑ вӑхӑчӗ + Магадан ҫуллахи вӑхӑчӗ + + + + + Малайзи вӑхӑчӗ + + + + + Мальдива вӑхӑчӗ + + + + + Маркизас утравӗсен вӑхӑчӗ + + + + + Маршалл утравӗсен вӑхӑчӗ + + + + + Маврики вӑхӑчӗ + Маврики стандартлӑ вӑхӑчӗ + Маврики ҫуллахи вӑхӑчӗ + + + + + Моусон вӑхӑчӗ + + + + + Мексика Лӑпкӑ океан вӑхӑчӗ + Мексика Лӑпкӑ океан стандартлӑ вӑхӑчӗ + Мексика Лӑпкӑ океан ҫуллахи вӑхӑчӗ + + + + + Улан-Батор вӑхӑчӗ + Улан-Батор стандартлӑ вӑхӑчӗ + Улан-Батор ҫуллахи вӑхӑчӗ + + + + + Мускав вӑхӑчӗ + Мускав стандартлӑ вӑхӑчӗ + Мускав ҫуллахи вӑхӑчӗ + + + MSK + МСК + MSD + + + + + Мьянма вӑхӑчӗ + + + + + Науру вӑхӑчӗ + + + + + Непал вӑхӑчӗ + + + + + Ҫӗнӗ Каледони вӑхӑчӗ + Ҫӗнӗ Каледони стандартлӑ вӑхӑчӗ + Ҫӗнӗ Каледони ҫуллахи вӑхӑчӗ + + + + + Ҫӗнӗ Зеланди вӑхӑчӗ + Ҫӗнӗ Зеланди стандартлӑ вӑхӑчӗ + Ҫӗнӗ Зеланди ҫуллахи вӑхӑчӗ + + + + + Ньюфаундленд вӑхӑчӗ + Ньюфаундленд стандартлӑ вӑхӑчӗ + Ньюфаундленд ҫуллахи вӑхӑчӗ + + + + + Ниуэ вӑхӑчӗ + + + + + Норфолк вӑхӑчӗ + Норфолк стандартлӑ вӑхӑчӗ + Норфолк ҫуллахи вӑхӑчӗ + + + + + Фернанду-ди-Норонья вӑхӑчӗ + Фернанду-ди-Норонья стандартлӑ вӑхӑчӗ + Фернанду-ди-Норонья ҫуллахи вӑхӑчӗ + + + + + Новосибирск вӑхӑчӗ + Новосибирск стандартлӑ вӑхӑчӗ + Новосибирск ҫуллахи вӑхӑчӗ + + + NOVT + NOVT + NOVST + + + + + Омск вӑхӑчӗ + Омск стандартлӑ вӑхӑчӗ + Омск ҫуллахи вӑхӑчӗ + + + OMST + OMST + OMSST + + + + + Пакистан вӑхӑчӗ + Пакистан стандартлӑ вӑхӑчӗ + Пакистан ҫуллахи вӑхӑчӗ + + + + + Палау вӑхӑчӗ + + + + + Папуа — Ҫӗнӗ Гвинея вӑхӑчӗ + + + + + Парагвай вӑхӑчӗ + Парагвай стандартлӑ вӑхӑчӗ + Парагвай ҫуллахи вӑхӑчӗ + + + + + Перу вӑхӑчӗ + Перу стандартлӑ вӑхӑчӗ + Перу ҫуллахи вӑхӑчӗ + + + + + Филиппин вӑхӑчӗ + Филиппин стандартлӑ вӑхӑчӗ + Филиппин ҫуллахи вӑхӑчӗ + + + + + Феникс утравӗсен вӑхӑчӗ + + + + + Сен-Пьерпа Микелон вӑхӑчӗ + Сен-Пьерпа Микелон стандартлӑ вӑхӑчӗ + Сен-Пьерпа Микелон ҫуллахи вӑхӑчӗ + + + + + Питкэрн вӑхӑчӗ + + + + + Понпеи вӑхӑчӗ + + + + + Ҫур ҫӗр Корея вӑхӑчӗ + + + + + Реюньон вӑхӑчӗ + + + + + Ротера вӑхӑчӗ + + + + + Сахалин вӑхӑчӗ + Сахалин стандартлӑ вӑхӑчӗ + Сахалин ҫуллахи вӑхӑчӗ + + + SAKT + SAKT + SAKST + + + + + Самар вӑхӑчӗ + Самар стандартлӑ вӑхӑчӗ + Самар ҫуллахи вӑхӑчӗ + + + SAMT + SAMT + SAMST + + + + + Самоа стандартлӑ вӑхӑчӗ + + + + + Сейшел утравӗсен вӑхӑчӗ + + + + + Сингапур вӑхӑчӗ + + + + + Соломон вӑхӑчӗ + + + + + Кӑнтӑр Георги вӑхӑчӗ + + + + + Суринам вӑхӑчӗ + + + + + Сёва вӑхӑчӗ + + + + + Таити вӑхӑчӗ + + + + + Тайвань вӑхӑчӗ + Тайвань стандартлӑ вӑхӑчӗ + Тайвань ҫуллахи вӑхӑчӗ + + + + + Таджикистан вӑхӑчӗ + + + + + Токелау вӑхӑчӗ + + + + + Тонга вӑхӑчӗ + Тонга стандартлӑ вӑхӑчӗ + Тонга ҫуллахи вӑхӑчӗ + + + + + Чуук вӑхӑчӗ + + + + + Турци вӑхӑчӗ + Турци стандартлӑ вӑхӑчӗ + Турци ҫуллахи вӑхӑчӗ + + + ТВ + ТСВ + ТÇВ + + + + + Туркменистан вӑхӑчӗ + Туркменистан стандартлӑ вӑхӑчӗ + Туркменистан ҫуллахи вӑхӑчӗ + + + + + Тувалу вӑхӑчӗ + + + + + Уругвай вӑхӑчӗ + Уругвай стандартлӑ вӑхӑчӗ + Уругвай ҫуллахи вӑхӑчӗ + + + + + Урумчи вӑхӑчӗ + + + УВ + + + + + Узбекистан вӑхӑчӗ + Узбекистан стандартлӑ вӑхӑчӗ + Узбекистан ҫуллахи вӑхӑчӗ + + + + + Вануату вӑхӑчӗ + Вануату стандартлӑ вӑхӑчӗ + Вануату ҫуллахи вӑхӑчӗ + + + + + Венесуэла вӑхӑчӗ + + + + + Владивосток вӑхӑчӗ + Владивосток стандартлӑ вӑхӑчӗ + Владивосток ҫуллахи вӑхӑчӗ + + + VLAT + VLAT + VLAST + + + + + Волгоград вӑхӑчӗ + Волгоград стандартлӑ вӑхӑчӗ + Волгоград ҫуллахи вӑхӑчӗ + + + VOLT + VOLT + VOLST + + + + + Восток вӑхӑчӗ + + + + + Уэйк утравӗ вӑхӑчӗ + + + + + Уоллиспа Футуна вӑхӑчӗ + + + + + Якутск вӑхӑчӗ + Якутск стандартлӑ вӑхӑчӗ + Якутск ҫуллахи вӑхӑчӗ + + + YAKT + YAKT + YAKST + + + + + Екатеринбург вӑхӑчӗ + Екатеринбург стандартлӑ вӑхӑчӗ + Екатеринбург ҫуллахи вӑхӑчӗ + + + YEKT + YEKT + YEKST + + + + + Юкон вӑхӑчӗ + + + + + + + хисеп мар + + + хисеп мар + + + , +   + хисеп мар + + + + + 0 пин + 0 пин + 0 пин + 00 пин + 00 пин + 00 пин + 000 пин + 000 пин + 000 пин + 0 млн + 0 млн + 0 млн + 00 млн + 00 млн + 00 млн + 000 млн + 000 млн + 000 млн + 0 млрд + 0 млрд + 0 млрд + 00 млрд + 00 млрд + 00 млрд + 000 млрд + 000 млрд + 000 млрд + 0 трлн + 0 трлн + 0 трлн + 00 трлн + 00 трлн + 00 трлн + 000 трлн + 000 трлн + 000 трлн + + + + + 0 пин + 0 пин + 0 пин + 00 пин + 00 пин + 00 пин + 000 пин + 000 пин + 000 пин + 0 млн + 0 млн + 0 млн + 00 млн + 00 млн + 00 млн + 000 млн + 000 млн + 000 млн + 0 млрд + 0 млрд + 0 млрд + 00 млрд + 00 млрд + 00 млрд + 000 млрд + 000 млрд + 000 млрд + 0 трлн + 0 трлн + 0 трлн + 00 трлн + 00 трлн + 00 трлн + 000 трлн + 000 трлн + 000 трлн + + + + + + + #,##0 % + + + + + + + #,##0 % + + + + + + + #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00;(#,##0.00) + + + + + + + #,##0.00 ¤ + #,##0.00 ¤ + + + #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00;(#,##0.00) + + + + + 0 пин ¤ + 0 пин ¤ + 0 пин ¤ + 00 пин ¤ + 00 пин ¤ + 00 пин ¤ + 000 пин ¤ + 000 пин ¤ + 000 пин ¤ + 0 млн ¤ + 0 млн ¤ + 0 млн ¤ + 00 млн ¤ + 00 млн ¤ + 00 млн ¤ + 000 млн ¤ + 000 млн ¤ + 000 млн ¤ + 0 млрд ¤ + 0 млрд ¤ + 0 млрд ¤ + 00 млрд ¤ + 00 млрд ¤ + 00 млрд ¤ + 000 млрд ¤ + 000 млрд ¤ + 000 млрд ¤ + 0 трлн ¤ + 0 трлн ¤ + 0 трлн ¤ + 00 трлн ¤ + 00 трлн ¤ + 00 трлн ¤ + 000 трлн ¤ + 000 трлн ¤ + 000 трлн ¤ + + + + + + Андорра песи + + + Пӗрлешнӗ Араб Эмирачӗсен дирхамӗ + ПАЭ дирхамӗ + ПАЭ дирхамӗ + ПАЭ дирхамӗ + + + Афганистан афганийӗ (1927–2002) + + + Афганистан афганийӗ + + + Албани лекӗ (1946–1965) + + + Албани лекӗ + + + Армени драмӗ + + + Нидерланд Антилӗн гульденӗ + + + Ангола кванзи + + + Ангола кванзи (1977–1991) + + + Ангола ҫӗнӗ кванзи (1990–2000) + + + Ангола реюстадо кванзӗ (1995–1999) + + + Аргентина аустралӗ + + + Аргентина песо-лейӗ (1970–1983) + + + Аргентина песи (1881–1970) + + + Аргентина песи (1983–1985) + + + Аргентина песи + + + Австри шиллингӗ + + + Австрали долларӗ + + + Аруба флоринӗ + + + Азербайджан маначӗ (1993–2006) + + + Азербайджан маначӗ + + + Боснипе Герцеговина динарӗ (1992–1994) + + + Боснипе Герцеговина конверсиленекен марки + + + Боснипе Герцеговина ҫӗнӗ динарӗ (1994–1997) + + + Барбадос долларӗ + + + Бангладеш таки + + + Бельги конверсиленекен франкӗ + + + Бельги франкӗ + + + Бельги франкӗ (финанс) + + + Болгари хытӑ левӗ + + + Болгари социалистсен левӗ + + + Болгари левӗ + + + Болгари левӗ (1879–1952) + + + Бахрейн динарӗ + + + Бурунди франкӗ + + + Бермуд долларӗ + + + Бруней долларӗ + + + Боливи боливианӗ + + + Боливи боливианӗ (1863–1963) + + + Боливи песи + + + Боливи мвдолӗ + + + Бразили ҫӗнӗ крузейри (1967–1986) + + + Бразили крузади (1986–1989) + + + Бразили крузейри (1990–1993) + + + Бразили реалӗ + + + Бразили ҫӗнӗ крузади (1989–1990) + + + Бразили крузейри (1993–1994) + + + Бразили крузейри (1942–1967) + + + Багама долларӗ + + + Бутан нгултрумӗ + + + Бирман кьячӗ + + + Ботсвана пули + + + Беларусь рублӗ (1994–1999) + + + Беларусь рублӗ + + + Беларусь рублӗ (2000–2016) + + + Белиз долларӗ + + + Канада долларӗ + + + Конго франкӗ + + + WIR еври + + + Швейцари франкӗ + + + WIR франкӗ + + + Чили эскуди + + + Чили татӑлу единици (UF) + + + Чили песи + + + Китай юанӗ (офшор) + + + Китай юанӗ + + + Колумби песи + + + Колумби чӑн хаклӑх единици + + + Коста-Рика колонӗ + + + Серби динарӗ (2002–2006) + + + Чехословаки хытӑ кронӗ + + + Куба конверсиленекен песи + + + Куба песи + + + Кабо-Верде эскуди + + + Кипр фунчӗ + + + Чехи крони + + + Тухӑҫ Германи марки + + + Германи марки + + + Джибути франкӗ + + + Дани крони + + + Доминика песи + + + Алжир динарӗ + + + Эквадор сукри + + + Эквадор яланхи хаклӑх единици + + + Эстон крони + + + Египет фунчӗ + + + Эритрей накфи + + + Испани песети (А) + + + Испани конверсиленекен песети + + + Испани песети + + + Эфиопи бырӗ + + + евро + + + Финлянди марки + + + Фиджи долларӗ + + + Фолкленд утравӗсен фунчӗ + + + Франци франкӗ + + + Британи фунчӗ + + + Грузи купонӗ + + + Грузи ларийӗ + + + Гана седийӗ (1979–2007) + + + Гана седийӗ + + + Гибралтар фунчӗ + + + Гамби даласийӗ + + + Гвиней франкӗ + + + Гвиней силийӗ + + + Экваторти Гвиней эквелӗ + + + Греци драхми + + + Гватемала кетцалӗ + + + Гвиней-Бисау эскуди + + + Гвиней-Бисау песи + + + Гайана долларӗ + + + Гонконг долларӗ + + + Гондурас лемпири + + + Хорвати динарӗ + + + Хорвати куни + + + Гаити гурдӗ + + + Венгри форинчӗ + + + Индонези рупийӗ + + + Ирланди фунчӗ + + + Израиль фунчӗ + + + Израиль шекелӗ (1980–1985) + + + Израиль ҫӗнӗ шекелӗ + + + Инди рупийӗ + + + Ирак динарӗ + + + Иран риалӗ + + + Исланди крони (1918–1981) + + + Исланди крони + + + Итали лири + + + Ямайка долларӗ + + + Иордан динарӗ + + + Япони иени + + + Кени шиллингӗ + + + Кӑркӑсстан сомӗ + + + Камбоджа риелӗ + + + Комор франкӗ + + + Ҫур ҫӗр Корей вони + + + Кӑнтӑр Корея хванӗ (1953–1962) + + + Кӑнтӑр Корей вони (1945–1953) + + + Кӑнтӑр Корей вони + + + Кувейт динарӗ + + + Кайман утравӗсен долларӗ + + + Казахстан тенги + + + Лаос кипӗ + + + Ливан фунчӗ + + + Шри-Ланка рупийӗ + + + Либери долларӗ + + + Лесото лотийӗ + + + Литва личӗ + + + Литва талонӗ + + + Люксембург конверсиленекен франкӗ + + + Люксембург франкӗ + + + Люксембург финанс франкӗ + + + Латви лачӗ + + + Латви рублӗ + + + Ливи динарӗ + + + Марокко дирхамӗ + + + Марокко франкӗ + + + Монако франкӗ + + + Молдова купонӗ + + + Молдова лайӗ + + + Мадагаскар ариарийӗ + + + Мадагаскар франкӗ + + + Македони денарӗ + + + Македони денарӗ (1992–1993) + + + Мали франкӗ + + + Мьянма кьячӗ + + + Монголи тугрикӗ + + + Макао патаки + + + Мавритани угийӗ (1973–2017) + + + Мавритани угийӗ + + + Мальта лири + + + Мальта фунчӗ + + + Маврики рупийӗ + + + Мальдив рупийӗ (1947–1981) + + + Мальдив руфийӗ + + + Малави квачи + + + Мексика песи + + + Мексика кӗмӗл песи (1861–1992) + + + Мексика инвестици единици + + + Малайзи ринггичӗ + + + Мозамбик эскуди + + + Мозамбик метикалӗ (1980–2006) + + + Мозамбик метикалӗ + + + Намиби долларӗ + + + Нигери найри + + + Никарагуа кордоби (1988–1991) + + + Никарагуа кордоби + + + Нидерланд гульденӗ + + + Норвеги крони + + + Непал рупийӗ + + + Ҫӗнӗ Зеланди долларӗ + + + Оман риалӗ + + + Панама бальбойи + + + Перу интийӗ + + + Перу солӗ + + + Перу солӗ (1863–1965) + + + Папуа – Ҫӗнӗ Гвинея кини + + + Филиппин песи + + + Пакистан рупийӗ + + + Польша злотӑйӗ + + + Польша злотӑйӗ (1950–1995) + + + Португали эскуди + + + Парагвай гуаранӗ + + + Катар риалӗ + + + Родези долларӗ + + + Румыни лейӗ (1952–2006) + + + Румыни лейӗ + + + Серби динарӗ + + + Раҫҫей рублӗ + ₽ + + + Раҫҫей рублӗ (1991–1998) + + + Руанда франкӗ + + + Сауд Аравийӗ риялӗ + + + Соломон утравӗсен долларӗ + + + Сейшел рупийӗ + + + Судан динарӗ (1992–2007) + + + Судан фунчӗ + + + Судан фунчӗ (1957–1998) + + + Швеци крони + + + Сингапур долларӗ + + + Сӑваплӑ Елена утравӗн фунчӗ + + + Словени толарӗ + + + Словаки крони + + + Сьерра-Леоне леони + + + Сьерра-Леоне леони (1964–2022) + + + Сомали шиллингӗ + + + Суринам долларӗ + + + Суринам гульденӗ + + + Кӑнтӑр Судан фунчӗ + + + Сан-Томепе Принсипи добри (1977–2017) + + + Сан-Томепе Принсипи добри + + + ССРП рублӗ + + + Сальвадор колонӗ + + + Сири фунчӗ + + + Эсватини лилангенийӗ + + + Таиланд бачӗ + + + Таджикистан рублӗ + + + Таджикистан сомонийӗ + + + Туркменистан маначӗ (1993–2009) + + + Туркменистан маначӗ + + + Тунис динарӗ + + + Тонга паанги + + + Тимор эскуди + + + Турци лири (1922–2005) + + + Турци лири + + + Тринидадпа Тобаго долларӗ + + + Тайвань ҫӗнӗ долларӗ + + + Танзани шиллингӗ + + + Украина гривни + + + Украина карбованецӗ + + + Уганда шиллингӗ (1966–1987) + + + Уганда шиллингӗ + + + АПШ долларӗ + $ + + + АПШ долларӗ (ҫитес кун) + + + АПШ долларӗ (ҫак кун) + + + Уругвай песи (индексациленӗ единица) + + + Уругвай песи (1975–1993) + + + Уругвай песи + + + Уругвай номинал ӗҫ хакӗн индексӗн единици + + + Узбекистан сумӗ + + + Венесуэла боливарӗ (1871–2008) + + + Венесуэла суверенлӑ боливарӗ + + + Венесуэла боливарӗ (2008–2018) + + + Венесуэла боливарӗ + + + Вьетнам донгӗ + + + Вьетнам донгӗ (1978–1985) + + + Вануату ватувӗ + + + Самоа тали + + + ази шутлав динарӗ + ази шутлав динарӗ + ази шутлав динарӗ + ази шутлав динарӗ + + + Вӑта Африка КФА франкӗ + + + кӗмӗл + Троя унцийӗ кӗмӗлпе + Троя унцийӗ кӗмӗлпе + Троя унцийӗ кӗмӗлпе + + + ылтӑн + Троя унцийӗ ылтӑнпа + Троя унцийӗ ылтӑнпа + Троя унцийӗ ылтӑнпа + + + Европа сыпӑнчӑк единици + + + Европа укҫа единици + + + Европа тӳлев единици (XBС) + + + Европа тӳлев единици (XBD) + + + Тухӑҫ Кариб долларӗ + + + Кариб гульденӗ + + + ятарлӑ йышӑну прависем (СДР) + + + Европа валюта единици + + + Франци ылтӑн франкӗ + + + Франци UIC франкӗ + + + Анӑҫ Африка КФА франкӗ + + + паллади + Троя унцийӗ палладипе + Троя унцийӗ палладипе + Троя унцийӗ палладипе + + + КФП франкӗ + + + платина + Троя унцийӗ платинӑпа + Троя унцийӗ платинӑпа + Троя унцийӗ платинӑпа + + + RINET фонд единици + + + сукре + + + тӗрӗслев валют кочӗ + + + ADB тӳлев единици + + + паллӑ мар валюта + + + Йемен динарӗ + + + Йемен риалӗ + + + Югослави хытӑ динарӗ (1966–1990) + + + Югослави ҫӗнӗ динарӗ (1994–2002) + + + Югослави конверсиленекен динарӗ (1990–1992) + + + Югослави реформӑланӑ динарӗ (1992–1993) + + + Кӑнтӑр Африка рэнчӗ (финанс) + + + Кӑнтӑр Африка рэнчӗ + + + Замби квачи (1968–2012) + + + Замби квачи + + + Заир ҫӗнӗ заирӗ (1993–1998) + + + Заир заирӗ (1971–1993) + + + Зимбабве долларӗ (1980–2008) + + + Зимбабве ылтӑнӗ + + + Зимбабве долларӗ (2009–2024) + + + Зимбабве долларӗ (2008) + + + + ≈{0} + + + Пан улми ҫук. + {0} пан улми пур. Ӑна илесшӗн-и? + {0} пан улми пур. Вӗсене илесшӗн-и? + {0}-мӗш пан улми выртать. + + + + - д{0} + деци{0} - с{0} + санти{0} - м{0} + милли{0} - мк{0} + микро{0} - н{0} + нано{0} - п{0} + пико{0} - ф{0} + фемто{0} - а{0} + атто{0} - з{0} + зепто{0} - и{0} + иокто{0} - р{0} + ронто{0} - кв{0} + квекто{0} - да{0} + дека{0} - г{0} + гекто{0} - к{0} + кило{0} - М{0} + мега{0} - Г{0} + гига{0} - Т{0} + тера{0} - П{0} + пета{0} - Э{0} + экса{0} - З{0} + зетта{0} - И{0} + иотта{0} - Р{0} + ронна{0} - Кв{0} + кветта{0} - Ки{0} + киби{0} - Ми{0} + меби{0} - Ги{0} + гиби{0} - Ти{0} + теби{0} - Пи{0} + пеби{0} - Эи{0} + эксби{0} - Зи{0} + зеби{0} - Йи{0} + йоби{0} + + + тӑваткал {0} + тӑваткал {0} + тӑваткал {0} + + + куб {0} + куб {0} + куб {0} + + + {0}-{1} - g + ирӗклӗ ӳкни хӑвӑртланӑвӗ {0} g {0} g - {0} g + {0} ирӗклӗ ӳкни хӑвӑртланӑвӗ - м/ҫ² + метр/тӑваткал ҫеккунт {0} м/ҫ² {0} м/ҫ² - {0} м/ҫ² - - - çавра - {0} çавра - {0} çавра - {0} çавра + {0} метр/тӑваткал ҫеккунт - рад + радиан {0} рад {0} рад - {0} рад + {0} радиан - градус {0}° {0}° - {0}° + {0} градус - ′ + пӗкӗ минучӗ {0}′ {0}′ - {0}′ + {0} пӗкӗ минучӗ - ″ + пӗкӗ ҫеккунчӗ {0}″ {0}″ - {0}″ + {0} пӗкӗ ҫеккунчӗ - км² + тӑваткал километр {0} км² {0} км² - {0} км² - {0}/км² + {0} тӑваткал километр + {0}/тӑваткал километр - га + гектар {0} га {0} га - {0} га + {0} гектар - м² + тӑваткал метр {0} м² {0} м² - {0} м² - {0}/м² + {0} тӑваткал метр + {0}/тӑваткал метр - см² + тӑваткал сантиметр {0} см² {0} см² - {0} см² - {0}/см² + {0} тӑваткал сантиметр + {0}/тӑваткал сантиметр - ми² + тӑваткал миля {0} ми² {0} ми² - {0} ми² - {0}/ми² - - - акр - {0} акр - {0} акр - {0} акр + {0} тӑваткал миля + {0}/тӑваткал миля - ярд² + тӑваткал ярд {0} ярд² {0} ярд² - {0} ярд² + {0} тӑваткал ярд - фт² + тӑваткал фут {0} фт² {0} фт² - {0} фт² + {0} тӑваткал фут - дюйм² + тӑваткал дюйм {0} дюйм² {0} дюйм² - {0} дюйм² - {0}/дюйм² - - - дунам - {0} дунам - {0} дунам - {0} дунам + {0} тӑваткал дюйм + {0}/тӑваткал дюйм - кар + карат {0} кар {0} кар - {0} кар + {0} карат - мг/дл + миллиграмм/децилитр {0} мг/дл {0} мг/дл - {0} мг/дл + {0} миллиграмм/децилитр - ммоль/л + миллимоль/литр {0} ммоль/л {0} ммоль/л - {0} ммоль/л - - - япала - {0} япала - {0} япала - {0} япала - - - пай - {0} пай - {0} пай - {0} пай + {0} миллимоль/литр - млн⁻¹ + миллионмĕш пайĕ {0} млн⁻¹ {0} млн⁻¹ - {0} млн⁻¹ + {0} миллионмĕш пайĕ + процент {0} % {0} % - {0} % + {0} процент + промилле {0} ‰ {0} ‰ - {0} ‰ + {0} промилле + промириад {0} ‱ {0} ‱ - {0} ‱ - - - моль - {0} моль - {0} моль - {0} моль + {0} промириад - Глк + глюкоза {0} Глк {0} Глк - {0} Глк + {0} глюкоза - л/км + литр/километр {0} л/км {0} л/км - {0} л/км + {0} литр/километр - л/100 км + литр/100 километр {0} л/100 км {0} л/100 км - {0} л/100 км + {0} литр/100 километр - ми/гал + миля/галлон {0} ми/гал {0} ми/гал - {0} ми/гал + {0} миля/галлон - ми/имп. гал + миля/империлле галлон {0} ми/имп. гал {0} ми/имп. гал - {0} ми/имп. гал + {0} миля/империлле галлон - Пбайт + петабайт {0} Пбайт {0} Пбайт - {0} Пбайт + {0} петабайт - Тбайт + терабайт {0} Тбайт {0} Тбайт - {0} Тбайт + {0} терабайт - Тбит + терабит {0} Тбит {0} Тбит - {0} Тбит + {0} терабит - Гбайт + гигабайт {0} Гбайт {0} Гбайт - {0} Гбайт + {0} гигабайт - Гбит + гигабит {0} Гбит {0} Гбит - {0} Гбит + {0} гигабит - Мбайт + мегабайт {0} Мбайт {0} Мбайт - {0} Мбайт + {0} мегабайт - Мбит + мегабит {0} Мбит {0} Мбит - {0} Мбит + {0} мегабит - кбайт + килобайт {0} кбайт {0} кбайт - {0} кбайт + {0} килобайт - кбит + килобит {0} кбит {0} кбит - {0} кбит - - - байт - {0} байт - {0} байт - {0} байт - - - бит - {0} бит - {0} бит - {0} бит - - - ӗмӗр - {0} ӗмӗр - {0} ӗмӗр - {0} ӗмӗр + {0} килобит - вунӑ ҫ. + вунӑ ҫуллӑх {0} вунӑ ҫ. {0} вунӑ ҫ. - {0} вунӑ ҫ. - - - ҫул - {0} ҫул - {0} ҫул - {0} ҫул - {0}/ҫул + {0} вунӑ ҫуллӑх - чӗр. + чӗрӗк {0} чӗр. {0} чӗр. - {0} чӗр. - {0}/чӗр. - - - уйӑх - {0} уйӑх - {0} уйӑх - {0} уйӑх - {0}/уйӑх - - - эрне - {0} эрне - {0} эрне - {0} эрне - {0}/эрне - - - кун - {0} кун - {0} кун - {0} кун - {0}/кун + {0} чӗрӗк + {0}/чӗрӗк - сех + сехет {0} сех {0} сех - {0} сех - {0}/сех + {0} сехет + {0}/сехет - мин + минут {0} мин {0} мин - {0} мин - {0}/мин + {0} минут + {0}/минут - ҫ + ҫеккунт {0} ҫ {0} ҫ - {0} ҫ - {0}/ҫ + {0} ҫеккунт + {0}/ҫеккунт - мҫ + миллиҫеккунт {0} мҫ {0} мҫ - {0} мҫ + {0} миллиҫеккунт - мкҫ + микроҫеккунт {0} мкҫ {0} мкҫ - {0} мкҫ + {0} микроҫеккунт - нҫ + наноҫеккунт {0} нҫ {0} нҫ - {0} нҫ + {0} наноҫеккунт - А + ампер {0} А {0} А - {0} А + {0} ампер - мА + миллиампер {0} мА {0} мА - {0} мА + {0} миллиампер - Ом + ом {0} Ом {0} Ом - {0} Ом + {0} ом - В + вольт {0} В {0} В - {0} В + {0} вольт - ккал + килокалори {0} ккал {0} ккал - {0} ккал + {0} килокалори - кал + калори {0} кал {0} кал - {0} кал + {0} калори - кДж + килоджоуль {0} кДж {0} кДж - {0} кДж + {0} килоджоуль - Дж + джоуль {0} Дж {0} Дж - {0} Дж + {0} джоуль - кВт⋅сех + киловатт-сехет {0} кВт⋅сех {0} кВт⋅сех - {0} кВт⋅сех + {0} киловатт-сехет - эВ + электронвольт {0} эВ {0} эВ - {0} эВ + {0} электронвольт - БӐВ + Британи ӑшӑ виҫи {0} БӐВ {0} БӐВ - {0} БӐВ - - - АПШ термӗ - {0} АПШ термӗ - {0} АПШ термӗ - {0} АПШ термӗ + {0} Британи ӑшӑ виҫи - фнтв + фунт-вӑй {0} фнтв {0} фнтв - {0} фнтв + {0} фунт-вӑй + + + паундаль + {0} пдл + {0} пдл + {0} пдл - Н + ньютон {0} Н {0} Н - {0} Н + {0} ньютон + + + дин + {0} дин + {0} дин + {0} дин - кВт⋅сех/100 км + киловатт-сехет/100 километр {0} кВт⋅сех/100 км {0} кВт⋅сех/100 км - {0} кВт⋅сех/100 км + {0} киловатт-сехет/100 километр - ГГц + гигагерц {0} ГГц {0} ГГц - {0} ГГц + {0} гигагерц - МГц + мегагерц {0} МГц {0} МГц - {0} МГц + {0} мегагерц - кГц + килогерц {0} кГц {0} кГц - {0} кГц + {0} килогерц - Гц + герц {0} Гц {0} Гц - {0} Гц - - - эм - {0} эм - {0} эм - {0} эм + {0} герц - пкс + пиксель {0} пкс {0} пкс - {0} пкс + {0} пиксель - Мпкс + мегапиксель {0} Мпкс {0} Мпкс - {0} Мпкс + {0} мегапиксель - пкс/см + пиксель/сантиметр {0} пкс/см {0} пкс/см - {0} пкс/см + {0} пиксель/сантиметр - пкс/дюйм + пиксель/дюйм {0} пкс/дюйм {0} пкс/дюйм - {0} пкс/дюйм + {0} пиксель/дюйм + Ҫӗр радиусӗ {0} R⊕ {0} R⊕ - {0} R⊕ + {0} Ҫӗр радиусӗ - км + километр {0} км {0} км - {0} км - {0}/км + {0} километр + {0}/километр - м + метр {0} м {0} м - {0} м - {0}/м + {0} метр + {0}/метр - дм + дециметр {0} дм {0} дм - {0} дм + {0} дециметр - см + сантиметр {0} см {0} см - {0} см - {0}/см + {0} сантиметр + {0}/сантиметр - мм + миллиметр {0} мм {0} мм - {0} мм + {0} миллиметр - мкм + микрометр {0} мкм {0} мкм - {0} мкм + {0} микрометр - нм + нанометр {0} нм {0} нм - {0} нм + {0} нанометр - пм + пикометр {0} пм {0} пм - {0} пм - - - ми - {0} ми - {0} ми - {0} ми - - - ярд - {0} ярд - {0} ярд - {0} ярд + {0} пикометр + + + миля + {0} ми + {0} ми + {0} миля - фт + фут {0} фт {0} фт - {0} фт - {0}/фт + {0} фут + {0}/фут - - дюйм - {0} дюйм - {0} дюйм - {0} дюйм - {0}/дюйм + + мил + {0} мил + {0} мил + {0} мил - пк + парсек {0} пк {0} пк - {0} пк - - - ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ - {0} ҫутӑ ҫулӗ + {0} парсек - а. в. + астрономи виҫи {0} а. в. {0} а. в. - {0} а. в. + {0} астрономи виҫи - фрл + фурлонг {0} фрл {0} фрл - {0} фрл + {0} фурлонг - тинӗс хӑл. + тинӗс хӑлаҫӗ {0} тинӗс хӑл. {0} тинӗс хӑл. - {0} тинӗс хӑл. + {0} тинӗс хӑлаҫӗ - тинӗс ми + тинӗс мили {0} тинӗс ми {0} тинӗс ми - {0} тинӗс ми + {0} тинӗс мили - ск. ми + скандинави мили {0} ск. ми {0} ск. ми - {0} ск. ми + {0} скандинави мили - пкт + пункт {0} пкт {0} пкт - {0} пкт + {0} пункт + Хӗвел радиусӗ {0} R☉ {0} R☉ - {0} R☉ + {0} Хӗвел радиусӗ - лк + люкс {0} лк {0} лк - {0} лк + {0} люкс - кд + кандела {0} кд {0} кд - {0} кд + {0} кандела - лм + люмен {0} лм {0} лм - {0} лм + {0} люмен + + + Хӗвел ҫутатаслӑхӗ + {0} L☉ + {0} L☉ + {0} Хӗвел ҫутатаслӑхӗ - т + тонна {0} т {0} т - {0} т + {0} тонна - кг + килограмм {0} кг {0} кг - {0} кг - {0}/кг + {0} килограмм + {0}/килограмм - г + грамм {0} г {0} г - {0} г - {0}/г + {0} грамм + {0}/грамм - мг + миллиграмм {0} мг {0} мг - {0} мг + {0} миллиграмм - мкг + микрограмм {0} мкг {0} мкг - {0} мкг + {0} микрограмм - ам. тонна + америкӑлла тонна {0} ам. тонна {0} ам. тонна - {0} ам. тонна + {0} америкӑлла тонна - стн + стоун {0} стн {0} стн - {0} стн + {0} стоун - фнт + фунт {0} фнт {0} фнт - {0} фнт - {0}/фнт - - - унци - {0} унци - {0} унци - {0} унци - {0}/унци + {0} фунт + {0}/фунт - тр. унцийӗ + троя унцийӗ {0} тр. унц. {0} тр. унц. - {0} тр. унц. + {0} троя унцийӗ - кар + карат {0} кар {0} кар - {0} кар + {0} карат - Да + дальтон {0} Да {0} Да - {0} Да + {0} дальтон + Ҫӗр масси {0} M⊕ {0} M⊕ - {0} M⊕ + {0} Ҫӗр масси + Хӗвел масси {0} M☉ {0} M☉ - {0} M☉ - - - гран - {0} гран - {0} гран - {0} гран + {0} Хӗвел масси - ГВт + гигаватт {0} ГВт {0} ГВт - {0} ГВт + {0} гигаватт - МВт + мегаватт {0} МВт {0} МВт - {0} МВт + {0} мегаватт - кВт + киловатт {0} кВт {0} кВт - {0} кВт + {0} киловатт - Вт + ватт {0} Вт {0} Вт - {0} Вт + {0} ватт - мВт + милливатт {0} мВт {0} мВт - {0} мВт + {0} милливатт - л. в. + лаша вӑйӗ {0} л. в. {0} л. в. - {0} л. в. + {0} лаша вӑйӗ - мм ч. к. ю. + миллиметр чĕр кĕмĕл юпипе {0} мм ч. к. ю. {0} мм ч. к. ю. - {0} мм ч. к. ю. + {0} миллиметр чĕр кĕмĕл юпипе - ч. к. ю. + чĕр кĕмĕл юпипе {0} ч. к. ю. {0} ч. к. ю. - {0} ч. к. ю. + {0} чĕр кĕмĕл юпипе - фнтв/дюйм² + фунт-вӑй/тӑваткал дюйм {0} фнтв/дюйм² {0} фнтв/дюйм² - {0} фнтв/дюйм² + {0} фунт-вӑй/тӑваткал дюйм - дюйм ч. к. ю. + дюйм чĕр кĕмĕл юпипе {0} дюйм ч. к. ю. {0} дюйм ч. к. ю. - {0} дюйм ч. к. ю. - - - бар - {0} бар - {0} бар - {0} бар + {0} дюйм чĕр кĕмĕл юпипе - мбар + миллибар {0} мбар {0} мбар - {0} мбар + {0} миллибар - атм + атмосфера {0} атм {0} атм - {0} атм + {0} атмосфера - Па + паскаль {0} Па {0} Па - {0} Па + {0} паскаль - гПа + гектопаскаль {0} гПа {0} гПа - {0} гПа + {0} гектопаскаль - кПа + килопаскаль {0} кПа {0} кПа - {0} кПа + {0} килопаскаль - МПа + мегапаскаль {0} МПа {0} МПа - {0} МПа + {0} мегапаскаль - км/сех + километр/сехет {0} км/сех {0} км/сех - {0} км/сех + {0} километр/сехет - м/ҫ + метр/ҫеккунт {0} м/ҫ {0} м/ҫ - {0} м/ҫ + {0} метр/ҫеккунт - ми/сех + миля/сехет {0} ми/сех {0} ми/сех - {0} ми/сех + {0} миля/сехет - уз + узел {0} уз {0} уз - {0} уз + {0} узел - Бфт + Бофорт балӗ {0} Бфт {0} Бфт - {0} Бфт + {0} Бофорт балӗ + + + Цельсий градусĕ + {0}°C + {0}°C + {0} Цельсий градусĕ + + + Фаренгейт градусĕ + {0}°F + {0}°F + {0} Фаренгейт градусĕ - К + кельвин {0} К {0} К - {0} К + {0} кельвин - фнтв⋅фт + фунт-вӑй-фут {0} фнтв⋅фт {0} фнтв⋅фт - {0} фнтв⋅фт + {0} фунт-вӑй-фут - Н⋅м + ньютон-метр {0} Н⋅м {0} Н⋅м - {0} Н⋅м + {0} ньютон-метр - км³ + куб километр {0} км³ {0} км³ - {0} км³ + {0} куб километр - м³ + куб метр {0} м³ {0} м³ - {0} м³ - {0}/м³ + {0} куб метр + {0}/куб метр - см³ + куб сантиметр {0} см³ {0} см³ - {0} см³ - {0}/см³ + {0} куб сантиметр + {0}/куб сантиметр - ми³ + куб миля {0} ми³ {0} ми³ - {0} ми³ + {0} куб миля - ярд³ + куб ярд {0} ярд³ {0} ярд³ - {0} ярд³ + {0} куб ярд - фт³ + куб фут {0} фт³ {0} фт³ - {0} фт³ + {0} куб фут - дюйм³ + куб дюйм {0} дюйм³ {0} дюйм³ - {0} дюйм³ + {0} куб дюйм - Мл + мегалитр {0} Мл {0} Мл - {0} Мл + {0} мегалитр - гл + гектолитр {0} гл {0} гл - {0} гл + {0} гектолитр - л + литр {0} л {0} л - {0} л - {0}/л + {0} литр + {0}/литр - дл + децилитр {0} дл {0} дл - {0} дл + {0} децилитр - сл + сантилитр {0} сл {0} сл - {0} сл + {0} сантилитр - мл + миллилитр {0} мл {0} мл - {0} мл + {0} миллилитр - мпт + метрла пинт {0} мпт {0} мпт - {0} мпт + {0} метрла пинт - м. курка + метрла курка {0} м. курка {0} м. курка - {0} м. курка + {0} метрла курка - м. шӗвӗ унци + метрла шӗвӗ унци {0} м. шӗвӗ унци {0} м. шӗвӗ унци - {0} м. шӗвӗ унци + {0} метрла шӗвӗ унци - акр-фт + акр-фут {0} акр-фт {0} акр-фт - {0} акр-фт - - - бушель - {0} бушель - {0} бушель - {0} бушель + {0} акр-фут - ам. гал. + америкӑлла галлон {0} ам. гал. {0} ам. гал. - {0} ам. гал. - {0}/ам. гал. + {0} америкӑлла галлон + {0}/америкӑлла галлон - имп. гал. + империлле галлон {0} имп. гал. {0} имп. гал. - {0} имп. гал. - {0}/имп. гал. + {0} империлле галлон + {0}/империлле галлон - ам. кварт + америкӑлла кварт {0} ам. кварт {0} ам. кварт - {0} ам. кварт + {0} америкӑлла кварт - ам. пинт + америкӑлла пинт {0} ам. пинт {0} ам. пинт - {0} ам. пинт + {0} америкӑлла пинт - имп. пинт + империлле пинт {0} имп. пинт {0} имп. пинт - {0} имп. пинт + {0} империлле пинт - ам. курка + америкӑлла курка {0} ам. курка {0} ам. курка - {0} ам. курка + {0} америкӑлла курка - имп. курка + империлле курка {0} имп. курка {0} имп. курка - {0} имп. курка + {0} империлле курка - ам. шӗвӗ унци + америкӑлла шӗвӗ унци {0} ам. шӗвӗ унци {0} ам. шӗвӗ унци - {0} ам. шӗвӗ унци + {0} америкӑлла шӗвӗ унци - имп. шӗвӗ унц. + империлле шӗвӗ унци {0} имп. шӗвӗ унц. {0} имп. шӗвӗ унц. - {0} имп. шӗвӗ унц. + {0} империлле шӗвӗ унци - апат каш. + апат кашӑкӗ {0} апат каш. {0} апат каш. - {0} апат каш. + {0} апат кашӑкӗ - чей каш. + чей кашӑкӗ {0} чей каш. {0} чей каш. - {0} чей каш. + {0} чей кашӑкӗ - барр. + баррель {0} барр. {0} барр. - {0} барр. + {0} баррель - пыл. апат каш. + пылак апат кашӑкӗ {0} пыл. апат каш. {0} пыл. апат каш. - {0} пыл. апат каш. + {0} пылак апат кашӑкӗ - имп. пыл. апат каш. + империлле пылак апат кашӑкӗ {0} имп. пыл. апат каш. {0} имп. пыл. апат каш. - {0} имп. пыл. апат каш. + {0} империлле пылак апат кашӑкӗ - тумл. + тумлам {0} тумл. {0} тумл. - {0} тумл. + {0} тумлам - шӗвӗ др. + шĕвĕ драхма {0} шӗвӗ др. {0} шӗвӗ др. - {0} шӗвӗ др. - - - чӗркке - {0} чӗркке - {0} чӗркке - {0} чӗркке + {0} шӗвӗ драхма - чӗпт. + чĕптĕм {0} чӗпт. {0} чӗпт. - {0} чӗпт. + {0} чӗптӗм - имп. кварт + империлле кварт {0} имп. кварт {0} имп. кварт - {0} имп. кварт + {0} империлле кварт - ср + стерадиан {0} ср {0} ср - {0} ср + {0} стерадиан - кат + катал {0} кат {0} кат - {0} кат + {0} катал - Кл + кулон {0} Кл {0} Кл - {0} Кл + {0} кулон - Ф + фарад {0} Ф {0} Ф - {0} Ф + {0} фарад - Гн + генри {0} Гн {0} Гн - {0} Гн + {0} генри - См + сименс {0} См {0} См - {0} См + {0} сименс - кал-IT + калори-IT {0} кал-IT {0} кал-IT - {0} кал-IT + {0} калори-IT - БӐВ-IT + Британи ӑшӑ виҫи-IT {0} БӐВ-IT {0} БӐВ-IT - {0} БӐВ-IT + {0} Британи ӑшӑ виҫи-IT - Бк + беккерель {0} Бк {0} Бк - {0} Бк + {0} беккерель - Зв + зиверт {0} Зв {0} Зв - {0} Зв + {0} зиверт - Гр + грей {0} Гр {0} Гр - {0} Гр + {0} грей - кгв + килограмм-вӑй {0} кгв {0} кгв - {0} кгв - - - род - {0} род - {0} род - {0} род - - - чейн - {0} чейн - {0} чейн - {0} чейн + {0} килограмм-вӑй - Тл + тесла {0} Тл {0} Тл - {0} Тл - - - Вб - {0} Вб - {0} Вб - {0} Вб - - - {0} °R - {0} °R - {0} °R - - - икӗ эрн. - {0} икӗ эрн. - {0} икӗ эрн. - {0} икӗ эрн. - - - слаг - {0} слаг - {0} слаг - {0} слаг - - - бенз. тан. - {0} бенз. тан. - {0} бенз. тан. - {0} бенз. тан. - - - рин - {0} рин - {0} рин - {0} рин - - - сун - {0} сун - {0} сун - {0} сун - - - сяку - {0} сяку - {0} сяку - {0} сяку - - - кудзирадзяку - {0} кудзирадзяку - {0} кудзирадзяку - {0} кудзирадзяку - - - кэн - {0} кэн - {0} кэн - {0} кэн + {0} тесла - - дзё - {0} дзё - {0} дзё - {0} дзё + + вебер + {0} Вб + {0} Вб + {0} вебер - - ри - {0} ри - {0} ри - {0} ри + + Ранкин градусӗ + {0} °R + {0} °R + {0} Ранкин градусӗ - - бу - {0} бу - {0} бу - {0} бу + + икӗ эрнелӗх + {0} икӗ эрн. + {0} икӗ эрн. + {0} икӗ эрнелӗх - - сэ - {0} сэ - {0} сэ - {0} сэ + + бензин танлӑхӗпе + {0} бенз. тан. + {0} бенз. тан. + {0} бензин танлӑхӗпе - - тё - {0} тё - {0} тё - {0} тё + + миллиардмĕш пайĕ + {0} млрд⁻¹ + {0} млрд⁻¹ + {0} миллиардмĕш пайĕ - - косадзи - {0} косадзи - {0} косадзи - {0} косадзи + + тухӑҫ еннелле {0} + ҫур ҫӗр еннелле {0} + кӑнтӑр еннелле {0} + анӑҫ еннелле {0} + + + + + д{0} + + + с{0} + + + м{0} + + + мк{0} + + + н{0} + + + п{0} + + + ф{0} + + + а{0} + + + з{0} + + + и{0} + + + р{0} + + + кв{0} + + + да{0} + + + г{0} + + + к{0} + + + М{0} + + + Г{0} + + + Т{0} + + + П{0} + + + Э{0} + + + З{0} + + + И{0} + + + Р{0} + + + Кв{0} + + + Ки{0} + + + Ми{0} + + + Ги{0} + + + Ти{0} + + + Пи{0} + + + Эи{0} + + + Зи{0} + + + Йи{0} + + + g + {0} g + {0} g + {0} g - - осадзи - {0} осадзи - {0} осадзи - {0} осадзи + + м/ҫ² + {0} м/ҫ² + {0} м/ҫ² + {0} м/ҫ² - - каппу - {0} каппу - {0} каппу - {0} каппу + + çавра + {0} çавра + {0} çавра + {0} çавра - - секи - {0} секи - {0} секи - {0} секи + + рад + {0} рад + {0} рад + {0} рад - - сай - {0} сай - {0} сай - {0} сай + + градус - - то - {0} то - {0} то - {0} то + + ′ - - коку - {0} коку - {0} коку - {0} коку + + ″ - - ҫутӑ - {0} ҫутӑ - {0} ҫутӑ - {0} ҫутӑ + + км² + {0} км² + {0} км² + {0} км² + {0}/км² - - фун - {0} фун - {0} фун - {0} фун + + га + {0} га + {0} га + {0} га - - млрд⁻¹ - {0} млрд⁻¹ - {0} млрд⁻¹ - {0} млрд⁻¹ + + м² + {0} м² + {0} м² + {0} м² + {0}/м² - - каҫ - {0} каҫ - {0} каҫ - {0} каҫ - {0}/каҫ + + см² + {0} см² + {0} см² + {0} см² + {0}/см² - - ен - т. е. {0} - ҫ. е. {0} - к. е. {0} - а. е. {0} - - - - - {0} g - {0} g - {0} g + + ми² + {0} ми² + {0} ми² + {0} ми² + {0}/ми² - - рад - {0} рад - {0} рад - {0} рад + + акр + {0} акр + {0} акр + {0} акр - - {0}° - {0}° - {0}° + + ярд² + {0} ярд² + {0} ярд² + {0} ярд² - - ′ - {0}′ - {0}′ - {0}′ + + фт² + {0} фт² + {0} фт² + {0} фт² - - ″ - {0}″ - {0}″ - {0}″ + + дюйм² + {0} дюйм² + {0} дюйм² + {0} дюйм² + {0}/дюйм² + + + дунам + {0} дунам + {0} дунам + {0} дунам кар @@ -16063,6 +9324,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} кар {0} кар + + мг/дл + {0} мг/дл + {0} мг/дл + {0} мг/дл + + + ммоль/л + {0} ммоль/л + {0} ммоль/л + {0} ммоль/л + япала {0} япала @@ -16096,100 +9369,241 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ‱ {0} ‱ + + моль + {0} моль + {0} моль + {0} моль + Глк {0} Глк {0} Глк {0} Глк + + л/км + {0} л/км + {0} л/км + {0} л/км + + + л/100 км + {0} л/100 км + {0} л/100 км + {0} л/100 км + + + ми/гал + {0} ми/гал + {0} ми/гал + {0} ми/гал + ми/имп. гал + {0} ми/имп. гал + {0} ми/имп. гал + {0} ми/имп. гал - ПБ + Пбайт {0} Пбайт {0} Пбайт - {0} ПБ + {0} Пбайт - ТБ + Тбайт {0} Тбайт {0} Тбайт - {0} ТБ + {0} Тбайт - Тб + Тбит {0} Тбит {0} Тбит - {0} Тб + {0} Тбит - ГБ + Гбайт {0} Гбайт {0} Гбайт - {0} ГБ + {0} Гбайт - Гб + Гбит {0} Гбит {0} Гбит - {0} Гб + {0} Гбит - МБ + Мбайт {0} Мбайт {0} Мбайт - {0} МБ + {0} Мбайт - Мб + Мбит {0} Мбит {0} Мбит - {0} Мб + {0} Мбит - кБ + кбайт {0} кбайт {0} кбайт - {0} кБ + {0} кбайт - кб + кбит {0} кбит {0} кбит - {0} кб + {0} кбит - Б + байт {0} байт {0} байт - {0} Б + {0} байт + + + бит + {0} бит + {0} бит + {0} бит + + + ӗмӗр + {0} ӗмӗр + {0} ӗмӗр + {0} ӗмӗр + + + вунӑ ҫ. + {0} вунӑ ҫ. + {0} вунӑ ҫ. + {0} вунӑ ҫ. + + + ҫул + {0} ҫул + {0} ҫул + {0} ҫул + {0}/ҫул + + + чӗр. + {0} чӗр. + {0} чӗр. + {0} чӗр. + {0}/чӗр. + + + уйӑх + {0} уйӑх + {0} уйӑх + {0} уйӑх + {0}/уйӑх + + + эрне + {0} эрне + {0} эрне + {0} эрне + {0}/эрне + + + кун + {0} кун + {0} кун + {0} кун + {0}/кун + + + сех + {0} сех + {0} сех + {0} сех + {0}/сех + + + мин + {0} мин + {0} мин + {0} мин + {0}/мин + + + ҫ + {0} ҫ + {0} ҫ + {0} ҫ + {0}/ҫ + + + мҫ + {0} мҫ + {0} мҫ + {0} мҫ + + + мкҫ + {0} мкҫ + {0} мкҫ + {0} мкҫ + + + нҫ + {0} нҫ + {0} нҫ + {0} нҫ + + + А + {0} А + {0} А + {0} А + + + мА + {0} мА + {0} мА + {0} мА + + + Ом + {0} Ом + {0} Ом + {0} Ом + + + В + {0} В + {0} В + {0} В - - вунӑ ҫ. - {0} вунӑ ҫ. - {0} вунӑ ҫ. - {0} вунӑ ҫ. + + ккал + {0} ккал + {0} ккал + {0} ккал - - ҫул - {0} ҫул - {0} ҫул - {0} ҫул + + кал + {0} кал + {0} кал + {0} кал - - чӗр. - {0} чӗр. - {0} чӗр. - {0} чӗр. - {0}/чӗр. + + кДж + {0} кДж + {0} кДж + {0} кДж - - сех - {0} сех - {0} сех - {0} сех - {0}/сех + + Дж + {0} Дж + {0} Дж + {0} Дж кВт⋅сех @@ -16197,6 +9611,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} кВт⋅сех {0} кВт⋅сех + + эВ + {0} эВ + {0} эВ + {0} эВ + БӐВ {0} БӐВ @@ -16215,23 +9635,172 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} фнтв {0} фнтв + + пдл + {0} пдл + {0} пдл + {0} пдл + + + Н + {0} Н + {0} Н + {0} Н + + + дин + {0} дин + {0} дин + {0} дин + кВт⋅сех/100 км {0} кВт⋅сех/100 км {0} кВт⋅сех/100 км {0} кВт⋅сех/100 км + + ГГц + {0} ГГц + {0} ГГц + {0} ГГц + + + МГц + {0} МГц + {0} МГц + {0} МГц + + + кГц + {0} кГц + {0} кГц + {0} кГц + + + Гц + {0} Гц + {0} Гц + {0} Гц + + + эм + {0} эм + {0} эм + {0} эм + пкс + {0} пкс + {0} пкс + {0} пкс Мпкс + {0} Мпкс + {0} Мпкс + {0} Мпкс - - R⊕ - {0} R⊕ - {0} R⊕ - {0} R⊕ + + пкс/см + {0} пкс/см + {0} пкс/см + {0} пкс/см + + + пкс/дюйм + {0} пкс/дюйм + {0} пкс/дюйм + {0} пкс/дюйм + + + км + {0} км + {0} км + {0} км + {0}/км + + + м + {0} м + {0} м + {0} м + {0}/м + + + дм + {0} дм + {0} дм + {0} дм + + + см + {0} см + {0} см + {0} см + {0}/см + + + мм + {0} мм + {0} мм + {0} мм + + + мкм + {0} мкм + {0} мкм + {0} мкм + + + нм + {0} нм + {0} нм + {0} нм + + + пм + {0} пм + {0} пм + {0} пм + + + ми + {0} ми + {0} ми + {0} ми + + + ярд + {0} ярд + {0} ярд + {0} ярд + + + фт + {0} фт + {0} фт + {0} фт + {0}/фт + + + дюйм + {0} дюйм + {0} дюйм + {0} дюйм + {0}/дюйм + + + мил + {0} мил + {0} мил + {0} мил + + + пк + {0} пк + {0} пк + {0} пк ҫутӑ ҫулӗ @@ -16247,6 +9816,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic фрл + {0} фрл + {0} фрл + {0} фрл тинӗс хӑл. @@ -16266,11 +9838,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ск. ми {0} ск. ми - - R☉ - {0} R☉ - {0} R☉ - {0} R☉ + + пкт + {0} пкт + {0} пкт + {0} пкт + + + лк + {0} лк + {0} лк + {0} лк + + + кд + {0} кд + {0} кд + {0} кд + + + лм + {0} лм + {0} лм + {0} лм т @@ -16278,6 +9868,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} т {0} т + + кг + {0} кг + {0} кг + {0} кг + {0}/кг + + + г + {0} г + {0} г + {0} г + {0}/г + + + мг + {0} мг + {0} мг + {0} мг + + + мкг + {0} мкг + {0} мкг + {0} мкг + ам. тонна {0} ам. тонна @@ -16297,6 +9913,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} фнт {0}/фнт + + унци + {0} унци + {0} унци + {0} унци + {0}/унци + тр. унцийӗ {0} тр. унц. @@ -16315,20 +9938,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Да {0} Да - - M⊕ - {0} M⊕ - {0} M⊕ - {0} M⊕ + + гран + {0} гран + {0} гран + {0} гран - - M☉ - {0} M☉ - {0} M☉ - {0} M☉ + + ГВт + {0} ГВт + {0} ГВт + {0} ГВт - Мвт + МВт + {0} МВт + {0} МВт + {0} МВт кВт @@ -16336,6 +9962,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} кВт {0} кВт + + Вт + {0} Вт + {0} Вт + {0} Вт + + + мВт + {0} мВт + {0} мВт + {0} мВт + л. в. {0} л. в. @@ -16364,7 +10002,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic дюйм ч. к. ю. {0} дюйм ч. к. ю. {0} дюйм ч. к. ю. - ч.ю. {0} дюйм + {0} дюйм ч. к. ю. + + + бар + {0} бар + {0} бар + {0} бар + + + мбар + {0} мбар + {0} мбар + {0} мбар атм @@ -16372,12 +10022,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} атм {0} атм + + Па + {0} Па + {0} Па + {0} Па + + + гПа + {0} гПа + {0} гПа + {0} гПа + + + кПа + {0} кПа + {0} кПа + {0} кПа + + + МПа + {0} МПа + {0} МПа + {0} МПа + км/сех {0} км/сех {0} км/сех {0} км/сех + + м/ҫ + {0} м/ҫ + {0} м/ҫ + {0} м/ҫ + ми/сех {0} ми/сех @@ -16396,18 +10076,111 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Бфт {0} Бфт + + К + {0} К + {0} К + {0} К + фнтв⋅фт {0} фнтв⋅фт {0} фнтв⋅фт {0} фнтв⋅фт + + Н⋅м + {0} Н⋅м + {0} Н⋅м + {0} Н⋅м + + + км³ + {0} км³ + {0} км³ + {0} км³ + + + м³ + {0} м³ + {0} м³ + {0} м³ + {0}/м³ + + + см³ + {0} см³ + {0} см³ + {0} см³ + {0}/см³ + + + ми³ + {0} ми³ + {0} ми³ + {0} ми³ + + + ярд³ + {0} ярд³ + {0} ярд³ + {0} ярд³ + + + фт³ + {0} фт³ + {0} фт³ + {0} фт³ + + + дюйм³ + {0} дюйм³ + {0} дюйм³ + {0} дюйм³ + Мл {0} Мл {0} Мл {0} Мл + + гл + {0} гл + {0} гл + {0} гл + + + л + {0} л + {0} л + {0} л + {0}/л + + + дл + {0} дл + {0} дл + {0} дл + + + сл + {0} сл + {0} сл + {0} сл + + + мл + {0} мл + {0} мл + {0} мл + + + мпт + {0} мпт + {0} мпт + {0} мпт + м. курка {0} м. курка @@ -16500,6 +10273,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} чей каш. {0} чей каш. + + барр. + {0} барр. + {0} барр. + {0} барр. + пыл. апат каш. {0} пыл. апат каш. @@ -16524,6 +10303,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} шӗвӗ др. {0} шӗвӗ др. + + чӗркке + {0} чӗркке + {0} чӗркке + {0} чӗркке + чӗпт. {0} чӗпт. @@ -16790,6 +10575,94 @@ CLDR data files are interpreted according to the LDML specification (http://unic а. е. {0} + + + ПБ + {0} Пбайт + {0} Пбайт + {0} ПБ + + + ТБ + {0} Тбайт + {0} Тбайт + {0} ТБ + + + Тб + {0} Тбит + {0} Тбит + {0} Тб + + + ГБ + {0} Гбайт + {0} Гбайт + {0} ГБ + + + Гб + {0} Гбит + {0} Гбит + {0} Гб + + + МБ + {0} Мбайт + {0} Мбайт + {0} МБ + + + Мб + {0} Мбит + {0} Мбит + {0} Мб + + + кБ + {0} кбайт + {0} кбайт + {0} кБ + + + кб + {0} кбит + {0} кбит + {0} кб + + + Б + {0} байт + {0} байт + {0} Б + + + пдл + {0} пдл + {0} пдл + {0} пдл + + + дин + {0} дин + {0} дин + {0} дин + + + мил + {0} мил + {0} мил + {0} мил + + + Мвт + + + {0} дюйм ч. к. ю. + {0} дюйм ч. к. ю. + ч.ю. {0} дюйм + + @@ -16828,21 +10701,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} — тӗрлӗрен {0} — ыттисем сӗрме купӑссем — {0} - {0} штриха - {0} штриха - {0} штриха + {0} йӗр + {0} йӗр + {0} йӗр сроклӑ индекс {0} ҫӳлти индекс {0} активлӑх Африка ҫырулӑхӗ Америка ҫырулӑхӗ - выльӑх - выльӑх е ҫутҫанталӑк + выльӑх-чӗрлӗх + выльӑх-чӗрлӗх е ҫут ҫанталӑк стрелка ӳт-пӳ тӳркӗтеслӗх Брайль шрифчӗпе - ҫурт + ҫурт-йӗр пуля е ҫӑлтӑр хупӑ та уҫӑ сасӑсем валюта символӗ @@ -16852,13 +10725,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic юмӑҫ символӗ йӗппи аялалла йӗппи аялалла ҫӳлелле - Тухӑҫ алфавичӗ + Тухӑҫ Ази ҫырулӑхӗ эмодзи Европа ҫырулӑхӗ - хӗрарӑм + хӗр арӑм ялав ялавсем - ҫимелли + ӗҫме-ҫиме формат форматпа пробелӑсем экран сарлакӑшӗ @@ -16872,53 +10745,53 @@ CLDR data files are interpreted according to the LDML specification (http://unic чӗре историлле шрифт идеографи сӑнав палли - Япони канӗ + япон кани камбун (китай ҫырӑвӗ) - кандзи (иероглиф) + кандзи брелок стрелка сулахаялла стрелка сулахаялла сылтӑмалла саспалли символӗ пӳлӗнчӗк усӑ курни - арҫын + ар ҫын математика символӗ Ҫывӑх Хӗвелтухӑҫ чӗлхисем тӗрлӗрен - хальхи шрифт + хальхи ҫырулӑхӗ модификатор - музыка символӗ - ҫутҫанталӑк + юрӑ-кӗвӗ палли + ҫут ҫанталӑк пробелӑсӑр цифрӑсем - объект - урӑх + япала + урӑххи мӑшӑр ҫын фонетика алфавичӗ пиктограмма вырӑн - ӳсентӑран + ӳсен-тӑран пунктуаци стрелка сылтӑмалла символ е паллӑ пӗчӗк вариантсем смайлик смайлик е ҫын - Кӑнтӑр Азири чӗлхесем - Кӑнтӑр-Хӗвелтухӑҫ Ази чӗлхисем + Кӑнтӑр Ази ҫырулӑхӗ + Кӑнтӑр Анӑҫ Ази ҫырулӑхӗ интервал спорт символ техника символӗ тонна палли - ҫулҫӳрев - ҫулҫӳрев е вырӑн + ҫул ҫӳрев + ҫул ҫӳрев е вырӑн стрелоксем ҫӳлелле вариант уҫӑ сасӑ ҫанталӑк Анӑҫ Ази ҫырулӑхӗ - пробел + пушлӑх тайлӑк diff --git a/make/data/cldr/common/main/cy.xml b/make/data/cldr/common/main/cy.xml index 9dfc29f16f9b..3236eb977158 100644 --- a/make/data/cldr/common/main/cy.xml +++ b/make/data/cldr/common/main/cy.xml @@ -790,7 +790,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Grenada Georgia Guyane Ffrengig - Ynys y Garn + Guernsey Ghana Gibraltar Yr Ynys Las @@ -1010,15 +1010,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Calendr Fformat Arian + Anwybyddu Trefnu yn ôl Symbolau + Trefnu yn ôl Acen Am Yn Ôl + Trefnu yn ôl Priflythrennau/Llythrennau Bychain + Trefnu sy’n Sensitif i Lythrennau Trefn - Math o Arian + Trefnu Arferol + Trefnu Rhifol + Aildrefnu Sgript/Bloc + Cryfder Trefnu + Arian cyfred + Trawsnewid Cyrchfan + Eithriadau Toriadau Geiriadur Cyflwyniad Emoji + Diwrnod cyntaf yr wythnos + Wedi cymysgu Cylched Awr (12 vs 24) + Dull Mewnbwn + Bysellfwrdd + Anwybyddu’r Uchaf Arddull Toriad Llinell Toriadau Llinell o fewn Geiriau + Rheolau Trawsnewid System Fesur + Uned Mesur Rhifau + Rhanbarth ar gyfer Data Atodol + Trawsnewid Ffynhonnell + Israniad Rhanbarth Toriad Brawddeg ar ôl Byrfodd + Trawsnewid + Cyfieithiad Peirianyddol + Cylchfa Amser + Amrywiad Lleoliad + Defnydd Preifat + Trawsnewid Defnydd Preifat Calendr Bwdaidd @@ -1038,13 +1064,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Calendr Hebreaidd Hebreaidd Calendr Cenedlaethol India + Cenedlaethol Indiaidd Calendr Hijri Hijri Calendr Hijri (tabl, cyfnod sifil) Hijri (tabl, cyfnod sifil) + Gweld Hijri, Sawdi Arabia + Hijri (cyfnod seryddol, tablaidd) Calendr Hijri (Umm al-Qura) Hijri (Umm al-Qura) Calendr ISO-8601 + Gregoraidd Calendr Japan Japaneaidd Calendr Persia @@ -1055,21 +1085,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cyfrifeg Fformat Arian Safonol Safonol + Llythrennau Bychain + Llythrennau Bychain + Priflythrennau + Cydweddoldeb Trefn Geiriadur + Geiriadur Trefn Rhagosodedig Unicode Unicode Rhagosodedig + Emoji Rheolau trefnu Ewropeaidd + Rheolau Ewropeaidd Trefn Llyfr Ffôn + Llyfr ffôn + Ffonetig Trefn Pinyin + Pinyin Chwilio at Ddibenion Cyffredinol Chwilio + Cytsain gyntaf Corëeg Trefn Safonol Safonol + Trawiad Trefn Traddodiadol + Traddodiadol + Trawiadau Radical Trefn Zhuyin + Zhuyin + Arian cyfred + Digidau + Atalnodi + Bwlch gwyn + Symbol + Y cyfan + Llythrennau Sylfaen yn Unig + Sylfaen, Acenion, Prif Lythrennau/Llythrennau Bychain, Amrywiannau, Cana + Sylfaen, Acenion + Sylfaen, Acenion, Prif Lythrennau/Llythrennau Bychain, Amrywiannau + I Led Llawn + I Hanner Lled Rhagosodedig Emoji Testun + System 12 Awr + 12 + System 24 Awr + 24 System 12 Awr (0–11) 12 (0–11) System 12 Awr (1–12) @@ -1078,6 +1139,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) System 24 Awr (1–24) 24 (1–24) + Shift Spaces, atalnodi, pob symbol + Shift spaces, atalnodi + Shift spaces, atalnodi + Shift spaces, atalnodi, symbolau nad ydynt yn arian cyfred Arddull Toriad Llinell Rhydd Rhydd Arddull Toriad Llinell Arferol @@ -1088,6 +1153,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cadw’r cyfan Normal Cadw mewn brawddegau + Trawslythreniad US BGN + Trawslythreniad UN GEGN System Fetrig Metrig System Fesur Imperialaidd @@ -1096,49 +1163,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ UDA Digidau Arabig-Indig Digidau Arabig-Indig Estynedig + Arabig-Indig Estynedig Rhifolion Armenaidd Rhifolion Armenaidd mewn Llythrennau Bychain + Llythrennau Bychain Armenaidd Digidau Bengalaidd Digidau Chakma Digidau Devanagarig Rhifolion Ethiopig + Ariannol Digidau Lled Llawn + Lled llawn Rhifolion Georgaidd Rhifolion Groegaidd Rhifolion Groegaidd mewn Llythrennau Bychain + Llythrennau Bychain Groegaidd Digidau Gwjarataidd Digidau Gwrmwcaidd + Rhifo diwrnod y mis gyda nod Han ar gyfer calendrau traddodiadol Rhifolion Degol Tsieineaidd + System degol gosodiadol yn defnyddio ideograffau rhif Tsieineaidd fel digidau Rhifolion Tsieineaidd Symledig Rhifolion Ariannol Tsieineaidd Symledig + Ariannol Tsieineaidd Symledig Rhifolion Tsieineaidd Traddodiadol Rhifolion Ariannol Tsieineaidd Traddodiadol + Ariannol Tsieineaidd Traddodiadol Rhifolion Hebreig Digidau Jafanaidd Rhifolion Japaneaidd Rhifolion Ariannol Japaneaidd + Ariannol Japaneaidd + Rhifo Gannen blwyddyn gyntaf Japaneaidd Digidau Chmeraidd Digidau Kannaraidd + Tai Tham Tham (eglwysig) Digidau Laoaidd Digidau Gorllewinol + Trwm mathemategol + Double-struck mathemategol + Monospace mathemategol + Sans-serif trwm mathemategol + Sans-serif mathemategol Digidau Malayalamaidd Digidau Mongolia Digidau Meetei Mayek Digidau Myanmar + Pwo Karen Dwyreiniol Myanmar + Pao Myanmar + Shan Myanmar + Tai Laing Myanmar + Digidau Brodorol + Digidau brodorol Ol Chiki Digidau Digidau Orïaidd + Wedi’i amlinellu Rhifolion Rhufeinig + Priflythrennau Rhufeinig Rhifolion Rhufeinig mewn Llythrennau Bychain + Llythrennau Bychain Rhufeinig + Wedi’i segmentu Digidau Takri Rhifolion Tamilaidd Traddodiadol Digidau Tamilaidd + Tamilaidd Modern Digidau Telugu Digidau Thai Digidau Tibetaidd + Rhifolion traddodiadol Digidau Vai Wedi’i ddiffodd Ymlaen + Cyfieithu Peirianyddol Heb ei Nodi + Amrywiad POSIX + + Wedi’i ddiffodd + Ymlaen + Metrig DU @@ -1220,8 +1322,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm:ss a y G M/y G - M/d/y GGGGG - E, M/d/y G + d/M/y GGGGG + E, d/M/y G MMM y G d MMM y G E, d MMM y G @@ -1234,16 +1336,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMMM y G y G + M/y G + d/M/y G + E, d/M/y G MMM y G d MMM y G E, d MMM y G + MMMM y G QQQ y G QQQQ y G + + {0}–{1} + {0}–{1} + d – d + + y G – y G + y – y G + + + M/y G – M/y G + M/y – M/y G + M/y – M/y G + + + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G + + + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + + + MMM y G – MMM y G + MMM – MMM y G + MMM y – MMM y G + + + MMM d – d, y G + d MMM y G – d MMM y G + d MMM – d MMM y G + d MMM y – d MMM y G + + + E, d MMM – E, d MMM y G + h a – h a h – h a @@ -1301,22 +1446,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d – d MMMM + d MMMM – d MMMM + y–y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y G + M/y – M/y G - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G MMM – MMM y G @@ -1413,6 +1562,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Gwen Sad + + Su + Ll + Ma + Me + I + G + Sa + Su Ll @@ -1443,13 +1601,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sad - S + Su Ll - M - M + Ma + Me I G - S + Sa @@ -1574,6 +1732,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1625,11 +1786,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, HH:mm:ss y G M/y G - M/d/y GGGGG - E, M/d/y G + d/M/y GGGGG + E, d/M/y G MMM y G d MMM y G E, d MMM y G + MMMM y G + d, MMMM, y G + E, d MMMM, y G h:mm a h:mm:ss a h:mm:ss a v @@ -1638,6 +1802,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d/M d MMM E, d MMM + d MMMM + E, d MMMM 'wythnos' W 'o' MMMM 'wythnos' W 'o' MMMM 'wythnos' W 'o' MMMM @@ -1651,6 +1817,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y Q y QQQ y QQQQ y @@ -1661,7 +1829,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'wythnos' w 'o' Y 'wythnos' w 'o' Y + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + + + y G – y G + y – y G + + + M/y G – M/y G + M/y – M/y G + M/y – M/y G + + + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G + + + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + + + MMM y G – MMM y G + MMM – MMM y G + MMM y – MMM y G + + + d – d MMM y G + d MMM y G – d MMM y G + d MMM – d MMM y G + d MMM y –d MMM y G + + + E, d MMM – E, d MMM y G + E, d MMM y G – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G + h – h a @@ -1717,6 +1931,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d – d MMMM + d MMMM – d MMMM + + + y – y + M/y – M/y M/y – M/y @@ -2605,24 +2826,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ffaro - - Amser Haf Prydain - Llundain Tiflis - - Ynys y Garn + + Athen De Georgia - - Amser Safonol Iwerddon - Dulyn @@ -2658,14 +2873,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Merida - - Gasa - Bwcarést - Caergystennin + Istanbwl Kiev @@ -2691,6 +2903,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dinas Hô Chi Minh + + + Amser Acrys + Amser Safonol Acrys + Amser Haf Acrys + + Amser Afghanistan @@ -2866,6 +3085,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amser Haf Brasília + + + Amser Prydain + Amser Haf Prydain + + Amser Brunei Darussalam @@ -3057,6 +3282,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Amser yr Ynys Las + Amser Safonol yr Ynys Las + Amser Haf yr Ynys Las + + Amser Dwyrain yr Ynys Las @@ -3083,7 +3315,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Amser Safonol Hawaii-Aleutian + Amser Hawaii @@ -3144,6 +3376,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amser Haf Iran + + + Amser Iwerddon + Amser Safonol Iwerddon + + Amser Irkutsk @@ -3165,6 +3403,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amser Haf Japan + + + Amser Kamchatka + Amser Safonol Kamchatka + Amser Haf Kamchatka + + Amser Kazakhstan @@ -3407,7 +3652,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Amser Pyongyang + Amser Gogledd Korea @@ -3436,9 +3681,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Amser Samoa Amser Safonol Samoa - Amser Haf Samoa @@ -3478,9 +3721,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Amser Taipei - Amser Safonol Taipei - Amser Haf Taipei + Amser Taiwan + Amser Safonol Taiwan + Amser Haf Taiwan @@ -3505,6 +3748,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amser Chuuk + + + Amser Türkiye + Amser Safonol Türkiye + Amser Haf Türkiye + + Amser Tyrcmenistan @@ -3524,6 +3774,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amser Haf Uruguay + + + Amser Ürümqi + + Amser Uzbekistan @@ -3615,33 +3870,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 000K 000K 000 mil + 0M 0 miliwn + 0M + 0M + 0M 0 miliwn + 00M 00 miliwn + 00M + 00M + 00M 00 miliwn + 000M 000 miliwn + 000M + 000M + 000M 000 miliwn + 0B 0 biliwn + 0B + 0B + 0B 0 biliwn + 00B 00 biliwn + 00B + 00B + 00B 00 biliwn + 000B 000 biliwn + 000B + 000B + 000B 000 biliwn + 0T 0 triliwn + 0T + 0T + 0T 0 triliwn + 00T 00 triliwn + 00T + 00T + 00T 00 triliwn + 000T 000T + 000T + 000T + 000T 000 triliwn + 0B 0B + 0B + 0B + 0B 0B + 00B 00B + 00B + 00B + 00B 00B + 000B 000B + 000B + 000B + 000B 000B @@ -4350,15 +4653,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yuan Tsieina (ar y môr) yuan Tsieina (ar y môr) - - Doler Banc Pobl Tsieina - doler Banc Pobl Tsieina - ddoler Banc Pobl Tsieina - ddoler Banc Pobl Tsieina - doler Banc Pobl Tsieina - doler Banc Pobl Tsieina - doler Banc Pobl Tsieina - Yuan Tsieina yuan Tsieina @@ -5986,12 +6280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ guilder Caribïaidd - guilder Caribïaidd - guilder Caribïaidd - guilder Caribïaidd - guilder Caribïaidd - guilder Caribïaidd - guilder Caribïaidd Uned Arian Cyfred Ewropeaidd @@ -6130,12 +6418,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold - Zimbabwean Gold Doler Zimbabwe (2009) @@ -6166,12 +6448,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} chi, {0} cath {0} chi, {0} chath {0} ci, {0} cath - {0}ydd ci - {0}ed ci - ci {0}af - ci rhif {0} - {0}il gi {0}fed ci + Cymerwch y troad {0}af ar y dde. + Cymerwch yr {0}il droad ar y dde + Cymerwch y {0}ydd troad ar y dde. + {0}ed ci + Cymerwch droad rhif {0} ar y dde. @@ -6443,7 +6725,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} milimôl y litr - rhan {0} rhan {0} rhan {0} ran @@ -8801,21 +9082,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} kt {0}kt - - rhan - {0} rhan - {0} rhan - {0} rhan - {0} rhan - {0} rhan - {0} rhan - % - - Glc - L/km {0}L/km @@ -9453,9 +9722,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg {0}mmHg - - o Hg - {0}psi {0}psi @@ -9679,11 +9945,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Imp gal {0} gal Imp. - {0}galIm + {0}gal-Im {0} gal Imp. {0} gal Imp. {0} gal Imp. - {0}galIm + {0}gal-Im {0}/galIm @@ -9722,11 +9988,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} tbsp - {0}tbsp + {0} Llond llwy fwrdd {0} tbsp {0} tbsp {0} tbsp - {0}tbsp + {0} Llond llwy fwrdd dsp Imp @@ -9780,89 +10046,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt Imp. {0}qt-Imp. - - {0} sr - {0} sr - {0} sr - {0} sr - {0} sr - {0} sr - - - {0} C - {0} C - {0} C - {0} C - {0} C - {0} C - - - {0} F - {0} F - {0} F - {0} F - {0} F - {0} F - - - {0} H - {0} H - {0} H - {0} H - {0} H - {0} H - - - {0} S - {0} S - {0} S - {0} S - {0} S - {0} S - - - cal-IT - - - {0} Bq - {0} Bq - {0} Bq - {0} Bq - {0} Bq - {0} Bq - - - {0} Sv - {0} Sv - {0} Sv - {0} Sv - {0} Sv - {0} Sv - - - {0} Gy - {0} Gy - {0} Gy - {0} Gy - {0} Gy - {0} Gy - - - {0} T - {0} T - {0} T - {0} T - {0} T - {0} T - - - {0} Wb - {0} Wb - {0} Wb - {0} Wb - {0} Wb - {0} Wb - {0} golau {0} golau diff --git a/make/data/cldr/common/main/da.xml b/make/data/cldr/common/main/da.xml index 9b61695c3b3e..1731414f53ea 100644 --- a/make/data/cldr/common/main/da.xml +++ b/make/data/cldr/common/main/da.xml @@ -428,6 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pali pijin polsk + piemontesisk ponape maliseet-passamaquoddy preussisk @@ -1154,18 +1155,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sorteringsrækkefølge Normaliseret sortering Numerisk sortering + Sorteringsrækkefølge for skriftsystemer og blokke Sorteringsstyrke valuta + omdan destination + Undtagelser for ordbogsbaseret opdeling emojivisning + ugens første dag + blandet indhold timeur (12 vs. 24) + Inputmetode + Tastatur + Højest ignorerede linjeskift linjeskift midt i ord + regler for transformering målesystem + måleenhed tal + region for supplerende data + transformeringskilde + regional underinddeling afsluttende tegnsætning efter fork. + transformering + maskinoversat Tidszone Sprogvariant Privatbrug + brugerdefineret transformering buddhistisk kalender @@ -1185,15 +1202,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jødisk kalender jødisk indisk nationalkalender + indisk nationalkalender hijri-kalender hijri verdslig hijri-kalender verdslig hijri islamisk kalender (Saudi-Arabien, observation) + hijri, måneobservation i Saudi-Arabien islamisk kalender (tabellarisk, astronomisk epoke) + hijri (tabellarisk, astronomisk epoke) hijri-kalender (Umm al-Qura) hijri (Umm al-Qura) ISO-8601-kalender + gregoriansk japansk kalender japansk persisk kalender @@ -1209,8 +1230,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortér efter accenter i normal rækkefølge Sortér efter accenter i omvendt rækkefølge Sortér med små bogstaver først + Små bogstaver Sortér efter store og små bogstaver i almindelig rækkefølge + Små bogstaver Sortér med store bogstaver først + Store bogstaver Sortér uden forskel på store og små bogstaver Sortér med skelnen mellem store og små bogstaver tidligere sorteringsrækkefølge, kompatibilitet @@ -1219,7 +1243,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordbog Unicode-standardsorteringsrækkefølge standard-Unicode + Emoji europæisk sorteringsrækkefølge + europæiske regler sorteringsrækkefølge i telefonbøger telefonbog fonetisk sorteringsrækkefølge @@ -1229,6 +1255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ generel søgning søg sortér efter den første konsonant i hangul + koreansk initialkonsonant standardsorteringsrækkefølge standard stregbaseret sorteringsrækkefølge @@ -1243,17 +1270,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortér Unicode efter første normalisering Sortér efter individuelle cifre Sortér tal numerisk + Valuta + Cifre + Tegnsætning + Blanktegn + Symbol Sortér alt + alle Sortér kun efter basisbogstaver + Kun grundbogstaver Sortér efter accenter/små og store bogstaver/bredde/kana + Grundbogstaver, accenter, store/små bogstaver, varianter, kana-tegn Sortér efter accenter + Grundbogstaver, accenter Sortér efter accenter/store og små bogstaver/bredde + Grundbogstaver, accenter, små/store bogstaver, varianter fuld bredde halv bredde Numerisk standard emoji tekst + 12-timersur + 12 + 24-timersur + 24 12-timersur (0-11) 12 (0–11) 12-timersur (1-12) @@ -1262,6 +1303,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-timersur (1-24) 24 (1–24) + Forskyd mellemrum, tegnsætning og alle symboler + Forskyd mellemrum og tegnsætning + Forskyd mellemrum og tegnsætning + Forskyd mellemrum, tegnsætning og symboler uden valutategn løst linjeskift løst normalt linjeskift @@ -1282,8 +1327,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikansk hindu-arabiske tal udvidede hindu-arabiske tal + udvidet hindu-arabisk armenske tal armenske tal med små bogstaver + armensk med små bogstaver Balinesiske tal bengali tal Brahmi-tal @@ -1292,43 +1339,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ devanagariske tal etiopiske tal Finansielle tal + finansielle tal tal i fuld bredde + fuld bredde georgiske tal græske tal græske tal med små bogstaver + græsk med små bogstaver gujarati tal gurmukhi tal + nummerering af månedsdage med han-tegn i traditionelle kalendere kinesiske decimaltal + positionelt decimalsystem med kinesiske talideogrammer som cifre forenklede kinesiske tal forenklede kinesiske finansielle tal + forenklede kinesiske finansielle taltegn traditionelle kinesiske tal traditionelle kinesiske finansielle tal + traditionelle kinesiske finansielle taltegn hebraiske tal javanesiske tal japanske tal japanske finansielle tal + japanske finansielle taltegn + japansk nummerering med gannen for første år Kayah Li-tal khmer tal kannada tal Tai Tham Hora-tal Tai Tham Tahm-tal + tai tham tham (kirkelig) laotiske tal arabertal Lepcha-tal Limbu-tal + matematisk fed + matematisk dobbeltstreget + matematisk monospatieret + matematisk fed sans-serif + matematisk sans-serif malayalamske tal Mongolske tal Meetei Mayek-tal Myanmar-tal + østlig pwo-karen (Myanmar) + pao (Myanmar) Myanmar Shan-tal + shan (Myanmar) + tai laing (Myanmar) nationale tal + lokale cifre N’Ko-tal ol chiki-tal oriya-tal Osmanya-tal + kontureret romertal + romertal med store bogstaver romertal med små bogstaver + romertal med små bogstaver Saurashtra-tal + segmenteret Sharada-tal Sora Sompeng-tal Sundanesiske tal @@ -1336,14 +1407,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Nye Tai Lue-tal traditionelle tamilske tal tamilske tal + moderne tamilsk telugu-tal thailandske tal tibetanske tal Traditionelle tal + traditionelle talord vai-tal Fra Til + uspecificeret maskinoversættelse + POSIX-variant + + Fra + Til + det metriske system de britiske målesystemer @@ -1498,7 +1577,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y G M/y G d.M.y GGGGG - E, d/M/y G + E d/M/y G MMM y G d. MMM y G E d. MMM y G @@ -1528,6 +1607,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0}-{1} + {0}-{1} h B–h B @@ -1626,6 +1709,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E 'den' d.–E 'den' d. MMM E 'den' d. MMM–E 'den' d. MMM + + d .–d. MMMM + d. MMMM – d. MMMM + y–y G @@ -1861,6 +1948,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + . + {1} {0} @@ -1923,6 +2014,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d. MMM y G E d. MMM y G + MMMM y G + d. MMMM y G + E d. MMMM y G h.mm a HH.mm h.mm.ss a @@ -1951,12 +2045,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y E d. MMM y MMMM y + d. MMMM y + E d. MMMM y QQQ y QQQQ y 'uge' w 'i' Y 'uge' w 'i' Y + + {0} {1} + + + {0}-{1} + {0}-{1} + {0}-{1} h B–h B @@ -2053,6 +2156,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d.–E d. MMM E d. MMM–E d. MMM + + d.–d. MMMM + d. MMMM – d. MMMM + MM.y–MM.y MM.y–MM.y @@ -2715,6 +2822,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jerevan + + Syowa + Wien @@ -2754,22 +2864,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Færøerne - - - Britisk sommertid - - Athen Hongkong - - - Irsk normaltid - - Bagdad @@ -2920,13 +3020,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska-sommertid - - - Almaty-tid - Almaty-normaltid - Almaty-sommertid - - Amazonas-tid @@ -2971,23 +3064,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Apia-tid - Apia-normaltid - Apia-sommertid - - - - - Aqtau-tid - Aqtau-normaltid - Aqtau-sommertid - - - - - Aqtobe-tid - Aqtobe-normaltid - Aqtobe-sommertid + Vest-Samoa-tid + Vest-Samoa-normaltid + Vest-Samoa-sommertid @@ -3091,6 +3170,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasiliansk sommertid + + + Britisk tid + Britisk sommertid + + Brunei Darussalam-tid @@ -3279,6 +3364,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Grønlandsk tid + Grønlandsk normaltid + Grønlandsk sommertid + + Østgrønlandsk tid @@ -3293,11 +3385,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Vestgrønlandsk sommertid - - - Guam-normaltid - - Golflandene-normaltid @@ -3310,7 +3397,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleutian-normaltid + Hawaii-tid @@ -3371,6 +3458,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iransk sommertid + + + Irsk tid + Irsk normaltid + + Irkutsk-tid @@ -3394,9 +3487,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovsk-Kamchatski tid - Petropavlovsk-Kamchatski normaltid - Petropavlovsk-Kamchatski sommertid + Kamchatski-tid + Kamchatski-normaltid + Kamchatski-sommertid @@ -3438,11 +3531,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgisisk tid - - - Langa tid - - Linjeøerne-tid @@ -3455,13 +3543,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe-sommertid - - - Macao-tid - Macao-normaltid - Macao-sommertid - - Magadan-tid @@ -3577,11 +3658,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha-sommertid - - - Nordmarianerne-tid - - Novosibirsk-tid @@ -3661,13 +3737,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pyongyang-tid - - - Qyzylorda-tid - Qyzylorda-normaltid - Qyzylorda-sommertid - - Reunion-tid @@ -3694,9 +3763,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoansk tid Samoansk normaltid - Samoansk sommertid @@ -3789,6 +3856,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguayansk sommertid + + + Ürümqi-tid + + Usbekisk tid @@ -3935,9 +4007,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4258,6 +4327,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ canadisk dollar canadisk dollar canadiske dollar + CAD congolesisk franc @@ -5198,6 +5268,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikansk dollar amerikansk dollar amerikanske dollar + USD Amerikansk dollar (næste dag) @@ -5287,8 +5358,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ caribiske gylden - caribiske gylden - caribiske gylden SDR @@ -5402,8 +5471,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabwe Gold - Zimbabwe Gold - Zimbabwe Gold Zimbabwisk dollar (2009) @@ -6308,7 +6375,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ton {0} tons {0} tons - {0} tons' + {0} tons’ neuter @@ -6833,8 +6900,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ international tabelkalorie - {0} calIT - {0} calIT becquerel @@ -6866,11 +6931,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} weber {0} weber - - lys - {0} lys - {0} lys - common milliardtedele @@ -7381,7 +7441,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} % - Glk {0} Glk {0} Glk @@ -7489,8 +7548,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mile - {0}" - {0}" + {0}″ + {0}″ ly @@ -7534,6 +7593,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}hk + ″ Hg {0}″ Hg {0}″ Hg @@ -7598,23 +7658,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calIT - {0} calIT - {0} calIT - - - {0} Gy - {0} Gy - kp {0} kp {0} kp - - lys - {0} lys - {0} lys - {0}nat {0}nætter diff --git a/make/data/cldr/common/main/de.xml b/make/data/cldr/common/main/de.xml index 005e61af6a05..b240664db691 100644 --- a/make/data/cldr/common/main/de.xml +++ b/make/data/cldr/common/main/de.xml @@ -171,7 +171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Griechisch Elamisch Englisch - Englisch (GB) Mittelenglisch Esperanto Spanisch @@ -344,6 +343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lillooet Livisch Lakota + Ladinisch Lombardisch Lingala Laotisch @@ -1220,23 +1220,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Währungsformat Sortierung ohne Symbole Umgekehrte Sortierung von Akzenten - Sortierung nach Groß- bzw. Kleinbuchstaben + Sortierung nach Groß- oder Kleinschreibung Sortierung nach Groß- oder Kleinschreibung Sortierung Normierte Sortierung Sortierung nach Zahlen + Änderung der Reihenfolge nach Schrift/Kästchen Sortierstärke Währung - Emojidarstellung + Umwandlungsziel + In Wörterbüchern nicht umgebrochen + Emojidarstellung + Erster Tag der Woche + Eingebunden Stundenformat (12h/24h) + Eingabemethode + Tastatur + Größter ignorierter Umfang Zeilenumbruchstil - Zeilenumbruch im Wortinneren + Zeilenumbruch im Wortinneren + Tranformationsregeln Maßsystem - Ziffern - Satzabbruch nach Abk. + Maßeinheit + Zahlen + Bereich für ergänzende Daten + Ausgangsdaten umwandeln + Gliederung nach Regionen + Satzabbruch nach Abk. + Transformieren + Maschinell übersetzt Zeitzone Lokale Variante Privatnutzung + Transformation für private Nutzung Buddhistischer Kalender @@ -1256,15 +1272,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jüdischer Kalender jüdisch Indischer Nationalkalender + Indischer Nationalkalender Hidschra-Kalender Hidschra Hidschra-Kalender (tabellarisch, nicht-astronomisch) Hidschra (tabellarisch, nicht-astronomisch) Islamischer Kalender (Saudi-Arabien, Beobachtung) + Hidschra, Sichtung Saudi-Arabien Islamischer Kalender (tabellarisch, astronomische Epoche) + Hidschra (tabellarisch, astronomisch) Hidschra-Kalender (Umm al-Qura) Hidschra (Umm al-Qura) ISO-8601-Kalender + gregorianisch Japanischer Kalender japanisch Persischer Kalender @@ -1272,16 +1292,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Minguo-Kalender Minguo Währungsformat (Buchhaltung) - Buchhaltung + Buchhaltung Währungsformat (Standard) - Standard + Standard Symbole sortieren Symbole sortieren ignorieren Akzente normal sortieren Akzente umgekehrt sortieren Kleinbuchstaben zuerst aufführen + Kleinschreibung Normal sortieren + Kleinschreibung Großbuchstaben zuerst aufführen + Großschreibung Ohne Groß-/Kleinschreibung sortieren Nach Groß-/Kleinschreibung sortieren Vorherige Sortierung, Kompatibilität @@ -1291,7 +1314,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unicode-Sortierung Standard-Unicode Emoji-Sortierung + Emoji Europäische Sortierregeln + Europäische Regeln Telefonbuch-Sortierung Telefonbuch Phonetische Sortierung @@ -1301,6 +1326,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Allgemeine Suche Suche Suche nach Anfangsbuchstaben des koreanischen Alphabets + Koreanischer Anlautkonsonant Standard-Sortierung Standard Strichfolge @@ -1315,17 +1341,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Nach Unicode sortieren Ziffern einzeln sortieren Ziffern numerisch sortieren + Währung + Ziffern + Satzzeichen + Leerraum + Sonderzeichen Alle sortieren + Alle Nur Basisbuchstaben sortieren + Grundzeichen Akzente/Fall/Breite/Kana sortieren + Grundzeichen, Akzente, Fälle, Varianten, Kana Akzente sortieren + Grundzeichen, Akzente Akzente/Fall/Breite sortieren + Grundzeichen, Akzente, Fälle, Varianten Vollbreit Halbbreit Numerisch - Standard - Emoji - Text + Standard + Emoji + Text + 12-Stunden-Format + 12 + 24-Stunden-Format + 24 12-Stunden-Format (0–11) 12 (0–11) 12-Stunden-Format (1-12) @@ -1334,29 +1374,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-Stunden-Format (1-24) 24 (1–24) + Speziell: Leerzeichen, Satzzeichen, alle Sonderzeichen + Speziell: Leerzeichen, Satzzeichen + Speziell: Leerzeichen, Satzzeichen + Speziell: Leerzeichen, Satzzeichen, Nicht-Währungssymbole Lockerer Zeilenumbruch - Locker + Locker Normaler Zeilenumbruch - Normal + Normal Fester Zeilenumbruch - Fest - Überall erlaubt - Nirgendwo erlaubt - Normal - Wortgruppen erhalten + Fest + Überall erlaubt + Nirgendwo erlaubt + Normal + Wortgruppen erhalten BGN UNGEGN Metrisches System - Metrisch + Metrisch Britisches Maßsystem - Britisch + Britisch US-Maßsystem - US-amerikanisch + US-amerikanisch Ahom-Ziffern Arabisch-indische Ziffern Erweiterte arabisch-indische Ziffern + Erweitert arabisch-indisch Armenische Ziffern - Armenische Ziffern in Kleinschrift + Armenische Ziffern in Kleinschreibung + Armenische Zahlzeichen in Kleinschreibung Balinesische Ziffern Bengalische Ziffern Brahmi-Ziffern @@ -1366,56 +1412,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Devanagari-Ziffern Äthiopische Ziffern Finanzzahlen + Finanzen Vollbreite Ziffern + Vollbreit Georgische Ziffern Gunjala-Gondi-Ziffern Masaram-Gondi-Ziffern Griechische Ziffern - Griechische Ziffern in Kleinschrift + Griechische Ziffern in Kleinschreibung + Griechische Zeichen in Kleinschreibung Gujarati-Ziffern Gurmukhi-Ziffern + Nummerierung der Monatstage in Hanzi in traditionellen Kalendern Chinesische Dezimalzahlen + Dezimales Stellenwertsystem mit chinesischen Zahlen-Ideogrammen als Ziffern Vereinfacht-chinesische Ziffern Vereinfacht-chinesische Finanzziffern + Vereinfacht-chinesische Finanzzeichen Traditionell-chinesische Ziffern Traditionell-chinesische Finanzziffern + Traditionell-chinesische Finanzzeichen Hebräische Ziffern Pahawh-Hmong-Ziffern Nyiakeng-Puachue-Hmong-Ziffern Javanesische Ziffern Japanische Ziffern Japanische Finanzziffern + Japanische Finanzzeichen + Japanische Gannen-Jahreszählung des ersten Jahres Kayah-Li-Ziffern Khmer-Ziffern Kannada-Ziffern Lanna-Ziffern (säkular) Lanna-Ziffern (sakral) + Lan Na (religiös) Laotische Ziffern Westliche Ziffern Lepcha-Ziffern Limbu-Ziffern Mathematische Fettschrift-Ziffern + Mathematisch fett mit Doppelstrich Mathematische Doppelstrich-Ziffern + Mathematisch mit Doppelstrich Mathematische Konstantschrift-Ziffern + Mathematisch Monospace Mathematische Grotesk-Fettschrift-Ziffern + Mathematisch Sans Serif fett Mathematische Grotesk-Ziffern + Mathematisch Sans Serif Malayalam-Ziffern Modi-Ziffern Mongolische Ziffern Mro-Ziffern Meitei-Mayek-Ziffern Myanmar-Ziffern + Östliche Pwo Karen in Myanmar + Pa’o in Myanmar Myanmarische Shan-Ziffern + Shan in Myanmar Myanmarische Tai-Laing-Ziffern + Tai Laing in Myanmar Native Ziffern + Native Ziffern N’Ko-Ziffern Ol-Chiki-Ziffern Oriya-Ziffern Osmaniya-Ziffern + Umriss Hanifi-Rohingya-Ziffern Römische Ziffern + Römisch, in Großbuchstaben Römische Ziffern in Kleinschrift + Römisch, in Kleinbuchstaben Saurashtra-Ziffern + Segmentiert Sharada-Ziffern Khudawadi-Ziffern Sinhala-Lith-Ziffern @@ -1423,19 +1493,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sundanesische Ziffern Takri-Ziffern Neue Tai-Lü-Ziffern - Tamilische Ziffern + Traditionelle tamilische Ziffern Tamil-Ziffern + Moderne tamilische Zahlzeichen Telugu-Ziffern Thai-Ziffern Tibetische Ziffern Tirhuta-Ziffern Traditionelle Zahlen + Traditionelle Zahlzeichen Vai-Ziffern Warang-Citi-Ziffern Wancho-Ziffern Aus Ein + Nicht näher bezeichnete maschinelle Übersetzung + POSIX-Variante + + Aus + Ein + Internationales (SI) @@ -1455,9 +1533,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ [aä b c d e f g h i j k l m n oö p q r s ß t uü v w x y z] [áàăâåãā æ ç éèĕêëē ğ íìĭîïİī ı ñ óòŏôøō œ ş úùŭûū ÿ] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - [| ~] + [| ~] [\- ‐‑ – — , ; \: ! ? . … '‘‚ "“„ « » ( ) \[ \] \{ \} § @ * / \& #] - [× | ~] + [× | ~] [\: ∶] @@ -2258,6 +2336,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d.–d. MMMM + d. MMMM–d. MMMM + y–y G @@ -2516,6 +2598,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -2524,7 +2609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} 'um' {0} - {1} 'um' {0} + {1} 'um' {0} @@ -2566,13 +2651,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d. MMM y G E, d. MMM y G - h a + MMMM y G + d. MMMM y G + d MMMM Y G, E HH 'Uhr' h:mm a h:mm:ss a h:mm:ss a v h:mm a v - h a v HH 'Uhr' v d.M. E, d.M. @@ -2593,11 +2679,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y E, d. MMM y MMMM y + d. MMMM y + E, d. MMMM y QQQ y QQQQ y 'Woche' w 'des' 'Jahres' Y 'Woche' w 'des' 'Jahres' Y + + {1}, {0} + {0} {1} + {1}, {0} + h 'Uhr' B – h 'Uhr' B @@ -2650,7 +2743,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMM y – E, d. MMM y G - h a – h a h – h a @@ -2699,6 +2791,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d.–d. MMMM + d. MMMM – d. MMMM + M/y – M/y M/y – M/y @@ -2825,7 +2921,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Minguo - v. VR China + vdR @@ -3421,11 +3517,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Färöer - - - Britische Sommerzeit - - Tiflis @@ -3438,11 +3529,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hongkong - - - Irische Sommerzeit - - Kalkutta @@ -3662,13 +3748,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska-Sommerzeit - - - Almaty-Zeit - Almaty-Normalzeit - Almaty-Sommerzeit - - Amazonas-Zeit @@ -3718,20 +3797,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia-Sommerzeit - - - Aqtau-Zeit - Aqtau-Normalzeit - Aqtau-Sommerzeit - - - - - Aqtöbe-Zeit - Aqtöbe-Normalzeit - Aqtöbe-Sommerzeit - - Arabische Zeit @@ -3833,6 +3898,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasília-Sommerzeit + + + Britische Zeit + Britische Sommerzeit + + Brunei-Darussalam-Zeit @@ -4026,23 +4097,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mittlere Greenwich-Zeit - + - Ostgrönland-Zeit - Ostgrönland-Normalzeit - Ostgrönland-Sommerzeit + Grönländische Zeit + Grönländische Normalzeit + Grönländische Sommerzeit - + - Westgrönland-Zeit - Westgrönland-Normalzeit - Westgrönland-Sommerzeit + Ostgrönländische Zeit + Ostgrönländische Normalzeit + Ostgrönländische Sommerzeit - + - Guam-Zeit + Westgrönländische Zeit + Westgrönländische Normalzeit + Westgrönländische Sommerzeit @@ -4057,7 +4130,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleuten-Normalzeit + Hawaii-Normalzeit @@ -4118,6 +4191,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iranische Sommerzeit + + + Irische Zeit + Irische Sommerzeit + + Irkutsker Zeit @@ -4185,11 +4264,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgisische Zeit - - - Sri-Lanka-Zeit - - Linieninseln-Zeit @@ -4202,13 +4276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord-Howe-Sommerzeit - - - Macau-Zeit - Macau-Normalzeit - Macau-Sommerzeit - - Magadan-Zeit @@ -4324,11 +4391,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando-de-Noronha-Sommerzeit - - - Nördliche-Marianen-Zeit - - Nowosibirsker Zeit @@ -4408,13 +4470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pjöngjang-Zeit - - - Quysylorda-Zeit - Quysylorda-Normalzeit - Qysylorda-Sommerzeit - - Réunion-Zeit @@ -4441,9 +4496,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa-Zeit Samoa-Normalzeit - Samoa-Sommerzeit @@ -4536,6 +4589,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguayische Sommerzeit + + + Ürümqi-Zeit + + Usbekische Zeit @@ -5001,9 +5059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Renminbi-Yuan (Offshore) - - Dollar der Chinesischen Volksbank - Renminbi Yuan Chinesischer Yuan @@ -5498,8 +5553,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Malediven-Rufiyaa - Malediven-Rufiyaa - Malediven-Rufiyaa Malawi-Kwacha @@ -6064,8 +6117,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Simbabwe-Gold - Simbabwe-Gold - Simbabwe-Gold Simbabwe-Dollar (2009) @@ -6456,15 +6507,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Millimol pro Liter - neuter + neuter Elemente {0} Element {0} Element {0} Element - {0} Elements + {0} Elements {0} Elemente {0} Elemente - {0} Elementen + {0} Elementen {0} Elemente @@ -7029,7 +7080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter - Newton {0} Newton {0} Newton {0} Newton @@ -8321,9 +8371,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Weber - Lichtgeschwindigkeit + Lichtgeschwindigkeit {0}-fache Lichtgeschwindigkeit - {0}-fache Lichtgeschwindigkeit + {0}-fache Lichtgeschwindigkeit neuter @@ -8813,9 +8863,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Gy - Lichtgeschw. + Lichtgeschw. {0}-fache Lichtg. - {0}-fache Lichtg. + {0}-fache Lichtg. Milliardstel @@ -8886,7 +8936,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Elem. - Teil {0} Teil {0} Teil @@ -8899,7 +8948,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol - Glc {0}Glc {0}Glc @@ -9149,9 +9197,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ l - - fl.oz. m. - ac ft @@ -9201,35 +9246,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}sr {0}sr - - {0} C - {0} C - - - {0} F - {0} F - - - {0} H - {0} H - - - {0} S - {0} S - - calIT {0}calIT {0}calIT - - {0} Sv - {0} Sv - - - {0} Gy - {0} Gy - {0}T {0}T @@ -9239,9 +9259,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}Wb - c - {0} c - {0} c + c + {0} c + {0} c {0}Nacht diff --git a/make/data/cldr/common/main/de_CH.xml b/make/data/cldr/common/main/de_CH.xml index 4e0839d657c2..29e90b51fcd1 100644 --- a/make/data/cldr/common/main/de_CH.xml +++ b/make/data/cldr/common/main/de_CH.xml @@ -38,7 +38,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sortierung nach Gross- bzw. Kleinbuchstaben Sortierung nach Gross- oder Kleinschreibung + Transformationsziel + Wörterbuchtrennung ausgenommen + Höchste ignorierte + Transformationsregeln Mass-System + Masseinheit + Region für Zusatzdaten + Transformationsquelle + Regionale Unterteilung + Transformation + Maschinenübersetzung + Transformation in Private Use Buddhistisch @@ -48,18 +59,59 @@ CLDR data files are interpreted according to the LDML specification (http://unic Äthiopisch Amäta Aläm Gregorianisch Hebräisch + Hidschra, saudi-arabische Ansicht + Hidschra (tabellarisch, astronomische Epoche) + Gregorianisch Japanisch Persisch + Kleinbuchstaben + Kleinbuchstaben Grossbuchstaben zuerst aufführen + Grossbuchstaben Ohne Gross-/Kleinschreibung sortieren Nach Gross-/Kleinschreibung sortieren Lexikografisch Unicode (Standard) Phonetisch + Choseong Strichfolge Traditionell + Interpunktion + Symbol + Leerzeichen, Interpunktion, alle Symbole + Leerzeichen, Interpunktion + Leerzeichen, Interpunktion + Leerzeichen, Interpunktion, Nicht-Währungs-Symbole britisches Mass-System US Mass-System + erweitert arabisch-indisch + armenisch, Kleinschrift + Finanzwesen + vollbreit + griechisch, Kleinschrift + Han-Zeichen-Nummerierung für den Tag des Monats in traditionellen Kalendern + dezimales Positionssystem mit chinesischen Schriftzeichen als Ziffern + vereinfacht-chinesisches Finanzwesen + traditionell-chinesisches Finanzwesen + japanisches Finanzwesen + japanisch Gannen-Erstjahresnummerierung + Tai Tham Tham (ekklesiastisch) + mathematisch fett + mathematisch mit Doppelstrich + mathematisch Monospace + mathematische, fette Sans-Serif + mathematische Sans-Serif + Myanmar östliche Pwo Karen + Myanmar Pao + Myanmar Shan + Myanmar Tai Laing + umrandet + römisch, Grossschrift + römisch, Kleinschrift + segmentiert + modern tamilisch + Traditionelle Ziffern + Nicht spezifizierte Maschinenübersetzung @@ -95,6 +147,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic M – M + + MMMM d.–d. + @@ -143,6 +198,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brunei-Zeit + + + Grönlandzeit + Grönland-Normalzeit + Grönland-Sommerzeit + + + + + Irische Zeit + Irische Normalzeit + + Salomoninseln-Zeit @@ -167,17 +235,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤ #,##0.00;¤-#,##0.00 ¤ #,##0.00;¤-#,##0.00 - #,##0.00 - - - ¤ #,##0.00;¤-#,##0.00 - #,##0.00 - 0 - 0 ¤ 0 Mio'.' ¤ 0 Mio'.' ¤ 00 Mio'.' @@ -220,8 +281,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic São-toméischer Dobra (2018) - Karibischer Gulden - Karibischer Gulden + Karibischer Gulden + Karibischer Gulden @@ -248,9 +309,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Mole - Glucose - {0} Glucose - {0} Glucose + Glucose + {0} Glucose + {0} Glucose Quartal @@ -263,9 +324,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} pro Fuss - Quecksilbersäule - {0} Quecksilbersäule - {0} Quecksilbersäule + Quecksilbersäule + {0} Quecksilbersäule + {0} Quecksilbersäule {0} Beaufort @@ -283,23 +344,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Kubikfuss - {0} Steradiant - {0} Steradianten + {0} Steradiant + {0} Steradianten - Coulombs - {0} Coulomb - {0} Coulombs + Coulombs + {0} Coulomb + {0} Coulombs - Kalorie [IT] - {0} Kalorie [IT] - {0} Kalorien [IT] + Kalorie [IT] + {0} Kalorie [IT] + {0} Kalorien [IT] - Kilogrammkraft - {0} Kilogrammkraft - {0} Kilogrammkraft + Kilogrammkraft + {0} Kilogrammkraft + {0} Kilogrammkraft @@ -309,8 +370,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Punkte - {0} Glc - {0} Glc + {0} Glc + {0} Glc Quartal @@ -319,8 +380,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fuss - {0} Hg - {0} Hg + {0} Hg + {0} Hg {0} Bft @@ -328,7 +389,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} m. fl. oz. - {0} m. fl. oz. + {0} m. fl. oz. Dram @@ -345,17 +406,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Prise - {0} kat - {0} kat + {0} kat + {0} kat - kcal [IT] + kcal [IT] {0} kcal [IT] - {0} kcal [IT] + {0} kcal [IT] - {0} Bq - {0} Bq + {0} Bq + {0} Bq @@ -368,14 +429,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} m. fl. oz. {0} m. fl. oz. - - {0} kat - {0} kat - kcal [IT] - {0} kcal [IT] - {0} kcal [IT] + {0} kcal [IT] + {0} kcal [IT] diff --git a/make/data/cldr/common/main/de_LU.xml b/make/data/cldr/common/main/de_LU.xml index e3d09a62a841..2e766d817d3c 100644 --- a/make/data/cldr/common/main/de_LU.xml +++ b/make/data/cldr/common/main/de_LU.xml @@ -14,14 +14,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - - vorm. - nachm. - - - + + + h a + + diff --git a/make/data/cldr/common/main/doi.xml b/make/data/cldr/common/main/doi.xml index 4cbf4bfa1e4f..635ec6c26af5 100644 --- a/make/data/cldr/common/main/doi.xml +++ b/make/data/cldr/common/main/doi.xml @@ -329,6 +329,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -373,12 +377,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic d, MMM y E, d, MMM y MMMM y + d, MMMM y + EEE, d, MMMM y QQQ y QQQQ y Y दा हफ्ता w Y दा हफ्ता w + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} h – h B @@ -790,20 +801,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic तालमेली आलमी समां + + - + अनजांता शैह्‌र - - - ब्रिटिश गर्मियें दा समां - - - - - आयरिश मानक समां - - उत्तरी अमरीकी केंदरी समां @@ -839,6 +843,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic अटलांटिक डेलाइट समां + + + ब्रिटिश समां + ब्रिटिश गर्मियें दा समां + + केंदरी यूरोपी समां @@ -865,6 +875,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ग्रीनविच मीन टाइम + + + आयरिश समां + आयरिश मानक समां + + diff --git a/make/data/cldr/common/main/dsb.xml b/make/data/cldr/common/main/dsb.xml index 0d7407def6a7..9bb25215e50e 100644 --- a/make/data/cldr/common/main/dsb.xml +++ b/make/data/cldr/common/main/dsb.xml @@ -337,6 +337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic nigerijanski pidgin pijinšćina pólšćina + piemontšćina maliseet-passamaquoddyšćina prusčina paštunšćina @@ -850,15 +851,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic kalender format płaśidła + rědowanje bźez symbolow + nawopacne rědowanje akcentow + rědowanje pó wjelikich a małych pismikach + rědowanje pó wjelikopisanju a małopisanju sortěrowański slěd + norměrowane rědowanje + numeriske rědowanje + noworědowanje pismikow abo blokow + intensiwnosć sortěrowanja pjenjeze + cil transformacije + słownikaŕske wuwześa w źělenju pśedstajenje emojija + prědny źeń tyźenja + měšana forma góźinowy cyklus (12 vs 24) + zapódawańska metoda + tastatura + nejwušy stopjeń ignorěrowanja system łamanja smužkow łamanje smužki w słowje + pšawidła transformacije system měrow + měrjeńska jadnotka licby + městno za wudopołnjece daty + žrědło transforměrowaś + rozrědowanje na regiony pśetergnjenje sady pó skrotconce + transforměrowaś + z mašinu pśestajone + casowa cona + lokalna warianta + za priwatne wužywanje + za priwatne wužywanje transforměrowaś buddhistiski kalender @@ -877,13 +904,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic gregorjaniski žydojski kalender hebrejski + indiski kalendaŕ islamski kalender hijri islamski ciwilny kalendaŕ islamski ciwilny + islamski kalendaŕ hijri + tabelariski islamski kalendaŕ hijri z astronomiskimi dobami islamski umalqui-kalendaŕ islamski Umm al-Qura iso-8601-kalender + gregoriański kalendaŕ japański kalender japański persiski kalender @@ -894,15 +925,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic knigływjeźenje standardny format płaśidła standard + małe pismiki + małe pismiki + wjelike pismiki + kompatibelnosć + słownik sortěrowański slěd pó Unicoźe standardne unicode-rědowanje + emoji + europske pšawidła + telefoniske knigły + fonetiski + pinyin powšykne pytanje pytaj + koreański zachopny konsonant standardny sortěrowański slěd standardne + smužka + tradicionelny + pó radikalach a smužkach + zhuyin + pjenjeze + licby + interpunkcija + prozne znamje + symbol + wšykne + jano zakładne pismiki + zakładne pismiki, akcenty, wjelikopisanje a małopisanje, warianty, kana + zakładne pismiki, akcenty + zakładne pismiki, akcenty, wjelikopisanje a małopisanje, warianty + w połnej šerokosći + napoł šeroke default emoji tekst + 12-góźinowy cyklus + 12 + 24-góźinowy cyklus + 24 12-góźinowy cyklus (0-11) 12 (0–11) 12-góźinowy cyklus (1-12) @@ -911,6 +973,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24-góźinowy cyklus (1-24) 24 (1–24) + shift proznota, interpunkcija, wšykne symbole + shift proznota, interpunkcija + shift proznota, interpunkcija + shift proznota, interpunkcija, symbole bźez pjenjezow lichy stil łamanja smužkow wólny běžny stil łamanja smužkow @@ -921,6 +987,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic zdźarž wšykno normalne w sadach + US-BGN-transliteracija + UN-GEGN-transliteracija metriski system metriski britiski system měrow @@ -929,47 +997,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic ameriski arabisko-indiske cyfry rozšyrjone arabisko-indiske cyfry + rozšyrjona arabsko-indišćina armeńske cyfry armeńske cyfry małopisane + armeńske małe pismiki bengalske cyfry chakmaske cyfry devanagari-cyfry etiopiske cyfry + financne połnošyroke cyfry + połna šerokosć georgiske cyfry grichiske cyfry grichiske cyfry małopisane + grichiske małe pismiki gujarati-cyfry gurmukhi-cyfry + Han-znamuška za źeń mjaseca za tradicionelne kalendarje chinske decimalne licby + decimalny system na zakłaźe pozicije z chinskimi ideografami ako cyfry zjadnorjone chinske cyfry zjadnorjone chinske financne cyfry + zjadnorjona chinšćina pjenjeznistwa tradicionalne chinske cyfry tradicionalne chinske financne cyfry + tradicionelna chinšćina pjenjeznistwa hebrejske cyfry javaske cyfry japańske cyfry japańske financne cyfry + japańšćina pjenjeznistwa + japańske licenje gannen wót prědnego lěta khmerske cyfry kannada-cyfry + tai tham tham (cerkwinske) laotiske cyfry arabiske cyfry + matematiske tłuste + matematiske dwójcy pódšmarnjone + matematiske monospace + matematiske bźez serifow tłuste + matematiske bźez serifow malayalamske cyfry meetei-mayekske cyfry burmaske cyfry + Myanmaŕska pódzajtšna pwo-kareńšćina + Myanmaŕska paošćina + Myanmaŕska shańšćina + Myanmaŕska tai-laingšćina + za kraj charakteristiske licby + za kraj charakteristiske licby ol-chikiske cyfry oriya-cyfry + zaramikowane romske cyfry + romske wjelike pismiki romske cyfry małopisane + romske małe pismiki + segmentěrowane tradicionalne tamilske cyfry tamilske cyfry + moderna tamilšćina telugu-cyfry thaiske cyfry tibetske cyfry + tradicionelne licby vaiske cyfry ně jo + njespecifiski pśełožk z mašinu + POSIX-warianta + + ně + jo + metriski britiski @@ -1022,6 +1125,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -1088,6 +1194,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0}–{1} + {0}–{1} + h 'hodź'. B – h 'hodź'. B @@ -1097,9 +1207,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic d. – d. - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -1117,21 +1224,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic GGGGG y-MM-dd, E – y-MM-dd, E GGGGG y-MM-dd, E – y-MM-dd, E - - G y MMM – G y MMM - G y MMM – y MMM - - - G y MMM d – G y MMM d - G y MMM d – MMM d - G y MMM d – y MMM d - - - G y MMM d, E – MMM d, E - G y MMM d, E – G y MMM d, E - G y MMM d, E – MMM d, E - G y MMM d, E – y MMM d, E - M. – M. @@ -1154,6 +1246,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d. – E, d. MMM E, d. MMM – E, d. MMM + + d. – d. MMMM + d. MMMM – d. MMMM + y–y G @@ -1410,6 +1506,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -1458,7 +1557,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y G d. MMM y G E, d. MMM y G - h a + LLLL y G + d. MMMM y G + E, d. MMMM y G 'zeg'. H h:mm a 'zeg'. H:mm @@ -1473,6 +1574,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic d. MMM E, d. MMM d. MMMM + E, d. MMMM W. 'tyźeń' MMMM W. 'tyźeń' MMMM W. 'tyźeń' MMMM @@ -1484,6 +1586,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d. MMM y E, d. MMM y LLLL y + d. MMMM y + E, d. MMMM y QQQ y QQQQ y w. 'tyźeń' 'lěta' Y @@ -1503,6 +1607,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic G y – G y + y–y G MM/y G – MM/y G @@ -1538,10 +1643,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d. MMM – E, d. MMM y G E, d. MMM y – E, d. MMM y G - - h a – h a - h–h a - 'zeg'. H–H @@ -1563,10 +1664,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'zeg'. H:mm – H:mm v 'zeg'. H:mm – H:mm v - - h a – h a v - h–h a v - H–H v @@ -1592,6 +1689,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d. – E, d. MMM E, d. MMM – E, d. MMM + + d. – d. MMMM + d. MMMM – d. MMMM + M.y – M.y M.y – M.y @@ -2342,9 +2443,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Njeznate - - Tirana - Jerewan @@ -2372,18 +2470,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bermudy - - São Paulo - Zürich Jatšowne kupy - - Bogotá - Havanna @@ -2399,9 +2491,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Praga - - Büsingen - Džibuti @@ -2414,9 +2503,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kairo - - El Aaiún - Kanary @@ -2429,11 +2515,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Färöje - - - Britiski lěśojski cas - - Akkra @@ -2449,11 +2530,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Port Numbay - - - Iriski lěśojski cas - - Kalkutta @@ -2580,9 +2656,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Damaskus - - Lomé - Dušanbe @@ -2607,6 +2680,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ho-Chi-Minh-město + + + Acre-cas + Acre-standardny cas + Acre-lěśojski cas + + Afghaniski cas @@ -2782,6 +2862,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasília lěśojski cas + + + Britiski lěśojski cas + + Bruneiski cas @@ -2970,6 +3055,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Greenwichski cas + + + Grönlandski cas + Grönlandski standardny cas + Grönlandski lěśojski cas + + Pódzajtšnogrönlandski cas @@ -2996,7 +3088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaiisko-aleutski standardny cas + Hawaiiski standardny cas @@ -3057,6 +3149,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Irański lěśojski cas + + + Iriski lěśojski cas + + Irkutski cas @@ -3078,6 +3175,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Japański lěśojski cas + + + Kamčatkaski cas + Kamčatkaski standardny cas + Kamčatkaski lěśojski cas + + kazachiski cas @@ -3340,11 +3444,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sachalinski lěśojski cas + + + Samaraski cas + Samaraski standardny cas + Samaraski lěśojski cas + + - Samoaski cas Samoaski standardny cas - Samoaski lěśojski cas @@ -3411,6 +3520,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Chuukski cas + + + Turkojski cas + Turkojski standardny cas + Turkojski lěśojski cas + + Turkmeniski cas @@ -3430,6 +3546,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Uruguayski lěśojski cas + + + Ürumqi cas + + Uzbekiski cas @@ -3562,28 +3683,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0 tys'.' + 0 tys'.' + 0 tys'.' 0 tys'.' 00 tys'.' + 00 tys'.' + 00 tys'.' 00 tys'.' 000 tys'.' + 000 tys'.' + 000 tys'.' 000 tys'.' 0 mio'.' + 0 mio'.' + 0 mio'.' 0 mio'.' 00 mio'.' + 00 mio'.' + 00 mio'.' 00 mio'.' 000 mio'.' + 000 mio'.' + 000 mio'.' 000 mio'.' 0 mrd'.' + 0 mrd'.' + 0 mrd'.' 0 mrd'.' 00 mrd'.' + 00 mrd'.' + 00 mrd'.' 00 mrd'.' 000 mrd'.' + 000 mrd'.' + 000 mrd'.' 000 mrd'.' 0 bil'.' + 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' + 000 bil'.' 000 bil'.' @@ -6303,9 +6448,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic metriske žydke unce - {0} žydka unca - {0} žydkej uncy - {0} žydke unce + {0} metriska žydka unca + {0} metriskej žydkej uncy + {0} metriske žydke unce {0} metriskich žydkich uncow diff --git a/make/data/cldr/common/main/dv.xml b/make/data/cldr/common/main/dv.xml deleted file mode 100644 index d4437ce3b471..000000000000 --- a/make/data/cldr/common/main/dv.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - ދިވެހިބަސް - - - ދިވެހި ރާއްޖެ - - - - - right-to-left - - - - [ހ ށ ނ ރ ބ ޅ ކ އ ވ މ ފ ދ ތ ލ ގ ޏ ސ ޑ ޒ ޓ ޔ ޕ ޖ ޗ ަ ާ ި ީ ު ޫ ެ ޭ ޮ ޯ ް] - [\u200C\u200D ޙ ޚ ޜ ޢ ޣ ޥ ޛ ޘ ޠ ޡ ޤ ޝ ޞ ޟ ޱ] - [ހ ށ ނ ރ ބ ޅ ކ އ ވ މ ފ ދ ތ ލ ގ ޏ ސ ޑ ޒ ޓ ޔ ޕ ޖ ޗ] - - - - - - - - EEEE d MMMM y G - - - - - d MMMM y G - - - - - dd-MM-y G - GyMMdd - - - - - d-M-yy GGGGG - GGGGGyyMd - - - - - - - - - EEEE d MMMM y - - - - - d MMMM y - - - - - dd-MM-y - yMMdd - - - - - d-M-yy - yyMd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - - - arab - - - ، - - - , - - - - - #,##,##0.### - - - - - - - #,##,##0% - - - - - - - ¤ #,##,##0.00 - ¤ #,##,##0.00 - #,##,##0.00 - - - ¤ #,##,##0.00 - #,##,##0.00 - - - - - - ރ. - - - - diff --git a/make/data/cldr/common/main/dv_MV.xml b/make/data/cldr/common/main/dv_MV.xml deleted file mode 100644 index e01037b70523..000000000000 --- a/make/data/cldr/common/main/dv_MV.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/dz.xml b/make/data/cldr/common/main/dz.xml index 1e37dc15f64c..f6b65a08c29b 100644 --- a/make/data/cldr/common/main/dz.xml +++ b/make/data/cldr/common/main/dz.xml @@ -939,6 +939,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic གཟའ་E, ལོy ཟླ་MMM ཚེ་d + + {0} – {1} + {0} – {1} + {0}–{1} + {0} – {1} སྤྱི་ཟླ་M–M @@ -1080,7 +1085,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ཇི་ཨེམ་ཏི་{0} - ཇི་ཨེམ་ཊི་ {0}་ཆུ་ཚོད། {1}། ({0}་) @@ -1300,9 +1304,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ལི་བྷྲ་བིལ - - བྲཱི་ཊིཤ་བྱཱར་དུས་ཆུ་ཚོད - ལཱན་ཌཱན @@ -1348,9 +1349,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ཇ་ཡ་པུ་ར - - ཨཱ་ཡརིཤ་བྱཱར་དུས་ཆུ་ཚོད - ཌབ་ལིན @@ -1731,6 +1729,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic བྲ་ཛི་ལི་ཡ་བྱཱར་དུས་ཆུ་ཚོད + + + བྲཱི་ཊིཤ་བྱཱར་དུས་ཆུ་ཚོད + + ཀེཔ་བཱཌ་ཆུ་ཚོད @@ -1906,6 +1909,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ཨི་རཱན་ཉིན་སྲུང་ཆུ་ཚོད + + + ཨཱ་ཡརིཤ་བྱཱར་དུས་ཆུ་ཚོད + + ཨར་ཀུཙི་ཆུ་ཚོད diff --git a/make/data/cldr/common/main/ee.xml b/make/data/cldr/common/main/ee.xml index 55fcfca25cea..8a452be7abf4 100644 --- a/make/data/cldr/common/main/ee.xml +++ b/make/data/cldr/common/main/ee.xml @@ -1316,6 +1316,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {0} {1} @@ -1374,12 +1378,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d 'lia', y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'kɔsiɖa' w 'lia' 'le' 'ƒe' Y 'me' 'kɔsiɖa' w 'lia' 'le' 'ƒe' Y 'me' + + {0} – {1} + {0}–{1} + {0} – {1} + a h – a h a h–h @@ -1600,6 +1611,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + "/", "-" + + + @@ -1892,16 +1910,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Du manya - - - British dzomeŋɔli gaƒoƒo me - - - - - Ireland nutome gaƒoƒo me - - Macau @@ -1971,13 +1979,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Alaska kele gaƒoƒo me - - - Almati gaƒoƒome - Almati gaƒoƒoɖoanyime - Almati dzomeŋɔli gaƒoƒome - - Amazon gaƒoƒome @@ -2027,20 +2028,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Apia kele gaƒoƒo me - - - Aktau gaƒoƒome - Aktau gaƒoƒoɖoanyime - Aktau dzomeŋɔli gaƒoƒome - - - - - Aktobe gaƒoƒome - Aktobe gaƒoƒoɖoanyime - Akttobe gaƒoƒome - - Arabia gaƒoƒo me @@ -2142,6 +2129,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasilia dzomeŋɔli gaƒoƒo me + + + Britain gaƒoƒo + British dzomeŋɔli gaƒoƒo me + + Brunei Darussalam gaƒoƒo me @@ -2336,7 +2329,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaii-Aleutia nutome gaƒoƒo me + Hawaii nutome gaƒoƒo me @@ -2397,6 +2390,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran kele gaƒoƒo me + + + Ireland gaƒoƒo + Ireland nutome gaƒoƒo me + + Irkutsk gaƒoƒo me @@ -2471,13 +2470,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lord Howe kele gaƒoƒo me - - - Makau gaƒoƒome - Makau gaƒoƒoɖoanyime - Makau ŋkekeme gaƒoƒome - - Magadan gaƒoƒo me @@ -2672,13 +2664,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pyongyang gaƒoƒo me - - - Kizilɔrda gaƒoƒome - Kizilɔrda gaƒoƒoɖoanyime - Kizilɔrda dzomeŋɔli gaƒoƒome - - Reunion gaƒoƒo me @@ -2705,9 +2690,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoa gaƒoƒo me Samoa nutome gaƒoƒo me - Samoa kele gaƒoƒo me @@ -2974,7 +2957,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} {1} - {1} {0} + {0} {1} @@ -3188,11 +3171,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic chilega peso - - tsainatɔwo ƒe gadzraɖoƒe dollar - tsainatɔwo ƒe gadzraɖoƒe dollar - tsainatɔwo ƒe gadzraɖoƒe dollarwo - Chinesega yuan diff --git a/make/data/cldr/common/main/el.xml b/make/data/cldr/common/main/el.xml index 101ab679a1dd..80617fc6267d 100644 --- a/make/data/cldr/common/main/el.xml +++ b/make/data/cldr/common/main/el.xml @@ -427,6 +427,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Πάλι Πιτζίν Πολωνικά + Πιεμοντέζικα Πομπηικά Μαλισιτ-Πασσαμακουόντ Πρωσικά @@ -827,7 +828,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Κίνα Κολομβία Νήσος Κλίπερτον - Σαρκ + Σαρκ Κόστα Ρίκα Κούβα Πράσινο Ακρωτήριο @@ -1103,18 +1104,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Σειρά ταξινόμησης Κανονικοποιημένη ταξινόμηση Αριθμητική ταξινόμηση + Αναδιάταξη συστημάτων γραφής/μπλοκ Ισχύς ταξινόμησης Νόμισμα + Προορισμός μετασχηματισμού + Εξαιρέσεις διαχωρισμού λεξικού Παρουσίαση emoji + Πρώτη ημέρα της εβδομάδας + Μεικτό Κύκλος ωρών (12 ή 24) + Μέθοδος εισαγωγής + Πληκτρολόγιο + Υψηλότερη παράβλεψη Στιλ αλλαγής γραμμών Αλλαγή γραμμής ανάμεσα σε λέξεις + Κανόνες μετασχηματισμού Σύστημα μέτρησης + Μονάδα μέτρησης Αριθμοί + Περιοχή για συμπληρωματικά δεδομένα + Πηγή μετασχηματισμού + Υποδιαίρεση περιοχής Τέλος πρότασης μετά από σύντμηση + Μετασχηματισμός + Μηχανικά μεταφρασμένο Ζώνη ώρας Παραλλαγή τοπικών ρυθμίσεων Ιδιωτική χρήση + Μετασχηματισμός ιδιωτικής χρήσης Βουδιστικό ημερολόγιο @@ -1134,15 +1151,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Εβραϊκό ημερολόγιο Εβραϊκό Ινδικό εθνικό ημερολόγιο + Εθνικό Ημερολόγιο της Ινδίας Ημερολόγιο Εγίρας Εγίρα Ημερολόγιο Εγίρας (σε μορφή πίνακα, αστικό εποχής) Εγίρα (σε μορφή πίνακα, αστικό εποχής) Ισλαμικό ημερολόγιο (Σαουδική Αραβία, θέαση) + Εγίρα, παρατήρηση στη Σαουδική Αραβία Ισλαμικό ημερολόγιο (δομημένο, αστρονομική εποχή) + Εγίρα (σε μορφή πίνακα, αστρονομική εποχή) Ημερολόγιο Εγίρας (Umm al-Qura) Εγίρα (Umm al-Qura) Ημερολόγιο ISO-8601 + Γρηγοριανό Ιαπωνικό ημερολόγιο Ιαπωνικό Περσικό ημερολόγιο @@ -1158,8 +1179,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Κανονικά ταξινόμηση τόνων Αντίστροφη ταξινόμηση τόνων Ταξινόμηση πεζών χαρακτήρων πρώτα + Πεζοί χαρακτήρες Κανονική ταξινόμηση χαρακτήρων + Πεζοί χαρακτήρες Ταξινόμηση κεφαλαίων χαρακτήρων πρώτα + Κεφαλαίοι χαρακτήρες Ταξινόμηση με διάκριση χαρακτήρων Ταξινόμηση χαρακτήρων διάκρισης Προηγούμενη σειρά ταξινόμησης, για συμβατότητα @@ -1168,7 +1192,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Λεξικό Προεπιλεγμένη σειρά ταξινόμησης Unicode Προεπιλεγμένη σειρά Unicode + Emoji Ευρωπαϊκοί κανόνες ταξινόμησης + Ευρωπαϊκοί κανόνες Σειρά ταξινόμησης τηλεφωνικού καταλόγου Τηλεφωνικός κατάλογος Φωνητική σειρά ταξινόμησης @@ -1178,6 +1204,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Αναζήτηση γενικού τύπου Αναζήτηση Αναζήτηση κατά αρχικό σύμφωνο Χανγκούλ + Κορεατικό αρχικό σύμφωνο Τυπική σειρά ταξινόμησης Τυπική Σειρά ταξινόμησης κινήσεων @@ -1192,17 +1219,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Κανονικοποιημένη ταξινόμηση Unicode Μεμονωμένη ταξινόμηση ψηφίων Αριθμητική ταξινόμηση ψηφίων + Νόμισμα + Ψηφία + Σημεία στίξης + Κενό διάστημα + Σύμβολο Ταξινόμηση όλων + Όλα Ταξινόμηση μόνο βασικών χαρακτήρων + Μόνο βασικά γράμματα Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους/χαρακτήρων Κάνα + Βασικά γράμματα, τόνοι, πεζά/κεφαλαία, παραλλαγές, Κάνα Ταξινόμηση τόνων + Βασικά γράμματα, τόνοι Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους + Βασικά γράμματα, τόνοι, πεζά/κεφαλαία, παραλλαγές Πλήρους πλάτους Μισού πλάτους Αριθμητικό Προεπιλογή Emoji Κείμενο + 12ωρο σύστημα + 12 + 24ωρο σύστημα + 24 12ωρο σύστημα (0–11) 12 (0–11) 12ωρο σύστημα (1–12) @@ -1211,6 +1252,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24ωρο σύστημα (1–24) 24 (1–24) + Μετατόπιση κενών διαστημάτων, σημείων στίξης, όλων των συμβόλων + Μετατόπιση κενών διαστημάτων, σημείων στίξης + Μετατόπιση κενών διαστημάτων, σημείων στίξης + Μετατόπιση κενών διαστημάτων, σημείων στίξης, συμβόλων εκτός νομισμάτων Χαλαρό στιλ αλλαγής γραμμών Χαλαρό Κανονικό στιλ αλλαγής γραμμών @@ -1231,51 +1276,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Αμερικανικό Αραβικο-ινδικά ψηφία Εκτεταμένα αραβικο-ινδικά ψηφία + Εκτεταμένα αραβικο-ινδικά Αρμενικά αριθμητικά Πεζά αρμενικά αριθμητικά + Αρμενικά πεζά Βεγγαλικά ψηφία Ψηφία Τσάκμα Ψηφία Ντεβαναγκάρι Αιθιοπικά αριθμητικά Οικονομικά αριθμητικά + Οικονομικά Ψηφία πλήρους πλάτους + Πλήρες πλάτος Γεωργιανά αριθμητικά Ελληνικά αριθμητικά Ελληνικά αριθμητικά πεζά + Ελληνικά πεζά Γκουτζαρατικά ψηφία Ψηφία Γκουρμούκι + Αρίθμηση ημέρας μήνα με χαρακτήρες Χαν για παραδοσιακά ημερολόγια Κινεζικά δεκαδικά αριθμητικά + Θεσιακό δεκαδικό σύστημα με χρήση κινεζικών αριθμητικών ιδεογραμμάτων ως ψηφίων Απλοποιημένα κινεζικά αριθμητικά Απλοποιημένα κινεζικά οικονομικά αριθμητικά + Απλοποιημένα κινεζικά οικονομικά Παραδοσιακά κινεζικά αριθμητικά Παραδοσιακά κινεζικά οικονομικά αριθμητικά + Παραδοσιακά κινεζικά οικονομικά Εβραϊκά αριθμητικά Ιαβαϊκά ψηφία Ιαπωνικά αριθμητικά Ιαπωνικά οικονομικά αριθμητικά + Ιαπωνικά οικονομικά + Ιαπωνική αρίθμηση πρώτου έτους Γκάνεν Ψηφία Χμερ Ψηφία Κανάντα + Τάι Ταμ Ταμ (εκκλησιαστικά) Λαοϊκά ψηφία Αραβικά αριθμητικά + Μαθηματικά έντονα + Μαθηματικά διπλής γραμμής + Μαθηματικά σταθερού πλάτους + Μαθηματικά έντονα χωρίς πατούρες + Μαθηματικά χωρίς πατούρες Μαλαγιαλαμικά ψηφία Μογγολικά ψηφία Ψηφία Μεϊτεί Μαγιέκ Ψηφία Μιανμάρ + Ανατολικά Πούο Κάρεν Μιανμάρ + Μιανμάρ Πάο + Μιανμάρ Σαν + Μιανμάρ Τάι Λάινγκ Εγγενή ψηφία + Εγγενή ψηφία Ψηφία Ολ Τσίκι Οριγικά ψηφία + Περιγραμμένα Λατινικά αριθμητικά + Κεφαλαία λατινικά Πεζά λατινικά αριθμητικά + Πεζά λατινικά + Τμηματικά Ταμιλικά αριθμητικά Ταμιλικά ψηφία + Σύγχρονα Ταμίλ Τελουγκουϊκά ψηφία Ταϊλανδικά ψηφία Θιβετανικά ψηφία Παραδοσιακά αριθμητικά + Παραδοσιακά αριθμητικά Ψηφία Βάι Απενεργοποίηση Ενεργοποίηση + Απροσδιόριστη μηχανική μετάφραση + Παραλλαγή POSIX + + Απενεργοποίηση + Ενεργοποίηση + Μετρικό Αγγλοσαξονικό @@ -1325,6 +1404,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1346,11 +1432,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + - EEEE, d MMMM y G + EEEE d MMMM y G @@ -1404,20 +1497,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y G MM-y G d/M/y GGGGG - E, dd-MM-y G + E dd/MM/y G MMM y G d MMM y G - E, d MMM y G + E d MMM y G h:mm a h:mm:ss a h a (vvvv) HH (vvvv) d/M - E, d/M + E d/M d MMM - E, d MMM + E d MMM d MMMM - E, d MMMM + E d MMMM y G y G M/y GGGGG @@ -1425,10 +1518,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d/M/y GGGGG MMM y G d MMM y G - E, d MMM y G + E d MMM y G MMMM y G + QQQ y G + + {0} – {1} + {0} - {1} h – h B @@ -1513,6 +1610,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd – E, dd MMM E, dd MMM – E, dd MMM + + d – d MMMM + d MMMM – d MMMM + y–y G @@ -1784,6 +1885,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} - {0} @@ -1815,11 +1919,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y G + M/y G d/M/y GGGGG - E, dd-MM-y G + E dd/MM/y G LLL y G d MMM y G E d MMM y G + MMMM y G + d MMMM y G + E d MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -1843,11 +1951,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y LLLL y + d MMMM y + E d MMMM y QQQ y QQQQ y εβδομάδα w του Y εβδομάδα w του Y + + {1}, {0} + {0} {1} + {0} - {1} @@ -1933,6 +2047,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d MMM – E d MMM E d MMM – E d MMM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2644,7 +2762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Άγνωστη πόλη + Άγνωστη τοποθεσία Ανδόρα @@ -3112,9 +3230,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Λιμπρεβίλ - - Θερινή ώρα Βρετανίας - Λονδίνο @@ -3205,9 +3320,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Τζαγιαπούρα - - Χειμερινή ώρα Ιρλανδίας - Δουβλίνο @@ -3902,7 +4014,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ώρα Άκρε + Ώρα Άκρε Χειμερινή ώρα Άκρε Θερινή ώρα Άκρε @@ -4089,6 +4201,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Μπραζίλιας + + + Ώρα Βρετανίας + Θερινή ώρα Βρετανίας + + Ώρα Μπρουνέι Νταρουσαλάμ @@ -4277,6 +4395,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Μέση ώρα Γκρίνουιτς + + + Ώρα Γροιλανδίας + Χειμερινή ώρα Γροιλανδίας + Θερινή ώρα Γροιλανδίας + + Ώρα Ανατολικής Γροιλανδίας @@ -4291,11 +4416,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Δυτικής Γροιλανδίας - - - Ώρα Γκουάμ - - Ώρα Κόλπου @@ -4308,7 +4428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Χειμερινή ώρα Χαβάης-Αλεούτιων Νήσων + Χειμερινή ώρα Χαβάης @@ -4369,6 +4489,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Ιράν + + + Ώρα Ιρλανδίας + Χειμερινή ώρα Ιρλανδίας + + Ώρα Ιρκούτσκ @@ -4392,9 +4518,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ώρα Καμτσάτκα - Χειμερινή ώρα Πετροπαβλόβσκ-Καμτσάτσκι - Θερινή ώρα Πετροπαβλόβσκ-Καμτσάτσκι + Ώρα Καμτσάτκα + Χειμερινή ώρα Πετροπαβλόβσκ-Καμτσάτκα + Θερινή ώρα Πετροπαβλόβσκ-Καμτσάτκα @@ -4448,13 +4574,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Λορντ Χάου - - - Ώρα Μακάο - Χειμερινή ώρα Μακάο - Θερινή ώρα Μακάο - - Ώρα Μαγκαντάν @@ -4570,11 +4689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Φερνάρντο ντε Νορόνια - - - Ώρα Νησιών Βόρειες Μαριάνες - - Ώρα Νοβοσιμπίρσκ @@ -4673,16 +4787,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ώρα Σάμαρας - Χειμερινή ώρα Σάμαρας - Θερινή ώρα Σαμάρας + Ώρα Σαμάρας + Χειμερινή ώρα Σαμάρας + Θερινή ώρα Σαμάρας - Ώρα Σαμόα Χειμερινή ώρα Σαμόα - Θερινή ώρα Σαμόα @@ -4751,9 +4863,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ώρα Τουρκίας - Χειμερινή ώρα Τουρκίας - Θερινή ώρα Τουρκίας + Ώρα Τουρκίας + Χειμερινή ώρα Τουρκίας + Θερινή ώρα Τουρκίας @@ -4775,6 +4887,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Θερινή ώρα Ουρουγουάης + + + Ώρα Ουρουμτσί + + Ώρα Ουζμπεκιστάν @@ -4917,9 +5034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5263,10 +5377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ γουάν Κίνας (υπεράκτιο) γουάν Κίνας (υπεράκτια) - - Δολάριο Λαϊκής Τράπεζας Κίνας - Δολάρια Λαϊκής Τράπεζας Κίνας - Γουάν Κίνας γουάν Κίνας @@ -6267,8 +6377,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ γκίλντα Καραϊβικής - γκίλντα Καραϊβικής - γκίλντες Καραϊβικής + γκίλντα Καραϊβικής + γκίλντες Καραϊβικής Ειδικά Δικαιώματα Ανάληψης @@ -6375,8 +6485,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Χρυσός της Ζιμπάμπουε - Χρυσός της Ζιμπάμπουε - Χρυσός της Ζιμπάμπουε + χρυσός της Ζιμπάμπουε + χρυσός της Ζιμπάμπουε Δολάριο Ζιμπάμπουε (2009) @@ -6718,8 +6828,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ μέρη - {0} μέρος - {0} μέρη neuter @@ -8986,11 +9094,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ τ. ίντσες - - μέρος - {0} μέρος - {0} μέρη - ppm @@ -9003,9 +9106,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - λ/χλμ {0} λ/χλμ @@ -9248,7 +9348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} μ. κύπ. - μ. ουγγιά υγρ. {0} μ. ουγγιά υγρ. {0} μ. ουγγιές υγρ. @@ -9272,13 +9371,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ δρ. όγκου - - {0} kat - {0} kat - - - cal-IT - φώς diff --git a/make/data/cldr/common/main/en.xml b/make/data/cldr/common/main/en.xml index e615f0f38051..5d8c0c2fc2f0 100644 --- a/make/data/cldr/common/main/en.xml +++ b/make/data/cldr/common/main/en.xml @@ -45,6 +45,7 @@ annotations. Old English Obolo Angika + Western Apache Arabic Modern Standard Arabic Aramaic @@ -374,6 +375,7 @@ annotations. Lillooet Livonian Lakota + Ladin Lombard Lingala Lao @@ -414,6 +416,7 @@ annotations. Marshallese Māori Mi'kmaw + Mandaic Minangkabau Macedonian Malayalam @@ -458,6 +461,7 @@ annotations. Kwasio Norwegian Nynorsk Ngiemboon + Wancho Norwegian Nogai Old Norse @@ -520,6 +524,7 @@ annotations. Rajasthani Rapanui Rarotongan + Rejang Romagnol Rohingya Riffian @@ -571,6 +576,9 @@ annotations. Chadian Arabic Sinhala Sidamo + Kildin Sami + Pite Sami + Ume Sami Slovak Slovenian Southern Lushootseed @@ -859,6 +867,7 @@ annotations. + @@ -878,6 +887,7 @@ annotations. + @@ -1082,7 +1092,8 @@ annotations. Guyana Hong Kong SAR China Hong Kong - Heard & McDonald Islands + Heard Island & McDonald Islands + Heard & McDonald Islands Honduras Croatia Haiti @@ -1160,6 +1171,7 @@ annotations. Norway Nepal Nauru + Naoero Niue New Zealand Aotearoa New Zealand @@ -1193,7 +1205,8 @@ annotations. Sudan Sweden Singapore - St. Helena + St. Helena, Ascension & Tristan da Cunha + St. Helena Slovenia Svalbard & Jan Mayen Slovakia @@ -1212,7 +1225,8 @@ annotations. Tristan da Cunha Turks & Caicos Islands Chad - French Southern Territories + French Southern and Antarctic Lands + French Southern Territories Togo Thailand Tajikistan @@ -1405,8 +1419,11 @@ annotations. Sort Accents Normally Sort Accents Reversed Sort Lowercase First + Lowercase Sort Normal Case Order + Lowercase Sort Uppercase First + Uppercase Sort Case Insensitive Sort Case Sensitive Previous Sort Order, for compatibility @@ -1444,15 +1461,25 @@ annotations. Sort Digits Individually Sort Digits Numerically Currency + Currency Digits + Digits Punctuation + Punctuation Whitespace + Whitespace Symbol + Symbol Sort All + All Sort Base Letters Only + Base Letters Only Sort Accents/Case/Width/Kana + Base, Accents, Case, Variants, Kana Sort Accents + Base, Accents Sort Accents/Case/Width + Base, Accents, Case, Variants To Accented Characters From ASCII Sequence To ASCII To Casefolded @@ -1490,6 +1517,10 @@ annotations. First day of week: Tuesday First day of week: Wednesday Hybrid + 12 Hour System + 12 + 24 Hour System + 24 12 Hour System (0–11) 12 (0–11) 12 Hour System (1–12) @@ -1754,6 +1785,10 @@ annotations. POSIX Compliant Locale POSIX variant + + Off + On + Metric UK @@ -2146,6 +2181,16 @@ annotations. + + + + {0}st + {0}nd + {0}rd + {0}th + + + @@ -2173,6 +2218,10 @@ annotations. + + / + : + {1}, {0} @@ -2241,7 +2290,9 @@ annotations. E, M/d/y G MMM y G MMM d, y G + MMM ddd, y G E, MMM d, y G + E, MMM ddd, y G h a h a HH @@ -2259,8 +2310,11 @@ annotations. E, M/d LLL MMM d + MMM ddd E, MMM d + E, MMM ddd MMMM d + MMMM ddd mm:ss y G y G @@ -2269,25 +2323,34 @@ annotations. E, M/d/y G MMM y G MMM d, y G + MMM ddd, y G E, MMM d, y G + E, MMM ddd, y G MMMM y G QQQ y G QQQQ y G + {0} {1} {0} ({2}: {1}) - {0} {1} + {1}, {0} {0} {1} {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) + {1}, {0} {0} {1} {0} ({2}: {1}) {0} {1} + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} h B – h B @@ -2393,6 +2456,10 @@ annotations. E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + MMMM d – MMMM d + y – y G @@ -2522,6 +2589,16 @@ annotations. + + + + {0}st + {0}nd + {0}rd + {0}th + + + @@ -2787,6 +2864,10 @@ annotations. + + / + : + {1}, {0} @@ -2855,7 +2936,14 @@ annotations. E, M/d/y G MMM y G MMM d, y G + MMM ddd, y G E, MMM d, y G + E, MMM ddd, y G + MMMM y G + MMMM d, y G + MMMM ddd, y G + E, MMMM d, y G + E, MMMM ddd, y G h a h a HH @@ -2879,8 +2967,13 @@ annotations. E, M/d LLL MMM d + MMM ddd E, MMM d + E, MMM ddd MMMM d + MMMM ddd + E, MMMM d + E, MMMM ddd 'week' W 'of' MMMM 'week' W 'of' MMMM mm:ss @@ -2890,27 +2983,43 @@ annotations. E, M/d/y MMM y MMM d, y + MMM ddd, y E, MMM d, y + E, MMM ddd, y MMMM y + MMMM d, y + MMMM ddd, y + E, MMMM d, y + E, MMMM ddd, y QQQ y QQQQ y 'week' w 'of' Y 'week' w 'of' Y + ’yy + MMM ’yy + MMM d, ’yy + {0} {1} {0} ({2}: {1}) - {0} {1} + {1}, {0} {0} {1} {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) + {1}, {0} {0} {1} {0} ({2}: {1}) {0} {1} + + {0} – {1} + {0} – {1} + {0}–{1} + {0} – {1} h B – h B @@ -3016,6 +3125,10 @@ annotations. E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + MMMM d – MMMM d + y – y @@ -3382,14 +3495,19 @@ annotations. E, M/d/y G MMM y G MMM d, y G + G y MMM ddd E, MMM d, y G + G y MMM ddd, E L M/d E, M/d LLL MMM d + MMM ddd E, MMM d + MMM ddd, E MMMM d + MMMM ddd y G y G M/y G @@ -3397,7 +3515,9 @@ annotations. E, M/d/y G MMM y G MMM d, y G + MMM ddd, y G E, MMM d, y G + G y MMM ddd, E MMMM y G QQQ y G QQQQ y G @@ -3487,7 +3607,9 @@ annotations. E, M/d/y GGGGG MMM y G MMM d, y G + G y MMM ddd E, MMM d, y G + G y MMM ddd, E EEEE, MMM d, y G L M/d @@ -3495,9 +3617,12 @@ annotations. EEEE, M/d LLL MMM d + MMM ddd E, MMM d + MMM ddd, E EEEE, MMM d MMMM d + MMMM ddd y G y G M/y GGGGG @@ -3507,7 +3632,9 @@ annotations. MM y GGGGG MMM y G MMM d, y G + MMM ddd, y G E, MMM d, y G + G y MMM ddd, E EEEE, MMMM d, y G MMMM y G QQQ y G @@ -4243,16 +4370,6 @@ annotations. Faroes - - - British Summer Time - - - - - Irish Standard Time - - Chagos Archipelago @@ -4345,13 +4462,6 @@ annotations. AKDT - - - Almaty Time - Almaty Standard Time - Almaty Summer Time - - Amazon Time @@ -4416,23 +4526,9 @@ annotations. - Samoa Time - Samoa Standard Time - Samoa Daylight Time - - - - - Aqtau Time - Aqtau Standard Time - Aqtau Summer Time - - - - - Aqtobe Time - Aqtobe Standard Time - Aqtobe Summer Time + West Samoa Time + West Samoa Standard Time + West Samoa Daylight Time @@ -4541,6 +4637,12 @@ annotations. Brasilia Summer Time + + + British Time + British Summer Time + + Brunei Time @@ -4689,7 +4791,7 @@ annotations. - French Southern & Antarctic Time + French Southern Territories Time @@ -4743,11 +4845,6 @@ annotations. West Greenland Summer Time - - - Guam Standard Time - - Gulf Standard Time @@ -4760,7 +4857,7 @@ annotations. - Hawaii-Aleutian Standard Time + Hawaii Time HST @@ -4829,6 +4926,12 @@ annotations. Iran Daylight Time + + + Irish Time + Irish Standard Time + + Irkutsk Time @@ -4896,11 +4999,6 @@ annotations. Kyrgyzstan Time - - - Lanka Time - - Line Islands Time @@ -4913,13 +5011,6 @@ annotations. Lord Howe Daylight Time - - - Macao Time - Macao Standard Time - Macao Summer Time - - Magadan Time @@ -5035,11 +5126,6 @@ annotations. Fernando de Noronha Summer Time - - - Northern Mariana Islands Time - - Novosibirsk Time @@ -5119,13 +5205,6 @@ annotations. North Korea Time - - - Kyzylorda Time - Kyzylorda Standard Time - Kyzylorda Summer Time - - Réunion Time @@ -5152,9 +5231,7 @@ annotations. - American Samoa Time - American Samoa Standard Time - American Samoa Daylight Time + American Samoa Time @@ -5247,6 +5324,11 @@ annotations. Uruguay Summer Time + + + Ürümqi Time + + Uzbekistan Time @@ -5842,11 +5924,6 @@ annotations. Chinese yuan (offshore) CNH - - Chinese People’s Bank Dollar - Chinese People’s Bank dollar - Chinese People’s Bank dollars - Chinese Yuan Chinese yuan @@ -7182,10 +7259,10 @@ annotations. {0} day {0} days - Take the {0}rd right. Take the {0}st right. - Take the {0}th right. Take the {0}nd right. + Take the {0}rd right. + Take the {0}th right. @@ -7665,11 +7742,21 @@ annotations. {0} pound of force {0} pounds of force + + poundal + {0} poundal + {0} poundal + newtons {0} newton {0} newtons + + dynes + {0} dyne + {0} dynes + kilowatt-hours per 100 kilometers {0} kilowatt-hour per 100 kilometers @@ -7805,6 +7892,11 @@ annotations. {0} inches {0} per inch + + mils + {0} mil + {0} mils + parsecs {0} parsec @@ -8969,11 +9061,21 @@ annotations. {0} lbf {0} lbf + + pdl + {0} pdl + {0} pdls + newton {0} N {0} N + + dyne + {0} dyne + {0} dynes + kWh/100km {0} kWh/100km @@ -9109,6 +9211,11 @@ annotations. {0} in {0}/in + + mil + {0} mil + {0} mil + parsecs {0} pc @@ -9533,9 +9640,9 @@ annotations. {0} fl oz Imp. - tbsp - {0} tbsp - {0} tbsp + Tbsp + {0} Tbsp + {0} Tbsp tsp @@ -10270,11 +10377,21 @@ annotations. {0}lbf {0}lbf + + pdl + {0}pdl + {0}pdls + N {0}N {0}N + + dyn + {0}dyn + {0}dyn + kWh/100km {0}kWh/100km @@ -10410,6 +10527,11 @@ annotations. {0}″ {0}/in + + mil + {0}mil + {0}mil + parsec {0}pc @@ -10835,9 +10957,9 @@ annotations. {0}fl oz Im - tbsp - {0}tbsp - {0}tbsp + Tbsp + {0}Tbsp + {0}Tbsp tsp diff --git a/make/data/cldr/common/main/en_001.xml b/make/data/cldr/common/main/en_001.xml index 439bcb3e4eb5..8b5ab2f9304a 100644 --- a/make/data/cldr/common/main/en_001.xml +++ b/make/data/cldr/common/main/en_001.xml @@ -19,13 +19,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Creek West Low German + + + St Barthélemy St Kitts & Nevis St Lucia St Martin St Pierre & Miquelon - St Helena + St Helena, Ascension & Tristan da Cunha + St Helena US Outlying Islands St Vincent & the Grenadines US Virgin Islands @@ -33,14 +37,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Case-Sensitive Sorting Normalised Sorting + Line Breaks Within Words + Hijri, Saudi Arabia Sighting + European Rules + Korean Initial Consonant Sort Without Normalisation Sort Unicode Normalised + 12-Hour System + 24-Hour System 12-Hour System (0–11) 12-Hour System (1–12) 24-Hour System (0–23) 24-Hour System (1–24) + Shift Spaces, Punctuation, All Symbols + Shift Spaces, Punctuation + Shift Spaces, Punctuation + Shift Spaces, Punctuation, Non-currency Symbols + Armenian Lowercase + Full-Width + Greek Lowercase + Han-Character Day-of-Month Numbering for Traditional Calendars + Simplified Chinese Financial + Traditional Chinese Financial + Japanese Financial + Japanese First-Year Gannen Numbering + Tai Tham Tham (Ecclesiastical) + Mathematical Bold + Mathematical Double-Struck + Mathematical Monospace + Mathematical Sans-Serif Bold + Mathematical Sans Serif + Myanmar Pa’O + Native Digits + Roman Uppercase + Roman Lowercase + Traditional Numerals + POSIX Variant @@ -166,18 +200,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd/MM/y GGGGG E, dd/MM/y G d MMM y G + ddd MMM y G E, d MMM y G + E, ddd MMM y G + EEEE, d MMM y G LL dd/MM E, dd/MM d MMM + ddd MMM E, d MMM + ddd MMM, E + EEEE d MMM d MMMM + ddd MMMM + EEEE d MMMM MM/y GGGGG dd/MM/y GGGGG E, dd/MM/y GGGGG d MMM y G + ddd MMM y G E, d MMM y G + EEEE, d MMM y G + EEEE, d MMMM y G @@ -210,6 +255,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y G E, d MMM y – E, d MMM y G + + EEEE d MMM – EEEE d MMM y G + EEEE d MMM y G – EEEE d MMM y G + EEEE d MMM – EEEE d MMM y G + EEEE d MMM y – EEEE d MMM y G + M–M @@ -229,6 +280,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d – E d MMM E d MMM – E d MMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -256,6 +311,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y G E, d MMM y – E, d MMM y G + + EEEE d MMM – EEEE d MMM y G + EEEE d MMM – EEEE d MMM y G + EEEE d MMM y – EEEE d MMM y G + + + EEEE d MMMM – EEEE d MMMM y G + EEEE d MMMM – EEEE d MMMM y G + EEEE d MMMM y – EEEE d MMMM y G + @@ -328,17 +393,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd/MM/y G d MMM y G E, d MMM y G + E, ddd MMM y G + EEEE, d MMM y G + d MMMM y G + ddd MMMM y G + E, d MMMM y G + E, ddd MMMM y G dd/MM E, dd/MM dd/MM d MMM + ddd MMM E, d MMM + E ddd MMM + EEEE d MMM d MMMM + ddd MMMM + E d MMMM + E ddd MMMM + EEEE d MMMM MM/y dd/MM/y E, dd/MM/y d MMM y + ddd MMM y E, d MMM y + E, ddd MMM y + EEEE, d MMM y + d MMMM y + E, d MMMM y + EEEE, d MMMM y + d MMM ’yy @@ -368,6 +453,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y G E, d MMM y – E, d MMM y G + + EEEE d MMM – EEEE d MMM y G + EEEE d MMM y G – EEEE d MMM y G + EEEE d MMM – EEEE d MMM y G + EEEE d MMM y – EEEE d MMM y G + h–h a @@ -388,9 +479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH–HH v - - M–M - dd/MM – dd/MM dd/MM – dd/MM @@ -400,15 +488,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd/MM – E dd/MM - d–d MMM + d – d MMM d MMM – d MMM E d – E d MMM E d MMM – E d MMM - - y–y + + d – d MMMM + d MMMM – d MMMM MM/y – MM/y @@ -434,6 +523,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y E, d MMM y – E, d MMM y + + EEEE d MMM – EEEE d MMM y + EEEE d MMM – EEEE d MMM y + EEEE d MMM y – EEEE d MMM y + + + EEEE d MMMM – EEEE d MMMM y + EEEE d MMMM – EEEE d MMMM y + EEEE d MMMM y – EEEE d MMMM y + @@ -471,12 +570,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd/MM E dd/MM d MMM + ddd MMM E d MMM + E ddd MMM d MMMM + ddd MMMM MM/y GGGGG dd/MM/y GGGGG E, dd/MM/y GGGGG d MMM y G + ddd MMM y G E, d MMM y G @@ -509,19 +612,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d dd/MM/y GGGGG + E, dd/MM/y GGGGG d MMM y G E, d MMM y G + EEEE, d MMM y G LL dd/MM E, dd/MM + EEEE, d/M d MMM + ddd MMM E, d MMM + ddd MMM, E + EEEE, d MMM d MMMM + ddd MMMM + EEEE, d MMMM MM/y GGGGG dd/MM/y GGGGG E, dd/MM/y GGGGG + EEEE, d MMMM y G d MMM y G + ddd MMM y G E, d MMM y G + EEEE, d MMMM y G + EEEE, d MMMM y G @@ -996,6 +1111,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Afghan afghani Afghan afghanis + + Bangladeshi taka + Bermudian Dollar Bermudian dollar @@ -1051,11 +1169,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ St Helena pound St Helena pounds + + Sierra Leonean Leone (1964–2022) + Sierra Leonean leone (1964–2022) + Sierra Leonean leones (1964–2022) + Tajikistani Rouble Tajikistani rouble Tajikistani roubles + + Turkish lira + US$ @@ -1315,6 +1441,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} US quart {0} US quarts + + US pints + {0} US pint + {0} US pints + + + US cups + {0} US cup + {0} US cups + US fluid ounces {0} US fluid ounce @@ -1465,6 +1601,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} US qt {0} US qt + + US pints + {0} US pt + {0} US pt + + + US cups + {0} US c + {0} US c + US fl oz {0} US fl oz @@ -1475,6 +1621,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl oz {0} fl oz + + tbsp + {0} tbsp + {0} tbsp + US dstspn {0} US dstspn @@ -1501,6 +1652,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt {0} qt + + {0} BTU-IT + + + {0}°R + {0}°R + @@ -1610,6 +1768,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}USqt {0}USqt + + US pt + {0}USpt + {0}USpt + + + US cup + {0}USc + {0}USc + US fl oz {0}US fl oz @@ -1620,6 +1788,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}fl oz {0}fl oz + + tbsp + {0}tbsp + {0}tbsp + US dsp {0}US dsp @@ -1638,6 +1811,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt {0}qt + + {0} BTU-IT + + + {0}°R + {0}°R + @@ -1670,6 +1850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ maths symbol + {0} Mr diff --git a/make/data/cldr/common/main/en_AE.xml b/make/data/cldr/common/main/en_AE.xml index 4e51414e9a77..e4237c96b638 100644 --- a/make/data/cldr/common/main/en_AE.xml +++ b/make/data/cldr/common/main/en_AE.xml @@ -241,6 +241,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM y + + {0} – {1} + dd/MM – dd/MM dd/MM – dd/MM diff --git a/make/data/cldr/common/main/en_AU.xml b/make/data/cldr/common/main/en_AU.xml index 15f43611d4f0..4d2076baa617 100644 --- a/make/data/cldr/common/main/en_AU.xml +++ b/make/data/cldr/common/main/en_AU.xml @@ -29,8 +29,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ceuta and Melilla South Georgia and South Sandwich Islands Heard Island and McDonald Islands + Heard and McDonald Islands St Kitts and Nevis St Pierre and Miquelon + St Helena, Ascension and Tristan da Cunha Svalbard and Jan Mayen São Tomé and Príncipe Turks and Caicos Islands @@ -39,24 +41,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wallis and Futuna - Upper case / Lower case Ordering + Upper-case/Lower-case ordering Private Use - Private Use Transform Korean Calendar Ethiopian Calendar + + [áàăâåäãā æ ç éèĕêëē íìĭîïī ḻ ñṉ ŋ óòŏôöøō œ ṯ úùŭûüū ÿ] + E, d/M/y G - EEEE d MMM y G - EEEE d MMM - EEEE d MMMM dd/MM/y E, dd/MM/y EEEE d MMM y G @@ -87,54 +88,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic EEEE d MMM – EEEE d MMM EEEE d MMM – EEEE d MMM + + d – d MMMM + E, d MMM – E, d MMM y G - - EEEE d MMM – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G - - - EEEE d MMMM – EEEE d MMMM y G - EEEE d MMMM – EEEE d MMMM y G - EEEE d MMMM y – EEEE d MMMM y G - - - - - Jan - Feb - Mar - Apr - May - June - July - Aug - Sept - Oct - Nov - Dec - - - - - - - Su. - M. - Tu. - W. - Th. - F. - Sa. - - - @@ -243,12 +206,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic + ddd MMM y G + E ddd MMM y G EEEE d MMM y G + E d MMMM y G + E ddd MMMM y G d/M - E, d/M - EEEE d MMM - EEEE d MMMM + E dd/MM + E d MMM + E dd/MM/y + E d MMM y + E ddd MMM y EEEE d MMM y + E d MMMM y EEEE d MMMM y @@ -259,26 +229,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic d/M/y – d/M/y G - E, d/M/y – E, d/M/y G - E, d/M/y G – E, d/M/y G - E, d/M/y – E, d/M/y G - E, d/M/y – E, d/M/y G + E dd/MM/y – E dd/MM/y G + E dd/MM/y G – E dd/MM/y G + E dd/MM/y – E dd/MM/y G + E dd/MM/y – E dd/MM/y G + + + d–d MMM y G - - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y G – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G + + E d MMM – E d MMM y G + E d MMM y G – E d MMM y G + E d MMM – E d MMM y G + E d MMM y – E d MMM y G + + + E d MMM – E d MMM + + + d–d MMMM + + + E dd/MM/y – E dd/MM/y + E dd/MM/y – E dd/MM/y + E dd/MM/y – E dd/MM/y + + + E d MMM – E d MMM y + E d MMM – E d MMM y + E d MMM y – E d MMM y EEEE d – EEEE d MMM y - EEEE d MMM – EEEE d MMM y - EEEE d MMM y – EEEE d MMM y EEEE d – EEEE d MMMM y - EEEE d MMMM – EEEE d MMMM y - EEEE d MMMM y – EEEE d MMMM y @@ -286,7 +271,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic + EEEE, d MMM y G E, d MMM + ddd MMM, E + ddd MMM, y G + G y ddd MMM, E + + + + + + + E, d/M/y GGGGG + G y ddd MMM + G y, E ddd MMM + EEEE, d MMMM, y G + ddd MMM, y G + G y ddd MMM, E + EEEE, d MMMM, y G @@ -485,13 +487,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic NZDT - - - American Samoa Time - American Samoa Standard Time - Samoa Summer Time - - Taiwan Time @@ -630,11 +625,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kr - - Sierra Leonean Leone (1964–2022) - Sierra Leonean leone (1964–2022) - Sierra Leonean leones (1964–2022) - Suriname Dollar Suriname dollar diff --git a/make/data/cldr/common/main/en_BW.xml b/make/data/cldr/common/main/en_BW.xml index 962743ebb05a..3510de58661c 100644 --- a/make/data/cldr/common/main/en_BW.xml +++ b/make/data/cldr/common/main/en_BW.xml @@ -146,6 +146,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, dd MMM y + + {0} – {1} + dd – dd MMM dd MMM – dd MMM diff --git a/make/data/cldr/common/main/en_BZ.xml b/make/data/cldr/common/main/en_BZ.xml index c8b650e7ca52..5c982b44912b 100644 --- a/make/data/cldr/common/main/en_BZ.xml +++ b/make/data/cldr/common/main/en_BZ.xml @@ -149,6 +149,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, dd MMM y + + {0} – {1} + M/d – M/d M/d – M/d diff --git a/make/data/cldr/common/main/en_CA.xml b/make/data/cldr/common/main/en_CA.xml index 4230ba6d833b..f76711b14e58 100644 --- a/make/data/cldr/common/main/en_CA.xml +++ b/make/data/cldr/common/main/en_CA.xml @@ -34,7 +34,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Macau Saint-Pierre-et-Miquelon Palestinian territories - Saint Helena + Saint Helena, Ascension & Tristan da Cunha + Saint Helena Svalbard and Jan Mayen São Tomé and Príncipe Turks and Caicos Islands @@ -82,6 +83,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic First day of week is Thursday First day of week is Tuesday First day of week is Wednesday + 12-hour system + 24-hour system 12-hour system (0–11) 12-hour system (1–12) 24-hour system (0–23) @@ -471,6 +474,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + {1}, {0} @@ -506,6 +512,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d/M/y + + {0}–{1} + {0}–{1} + {0}–{1} h B–h B @@ -1142,7 +1152,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic US$ - Cg + Cg unknown currency @@ -1649,6 +1659,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} fl oz {0} fl oz + + tbsp + {0} tbsp + {0} tbsp + dssp {0} dssp @@ -1797,6 +1812,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}fl oz {0}fl oz + + tbsp + {0}tbsp + {0}tbsp + dsp {0}dsp diff --git a/make/data/cldr/common/main/en_Dsrt.xml b/make/data/cldr/common/main/en_Dsrt.xml deleted file mode 100644 index 06e85d5decb5..000000000000 --- a/make/data/cldr/common/main/en_Dsrt.xml +++ /dev/null @@ -1,884 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 𐐎𐐲𐑉𐑊𐐼 - 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐤𐐱𐑉𐑃 𐐊𐑋𐐯𐑉𐐲𐐿𐐲 - 𐐝𐐵𐑃 𐐊𐑋𐐯𐑉𐐲𐐿𐐲 - 𐐄𐑇𐐨𐐰𐑌𐐨𐐲 - 𐐎𐐯𐑅𐐻𐐲𐑉𐑌 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐊𐑋𐐯𐑉𐐲𐐿𐐲 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐤𐐱𐑉𐑄𐐲𐑉𐑌 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐣𐐮𐐼𐑊 𐐈𐑁𐑉𐐮𐐿𐐲 - 𐐝𐐲𐑄𐐲𐑉𐑌 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐊𐑋𐐯𐑉𐐲𐐿𐐲𐑆 - 𐐤𐐱𐑉𐑄𐐲𐑉𐑌 𐐊𐑋𐐯𐑉𐐲𐐿𐐲 - 𐐗𐐯𐑉𐐲𐐺𐐨𐐲𐑌 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐁𐑈𐐲 - 𐐝𐐲𐑄𐐲𐑉𐑌 𐐁𐑈𐐲 - 𐐝𐐵𐑃-𐐀𐑅𐐻𐐲𐑉𐑌 𐐁𐑈𐐲 - 𐐝𐐲𐑄𐐲𐑉𐑌 𐐏𐐲𐑉𐐲𐐹 - 𐐉𐑅𐐻𐑉𐐩𐑊𐐨𐐲 𐐰𐑌𐐼 𐐤𐐭 𐐞𐐨𐑊𐐲𐑌𐐼 - 𐐣𐐯𐑊𐐲𐑌𐐨𐑈𐐲 - 𐐣𐐴𐐿𐑉𐐲𐑌𐐨𐑈𐐲𐑌 𐐡𐐨𐐾𐐲𐑌 - 𐐑𐐪𐑊𐐲𐑌𐐨𐑈𐐲 - 𐐁𐑈𐐲 - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐁𐑈𐐲 - 𐐎𐐯𐑅𐐻𐐲𐑉𐑌 𐐁𐑈𐐲 - 𐐏𐐲𐑉𐐲𐐹 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐏𐐲𐑉𐐲𐐹 - 𐐤𐐱𐑉𐑄𐐲𐑉𐑌 𐐏𐐲𐑉𐐲𐐹 - 𐐎𐐯𐑅𐐻𐐲𐑉𐑌 𐐏𐐲𐑉𐐲𐐹 - 𐐢𐐰𐐻𐑌 𐐊𐑋𐐯𐑉𐐲𐐿𐐲 𐐰𐑌𐐼 𐑄 𐐗𐐯𐑉𐐲𐐺𐐨𐐲𐑌 - 𐐈𐑌𐐼𐐱𐑉𐐲 - 𐐏𐐭𐑌𐐴𐐼𐐮𐐼 𐐇𐑉𐐲𐐺 𐐇𐑋𐐲𐑉𐐩𐐻𐑅 - 𐐈𐑁𐑀𐐰𐑌𐐲𐑅𐐻𐐰𐑌 - 𐐈𐑌𐐻𐐨𐑀𐐶𐐲 𐐰𐑌𐐼 𐐒𐐪𐑉𐐺𐐷𐐭𐐼𐐲 - 𐐈𐑍𐑀𐐶𐐮𐑊𐐲 - 𐐈𐑊𐐺𐐩𐑌𐐨𐐲 - 𐐂𐑉𐑋𐐨𐑌𐐨𐐲 - 𐐈𐑌𐑀𐐬𐑊𐐲 - 𐐈𐑌𐐻𐐪𐑉𐐿𐐻𐐮𐐿𐐲 - 𐐂𐑉𐐾𐐲𐑌𐐻𐐨𐑌𐐲 - 𐐊𐑋𐐯𐑉𐐲𐐿𐐲𐑌 𐐝𐐲𐑋𐐬𐐲 - 𐐉𐑅𐐻𐑉𐐨𐐲 - 𐐉𐑅𐐻𐑉𐐩𐑊𐐨𐐲 - 𐐊𐑉𐐭𐐺𐐲 - 𐐈𐑊𐐰𐑌𐐼 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐈𐑆𐐲𐑉𐐺𐐴𐑈𐐪𐑌 - 𐐒𐐱𐑆𐑌𐐨𐐲 𐐰𐑌𐐼 𐐐𐐲𐑉𐐻𐑅𐐲𐑀𐐬𐑂𐐨𐑌𐐲 - 𐐒𐐪𐑉𐐺𐐩𐐼𐐬𐑅 - 𐐒𐐪𐑍𐑀𐑊𐐲𐐼𐐯𐑇 - 𐐒𐐯𐑊𐐾𐐲𐑋 - 𐐒𐐲𐑉𐐿𐐩𐑌𐐲 𐐙𐐰𐑅𐐬 - 𐐒𐐲𐑊𐑀𐐯𐑉𐐨𐐲 - 𐐒𐐪𐑉𐐩𐑌 - 𐐒𐐲𐑉𐐳𐑌𐐼𐐨 - 𐐒𐐲𐑌𐐨𐑌 - 𐐝𐐩𐑌𐐻 𐐒𐐪𐑉𐐻𐐩𐑊𐐲𐑋𐐨 - 𐐒𐐲𐑉𐑋𐐷𐐭𐐼𐐲 - 𐐒𐑉𐐭𐑌𐐴 - 𐐒𐐬𐑊𐐮𐑂𐐨𐐲 - 𐐒𐑉𐐲𐑆𐐮𐑊 - 𐐒𐐲𐐸𐐪𐑋𐐲𐑅 - 𐐒𐐭𐐻𐐪𐑌 - 𐐒𐐭𐑂𐐩 𐐌𐑊𐐲𐑌𐐼 - 𐐒𐐪𐐻𐑅𐐶𐐪𐑌𐐲 - 𐐒𐐯𐑊𐐲𐑉𐐭𐑅 - 𐐒𐐲𐑊𐐨𐑆 - 𐐗𐐰𐑌𐐲𐐼𐐲 - 𐐗𐐬𐐿𐐬𐑆 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐗𐐪𐑍𐑀𐐬 - 𐐗𐐲𐑌𐑇𐐪𐑅𐐲 - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐈𐑁𐑉𐐲𐐿𐐲𐑌 𐐡𐐨𐐹𐐲𐐺𐑊𐐮𐐿 - 𐐗𐐪𐑍𐑀𐐬 - 𐐒𐑉𐐪𐑆𐐲𐑂𐐮𐑊 - 𐐝𐐶𐐮𐐻𐑅𐐲𐑉𐑊𐐲𐑌𐐼 - 𐐌𐑂𐑉𐐨 𐐗𐐬𐑅𐐻 - 𐐗𐐳𐐿 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐕𐐨𐑊𐐩 - 𐐗𐐰𐑋𐐲𐑉𐐭𐑌 - 𐐕𐐴𐑌𐐲 - 𐐗𐐲𐑊𐐲𐑋𐐺𐐨𐐲 - 𐐗𐐱𐑅𐐻𐐲 𐐡𐐨𐐿𐐲 - 𐐗𐐷𐐭𐐺𐐲 - 𐐗𐐩𐐹 𐐚𐐯𐑉𐐼𐐨 - 𐐗𐑉𐐮𐑅𐑋𐐲𐑅 𐐌𐑊𐐲𐑌𐐼 - 𐐝𐐴𐐹𐑉𐐲𐑅 - 𐐕𐐯𐐿 𐐡𐐨𐐹𐐲𐐺𐑊𐐮𐐿 - 𐐖𐐲𐑉𐑋𐐲𐑌𐐨 - 𐐖𐐲𐐺𐐭𐐼𐐨 - 𐐔𐐯𐑌𐑋𐐪𐑉𐐿 - 𐐔𐐪𐑋𐐲𐑌𐐨𐐿𐐲 - 𐐔𐐲𐑋𐐮𐑌𐐲𐐿𐐲𐑌 𐐡𐐨𐐹𐐲𐐺𐑊𐐮𐐿 - 𐐈𐑊𐐾𐐮𐑉𐐨𐐲 - 𐐇𐐿𐐶𐐲𐐼𐐱𐑉 - 𐐇𐑅𐐻𐐬𐑌𐐨𐐲 - 𐐀𐐾𐐲𐐹𐐻 - 𐐎𐐯𐑅𐐻𐐲𐑉𐑌 𐐝𐐲𐐸𐐱𐑉𐐲 - 𐐇𐑉𐐮𐐻𐑉𐐨𐐲 - 𐐝𐐹𐐩𐑌 - 𐐀𐑃𐐨𐐬𐐹𐐨𐐲 - 𐐏𐐲𐑉𐐲𐐹𐐨𐐲𐑌 𐐏𐐭𐑌𐐷𐐲𐑌 - 𐐙𐐮𐑌𐑊𐐲𐑌𐐼 - 𐐙𐐨𐐾𐐨 - 𐐙𐐪𐑊𐐿𐑊𐐲𐑌𐐼 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐣𐐴𐐿𐑉𐐲𐑌𐐨𐑈𐐲 - 𐐙𐐯𐑉𐐬 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐙𐑉𐐰𐑌𐑅 - 𐐘𐐲𐐺𐐪𐑌 - 𐐏𐐭𐑌𐐴𐐻𐐲𐐼 𐐗𐐨𐑍𐐼𐐲𐑋 - 𐐘𐑉𐐲𐑌𐐩𐐼𐐲 - 𐐖𐐱𐑉𐐾𐐲 - 𐐙𐑉𐐯𐑌𐐽 𐐘𐐨𐐪𐑌𐐲 - 𐐘𐐲𐑉𐑌𐑆𐐨 - 𐐘𐐪𐑌𐐲 - 𐐖𐐲𐐺𐑉𐐱𐑊𐐻𐐲𐑉 - 𐐘𐑉𐐨𐑌𐑊𐐲𐑌𐐼 - 𐐘𐐰𐑋𐐺𐐨𐐲 - 𐐘𐐮𐑌𐐨 - 𐐘𐐶𐐪𐐼𐐲𐑊𐐭𐐹 - 𐐇𐐿𐐶𐐲𐐻𐐱𐑉𐐨𐐲𐑊 𐐘𐐮𐑌𐐨 - 𐐘𐑉𐐨𐑅 - 𐐝𐐵𐑃 𐐖𐐱𐑉𐐾𐐲 𐐰𐑌𐐼 𐑄 𐐝𐐵𐑃 𐐝𐐰𐑌𐐼𐐶𐐮𐐽 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐘𐐶𐐪𐐼𐐲𐑋𐐪𐑊𐐲 - 𐐘𐐶𐐪𐑋 - 𐐘𐐮𐑌𐐨-𐐒𐐮𐑅𐐵 - 𐐘𐐴𐐰𐑌𐐲 - 𐐐𐐬𐑍 𐐗𐐬𐑍 𐐝𐐈𐐡 𐐕𐐴𐑌𐐲 - 𐐐𐐬𐑍 𐐗𐐬𐑍 - 𐐐𐐲𐑉𐐼 𐐌𐑊𐐲𐑌𐐼 𐐰𐑌𐐼 𐐣𐐿𐐔𐐱𐑌𐐲𐑊𐐼 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐐𐐪𐑌𐐼𐐭𐑉𐐲𐑅 - 𐐗𐑉𐐬𐐩𐑇𐐲 - 𐐐𐐩𐐻𐐨 - 𐐐𐐲𐑍𐑀𐐲𐑉𐐨 - 𐐆𐑌𐐼𐐲𐑌𐐨𐑈𐐲 - 𐐌𐑉𐑊𐐲𐑌𐐼 - 𐐆𐑆𐑉𐐨𐐲𐑊 - 𐐌𐐲𐑊 𐐲𐑁 𐐣𐐰𐑌 - 𐐆𐑌𐐼𐐨𐐲 - 𐐒𐑉𐐮𐐼𐐮𐑇 𐐆𐑌𐐼𐐨𐐲𐑌 𐐄𐑇𐐲𐑌 𐐓𐐯𐑉𐐲𐐻𐐱𐑉𐐨 - 𐐆𐑉𐐰𐐿 - 𐐆𐑉𐐪𐑌 - 𐐌𐑅𐑊𐐲𐑌𐐼 - 𐐆𐐻𐐲𐑊𐐨 - 𐐖𐐲𐑉𐑆𐐨 - 𐐖𐐲𐑋𐐩𐐿𐐲 - 𐐖𐐱𐑉𐐼𐐲𐑌 - 𐐖𐐲𐐹𐐰𐑌 - 𐐗𐐯𐑌𐐷𐐲 - 𐐗𐐮𐑉𐑀𐐲𐑅𐐻𐐰𐑌 - 𐐗𐐰𐑋𐐺𐐬𐐼𐐨𐐲 - 𐐗𐐮𐑉𐐲𐐺𐐪𐐻𐐨 - 𐐗𐐪𐑋𐐲𐑉𐐬𐑆 - 𐐝𐐩𐑌𐐻 𐐗𐐮𐐻𐑅 𐐰𐑌𐐼 𐐤𐐨𐑂𐐮𐑅 - 𐐤𐐱𐑉𐑃 𐐗𐐲𐑉𐐨𐐲 - 𐐝𐐵𐑃 𐐗𐐲𐑉𐐨𐐲 - 𐐗𐐲𐐶𐐩𐐻 - 𐐗𐐩𐑋𐐲𐑌 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐗𐐲𐑆𐐪𐐿𐑅𐐻𐐪𐑌 - 𐐢𐐪𐐬𐑅 - 𐐢𐐯𐐺𐐲𐑌𐐪𐑌 - 𐐢𐐮𐐿𐐻𐐲𐑌𐑅𐐻𐐴𐑌 - 𐐟𐑉𐐨 𐐢𐐰𐑍𐐿𐐲 - 𐐢𐐴𐐺𐐮𐑉𐐨𐐲 - 𐐢𐐲𐑅𐐬𐑃𐐬 - 𐐢𐐮𐑃𐐲𐐶𐐩𐑌𐐨𐐲 - 𐐢𐐲𐐿𐑅𐐲𐑋𐐺𐐲𐑉𐑀 - 𐐢𐐰𐐻𐑂𐐨𐐲 - 𐐢𐐮𐐺𐐨𐐲 - 𐐣𐐲𐑉𐐪𐐿𐐬 - 𐐣𐐪𐑌𐐲𐐿𐐬 - 𐐣𐐱𐑊𐐼𐐬𐑂𐐲 - 𐐣𐐪𐑌𐐲𐑌𐐨𐑀𐑉𐐬 - 𐐝𐐩𐑌𐐻 𐐣𐐪𐑉𐐻𐑌 - 𐐣𐐰𐐼𐐲𐑀𐐰𐑅𐐿𐐲𐑉 - 𐐣𐐪𐑉𐑇𐐲𐑊 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐣𐐰𐑅𐐲𐐼𐐬𐑌𐐨𐐲 - 𐐣𐐪𐑊𐐨 - 𐐣𐐨𐐲𐑌𐑋𐐪𐑉 - 𐐣𐐪𐑍𐑀𐐬𐑊𐐨𐐲 - 𐐣𐐲𐐿𐐵 𐐝𐐈𐐡 𐐕𐐴𐑌𐐲 - 𐐣𐐲𐐿𐐵 - 𐐤𐐱𐑉𐑄𐐲𐑉𐑌 𐐣𐐰𐑉𐐨𐐱𐑌𐐲 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐣𐐪𐑉𐐻𐑌𐐨𐐿 - 𐐣𐐱𐑉𐐲𐐻𐐩𐑌𐐨𐐲 - 𐐣𐐪𐑌𐐻𐑅𐐲𐑉𐐪𐐻 - 𐐣𐐱𐑊𐐻𐐲 - 𐐣𐐱𐑉𐐮𐑇𐐲𐑅 - 𐐣𐐪𐑊𐐼𐐨𐑂𐑆 - 𐐣𐐲𐑊𐐪𐐶𐐨 - 𐐣𐐯𐐿𐑅𐐲𐐿𐐬 - 𐐣𐐲𐑊𐐩𐑈𐐲 - 𐐣𐐬𐑆𐐰𐑋𐐺𐐨𐐿 - 𐐤𐐲𐑋𐐮𐐺𐐨𐐲 - 𐐤𐐭 𐐗𐐰𐑊𐐲𐐼𐐬𐑌𐐷𐐲 - 𐐤𐐴𐐾𐐲𐑉 - 𐐤𐐱𐑉𐑁𐐲𐐿 𐐌𐑊𐐲𐑌𐐼 - 𐐤𐐴𐐾𐐮𐑉𐐨𐐲 - 𐐤𐐮𐐿𐐲𐑉𐐪𐑀𐐶𐐲 - 𐐤𐐯𐑄𐐲𐑉𐑊𐐲𐑌𐐼𐑆 - 𐐤𐐱𐑉𐐶𐐩 - 𐐤𐐩𐐹𐐪𐑊 - 𐐤𐐪𐐭𐑉𐐭 - 𐐤𐐷𐐭𐐩 - 𐐤𐐭 𐐞𐐨𐑊𐐲𐑌𐐼 - 𐐄𐑋𐐲𐑌 - 𐐑𐐰𐑌𐐲𐑋𐐪 - 𐐑𐐲𐑉𐐭 - 𐐙𐑉𐐯𐑌𐐽 𐐑𐐪𐑊𐐲𐑌𐐨𐑈𐐲 - 𐐑𐐰𐐹𐐷𐐳𐐲 𐐤𐐭 𐐘𐐮𐑌𐐨 - 𐐙𐐮𐑊𐐲𐐹𐐨𐑌𐑆 - 𐐑𐐰𐐿𐐲𐑅𐐻𐐰𐑌 - 𐐑𐐬𐑊𐐲𐑌𐐼 - 𐐝𐐩𐑌𐐻 𐐑𐐨𐐯𐑉 𐐰𐑌𐐼 𐐣𐐨𐐿𐐲𐑊𐐪𐑌 - 𐐑𐐮𐐻𐐿𐐯𐑉𐑌 - 𐐑𐐶𐐯𐑉𐐻𐐬 𐐡𐐨𐐿𐐬 - 𐐑𐐰𐑊𐐲𐑅𐐻𐐮𐑌𐐨𐐲𐑌 𐐓𐐯𐑉𐐲𐐻𐐱𐑉𐐨 - 𐐑𐐱𐑉𐐽𐐲𐑀𐐲𐑊 - 𐐑𐐲𐑊𐐵 - 𐐑𐐯𐑉𐐲𐑀𐐶𐐴 - 𐐗𐐲𐐻𐐪𐑉 - 𐐍𐐻𐑊𐐴𐐮𐑍 𐐄𐑇𐐨𐐰𐑌𐐨𐐲 - 𐐡𐐨𐐷𐐭𐑌𐐷𐐲𐑌 - 𐐡𐐬𐑋𐐩𐑌𐐨𐐲 - 𐐝𐐲𐑉𐐺𐐨𐐲 - 𐐡𐐲𐑇𐐲 - 𐐡𐐲𐐶𐐪𐑌𐐼𐐲 - 𐐝𐐵𐐼𐐨 𐐊𐑉𐐩𐐺𐐨𐐲 - 𐐝𐐪𐑊𐐲𐑋𐐲𐑌 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐝𐐩𐑇𐐯𐑊𐑆 - 𐐝𐐭𐐼𐐰𐑌 - 𐐝𐐶𐐨𐐼𐑌 - 𐐝𐐮𐑍𐐲𐐹𐐱𐑉 - 𐐝𐐩𐑌𐐻 𐐐𐐯𐑊𐐲𐑌𐐲 - 𐐝𐑊𐐬𐑂𐐨𐑌𐐨𐐲 - 𐐝𐑂𐐪𐑊𐐺𐐪𐑉𐐼 𐐰𐑌𐐼 𐐖𐐰𐑌 𐐣𐐴𐐲𐑌 - 𐐝𐑊𐐬𐑂𐐪𐐿𐐨𐐲 - 𐐝𐐨𐐯𐑉𐐲 𐐢𐐨𐐬𐑌 - 𐐝𐐪𐑌 𐐣𐐲𐑉𐐨𐑌𐐬 - 𐐝𐐯𐑌𐐲𐑀𐐱𐑊 - 𐐝𐐲𐑋𐐪𐑊𐐨𐐲 - 𐐝𐐭𐑉𐐲𐑌𐐪𐑋 - 𐐝𐐵 𐐓𐐬𐑋 𐐰𐑌𐐼 𐐑𐑉𐐮𐑌𐐽𐐮𐐹𐐩 - 𐐇𐑊 𐐝𐐰𐑊𐑂𐐲𐐼𐐱𐑉 - 𐐝𐐮𐑉𐐨𐐲 - 𐐝𐐶𐐪𐑆𐐨𐑊𐐰𐑌𐐼 - 𐐓𐐲𐑉𐐿𐑅 𐐰𐑌𐐼 𐐗𐐴𐐿𐐬𐑆 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐕𐐰𐐼 - 𐐙𐑉𐐯𐑌𐐽 𐐝𐐲𐑄𐐲𐑉𐑌 𐐓𐐯𐑉𐐲𐐻𐐱𐑉𐐨𐑆 - 𐐓𐐬𐑀𐐬 - 𐐓𐐴𐑊𐐰𐑌𐐼 - 𐐓𐐲𐐾𐐨𐐿𐐲𐑅𐐻𐐰𐑌 - 𐐓𐐬𐐿𐐯𐑊𐐵 - 𐐀𐑅𐐻 𐐓𐐨𐑋𐐱𐑉 - 𐐓𐐲𐑉𐐿𐑋𐐯𐑌𐐲𐑅𐐻𐐰𐑌 - 𐐓𐐪𐑍𐑀𐐲 - 𐐓𐐲𐑉𐐿𐐨 - 𐐓𐑉𐐮𐑌𐐮𐐼𐐰𐐼 𐐰𐑌𐐼 𐐓𐐲𐐺𐐩𐑀𐐬 - 𐐓𐐲𐑂𐐪𐑊𐐭 - 𐐓𐐴𐐶𐐪𐑌 - 𐐓𐐰𐑌𐑆𐐲𐑌𐐨𐐲 - 𐐏𐐭𐑀𐐰𐑌𐐼𐐲 - 𐐏𐐭𐑌𐐰𐐮𐐻𐐲𐐼 𐐝𐐻𐐩𐐻𐑅 𐐣𐐴𐑌𐐬𐑉 𐐍𐐻𐑊𐐴𐐨𐑍 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐏𐐭𐑌𐐴𐐻𐐲𐐼 𐐝𐐻𐐩𐐻𐑅 - 𐐏𐐳𐑉𐐲𐑀𐐶𐐴 - 𐐅𐑆𐐺𐐯𐐿𐐲𐑅𐐻𐐰𐑌 - 𐐚𐐰𐐼𐐲𐐿𐐲𐑌 - 𐐝𐐩𐑌𐐻 𐐚𐐮𐑌𐑅𐐲𐑌𐐻 𐐰𐑌𐐼 𐑄 𐐘𐑉𐐯𐑌𐐲𐐼𐐨𐑌𐑆 - 𐐒𐑉𐐮𐐼𐐮𐑇 𐐚𐐲𐑉𐐾𐐲𐑌 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐏.𐐝. 𐐚𐐲𐑉𐐾𐐲𐑌 𐐌𐑊𐐲𐑌𐐼𐑆 - 𐐚𐐨𐐯𐐻𐑌𐐪𐑋 - 𐐚𐐪𐑌𐐳𐐪𐐼𐐭 - 𐐎𐐪𐑊𐐮𐑅 𐐰𐑌𐐼 𐐙𐐭𐐻𐐭𐑌𐐲 - 𐐝𐐲𐑋𐐬𐐲 - 𐐏𐐯𐑋𐐲𐑌 - 𐐣𐐪𐐷𐐱𐐻 - 𐐝𐐵𐑃 𐐈𐑁𐑉𐐲𐐿𐐲 - 𐐞𐐰𐑋𐐺𐐨𐐲 - 𐐞𐐮𐑋𐐺𐐪𐐺𐐶𐐩 - 𐐊𐑌𐐬𐑌 𐐬𐑉 𐐆𐑌𐑂𐐰𐑊𐐮𐐼 𐐡𐐨𐐾𐐲𐑌 - - - 𐐓𐑉𐐲𐐼𐐮𐑇𐐲𐑌𐑊 𐐖𐐲𐑉𐑋𐐲𐑌 𐐱𐑉𐑃𐐪𐑀𐑉𐐲𐑁𐐨 - 𐐖𐐲𐑉𐑋𐐲𐑌 𐐱𐑉𐑃𐐪𐑀𐑉𐐲𐑁𐐨 𐐲𐑂 1996 - 𐐢𐐩𐐻 𐐣𐐮𐐼𐑊 𐐙𐑉𐐯𐑌𐐽 𐐻𐐭 1606 - 𐐊𐑉𐑊𐐨 𐐣𐐪𐐼𐐲𐑉𐑌 𐐙𐑉𐐯𐑌𐐽 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐂𐑉𐑋𐐨𐑌𐐨𐐲𐑌 - 𐐎𐐯𐑅𐐻𐐲𐑉𐑌 𐐂𐑉𐑋𐐨𐑌𐐨𐐲𐑌 - 𐐏𐐭𐑌𐐲𐑁𐐴𐐼 𐐓𐐲𐑉𐐿𐐮𐐿 𐐢𐐰𐐻𐑌 𐐈𐑊𐑁𐐲𐐺𐐲𐐻 - 𐐆𐐙𐐈 𐐙𐐬𐑌𐐯𐐻𐐮𐐿𐑅 - 𐐣𐐪𐑌𐐲𐐻𐐪𐑌𐐮𐐿 - 𐐑𐐱𐑊𐐨𐐻𐐱𐑌𐐮𐐿 - 𐐗𐐲𐑋𐐹𐐷𐐭𐐻𐐯𐑉 - 𐐡𐐲𐑂𐐴𐑆𐐼 𐐉𐑉𐑃𐐪𐑀𐑉𐐲𐑁𐐨 - 𐐝𐐿𐐪𐐼𐐮𐑇 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐆𐑍𐑊𐐮𐑇 - - - 𐑋𐐯𐐻𐑉𐐮𐐿 - 𐐏𐐝 - - - - [𐐨 𐐩 𐐪 𐐫 𐐬 𐐭 𐐮 𐐯 𐐰 𐐱 𐐲 𐐳 𐐴 𐐵 𐐶 𐐷 𐐸 𐐹 𐐺 𐐻 𐐼 𐐽 𐐾 𐐿 𐑀 𐑁 𐑂 𐑃 𐑄 𐑅 𐑆 𐑇 𐑈 𐑉 𐑊 𐑋 𐑌 𐑍 𐑎 𐑏] - [𐐀 𐐁 𐐂 𐐃 𐐄 𐐅 𐐆 𐐇 𐐈 𐐉 𐐊 𐐋 𐐌 𐐍 𐐎 𐐏 𐐐 𐐑 𐐒 𐐓 𐐔 𐐕 𐐖 𐐗 𐐘 𐐙 𐐚 𐐛 𐐜 𐐝 𐐞 𐐟 𐐠 𐐡 𐐢 𐐣 𐐤 𐐥 𐐦 𐐧] - - - - - - - - 𐐖𐐰𐑌 - 𐐙𐐯𐐺 - 𐐣𐐪𐑉 - 𐐁𐐹𐑉 - 𐐣𐐩 - 𐐖𐐭𐑌 - 𐐖𐐭𐑊 - 𐐂𐑀 - 𐐝𐐯𐐹 - 𐐉𐐿𐐻 - 𐐤𐐬𐑂 - 𐐔𐐨𐑅 - - - 𐐖𐐰𐑌𐐷𐐭𐐯𐑉𐐨 - 𐐙𐐯𐐺𐑉𐐭𐐯𐑉𐐨 - 𐐣𐐪𐑉𐐽 - 𐐁𐐹𐑉𐐮𐑊 - 𐐣𐐩 - 𐐖𐐭𐑌 - 𐐖𐐭𐑊𐐴 - 𐐂𐑀𐐲𐑅𐐻 - 𐐝𐐯𐐹𐐻𐐯𐑋𐐺𐐲𐑉 - 𐐉𐐿𐐻𐐬𐐺𐐲𐑉 - 𐐤𐐬𐑂𐐯𐑋𐐺𐐲𐑉 - 𐐔𐐨𐑅𐐯𐑋𐐺𐐲𐑉 - - - - - 𐐖 - 𐐙 - 𐐣 - 𐐁 - 𐐣 - 𐐖 - 𐐖 - 𐐂 - 𐐝 - 𐐉 - 𐐤 - 𐐔 - - - - - - - 𐐝𐐲𐑌 - 𐐣𐐲𐑌 - 𐐓𐐭𐑆 - 𐐎𐐯𐑌 - 𐐛𐐲𐑉 - 𐐙𐑉𐐴 - 𐐝𐐰𐐻 - - - 𐐝𐐲𐑌𐐼𐐩 - 𐐣𐐲𐑌𐐼𐐩 - 𐐓𐐭𐑆𐐼𐐩 - 𐐎𐐯𐑌𐑆𐐼𐐩 - 𐐛𐐲𐑉𐑆𐐼𐐩 - 𐐙𐑉𐐴𐐼𐐩 - 𐐝𐐰𐐻𐐲𐑉𐐼𐐩 - - - - - 𐐝 - 𐐣 - 𐐓 - 𐐎 - 𐐛 - 𐐙 - 𐐝 - - - - - - - 𐐗1 - 𐐗2 - 𐐗3 - 𐐗4 - - - 1𐑅𐐻 𐐿𐐶𐐪𐑉𐐻𐐲𐑉 - 2𐑌𐐼 𐐿𐐶𐐪𐑉𐐻𐐲𐑉 - 3𐑉𐐼 𐐿𐐶𐐪𐑉𐐻𐐲𐑉 - 4𐑉𐑃 𐐿𐐶𐐪𐑉𐐻𐐲𐑉 - - - - - - - 𐐈𐐣 - 𐐰𐑋 - 𐐑𐐣 - 𐐹𐑋 - - - - - - 𐐒𐐲𐑁𐐬𐑉 𐐗𐑉𐐴𐑅𐐻 - 𐐈𐑌𐐬 𐐔𐐱𐑋𐐮𐑌𐐨 - - - 𐐒𐐗 - 𐐈𐐔 - - - 𐐒 - 𐐈 - - - - - - - 𐐇𐑉𐐲 - - - 𐐏𐐨𐑉 - - - 𐐣𐐲𐑌𐑃 - - - 𐐎𐐨𐐿 - - - 𐐔𐐩 - 𐐜 𐐼𐐩 𐐺𐐲𐑁𐐬𐑉 𐐷𐐯𐑅𐐻𐐲𐑉𐐼𐐩 - 𐐏𐐯𐑅𐐻𐐲𐑉𐐼𐐩 - 𐐓𐐲𐐼𐐩 - 𐐓𐐲𐑋𐐱𐑉𐐬 - 𐐜 𐐼𐐩 𐐰𐑁𐐻𐐲𐑉 𐐻𐐲𐑋𐐱𐑉𐐬 - - - 𐐔𐐩 𐐲𐑂 𐑄 𐐎𐐨𐐿 - - - 𐐈𐐣/𐐑𐐣 - - - 𐐍𐑉 - - - 𐐣𐐮𐑌𐐲𐐻 - - - 𐐝𐐯𐐿𐐲𐑌𐐼 - - - 𐐞𐐬𐑌 - - - - 𐐘𐐣𐐓 {0} - 𐐘𐐣𐐓 - {0} 𐐓𐐴𐑋 - - 𐐐𐐪𐑌𐐲𐑊𐐭𐑊𐐭 - - - 𐐊𐑌𐑌𐐬𐑌 - - - 𐐣𐐮𐐼𐐶𐐩 - - - 𐐎𐐩𐐿 - - - 𐐈𐐼𐐰𐐿 - - - 𐐤𐐬𐑋 - - - 𐐁𐑍𐐿𐐲𐑉𐐮𐐾 - - - 𐐏𐐰𐐿𐐭𐐻𐐰𐐻 - - - 𐐖𐐭𐑌𐐬 - - - 𐐢𐐱𐑅 𐐈𐑌𐐾𐐲𐑊𐑅 - - - 𐐒𐐱𐐮𐑆𐐨 - - - 𐐙𐐨𐑌𐐮𐐿𐑅 - - - 𐐔𐐯𐑌𐑂𐐲𐑉 - - - 𐐤𐐭 𐐝𐐩𐑊𐐲𐑋, 𐐤𐐱𐑉𐑃 𐐔𐐲𐐿𐐬𐐼𐐲 - - - 𐐝𐐯𐑌𐐻𐐲𐑉, 𐐤𐐱𐑉𐑃 𐐔𐐲𐐿𐐬𐐼𐐲 - - - 𐐟𐐮𐐿𐐪𐑀𐐬 - - - 𐐣𐐲𐑌𐐪𐑋𐐲𐑌𐐨 - - - 𐐚𐐮𐑌𐑅𐐯𐑌𐑆, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐑𐐨𐐻𐐲𐑉𐑆𐐺𐐲𐑉𐑀, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐓𐐯𐑊 𐐝𐐮𐐼𐐨, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐤𐐪𐐿𐑅, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐎𐐮𐑌𐐲𐑋𐐰𐐿, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐣𐐲𐑉𐐯𐑍𐑀𐐬, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐆𐑌𐐼𐐨𐐲𐑌𐐰𐐹𐐬𐑊𐐲𐑅 - - - 𐐢𐐭𐐶𐐨𐑂𐐮𐑊 - - - 𐐚𐐯𐑂𐐩, 𐐆𐑌𐐼𐐨𐐰𐑌𐐲 - - - 𐐣𐐪𐑌𐐻𐐲𐑅𐐯𐑊𐐬, 𐐗𐐲𐑌𐐻𐐲𐐿𐐨 - - - 𐐔𐐲𐐻𐑉𐐱𐐮𐐻 - - - 𐐤𐐭 𐐏𐐱𐑉𐐿 - - - - 𐐊𐑊𐐰𐑅𐐿𐐲 𐐓𐐴𐑋 - 𐐊𐑊𐐰𐑅𐐿𐐲 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐊𐑊𐐰𐑅𐐿𐐲 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐓𐐴𐑋 - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐝𐐯𐑌𐐻𐑉𐐲𐑊 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐓𐐴𐑋 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐀𐑅𐐻𐐲𐑉𐑌 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐣𐐵𐑌𐐻𐐲𐑌 𐐓𐐴𐑋 - 𐐣𐐵𐑌𐐻𐐲𐑌 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐣𐐵𐑌𐐻𐐲𐑌 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐑𐐲𐑅𐐮𐑁𐐮𐐿 𐐓𐐴𐑋 - 𐐑𐐲𐑅𐐮𐑁𐐮𐐿 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐑𐐲𐑅𐐮𐑁𐐮𐐿 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐈𐐻𐑊𐐰𐑌𐐻𐐮𐐿 𐐓𐐴𐑋 - 𐐈𐐻𐑊𐐰𐑌𐐻𐐮𐐿 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐈𐐻𐑊𐐰𐑌𐐻𐐮𐐿 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐐𐐱𐑍 𐐗𐐱𐑍 𐐓𐐴𐑋 - 𐐐𐐱𐑍 𐐗𐐱𐑍 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐐𐐱𐑍 𐐗𐐱𐑍 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - 𐐤𐐭𐑁𐐲𐑌𐐼𐑊𐐲𐑌𐐼 𐐓𐐴𐑋 - 𐐤𐐭𐑁𐐲𐑌𐐼𐑊𐐲𐑌𐐼 𐐝𐐻𐐰𐑌𐐼𐐲𐑉𐐼 𐐓𐐴𐑋 - 𐐤𐐭𐑁𐐲𐑌𐐼𐑊𐐲𐑌𐐼 𐐔𐐩𐑊𐐴𐐻 𐐓𐐴𐑋 - - - - - - - - $ - - - - - - - {0} 𐐷𐐮𐑉 - {0} 𐐷𐐮𐑉𐑆 - - - {0} 𐑋𐐲𐑌𐑃𐑅 - {0} 𐑋𐐲𐑌𐑃 - - - {0} 𐐶𐐨𐐿 - {0} 𐐶𐐨𐐿𐑅 - - - {0} 𐐼𐐩 - {0} 𐐼𐐩𐑆 - - - {0} 𐐵𐑉 - {0} 𐐵𐑉𐑆 - - - {0} 𐑋𐐮𐑌𐐲𐐻 - {0} 𐑋𐐮𐑌𐐲𐐻𐑅 - - - {0} 𐑅𐐯𐐿𐐲𐑌𐐼 - {0} 𐑅𐐯𐐿𐐲𐑌𐐼𐑆 - - - - - - 𐐷𐐯𐑅:𐐷 - 𐑌𐐬:𐑌 - - - diff --git a/make/data/cldr/common/main/en_Dsrt_US.xml b/make/data/cldr/common/main/en_Dsrt_US.xml deleted file mode 100644 index 343e62d2978b..000000000000 --- a/make/data/cldr/common/main/en_Dsrt_US.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - Line Breaks Within Words - - - Armenian Lowercase - Full-Width - Greek Lowercase - Simplified Chinese Financial - Traditional Chinese Financial - Japanese Financial - Native Digits - Roman Uppercase - Roman Lowercase - @@ -39,37 +22,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d/M/y G - EEEE, d MMM y G E dd/MM E d MMM - EEEE d MMM - EEEE d MMMM - EEEE, d MMM y G - EEEE, d MMMM y G - - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y G – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G - E d MMM – E d MMM E, d MMM – E, d MMM y G - - EEEE d MMM – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G - - - EEEE d MMMM – EEEE d MMMM y G - EEEE d MMMM – EEEE d MMMM y G - EEEE d MMMM y – EEEE d MMMM y G - @@ -145,52 +107,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d/M/y G - EEEE, d MMM y G + ddd MMM y G E dd/MM E d MMM - EEEE d MMM - EEEE d MMMM - EEEE, d MMM y - EEEE, d MMMM y d – d - - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y G – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G - - - M – M - - - d – d MMM - E d MMM – E d MMM - - y – y - d – d MMM y E, d MMM – E, d MMM y - - EEEE d MMM – EEEE d MMM y - EEEE d MMM – EEEE d MMM y - EEEE d MMM y – EEEE d MMM y - - - EEEE d MMMM – EEEE d MMMM y - EEEE d MMMM – EEEE d MMMM y - EEEE d MMMM y – EEEE d MMMM y - @@ -248,28 +181,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic d/M/y GGGGG E, d/M/y GGGGG - EEEE, d MMM y G L d/M E, d/M - EEEE, d/M - EEEE, d MMM - EEEE, d MMMM M/y GGGGG d/M/y GGGGG E, d/M/y GGGGG - EEEE, d MMMM y G - EEEE, d MMMM y G - + + GMT BST - + CET @@ -384,7 +312,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - {0} - + + + + pints + {0} pint + {0} pints + + + cups + {0} cup + {0} cups + + + + + pt + {0} pt + {0} pt + + + cup + {0} cup + {0} cup + + + + + pt + {0} pt + {0} pt + + + cup + {0} cup + {0} cup + + + diff --git a/make/data/cldr/common/main/en_IE.xml b/make/data/cldr/common/main/en_IE.xml index c47094ccecc3..06ec80cf9d6e 100644 --- a/make/data/cldr/common/main/en_IE.xml +++ b/make/data/cldr/common/main/en_IE.xml @@ -117,11 +117,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + + GMT IST - + diff --git a/make/data/cldr/common/main/en_IN.xml b/make/data/cldr/common/main/en_IN.xml index 5e2f43906286..221c943d3631 100644 --- a/make/data/cldr/common/main/en_IN.xml +++ b/make/data/cldr/common/main/en_IN.xml @@ -12,6 +12,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + St. Helena, Ascension & Tristan da Cunha + Bengali Digits Oriya Digits @@ -76,9 +79,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM, y G d MMM, y G E, d MMM, y G - EEEE, d MMM y G d/M E, d/M + E, ddd MMM EEEE, d MMM EEEE, d MMMM M/y GGGGG @@ -87,22 +90,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM, y G d MMM, y G E, d MMM, y G - EEEE, d MMM y G + E, ddd MMM y G MMMM, y G - EEEE, d MMMM y G - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G - E, d/M/y – E, d/M/y GGGGG - E, d/M/y GGGGG – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G EEEE d MMM – EEEE d MMM, y G @@ -115,8 +117,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d/M – d/M - E, dd/MM – E, dd/MM - E, dd/MM – E, dd/MM + E, d/M – E, d/M + E, d/M – E, d/M E, d – E, d MMM @@ -126,29 +128,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic EEEE d – EEEE d MMM EEEE d MMM – EEEE d MMM + + d – d MMMM + d MMMM – d MMMM + MM/y – MM/y G - MM/y – MM/y G + M/y – M/y G - dd/MM/y – dd/MM/y G - dd/MM/y – dd/MM/y G + d/M/y – d/M/y G + d/M/y – d/M/y G dd/MM/y – dd/MM/y G - E, dd/MM/y – E, dd/MM/y G - E, dd/MM/y – E, dd/MM/y G - E, dd/MM/y – E, dd/MM/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G - E d – E d MMM y G - E d MMM – E d MMM y G - E d MMM y – E d MMM y G + E, d MMM – E, d MMM y G + + + + AM + PM + + + AM + PM + + + + + AM + PM + + + AM + PM + + + AM + PM + + + @@ -225,47 +255,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, h:mm:ss a E, h:mm:ss a E, HH:mm:ss - EEEE, d MMM y G + ddd MMM y G + d/M + E, d/M + E, ddd MMM EEEE, d MMM + E, d MMMM + E, ddd MMMM EEEE, d MMMM d/M/y E, d/M/y - E, d MMM, y - EEEE, d MMM y - EEEE, d MMMM y + ddd MMMM y + E, ddd MMMM y - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y G – EEEE d MMM y G - EEEE d MMM – EEEE d MMM y G - EEEE d MMM y – EEEE d MMM y G + EEEE, d MMM – EEEE, d MMM y G + EEEE, d MMM – EEEE, d MMM y G + EEEE, d MMM y – EEEE, d MMM y G - E, dd/MM – E, dd/MM - E, dd/MM – E, dd/MM + E, d/M – E, d/M + E, d/M – E, d/M E, d – E, d MMM E, d MMM – E, d MMM - EEEE d – EEEE d MMM - EEEE d MMM – EEEE d MMM + EEEE, d – EEEE, d MMM + EEEE, d MMM – EEEE, d MMM + + + E, d MMM – E, d MMM y - EEEE d – EEEE d MMM y - EEEE d MMM – EEEE d MMM y - EEEE d MMM y – EEEE d MMM y + EEEE, d – EEEE, d MMM y + EEEE, d MMM – EEEE, d MMM y + EEEE, d MMM y – EEEE, d MMM y - EEEE d – EEEE d MMMM y - EEEE d MMMM – EEEE d MMMM y - EEEE d MMMM y – EEEE d MMMM y + EEEE, d – EEEE, d MMMM y + EEEE, d MMMM – EEEE, d MMMM y + EEEE, d MMMM y – EEEE, d MMMM y + + + + Saka + + + @@ -294,10 +337,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM, y G d MMM, y G + ddd MMM y G E, d MMM, y G + E, d MMM y G EEEE d MMM y G d/M E, d/M + E, ddd MMM EEE, d MMM d EEEE MMMM d/M/y G @@ -305,12 +351,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM, y G d MMM, y G E, d MMM, y G + E, ddd MMM y G EEEE, d MMM y MMMM, y G EEEE, d MMMM y + + + + + EEEE, d MMMM y G + + + + + d MMMM y G + + + + + d MMM y G + + + + + d/M/y GGGGG + + + + + + + {1} 'at' {0} + + + + + {1} 'at' {0} + + + + + {1}, {0} + + + + + {1}, {0} + + + + d/M/y GGGGG + ddd MMM y G + E, ddd MMM y G + d/M + E, d/M + E, ddd MMM + d/M/y GGGGG + E, d/M/y GGGGG + E, ddd MMM y G + + + @@ -334,30 +438,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 0 thousand - 0 thousand - 00 thousand - 00 thousand - 0 lakh - 0 lakh - 00 lakh - 00 lakh - 0 crore - 0 crore - 00 crore - 00 crore - 000 crore - 000 crore - 0000 crore - 0000 crore - 00000 crore - 00000 crore - 0 lakh crore - 0 lakh crore - 00 lakh crore - 00 lakh crore - 000 lakh crore - 000 lakh crore + 0 thousand + 0 thousand + 00 thousand + 00 thousand + 0 lakh + 0 lakh + 00 lakh + 00 lakh + 0 crore + 0 crore + 00 crore + 00 crore + 000 crore + 000 crore + 0000 crore + 0000 crore + 00000 crore + 00000 crore + 0 lakh crore + 0 lakh crore + 00 lakh crore + 00 lakh crore + 000 lakh crore + 000 lakh crore @@ -400,8 +504,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤#,##,##0.00 - ¤ #,##,##0.00 - #,##,##0.00 @@ -483,13 +585,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Uzbekistani Som - Venezuelan Bolívar Venezuelan bolívar Venezuelan bolívars - Venezuelan Bolívar - Venezuelan Bolívars + Venezuelan Bolivar + Venezuelan bolivar + Venezuelan bolivars Caribbean Guilder @@ -530,9 +632,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - {0}, and {1} - - + + {0}. + diff --git a/make/data/cldr/common/main/en_JP.xml b/make/data/cldr/common/main/en_JP.xml index 83c6922e4eb3..dcde07cbaaab 100644 --- a/make/data/cldr/common/main/en_JP.xml +++ b/make/data/cldr/common/main/en_JP.xml @@ -177,6 +177,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, y/MM/dd + + {0} – {1} + MM/y G – MM/y G MM/y – MM/y G diff --git a/make/data/cldr/common/main/en_MO.xml b/make/data/cldr/common/main/en_MO.xml index 000ac308b40d..6b2ba0f4e392 100644 --- a/make/data/cldr/common/main/en_MO.xml +++ b/make/data/cldr/common/main/en_MO.xml @@ -20,13 +20,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic HKST - - - MST - MST - MDT - - diff --git a/make/data/cldr/common/main/en_MT.xml b/make/data/cldr/common/main/en_MT.xml index d7caecab19bc..12966805bc75 100644 --- a/make/data/cldr/common/main/en_MT.xml +++ b/make/data/cldr/common/main/en_MT.xml @@ -117,6 +117,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, dd MMM y + + {0} – {1} + E, dd/MM – E, dd/MM E, dd/MM – E, dd/MM diff --git a/make/data/cldr/common/main/en_PK.xml b/make/data/cldr/common/main/en_PK.xml index f62cae9e95c8..dafa951d86f5 100644 --- a/make/data/cldr/common/main/en_PK.xml +++ b/make/data/cldr/common/main/en_PK.xml @@ -78,6 +78,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0} – {1} + M/d – M/d M/d – M/d diff --git a/make/data/cldr/common/main/en_Shaw.xml b/make/data/cldr/common/main/en_Shaw.xml deleted file mode 100644 index 1f799a2edfd5..000000000000 --- a/make/data/cldr/common/main/en_Shaw.xml +++ /dev/null @@ -1,1662 +0,0 @@ - - - - - - - - - - - - - - - - 𐑢𐑻𐑤𐑛 - ·𐑨𐑓𐑮𐑦𐑒𐑩 - ·𐑯𐑹𐑔 𐑩𐑥𐑧𐑮𐑦𐑒𐑩 - ·𐑕𐑬𐑔 𐑩𐑥𐑧𐑮𐑦𐑒𐑩 - ·𐑴𐑖𐑦𐑭𐑯𐑾 - ·𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑩𐑥𐑧𐑮𐑦𐑒𐑩 - ·𐑩𐑥𐑧𐑮𐑦𐑒𐑩𐑟 - ·𐑯𐑹𐑞𐑼𐑯 𐑩𐑥𐑧𐑮𐑦𐑒𐑩 - ·𐑒𐑨𐑮𐑦𐑚𐑰𐑩𐑯 - ·𐑕𐑳𐑞𐑼𐑯 𐑘𐑫𐑼𐑩𐑐 - 𐑥𐑲𐑒𐑮𐑴𐑯𐑰𐑟𐑩𐑯 𐑮𐑰𐑡𐑩𐑯 - ·𐑱𐑠𐑩 - ·𐑘𐑫𐑼𐑩𐑐 - ·𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐 - ·𐑯𐑹𐑞𐑼𐑯 𐑘𐑫𐑼𐑩𐑐 - ·𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐 - ·𐑤𐑨𐑑𐑦𐑯 𐑩𐑥𐑧𐑮𐑦𐑒𐑩 - ·𐑩𐑕𐑧𐑯𐑖𐑩𐑯 𐑲𐑤𐑩𐑯𐑛 - ·𐑨𐑯𐑛𐑹𐑩 - ·𐑿𐑯𐑲𐑑𐑩𐑛 𐑨𐑮𐑩𐑚 𐑧𐑥𐑦𐑮𐑩𐑑𐑕 - ·𐑨𐑓𐑜𐑨𐑯𐑦𐑕𐑑𐑭𐑯 - ·𐑨𐑙𐑜𐑢𐑦𐑤𐑩 - ·𐑨𐑤𐑚𐑱𐑯𐑾 - ·𐑨𐑙𐑜𐑴𐑤𐑩 - ·𐑨𐑯𐑑𐑸𐑒𐑑𐑦𐑒𐑩 - ·𐑸𐑡𐑩𐑯𐑑𐑰𐑯𐑩 - ·𐑩𐑥𐑧𐑮𐑦𐑒𐑩𐑯 𐑕𐑩𐑥𐑴𐑩 - ·𐑪𐑕𐑑𐑮𐑾 - ·𐑪𐑕𐑑𐑮𐑱𐑤𐑾 - ·𐑨𐑟𐑼𐑚𐑲𐑡𐑭𐑯 - ·𐑚𐑸𐑚𐑱𐑛𐑪𐑕 - ·𐑚𐑨𐑙𐑜𐑤𐑩𐑛𐑧𐑖 - ·𐑚𐑧𐑤𐑡𐑩𐑥 - ·𐑚𐑳𐑤𐑜𐑺𐑾 - ·𐑚𐑸𐑱𐑯 - ·𐑚𐑫𐑮𐑫𐑯𐑛𐑦 - ·𐑚𐑧𐑯𐑦𐑯 - ·𐑚𐑼𐑥𐑿𐑛𐑩 - ·𐑚𐑮𐑵𐑯𐑲 - ·𐑚𐑩𐑤𐑦𐑝𐑾 - ·𐑚𐑮𐑩𐑟𐑦𐑤 - ·𐑚𐑩𐑣𐑭𐑥𐑩𐑟 - ·𐑚𐑵𐑑𐑭𐑯 - ·𐑚𐑪𐑑𐑕𐑢𐑭𐑯𐑩 - ·𐑒𐑨𐑯𐑩𐑛𐑩 - ·𐑒𐑪𐑙𐑜𐑴 - ·𐑒𐑦𐑯𐑖𐑭𐑕𐑩 - ·𐑒𐑪𐑙𐑜𐑴 (𐑛𐑰𐑸𐑕𐑰) - ·𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑨𐑓𐑮𐑦𐑒𐑩𐑯 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒 - ·𐑒𐑪𐑙𐑜𐑴 - ·𐑚𐑮𐑭𐑟𐑩𐑝𐑦𐑤 - ·𐑒𐑪𐑙𐑜𐑴 (𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒) - ·𐑕𐑢𐑦𐑑𐑕𐑼𐑤𐑩𐑯𐑛 - ·𐑒𐑫𐑒 𐑲𐑤𐑩𐑯𐑛𐑟 - ·𐑗𐑦𐑤𐑦 - ·𐑒𐑨𐑥𐑼𐑵𐑯 - ·𐑗𐑲𐑯𐑩 - ·𐑒𐑩𐑤𐑳𐑥𐑚𐑾 - ·𐑒𐑪𐑕𐑑𐑩 𐑮𐑰𐑒𐑩 - ·𐑒𐑿𐑚𐑩 - ·𐑕𐑲𐑐𐑮𐑩𐑕 - ·𐑗𐑧𐑒𐑾 - ·𐑗𐑧𐑒 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒 - ·𐑡𐑻𐑥𐑩𐑯𐑦 - ·𐑡𐑦𐑚𐑵𐑑𐑦 - ·𐑛𐑧𐑯𐑥𐑸𐑒 - ·𐑛𐑩𐑥𐑦𐑯𐑦𐑒𐑩 - ·𐑛𐑩𐑥𐑦𐑯𐑦𐑒𐑩𐑯 𐑮𐑦𐑐𐑳𐑚𐑤𐑦𐑒 - ·𐑨𐑤𐑡𐑽𐑾 - ·𐑧𐑒𐑢𐑩𐑛𐑹 - ·𐑰𐑡𐑦𐑐𐑑 - ·𐑧𐑮𐑦𐑑𐑮𐑱𐑩 - ·𐑕𐑐𐑱𐑯 - ·𐑰𐑔𐑦𐑴𐑐𐑾 - ·𐑓𐑦𐑯𐑤𐑩𐑯𐑛 - ·𐑓𐑰𐑡𐑰 - ·𐑓𐑷𐑒𐑤𐑨𐑯𐑛 𐑲𐑤𐑩𐑯𐑛𐑟 - ·𐑓𐑷𐑒𐑤𐑨𐑯𐑛 𐑲𐑤𐑩𐑯𐑛𐑟 (·𐑦𐑕𐑤𐑨𐑟 𐑥𐑨𐑤𐑝𐑰𐑯𐑩𐑟) - ·𐑓𐑮𐑭𐑯𐑕 - ·𐑜𐑨𐑚𐑪𐑯 - ·𐑿𐑯𐑲𐑑𐑩𐑛 𐑒𐑦𐑙𐑛𐑩𐑥 - ·𐑿𐑒𐑱 - ·𐑜𐑮𐑩𐑯𐑱𐑛𐑩 - ·𐑡𐑹𐑡𐑩 - ·𐑜𐑭𐑯𐑩 - ·𐑡𐑦𐑚𐑮𐑷𐑤𐑑𐑼 - ·𐑜𐑨𐑥𐑚𐑾 - ·𐑜𐑦𐑯𐑦 - ·𐑜𐑮𐑰𐑕 - ·𐑜𐑢𐑭𐑑𐑩𐑥𐑭𐑤𐑩 - ·𐑜𐑲𐑭𐑯𐑩 - ·𐑣𐑪𐑙 𐑒𐑪𐑙 𐑕.𐑩.𐑮. ·𐑗𐑲𐑯𐑩 - ·𐑣𐑪𐑙 𐑒𐑪𐑙 - ·𐑣𐑪𐑯𐑛𐑘𐑫𐑼𐑩𐑕 - ·𐑒𐑮𐑴𐑱𐑖𐑩 - ·𐑣𐑱𐑑𐑦 - ·𐑣𐑳𐑙𐑜𐑼𐑦 - ·𐑦𐑯𐑛𐑩𐑯𐑰𐑠𐑩 - ·𐑲𐑼𐑤𐑩𐑯𐑛 - ·𐑦𐑟𐑮𐑱𐑤 - ·𐑦𐑯𐑛𐑾 - ·𐑚𐑮𐑦𐑑𐑦𐑖 𐑦𐑯𐑛𐑾𐑯 𐑴𐑖𐑩𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦 - ·𐑦𐑮𐑭𐑒 - ·𐑦𐑮𐑭𐑯 - ·𐑲𐑕𐑤𐑩𐑯𐑛 - ·𐑦𐑑𐑩𐑤𐑦 - ·𐑡𐑩𐑥𐑱𐑒𐑩 - ·𐑡𐑹𐑛𐑩𐑯 - ·𐑡𐑩𐑐𐑨𐑯 - ·𐑒𐑧𐑯𐑘𐑩 - ·𐑒𐑨𐑥𐑚𐑴𐑛𐑾 - ·𐑯𐑹𐑔 𐑒𐑼𐑾 - ·𐑕𐑬𐑔 𐑒𐑼𐑾 - ·𐑒𐑵𐑢𐑱𐑑 - ·𐑤𐑬𐑕 - ·𐑤𐑧𐑚𐑩𐑯𐑪𐑯 - ·𐑤𐑦𐑒𐑑𐑩𐑯𐑕𐑑𐑲𐑯 - ·𐑕𐑮𐑦 𐑤𐑨𐑯𐑒𐑩 - ·𐑤𐑲𐑚𐑽𐑾 - ·𐑤𐑩𐑕𐑵𐑑𐑵 - ·𐑤𐑦𐑔𐑿𐑱𐑯𐑾 - ·𐑤𐑳𐑒𐑕𐑩𐑥𐑚𐑻𐑜 - ·𐑤𐑦𐑚𐑾 - ·𐑥𐑼𐑪𐑒𐑴 - ·𐑥𐑪𐑯𐑩𐑒𐑴 - ·𐑥𐑨𐑛𐑩𐑜𐑨𐑕𐑒𐑼 - ·𐑥𐑸𐑖𐑩𐑤 𐑲𐑤𐑩𐑯𐑛𐑟 - ·𐑯𐑹𐑔 𐑥𐑨𐑕𐑩𐑛𐑴𐑯𐑾 - ·𐑥𐑭𐑤𐑦 - ·𐑥𐑘𐑨𐑯𐑥𐑸 (·𐑚𐑻𐑥𐑩) - ·𐑥𐑪𐑙𐑜𐑴𐑤𐑾 - ·𐑥𐑩𐑒𐑬 𐑒𐑪𐑙 𐑕.𐑩.𐑮. ·𐑗𐑲𐑯𐑩 - ·𐑥𐑩𐑒𐑬 - ·𐑥𐑹𐑦𐑑𐑱𐑯𐑾 - ·𐑥𐑪𐑯𐑑𐑕𐑼𐑨𐑑 - ·𐑥𐑷𐑤𐑑𐑩 - ·𐑥𐑼𐑦𐑖𐑩𐑕 - ·𐑥𐑩𐑤𐑭𐑢𐑦 - ·𐑥𐑧𐑒𐑕𐑦𐑒𐑴 - ·𐑥𐑩𐑤𐑱𐑠𐑩 - ·𐑥𐑴𐑟𐑨𐑥𐑚𐑰𐑒 - ·𐑯𐑩𐑥𐑦𐑚𐑾 - ·𐑯𐑰𐑠𐑺 - ·𐑯𐑲𐑡𐑽𐑾 - ·𐑯𐑦𐑒𐑼𐑭𐑜𐑢𐑩 - ·𐑯𐑧𐑞𐑼𐑤𐑩𐑯𐑛𐑟 - ·𐑯𐑹𐑢𐑱 - ·𐑯𐑦𐑐𐑷𐑤 - ·𐑯𐑭𐑵𐑮𐑵 - ·𐑯𐑿 𐑟𐑰𐑤𐑩𐑯𐑛 - ·𐑭𐑴𐑑𐑾𐑮𐑴𐑩 𐑯𐑿 𐑟𐑰𐑤𐑩𐑯𐑛 - ·𐑴𐑥𐑭𐑯 - ·𐑐𐑨𐑯𐑩𐑥𐑭 - ·𐑐𐑼𐑵 - ·𐑓𐑦𐑤𐑦𐑐𐑰𐑯𐑟 - ·𐑐𐑭𐑒𐑦𐑕𐑑𐑭𐑯 - ·𐑐𐑴𐑤𐑩𐑯𐑛 - ·𐑐𐑨𐑤𐑩𐑕𐑑𐑦𐑯𐑾𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦𐑟 - ·𐑐𐑨𐑤𐑩𐑕𐑑𐑲𐑯 - ·𐑐𐑹𐑗𐑩𐑜𐑩𐑤 - ·𐑐𐑨𐑮𐑩𐑜𐑢𐑲 - ·𐑒𐑳𐑑𐑸 - ·𐑮𐑩𐑥𐑱𐑯𐑾 - ·𐑕𐑻𐑚𐑾 - ·𐑮𐑳𐑖𐑩 - ·𐑮𐑵𐑨𐑯𐑛𐑩 - ·𐑕𐑬𐑛𐑦 𐑼𐑱𐑚𐑾 - ·𐑕𐑱𐑖𐑧𐑤𐑟 - ·𐑕𐑵𐑛𐑨𐑯 - ·𐑕𐑢𐑰𐑛𐑩𐑯 - ·𐑕𐑦𐑙𐑩𐑐𐑹 - ·𐑕𐑤𐑩𐑝𐑨𐑒𐑾 - ·𐑕𐑦𐑺𐑩 𐑤𐑦𐑴𐑯 - ·𐑕𐑨𐑯 𐑥𐑼𐑰𐑯𐑴 - ·𐑕𐑧𐑯𐑦𐑜𐑷𐑤 - ·𐑕𐑩𐑥𐑭𐑤𐑾 - ·𐑕𐑬𐑔 𐑕𐑵𐑛𐑨𐑯 - ·𐑧𐑤 𐑕𐑨𐑤𐑝𐑩𐑛𐑹 - ·𐑕𐑦𐑮𐑾 - ·𐑧𐑕𐑢𐑭𐑑𐑦𐑯𐑦 - ·𐑕𐑢𐑭𐑟𐑦𐑤𐑨𐑯𐑛 - ·𐑗𐑨𐑛 - ·𐑓𐑮𐑧𐑯𐑗 𐑕𐑳𐑞𐑼𐑯 𐑑𐑧𐑮𐑦𐑑𐑼𐑦𐑟 - ·𐑑𐑴𐑜𐑴 - ·𐑑𐑲𐑤𐑨𐑯𐑛 - ·𐑑𐑿𐑯𐑦𐑟𐑾 - ·𐑑𐑪𐑙𐑩 - ·𐑑𐑫𐑼𐑒𐑦𐑘𐑩 - ·𐑑𐑻𐑒𐑦 - ·𐑑𐑲𐑢𐑭𐑯 - ·𐑑𐑨𐑯𐑟𐑩𐑯𐑾 - ·𐑿𐑒𐑮𐑱𐑯 - ·𐑿𐑜𐑨𐑯𐑛𐑩 - ·𐑿𐑧𐑕 𐑬𐑑𐑤𐑲𐑦𐑙 𐑲𐑤𐑩𐑯𐑛𐑟 - ·𐑿𐑯𐑲𐑑𐑩𐑛 𐑕𐑑𐑱𐑑𐑕 - ·𐑿𐑧𐑕 - ·𐑘𐑫𐑼𐑩𐑜𐑢𐑲 - ·𐑝𐑨𐑑𐑦𐑒𐑩𐑯 𐑕𐑦𐑑𐑦 - ·𐑝𐑧𐑯𐑦𐑟𐑢𐑱𐑤𐑩 - ·𐑝𐑦𐑧𐑑𐑯𐑭𐑥 - ·𐑕𐑩𐑥𐑴𐑩 - 𐑕𐑿𐑛𐑴-𐑨𐑒𐑕𐑩𐑯𐑑𐑕 - 𐑕𐑿𐑛𐑴-𐑚𐑲𐑛𐑲 - ·𐑘𐑧𐑥𐑩𐑯 - ·𐑕𐑬𐑔 𐑨𐑓𐑮𐑦𐑒𐑩 - ·𐑟𐑨𐑥𐑚𐑾 - ·𐑟𐑦𐑥𐑚𐑭𐑚𐑢𐑱 - 𐑳𐑯𐑯𐑴𐑯 𐑮𐑰𐑡𐑩𐑯 - - - 𐑤𐑱𐑑 𐑥𐑦𐑛𐑩𐑤 𐑓𐑮𐑧𐑯𐑗 𐑑 1606 - 𐑻𐑤𐑦 𐑥𐑪𐑛𐑼𐑯 𐑓𐑮𐑧𐑯𐑗 - - - 𐑒𐑨𐑤𐑦𐑯𐑛𐑼 - 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑 - 𐑕𐑹𐑑 𐑹𐑛𐑼 - 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 - 𐑬𐑼 𐑕𐑲𐑒𐑩𐑤 (12 𐑹 24) - 𐑤𐑲𐑯 𐑚𐑮𐑱𐑒𐑕 𐑭𐑓𐑑𐑼 𐑢𐑻𐑛𐑟 - 𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥 - 𐑯𐑳𐑥𐑚𐑼𐑟 - 𐑕𐑧𐑯𐑑𐑩𐑯𐑕 𐑚𐑮𐑱𐑒 𐑭𐑓𐑑𐑼 𐑩𐑚𐑮. - - - 𐑜𐑮𐑦𐑜𐑹𐑾𐑯 𐑒𐑨𐑤𐑦𐑯𐑛𐑼 - 𐑜𐑮𐑦𐑜𐑹𐑾𐑯 - 𐑩𐑒𐑬𐑯𐑑𐑦𐑙 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑 - 𐑩𐑒𐑬𐑯𐑑𐑦𐑙 - 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑒𐑳𐑮𐑩𐑯𐑕𐑦 𐑓𐑹𐑥𐑨𐑑 - 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 - 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 - 12 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (0–11) - 12 (0–11) - 12 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (1–12) - 12 (1–12) - 24 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (0–23) - 24 (0–23) - 24 𐑬𐑼 𐑕𐑦𐑕𐑑𐑩𐑥 (1–24) - 24 (1–24) - 𐑚𐑮𐑱𐑒 𐑷𐑤 - 𐑒𐑰𐑐 𐑷𐑤 - 𐑯𐑹𐑥𐑩𐑤 - 𐑒𐑰𐑐 𐑦𐑯 𐑓𐑮𐑱𐑟𐑩𐑟 - 𐑥𐑧𐑑𐑮𐑦𐑒 𐑕𐑦𐑕𐑑𐑩𐑥 - 𐑥𐑧𐑑𐑮𐑦𐑒 - 𐑦𐑥𐑐𐑽𐑾𐑤 𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥 - 𐑿𐑒𐑱 - 𐑿𐑧𐑕 𐑥𐑧𐑠𐑼𐑥𐑩𐑯𐑑 𐑕𐑦𐑕𐑑𐑩𐑥 - 𐑿𐑧𐑕 - 𐑢𐑧𐑕𐑑𐑼𐑯 𐑛𐑦𐑡𐑦𐑑𐑕 - 𐑪𐑓 - 𐑪𐑯 - - - 𐑥𐑧𐑑𐑮𐑦𐑒 - 𐑿𐑒𐑱 - 𐑿𐑧𐑕 - - - 𐑤𐑨𐑙𐑜𐑢𐑦𐑡: {0} - 𐑕𐑒𐑮𐑦𐑐𐑑: {0} - 𐑮𐑰𐑡𐑩𐑯: {0} - - - - [𐑐 𐑑 𐑒 𐑓 𐑔 𐑕 𐑖 𐑗 𐑘 𐑙 𐑚 𐑛 𐑜 𐑝 𐑞 𐑟 𐑠 𐑡 𐑢 𐑣 𐑤 𐑥 𐑦 𐑧 𐑨 𐑩 𐑪 𐑫 𐑬 𐑭 𐑮 𐑯 𐑰 𐑱 𐑲 𐑳 𐑴 𐑵 𐑶 𐑷 𐑸 𐑹 𐑺 𐑻 𐑼 𐑽 𐑾 𐑿] - [𐑐 𐑑 𐑒 𐑓 𐑔 𐑕 𐑖 𐑗 𐑘 𐑙 𐑚 𐑛 𐑜 𐑝 𐑞 𐑟 𐑠 𐑡 𐑢 𐑣 𐑤 𐑥 𐑦 𐑧 𐑨 𐑩 𐑪 𐑫 𐑬 𐑭 𐑮 𐑯 𐑰 𐑱 𐑲 𐑳 𐑴 𐑵 𐑶 𐑷 𐑸 𐑹 𐑺 𐑻 𐑼 𐑽 𐑾 𐑿] - [\- ‐‑ – — , ; \: ! ? . … ' ‹ › « » ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - ‹ - › - « - » - - - - - - - - EEEE, d MMMM y G - - - - - d MMMM y G - - - - - d MMM y G - - - - - dd/MM/y GGGGG - - - - - - - {1}, {0} - - - {1} 𐑨𐑑 {0} - - - {1} 𐑨𐑑 {0} - - - - - {1}, {0} - - - {1} 𐑨𐑑 {0} - - - {1} 𐑨𐑑 {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - E d - y G - dd/MM/y GGGGG - LLL y G - d MMM y G - E, d MMM y G - dd/MM - E dd/MM - d MMM - E d MMM - d MMMM - y G - y G - MM/y GGGGG - dd/MM/y GGGGG - E, dd/MM/y GGGGG - LLL y G - d MMM y G - E, d MMM y G - LLLL y G - QQQ y G - QQQQ y G - - - - h – h B - - - h:mm – h:mm B - h:mm – h:mm B - - - y G – y G - y–y G - - - - - - - - - ·𐑡𐑨 - ·𐑓𐑧 - ·𐑥𐑸 - ·𐑱𐑐 - ·𐑥𐑱 - ·𐑡𐑵 - ·𐑡𐑫 - ·𐑪𐑜 - ·𐑕𐑧 - ·𐑷𐑒 - ·𐑯𐑴 - ·𐑛𐑭 - - - 𐑡 - 𐑓 - 𐑥 - 𐑱 - 𐑥 - 𐑡 - 𐑡 - 𐑷 - 𐑕 - 𐑪 - 𐑯 - 𐑛 - - - ·𐑡𐑨𐑙𐑘𐑭𐑢𐑺𐑰 - ·𐑓𐑧𐑚𐑘𐑵𐑢𐑺𐑰 - ·𐑥𐑸𐑗 - ·𐑱𐑐𐑮𐑭𐑤 - ·𐑥𐑱 - ·𐑡𐑵𐑯 - ·𐑡𐑫𐑤𐑲 - ·𐑪𐑜𐑭𐑕𐑑 - ·𐑕𐑧𐑐𐑑𐑧𐑥𐑚𐑸 - ·𐑷𐑒𐑑𐑴𐑚𐑸 - ·𐑯𐑴𐑝𐑧𐑥𐑚𐑸 - ·𐑛𐑭𐑕𐑧𐑥𐑚𐑸 - - - - - ·𐑡𐑨𐑯 - ·𐑓𐑧𐑚 - ·𐑥𐑸𐑗 - ·𐑱𐑐𐑮 - ·𐑥𐑱 - ·𐑡𐑵𐑯 - ·𐑡𐑵𐑤 - ·𐑷𐑜 - ·𐑕𐑧𐑐 - ·𐑪𐑒𐑑 - ·𐑯𐑴𐑝 - ·𐑛𐑦𐑕 - - - 𐑡 - 𐑓 - 𐑥 - 𐑱 - 𐑥 - 𐑡 - 𐑡 - 𐑪 - 𐑕 - 𐑷 - 𐑯 - 𐑛 - - - ·𐑡𐑨𐑯𐑿𐑼𐑦 - ·𐑓𐑧𐑚𐑮𐑵𐑼𐑦 - ·𐑥𐑸𐑗 - ·𐑱𐑐𐑮𐑩𐑤 - ·𐑥𐑱 - ·𐑡𐑵𐑯 - ·𐑡𐑩𐑤𐑲 - ·𐑷𐑜𐑩𐑕𐑑 - ·𐑕𐑧𐑐𐑑𐑧𐑥𐑚𐑼 - ·𐑪𐑒𐑑𐑴𐑚𐑼 - ·𐑯𐑴𐑝𐑧𐑥𐑚𐑼 - ·𐑛𐑦𐑕𐑧𐑥𐑚𐑼 - - - - - - - ·𐑕𐑭 - ·𐑥𐑭 - ·𐑑𐑵 - ·𐑢𐑧 - ·𐑔𐑻 - ·𐑓𐑮 - ·𐑕𐑨 - - - ·𐑕𐑭𐑙𐑛𐑱 - ·𐑥𐑭𐑙𐑛𐑱 - ·𐑑𐑵𐑟𐑛𐑱 - ·𐑢𐑧𐑙𐑟𐑛𐑱 - ·𐑔𐑻𐑟𐑛𐑱 - ·𐑓𐑮𐑲𐑛𐑱 - ·𐑕𐑨𐑛𐑻𐑛𐑱 - - - - - 𐑕 - 𐑥 - 𐑑 - 𐑢 - 𐑔 - 𐑓 - 𐑕 - - - - - - - 𐑒1 - 𐑒2 - 𐑒3 - 𐑒4 - - - 1𐑕𐑑 𐑒𐑢𐑸𐑛𐑸 - 2𐑯𐑛 𐑒𐑢𐑸𐑛𐑸 - 3𐑻𐑛 𐑒𐑢𐑸𐑛𐑸 - 4𐑹𐑔 𐑒𐑢𐑸𐑛𐑸 - - - - - - - 𐑨𐑥 - 𐑨.𐑥. - 𐑐𐑥 - 𐑐.𐑥. - - - - - - 𐑚𐑰𐑓𐑪𐑮 ·𐑒𐑮𐑲𐑕𐑑 - 𐑨𐑙𐑴 𐑛𐑪𐑥𐑦𐑙𐑰 - - - 𐑚·𐑒 - 𐑨𐑛 - - - 𐑚 - 𐑨 - - - - - - EEEE, d MMMM y - - - - - d MMMM y - - - - - d MMM y - - - - - dd/MM/y - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1}, {0} - - - {1} 𐑨𐑑 {0} - - - {1} 𐑨𐑑 {0} - - - - - {1}, {0} - - - {1} 𐑨𐑑 {0} - - - {1} 𐑨𐑑 {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - E d - y G - dd/MM/y G - LLL y G - d MMM y G - E, d MMM y G - dd/MM - E dd/MM - d MMM - E d MMM - d MMMM - 𐑢𐑰𐑒 W 𐑝 LLLL - 𐑢𐑰𐑒 W 𐑝 LLLL - MM/y - dd/MM/y - E, dd/MM/y - LLL y - d MMM y - E, d MMM y - LLLL y - QQQ y - QQQQ y - 𐑢𐑰𐑒 w 𐑝 Y - 𐑢𐑰𐑒 w 𐑝 Y - - - - h – h B - - - h:mm – h:mm B - h:mm – h:mm B - - - y G – y G - y – y G - - - M/y G – M/y G - M/y – M/y G - M/y – M/y G - - - dd/MM/y – dd/MM/y G - dd/MM/y G – dd/MM/y G - dd/MM/y – dd/MM/y G - dd/MM/y – dd/MM/y G - - - E, dd/MM/y – E, dd/MM/y G - E, dd/MM/y G – E, dd/MM/y G - E, dd/MM/y – E, dd/MM/y G - E, dd/MM/y – E, dd/MM/y G - - - LLL y G – MMM y G - LLL – MMM y G - LLL y – MMM y G - - - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - h:mm – h:mm a - h:mm – h:mm a - - - h:mm – h:mm a v - h:mm – h:mm a v - - - M – M - - - dd/MM – dd/MM - dd/MM – dd/MM - - - E dd/MM – E dd/MM - E dd/MM – E dd/MM - - - LLL–MMM - - - d–d MMM - d MMM – d MMM - - - E d MMM – E d MMM - E d MMM – E d MMM - - - MM/y – MM/y - MM/y – MM/y - - - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - - - E, dd/MM/y – E, dd/MM/y - E, dd/MM/y – E, dd/MM/y - E, dd/MM/y – E, dd/MM/y - - - LLL – MMM y - LLL y – MMM y - - - d–d MMM y - d MMM – d MMM y - d MMM y – d MMM y - - - E, d MMM – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y - - - LLLL – MMMM y - LLLL y – MMMM y - - - - - - - - 𐑽𐑭 - - - 𐑘𐑽 - 𐑤𐑭𐑕𐑑 𐑘𐑽 - 𐑞𐑦𐑕 𐑘𐑽 - 𐑯𐑧𐑒𐑕𐑑 𐑘𐑽 - - 𐑦𐑯 {0} 𐑘𐑽 - 𐑦𐑯 {0} 𐑘𐑽𐑟 - - - {0} 𐑘𐑽 𐑩𐑜𐑴 - {0} 𐑘𐑽𐑟 𐑩𐑜𐑴 - - - - 𐑤𐑭𐑕𐑑 𐑘𐑽 - 𐑞𐑦𐑕 𐑘𐑽 - 𐑯𐑧𐑒𐑕𐑑 𐑘𐑽 - - 𐑦𐑯 {0} 𐑘𐑽 - 𐑦𐑯 {0} 𐑘𐑽𐑕 - - - {0} 𐑘𐑽 𐑩𐑜𐑴 - {0} 𐑘𐑽𐑕 𐑩𐑜𐑴 - - - - 𐑤𐑭𐑕𐑑 𐑘𐑽 - 𐑯𐑧𐑒𐑕𐑑 𐑘𐑽 - - 𐑦𐑯 {0} 𐑘𐑽 - 𐑦𐑯 {0} 𐑘𐑽𐑕 - - - {0} 𐑘𐑽 𐑩𐑜𐑴 - {0} 𐑘𐑽𐑕 𐑩𐑜𐑴 - - - - 𐑤𐑭𐑕𐑑 𐑒𐑢𐑹𐑑𐑼 - 𐑞𐑦𐑕 𐑒𐑢𐑹𐑑𐑼 - 𐑯𐑧𐑒𐑕𐑑 𐑒𐑢𐑹𐑑𐑼 - - 𐑦𐑯 {0} 𐑒𐑢𐑹𐑑𐑼 - 𐑦𐑯 {0} 𐑒𐑢𐑹𐑑𐑼𐑟 - - - {0} 𐑒𐑢𐑹𐑑𐑼 𐑩𐑜𐑴 - {0} 𐑒𐑢𐑹𐑑𐑼𐑟 𐑩𐑜𐑴 - - - - - 𐑦𐑯 {0} 𐑒𐑢𐑑 - 𐑦𐑯 {0} 𐑒𐑢𐑑 - - - {0} 𐑒𐑢𐑑 𐑩𐑜𐑴 - {0} 𐑒𐑢𐑑 𐑩𐑜𐑴 - - - - 𐑥𐑭𐑙𐑔 - 𐑤𐑭𐑕𐑑 𐑥𐑳𐑯𐑔 - 𐑞𐑦𐑕 𐑥𐑳𐑯𐑔 - 𐑯𐑧𐑒𐑕𐑑 𐑥𐑳𐑯𐑔 - - 𐑦𐑯 {0} 𐑥𐑳𐑯𐑔 - 𐑦𐑯 {0} 𐑥𐑳𐑯𐑔𐑕 - - - {0} 𐑥𐑳𐑯𐑔 𐑩𐑜𐑴 - {0} 𐑥𐑳𐑯𐑔𐑕 𐑩𐑜𐑴 - - - - 𐑤𐑭𐑕𐑑 𐑥𐑳 - 𐑞𐑦𐑕 𐑥𐑳 - 𐑯𐑧𐑒𐑕𐑑 𐑥𐑳 - - 𐑦𐑯 {0} 𐑥𐑳 - 𐑦𐑯 {0} 𐑥𐑳 - - - {0} 𐑥𐑳 𐑩𐑜𐑴 - {0} 𐑥𐑳 𐑩𐑜𐑴 - - - - 𐑢𐑰𐑒 - 𐑤𐑭𐑕𐑑 𐑢𐑰𐑒 - 𐑞𐑦𐑕 𐑢𐑰𐑒 - 𐑯𐑧𐑒𐑕𐑑 𐑢𐑰𐑒 - - 𐑦𐑯 {0} 𐑢𐑰𐑒 - 𐑦𐑯 {0} 𐑢𐑰𐑒𐑕 - - - {0} 𐑢𐑰𐑒 𐑩𐑜𐑴 - {0} 𐑢𐑰𐑒𐑕 𐑩𐑜𐑴 - - 𐑞 𐑢𐑰𐑒 𐑝 {0} - - - 𐑤𐑭𐑕𐑑 𐑢 - 𐑞𐑦𐑕 𐑢 - 𐑯𐑧𐑒𐑕𐑑 𐑢 - - 𐑦𐑯 {0} 𐑢 - 𐑦𐑯 {0} 𐑢 - - - {0} 𐑢 𐑩𐑜𐑴 - {0} 𐑢 𐑩𐑜𐑴 - - - - 𐑛𐑱 - 𐑘𐑧𐑕𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑥𐑪𐑮𐑴 - - 𐑦𐑯 {0} 𐑛𐑱 - 𐑦𐑯 {0} 𐑛𐑱𐑟 - - - {0} 𐑛𐑱 𐑩𐑜𐑴 - {0} 𐑛𐑱𐑟 𐑩𐑜𐑴 - - - - 𐑘𐑧𐑕𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑥𐑪𐑮𐑴 - - 𐑦𐑯 {0} 𐑛𐑱 - 𐑦𐑯 {0} 𐑛𐑱𐑕 - - - {0} 𐑛𐑱 𐑩𐑜𐑴 - {0} 𐑛𐑱𐑕 𐑩𐑜𐑴 - - - - 𐑘𐑧𐑕𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑛𐑱 - 𐑑𐑩𐑥𐑪𐑮𐑴 - - 𐑦𐑯 {0} 𐑛𐑱 - 𐑦𐑯 {0} 𐑛𐑱𐑕 - - - {0} 𐑛𐑱 𐑩𐑜𐑴 - {0} 𐑛𐑱𐑕 𐑩𐑜𐑴 - - - - 𐑛𐑱 𐑝 𐑞 𐑢𐑰𐑒 - - - 𐑨𐑥/𐑐𐑥 - - - 𐑬𐑮 - 𐑞𐑦𐑕 𐑬𐑼 - - 𐑦𐑯 {0} 𐑬𐑼 - 𐑦𐑯 {0} 𐑬𐑼𐑟 - - - {0} 𐑬𐑼 𐑩𐑜𐑴 - {0} 𐑬𐑼𐑟 𐑩𐑜𐑴 - - - - 𐑞𐑦𐑕 𐑬𐑼 - - 𐑦𐑯 {0} 𐑬𐑼 - 𐑦𐑯 {0} 𐑬𐑼𐑕 - - - {0} 𐑬𐑼 𐑩𐑜𐑴 - {0} 𐑬𐑼𐑕 𐑩𐑜𐑴 - - - - 𐑞𐑦𐑕 𐑬𐑼 - - 𐑦𐑯 {0} 𐑬𐑼 - 𐑦𐑯 {0} 𐑬𐑼𐑕 - - - {0} 𐑬𐑼 𐑩𐑜𐑴 - {0} 𐑬𐑼𐑕 𐑩𐑜𐑴 - - - - 𐑥𐑦𐑙𐑦𐑑 - 𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑 - - 𐑦𐑯 {0} 𐑥𐑦𐑯𐑦𐑑 - 𐑦𐑯 {0} 𐑥𐑦𐑯𐑦𐑑𐑕 - - - {0} 𐑥𐑦𐑯𐑦𐑑 𐑩𐑜𐑴 - {0} 𐑥𐑦𐑯𐑦𐑑𐑕 𐑩𐑜𐑴 - - - - 𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑 - - 𐑦𐑯 {0} 𐑥𐑦𐑯 - 𐑦𐑯 {0} 𐑥𐑦𐑯 - - - {0} 𐑥𐑦𐑯 𐑩𐑜𐑴 - {0} 𐑥𐑦𐑯 𐑩𐑜𐑴 - - - - 𐑞𐑦𐑕 𐑥𐑦𐑯𐑦𐑑 - - 𐑦𐑯 {0} 𐑥𐑦𐑯 - 𐑦𐑯 {0} 𐑥𐑦𐑯 - - - {0} 𐑥𐑦𐑯 𐑩𐑜𐑴 - {0} 𐑥𐑦𐑯 𐑩𐑜𐑴 - - - - 𐑕𐑧𐑒𐑭𐑙𐑛 - 𐑯𐑬 - - 𐑦𐑯 {0} 𐑕𐑧𐑒𐑩𐑯𐑛 - 𐑦𐑯 {0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟 - - - {0} 𐑕𐑧𐑒𐑩𐑯𐑛 𐑩𐑜𐑴 - {0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟 𐑩𐑜𐑴 - - - - 𐑯𐑬 - - 𐑦𐑯 {0} 𐑕𐑧𐑒 - 𐑦𐑯 {0} 𐑕𐑧𐑒 - - - {0} 𐑕𐑧𐑒 𐑩𐑜𐑴 - {0} 𐑕𐑧𐑒 𐑩𐑜𐑴 - - - - 𐑯𐑬 - - 𐑦𐑯 {0} 𐑕𐑧𐑒 - 𐑦𐑯 {0} 𐑕𐑧𐑒 - - - {0} 𐑕𐑧𐑒 𐑩𐑜𐑴 - {0} 𐑕𐑧𐑒 𐑩𐑜𐑴 - - - - 𐑟𐑴𐑯 - - - - ·𐑜𐑥𐑑{0} - ·𐑜𐑥𐑑 - 𐑜𐑥𐑑+? - {0} 𐑑𐑲𐑥 - {0} 𐑛𐑱𐑤𐑲𐑑 𐑑𐑲𐑥 - {0} 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥 - - - 𐑒𐑴𐑹𐑛𐑦𐑯𐑱𐑑𐑩𐑛 𐑿𐑯𐑦𐑝𐑻𐑕𐑩𐑤 𐑑𐑲𐑥 - - - 𐑿𐑑𐑰𐑒𐑰 - - - - 𐑳𐑯𐑯𐑴𐑯 𐑤𐑴𐑒𐑱𐑖𐑩𐑯 - - - - 𐑚𐑮𐑦𐑑𐑦𐑖 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥 - - - - - 𐑲𐑮𐑦𐑖 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥 - - - - - 𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥 - 𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥 - 𐑕𐑧𐑯𐑑𐑮𐑩𐑤 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥 - - - 𐑕𐑘𐑑 - 𐑕𐑘𐑑 - 𐑕𐑘𐑕𐑑 - - - - - 𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥 - 𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥 - 𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥 - - - 𐑰𐑘𐑑 - 𐑰𐑘𐑑 - 𐑰𐑘𐑕𐑑 - - - - - 𐑓𐑻𐑞𐑼-𐑰𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥 - - - - - 𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑑𐑲𐑥 - 𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑑𐑨𐑯𐑛𐑼𐑛 𐑑𐑲𐑥 - 𐑢𐑧𐑕𐑑𐑼𐑯 𐑘𐑫𐑼𐑩𐑐𐑾𐑯 𐑕𐑳𐑥𐑼 𐑑𐑲𐑥 - - - 𐑢𐑘𐑑 - 𐑢𐑘𐑑 - 𐑢𐑘𐑕𐑑 - - - - - 𐑜𐑮𐑧𐑯𐑦𐑗 𐑥𐑰𐑯 𐑑𐑲𐑥 - - - 𐑜𐑥𐑑 - - - - - - - - - 0 𐑔𐑬𐑟𐑩𐑯𐑛 - 0 𐑔𐑬𐑟𐑩𐑯𐑛 - 00 𐑔𐑬𐑟𐑩𐑯𐑛 - 00 𐑔𐑬𐑟𐑩𐑯𐑛 - 000 𐑔𐑬𐑟𐑩𐑯𐑛 - 000 𐑔𐑬𐑟𐑩𐑯𐑛 - 0 𐑥𐑦𐑤𐑘𐑩𐑯 - 0 𐑥𐑦𐑤𐑘𐑩𐑯 - 00 𐑥𐑦𐑤𐑘𐑩𐑯 - 00 𐑥𐑦𐑤𐑘𐑩𐑯 - 000 𐑥𐑦𐑤𐑘𐑩𐑯 - 000 𐑥𐑦𐑤𐑘𐑩𐑯 - 0 𐑚𐑦𐑤𐑘𐑩𐑯 - 0 𐑚𐑦𐑤𐑘𐑩𐑯 - 00 𐑚𐑦𐑤𐑘𐑩𐑯 - 00 𐑚𐑦𐑤𐑘𐑩𐑯 - 000 𐑚𐑦𐑤𐑘𐑩𐑯 - 000 𐑚𐑦𐑤𐑘𐑩𐑯 - 0 𐑑𐑮𐑦𐑤𐑾𐑯 - 0 𐑑𐑮𐑦𐑤𐑾𐑯 - 00 𐑑𐑮𐑦𐑤𐑾𐑯 - 00 𐑑𐑮𐑦𐑤𐑾𐑯 - 000 𐑑𐑮𐑦𐑤𐑾𐑯 - 000 𐑑𐑮𐑦𐑤𐑾𐑯 - - - - - - - ¤#,##0.00 - - - ¤#,##0.00;(¤#,##0.00) - ¤ #,##0.00;(¤ #,##0.00) - #,##0.00;(#,##0.00) - - - - - - 𐑚𐑼𐑥𐑿𐑛𐑩𐑯 𐑛𐑪𐑤𐑼 - - - 𐑒𐑩𐑯𐑱𐑛𐑾𐑯 𐑛𐑪𐑤𐑼 - - - 𐑗𐑧𐑒 𐑒𐑩𐑮𐑵𐑯𐑩 - - - 𐑛𐑱𐑯𐑦𐑖 𐑒𐑮𐑴𐑯𐑩 - - - 𐑚𐑮𐑦𐑑𐑦𐑖 𐑐𐑬𐑯𐑛 - - - 𐑣𐑳𐑙𐑜𐑺𐑾𐑯 𐑓𐑪𐑮𐑦𐑯𐑑 - - - 𐑲𐑕𐑤𐑨𐑯𐑛𐑦𐑒 𐑒𐑮𐑴𐑯𐑩 - - - 𐑥𐑧𐑒𐑕𐑦𐑒𐑩𐑯 𐑐𐑱𐑕𐑴 - - - 𐑕𐑢𐑰𐑛𐑦𐑖 𐑒𐑮𐑴𐑯𐑩 - - - 𐑿𐑧𐑕 𐑛𐑪𐑤𐑼 - - - - {0}+ - - - {0} 𐑛𐑱 - {0} 𐑛𐑱𐑟 - 𐑑𐑱𐑒 𐑞 {0}𐑔 𐑮𐑲𐑑. - - - - - - 𐑛𐑧𐑒𐑱𐑛𐑟 - {0} 𐑛𐑧𐑒𐑱𐑛 - {0} 𐑛𐑧𐑒𐑱𐑛𐑟 - - - 𐑘𐑽𐑟 - {0} 𐑘𐑽 - {0} 𐑘𐑽𐑟 - {0} 𐑐𐑻 𐑘𐑽𐑟 - - - 𐑬𐑼𐑟 - - - 𐑥𐑦𐑯𐑦𐑑𐑕 - {0} 𐑥𐑦𐑯𐑦𐑑 - {0} 𐑥𐑦𐑯𐑦𐑑𐑕 - {0} 𐑐𐑻 𐑥𐑦𐑯𐑦𐑑 - - - 𐑕𐑧𐑒𐑩𐑯𐑛𐑟 - {0} 𐑕𐑧𐑒𐑩𐑯𐑛 - {0} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟 - {0} 𐑐𐑻 𐑕𐑧𐑒𐑩𐑯𐑛 - - - 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼𐑟 - {0} 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼 - {0} 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼𐑟 - {0} 𐑐𐑻 𐑒𐑦𐑤𐑪𐑥𐑦𐑑𐑼 - - - 𐑥𐑦𐑑𐑼𐑟 - {0} 𐑥𐑦𐑑𐑼 - {0} 𐑥𐑦𐑑𐑼𐑟 - {0} 𐑐𐑻 𐑥𐑦𐑑𐑼𐑟 - - - 𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼𐑟 - {0} 𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼 - {0} 𐑛𐑧𐑕𐑦𐑥𐑦𐑑𐑼𐑟 - - - 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼𐑟 - {0} 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼 - {0} 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼𐑟 - {0} 𐑐𐑻 𐑕𐑧𐑯𐑑𐑦𐑥𐑰𐑑𐑼 - - - 𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼𐑟 - {0} 𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼 - {0} 𐑥𐑦𐑤𐑦𐑥𐑰𐑑𐑼𐑟 - - - 𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼𐑟 - {0} 𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼 - {0} 𐑥𐑲𐑒𐑮𐑴𐑥𐑰𐑑𐑼𐑟 - - - 𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼𐑟 - {0} 𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼 - {0} 𐑯𐑨𐑯𐑴𐑥𐑦𐑑𐑼𐑟 - - - 𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼𐑟 - {0} 𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼 - {0} 𐑐𐑰𐑒𐑴𐑥𐑦𐑑𐑼𐑟 - - - 𐑥𐑲𐑤𐑟 - {0} 𐑥𐑲𐑤 - {0} 𐑥𐑲𐑤𐑟 - - - 𐑘𐑸𐑛𐑟 - {0} 𐑘𐑸𐑛 - {0} 𐑘𐑸𐑛𐑟 - - - 𐑓𐑰𐑑 - {0} 𐑓𐑫𐑑 - {0} 𐑓𐑰𐑑 - {0} 𐑐𐑻 𐑓𐑫𐑑 - - - 𐑦𐑯𐑗𐑩𐑟 - {0} 𐑦𐑯𐑗 - {0} 𐑦𐑯𐑗𐑩𐑟 - {0} 𐑐𐑻 𐑦𐑯𐑗 - - - 𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤 - {0} 𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤 - {0} 𐑕𐑒𐑨𐑯𐑛𐑦𐑯𐑱𐑝𐑾𐑯 𐑥𐑲𐑤𐑟 - - - 𐑒𐑸𐑛𐑦𐑯𐑩𐑤 𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯 - {0} 𐑰𐑕𐑑 - {0} 𐑯𐑹𐑔 - {0} 𐑕𐑬𐑔 - {0} 𐑢𐑧𐑕𐑑 - - - - - 𐑛𐑧𐑒 - {0} 𐑛𐑧𐑒 - {0} 𐑛𐑧𐑒 - - - 𐑘𐑽𐑟 - {0}/𐑘 - - - 𐑬𐑼𐑟 - - - 𐑥𐑦𐑯𐑟 - {0} 𐑥𐑦𐑯 - {0} 𐑥𐑦𐑯𐑟 - {0}/𐑥𐑦𐑯 - - - 𐑕𐑧𐑒𐑕 - {0} 𐑕𐑧𐑒 - {0} 𐑕𐑧𐑒𐑕 - {0}/𐑕 - - - 𐑥𐑲𐑤𐑟 - {0} 𐑥𐑲 - {0} 𐑥𐑲 - - - 𐑘𐑸𐑛𐑟 - {0} 𐑘𐑛 - {0} 𐑘𐑛 - - - 𐑓𐑰𐑑 - {0} 𐑓𐑑 - {0} 𐑓𐑑 - {0}/𐑓𐑑 - - - 𐑦𐑯𐑗𐑩𐑟 - {0} 𐑦𐑯 - {0} 𐑦𐑯 - {0}/𐑦𐑯 - - - 𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯 - {0} 𐑰 - {0} 𐑯 - {0} 𐑕 - {0} 𐑢 - - - - - 𐑛𐑧𐑒 - {0}𐑛𐑧𐑒 - {0}𐑛𐑧𐑒 - - - {0}𐑘 - {0}𐑘 - {0}/𐑘 - - - 𐑬𐑼 - - - 𐑥𐑦𐑯 - {0}𐑥 - {0}𐑥 - {0}/𐑥𐑦𐑯 - - - 𐑕𐑧𐑒 - {0}𐑕 - {0}𐑕 - {0}/𐑕 - - - {0}𐑥𐑲 - {0}𐑥𐑲 - - - 𐑘𐑛 - {0}𐑘𐑛 - {0}𐑘𐑛 - - - 𐑓𐑑 - {0}′ - {0}′ - {0}/𐑓𐑑 - - - 𐑦𐑯 - {0}″ - {0}″ - {0}/𐑦𐑯 - - - 𐑛𐑦𐑮𐑧𐑒𐑖𐑩𐑯 - {0}𐑰 - {0}𐑯 - {0}𐑕 - {0}𐑢 - - - - - - {0} 𐑯 {1} - {0} 𐑯 {1} - - - {0} 𐑹 {1} - {0} 𐑹 {1} - - - {0} {1} - {0} {1} - {0} {1} - {0} {1} - - - - - 𐑘𐑧𐑕:𐑘 - 𐑯𐑴:𐑯 - - - - und en - informal - {0} - {0}{1} - - ·{title} {given} {given2} {surname} {generation}, {credentials} - - - ·{given-informal} {surname} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-allCaps} - - - ·{given-informal-monogram-allCaps}{surname-monogram-allCaps} - - - ·{given} {given2-initial} {surname} {generation}, {credentials} - - - ·{given-informal} {surname} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{surname-monogram-allCaps} - - - ·{given-informal-monogram-allCaps} - - - ·{given-initial}{given2-initial} {surname} - - - ·{given-informal} {surname-initial} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{surname-monogram-allCaps} - - - ·{given-informal-monogram-allCaps} - - - ·{surname} {title} {given} {given2} {generation}, {credentials} - - - ·{surname} {given-informal} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-allCaps} - - - ·{surname-monogram-allCaps}{given-informal-monogram-allCaps} - - - ·{surname} {given} {given2-initial} {generation}, {credentials} - - - ·{surname} {given-informal} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{surname-monogram-allCaps} - - - ·{given-informal-monogram-allCaps} - - - ·{surname} {given-initial}{given2-initial} - - - ·{surname} {given-initial} - - - ·{title} {surname} - - - ·{given-informal} - - - ·{surname-monogram-allCaps} - - - ·{given-informal-monogram-allCaps} - - - ·{surname-core}, {given} {given2} {surname-prefix} - - - ·{surname}, {given-informal} - - - ·{surname-core}, {given} {given2-initial} {surname-prefix} - - - ·{surname}, {given-informal} - - - ·{surname-core}, {given-initial}{given2-initial} {surname-prefix} - - - ·{surname}, {given-informal} - - - 𐑟𐑩𐑯𐑛𐑱𐑩 - - - 𐑲𐑮𐑰𐑯 - 𐑨𐑛𐑤𐑼 - - - 𐑥𐑺𐑦 𐑕𐑵 - 𐑣𐑱𐑥𐑦𐑖 - 𐑢𐑪𐑑𐑕𐑩𐑯 - - - 𐑥𐑮 - 𐑚𐑻𐑑𐑦 - 𐑣𐑧𐑯𐑮𐑦 𐑮𐑪𐑚𐑼𐑑 - ∅∅∅ - 𐑢𐑵𐑕𐑑𐑼 - ∅∅∅ - 𐑡𐑼 - 𐑥-𐑐 - - - 𐑕𐑦𐑯𐑚𐑨𐑛 - - - 𐑒𐑧𐑑𐑩 - 𐑥𐑦𐑤𐑼 - - - 𐑑𐑕𐑧𐑑𐑕𐑰𐑤𐑾 - 𐑣𐑱𐑥𐑦𐑖 - - - 𐑐𐑮𐑓 𐑛𐑼 - 𐑝𐑪𐑯 - 𐑚𐑮𐑰𐑤 - 𐑜𐑪𐑯𐑔𐑭𐑤𐑧𐑔 𐑛𐑪𐑥𐑦𐑙𐑜𐑴 - 𐑡𐑼 - 𐑥-𐑛 𐑛𐑛𐑕 - - - diff --git a/make/data/cldr/common/main/en_Shaw_GB.xml b/make/data/cldr/common/main/en_Shaw_GB.xml deleted file mode 100644 index 3fb9493e77bc..000000000000 --- a/make/data/cldr/common/main/en_Shaw_GB.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - + @@ -724,6 +724,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Birmo Mongolujo Makao (SAR de Ĉinujo) + Makao Nord-Marianoj Martiniko Maŭritanio @@ -759,6 +760,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pitkarna Insulo Puertoriko Palestinaj teritorioj + Palestino Portugalujo Palaŭo Paragvajo @@ -775,7 +777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sudano Svedujo Singapuro - Sankta Heleno + Sankta Heleno, Ascension kaj Tristan da Cunha Slovenujo Svalbardo kaj Janmajeno Slovakujo @@ -793,7 +795,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tristan da Cunha Turkoj kaj Kajkoj Ĉado - Francaj Sudaj Teritorioj + Francaj Sudaj kaj Antarktaj Teritorioj Togolando Tajlando Taĝikujo @@ -841,15 +843,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic kalendaro formo de valuto + ordigo ignoranta simbolojn + inversa ordigo kun kromsignoj + ordigo majuskloj/minuskloj + ordigo distinganta litergrandon ordigo + normigita ordigo + ordigi kiel numeroj + ordigo de grupoj/skribsistemoj + forto de ordigo valuto + celo de transformo + eksigi de vortar-bazita linisalto vidigo de miensimboloj + unua tago de semajno + miksitaj horloĝa sistemo (12- aŭ 24-hora) + metodo de enigo + klavaro stilo de linisalto linisalto ene vortoj + reguloj de transformo mezur-sistemo + mezur-unuo ciferoj + regiono por suplementaj datumoj + fonto de transformo + subregiono frazfino post mallongigo + transformo + maŝine tradukita + horzono + variaĵo de lokaĵaro + por privata uzo + private uzata transformo budaisma kalendaro @@ -868,13 +895,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic gregoria juda kalendaro juda + hinda nacia islama kalendaro islama - tabela islama kalendaro - tabela islama + islama kalendaro (tabela, civila epoko) + islama (tabela, civila epoko) + islama (observ-bazita, Sauda Arabujo) + islama (tabela, astronomia epoko) islama kalendaro (Umm al-Qura) - islama Umm al-Qura - gregoria kalendaro (jaro unue) + islama (Umm al-Qura) + gregoria kalendaro ISO 8601 + gregoria japana kalendaro japana persa kalendaro @@ -885,15 +916,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic kontista norma formo de valuto norma + minuskloj unue + minuskloj unue + majuskloj unue + malnova maniero + vortara norma ordigo laŭ Unikodo norma laŭ Unikodo + por miensimboloj + eŭropaj reguloj (EOR) + adresara + fonetika + pinjina ĝeneral-uza serĉo serĉa + koreaj unuaj konsonantoj norma ordigo norma + laŭ strek-nombro + tradicia + laŭ radikaloj kaj strek-nombro + bopomofo + valutoj + ciferoj + helpsignoj + blankspacoj + aliaj simboloj + ĉio + nur literoj ignorante kromsignojn + literoj kun kromsignoj, litergrando, variaĵo, kanaoj + literoj kun kromsignoj + literoj kun kromsignoj, litergrando, variaĵo + al plenlarĝa + al duonlarĝa norma miensimboloj teksto + 12-hora sistemo + 12 + 24-hora sistemo + 24 12-hora sistemo (0–11) 12 (0–11) 12-hora sistemo (1–12) @@ -912,6 +974,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic konservi ĉiujn norma konservi en frazoj + transliterumo laŭ BGN + transliterumo laŭ UNGEGN metra sistemo metra brita mezur-sistemo @@ -920,46 +984,75 @@ CLDR data files are interpreted according to the LDML specification (http://unic usona hind-arabaj ciferoj hind-arabaj ciferoj etenditaj + hind-arabaj etenditaj armenaj ciferoj armenaj ciferoj minusklaj + armenaj minusklaj bengalaj ciferoj ĉakmaj ciferoj devanagaraj ciferoj etiopaj ciferoj + financaj ciferoj plenlarĝaj + plenlarĝaj kartvelaj ciferoj grekaj ciferoj grekaj ciferoj minusklaj + grekaj minusklaj guĝarataj ciferoj gurmukaj ciferoj + numeri monattagojn per ĉinaj signoj por tradiciaj kalendaroj ĉinaj dekumaj ciferoj + pozicia dekuma sistemo uzanta ĉinajn ideografiaĵojn kiel ciferojn simpligit-ĉinaj ciferoj simpligit-ĉinaj financaj ciferoj + simpligit-ĉinaj financaj tradici-ĉinaj ciferoj - tradic-ĉinaj financaj ciferoj + tradici-ĉinaj financaj ciferoj + tradici-ĉinaj financaj hebreaj ciferoj javaj ciferoj japanaj ciferoj japanaj financaj ciferoj + japanaj financaj kmeraj ciferoj kanaraj ciferoj laŭaj ciferoj eŭropaj ciferoj + matematikaj grasaj + matematikaj kretograsaj + matematikaj egallarĝaj + matematikaj senserifaj grasaj + matematikaj senserifaj malajalamaj ciferoj manipuraj ciferoj birmaj ciferoj + indiĝenaj ciferoj + indiĝenaj ciferoj orijaj ciferoj + konturaj ciferoj romaj ciferoj + romaj majusklaj romaj ciferoj minusklaj + romaj minusklaj + segmentaj tamilaj tradiciaj ciferoj tamilaj ciferoj + tamilaj modernaj teluguaj ciferoj tajaj ciferoj tibetaj ciferoj + tradiciaj ciferoj vajaj ciferoj ne jes + nedifinita maŝina traduko + variaĵo POSIX + + ne + jes + metra brita @@ -976,7 +1069,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic [q w x y] [A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U V Z] [  , % ‰ + − 0 1 2 3 4 5 6 7 8 9] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] \{ \} /] + [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” « » ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″ ° ~] {0}… …{0} @@ -986,28 +1079,78 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + de budaisma erao + + + + + + + + Toto + Paofio + Hatoro + Ĥojako + Tobio + Meĥiro + Famenuto + Farmutio + Pahono + Paonio + Epifio + Misorio + Nasio + + + + + Toto + Paofio + Hatoro + Ĥojako + Tobio + Meĥiro + Famenuto + Farmutio + Pahono + Paonio + Epifio + Misorio + Nasio + + + + + + de erao de martiroj + + + - EEEE, 'la' d-'a' 'de' MMMM y G + EEEE, 'la' d-'a' 'de' MMMM y GGGG - G y-MMMM-dd + d MMMM y G GyMMMMdd - G y-MMM-dd + d MMM y G GyMMMdd - G y-MM-dd + y-MM-dd G @@ -1054,8 +1197,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y G - d MMM y G - E, d MMM y G + y-MM G + y-MM-dd G + E, y-MM-dd G MMM y G d MMM y G E, d MMM y G @@ -1068,9 +1212,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMMM y G y G - M y GGGGG - y-MM-dd GGGGG - E, y-MM-dd GGGGG + y-MM G + y-MM-dd G + E, y-MM-dd G MMM y G d MMM y G E, d MMM y G @@ -1094,21 +1238,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic y – y G - MMM y GGGGG – MMM y GGGGG - MMM – MMM y GGGGG - MMM y – MMM y GGGGG + y-MM G – y-MM G + y-MM – y-MM G + y-MM – y-MM G - d – d MMM y GGGGG - d MMM y GGGGG – d MMM y GGGGG - d MMM – d MMM y GGGGG - d MMM y – d MMM y GGGGG + y-MM-dd – y-MM-dd G + y-MM-dd G – y-MM-dd G + y-MM-dd – y-MM-dd G + y-MM-dd – y-MM-dd G - E, d – E, d MMM y GGGGG - E, d MMM y GGGGG – E, d MMM y GGGGG - E, d MMM – E, d MMM y GGGGG - E, d MMM y – E, d MMM y GGGGG + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd G – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G MMM y G – MMM y G @@ -1159,22 +1303,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y G - y-MM – y-MM GGGGG - y-MM – y-MM GGGGG + y-MM – y-MM G + y-MM – y-MM G - y-MM-dd – y-MM-dd GGGGG - y-MM-dd – y-MM-dd GGGGG - y-MM-dd – y-MM-dd GGGGG + y-MM-dd – y-MM-dd G + y-MM-dd – y-MM-dd G + y-MM-dd – y-MM-dd G - E, y-MM-dd – E, y-MM-dd GGGGG - E, y-MM-dd – E, y-MM-dd GGGGG - E, y-MM-dd – E, y-MM-dd GGGGG + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G MMM – MMM y G @@ -1335,19 +1483,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic - y-MMMM-dd + d MMMM y yMMMMdd - y-MMM-dd + d MMM y yMMMdd - yy-MM-dd + y-MM-dd yyMMdd @@ -1402,12 +1550,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1}, {0} - - {1}, {0} - - - {1}, {0} - @@ -1418,11 +1560,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y G - d MMM y G - E, d MMM y G + y-MM G + y-MM-dd G + E, y-MM-dd G MMM y G d MMM y G E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G HH'H' h:mm a h:mm:ss a @@ -1434,6 +1580,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM E, d MMM d MMMM + E, d MMMM W-'a' 'semajno' 'de' MMMM W-'a' 'semajno' 'de' MMMM E, y-MM-dd @@ -1441,12 +1588,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ 'de' y w-'a' 'semajno' 'de' Y w-'a' 'semajno' 'de' Y + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + {0} – {1} + + + h – h B + + + h:mm – h:mm B + h:mm – h:mm B + d – d @@ -1466,10 +1631,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y – d MMM y G - E, d – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd G – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G + E, y-MM-dd – E, y-MM-dd G MMM y G – MMM y G @@ -1492,7 +1657,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic h – h a - HH – HH + HH'H' – HH'H' h:mm a – h:mm a @@ -1518,12 +1683,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic HH–HH'H' v + + MM – MM + E, MM-dd – E, MM-dd E, MM-dd – E, MM-dd - MMM–MMM + MMM – MMM d – d MMM @@ -1533,6 +1701,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y @@ -1546,14 +1718,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y – MMM y - d–d MMM y + d – d MMM y d MMM – d MMM y d MMM y – d MMM y E, d – E, d MMM y E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y + E, d MMM y – E, d MMM y MMMM – MMMM y @@ -1562,6 +1734,162 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + Tiŝrio + Ĥeŝvano + Kislevo + Tebeto + Ŝebato + Adaro I + Adaro + Adaro II + Nisano + Ijaro + Sivano + Tamuzo + Abo + Elulo + + + + + Tiŝrio + Ĥeŝvano + Kislevo + Tebeto + Ŝebato + Adaro I + Adaro + Adaro II + Nisano + Ijaro + Sivano + Tamuzo + Abo + Elulo + + + + + + de juda erao + + + + + + + + Ĉaitra + Vaiŝakha + Ĝjaiŝtha + Aŝadha + Ŝravana + Bhadra + Aŝvina + Kartika + Agrahajana + Paŭŝa + Magha + Phalguna + + + + + Ĉaitra + Vaiŝakha + Ĝjaiŝtha + Aŝadha + Ŝravana + Bhadra + Aŝvina + Kartika + Agrahajana + Paŭŝa + Magha + Phalguna + + + + + + de erao Śaka + + + + + + + + Muh. + Saf. + Rab. I + Rab. II + Ĝum. I + Ĝum. II + Raĝ. + Ŝab. + Ram. + Ŝav. + Dulk. + Dulh. + + + Muharamo + Safaro + Rabio I + Rabio II + Ĝumado I + Ĝumado II + Raĝabo + Ŝabano + Ramadano + Ŝavalo + Dulkago + Dulhiĝo + + + + + Muh. + Saf. + Rab. I + Rab. II + Ĝum. I + Ĝum. II + Raĝ. + Ŝab. + Ram. + Ŝav. + Dulk. + Dulh. + + + Muharamo + Safaro + Rabio I + Rabio II + Ĝumado I + Ĝumado II + Raĝabo + Ŝabano + Ramadano + Ŝavalo + Dulkago + Dulhiĝo + + + + + + de araba erao + antaŭ heĝiro + + + @@ -1719,9 +2047,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic jartago - - jartago - tago de semajno @@ -1997,15 +2322,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic antaŭ {0} s. - - tagtempo - tagtempo - - tagtempo - horo nuna horo @@ -2106,7 +2425,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic UTC{0} - UTC UTC+? tempo: {0} {0} (somera tempo) @@ -2405,9 +2723,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Librevilo - - brita somera tempo - Londono @@ -2480,9 +2795,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ĝakarto - - irlanda norma tempo - Dublino @@ -3043,6 +3355,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Harareo + + + tempo: Akro + Akro (norma tempo) + Akro (somera tempo) + + afgana tempo @@ -3218,6 +3537,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic brazilja somera tempo + + + brita tempo + brita somera tempo + + bruneja tempo @@ -3388,7 +3713,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - universala tempo kunordigita + grenviĉa meza tempo + + + + + gronlanda tempo + gronlanda norma tempo + gronlanda somera tempo @@ -3417,7 +3749,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Havajo-Aleutoj (norma tempo) + havaja tempo @@ -3478,6 +3810,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic irana somera tempo + + + irlanda tempo + irlanda norma tempo + + irkutska tempo @@ -3499,6 +3837,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic japana somera tempo + + + kamĉatka tempo + kamĉatka norma tempo + kamĉatka somera tempo + + kazaĥa tempo @@ -3761,11 +4106,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic saĥalena somera tempo + + + tempo: Samara + Samara (norma tempo) + Samara (somera tempo) + + - uson-samoa tempo uson-samoa norma tempo - uson-samoa somera tempo @@ -3832,6 +4182,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic tempo: Ĉuuk + + + turka tempo + turka norma tempo + turka somera tempo + + turkmena tempo @@ -3851,6 +4208,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic urugvaja somera tempo + + + tempo: Urumĉio + + uzbeka tempo @@ -4830,9 +5192,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic plateno - nekonata monunuo - (nekunata monunuo) - (nekonata monunuo) + nekonata valuto + (nekonata valuto) + (nekonata valuto) jemena rialo @@ -5040,11 +5402,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kvadratmejloj po {0} sur kvadratmejlo - - akreoj - {0} akreo - {0} akreoj - kvadrataj jardoj {0} kvadratjardo @@ -5062,7 +5419,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic po {0} sur kvadratcolo - karatoj {0} karato {0} karatoj @@ -5211,7 +5567,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic po {0} en semajno - tagoj {0} tago {0} tagoj po {0} en tago @@ -5509,12 +5864,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} uncoj trojaj - karatoj {0} karato {0} karatoj - daltonoj {0} daltono {0} daltonoj @@ -5529,7 +5882,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} sunmasoj - granoj {0} grano {0} granoj @@ -5633,11 +5985,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic po {0} mejlo en horo po {0} mejloj en horo - - nodoj - {0} nodo - {0} nodoj - boforta skalo {0} grado laŭ boforta skalo @@ -5716,26 +6063,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} mililitro {0} mililitroj - - duonkvartoj metraj - {0} duonkvarto metra - {0} duonkvartoj metraj - - - kvaronkvartoj metraj - {0} kvaronkvarto metra - {0} kvaronkvartoj metraj - fluiduncoj metraj {0} fluidunco metra {0} fluiduncoj metraj - - kvaronkvartoj usonaj - {0} kvaronkvarto usona - {0} kvaronkvartoj usonaj - steradianoj {0} steradiano @@ -5802,7 +6134,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} veberoj - lum {0} lum {0} lum @@ -6485,646 +6816,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - g₀ - {0} g₀ - {0} g₀ - - - {0} m/s² - {0} m/s² - - - riv. - {0} riv. - {0} riv. - - - {0} rad - {0} rad - - - ° - - - ′ - - - ″ - - - {0} km² - {0} km² - - - {0} ha - {0} ha - - - {0} m² - {0} m² - - - {0} cm² - {0} cm² - - - {0} mi² - {0} mi² + + d - - akreoj - {0} akreo - {0} akreoj + + pt. + {0} pt. + {0} pt. - - {0} yd² - {0} yd² + + ct - - {0} ft² - {0} ft² + + Da - - {0} in² - {0} in² + + gr - - {0} kt - {0} kt + + nd. + {0} nd. + {0} nd. - - mg/dl - {0} mg/dl - {0} mg/dl + + duonkvartoj m. + {0} duonkvarto m. + {0} duonkvartoj m. - - mmol/l - {0} mmol/l - {0} mmol/l - - - ekz. - {0} ekz. - {0} ekz. - - - {0} ppm - {0} ppm - - - {0} % - {0} % - - - {0} ‰ - {0} ‰ - - - {0} ‱ - {0} ‱ - - - {0} mol - {0} mol - - - Glc - - - l/km - {0} l/km - {0} l/km - - - l/100 km - {0} l/100 km - {0} l/100 km - - - {0} PB - {0} PB - - - {0} TB - {0} TB - - - {0} Tb - {0} Tb - - - {0} GB - {0} GB - - - {0} Gb - {0} Gb - - - {0} MB - {0} MB - - - {0} Mb - {0} Mb - - - {0} kB - {0} kB - - - {0} kb - {0} kb - - - B - {0} B - {0} B - - - b - {0} b - {0} b - - - jc. - {0} jc. - {0} jc. - - - jd. - {0} jd. - {0} jd. - - - a - {0} a - {0} a - {0}/a - - - jk-onoj - {0} jk-ono - {0} jk-onoj - {0}/jk-ono - - - mon. - {0}/mon. - - - sem. - {0} sem. - {0} sem. - {0}/sem. - - - d - {0} d - {0} d - - - h - {0} h - {0} h - {0}/h - - - min - {0} min - {0} min - - - s - {0} s - {0} s - {0}/s - - - ms - {0} ms - {0} ms - - - {0} μs - {0} μs - - - {0} ns - {0} ns - - - A - {0} A - {0} A - - - {0} mA - {0} mA - - - Ω - {0} Ω - {0} Ω - - - V - {0} V - {0} V - - - {0} kcal - {0} kcal - - - {0} cal - {0} cal - - - {0} kJ - {0} kJ - - - J - {0} J - {0} J - - - {0} kWh - {0} kWh - - - {0} eV - {0} eV - - - {0} N - {0} N - - - kWh/100 km - {0} kWh/100 km - {0} kWh/100 km - - - {0} GHz - {0} GHz - - - {0} MHz - {0} MHz - - - {0} kHz - {0} kHz - - - {0} Hz - {0} Hz - - - {0} R⊕ - {0} R⊕ - - - {0} km - {0} km - - - {0} m - {0} m - - - {0} dm - {0} dm - - - {0} cm - {0} cm - - - {0} mm - {0} mm - - - {0} μm - {0} μm - - - {0} nm - {0} nm - - - {0} pm - {0} pm - - - {0} mi - {0} mi - - - {0} yd - {0} yd - - - {0} ft - {0} ft - - - {0} in - {0} in - - - {0} pc - {0} pc - - - {0} lj - {0} lj - - - {0} au - {0} au - - - {0} nmi - {0} nmi - - - {0} smi - {0} smi - - - pt. - {0} pt. - {0} pt. - - - {0} R☉ - {0} R☉ - - - {0} lx - {0} lx - - - {0} cd - {0} cd - - - {0} lm - {0} lm - - - {0} t - {0} t - - - {0} kg - {0} kg - - - {0} g - {0} g - - - {0} mg - {0} mg - - - {0} μg - {0} μg - - - m-l. tunoj - {0} m-l. tuno - {0} m-l. tunoj - - - {0} lb - {0} lb - - - {0} oz - {0} oz - - - {0} oz t - {0} oz t - - - ct - {0} ct - {0} ct - - - {0} Da - {0} Da - - - {0} M⊕ - {0} M⊕ - - - {0} M☉ - {0} M☉ - - - gr - {0} gr - {0} gr - - - {0} GW - {0} GW - - - {0} MW - {0} MW - - - {0} kW - {0} kW - - - W - {0} W - {0} W - - - {0} mW - {0} mW - - - ĈP - {0} ĈP - {0} ĈP - - - mmHg - {0} mmHg - {0} mmHg - - - da Hg - {0} da Hg - {0} da Hg - - - lbf/in² - {0} lbf/in² - {0} lbf/in² - - - {0} inHg - {0} inHg - - - {0} bar - {0} bar - - - {0} mbar - {0} mbar - - - {0} atm - {0} atm - - - {0} Pa - {0} Pa - - - {0} hPa - {0} hPa - - - {0} kPa - {0} kPa - - - {0} MPa - {0} MPa - - - {0} km/h - {0} km/h - - - {0} m/s - {0} m/s - - - {0} mi/h - {0} mi/h - - - nd. - {0} nd. - {0} nd. - - - {0} Bft - {0} Bft - - - {0} ° - {0} ° - - - {0} °C - {0} °C - - - {0} °F - {0} °F - - - {0} K - {0} K - - - {0} N⋅m - {0} N⋅m - - - {0} km³ - {0} km³ - - - {0} m³ - {0} m³ - - - {0} cm³ - {0} cm³ - - - Ml - {0} Ml - {0} Ml - - - hl - {0} hl - {0} hl - - - l - {0} l - {0} l - - - dl - {0} dl - {0} dl - - - cl - {0} cl - {0} cl - - - ml - {0} ml - {0} ml - - - duonkvartoj m. - {0} duonkvarto m. - {0} duonkvartoj m. - - - kvaronkvartoj m. - {0} kvaronkvarto m. - {0} kvaronkvartoj m. - - - fl oz m. - {0} fl oz m. - {0} fl oz m. + + kvaronkvartoj m. + {0} kvaronkvarto m. + {0} kvaronkvartoj m. kvaronkvartoj us. {0} kvaronkvarto us. {0} kvaronkvartoj us. - - cal [IT] - {0} cal [IT] - {0} cal [IT] - - - lum - {0} lum - {0} lum - - - {0} ppb - {0} ppb - @@ -7161,4 +6889,106 @@ CLDR data files are interpreted according to the LDML specification (http://unic ne:n + + {0} — ĉio + {0} — kongrueco + {0} — enfermitaj + {0} — etenditaj + {0} direktita maldekstren + {0} direktita dekstren + {0} — historiaj + {0} — diversaj + {0} — aliaj + skribsistemoj — {0} + {0} streko + {0} strekoj + subindico {0} + superindico {0} + aktivecoj + afrikaj skribsistemoj + amerikaj skribsistemoj + bestoj + bestoj kaj naturo + sagetoj + korpo + kestetaj eroj + brajlo + konstruaĵoj + bulmarkoj kaj steletoj + jamo-konsonantoj + valut-simboloj + haltostreko/streketo + ciferoj + vinjetoj + aŭguraj simboloj + sagetoj malsupren + sagetoj supren-malsupren + orientaziaj skribsistemoj + miensimboloj + eŭropaj skribsistemoj + ina + flago + flagoj + manĝaĵoj kaj trinkaĵoj + tekstaranĝaj signoj + tekstaranĝaj signoj kaj blankspacoj + plenlarĝaj variaĵoj + geometriaj formoj + duonlarĝaj variaĵoj + ĉinaj signoj + ĉinaj radikaloj + ĉinkoreaj signoj + ĉinaj signoj (simpligitaj) + ĉinaj signoj (tradiciaj) + koro + historiaj skribsistemoj + skribsignoj priskribantaj ideografiaĵojn + japanaj kanaoj + japanaj klasikĉintekstaj helpsignoj + ĉin-japanaj signoj + klavo + sagetoj maldekstren + sagetoj dekstren-maldekstren + litersimilaj simboloj + limigita uzo + vira + matematikaj simboloj + okcidentaziaj skribsistemoj + diversaj + modernaj skribsistemoj + modifaj literoj + muzikaj simboloj + naturo + kombinaj signoj + numeroj + objektoj + aliaj + paraj + personoj + fonetika alfabeto + bildsimboloj + ejoj + kreskaĵoj + helpsignoj + sagetoj dekstren + normitaj simboloj/signoj + etaj variaĵoj + mienoj + mienoj kaj personoj + sudaziaj skribsistemoj + sudorientaziaj skribsistemoj + interspacoj + sporto + simboloj + teĥnikaj simboloj + indikiloj de tonoj + vojaĝo + vojaĝo kaj ejoj + sagetoj supren + variaĵoj + jamo-vokaloj + vetero + okcidentaziaj skribsistemoj + blankspacoj + diff --git a/make/data/cldr/common/main/es.xml b/make/data/cldr/common/main/es.xml index c2a5fc105c07..cb7ad61e96b5 100644 --- a/make/data/cldr/common/main/es.xml +++ b/make/data/cldr/common/main/es.xml @@ -428,6 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pali pidgin salomonense polaco + piamontés pohnpeiano maliseet-passamaquoddy prusiano @@ -1098,18 +1099,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ orden orden con normalización orden numérico + reordenación por sistema de escritura/bloque intensidad de orden moneda + destino de transformación + exclusiones de separación por diccionario presentación del emoji + primer día de la semana + intercalado ciclo horario (12 o 24 horas) + método de entrada + teclado + valor máximo ignorado estilo de salto de línea salto de línea en palabras + reglas de transformación sistema de medición + unidad de medida números + región para datos complementarios + origen de transformación + subdivisión de región salto de oración después de abreviatura + transformación + traducido automáticamente zona horaria variante local uso privado + transformación de uso privado calendario budista @@ -1129,13 +1146,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendario hebreo hebreo calendario nacional hindú + nacional indio calendario hijri hijri - calendario hijri tabular - hijri tabular - calendario hijri Umm al-Qura - hijri Umm al-Qura - calendario ISO-8601 + calendario hijri (tabular, época civil) + hijri (tabular, época civil) + hijri (avistamiento en Arabia Saudí) + hijri (tabular, época astronómica) + calendario hijri (Umm al-Qura) + hijri (Umm al-Qura) + calendario gregoriano (ISO-8601) + gregoriano calendario japonés japonés calendario persa @@ -1151,8 +1172,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenar acentos normalmente Ordenar acentos con inversión Ordenar empezando por minúsculas + minúsculas Ordenar siguiendo orden normal de mayúsculas y minúsculas + minúsculas Ordenar empezando por mayúsculas + mayúsculas Ordenar sin distinguir entre mayúsculas y minúsculas Ordenar distinguiendo entre mayúsculas y minúsculas orden anterior, para compatibilidad @@ -1161,7 +1185,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ diccionario orden predeterminado de Unicode predeterminado de Unicode + emoji reglas de ordenación europeas + normas europeas orden de listín telefónico listín telefónico orden fonético @@ -1171,6 +1197,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ búsqueda de uso general búsqueda Buscar por consonante inicial de hangul + consonante inicial coreana orden estándar estándar orden de los trazos @@ -1185,17 +1212,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenar con normalización Unicode Ordenar dígitos individualmente Ordenar dígitos numéricamente + moneda + dígitos + puntuación + espacio en blanco + símbolo Ordenar todo + todo Ordenar solo letras base + solo letras base Ordenar acentos/mayúsculas y minúsculas/ancho/kana + base, acentos, mayúsculas/minúsculas, variantes, kana Ordenar acentos + base, acentos Ordenar acentos/mayúsculas y minúsculas/ancho + base, acentos, mayúsculas/minúsculas, variantes ancho completo ancho medio Numérico predeterminado emoji texto + sistema de 12 horas + 12 + sistema de 24 horas + 24 sistema de 12 horas (0–11) 12 (0–11) sistema de 12 horas (1–12) @@ -1204,6 +1245,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) sistema de 24 horas (1–24) 24 (1–24) + ignorar espacios, puntuación y todos los símbolos + ignorar espacios y puntuación + ignorar espacios y puntuación + ignorar espacios, puntuación y símbolos no monetarios estilo de salto de línea flexible flexible estilo de salto de línea normal @@ -1224,51 +1269,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ estadounidense dígitos indoarábigos dígitos indoarábigos extendidos + indoarábigos extendidos números en armenio números en armenio en minúscula + en armenio en minúscula dígitos en bengalí dígitos en chakma dígitos en devanagari números en etíope Números financieros + financieros dígitos de ancho completo + ancho completo números en georgiano números en griego números en griego en minúscula + en griego en minúscula dígitos en guyaratí dígitos en gurmuji + numeración de días del mes en caracteres han para calendarios tradicionales números decimales en chino + sistema decimal posicional con ideogramas numéricos chinos como dígitos números en chino simplificado números financieros en chino simplificado + financieros en chino simplificado números en chino tradicional números financieros en chino tradicional + financieros en chino tradicional números en hebreo dígitos en javanés números en japonés números financieros en japonés + financieros en japonés + numeración gannen del primer año en japonés dígitos en jemer dígitos en canarés + tai tham tham (eclesiástico) dígitos en lao dígitos occidentales + matemáticos en negrita + matemáticos de doble trazo + matemáticos monoespaciados + matemáticos en negrita sin serifa + matemáticos sin serifa dígitos en malayálam dígitos en mongol dígitos en meitei dígitos en birmano + karen pwo oriental en birmano + pao en birmano + shan en birmano + tai laing en birmano dígitos nativos + dígitos nativos dígitos en ol chiki dígitos en oriya + contorneados números romanos + romanos en mayúscula números romanos en minúscula + romanos en minúscula + segmentados números en tamil tradicional dígitos en tamil + tamil moderno dígitos en telugu dígitos en tailandés dígitos en tibetano Números tradicionales + números tradicionales dígitos en vai desactivado activado + traducción automática no especificada + variante POSIX + + No + Sí + métrico anglosajón @@ -1356,6 +1435,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + E d r @@ -1405,6 +1487,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1600,6 +1689,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM – E, d 'de' MMM E, d 'de' MMM – E, d 'de' MMM + + d–d 'de' MMMM + d 'de' MMMM – d 'de' MMMM + y–y G @@ -1839,6 +1932,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1902,19 +1998,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'semana' W 'de' MMMM M/y d/M/y - EEE, d/M/y + E, d/M/y M/y MMM y d MMM y - EEE, d MMM y + E, d MMM y MMMM 'de' y d 'de' MMMM 'de' y - EEE, d 'de' MMMM 'de' y + E, d 'de' MMMM 'de' y QQQ y QQQQ 'de' y 'semana' w 'de' Y 'semana' w 'de' Y + + {1}, {0} + {0} {1} + {1}, {0} + y G – y G @@ -2849,9 +2950,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ París - - hora de verano británica - Londres @@ -2894,9 +2992,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Makasar - - hora de verano de Irlanda - Dublín @@ -3192,9 +3287,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Acre - Hora estándar de Acre - Hora de verano de Acre + hora de Acre + hora estándar de Acre + hora de verano de Acre @@ -3278,20 +3373,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ horario de verano de Apia - - - Hora de Aktau - Hora estándar de Aktau - Hora de verano de Aktau - - - - - Hora de Aktobe - Hora estándar de Aktobe - Hora de verano de Aktobe - - hora de Arabia @@ -3393,6 +3474,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Brasilia + + + hora británica + hora de verano británica + + hora de Brunéi @@ -3584,6 +3671,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + hora de Groenlandia + hora estándar de Groenlandia + hora de verano de Groenlandia + + hora de Groenlandia oriental @@ -3598,11 +3692,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Groenlandia occidental - - - Hora estándar de Guam - - hora estándar del Golfo @@ -3615,7 +3704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hora estándar de Hawái-Aleutianas + hora estándar de Hawái y Aleutianas @@ -3676,6 +3765,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Irán + + + hora de Irlanda + hora estándar de Irlanda + + hora de Irkutsk @@ -3743,11 +3838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de Kirguistán - - - Hora de Sri Lanka - - hora de las Espóradas Ecuatoriales @@ -3760,13 +3850,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Lord Howe - - - Hora de Macao - Hora estándar de Macao - Hora de verano de Macao - - hora de Magadán @@ -3882,11 +3965,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Fernando de Noronha - - - Hora de las Islas Marianas del Norte - - hora de Novosibirsk @@ -3966,13 +4044,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de Pyongyang - - - Hora de Qyzylorda - Hora estándar de Qyzylorda - Hora de verano de Qyzylorda - - hora de Reunión @@ -3999,9 +4070,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hora de Samoa hora estándar de Samoa - hora de verano de Samoa @@ -4070,9 +4139,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Turquía - Hora estándar de Turquía - Hora de verano de Turquía + hora de Turquía + hora estándar de Turquía + hora de verano de Turquía @@ -4094,6 +4163,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de Uruguay + + + hora de Urumqi + + hora de Uzbekistán @@ -4240,9 +4314,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5640,8 +5711,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ oro zimbabuense - oro zimbabuense - oro zimbabuense dólar zimbabuense @@ -5655,7 +5724,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} día {0} de días {0} días - Toma la {0}.ª a la derecha. + El {0}.ᵉʳ equipo clasificado ganó. + El {0}.º equipo clasificado ganó. La {0} es... El {0} es… @@ -5898,8 +5968,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ partes - {0} parte - {0} partes feminine @@ -7033,6 +7101,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Glc + {0} Glc + {0} Glc l/km @@ -7356,6 +7426,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt imp. {0} qt imp. + + {0} sr + {0} sr + + + {0} kat + {0} kat + cal-IT {0} cal-IT @@ -7365,6 +7443,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} kgf {0} kgf + + {0} T + {0} T + + + {0} Wb + {0} Wb + luz {0} luz @@ -7473,7 +7559,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ít - parte {0} parte {0} partes @@ -7498,9 +7583,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol {0}mol - - Glc - {0}l/km {0}l/km @@ -7931,11 +8013,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg {0}mmHg - - de Hg - {0} de Hg - {0} de Hg - {0}psi {0}psi @@ -8148,7 +8225,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt imp - cal-IT + {0} cal-IT + {0} cal-IT + + + {0} kgf + {0} kgf {0}luz diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml index ceb8a7f98ecd..94c7e511b0c2 100644 --- a/make/data/cldr/common/main/es_419.xml +++ b/make/data/cldr/common/main/es_419.xml @@ -23,19 +23,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ vasco alemán de la alta edad antigua griego clásico + hindi (latino) haitiano cabardiano karachái-bálkaro + kurdo kurmanyi genovés malabar manipuri ndebele del sur sesotho del norte - prusiano antiguo - pashtún - retorrománico - sindhi + pasto + rayastani árabe (Chad) sami del sur sesotho del sur @@ -51,9 +51,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zuni - - @@ -76,11 +74,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Isla Ascensión Islas Åland Bosnia-Herzegovina - Congo (República Democrática del Congo) - República del Congo Costa de Marfil Eurozona - R. U. + R.U. Islas Georgia del Sur y Sándwich del Sur Islas Canarias Islas Ultramarinas @@ -89,6 +85,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Timor Oriental Türkiye Islas Ultramarinas de EE.UU. + EE.UU. + Islas Vírgenes de EE.UU. orden normalizado @@ -97,6 +95,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendario islámico (Arabia Saudita) + hijri (avistamiento en Arabia Saudita) calendario islámico tabular calendario chino ordenar símbolos @@ -108,22 +107,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordenar empezando por mayúsculas ordenar sin distinguir entre mayúsculas y minúsculas ordenar distinguiendo entre mayúsculas y minúsculas - unicode predeterminado reglas de orden europeas orden de agenda telefónica agenda telefónica - fonética + orden de trazos trazo trazo radical introducir saltos conservar todos conservar en frases + dígitos en malabar dígitos en tirh números traducionales dígitos en Warang Citi no sí + + no + sí + Alfabeto: {0} @@ -242,6 +245,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + ene + feb + mar + abr + may + jun + jul + ago + sep + oct + nov + dic + + + + + ene + feb + mar + abr + may + jun + jul + ago + sep + oct + nov + dic + + + @@ -373,7 +410,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH v dd-MMM E d/M/y - E, d MMM y QQQ 'de' y @@ -589,12 +625,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora universal coordinada + + Porto Novo + Nasáu Fuerte Nelson + + Kinsasa + Santiago @@ -604,23 +646,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guernsey - - Conakry + + Biskek - - - hora estándar de Irlanda - + + Rangún Khandyga + + Babane + Isla Wake Santo Tomás + + Wallis y Futuna + + + + hora estándar de Sudáfrica + + hora de la montaña @@ -628,16 +679,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verano de la montaña - - - hora de Islas Cocos - - - hora de las islas Cook - hora estándar de las islas Cook - hora de verano media de las islas Cook + hora de las Islas Cook + hora estándar de las Islas Cook + hora de verano de las Islas Cook @@ -668,7 +714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - horario del lejano este de Europa + hora del lejano este de Europa @@ -705,14 +751,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ∅∅∅ - - - hora de India - - - + - hora de Islas Marshall + hora de Hawái @@ -732,9 +773,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de Pionyang - + - hora de Islas Salomón + hora de Samoa Americana + + + + + hora estándar de Singapur @@ -862,11 +908,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tenge kazajo tengues kazajos - - kwacha malauí - kwacha malauí - kwachas malauíes - córdoba nicaragüense córdoba nicaragüense @@ -913,6 +954,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ (moneda desconocida) + + El {0}ᵉʳ. equipo clasificado ganó. + @@ -921,6 +965,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} unidad de fuerza gravitacional {0} unidades de fuerza gravitacional + + ítems + {0} parte {0} partes @@ -942,8 +989,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kilojoules - {0} kilojule - {0} kilojules + {0} kilojoule + {0} kilojoules joules @@ -1026,6 +1073,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} parte {0} parte + + {0}% + {0}% + {0} mpg imp. {0} mpg imp. @@ -1222,7 +1273,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ml - fl oz m {0}fl oz m {0}fl oz m diff --git a/make/data/cldr/common/main/es_AR.xml b/make/data/cldr/common/main/es_AR.xml index 98798fa94e93..0a34e912c8f7 100644 --- a/make/data/cldr/common/main/es_AR.xml +++ b/make/data/cldr/common/main/es_AR.xml @@ -35,6 +35,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + H:mm:ss zzzz + Hmmsszzzz + + + + + H:mm:ss z + Hmmssz + + + + + H:mm:ss + Hmmss + + + + + H:mm + Hmm + + + E d-M @@ -152,6 +178,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + HH:mm:ss zzzz + HHmmsszzzz + + + + + HH:mm:ss z + HHmmssz + + + + + HH:mm:ss + HHmmss + + + + + HH:mm + HHmm + + + d MMM y G @@ -164,6 +216,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic d 'de' MMM 'de' y + + {0} – {1} + {0} – {1} + {0} a el {1} h a – h a diff --git a/make/data/cldr/common/main/es_CL.xml b/make/data/cldr/common/main/es_CL.xml index 73f8cd17283d..abd65116a77b 100644 --- a/make/data/cldr/common/main/es_CL.xml +++ b/make/data/cldr/common/main/es_CL.xml @@ -215,6 +215,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + HH:mm:ss zzzz + HHmmsszzzz + + + + + HH:mm:ss z + HHmmssz + + + + + HH:mm:ss + HHmmss + + + + + HH:mm + HHmm + + + d MMM y G @@ -225,6 +251,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E dd-MM-y + + {0} – {1} + {0} a el {1} h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_CO.xml b/make/data/cldr/common/main/es_CO.xml index 9ed3c17d3aaa..ddeb5057a7cc 100644 --- a/make/data/cldr/common/main/es_CO.xml +++ b/make/data/cldr/common/main/es_CO.xml @@ -263,6 +263,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic d 'de' MMM 'de' y + + {0} – {1} + {0} – {1} + {0} – {1} + {0} al {1} d 'a' d diff --git a/make/data/cldr/common/main/es_EC.xml b/make/data/cldr/common/main/es_EC.xml index 1ec5523db69d..0d95c888a222 100644 --- a/make/data/cldr/common/main/es_EC.xml +++ b/make/data/cldr/common/main/es_EC.xml @@ -138,6 +138,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0} – {1} + {0} a el {1} h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_GT.xml b/make/data/cldr/common/main/es_GT.xml index 4dec8a8902cc..21087350c8ff 100644 --- a/make/data/cldr/common/main/es_GT.xml +++ b/make/data/cldr/common/main/es_GT.xml @@ -157,6 +157,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0} – {1} + + {0} – {1} h:mm–h:mm a h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_HN.xml b/make/data/cldr/common/main/es_HN.xml index 5afde23ec75a..78ab24ed10d6 100644 --- a/make/data/cldr/common/main/es_HN.xml +++ b/make/data/cldr/common/main/es_HN.xml @@ -161,6 +161,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0} – {1} + {0}–{1} + {0} a el {1} h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml index 098cdc29d4fd..ee5d5ccbfd1b 100644 --- a/make/data/cldr/common/main/es_MX.xml +++ b/make/data/cldr/common/main/es_MX.xml @@ -86,7 +86,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic calendario minguo minguo orden de clasificación de Unicode predeterminado - fonético trazos trazos radicales dividir todo @@ -127,24 +126,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - - ene - feb - mar - abr - may - jun - jul - ago - sep - oct - nov - dic - - - @@ -258,9 +239,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d 'de' MMM – E d 'de' MMM 'de' y G E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G - - h a – h a - HH–HH @@ -468,9 +446,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fort Nelson - - Conakri - Atirau @@ -501,11 +476,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de la isla de Navidad - - - hora de las Islas Cocos - - hora de las Islas Cook @@ -551,21 +521,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de las Islas Gilbert - - - hora de las Islas Marshall - - hora de Pyongyang - - - hora de las Islas Salomón - - hora de la Isla Wake diff --git a/make/data/cldr/common/main/es_PA.xml b/make/data/cldr/common/main/es_PA.xml index d224a8a840d7..6403832123d1 100644 --- a/make/data/cldr/common/main/es_PA.xml +++ b/make/data/cldr/common/main/es_PA.xml @@ -174,6 +174,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E MM/dd/y + + {0} – {1} + + {0} – {1} d 'de' MMM 'al' d 'de' MMM diff --git a/make/data/cldr/common/main/es_PE.xml b/make/data/cldr/common/main/es_PE.xml index 72b74079b471..ab0e1108cb5b 100644 --- a/make/data/cldr/common/main/es_PE.xml +++ b/make/data/cldr/common/main/es_PE.xml @@ -210,6 +210,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + {0} – {1} + {0} a el {1} h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_PR.xml b/make/data/cldr/common/main/es_PR.xml index ec110bc87f8d..96be109ce619 100644 --- a/make/data/cldr/common/main/es_PR.xml +++ b/make/data/cldr/common/main/es_PR.xml @@ -161,6 +161,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E MM/dd/y + + {0} – {1} + {0} a el {1} h:mm–h:mm a diff --git a/make/data/cldr/common/main/es_PY.xml b/make/data/cldr/common/main/es_PY.xml index 531a21efb6c4..cb844d11b6da 100644 --- a/make/data/cldr/common/main/es_PY.xml +++ b/make/data/cldr/common/main/es_PY.xml @@ -104,8 +104,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + HH:mm:ss zzzz + HHmmsszzzz + + + + + HH:mm:ss z + HHmmssz + + + + + HH:mm:ss + HHmmss + + + + + HH:mm + HHmm + + + + + {0} – {1} + {0} – {1} + + {0} – {1} h a 'a' h a h 'a' h a diff --git a/make/data/cldr/common/main/es_US.xml b/make/data/cldr/common/main/es_US.xml index e85d398caba7..e4f7a4be0abd 100644 --- a/make/data/cldr/common/main/es_US.xml +++ b/make/data/cldr/common/main/es_US.xml @@ -44,6 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ingusetio cabilio karachay-balkar + kurdo kurdo kurmanyi ligur creole de Luisiana @@ -55,7 +56,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ojibwa del noroeste ojibwa del oeste pijín - romanche sami del norte árabe chadiano lushootseed del sur @@ -100,29 +100,53 @@ CLDR data files are interpreted according to the LDML specification (http://unic Territorios alejados de Oceanía Islas menores alejadas de EE. UU. + + reordenamiento de secuencia comandos/bloques + exclusiones del diccionario + traducción automática + calendario coreano coreano + calendario nacional de la India + hijri, avistamiento en Arabia Saudita chino predeterminado Unicode - fonético sistema piyin trazos trazos radicales sistema zhuyin + todos + orden solo por raíz alfabética + raíz, acentos, formato, variantes, Kana + raíz, acentos + raíz, acentos, formato, variantes emoticón + espacios, signos de puntuación y todos los símbolos + espacios y signos de puntuación + espacios y signos de puntuación + espacios, signos de puntuación y símbolos no monetarios dividir todo mantener todo regular mantener en frases + dígitos indoarábigos extendidos + minúscula armenia dígitos chakma + minúscula griega dígitos en gujarati dígitos javaneses + numeración japonesa Gannen del primer año dígitos meetei mayek dígitos ol chiki desactivado activado + traducción automática sin especificar + + desactivado + activado + imperial @@ -138,6 +162,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + DD/MM/YYYY + + + @@ -266,9 +297,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQ y - - h a – h a - HH–HH @@ -315,6 +343,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + / + + + @@ -433,11 +468,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de Chamorro - - - hora de las Islas Cocos - - hora de las Islas Cook @@ -505,11 +535,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de las islas Marquesas - - - hora de las Islas Marshall - - hora de la isla Norfolk @@ -527,11 +552,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora de Pyongyang - - - hora de las Islas Salomón - - hora de la isla Wake @@ -620,6 +640,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic oro de Zimbabue + oro de Zimbabue + oro de Zimbabue @@ -646,6 +668,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} parte por millón {0} partes por millón + + partes p/millón + {0} parte p/millón + {0} partes p/millón + por ciento @@ -767,7 +794,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic simens - {0} siemens + {0} siemens {0} siemens @@ -813,10 +840,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ‰ - - {0} Glc - {0} Glc - byte @@ -1015,7 +1038,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} cal. IT - kp {0} kp {0} kp diff --git a/make/data/cldr/common/main/es_UY.xml b/make/data/cldr/common/main/es_UY.xml index bba2e5e698c2..cc5d19b2edb7 100644 --- a/make/data/cldr/common/main/es_UY.xml +++ b/make/data/cldr/common/main/es_UY.xml @@ -102,6 +102,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + HH:mm:ss zzzz + HHmmsszzzz + + + + + HH:mm:ss z + HHmmssz + + + + + HH:mm:ss + HHmmss + + + + + HH:mm + HHmm + + + diff --git a/make/data/cldr/common/main/et.xml b/make/data/cldr/common/main/et.xml index e5fdcbb14d05..d1292e152109 100644 --- a/make/data/cldr/common/main/et.xml +++ b/make/data/cldr/common/main/et.xml @@ -38,8 +38,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ obolo angika Levandi araabia + lääneapatši araabia - tänapäeva araabia kirjakeel + araabia kirjakeel aramea mapudunguni araona @@ -289,7 +290,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ karakalpaki kabiili katšini - jju + džuu kamba kaavi kabardi-tšerkessi @@ -297,6 +298,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tjapi makonde kabuverdianu + kektši + kenjangi koro kongo kaingangi @@ -360,7 +363,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Louisiana kreoolkeel lozi põhjaluri - samia + saamia leedu latgali Katanga luba @@ -387,12 +390,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mauritiuse kreoolkeel malagassi keskiiri - makhuwa-meetto + meeto meta maršalli mohheni maoori mikmaki + manda minangkabau makedoonia malajalami @@ -403,6 +407,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mohoogi more marathi + mara mäemari malai malta @@ -435,6 +440,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kwasio uusnorra ngiembooni + vantšo norra nogai vanapõhja @@ -493,6 +499,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ radžastani rapanui rarotonga + redžangi romanja rohingja riifi @@ -539,6 +546,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tšaadi araabia singali sidamo + Kildini saami + Pite saami + Ume saami slovaki seraiki sloveeni @@ -699,7 +709,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -737,7 +747,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -820,6 +830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -836,6 +847,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -889,7 +901,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1234,6 +1246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ normitud kirjaviis Resia Lipovaz’i murre monotoonne + ndjuka murre Natisone murre Gniva/Njiva murre Oseacco/Osojane murre @@ -1262,18 +1275,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ järjestus normaliseeritud järjestus numbrite järjestus + skriptide/plokkide ümberjärjestamine järjestuskaalud vääring - Emoji esitlus + sihtkoha teisendamine + sõnastiku katkestuste välistamised + emodži esitus + nädala esimene päev + kombineeritud 12 või 24 tunni süsteem + sisestusmeetod + klaviatuur + kõrgeim ignoreeritav reavahetuse laad reavahetus sõnade vahel + reeglite muundamine mõõdustik + mõõtühik numbrid + lisaandmete piirkond + teisenduse allikas + piirkonna haldusüksus lause poolitamine pärast lühendit + teisendus + masintõlgitud ajavöönd lokaadi variant erakasutus + privaatse kasutuse teisendus budistlik kalender @@ -1293,15 +1322,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ juudi kalender juudi India rahvuslik kalender + india rahvuslik hidžra kalender hidžra hidžra kalender (tabelkalender, ilmalik) hidžra (tabelkalender, ilmalik) hidžra kalender (Saudi Araabia, vaatluspõhine) + hidžra, Saudi Araabia vaatlus hidžra kalender (tabelkalender, astronoomiline ajastu) + hidžra (tabulaarne, astronoomiline ajajärk) hidžra kalender (Umm al-Qurá) hidžra (Umm al-Qurá) - ISO-8601 kalender + Gregoriuse kalender (ISO-8601) + Gregoriuse Jaapani kalender Jaapani Pärsia kalender @@ -1317,43 +1350,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ diakriitikud tavajärjestuses diakriitikud pöördjärjestuses väiketäht järjestuses eespool + väiketäht harilik järjestus + väiketäht suurtäht järjestuses eespool + suurtäht tõstutundetu järjestus tõstutundlik järjestus varasem sortimisjärjestus (ühilduvuse jaoks) + ühilduvus sõnastiku sortimisjärjestus + sõnastik Unicode’i vaikejärjestus vaike-Unicode emoji sortimisjärjestus + emotikon Euroopa järjestusreeglid + Euroopa reeglid telefoniraamatu sortimisjärjestus + telefoniraamat foneetiline sortimisjärjestus + foneetiline pinyin’i sortimisjärjestus + pinyin üldeesmärgiline otsing otsing otsing korea alguskonsonandi järgi + Korea esikonsonant standardne järjestus standardne kriipsude sortimisjärjestus + joonetõmme traditsiooniline sortimisjärjestus + traditsiooniline võtmete-kriipsude sortimisjärjestus + radikaalne joonetõmme zhuyin’i sortimisjärjestus + zhuyin järjesta normaliseerimata järjesta Unicode’i normaliseerimisega järjesta numbrid eraldi järjesta numbrid arvuliselt + valuuta + numbrid + kirjavahemärgid + tühimärgid + sümbol järjesta kõik + kõik järjesta ainult alustähed + ainult põhitähed järjesta diakriitikud, algustähed, laius ja kana kiri + põhitähed, diakriitilised, suurtähestus, variandid, kana järjesta diakriitikud + põhitähed, diakriitilised järjesta diakriitikud, algustähed ja laius + põhitähed, diakriitilised, suurtähestus, variandid täislaius poollaius Numbriline vaikeväärtus - Emotikon + emodži tekst + 12-tunnine süsteem + 12 + 24-tunnine süsteem + 24 12-tunnine süsteem (0–11) 12 (0–11) 12-tunnine süsteem (1–12) @@ -1362,6 +1424,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-tunnine süsteem (1–24) 24 (1–24) + tühikute nihutamine, kirjavahemärgid, kõik sümbolid + tühikute nihutamine, kirjavahemärgid + tühikute nihutamine, kirjavahemärgid + tühikute nihutamine, kirjavahemärgid, valuutaga mitteseotud sümbolid paindlik reavahetuse laad paindlik harilik reavahetuse laad @@ -1383,8 +1449,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ahomi numbrid idaaraabia numbrid laiendatud idaaraabia numbrid + laiendatud idaaraabia armeenia numbrid väiketähelised armeenia numbrid + armeenia väiketähelised bali numbrid bengali numbrid braahmi numbrid @@ -1395,27 +1463,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ divehi numbrid etioopia numbrid finantsnumbrid + finantsidega seotud täislaiusega numbrid + täislaiuses garai numbrid gruusia numbrid Gūnjāla gondi numbrid Masarami gondi numbrid kreeka numbrid väiketähelised kreeka numbrid + kreeka väiketähelised gudžarati numbrid gurungi numbrid gurmukhi numbrid + traditsiooniliste kalendrite han-märkidega kuupäevasüsteem hiina kümnendnumbrid + hiina arvumärkidega positsiooniline kümnendsüsteem lihtsustatud hiina keele numbrid lihtsustatud hiina keele finantsnumbrid + lihtsustatud hiina keele finantsidega seotud traditsioonilise hiina keele numbrid traditsioonilise hiina keele finantsnumbrid + traditsioonilise hiina keele finantsidega seotud heebrea numbrid phahau-hmongi numbrid Chervangi numbrid jaava numbrid jaapani numbrid jaapani finantsnumbrid + jaapani finants + jaapani ajastute algusaasta numbrisüsteem kaja-lii numbrid kaavi numbrid khmeeri numbrid @@ -1423,29 +1500,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kirat-rai numbrid tai tham hora numbrid tai tham tham numbrid + tai-thami thami (sakraalkiri) lao numbrid araabia numbrid leptša numbrid limbu numbrid + matemaatiline paks kiri + matemaatiline topeltkiri + matemaatiline monospace + matemaatiline paks sans-serif + matemaatiline sans-serif malajalami numbrid modi numbrid mongoli numbrid mruu numbrid meitei numbrid birma numbrid - myanmari shan numbrid + birma idapvoo numbrid + birma idapvoo + birma paoo numbrid + birma paoo + birma šani numbrid + birma šani myanmari tai laing numbrid + birma tailaing Nagi mundari numbrid kohalikud numbrid + kohalikud numbrid nkoo numbrid santali numbrid bhumidži numbrid oria numbrid osmani numbrid + kontuuriga rohingja numbrid Rooma numbrid + Rooma suurtähed väiketähelised Rooma numbrid + Rooma väiketähed sauraštra numbrid + segmenditud šaarada numbrid hudavadi numbrid sinhala lithi numbrid @@ -1456,6 +1550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uue tai-lõõ numbrid traditsioonilised tamili numbrid tamili numbrid + moodne tamili telugu numbrid tai numbrid tiibeti numbrid @@ -1463,12 +1558,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tase numbrid tolong-siki numbrid traditsioonilised numbrid + traditsioonilised numbrid vai numbrid hoo numbrid vantšo numbrid välja lülitatud sisse lülitatud + määramatu masintõlgitud + POSIX-i variant + + välja lülitatud + sisse lülitatud + meetermõõdustik inglise mõõdustik @@ -1542,6 +1644,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + dd.MM.r + + + + + + dd.MM.r + + @@ -1700,6 +1814,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMM – E, d. MMM E, d. MMM – E, d. MMM + + d–d. MMMM + d. MMMM – d. MMMM + y–y G @@ -1932,6 +2050,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1975,6 +2096,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d. MMM y G E, d. MMMM y G + MMMM y G + d. MMMM y G + E, d. MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -1997,11 +2121,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y E, d. MMMM y MMMM y + d MMMM y + E, d. MMMM y QQQ y QQQQ y w. 'nädal' (Y) w. 'nädal' (Y) + + {1}, {0} + {0} {1} + {1}, {0} + y G – y G @@ -2070,6 +2201,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMM – E, d. MMM E, d. MMM – E, d. MMM + + d–d. MMMM + d. MMMM – d. MMMM + MM.y–MM.y MM.y–MM.y @@ -2105,6 +2240,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + \u002E + + + @@ -2644,6 +2786,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +HH:mm;−HH:mm GMT {0} + UTC {0} ({0}) Honolulu @@ -2734,11 +2877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pariis - - - Briti suveaeg - - Thbilisi @@ -2751,11 +2889,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hongkong - - - Iiri suveaeg - - Jeruusalemm @@ -2774,9 +2907,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rooma - - Tōkyō - Biškek @@ -2816,15 +2946,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Riia + + Hovd + Macau Maldiivid - - Bahia Banderas - México @@ -2987,13 +3117,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska suveaeg - - - Almatõ aeg - Almatõ standardaeg - Almatõ suveaeg - - Amazonase aeg @@ -3043,20 +3166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia suveaeg - - - Aktau aeg - Aktau standardaeg - Aktau suveaeg - - - - - Aktöbe aeg - Aktöbe standardaeg - Aktöbe suveaeg - - Araabia aeg @@ -3158,6 +3267,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasiilia suveaeg + + + Briti aeg + Briti suveaeg + + Brunei aeg @@ -3338,9 +3453,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Gröönimaa aeg - Gröönimaa standardaeg - Gröönimaa suveaeg + Gröönimaa aeg + Gröönimaa standardaeg + Gröönimaa suveaeg @@ -3357,11 +3472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lääne-Gröönimaa suveaeg - - - Guami standardaeg - - Pärsia lahe standardaeg @@ -3374,7 +3484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleuudi standardaeg + Hawaii aeg @@ -3435,6 +3545,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iraani suveaeg + + + Iiri aeg + Iiri suveaeg + + Irkutski aeg @@ -3502,11 +3618,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kõrgõzstani aeg - - - Sri Lanka aeg - - Line’i saarte aeg @@ -3519,13 +3630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe’i suveaeg - - - Macau aeg - Macau standardaeg - Macau suveaeg - - Magadani aeg @@ -3641,11 +3745,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha suveaeg - - - Põhja-Mariaani aeg - - Novosibirski aeg @@ -3725,13 +3824,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pyongyangi aeg - - - Kõzõlorda aeg - Kõzõlorda standardaeg - Kõzõlorda suveaeg - - Réunioni aeg @@ -3758,9 +3850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa aeg Samoa standardaeg - Samoa suveaeg @@ -3853,6 +3943,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguay suveaeg + + + Ürümqi aeg + + Usbekistani aeg @@ -3994,7 +4089,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - #,##0.00 #,##0.00 ¤;(#,##0.00 ¤) @@ -4300,6 +4394,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Šveitsi frank Šveitsi frank Šveitsi franki + Fr Tšiili eskuudo @@ -4745,7 +4840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Madagaskari frank Madagaskari frank - Madagaskar franki + Madagaskari frank Makedoonia dinaar @@ -5604,11 +5699,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} millimool liitri kohta {0} millimooli liitri kohta - - osa - {0} osa - {0} osa - osa miljoni kohta {0} osa miljoni kohta @@ -6462,11 +6552,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} veeber {0} veebrit - - valgus - {0} valgus - {0} valgust - miljardikosa @@ -7006,21 +7091,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - {0} aaker - {0} aakrit - - - osa - {0} osa - {0} osa - mol - - Glc - {0} l/100km {0} l/100km @@ -7067,22 +7140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}kWh/100km {0}kWh/100km - - {0} miil - {0} miili - - - {0} jard - {0} jardi - - - {0} jalg - {0} jalga - - - {0} toll - {0} tolli - punktid @@ -7129,11 +7186,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt Imp. {0} qt Imp. - - cal-IT - - valgus {0} valg. {0} valg. diff --git a/make/data/cldr/common/main/eu.xml b/make/data/cldr/common/main/eu.xml index b1f9d1b1945b..c00c21c3825b 100644 --- a/make/data/cldr/common/main/eu.xml +++ b/make/data/cldr/common/main/eu.xml @@ -340,6 +340,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Nigeriako pidgina pijina poloniera + piemontera maliseet-passamaquoddyera prusiera paxtunera @@ -1098,18 +1099,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenatzeko irizpidea Araututako ordena Zenbakizko ordena + Idazketen/Blokeen ordena aldatzea Ordenaren sendotasuna Moneta + Eraldaketaren helburua + Lerro-jauzien salbuespenak Emojien aurkezpena + Asteko lehen eguna + Nahasia Ordu-zikloa (12 vs 24) + Idazketa-metodoa + Teklatua + Ez ikusi gehien egin zaiona Lerro-jauziaren estiloa Hitz barruko lerro-jauziak + Eraldaketa-arauak Neurketa-sistema + Neurketa-unitatea Zenbakiak + Datu gehigarrietarako eremua + Eraldaketaren iturburua + Eremuaren subdibisioa Laburtzapenen ondorengo lerro-jauzia + Eraldaketa + Automatikoki itzulia Ordu-zona Eskualdeko ezarpenen aldaera Erabilera pribatua + Erabilera pribaturako eraldaketa Egutegi budista @@ -1129,15 +1146,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hebrear egutegia Hebrearra Indiar egutegia + Indiako egutegi nazionala Egutegi islamiarra Islamiarra Egutegi islamiarra (taula-formakoa, garai zibilekoa) Islamiarra (taula-formakoa, garai zibilekoa) Islamiar egutegia (Saudi Arabia, ikuspegiak) + Islamiarra, Saudi Arabiako behaketa Islamiar egutegia (taula-formakoa, gai astronomikokoa) + Islamiarra (taula-formakoa, garai astronomikokoa) Egutegi islamiarra (Umm al-Qura) Islamiarra (Umm al-Qura) ISO-8601 egutegia + Gregoriarra Japoniar egutegia Japoniarra Egutegi persiarra @@ -1153,43 +1174,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenatu azentuak modu normalean Ordenatu azentuak alderantziz Ordenatu minuskulak lehenik + Minuskula Ordenatu maiuskulak modu normalean + Minuskula Ordenatu maiuskulak lehenik + Maiuskula Ordenatu maiuskulak eta minuskulak bereizi gabe Ordenatu maiuskulak eta minuskulak bereizita Aurreko hurrenkera, bateragarria izateko + Bateragarritasuna Hurrenkera alfabetikoa + Hiztegia Unicode hurrenkera lehenetsia Unicode lehenetsia Emojien hurrenkera + Emojiak Europako ordenatzeko arauak + Europako arauak Telefonoen zerrenda + Telefono-zerrenda Ordenatzeko irizpide fonetikoa + Fonetikoa Pinyin hurrenkera + Pinyin-a Bilaketa orokorra Bilaketa Bilatu hangularen lehen kontsonantearen arabera + Koreerazko hasierako kontsonantea Ordenatzeko irizpide estandarra Estandarra Tarteen araberako hurrenkera + Trazua Tradizionala + Tradizionala Radical trazuen hurrenkera + Erroaren trazua Zhuyin hurrenkera + Zhuyin-a Ordenatu arauak kontuan hartu gabe Ordenatu Unicode arauen arabera Ordenatu digituak banaka Ordenatu digituak zenbakien arabera + Dibisa + Digituak + Puntuazioa + Zuriunea + Sinboloa Ordenatu guztiak + Dena Ordenatu oinarrizko hizkiak soilik + Oinarrizko hizkiak bakarrik Ordenatu azentuak / maiuskula eta minuskulak / zabalera / kanak + Oinarrizkoak, azentuak, maiuskulak/minuskulak, aldaerak, kana Ordenatu azentuak + Oinarrizkoak, azentuak Ordenatu azentuak / maiuskula eta minuskulak / zabalera + Oinarrizkoak, azentuak, maiuskulak/minuskulak, aldaerak Zabalera osoko karaktere-bihurketa Zabalera erdiko karaktere-bihurketa Zenbakizko bihurketa Lehenetsia Emojia Testua + 12 orduko sistema + 12 + 24 orduko sistema + 24 12 orduko sistema (0–11) 12 (0–11) 12 orduko sistema (1–12) @@ -1198,6 +1248,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 orduko sistema (1–24) 24 (1–24) + Kontuan izan espazioak, puntuazioa, sinbolo guztiak + Kontuan izan espazioak, puntuazioa + Kontuan izan espazioak, puntuazioa + Kontuan izan espazioak, puntuazioa, dibisak ez diren sinboloak Lerro-jauziaren estilo malgua Malgua Lerro-jauziaren estilo arrunta @@ -1219,8 +1273,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ahom digituak Digitu arabiar-hindikoak Digitu arabiar-hindiko hedatuak + Arabiar-indiar hedatuak Zenbaki armeniarrak Zenbaki armeniarrak minuskulaz + Armeniarrak minuskulaz Digitu balitarrak Digitu bengalarrak Brahmi digituak @@ -1231,58 +1287,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dives Akuru digituak Zenbaki etiopiarrak Finantza-zenbakiak + Finantzetakoak Zabalera osoko digituak + Zabalera osokoak Zenbaki georgiarrak Gunjala Gondi digituak Masaram Gondi digituak Zenbaki grekoak Zenbaki grekoak minuskulaz + Grekoak minuskulaz Digitu gujaratarrak Digitu gurmukhiak + Egutegi tradizionaletan hileko egunen zenbakiak adierazteko han karakterea Zenbaki hamartar txinatarrak + Digitu gisa zenbaki-ideograma txinatarrak darabiltzan kokapen-dezimalen sistema Zenbaki txinatar sinplifikatuak Finantzetarako zenbaki txinatar sinplifikatuak + Finantzetarako txinatar sinplifikatuak Zenbaki txinatar tradizionalak Finantzetarako zenbaki txinatar tradizionalak + Finantzetarako txinatar tradizionalak Zenbaki hebrearrak Pahawh Hmong digituak Nyiakeng Puachue Hmong digituak Digitu javatarrak Zenbaki japoniarrak Finantzetarako zenbaki japoniarrak + Finantzetarako japoniarrak + Garaiko lehen urterako gannen zenbaki japoniarrak Kayah Li digituak kawi digituak Digitu khmertarrak Digitu kannadarrak Tai Tham Hora digituak Tai Tham Tham digituak + Tai Tham Tham (eklesiastikoa) Digitu laostarrak Digitu mendebaldarrak Digitu leptxatarrak Digitu limbutarrak Digitu matematiko lodiak + Matematikarako letra lodia Marra bikoitzeko digitu matematikoak + Arbeleko letra lodia Zuriune bakarreko digitu matematikoak + Matematikarako espazio bakarreko letra Sans-Serif Bold digitu matematikoak + Matematikarako sans-serif letra lodia Sans-Serif digitu matematikoak + Matematikarako sans-serif letra Digitu malabartarrak Modi digituak Digitu mongoliarrak Mro digituak Meetei Mayek digituak Digitu birmaniarrak + Myanmarko ekialdeko pwo karendarrak + Myanmarko paoarrak Shan digitu birmaniarrak + Myanmarko shandarrak Tai Laing digitu birmaniarrak + Myanmarko tai laingtarrak nag mundari digituak Digitu natiboak + Digitu natiboak N’Ko digituak Ol Chiki digituak Digitu oriyarrak Digitu osmanyarrak + Profilatuak Hanifi digitu rohingyak Zenbaki erromatarrak + Erromatarrak maiuskulaz Zenbaki erromatarrak minuskulaz + Erromatarrak minuskulaz Digitu saurashtrarrak + Segmentatuak Digitu sharadarrak Digitu khudawadiarrak Sinhala Lith digituak @@ -1292,18 +1372,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Digitu tai lue berriak Zenbaki tamildar tradizionalak Digitu tamildarrak + Tamildar modernoak Digitu teluguarrak Digitu thailandiarrak Digitu tibetarrak Tirhuta digituak tangsar digituak Zenbaki tradizionalak + Zenbaki tradizionalak Vai digituak Warang Citi digituak Wancho digituak Aktibatuta Desaktibatuta + Zehaztu gabeko itzulpen automatikoa + POSIX aldaera + + Aktibatuta + Desaktibatuta + Sistema metrikoa Erresuma Batuko sistema @@ -1334,9 +1422,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -1360,9 +1445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -1386,16 +1468,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - h B – h B - - - h:mm B – h:mm B - - - h a – h a - h–h a - h:mm a – h:mm a h:mm–h:mm a @@ -1406,63 +1478,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm–h:mm a v h:mm–h:mm a v - - h a – h a v - h–h a v - - - MM-dd – MM-dd - MM-dd – MM-dd - - - MM-dd, E – MM-dd, E - MM-dd, E – MM-dd, E - - - MMM d – MMM d - - - MMM d, E – MMM d, E - MMM d, E – MMM d, E - - - y-MM – y-MM - y-MM – y-MM - - - y-MM-dd – y-MM-dd - y-MM-dd – y-MM-dd - y-MM-dd – y-MM-dd - - - y-MM-dd, E – y-MM-dd, E - y-MM-dd, E – y-MM-dd, E - y-MM-dd, E – y-MM-dd, E - - - U MMM – U MMM - - - U MMM d – MMM d - U MMM d – U MMM d - - - U MMM d, E – MMM d, E - U MMM d, E – MMM d, E - U MMM d, E – U MMM d, E - - - U MMMM – U MMMM - - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -1502,7 +1523,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G y-MM-dd + G y/MM/dd @@ -1544,9 +1565,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a G. 'aroko' y. 'urtea' - G. 'aroko' y-MM - y-MM-dd (GGGGG) - G 'aroko' y-MM-dd, E + G. 'aroko' y/MM + y/MM/dd (GGGGG) + G 'aroko' y/MM/dd, E G. 'aroko' y('e')'ko' MMMM G. 'aroko' y('e')'ko' MMMM d G. 'aroko' y('e')'ko' MMMM d, EEEE @@ -1590,6 +1611,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd–dd + + G y/MM – G y/MM + G y/MM – y/MM + G y/MM – y/MM + + + G y/MM/dd – y/MM/dd + G y/MM/dd – G y/MM/dd + G y/MM/dd – y/MM/dd + G y/MM/dd – y/MM/dd + + + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – G y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y, MMM – G y, MMM G y, MMM–MMM @@ -1608,7 +1646,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y, MMM d, E – G y, MMM d, E - h a – h a h – h a @@ -1628,10 +1665,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm – h:mm a v h:mm–h:mm a v - - h a – h a v - h–h a v - MM/dd – MM/dd MM/dd – MM/dd @@ -1909,6 +1942,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} ({0}) @@ -1939,10 +1975,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a G y/M + G y/MM/dd G y/M/d, E G y. 'urteko' MMM G y. 'urteko' MMM d('a') G y. 'urteko' MMM d('a'), E + G y('e')'ko' MMMM + G y('e')'ko' MMMM'ren' d('a') + G y('e')'ko' MMMM'ren' d('a'), E h:mm a h:mm:ss a h:mm:ss a v @@ -1953,6 +1993,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d('a') MMM d('a'), E MMMM'ren' d('a') + MMMM'ren' d('a'), E MMMM'ren' W. 'astea' MMMM'ren' W. 'astea' y/M @@ -1969,6 +2010,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Y. 'urteko' w. 'astea' + {1}, {0} + {0} {1} + {1}, {0} {0} ({1}) @@ -1981,6 +2025,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h:mm–h:mm B h:mm–h:mm + + G y/MM – G y/MM + G y/MM – y/MM + G y/MM – y/MM + + + G y/MM/dd – y/MM/dd + G y/MM/dd – G y/MM/dd + G y/MM/dd – y/MM/dd + G y/MM/dd – y/MM/dd + + + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – G y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y, MMM – G y, MMM G y, MMM–MMM @@ -2029,6 +2090,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d('a'), E – MMM d('a'), E MMM d('a'), E – MMM d('a'), E + + MMMM'ren' d–d('a') + MMMM'ren' d('a') – MMMM'ren' d('a') + y/M – y/M y/M – y/M @@ -2067,9 +2132,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2093,9 +2155,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2119,9 +2178,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2145,9 +2201,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2171,9 +2224,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2202,9 +2252,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - G y – G y - GGGGG y-MM – GGGGG y-MM GGGGG y-MM – y-MM @@ -2652,9 +2699,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Addis Abeba - - Londresko udako ordua - Londres @@ -2678,11 +2722,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hegoaldeko Georgiak - - - Irlandako ordu estandarra - - Man uhartea @@ -2767,9 +2806,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mexiko Hiria - - Nouméa - Niamei @@ -2928,18 +2964,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaskako ordu estandarra Alaskako udako ordua - - AKT - AKST - AKDT - - - - - Almatyko ordua - Almatyko ordu estandarra - Almatyko udako ordua - @@ -2954,11 +2978,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ipar Amerikako erdialdeko ordu estandarra Ipar Amerikako erdialdeko udako ordua - - CT - CST - CDT - @@ -2966,11 +2985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ipar Amerikako ekialdeko ordu estandarra Ipar Amerikako ekialdeko udako ordua - - ET - EST - EDT - @@ -2978,11 +2992,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ipar Amerikako mendialdeko ordu estandarra Ipar Amerikako mendialdeko udako ordua - - MT - MST - MDT - @@ -2990,11 +2999,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ipar Amerikako Pazifikoko ordu estandarra Ipar Amerikako Pazifikoko udako ordua - - PT - PST - PDT - @@ -3010,20 +3014,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apiako udako ordua - - - Aktauko ordua - Aktauko ordu estandarra - Aktauko udako ordua - - - - - Aktobeko ordua - Aktobeko ordu estandarra - Aktobeko udako ordua - - Arabiako ordua @@ -3058,11 +3048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ipar Amerikako Atlantikoko ordu estandarra Ipar Amerikako Atlantikoko udako ordua - - AT - AST - ADT - @@ -3130,6 +3115,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasiliako udako ordua + + + Britainia Handiko ordua + Britainia Handiko udako ordua + + Brunei Darussalamgo ordua @@ -3326,6 +3317,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Groenlandiako ordua + Groenlandiako ordu estandarra + Groenlandiako udako ordua + + Groenlandiako ekialdeko ordua @@ -3340,11 +3338,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Groenlandiako mendebaldeko udako ordua - - - Guameko ordu estandarra - - Golkoko ordu estandarra @@ -3357,11 +3350,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleutiar uharteetako ordu estandarra + Hawaiiko ordua - - HAST - @@ -3369,11 +3359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hawaii-Aleutiar uharteetako ordu estandarra Hawaii-Aleutiar uharteetako udako ordua - - HAT - HAST - HADT - @@ -3426,6 +3411,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Irango udako ordua + + + Irlandako ordua + Irlandako ordu estandarra + + Irkutskeko ordua @@ -3493,11 +3484,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgizistango ordua - - - Lankako ordua - - Line uharteetako ordua @@ -3510,13 +3496,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howeko udako ordua - - - Macaoko ordua - Macaoko ordu estandarra - Macaoko udako ordua - - Magadango ordua @@ -3632,11 +3611,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronhako udako ordua - - - Ipar Mariana uharteetako ordua - - Novosibirskeko ordua @@ -3716,13 +3690,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Piongiangeko ordua - - - Kyzylordako ordua - Kyzylordako ordu estandarra - Kyzylordako udako ordua - - Reunioneko ordua @@ -3749,9 +3716,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoako ordua Samoako ordu estandarra - Samoako udako ordua @@ -3818,6 +3783,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chuukeko ordua + + + Turkiako ordua + Turkiako ordu estandarra + Turkiako udako ordua + + Turkmenistango ordua @@ -3837,6 +3809,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguaiko udako ordua + + + Urumtxiko ordua + + Uzbekistango ordua @@ -4655,11 +4632,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yuan txinatar (itsasoz haraindikoa) yuan txinatar (itsasoz haraindikoa) - - Txinako Herri Bankuaren dolarra - Txinako Herri Bankuaren dolar - Txinako Herri Bankuaren dolar - yuan txinatarra yuan txinatar @@ -5705,8 +5677,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ florin karibetarra - florin karibetarra - florin karibetarra igorpen-eskubide berezia @@ -5836,8 +5806,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ urre zimbabwetarra - urre zimbabwetarra - urre zimbabwetarra dolar zimbabwetarra (2009) @@ -6062,8 +6030,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zatiak - {0} zati - {0} zati zati milioi bakoitzeko @@ -6085,8 +6051,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ glukosa-unitateak - {0} glukosa-unitate - {0} glukosa-unitate litro kilometro bakoitzeko @@ -6557,8 +6521,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ merkurio-unitateak - {0} merkurio-unitate - {0} merkurio-unitate libra hazbete karratuko @@ -6715,8 +6677,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ likido-ontza metrikoak - {0} likido-ontza metriko - {0} likido-ontza metriko {0} bushel @@ -6770,58 +6730,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ katalak - {0} katal - {0} katal coulombak - {0} coulomb - {0} coulomb faradak - {0} farad - {0} farad henryak - {0} henry - {0} henry siemensak - {0} siemens - {0} siemens kaloriak [IT] - {0} kaloria [IT] - {0} kaloria [IT] becquerelak - {0} becquerel - {0} becquerel sievertak - {0} sievert - {0} sievert grayak - {0} gray - {0} gray kilopondak - {0} kilopond - {0} kilopond teslak - {0} tesla - {0} tesla weberrak @@ -7415,13 +7353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol/l - - zati - {0} zati - {0} zati - - glukosa-unitate {0} Glc {0} Glc @@ -7510,7 +7442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} M☉ - merkurio-unitate {0} Hg unitate {0} Hg unitate @@ -7548,9 +7479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mc {0}mc - - likido-ontza metriko - {0}ac ft {0}ac ft @@ -7587,69 +7515,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dsp-Imp {0}dsp-Imp - - estereorradian - {0} sr - {0} sr - - katal {0} kat {0} kat - coulomb {0} C {0} C - farad {0} F {0} F - henry {0} H {0} H - siemens {0} S {0} S - kaloria [IT] {0} cal [IT] {0} cal [IT] - becquerel {0} Bq {0} Bq - sievert {0} Sv {0} Sv - gray {0} Gy {0} Gy - kilopond {0} kgf {0} kgf - tesla {0} T {0} T - - weber - {0} a. {0} a. diff --git a/make/data/cldr/common/main/fa.xml b/make/data/cldr/common/main/fa.xml index 73a558d745c8..9a113940a214 100644 --- a/make/data/cldr/common/main/fa.xml +++ b/make/data/cldr/common/main/fa.xml @@ -275,7 +275,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ کوجراچینی کهوار کیکویویی - کرمانجی + کرمانجکی کوانیاما قزاقی کاکایی @@ -430,6 +430,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ پالی پی‌جین لهستانی + پیه‌مونتی پانپیی ملیسیت - پاسماکودی پروسی @@ -608,7 +609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1080,18 +1081,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ترتیب مرتب‌سازی معمولی مرتب‌سازی عددی + ترتیب براساس نوشتار/قطعه قدرت مرتب‌سازی واحد پول + تغییر شکل مقصد + استثناهای شکست کلمات در واژه‌نامه نمایش اموجی + شنبه + ترکیبی دور ساعت (۱۲ در مقابل ۲۴) + روش ورودی + صفحه‌کلید + بالاترین سطح چشم‌پوشی شیوهٔ سطرشکنی شکست خط داخل کلمات + قوانین تغییر شکل دستگاه اندازه‌گیری + واحد اندازه‌گیری اعداد + ناحیه داده‌های تکمیلی + مبدأ تبدیل + زیربخش ناحیه شکست جمله پس از مخفف + تبدیل + ترجمه ماشینی منطقهٔ زمانی متغیر محلی استفادهٔ خصوصی + تبدیل برای کاربرد خصوصی تقویم بودایی @@ -1111,22 +1128,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ تقویم عبری عبری تقویم ملی هند - تقویم هجری قمری + تقویم ملی هند + تقویم هجری هجری - تقویم هجری قمری جدولی مدنی - هجری (جدولی، دوران مدنی) + تقویم هجری (جدولی، مبدأ ثابت مدنی) + هجری (جدولی، مبدأ ثابت مدنی) قویم هجری قمری هلالی عربستان سعودی - تقویم هجری قمری جدولی نجومی - هجری (جدولی، دوران نجومی) + هجری، رؤیت در عربستان سعودی + تقویم هجری (جدولی، مبدأ نجومی) + هجری (جدولی، مبدأ نجومی) تقویم هجری قمری ام‌القری هجری (ام‌القری) - تقویم ایزو ۸۶۰۱ + تقویم میلادی (ایزو ۸۶۰۱) + میلادی تقویم ژاپنی ژاپنی تقویم هجری شمسی ایرانی - تقویم جمهوری چین (تایوان) - جمهوری چین + تقویم مینگو + مینگو قالب حسابداری واحد پول حسابداری قالب استاندارد واحد پول @@ -1136,43 +1156,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ مرتب‌سازی آکسان‌ها به صورت معمولی مرتب‌سازی معکوس براساس آکسان ابتدا مرتب‌سازی حروف کوچک + حروف کوچک مرتب‌سازی به ترتیب معمولی بزرگ و کوچکی حروف + حروف کوچک مرتب‌سازی بر اساس حرف بزرگ در ابتدا + حروف بزرگ مرتب‌سازی بدون توجه به کوچک و بزرگی حروف مرتب‌سازی با حساسیت به اندازه حروف ترتیب پیشین، برای سازگاری + سازگاری ترتیب فرهنگ لغت + واژه‌نامه ترتیب پیش‌فرض یونی‌کد یونی‌کد پیش‌فرض ترتیب ایموجی + اموجی قوانین ترتیب اروپایی + قوانین اروپایی ترتیب دفتر تلفن + دفترچه تلفن مرتب کردن بر اساس آوایی + آوایی ترتیب پین‌یین + پین‌یین جستجوی عمومی جستجو جستجو با صامت اول هانگول + همخوان آغازین کره‌ای ترتیب استاندارد استاندارد ترتیب حرکتی + ضربه ترتیب سنتی + سنتی ترتیب رادیکالی-حرکتی + ضربه رادیکال ترتیب ژویین + ژویین مرتب‌سازی بدون عادی‌سازی مرتب‌سازی یونی‌کد نرمال‌شده مرتب‌سازی ارقام بصورت مجزا مرتب‌سازی شماره‌ها با سیستم عددی + واحد پول + ارقام + نشانه‌گذاری + فاصله + نماد مرتب‌سازی همه + همه مرتب‌سازی فقط حروف پایه + فقط حروف پایه مرتب‌سازی بر اساس آکسان/اندازه حروف/عرض/کانا + پایه، آکسان، حالت، گونه، کانا مرتب‌سازی آکسان‌ها + پایه، آکسان مرتب‌سازی بر اساس آکسان/اندازه حرف/عرض - تمام‌عرض - نیم‌عرض + پایه، آکسان، حالت، گونه + به تمام‌عرض + به نیم‌عرض سیستم اعداد پیش‌فرض اموجی پیامک + سیستم ۱۲ ساعته + ۱۲ ساعته + سیستم ۲۴ ساعته + ۲۴ ساعته سیستم ۱۲ ساعته (۰ تا ۱۱) ۱۲ ساعته (۰ تا ۱۱) سیستم ۱۲ ساعته (۱ تا ۱۲) @@ -1181,6 +1230,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ۲۴ ساعته (۰ تا ۲۳) سیستم ۲۴ ساعته (۱ تا ۲۴) ۲۴ ساعته (۱ تا ۲۴) + انتقال فاصله‌ها، نقطه‌گذاری، همه نمادها + انتقال فاصله‌ها، نقطه‌گذاری + انتقال فاصله‌ها، نقطه‌گذاری + انتقال فاصله‌ها، نقطه‌گذاری، نمادهای غیر واحد پول شیوهٔ سطرشکنی سهل‌گیرانه سهل‌گیرانه شیوهٔ سطرشکنی عادی @@ -1201,8 +1254,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ امریکایی ارقام عربی ارقام فارسی + فارسی اعداد ارمنی اعداد ارمنی با حروف کوچک + ارمنی با حروف کوچک ارقام بالیایی ارقام بنگالی ارقام برهمایی @@ -1211,48 +1266,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ارقام دوناگری اعداد اتیوپیایی سیستم عددی مالی + مالی ارقام تمام‌عرض + تمام‌عرض اعداد گرجی اعداد یونانی اعداد یونانی با حروف کوچک + یونانی با حروف کوچک ارقام گجراتی ارقام گورومخی + شماره‌گذاری روزهای ماه با نویسه هان برای تقویم‌های سنتی اعداد دهدهی چینی + سیستم دهدهی موقعیتی با استفاده از اندیش‌نگاری اعداد چینی به‌عنوان ارقام اعداد چینی ساده‌شده اعداد مالی چینی ساده‌شده + مالی چینی ساده‌شده اعداد چینی سنتی اعداد مالی چینی سنتی + مالی چینی سنتی اعداد عبری ارقام جاوه‌ای اعداد ژاپنی اعداد مالی ژاپنی + مالی ژاپنی + شماره‌گذاری ژاپنی سال اول گانن ارقام خمری ارقام کاناده‌ای + تای تام تام (مذهبی) ارقام لائوسی ارقام غربی ارقام ریاضی سیاه + ریاضی پررنگ + ریاضی دوضربه‌ای + ریاضی تک‌فاصله‌ای ارقام ریاضی سیاه بی‌سریف + ریاضی پررنگ بدون لبه ارقام ریاضی بی‌سریف + ریاضی بدون لبه ارقام مالایالامی ارقام مغولی ارقام میتی مایک ارقام میانماری + پو کارن شرقی میانمار + پائو میانمار ارقام شان میانماری + شان میانمار + تای لِینگ میانمار ارقام بومی + ارقام بومی ارقام اول چیکی ارقام اودیه + دورخط‌دار اعداد رومی + حروف بزرگ رومی اعداد رومی با حروف کوچک + حروف کوچک رومی + بخش‌بخش اعداد سنتی تامیلی ارقام تامیلی + تامیل مدرن ارقام تلوگویی ارقام تایلندی ارقام تبتی سیستم اعداد سنتی + اعداد سنتی ارقام وایی خاموش روشن + ترجمه ماشینی نامشخص + متغیر POSIX + + خاموش + روشن + متریک بریتانیایی @@ -1322,6 +1409,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + - + + @@ -1344,6 +1436,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1422,7 +1521,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y G E d MMM y G H - HH:mm (Z) + HH:mm (Z) H:mm H:mm:ss H (v) @@ -1450,6 +1549,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ({1}) + + {0} تا {1} + {0} تا {1} + {0} تا {1} + {0} تا {1} h B تا h B @@ -1555,6 +1659,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d LLL تا E d LLL E d LLL تا E d LLL + + d تا d MMMM + d MMMM تا d MMMM + y تا y G @@ -1611,13 +1719,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ دسامبر - ژانویهٔ - فوریهٔ + ژانویه + فوریه مارس آوریل - مهٔ + مه ژوئن - ژوئیهٔ + ژوئیه اوت سپتامبر اکتبر @@ -1819,6 +1927,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}، ساعت {0} @@ -1862,8 +1973,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E d MMM y G + MMMM y G + d MMMM، y G + E، d MMMM، y G H - HH:mm (Z) + HH:mm (v) H:mm H:mm:ss H:mm:ss v @@ -1886,6 +2000,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + d MMMM y + E، d MMMM y EEEE d MMMM y QQQQ y QQQQ y @@ -1893,10 +2009,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ هفتهٔ wم Y - {1} {0} + {0} {1} {0} ({1}) + + {0} تا {1} + {0} تا {1} + {0} تا {1} + {0} تا {1} h B تا h B @@ -2002,6 +2123,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d LLL تا E d LLL E d LLL تا E d LLL + + d تا d MMMM + d MMMM تا d MMMM + y تا y @@ -2202,9 +2327,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - y/M G - E، y/M/d G - HH:mm (Z) + HH:mm (v) + d MMMM mm:ss y/M G E y/M/d G @@ -2612,8 +2736,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‎+HH:mm;‎−HH:mm {0} گرینویچ - گرینویچ - گرینویچ+؟ + GMT+؟ + UTC+؟ وقت {0} وقت تابستانی {0} وقت عادی {0} @@ -3094,9 +3218,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ لیبرویل - - وقت تابستانی بریتانیا - لندن @@ -3187,9 +3308,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ جایاپورا - - وقت عادی ایرلند - دوبلین @@ -3885,6 +4003,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ هراره + + + وقت آکری + وقت عادی آکری + وقت تابستانی آکری + + وقت افغانستان @@ -3917,13 +4042,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی آلاسکا - - - وقت آلماآتا - وقت عادی آلماآتا - وقت تابستانی آلماآتا - - وقت آمازون @@ -4074,6 +4192,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی برازیلیا + + + وقت بریتانیا + وقت تابستانی بریتانیا + + وقت برونئی دارالسلام @@ -4247,6 +4371,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت گرینویچ + + + وقت گرینلند + وقت عادی گرینلند + وقت تابستانی گرینلند + + وقت شرق گرینلند @@ -4261,11 +4392,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی غرب گرینلند - - - وقت عادی گوام - - وقت عادی خلیج فارس @@ -4278,7 +4404,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - وقت عادی هاوایی‐الوشن + وقت عادی هاوایی @@ -4339,6 +4465,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی ایران + + + وقت ایرلند + وقت عادی ایرلند + + وقت ایرکوتسک @@ -4362,9 +4494,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - وقت پتروپاولوسک‐کامچاتسکی - وقت عادی پتروپاولوسک‐کامچاتسکی - وقت تابستانی پتروپاولوسک‐کامچاتسکی + وقت کامچاتسکی + وقت عادی کامچاتسکی + وقت تابستانی کامچاتسکی @@ -4406,11 +4538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت قرقیزستان - - - وقت لانکا - - وقت جزایر لاین @@ -4423,13 +4550,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی لردهو - - - وقت ماکائو - وقت عادی ماکائو - وقت تابستانی ماکائو - - وقت ماگادان @@ -4545,11 +4665,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی فرناندو دی نورونیا - - - وقت جزایر ماریانای شمالی - - وقت نووسیبیرسک @@ -4629,13 +4744,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت پیونگ‌یانگ - - - وقت قیزیل‌اوردا - وقت عادی قیزیل‌اوردا - وقت تابستانی قیزیل‌اوردا - - وقت رئونیون @@ -4662,9 +4770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - وقت ساموا وقت عادی ساموا - وقت تابستانی ساموا @@ -4757,6 +4863,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ وقت تابستانی اروگوئه + + + وقت اورومچی + + وقت ازبکستان @@ -4938,14 +5049,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‎#,##0.00 - ‎¤ #,##0.00;‎(¤ #,##0.00) - ‎¤ #,##0.00;‎(¤ #,##0.00) + #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00 ¤;(#,##0.00 ¤) ‎#,##0.00;‎(#,##0.00) - ‎¤ 0 هزار + 0K¤ ‎¤ 0 هزار ‎¤ 00 هزار ‎¤ 00 هزار @@ -5100,6 +5211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ فرانک سوئیس + Fr.‎ پزوی شیلی @@ -5655,8 +5767,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ گیلدر کارائیب - گیلدر کارائیب - گیلدر کارائیب + XCG فرانک طلای فرانسه @@ -5706,8 +5817,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ طلای زیمبابوه - طلای زیمبابوه - طلای زیمبابوه دلار زیمبابوه (۲۰۰۹) @@ -5797,11 +5906,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} میلی‌مول در لیتر {0} میلی‌مول در لیتر - - پارت - {0} پارت - {0} پارت - بخش در میلیون {0} بخش در میلیون @@ -5819,11 +5923,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ده‌هزارم {0} ده‌هزارم - - گلوکز - {0} گلوکز - {0} گلوکز - لیتر در کیلومتر {0} لیتر در کیلومتر @@ -5995,16 +6094,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} مایل اسکاندیناوی {0} مایل اسکاندیناوی - - شمع - {0} شمع - {0} شمع - - - لومن - {0} لومن - {0} لومن - {0} تابندگی خورشید {0} تابندگی خورشید @@ -6037,11 +6126,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} میلی‌متر جیوه {0} میلی‌متر جیوه - - جیوه - {0} جیوه - {0} جیوه - {0} پوند در اینچ مربع {0} پوند در اینچ مربع @@ -6063,6 +6147,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} مایل در ساعت {0} مایل در ساعت + + {0} درجه + {0} درجه + {0} درجهٔ سلسیوس {0} درجهٔ سلسیوس @@ -6170,76 +6258,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} درم {0} درم - - استرادیان - {0} استرادیان - {0} استرادیان - - - کاتال - {0} کاتال - {0} کاتال - - - کولن - {0} کولن - {0} کولن - - - فاراد - {0} فاراد - {0} فاراد - - - هنری - {0} هنری - {0} هنری - - - زیمنس - {0} زیمنس - {0} زیمنس - کالری [IT] {0} کالری [IT] {0} کالری [IT] - - بکرل - {0} بکرل - {0} بکرل - - - سیورت - {0} سیورت - {0} سیورت - - - گری - {0} گری - {0} گری - - - کیلوگرم-نیرو - {0} کیلوگرم-نیرو - {0} کیلوگرم-نیرو - - - تسلا - {0} تسلا - {0} تسلا - - - وبر - {0} وبر - {0} وبر - - - نور - {0} نوری - {0} نوری - {0} بخش در بیلیون {0} بخش در بیلیون @@ -6973,8 +6996,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ پوند در اینچ مربع - {0}‎ psi - {0}‎ psi اینچ جیوه @@ -7236,8 +7257,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ استرادیان - {0} استرادیان - {0} استرادیان + {0} sr + {0} sr کاتال @@ -7504,20 +7525,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}مورد - پارت {0} پارت {0}پارت + ppm {0}ppm {0}ppm ٪ - - گلوکز - L/۱۰۰km @@ -7800,12 +7818,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}lx - شمع {0}cd {0}cd - لومن {0}lm {0}lm @@ -7900,10 +7916,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}hp {0}hp - - جیوه + + mmHg + {0}mmHg + {0}mmHg + + + psi + inHg {0}inHg {0}inHg @@ -7947,7 +7969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B{0} - {0}بوفورت + B{0} ‎°C @@ -7956,6 +7978,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‎°F + K {0}K {0}K @@ -8000,6 +8023,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mc {0}mc + + ‎{0} fl oz m.‎ + ‎{0} fl oz m.‎ + {0}ac ft {0}ac ft @@ -8059,29 +8086,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt-Imp. {0}qt-Imp. - - کاتال - - - کولن + + {0} sr + {0} sr - - هنری + + Bq + {0} Bq + {0} Bq - - کالری-IT + + Sv + {0} Sv + {0} Sv - گری - - - تسلا - - - وبر + {0} Gy + {0} Gy - نور {0}نوری {0}نوری diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml index 5be8b38a0e4f..fea281851bc1 100644 --- a/make/data/cldr/common/main/ff_Adlm.xml +++ b/make/data/cldr/common/main/ff_Adlm.xml @@ -998,6 +998,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤈𞤫𞤱𞤲𞤭𞤲𞥋𞤣𞤭𞤪𞤮 𞤔𞤭𞤩𞤼𞤢𞤲𞤣𞤫 𞤊𞤭𞤩𞤢𞤲𞤣𞤫 Unicode 𞤏𞤭𞤯𞤢𞤲𞤣𞤫 𞤖𞤵𞥅𞤩𞤵𞤲𞥋𞤣𞤫 𞤖𞤢𞤱𞤪𞤭𞤼𞤢𞤲𞤣𞤫 𞤈𞤫𞤱𞤲𞤭𞤲𞥋𞤣𞤭𞤪𞤮 𞤔𞤭𞤩𞤼𞤢𞤲𞤣𞤫 + 𞤐𞥋𞤔𞤵𞤩𞥆𞤵𞤣𞤭 𞤁𞤵𞤥𞤵𞤲𞥆𞤢 𞤐𞥋𞤔𞤢𞤥𞤲𞥋𞤣𞤭 𞥑𞥒 + 𞤐𞥋𞤔𞤵𞤩𞥆𞤵𞤣𞤭 𞤁𞤵𞤥𞤵𞤲𞥆𞤢 𞤐𞥋𞤔𞤢𞤥𞤲𞥋𞤣𞤭 𞥒𞥔 𞤐𞤶𞤵𞤩𞥆𞤵𞤣𞤭 𞤁𞤵𞤥𞤵𞤲𞥆𞤢 𞤐𞤶𞤢𞤥𞤲𞤣𞤭 𞥑𞥒 (𞥐-𞥑𞥒) 𞤐𞥋𞤔𞤵𞤩𞥆𞤵𞤣𞤭 𞤁𞤵𞤥𞤵𞤲𞥆𞤢 𞤐𞥋𞤔𞤢𞤥𞤲𞥋𞤣𞤭 𞥑𞥒 (𞥑-𞥑𞥒) 𞤐𞥋𞤔𞤵𞤩𞥆𞤵𞤣𞤭 𞤁𞤵𞤥𞤵𞤲𞥆𞤢 𞤐𞥋𞤔𞤢𞤥𞤲𞥋𞤣𞤭 𞥒𞥔 (𞥐-𞥒𞥓) @@ -1863,6 +1865,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤴𞤮𞤲𞤼𞤫𞤪𞤫 w 𞤲𞤣𞤫𞤪 Y + + {0} – {1} + {0} – {1} + {0} – {1} + h – h B @@ -2122,242 +2129,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - 𞤔𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥑𞥑-𞥑𞥒𞥐𞥖) - - 𞤚𞤢𞤴𞤳𞤢 (𞥖𞥔𞥕-𞥖𞥕𞥐) - 𞤖𞤢𞤳𞤵𞤧𞤭 (𞥖𞥕𞥐-𞥖𞥗𞥑) - 𞤖𞤢𞤳𞤵𞤸𞤮𞥅 (𞥖𞥗𞥒-𞥖𞥘𞥖) - 𞤡𞤵𞤷𞤮𞥅 (𞥖𞥘𞥖-𞥗𞥐𞥑) - 𞤚𞤢𞤴𞤸𞤮𞥅 (𞥗𞥐𞥑-𞥗𞥐𞥔) - 𞤑𞤫𞤴𞤵𞤲 (𞥗𞥐𞥔-𞥗𞥐𞥘) - 𞤏𞤢𞤣𞤮𞥅 (𞥗𞥐𞥘-𞥗𞥑𞥕) - 𞤈𞤫𞤴𞤳𞤭 (𞥗𞥑𞥕-𞥗𞥑𞥗) - 𞤒𞤮𞥅𞤪𞤮𞥅 (𞥗𞥑𞥗-𞥗𞥒𞥔) - 𞤔𞤭𞤲𞤳𞤭 (𞥗𞥒𞥔-𞥗𞥒𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 (𞥗𞥒𞥙-𞥗𞥔𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤳𞤢𞤥𞤨𞤮𞥅 (𞥗𞥔𞥙-𞥗𞥔𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤧𞤮𞥅𞤸𞤮𞥅 (𞥗𞥔𞥙-𞥗𞥕𞥗) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤸𞤮𞥅𞤶𞤭 (𞥗𞥕𞥗-𞥗𞥖𞥕) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤶𞤭𞤲𞤺𞤮 (𞥗𞥖𞥕-𞥗𞥖𞥗) - 𞤔𞤭𞤲𞤺𞤮-𞤳𞤫𞤴𞤵𞥅𞤲 (𞥗𞥖𞥗-𞥗𞥗𞥐) - 𞤖𞤮𞥅𞤳𞤭 (𞥗𞥗𞥐-𞥗𞥘𞥐) - 𞤚𞤫𞤲-𞤮𞥅 (𞥗𞥘𞥑-𞥗𞥘𞥒) - 𞤉𞤲𞤪𞤢𞤴𞤳𞤵 (𞥗𞥘𞥒-𞥘𞥐𞥖) - 𞤁𞤢𞤴𞤣𞤮𞥅 (𞥘𞥐𞥖-𞥘𞥑𞥐) - 𞤑𞤮𞥅𞤲𞤭𞤲 (𞥘𞥑𞥐-𞥘𞥒𞥔) - 𞤚𞤫𞤲𞤧𞤮𞥅 (𞥘𞥒𞥔-𞥘𞥓𞥔) - 𞤔𞤮𞥅𞤱𞤢 (𞥘𞥓𞥔-𞥘𞥔𞥘) - 𞤑𞤢𞤶𞤮𞥅 (𞥘𞥔𞥘-𞥘𞥕𞥑) - 𞤐𞤭𞤲𞤶𞤵 (𞥘𞥕𞥑-𞥘𞥕𞥔) - 𞤅𞤢𞤴𞤳𞤮𞥅 (𞥘𞥕𞥔-𞥘𞥕𞥗) - 𞤚𞤫𞤲-𞤢𞤲 (𞥘𞥕𞥗-𞥘𞥕𞥙) - 𞤔𞤮𞥅𞤺𞤢𞤲 (𞥘𞥕𞥙-𞥘𞥗𞥗) - 𞤘𞤢𞤲𞤶𞤭𞤴𞤮𞥅 (𞥘𞥗𞥗-𞥘𞥘𞥕) - 𞤐𞤭𞤲𞥆𞤢 (𞥘𞥘𞥕-𞥘𞥘𞥙) - 𞤑𞤢𞤥𞤨𞤭𞤴𞤮𞥅 (𞥘𞥘𞥙-𞥘𞥙𞥘) - 𞤡𞤮𞥅𞤼𞤢𞤴 (𞥘𞥙𞥘-𞥙𞥐𞥑) - 𞤉𞤲𞤺𞤭𞥅 (𞥙𞥐𞥑-𞥙𞥒𞥓) - 𞤉𞤲𞥃𞤮𞥅 (𞥙𞥒𞥓-𞥙𞥓𞥑) - 𞤔𞤮𞥅𞤸𞤫𞤴 (𞥙𞥓𞥑-𞥙𞥓𞥘) - 𞤚𞤫𞤲𞤺𞤭𞤴𞤮𞥅 (𞥙𞥓𞥘-𞥙𞥔𞥗) - 𞤚𞤫𞤲𞤪𞤢𞤴𞤳𞤵 (𞥙𞥔𞥗-𞥙𞥕𞥗) - 𞤚𞤫𞤲𞤼𞤮𞤳𞤵 (𞥙𞥕𞥗-𞥙𞥖𞥑) - 𞤌𞥅𞤱𞤢 (𞥙𞥖𞥑-𞥙𞥖𞥔) - 𞤑𞤮𞥅𞤸𞤮𞥅 (𞥙𞥖𞥔-𞥙𞥖𞥘) - 𞤀𞤲𞥆𞤢 (𞥙𞥖𞥘-𞥙𞥗𞥐) - 𞤚𞤫𞤲𞤪𞤮𞤳𞤵 (𞥙𞥗𞥐-𞥙𞥗𞥓) - 𞤚𞤫𞤲𞥋𞤫𞤲 (𞥙𞥗𞥓-𞥙𞥗𞥖) - 𞤔𞤮𞥅𞤺𞤫𞤲 (𞥙𞥗𞥖-𞥙𞥗𞥘) - 𞤚𞤫𞤲𞤺𞤫𞤲 (𞥙𞥗𞥘-𞥙𞥘𞥓) - 𞤉𞤴𞤳𞤢𞤲 (𞥙𞥘𞥓-𞥙𞥘𞥕) - 𞤑𞤢𞤲𞥆𞤢 (𞥙𞥘𞥕-𞥙𞥘𞥗) - 𞤉𞤴𞥇𞤫𞤲 (𞥙𞥘𞥗-𞥙𞥘𞥙) - 𞤉𞤴𞤧𞤮 (𞥙𞥘𞥙-𞥙𞥙𞥐) - 𞤡𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥙𞥙𞥐-𞥙𞥙𞥕) - 𞤕𞤮𞥅𞤼𞤮𞤳𞤵 (𞥙𞥙𞥕-𞥙𞥙𞥙) - 𞤕𞤮𞥅𞤸𞤮𞥅 (𞥙𞥙𞥙-𞥑𞥐𞥐𞥔) - 𞤑𞤢𞤲𞤳𞤮𞥅 (𞥑𞥐𞥐𞥔-𞥑𞥐𞥑𞥒) - 𞤕𞤮𞥅𞤱𞤢 (𞥑𞥐𞥑𞥒-𞥑𞥐𞥑𞥗) - 𞤑𞤢𞤲𞥆𞤭𞤲 (𞥑𞥐𞥑𞥗-𞥑𞥐𞥒𞥑) - 𞤔𞤭𞤴𞤢𞤲 (𞥑𞥐𞥒𞥑-𞥑𞥐𞥒𞥔) - 𞤃𞤢𞤲𞤶𞤵 (𞥑𞥐𞥒𞥔-𞥑𞥐𞥒𞥘) - 𞤕𞤮𞥅𞤺𞤫𞤲 (𞥑𞥐𞥒𞥘-𞥑𞥐𞥓𞥗) - 𞤕𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥓𞥗-𞥑𞥐𞥔𞥐) - 𞤕𞤮𞥅𞤳𞤴𞤵𞥅 (𞥑𞥐𞥔𞥐-𞥑𞥐𞥔𞥔) - 𞤑𞤢𞤲𞤼𞤮𞤳𞤵 (𞥑𞥐𞥔𞥔-𞥑𞥐𞥔𞥖) - 𞤉𞤴𞥃𞤮𞥅 (𞥑𞥐𞥔𞥖-𞥑𞥐𞥕𞥓) - 𞤚𞤫𞤲𞤺𞤭 (𞥑𞥐𞥕𞥓-𞥑𞥐𞥕𞥘) - 𞤑𞤮𞥅𞤸𞤫𞤴 (𞥑𞥐𞥕𞥘-𞥑𞥐𞥖𞥕) - 𞤔𞤭𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥖𞥕-𞥑𞥐𞥖𞥙) - 𞤉𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥐𞥖𞥙-𞥑𞥐𞥗𞥔) - 𞤡𞤮𞥅𞤸𞤮 (𞥑𞥐𞥗𞥔-𞥑𞥐𞥗𞥗) - 𞤡𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥗𞥗-𞥑𞥐𞥘𞥑) - 𞤉𞤴𞤸𞤮𞥅 (𞥑𞥐𞥘𞥑-𞥑𞥐𞥘𞥔) - 𞤌𞥅𞤼𞤮𞤳𞤵 (𞥑𞥐𞥘𞥔-𞥑𞥐𞥘𞥗) - 𞤑𞤢𞤲𞤶𞤭 (𞥑𞥐𞥘𞥗-𞥑𞥐𞥙𞥔) - 𞤑𞤢𞤸𞤮𞥅 (𞥑𞥐𞥙𞥔-𞥑𞥐𞥙𞥖) - 𞤉𞤴𞤷𞤮𞥅 (𞥑𞥐𞥙𞥖-𞥑𞥐𞥙𞥗) - 𞤔𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥐𞥙𞥗-𞥑𞥐𞥙𞥙) - 𞤑𞤮𞥅𞤱𞤢 (𞥑𞥐𞥙𞥙-𞥑𞥑𞥐𞥔) - 𞤕𞤮𞥅𞤶𞤭 (𞥑𞥑𞥐𞥔-𞥑𞥑𞥐𞥖) - 𞤑𞤢𞥃𞤮𞥅 (𞥑𞥑𞥐𞥖-𞥑𞥑𞥐𞥘) - 𞤚𞤫𞤲𞥆𞤭𞤲 (𞥑𞥑𞥐𞥘-𞥑𞥑𞥑𞥐) - 𞤚𞤫𞤲-𞤫𞤴 (𞥑𞥑𞥑𞥐-𞥑𞥑𞥑𞥓) - 𞤉𞤴𞤳𞤭𞤴𞤵𞥅 (𞥑𞥑𞥑𞥓-𞥑𞥑𞥑𞥘) - 𞤘𞤫𞤲𞥇𞤴𞤭 (𞥑𞥑𞥑𞥘-𞥑𞥑𞥒𞥐) - (𞤖𞤮𞥅𞤢𞤲 (𞥑𞥑𞥒𞥐-𞥑𞥑𞥒𞥔 - 𞤚𞤫𞤲𞤶𞤭 (𞥑𞥑𞥒𞥔-𞥑𞥑𞥒𞥖) - 𞤁𞤢𞤴𞤶𞤭 (𞥑𞥑𞥒𞥖-𞥑𞥑𞥓𞥑) - 𞤚𞤫𞤲𞥃𞤮𞥅 (𞥑𞥑𞥓𞥑-𞥑𞥑𞥓𞥒) - 𞤕𞤮𞥅𞥃𞤮𞥅 (𞥑𞥑𞥓𞥒-𞥑𞥑𞥓𞥕) - 𞤖𞤮𞥅𞤫𞤲 (𞥑𞥑𞥓𞥕-𞥑𞥑𞥔𞥑) - 𞤉𞤴𞤶𞤭 (𞥑𞥑𞥔𞥑-𞥑𞥑𞥔𞥒) - 𞤑𞤮𞥅𞤶𞤭 (𞥑𞥑𞥔𞥒-𞥑𞥑𞥔𞥔) - 𞤚𞤫𞤲𞥇𞤴𞤮𞥅 (𞥑𞥑𞥔𞥔-𞥑𞥑𞥔𞥕) - 𞤑𞤭𞤴𞤵𞥅𞤢𞤲 (𞥑𞥑𞥔𞥕-𞥑𞥑𞥕𞥑) - 𞤐𞤭𞤲𞤨𞤫𞤴 (𞥑𞥑𞥕𞥑-𞥑𞥑𞥕𞥔) - 𞤑𞤭𞤴𞤵𞥅𞤶𞤵 (𞥑𞥑𞥕𞥔-𞥑𞥑𞥕𞥖) - 𞤖𞤮𞥅𞤺𞤫𞤲 (𞥑𞥑𞥕𞥖-𞥑𞥑𞥕𞥙) - 𞤖𞤫𞤴𞤶𞤭 (𞥑𞥑𞥕𞥙-𞥑𞥑𞥖𞥐) - 𞤉𞤴𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥑𞥖𞥐-𞥑𞥑𞥖𞥑) - 𞤌𞥅𞤸𞤮 (𞥑𞥑𞥖𞥑-𞥑𞥑𞥖𞥓) - 𞤕𞤮𞥅𞤳𞤢𞤲 (𞥑𞥑𞥖𞥓-𞥑𞥑𞥖𞥕) - 𞤉𞤴𞤥𞤢𞤲 (𞥑𞥑𞥖𞥕-𞥑𞥑𞥖𞥖) - 𞤐𞤭𞤲𞥇𞤢𞤲 (𞥑𞥑𞥖𞥖-𞥑𞥑𞥖𞥙) - 𞤑𞤢𞤮𞥅 (𞥑𞥑𞥖𞥙-𞥑𞥑𞥗𞥑) - 𞤡𞤮𞥅𞤢𞤲 (𞥑𞥑𞥗𞥑-𞥑𞥑𞥗𞥕) - 𞤀𞤲𞤺𞤫𞤲 (𞥑𞥑𞥗𞥕-𞥑𞥑𞥗𞥗) - 𞤔𞤭𞥃𞤮𞥅 (𞥑𞥑𞥗𞥗-𞥑𞥑𞥘𞥑) - 𞤒𞤮𞥅𞤱𞤢 (𞥑𞥑𞥘𞥑-𞥑𞥑𞥘𞥒) - 𞤔𞤵𞤫𞤴 (𞥑𞥑𞥘𞥒-𞥑𞥑𞥘𞥔) - 𞤘𞤫𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥑𞥘𞥔-𞥑𞥑𞥘𞥕) - 𞤄𞤵𞤲𞤶𞤭 (𞥑𞥑𞥘𞥕-𞥑𞥑𞥙𞥐) - 𞤑𞤫𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥑𞥙𞥐-𞥑𞥑𞥙𞥙) - 𞤡𞤮𞥅𞤶𞤭 (𞥑𞥑𞥙𞥙-𞥑𞥒𞥐𞥑) - 𞤑𞤫𞤲𞥆𞤭𞤲 (𞥑𞥒𞥐𞥑-𞥑𞥒𞥐𞥔) - 𞤘𞤫𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥒𞥐𞥔-𞥑𞥒𞥐𞥖) - 𞤑𞤫𞤲𞥇𞤫𞤴 (𞥑𞥒𞥐𞥖-𞥑𞥒𞥐𞥗) - 𞤔𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥐𞥗-𞥑𞥒𞥑𞥑) - 𞤑𞤫𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥒𞥑𞥑-𞥑𞥒𞥑𞥓) - 𞤑𞤫𞤥𞤨𞤮𞥅 (𞥑𞥒𞥑𞥓-𞥑𞥒𞥑𞥙) - 𞤔𞤮𞥅𞤳𞤭𞤴𞤵𞥅 (𞥑𞥒𞥑𞥙-𞥑𞥒𞥒𞥒) - 𞤔𞤮𞥅 (𞥑𞥒𞥒𞥒-𞥑𞥒𞥒𞥔) - 𞤘𞤫𞤲𞥆𞤭𞤲 (𞥑𞥒𞥒𞥔-𞥑𞥒𞥒𞥕) - 𞤑𞤢𞤪𞤮𞤳𞤵 (𞥑𞥒𞥒𞥕-𞥑𞥒𞥒𞥗) - 𞤀𞤲𞤼𞤫𞤴 (𞥑𞥒𞥒𞥗-𞥑𞥒𞥒𞥙) - 𞤑𞤢𞤲𞤳𞤭 (𞥑𞥒𞥒𞥙-𞥑𞥒𞥓𞥒) - 𞤔𞤮𞥅𞤫𞤴 (𞥑𞥒𞥓𞥒-𞥑𞥒𞥓𞥓) - 𞤚𞤫𞤥𞤨𞤵𞤳𞤵 (𞥑𞥒𞥓𞥓-𞥑𞥒𞥓𞥔) - 𞤄𞤵𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥒𞥓𞥔-𞥑𞥒𞥓𞥕) - 𞤑𞤢𞤼𞤫𞤴 (𞥑𞥒𞥓𞥕-𞥑𞥒𞥓𞥘) - 𞤈𞤢𞤴𞤳𞤵𞤲𞤭𞤲 (𞥑𞥒𞥓𞥘-𞥑𞥒𞥓𞥙) - 𞤉𞤲𞥇𞤮𞥅 (𞥑𞥒𞥓𞥙-𞥑𞥒𞥔𞥐) - 𞤐𞤭𞤲𞤶𞤭 (𞥑𞥒𞥔𞥐-𞥑𞥒𞥔𞥓) - 𞤑𞤢𞤲𞤺𞤫𞤲 (𞥑𞥒𞥔𞥓-𞥑𞥒𞥔𞥗) - 𞤖𞤮𞥅𞤶𞤭 (𞥑𞥒𞥔𞥗-𞥑𞥒𞥔𞥙) - 𞤑𞤫𞤲𞤷𞤮𞥅 (𞥑𞥒𞥔𞥙-𞥑𞥒𞥕𞥖) - 𞤑𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥕𞥖-𞥑𞥒𞥕𞥗) - 𞤡𞤮𞥅𞤳𞤢 (𞥑𞥒𞥕𞥗-𞥑𞥒𞥕𞥙) - 𞤡𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥕𞥙-𞥑𞥒𞥖𞥐) - 𞤄𞤵𞤲𞥇𞤮𞥅 (𞥑𞥒𞥖𞥐-𞥑𞥒𞥖𞥑) - 𞤑𞤮𞥅𞤷𞤮𞥅 (𞥑𞥒𞥖𞥑-𞥑𞥒𞥖𞥔) - 𞤄𞤵𞤲𞥇𞤫𞤴 (𞥑𞥒𞥖𞥔-𞥑𞥒𞥗𞥕) - 𞤑𞤫𞤲𞤶𞤭 (𞥑𞥒𞥗𞥕-𞥑𞥒𞥗𞥘) - 𞤑𞤮𞥅𞤢𞤲 (𞥑𞥒𞥗𞥘-𞥑𞥒𞥘𞥘) - 𞤡𞤮𞥅 (𞥑𞥒𞥘𞥘-𞥑𞥒𞥙𞥓) - 𞤉𞤴𞤲𞤭𞤲 (𞥑𞥒𞥙𞥓-𞥑𞥒𞥙𞥙) - 𞤡𞤮𞥅𞤢𞤲 (𞥑𞥒𞥙𞥙-𞥑𞥓𞥐𞥒) - 𞤑𞤫𞤲𞤺𞤫𞤲 (𞥑𞥓𞥐𞥒-𞥑𞥓𞥐𞥓) - 𞤑𞤢𞤺𞤫𞤲 (𞥑𞥓𞥐𞥓-𞥑𞥓𞥐𞥖) - 𞤚𞤮𞤳𞤵𞤶𞤭 (𞥑𞥓𞥐𞥖-𞥑𞥓𞥐𞥘) - 𞤉𞤲𞤳𞤭𞤴𞤮𞥅 (𞥑𞥓𞥐𞥘-𞥑𞥓𞥑𞥑) - 𞤌𞥅𞤷𞤮𞥅 (𞥑𞥓𞥑𞥑-𞥑𞥓𞥑𞥒) - 𞤡𞤮𞥅𞤱𞤢 (𞥑𞥓𞥑𞥒-𞥑𞥓𞥑𞥗) - 𞤄𞤵𞤥𞤨𞤮𞥅 (𞥑𞥓𞥑𞥗-𞥑𞥓𞥑𞥙) - 𞤘𞤫𞤲𞤮𞥅 (𞥑𞥓𞥑𞥙-𞥑𞥓𞥒𞥑) - 𞤘𞤫𞤲𞤳𞤮𞥅 (𞥑𞥓𞥒𞥑-𞥑𞥓𞥒𞥔) - 𞤡𞤮𞥅𞤷𞤵𞥅 (𞥑𞥓𞥒𞥔-𞥑𞥓𞥒𞥖) - 𞤑𞤢𞤪𞤴𞤢𞤳𞤵 (𞥑𞥓𞥒𞥖-𞥑𞥓𞥒𞥙) - 𞤘𞤫𞤲𞤼𞤮𞤳𞤵 (𞥑𞥓𞥒𞥙-𞥑𞥓𞥓𞥑) - 𞤘𞤫𞤲𞤳𞤮𞥅 (𞥑𞥓𞥓𞥑-𞥑𞥓𞥓𞥔) - 𞤑𞤫𞤲𞤥𞤵 (𞥑𞥓𞥓𞥔-𞥑𞥓𞥓𞥖) - 𞤉𞤲𞤺𞤫𞤲 (𞥑𞥓𞥓𞥖-𞥑𞥓𞥔𞥐) - 𞤑𞤮𞥅𞤳𞤮𞤳𞤵 (𞥑𞥓𞥔𞥐-𞥑𞥓𞥔𞥖) - 𞤡𞤮𞥅𞤸𞤫𞤴 (𞥑𞥓𞥔𞥖-𞥑𞥓𞥗𞥐) - 𞤑𞤫𞤲𞤼𞤮𞤳𞤵 (𞥑𞥓𞥗𞥐-𞥑𞥓𞥗𞥒) - 𞤄𞤵𞤲𞤷𞤵𞥅 (𞥑𞥓𞥗𞥒-𞥑𞥓𞥗𞥕) - 𞤚𞤫𞤲𞤶𞤵 (𞥑𞥓𞥗𞥕-𞥑𞥓𞥗𞥙) - 𞤑𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥓𞥗𞥙-𞥑𞥓𞥘𞥑) - 𞤑𞤮𞥅𞤱𞤢 (𞥑𞥓𞥘𞥑-𞥑𞥓𞥘𞥔) - 𞤘𞤫𞤲𞤷𞤵𞥅 (𞥑𞥓𞥘𞥔-𞥑𞥓𞥙𞥒) - 𞤃𞤫𞤴𞤼𞤮𞤳𞤵 (𞥑𞥓𞥘𞥔-𞥑𞥓𞥘𞥗) - 𞤑𞤢𞤳𞤫𞤴 (𞥑𞥓𞥘𞥗-𞥑𞥓𞥘𞥙) - 𞤑𞤮𞥅 (𞥑𞥓𞥘𞥙-𞥑𞥓𞥙𞥐) - 𞤃𞤫𞤴𞤼𞤮𞤳𞤵 (𞥑𞥓𞥙𞥐-𞥑𞥓𞥙𞥔) - 𞤌𞥅𞤫𞤴 (𞥑𞥓𞥙𞥔-𞥑𞥔𞥒𞥘) - 𞤡𞤮𞥅𞤷𞤮𞥅 (𞥑𞥔𞥒𞥘-𞥑𞥔𞥒𞥙) - 𞤉𞤴𞤳𞤭𞤴𞤮𞥅 (𞥑𞥔𞥒𞥙-𞥑𞥔𞥔𞥑) - 𞤑𞤢𞤳𞤭𞤼𞤧𞤵 (𞥑𞥔𞥔𞥑-𞥑𞥔𞥔𞥔) - 𞤄𞤵𞤲𞥇𞤢𞤲 (𞥑𞥔𞥔𞥔-𞥑𞥔𞥔𞥙) - 𞤖𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥔𞥔𞥙-𞥑𞥔𞥕𞥒) - 𞤑𞤭𞤴𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥔𞥕𞥒-𞥑𞥔𞥕𞥕) - 𞤑𞤮𞥅𞥃𞤮𞥅 (𞥑𞥔𞥕𞥕-𞥑𞥔𞥕𞥗) - 𞤕𞤮𞥅𞤪𞤮𞤳𞤵 (𞥑𞥔𞥕𞥗-𞥑𞥔𞥖𞥐) - 𞤑𞤢𞤲𞥃𞤮𞥅 (𞥑𞥔𞥖𞥐-𞥑𞥔𞥖𞥖) - 𞤄𞤵𞤲𞥃𞤮𞥅 (𞥑𞥔𞥖𞥖-𞥑𞥔𞥖𞥗) - 𞤌𞥅𞤲𞤭𞤲 (𞥑𞥔𞥖𞥗-𞥑𞥔𞥖𞥙) - 𞤄𞤵𞤲𞤥𞤫𞤴 (𞥑𞥔𞥕𞥙-𞥑𞥔𞥘𞥗) - 𞤕𞤮𞥅𞤳𞤴𞤮𞥅 (𞥑𞥔𞥘𞥗-𞥑𞥔𞥘𞥙) - 𞤉𞤲𞤼𞤮𞤳𞤵 (𞥑𞥔𞥘𞥙-𞥑𞥔𞥙𞥒) - 𞤃𞤫𞤴𞤮𞥅 (𞥑𞥔𞥙𞥒-𞥑𞥕𞥐𞥑) - 𞤄𞤵𞤲𞤳𞤭 (𞥑𞥕𞥐𞥑-𞥑𞥕𞥐𞥔) - 𞤉𞤴𞥃𞤮𞥅 (𞥑𞥕𞥐𞥔-𞥑𞥕𞥒𞥑) - 𞤚𞤢𞤴𞤫𞤴 (𞥑𞥕𞥒𞥑-𞥑𞥕𞥒𞥘) - 𞤑𞤭𞤴𞤮𞥅𞤪𞤮𞤳𞤵 (𞥑𞥕𞥒𞥘-𞥑𞥕𞥓𞥒) - 𞤚𞤫𞤥𞤦𞤵𞤲 (𞥑𞥕𞥓𞥒-𞥑𞥕𞥕𞥕) - 𞤑𞤮𞥅𞤶𞤭 (𞥑𞥕𞥕𞥕-𞥑𞥕𞥕𞥘) - 𞤉𞤴𞤪𞤮𞤳𞤵 (𞥑𞥕𞥕𞥘-𞥑𞥕𞥗𞥐) - 𞤘𞤫𞤲𞤳𞤭 (𞥑𞥕𞥗𞥐-𞥑𞥕𞥗𞥓) - 𞤚𞤫𞤲𞥃𞤮𞥅 (𞥑𞥕𞥗𞥓-𞥑𞥕𞥙𞥒) - 𞤄𞤵𞤲𞤪𞤮𞤳𞤵 (𞥑𞥕𞥙𞥒-𞥑𞥕𞥙𞥖) - 𞤑𞤫𞤴𞤷𞤮𞥅 (𞥑𞥕𞥙𞥖-𞥑𞥖𞥑𞥕) - 𞤘𞤫𞤲𞥆𞤢 (𞥑𞥖𞥑𞥕-𞥑𞥖𞥒𞥔) - 𞤑𞤢𞤲𞥇𞤫𞤴 (𞥑𞥖𞥒𞥔-𞥑𞥖𞥔𞥔) - 𞤡𞤮𞥅𞤸𞤮 (𞥑𞥖𞥔𞥔-𞥑𞥖𞥔𞥘) - 𞤑𞤫𞤴𞤢𞤲 (𞥑𞥖𞥔𞥘-𞥑𞥖𞥕𞥒) - 𞤔𞤮𞥅 (𞥑𞥖𞥕𞥒-𞥑𞥖𞥕𞥕) - 𞤃𞤫𞤴𞤪𞤫𞤳𞤭 (𞥑𞥖𞥕𞥕-𞥑𞥖𞥕𞥘) - 𞤃𞤢𞤲𞤶𞤭 (𞥑𞥖𞥕𞥘-𞥑𞥖𞥖𞥑) - 𞤑𞤢𞤲𞤦𞤵𞤲 (𞥑𞥖𞥖𞥑-𞥑𞥖𞥗𞥓) - 𞤉𞤥𞤨𞤮𞥅 (𞥑𞥖𞥗𞥓-𞥑𞥖𞥘𞥑) - 𞤚𞤫𞤲𞥆𞤢 (𞥑𞥖𞥘𞥑-𞥑𞥖𞥘𞥔) - 𞤔𞤮𞥅𞤳𞤭𞤴𞤮𞥅 (𞥑𞥖𞥘𞥔-𞥑𞥖𞥘𞥘) - 𞤘𞤫𞤲𞤪𞤮𞤳𞤵 (𞥑𞥖𞥘𞥘-𞥑𞥗𞥐𞥔) - 𞤖𞤮𞥅𞤫𞤴 (𞥑𞥗𞥐𞥔-𞥑𞥗𞥑𞥑) - 𞤡𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥗𞥑𞥑-𞥑𞥗𞥑𞥖) - 𞤑𞤭𞤴𞤮𞥅𞤸𞤮𞥅 (𞥑𞥗𞥑𞥖-𞥑𞥗𞥓𞥖) - 𞤘𞤫𞤥𞤦𞤵𞤲 (𞥑𞥗𞥓𞥖-𞥑𞥗𞥔𞥑) - 𞤑𞤢𞤥𞤨𞤮𞥅 (𞥑𞥗𞥔𞥑-𞥑𞥗𞥔𞥔) - 𞤉𞤲𞤳𞤭𞤴𞤮𞥅 (𞥑𞥗𞥔𞥔-𞥑𞥗𞥔𞥘) - 𞤑𞤢𞤲𞥇𞥇𞥇𞥇𞤫𞤲 (𞥑𞥗𞥔𞥘-𞥑𞥗𞥕𞥑) - 𞤖𞤮𞥅𞤪𞤫𞤳𞤭 (𞥑𞥗𞥕𞥑-𞥑𞥗𞥖𞥔) - 𞤃𞤫𞤴𞤱𞤢 (𞥑𞥗𞥖𞥔-𞥑𞥗𞥗𞥒) - 𞤀𞤲𞥇𞤫𞤴 (𞥑𞥗𞥗𞥒-𞥑𞥗𞥘𞥑) - 𞤚𞤫𞤲𞤥𞤫𞤴 (𞥑𞥗𞥘𞥑-𞥑𞥗𞥘𞥙) - 𞤑𞤢𞤲𞤧𞤫𞤴 (𞥑𞥗𞥘𞥙-𞥑𞥘𞥐𞥑) - 𞤑𞤭𞤴𞤮𞥅𞤱𞤢 (𞥑𞥘𞥐𞥑-𞥑𞥘𞥐𞥔) - 𞤄𞤵𞤲𞤳𞤢 (𞥑𞥘𞥐𞥔-𞥑𞥘𞥑𞥘) - 𞤄𞤵𞤲𞤧𞤫𞤴 (𞥑𞥘𞥑𞥘-𞥑𞥘𞥓𞥐) - 𞤚𞤫𞤥𞤨𞤮𞥅 (𞥑𞥘𞥓𞥐-𞥑𞥘𞥔𞥔) - 𞤑𞤮𞥅𞤳𞤢 (𞥑𞥘𞥔𞥔-𞥑𞥘𞥔𞥘) - 𞤑𞤢𞤫𞤴 (𞥑𞥘𞥔𞥘-𞥑𞥘𞥕𞥔) - 𞤀𞤲𞤧𞤫𞤴 (𞥑𞥘𞥕𞥔-𞥑𞥘𞥖𞥐) - 𞤃𞤫𞤲𞥇𞤢𞤲 (𞥑𞥘𞥖𞥐-𞥑𞥘𞥖𞥑) - 𞤄𞤵𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥘𞥖𞥑-𞥑𞥘𞥖𞥔) - 𞤘𞤫𞤲𞤶𞤭 (𞥑𞥘𞥖𞥔-𞥑𞥘𞥖𞥕) - 𞤑𞤫𞤴𞤮𞥅 (𞥑𞥘𞥖𞥕-𞥑𞥘𞥖𞥘) 𞤃𞤫𞤴𞤶𞤭 𞤚𞤢𞤴𞥃𞤮𞥅 𞤡𞤮𞥅𞤱𞤢 @@ -2365,237 +2137,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤈𞤫𞤴𞤱𞤢 - 𞤚𞤢𞤴𞤳𞤢 (𞥖𞥔𞥕-𞥖𞥕𞥐) - 𞤖𞤢𞤳𞤵𞤧𞤭 (𞥖𞥕𞥐-𞥖𞥗𞥑) - 𞤖𞤢𞤳𞤵𞤸𞤮𞥅 (𞥖𞥗𞥒-𞥖𞥘𞥖) - 𞤡𞤵𞤷𞤮𞥅 (𞥖𞥘𞥖-𞥗𞥐𞥑) - 𞤚𞤢𞤴𞤸𞤮𞥅 (𞥗𞥐𞥑-𞥗𞥐𞥔) - 𞤑𞤫𞤴𞤵𞤲 (𞥗𞥐𞥔-𞥗𞥐𞥘) - 𞤏𞤢𞤣𞤮𞥅 (𞥗𞥐𞥘-𞥗𞥑𞥕) - 𞤈𞤫𞤴𞤳𞤭 (𞥗𞥑𞥕-𞥗𞥑𞥗) - 𞤒𞤮𞥅𞤪𞤮𞥅 (𞥗𞥑𞥗-𞥗𞥒𞥔) - 𞤔𞤭𞤲𞤳𞤭 (𞥗𞥒𞥔-𞥗𞥒𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 (𞥗𞥒𞥙-𞥗𞥔𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤳𞤢𞤥𞤨𞤮𞥅 (𞥗𞥔𞥙-𞥗𞥔𞥙) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤧𞤮𞥅𞤸𞤮𞥅 (𞥗𞥔𞥙-𞥗𞥕𞥗) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤸𞤮𞥅𞤶𞤭 (𞥗𞥕𞥗-𞥗𞥖𞥕) - 𞤚𞤫𞤥𞤨𞤭𞤴𞤮𞥅 𞤶𞤭𞤲𞤺𞤮 (𞥗𞥖𞥕-𞥗𞥖𞥗) - 𞤔𞤭𞤲𞤺𞤮-𞤳𞤫𞤴𞤵𞥅𞤲 (𞥗𞥖𞥗-𞥗𞥗𞥐) - 𞤖𞤮𞥅𞤳𞤭 (𞥗𞥗𞥐-𞥗𞥘𞥐) - 𞤚𞤫𞤲-𞤮𞥅 (𞥗𞥘𞥑-𞥗𞥘𞥒) - 𞤉𞤲𞤪𞤢𞤴𞤳𞤵 (𞥗𞥘𞥒-𞥘𞥐𞥖) - 𞤁𞤢𞤴𞤣𞤮𞥅 (𞥘𞥐𞥖-𞥘𞥑𞥐) - 𞤑𞤮𞥅𞤲𞤭𞤲 (𞥘𞥑𞥐-𞥘𞥒𞥔) - 𞤚𞤫𞤲𞤧𞤮𞥅 (𞥘𞥒𞥔-𞥘𞥓𞥔) - 𞤔𞤮𞥅𞤱𞤢 (𞥘𞥓𞥔-𞥘𞥔𞥘) - 𞤑𞤢𞤶𞤮𞥅 (𞥘𞥔𞥘-𞥘𞥕𞥑) - 𞤐𞤭𞤲𞤶𞤵 (𞥘𞥕𞥑-𞥘𞥕𞥔) - 𞤅𞤢𞤴𞤳𞤮𞥅 (𞥘𞥕𞥔-𞥘𞥕𞥗) - 𞤚𞤫𞤲-𞤢𞤲 (𞥘𞥕𞥗-𞥘𞥕𞥙) - 𞤔𞤮𞥅𞤺𞤢𞤲 (𞥘𞥕𞥙-𞥘𞥗𞥗) - 𞤘𞤢𞤲𞤶𞤭𞤴𞤮𞥅 (𞥘𞥗𞥗-𞥘𞥘𞥕) - 𞤐𞤭𞤲𞥆𞤢 (𞥘𞥘𞥕-𞥘𞥘𞥙) - 𞤑𞤢𞤥𞤨𞤭𞤴𞤮𞥅 (𞥘𞥘𞥙-𞥘𞥙𞥘) - 𞤡𞤮𞥅𞤼𞤢𞤴 (𞥘𞥙𞥘-𞥙𞥐𞥑) - 𞤉𞤲𞤺𞤭𞥅 (𞥙𞥐𞥑-𞥙𞥒𞥓) - 𞤉𞤲𞥃𞤮𞥅 (𞥙𞥒𞥓-𞥙𞥓𞥑) - 𞤔𞤮𞥅𞤸𞤫𞤴 (𞥙𞥓𞥑-𞥙𞥓𞥘) - 𞤚𞤫𞤲𞤺𞤭𞤴𞤮𞥅 (𞥙𞥓𞥘-𞥙𞥔𞥗) - 𞤚𞤫𞤲𞤪𞤢𞤴𞤳𞤵 (𞥙𞥔𞥗-𞥙𞥕𞥗) - 𞤚𞤫𞤲𞤼𞤮𞤳𞤵 (𞥙𞥕𞥗-𞥙𞥖𞥑) - 𞤌𞥅𞤱𞤢 (𞥙𞥖𞥑-𞥙𞥖𞥔) - 𞤑𞤮𞥅𞤸𞤮𞥅 (𞥙𞥖𞥔-𞥙𞥖𞥘) - 𞤀𞤲𞥆𞤢 (𞥙𞥖𞥘-𞥙𞥗𞥐) - 𞤚𞤫𞤲𞤪𞤮𞤳𞤵 (𞥙𞥗𞥐-𞥙𞥗𞥓) - 𞤚𞤫𞤲𞥋𞤫𞤲 (𞥙𞥗𞥓-𞥙𞥗𞥖) - 𞤔𞤮𞥅𞤺𞤫𞤲 (𞥙𞥗𞥖-𞥙𞥗𞥘) - 𞤚𞤫𞤲𞤺𞤫𞤲 (𞥙𞥗𞥘-𞥙𞥘𞥓) - 𞤉𞤴𞤳𞤢𞤲 (𞥙𞥘𞥓-𞥙𞥘𞥕) - 𞤑𞤢𞤲𞥆𞤢 (𞥙𞥘𞥕-𞥙𞥘𞥗) - 𞤉𞤴𞥇𞤫𞤲 (𞥙𞥘𞥗-𞥙𞥘𞥙) - 𞤉𞤴𞤧𞤮 (𞥙𞥘𞥙-𞥙𞥙𞥐) - 𞤡𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥙𞥙𞥐-𞥙𞥙𞥕) - 𞤕𞤮𞥅𞤼𞤮𞤳𞤵 (𞥙𞥙𞥕-𞥙𞥙𞥙) - 𞤕𞤮𞥅𞤸𞤮𞥅 (𞥙𞥙𞥙-𞥑𞥐𞥐𞥔) - 𞤑𞤢𞤲𞤳𞤮𞥅 (𞥑𞥐𞥐𞥔-𞥑𞥐𞥑𞥒) - 𞤕𞤮𞥅𞤱𞤢 (𞥑𞥐𞥑𞥒-𞥑𞥐𞥑𞥗) - 𞤑𞤢𞤲𞥆𞤭𞤲 (𞥑𞥐𞥑𞥗-𞥑𞥐𞥒𞥑) - 𞤔𞤭𞤴𞤢𞤲 (𞥑𞥐𞥒𞥑-𞥑𞥐𞥒𞥔) - 𞤃𞤢𞤲𞤶𞤵 (𞥑𞥐𞥒𞥔-𞥑𞥐𞥒𞥘) - 𞤕𞤮𞥅𞤺𞤫𞤲 (𞥑𞥐𞥒𞥘-𞥑𞥐𞥓𞥗) - 𞤕𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥓𞥗-𞥑𞥐𞥔𞥐) - 𞤕𞤮𞥅𞤳𞤴𞤵𞥅 (𞥑𞥐𞥔𞥐-𞥑𞥐𞥔𞥔) - 𞤑𞤢𞤲𞤼𞤮𞤳𞤵 (𞥑𞥐𞥔𞥔-𞥑𞥐𞥔𞥖) - 𞤉𞤴𞥃𞤮𞥅 (𞥑𞥐𞥔𞥖-𞥑𞥐𞥕𞥓) - 𞤚𞤫𞤲𞤺𞤭 (𞥑𞥐𞥕𞥓-𞥑𞥐𞥕𞥘) - 𞤑𞤮𞥅𞤸𞤫𞤴 (𞥑𞥐𞥕𞥘-𞥑𞥐𞥖𞥕) - 𞤔𞤭𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥖𞥕-𞥑𞥐𞥖𞥙) - 𞤉𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥐𞥖𞥙-𞥑𞥐𞥗𞥔) - 𞤡𞤮𞥅𞤸𞤮 (𞥑𞥐𞥗𞥔-𞥑𞥐𞥗𞥗) - 𞤡𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥐𞥗𞥗-𞥑𞥐𞥘𞥑) - 𞤉𞤴𞤸𞤮𞥅 (𞥑𞥐𞥘𞥑-𞥑𞥐𞥘𞥔) - 𞤌𞥅𞤼𞤮𞤳𞤵 (𞥑𞥐𞥘𞥔-𞥑𞥐𞥘𞥗) - 𞤑𞤢𞤲𞤶𞤭 (𞥑𞥐𞥘𞥗-𞥑𞥐𞥙𞥔) - 𞤑𞤢𞤸𞤮𞥅 (𞥑𞥐𞥙𞥔-𞥑𞥐𞥙𞥖) - 𞤉𞤴𞤷𞤮𞥅 (𞥑𞥐𞥙𞥖-𞥑𞥐𞥙𞥗) - 𞤔𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥐𞥙𞥗-𞥑𞥐𞥙𞥙) - 𞤑𞤮𞥅𞤱𞤢 (𞥑𞥐𞥙𞥙-𞥑𞥑𞥐𞥔) - 𞤕𞤮𞥅𞤶𞤭 (𞥑𞥑𞥐𞥔-𞥑𞥑𞥐𞥖) - 𞤑𞤢𞥃𞤮𞥅 (𞥑𞥑𞥐𞥖-𞥑𞥑𞥐𞥘) - 𞤚𞤫𞤲𞥆𞤭𞤲 (𞥑𞥑𞥐𞥘-𞥑𞥑𞥑𞥐) - 𞤚𞤫𞤲-𞤫𞤴 (𞥑𞥑𞥑𞥐-𞥑𞥑𞥑𞥓) - 𞤉𞤴𞤳𞤭𞤴𞤵𞥅 (𞥑𞥑𞥑𞥓-𞥑𞥑𞥑𞥘) - 𞤘𞤫𞤲𞥇𞤴𞤭 (𞥑𞥑𞥑𞥘-𞥑𞥑𞥒𞥐) - (𞤖𞤮𞥅𞤢𞤲 (𞥑𞥑𞥒𞥐-𞥑𞥑𞥒𞥔 - 𞤚𞤫𞤲𞤶𞤭 (𞥑𞥑𞥒𞥔-𞥑𞥑𞥒𞥖) - 𞤁𞤢𞤴𞤶𞤭 (𞥑𞥑𞥒𞥖-𞥑𞥑𞥓𞥑) - 𞤚𞤫𞤲𞥃𞤮𞥅 (𞥑𞥑𞥓𞥑-𞥑𞥑𞥓𞥒) - 𞤕𞤮𞥅𞥃𞤮𞥅 (𞥑𞥑𞥓𞥒-𞥑𞥑𞥓𞥕) - 𞤖𞤮𞥅𞤫𞤲 (𞥑𞥑𞥓𞥕-𞥑𞥑𞥔𞥑) - 𞤉𞤴𞤶𞤭 (𞥑𞥑𞥔𞥑-𞥑𞥑𞥔𞥒) - 𞤑𞤮𞥅𞤶𞤭 (𞥑𞥑𞥔𞥒-𞥑𞥑𞥔𞥔) - 𞤚𞤫𞤲𞥇𞤴𞤮𞥅 (𞥑𞥑𞥔𞥔-𞥑𞥑𞥔𞥕) - 𞤑𞤭𞤴𞤵𞥅𞤢𞤲 (𞥑𞥑𞥔𞥕-𞥑𞥑𞥕𞥑) - 𞤐𞤭𞤲𞤨𞤫𞤴 (𞥑𞥑𞥕𞥑-𞥑𞥑𞥕𞥔) - 𞤑𞤭𞤴𞤵𞥅𞤶𞤵 (𞥑𞥑𞥕𞥔-𞥑𞥑𞥕𞥖) - 𞤖𞤮𞥅𞤺𞤫𞤲 (𞥑𞥑𞥕𞥖-𞥑𞥑𞥕𞥙) - 𞤖𞤫𞤴𞤶𞤭 (𞥑𞥑𞥕𞥙-𞥑𞥑𞥖𞥐) - 𞤉𞤴𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥑𞥖𞥐-𞥑𞥑𞥖𞥑) - 𞤌𞥅𞤸𞤮 (𞥑𞥑𞥖𞥑-𞥑𞥑𞥖𞥓) - 𞤕𞤮𞥅𞤳𞤢𞤲 (𞥑𞥑𞥖𞥓-𞥑𞥑𞥖𞥕) - 𞤉𞤴𞤥𞤢𞤲 (𞥑𞥑𞥖𞥕-𞥑𞥑𞥖𞥖) - 𞤐𞤭𞤲𞥇𞤢𞤲 (𞥑𞥑𞥖𞥖-𞥑𞥑𞥖𞥙) - 𞤑𞤢𞤮𞥅 (𞥑𞥑𞥖𞥙-𞥑𞥑𞥗𞥑) - 𞤡𞤮𞥅𞤢𞤲 (𞥑𞥑𞥗𞥑-𞥑𞥑𞥗𞥕) - 𞤀𞤲𞤺𞤫𞤲 (𞥑𞥑𞥗𞥕-𞥑𞥑𞥗𞥗) - 𞤔𞤭𞥃𞤮𞥅 (𞥑𞥑𞥗𞥗-𞥑𞥑𞥘𞥑) - 𞤒𞤮𞥅𞤱𞤢 (𞥑𞥑𞥘𞥑-𞥑𞥑𞥘𞥒) - 𞤔𞤵𞤫𞤴 (𞥑𞥑𞥘𞥒-𞥑𞥑𞥘𞥔) - 𞤘𞤫𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥑𞥘𞥔-𞥑𞥑𞥘𞥕) - 𞤄𞤵𞤲𞤶𞤭 (𞥑𞥑𞥘𞥕-𞥑𞥑𞥙𞥐) - 𞤑𞤫𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥑𞥙𞥐-𞥑𞥑𞥙𞥙) - 𞤡𞤮𞥅𞤶𞤭 (𞥑𞥑𞥙𞥙-𞥑𞥒𞥐𞥑) - 𞤑𞤫𞤲𞥆𞤭𞤲 (𞥑𞥒𞥐𞥑-𞥑𞥒𞥐𞥔) - 𞤘𞤫𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥒𞥐𞥔-𞥑𞥒𞥐𞥖) - 𞤑𞤫𞤲𞥇𞤫𞤴 (𞥑𞥒𞥐𞥖-𞥑𞥒𞥐𞥗) - 𞤔𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥐𞥗-𞥑𞥒𞥑𞥑) - 𞤑𞤫𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥒𞥑𞥑-𞥑𞥒𞥑𞥓) - 𞤑𞤫𞤥𞤨𞤮𞥅 (𞥑𞥒𞥑𞥓-𞥑𞥒𞥑𞥙) - 𞤔𞤮𞥅𞤳𞤭𞤴𞤵𞥅 (𞥑𞥒𞥑𞥙-𞥑𞥒𞥒𞥒) - 𞤔𞤮𞥅 (𞥑𞥒𞥒𞥒-𞥑𞥒𞥒𞥔) - 𞤘𞤫𞤲𞥆𞤭𞤲 (𞥑𞥒𞥒𞥔-𞥑𞥒𞥒𞥕) - 𞤑𞤢𞤪𞤮𞤳𞤵 (𞥑𞥒𞥒𞥕-𞥑𞥒𞥒𞥗) - 𞤀𞤲𞤼𞤫𞤴 (𞥑𞥒𞥒𞥗-𞥑𞥒𞥒𞥙) - 𞤑𞤢𞤲𞤳𞤭 (𞥑𞥒𞥒𞥙-𞥑𞥒𞥓𞥒) - 𞤔𞤮𞥅𞤫𞤴 (𞥑𞥒𞥓𞥒-𞥑𞥒𞥓𞥓) - 𞤚𞤫𞤥𞤨𞤵𞤳𞤵 (𞥑𞥒𞥓𞥓-𞥑𞥒𞥓𞥔) - 𞤄𞤵𞤲𞤪𞤭𞤴𞤢𞤳𞤵 (𞥑𞥒𞥓𞥔-𞥑𞥒𞥓𞥕) - 𞤑𞤢𞤼𞤫𞤴 (𞥑𞥒𞥓𞥕-𞥑𞥒𞥓𞥘) - 𞤈𞤢𞤴𞤳𞤵𞤲𞤭𞤲 (𞥑𞥒𞥓𞥘-𞥑𞥒𞥓𞥙) - 𞤉𞤲𞥇𞤮𞥅 (𞥑𞥒𞥓𞥙-𞥑𞥒𞥔𞥐) - 𞤐𞤭𞤲𞤶𞤭 (𞥑𞥒𞥔𞥐-𞥑𞥒𞥔𞥓) - 𞤑𞤢𞤲𞤺𞤫𞤲 (𞥑𞥒𞥔𞥓-𞥑𞥒𞥔𞥗) - 𞤖𞤮𞥅𞤶𞤭 (𞥑𞥒𞥔𞥗-𞥑𞥒𞥔𞥙) - 𞤑𞤫𞤲𞤷𞤮𞥅 (𞥑𞥒𞥔𞥙-𞥑𞥒𞥕𞥖) - 𞤑𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥕𞥖-𞥑𞥒𞥕𞥗) - 𞤡𞤮𞥅𞤳𞤢 (𞥑𞥒𞥕𞥗-𞥑𞥒𞥕𞥙) - 𞤡𞤮𞥅𞤺𞤫𞤲 (𞥑𞥒𞥕𞥙-𞥑𞥒𞥖𞥐) - 𞤄𞤵𞤲𞥇𞤮𞥅 (𞥑𞥒𞥖𞥐-𞥑𞥒𞥖𞥑) - 𞤑𞤮𞥅𞤷𞤮𞥅 (𞥑𞥒𞥖𞥑-𞥑𞥒𞥖𞥔) - 𞤄𞤵𞤲𞥇𞤫𞤴 (𞥑𞥒𞥖𞥔-𞥑𞥒𞥗𞥕) - 𞤑𞤫𞤲𞤶𞤭 (𞥑𞥒𞥗𞥕-𞥑𞥒𞥗𞥘) - 𞤑𞤮𞥅𞤢𞤲 (𞥑𞥒𞥗𞥘-𞥑𞥒𞥘𞥘) - 𞤡𞤮𞥅 (𞥑𞥒𞥘𞥘-𞥑𞥒𞥙𞥓) - 𞤉𞤴𞤲𞤭𞤲 (𞥑𞥒𞥙𞥓-𞥑𞥒𞥙𞥙) - 𞤡𞤮𞥅𞤢𞤲 (𞥑𞥒𞥙𞥙-𞥑𞥓𞥐𞥒) - 𞤑𞤫𞤲𞤺𞤫𞤲 (𞥑𞥓𞥐𞥒-𞥑𞥓𞥐𞥓) - 𞤑𞤢𞤺𞤫𞤲 (𞥑𞥓𞥐𞥓-𞥑𞥓𞥐𞥖) - 𞤚𞤮𞤳𞤵𞤶𞤭 (𞥑𞥓𞥐𞥖-𞥑𞥓𞥐𞥘) - 𞤉𞤲𞤳𞤭𞤴𞤮𞥅 (𞥑𞥓𞥐𞥘-𞥑𞥓𞥑𞥑) - 𞤌𞥅𞤷𞤮𞥅 (𞥑𞥓𞥑𞥑-𞥑𞥓𞥑𞥒) - 𞤡𞤮𞥅𞤱𞤢 (𞥑𞥓𞥑𞥒-𞥑𞥓𞥑𞥗) - 𞤄𞤵𞤥𞤨𞤮𞥅 (𞥑𞥓𞥑𞥗-𞥑𞥓𞥑𞥙) - 𞤘𞤫𞤲𞤮𞥅 (𞥑𞥓𞥑𞥙-𞥑𞥓𞥒𞥑) - 𞤘𞤫𞤲𞤳𞤮𞥅 (𞥑𞥓𞥒𞥑-𞥑𞥓𞥒𞥔) - 𞤡𞤮𞥅𞤷𞤵𞥅 (𞥑𞥓𞥒𞥔-𞥑𞥓𞥒𞥖) - 𞤑𞤢𞤪𞤴𞤢𞤳𞤵 (𞥑𞥓𞥒𞥖-𞥑𞥓𞥒𞥙) - 𞤘𞤫𞤲𞤼𞤮𞤳𞤵 (𞥑𞥓𞥒𞥙-𞥑𞥓𞥓𞥑) - 𞤘𞤫𞤲𞤳𞤮𞥅 (𞥑𞥓𞥓𞥑-𞥑𞥓𞥓𞥔) - 𞤑𞤫𞤲𞤥𞤵 (𞥑𞥓𞥓𞥔-𞥑𞥓𞥓𞥖) - 𞤉𞤲𞤺𞤫𞤲 (𞥑𞥓𞥓𞥖-𞥑𞥓𞥔𞥐) - 𞤑𞤮𞥅𞤳𞤮𞤳𞤵 (𞥑𞥓𞥔𞥐-𞥑𞥓𞥔𞥖) - 𞤡𞤮𞥅𞤸𞤫𞤴 (𞥑𞥓𞥔𞥖-𞥑𞥓𞥗𞥐) - 𞤑𞤫𞤲𞤼𞤮𞤳𞤵 (𞥑𞥓𞥗𞥐-𞥑𞥓𞥗𞥒) - 𞤄𞤵𞤲𞤷𞤵𞥅 (𞥑𞥓𞥗𞥒-𞥑𞥓𞥗𞥕) - 𞤚𞤫𞤲𞤶𞤵 (𞥑𞥓𞥗𞥕-𞥑𞥓𞥗𞥙) - 𞤑𞤮𞥅𞤪𞤴𞤢𞤳𞤵 (𞥑𞥓𞥗𞥙-𞥑𞥓𞥘𞥑) - 𞤑𞤮𞥅𞤱𞤢 (𞥑𞥓𞥘𞥑-𞥑𞥓𞥘𞥔) - 𞤘𞤫𞤲𞤷𞤵𞥅 (𞥑𞥓𞥘𞥔-𞥑𞥓𞥙𞥒) - 𞤃𞤫𞤴𞤼𞤮𞤳𞤵 (𞥑𞥓𞥘𞥔-𞥑𞥓𞥘𞥗) - 𞤑𞤢𞤳𞤫𞤴 (𞥑𞥓𞥘𞥗-𞥑𞥓𞥘𞥙) - 𞤑𞤮𞥅 (𞥑𞥓𞥘𞥙-𞥑𞥓𞥙𞥐) - 𞤃𞤫𞤴𞤼𞤮𞤳𞤵 (𞥑𞥓𞥙𞥐-𞥑𞥓𞥙𞥔) - 𞤌𞥅𞤫𞤴 (𞥑𞥓𞥙𞥔-𞥑𞥔𞥒𞥘) - 𞤡𞤮𞥅𞤷𞤮𞥅 (𞥑𞥔𞥒𞥘-𞥑𞥔𞥒𞥙) - 𞤉𞤴𞤳𞤭𞤴𞤮𞥅 (𞥑𞥔𞥒𞥙-𞥑𞥔𞥔𞥑) - 𞤑𞤢𞤳𞤭𞤼𞤧𞤵 (𞥑𞥔𞥔𞥑-𞥑𞥔𞥔𞥔) - 𞤄𞤵𞤲𞥇𞤢𞤲 (𞥑𞥔𞥔𞥔-𞥑𞥔𞥔𞥙) - 𞤖𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥔𞥔𞥙-𞥑𞥔𞥕𞥒) - 𞤑𞤭𞤴𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥔𞥕𞥒-𞥑𞥔𞥕𞥕) - 𞤑𞤮𞥅𞥃𞤮𞥅 (𞥑𞥔𞥕𞥕-𞥑𞥔𞥕𞥗) - 𞤕𞤮𞥅𞤪𞤮𞤳𞤵 (𞥑𞥔𞥕𞥗-𞥑𞥔𞥖𞥐) - 𞤑𞤢𞤲𞥃𞤮𞥅 (𞥑𞥔𞥖𞥐-𞥑𞥔𞥖𞥖) - 𞤄𞤵𞤲𞥃𞤮𞥅 (𞥑𞥔𞥖𞥖-𞥑𞥔𞥖𞥗) - 𞤌𞥅𞤲𞤭𞤲 (𞥑𞥔𞥖𞥗-𞥑𞥔𞥖𞥙) - 𞤄𞤵𞤲𞤥𞤫𞤴 (𞥑𞥔𞥕𞥙-𞥑𞥔𞥘𞥗) - 𞤕𞤮𞥅𞤳𞤴𞤮𞥅 (𞥑𞥔𞥘𞥗-𞥑𞥔𞥘𞥙) - 𞤉𞤲𞤼𞤮𞤳𞤵 (𞥑𞥔𞥘𞥙-𞥑𞥔𞥙𞥒) - 𞤃𞤫𞤴𞤮𞥅 (𞥑𞥔𞥙𞥒-𞥑𞥕𞥐𞥑) - 𞤄𞤵𞤲𞤳𞤭 (𞥑𞥕𞥐𞥑-𞥑𞥕𞥐𞥔) - 𞤉𞤴𞥃𞤮𞥅 (𞥑𞥕𞥐𞥔-𞥑𞥕𞥒𞥑) - 𞤚𞤢𞤴𞤫𞤴 (𞥑𞥕𞥒𞥑-𞥑𞥕𞥒𞥘) - 𞤑𞤭𞤴𞤮𞥅𞤪𞤮𞤳𞤵 (𞥑𞥕𞥒𞥘-𞥑𞥕𞥓𞥒) - 𞤚𞤫𞤥𞤦𞤵𞤲 (𞥑𞥕𞥓𞥒-𞥑𞥕𞥕𞥕) - 𞤑𞤮𞥅𞤶𞤭 (𞥑𞥕𞥕𞥕-𞥑𞥕𞥕𞥘) - 𞤉𞤴𞤪𞤮𞤳𞤵 (𞥑𞥕𞥕𞥘-𞥑𞥕𞥗𞥐) - 𞤘𞤫𞤲𞤳𞤭 (𞥑𞥕𞥗𞥐-𞥑𞥕𞥗𞥓) - 𞤚𞤫𞤲𞥃𞤮𞥅 (𞥑𞥕𞥗𞥓-𞥑𞥕𞥙𞥒) - 𞤄𞤵𞤲𞤪𞤮𞤳𞤵 (𞥑𞥕𞥙𞥒-𞥑𞥕𞥙𞥖) - 𞤑𞤫𞤴𞤷𞤮𞥅 (𞥑𞥕𞥙𞥖-𞥑𞥖𞥑𞥕) - 𞤘𞤫𞤲𞥆𞤢 (𞥑𞥖𞥑𞥕-𞥑𞥖𞥒𞥔) - 𞤑𞤢𞤲𞥇𞤫𞤴 (𞥑𞥖𞥒𞥔-𞥑𞥖𞥔𞥔) - 𞤡𞤮𞥅𞤸𞤮 (𞥑𞥖𞥔𞥔-𞥑𞥖𞥔𞥘) - 𞤑𞤫𞤴𞤢𞤲 (𞥑𞥖𞥔𞥘-𞥑𞥖𞥕𞥒) - 𞤔𞤮𞥅 (𞥑𞥖𞥕𞥒-𞥑𞥖𞥕𞥕) - 𞤃𞤫𞤴𞤪𞤫𞤳𞤭 (𞥑𞥖𞥕𞥕-𞥑𞥖𞥕𞥘) - 𞤃𞤢𞤲𞤶𞤭 (𞥑𞥖𞥕𞥘-𞥑𞥖𞥖𞥑) - 𞤑𞤢𞤲𞤦𞤵𞤲 (𞥑𞥖𞥖𞥑-𞥑𞥖𞥗𞥓) - 𞤉𞤥𞤨𞤮𞥅 (𞥑𞥖𞥗𞥓-𞥑𞥖𞥘𞥑) - 𞤚𞤫𞤲𞥆𞤢 (𞥑𞥖𞥘𞥑-𞥑𞥖𞥘𞥔) - 𞤔𞤮𞥅𞤳𞤭𞤴𞤮𞥅 (𞥑𞥖𞥘𞥔-𞥑𞥖𞥘𞥘) - 𞤘𞤫𞤲𞤪𞤮𞤳𞤵 (𞥑𞥖𞥘𞥘-𞥑𞥗𞥐𞥔) - 𞤖𞤮𞥅𞤫𞤴 (𞥑𞥗𞥐𞥔-𞥑𞥗𞥑𞥑) - 𞤡𞤮𞥅𞤼𞤮𞤳𞤵 (𞥑𞥗𞥑𞥑-𞥑𞥗𞥑𞥖) - 𞤑𞤭𞤴𞤮𞥅𞤸𞤮𞥅 (𞥑𞥗𞥑𞥖-𞥑𞥗𞥓𞥖) - 𞤘𞤫𞤥𞤦𞤵𞤲 (𞥑𞥗𞥓𞥖-𞥑𞥗𞥔𞥑) - 𞤑𞤢𞤥𞤨𞤮𞥅 (𞥑𞥗𞥔𞥑-𞥑𞥗𞥔𞥔) - 𞤉𞤲𞤳𞤭𞤴𞤮𞥅 (𞥑𞥗𞥔𞥔-𞥑𞥗𞥔𞥘) - 𞤑𞤢𞤲𞥇𞥇𞥇𞥇𞤫𞤲 (𞥑𞥗𞥔𞥘-𞥑𞥗𞥕𞥑) - 𞤖𞤮𞥅𞤪𞤫𞤳𞤭 (𞥑𞥗𞥕𞥑-𞥑𞥗𞥖𞥔) - 𞤃𞤫𞤴𞤱𞤢 (𞥑𞥗𞥖𞥔-𞥑𞥗𞥗𞥒) - 𞤀𞤲𞥇𞤫𞤴 (𞥑𞥗𞥗𞥒-𞥑𞥗𞥘𞥑) - 𞤚𞤫𞤲𞤥𞤫𞤴 (𞥑𞥗𞥘𞥑-𞥑𞥗𞥘𞥙) - 𞤑𞤢𞤲𞤧𞤫𞤴 (𞥑𞥗𞥘𞥙-𞥑𞥘𞥐𞥑) - 𞤑𞤭𞤴𞤮𞥅𞤱𞤢 (𞥑𞥘𞥐𞥑-𞥑𞥘𞥐𞥔) - 𞤄𞤵𞤲𞤳𞤢 (𞥑𞥘𞥐𞥔-𞥑𞥘𞥑𞥘) - 𞤄𞤵𞤲𞤧𞤫𞤴 (𞥑𞥘𞥑𞥘-𞥑𞥘𞥓𞥐) - 𞤚𞤫𞤥𞤨𞤮𞥅 (𞥑𞥘𞥓𞥐-𞥑𞥘𞥔𞥔) - 𞤑𞤮𞥅𞤳𞤢 (𞥑𞥘𞥔𞥔-𞥑𞥘𞥔𞥘) - 𞤑𞤢𞤫𞤴 (𞥑𞥘𞥔𞥘-𞥑𞥘𞥕𞥔) - 𞤀𞤲𞤧𞤫𞤴 (𞥑𞥘𞥕𞥔-𞥑𞥘𞥖𞥐) - 𞤃𞤫𞤲𞥇𞤢𞤲 (𞥑𞥘𞥖𞥐-𞥑𞥘𞥖𞥑) - 𞤄𞤵𞤲𞤳𞤭𞤴𞤵𞥅 (𞥑𞥘𞥖𞥑-𞥑𞥘𞥖𞥔) - 𞤘𞤫𞤲𞤶𞤭 (𞥑𞥘𞥖𞥔-𞥑𞥘𞥖𞥕) 𞤃 𞤚 𞤅 @@ -3254,7 +2795,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤖𞤘{0} - 𞤑𞤖𞤘 {0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 {0} 𞤐𞤶𞤢𞤥𞤲𞤣𞤭 𞤕𞤫𞥅𞤯𞤵 {0} 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 @@ -3732,9 +3272,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤂𞤭𞥅𞤦𞤫𞤪𞤾𞤭𞥅𞤤 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞥆𞤵 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 - 𞤂𞤮𞤲𞤣𞤮𞤲 @@ -3825,9 +3362,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤔𞤢𞤴𞤢𞤨𞤵𞤪𞤢 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤤𞤢𞤲𞤣𞤭𞤲𞤳𞤮𞥅𞤪𞤫 - 𞤁𞤵𞤦𞤵𞤤𞤫𞤲 @@ -4559,13 +4093,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤤𞤢𞤧𞤳𞤢𞥄 𞤲𞤣𞤫𞤲 - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤤𞤥𞤢𞤼𞤭 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤤𞤥𞤢𞤼𞤭 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤤𞤥𞤢𞤼𞤭 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤥𞤢𞥁𞤮𞥅𞤲 @@ -4615,20 +4142,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞥄𞤨𞤭𞤴𞤢 - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤳𞤼𞤢𞤱 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤳𞤼𞤢𞤱 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤳𞤼𞤢𞤱 - - - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞤳𞤼𞤮𞤦𞤭𞥅 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤀𞤳𞤼𞤮𞤦𞤭𞥅 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤀𞤳𞤼𞤮𞤦𞤭𞥅 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤀𞥄𞤪𞤢𞤦𞤭𞤴𞤢 @@ -4730,6 +4243,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤄𞤪𞤢𞤧𞤭𞤤𞤭𞤴𞤢𞥄 + + + 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞥆𞤵 𞤄𞤪𞤭𞤼𞤢𞤲𞤭𞤴𞤢𞤲𞤳𞤮𞥅𞤪𞤫 + + 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤄𞤵𞤪𞤲𞤢𞤴 @@ -4922,11 +4440,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤖𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤘𞤭𞤪𞤤𞤢𞤲𞤣 - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤘𞤵𞤱𞤢𞥄𞤥 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤂𞤮𞥅𞤻𞤵 @@ -5000,6 +4513,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤋𞤪𞤢𞥄𞤲 + + + 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤋𞤪𞤤𞤢𞤲𞤣𞤭𞤲𞤳𞤮𞥅𞤪𞤫 + + 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤋𞤪𞤳𞤵𞤼𞤭𞤧𞤳𞤵 @@ -5067,13 +4585,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤂𞤮𞤪𞤣𞤵-𞤖𞤮𞤱𞤫 - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤳𞤢𞤱𞤮𞥅 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤃𞤢𞤳𞤢𞤱𞤮𞥅 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤃𞤢𞤳𞤢𞤱𞤮𞥅 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤺𞤢𞤣𞤢𞤲 @@ -5268,13 +4779,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤆𞤭𞤴𞤮𞤲𞤴𞤢𞤲 - - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤑𞤭𞤶𞤤𞤮𞤪𞤣𞤢𞥄 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤑𞤭𞤶𞤤𞤮𞤪𞤣𞤢𞥄 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤑𞤭𞤶𞤤𞤮𞤪𞤣𞤢𞥄 - - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤈𞤫𞤲𞤭𞤴𞤮𞤲 @@ -5294,9 +4798,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤢𞤥𞤵𞤱𞤢 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤅𞤢𞤥𞤵𞤱𞤢 - 𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤅𞤢𞤥𞤵𞤱𞤢 diff --git a/make/data/cldr/common/main/fi.xml b/make/data/cldr/common/main/fi.xml index 72ce5d134f68..e1b8241d685a 100644 --- a/make/data/cldr/common/main/fi.xml +++ b/make/data/cldr/common/main/fi.xml @@ -550,6 +550,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tšadinarabia sinhala sidamo + kiltinänsaame + piitimensaame + uumajansaame slovakki saraiki sloveeni @@ -659,6 +662,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ wolof wu-kiina kalmukki + kaitag xhosa mingreli kangri @@ -833,6 +837,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -1154,7 +1159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sudan Ruotsi Singapore - Saint Helena + Saint Helena, Ascension ja Tristan da Cunha Slovenia Huippuvuoret ja Jan Mayen Slovakia @@ -1229,6 +1234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ varhaisnykyranska valkovenäjän virallinen oikeinkirjoitus portugalin oikeinkirjoitus 1943 + akhimimic akanin akuapem-murre amerikkalainen kirjastolatinaistus 1997 alukun kreolimurre @@ -1344,18 +1350,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lajittelujärjestys normalisoitu lajittelu numeroiden lajittelu + skriptin/lohkon uudelleenjärjestys lajittelun taso valuutta + muunnoksen kohde + kielletyt sanojen katkaisut emojin esitys + viikon ensimmäinen päivä + yhdistetty tuntijärjestelmä + syöttötapa + näppäimistö + ylin ohitettu rivinvaihtotyyli rivi vaihtuu sanojen sisällä + muunnossäännöt mittajärjestelmä + mittayksikkö numerot + alueen täydentävät tiedot + muunnoslähde + alueen alaosasto lause vaihtuu lyhenteen jälkeen + muunnos + konekäännetty aikavyöhyke maavalinnan muunnelma yksityiskäyttö + yksityiskäyttöinen muunnos buddhalainen kalenteri @@ -1375,15 +1397,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ juutalainen kalenteri juutalainen intialainen kalenteri + saka samvat -kalenteri hidžra-kalenteri hidžra-kalenteri hidžra-siviilikalenteri (tabulaarinen, perjantaiepookki) hidžra-kalenteri (taulukkomuoto, perjantaiepookki) hidžra-kalenteri (saudiarabialainen) + hidžra-kalenteri, Saudi-Arabia, kuun havainnointi hidžra-matemaattinen kalenteri (tabulaarinen, torstaiepookki) + hidžra-kalenteri (taulukkomuoto, astronominen epookki) hidžra-kalenteri, Umm al-Qura Umm al Qura -kalenteri ISO 8601 -kalenteri + gregoriaaninen kalenteri japanilainen kalenteri japanilainen persialainen kalenteri @@ -1399,8 +1425,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ painomerkkien normaali lajittelu painomerkkien käänteinen lajittelu pienet kirjaimet edeltävät isoja + pienet kirjaimet isojen ja pienten kirjainten normaalijärjestys + pienet kirjaimet isot kirjaimet edeltävät pieniä + isot kirjaimet isojen ja pienten kirjainten lajittelu yhdessä isojen ja pienten kirjainten lajittelu erikseen aiempi lajittelujärjestys yhteensopivuutta varten @@ -1410,7 +1439,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unicoden oletusjärjestys oletusarvoinen unicode emojien lajittelujärjestys + emoji yleiseurooppalainen lajittelujärjestys + eurooppalaiset säännöt puhelinluettelojärjestys puhelinluettelo äänteellinen järjestys @@ -1420,6 +1451,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yleishakujärjestys haku haku hangul-alkukonsonantin mukaan + korean alkukonsonantit normaalijärjestys normaali piirtojärjestys @@ -1434,17 +1466,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lajittelu Unicode-normalisoituna numero-numerolta lajittelu numeroden lajittelu lukuina + valuutta + numerot + välimerkit + tyhjämerkki + symboli kaikkien merkkien lajittelu + kaikki vain peruskirjainten lajittelu + vain peruskirjaimet painomerkit ja aakkoslajit tai merkkileveydet ja kana-merkit huomioiva lajittelu + peruskirjaimet, aksenttimerkit, sija, versiot, kana painomerkit huomioiva lajittelu + peruskirjaimet, aksenttimerkit painomerkit ja aakkoslajit tai merkkileveydet huomioiva lajittelu + peruskirjaimet, aksenttimerkit, sija, versiot ideogrammin levyinen ideogrammin puolikkaan levyinen numeerinen muunnos oletusarvoinen emoji teksti + 12 tunnin järjestelmä + 12 + 24 tunnin järjestelmä + 24 12 tunnin järjestelmä (0–11) 12 (0–11) 12 tunnin järjestelmä (1–12) @@ -1453,6 +1499,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 tunnin järjestelmä (1–24) 24 (1–24) + vaihto: välilyönnit, välimerkit, kaikki symbolit + vaihto: välilyönnit, välimerkit + vaihto: välilyönnit, välimerkit + vaihto: välilyönnit, välimerkit, muut kuin valuuttasymbolit väljä rivinvaihto väljä normaali rivinvaihto @@ -1474,8 +1524,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ahom-numerot arabialaiset numerot laajennetut arabialaiset numerot + laajennettu arabi-intialainen armenialaiset numerot armenialaiset piennumerot + armenialaiset pienet balilaiset numerot bengalilaiset numerot brahmilaiset numerot @@ -1486,58 +1538,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dives akuru -numerot etiopialaiset numerot talousnumerot + talousnumerot ideografin levyiset numerot + täysleveät georgialaiset numerot gondin gunjala-numerot gondin masaram-numerot kreikkalaiset numerot kreikkalaiset piennumerot + kreikkalaiset pienet gudžaratilaiset numerot gurmukhilaiset numerot + han-symbolien kuukauden päivänumerot perinteisille kalentereille kiinalaiset desimaalinumerot + paikkasidonnainen desimaalijärjestelmä, joka käyttää numeroiden kiinalaisia ideografeja yksinkertaistetut kiinalaiset numerot yksinkertaistetut kiinalaiset talousnumerot + yksinkertaistetut kiinalaiset taloudelliset perinteiset kiinalaiset numerot perinteiset kiinalaiset talousnumerot + perinteiset kiinalaiset taloudelliset heprealaiset numerot pahawh hmong -numerot hmongin nyiakeng puachue -numerot jaavalaiset numerot japanilaiset numerot japanilaiset talousnumerot + japanilaiset taloudelliset + japanilainen keisarin aikakauden ensimmäinen vuosi, Gannen-numerointi kayah li -numerot kawilaiset numerot khmeriläiset numerot kannadalaiset numerot taithamin hora-numerot taithamin tham-numerot + tai tham tham (kirkollinen) laolaiset numerot länsimaiset numerot lepchanumerot limbunumerot matemaattiset lihavoidut numerot + matemaattinen (lihavoitu) matemaattiset kaksoislyöntinumerot + matemaattinen (kaksoisviivallinen) matemaattiset tasalevyiset numerot + matemaattinen (kiinteävälinen) matemaattiset pääteviivattomat lihavoidut numerot + matemaattinen (lihavoitu, pääteviivaton) matemaattiset pääteviivattomat numerot + matemaattinen (pääteviivaton) malajalamilaiset numerot modi-numerot mongolialaiset numerot mro-numerot meetei mayek -numerot burmalaiset numerot + myanmarilaiset itäiset pwo karen -numerot + myanmarilaiset pao-numerot myanmarin shan-numerot + myanmarilaiset shan-numerot myanmarin tai laing -numerot + myanmarilaiset tai laing -numerot Nagin mundarinumerot kielen omat numerot + kielen omat n’ko-numerot ol chiki -numerot orijalaiset numerot osmanjalaiset numerot + rajatut hanifilaisen rohingyan numerot roomalaiset numerot + roomalaiset isot numerot roomalaiset piennumerot + roomalaiset pienet saurashtra-numerot + segmentoidut šarada-numerot khutabadi-numerot sinhalan lith-numerot @@ -1547,18 +1623,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uudet tai lue -numerot perinteiset tamilinumerot tamilinumerot + modernit tamilinumerot telugulaiset numerot thainumerot tiibetiläiset numerot tirhuta-numerot tangsa-numerot perinteiset numerot + perinteiset numerot vai-numerot varang kshiti -numerot wancholaiset numerot pois päällä + määrittämätön konekäännös + POSIX-variantti + + pois + päällä + metrinen brittiläinen @@ -1620,7 +1704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cccc d.M.y - yMccccd + yMEEEEd @@ -1774,7 +1858,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cccc d. MMMM y G - GyMMMMccccd + GyMMMMEEEEd @@ -1879,11 +1963,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y G E d. MMM y G LLLL y G - cccc d. MMMM y G + cccc d. MMMM y G QQQ y G QQQQ y G + + {0}–{1} + {0}–{1} h.mm B – h.mm B @@ -1997,6 +2084,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLL–LLLL + + MMMM d–MMMM d + y–y G @@ -2240,7 +2330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cccc d. MMMM y - yMMMMccccd + yMMMMEEEEd @@ -2288,6 +2378,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + . + {1} {0} @@ -2343,12 +2437,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h.mm.ss a E H.mm.ss y G - M.y G - M.d.y G + L.y G + d.M.y G E d.M.y G LLL y G d.M.y G E d.M.y G + LLLL y G d. MMMM y G E d. MMMM y G H @@ -2378,14 +2473,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d.M.y E d.M.y LLLL y - cccc d. MMMM y d. MMMM y E d. MMMM y + cccc d. MMMM y QQQ y QQQQ y 'vuoden' Y 'viikko' w 'vuoden' Y 'viikko' w + + {0} {1} + {0}–{1} @@ -2710,6 +2808,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + y MMM d + + + + + y-MM-dd + + + + + + + HH.mm + + + + + + . + + + HH.mm.ss + + + @@ -3224,7 +3351,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +H.mm;-H.mm UTC{0} - UTC aikavyöhyke: {0} {0} (kesäaika) {0} (normaaliaika) @@ -3316,9 +3442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pariisi - - Britannian kesäaika - Lontoo @@ -3339,11 +3462,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hongkong - - - Irlannin kesäaika - - Mansaari @@ -3575,13 +3693,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaskan kesäaika - - - Almatyn aika - Almatyn normaaliaika - Almatyn kesäaika - - Amazonin aika @@ -3631,20 +3742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apian kesäaika - - - Aqtaw’n aika - Aqtaw’n normaaliaika - Aqtaw’n kesäaika - - - - - Aqtöben aika - Aqtöben normaaliaika - Aqtöben kesäaika - - Saudi-Arabian aika @@ -3746,6 +3843,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasilian kesäaika + + + Ison-Britannian aika + Ison-Britannian kesäaika + + Brunein aika @@ -3924,6 +4027,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Greenwichin normaaliaika + + + Grönlannin aika + Grönlannin normaaliaika + Grönlannin kesäaika + + Itä-Grönlannin aika @@ -3938,11 +4048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Länsi-Grönlannin kesäaika - - - Guamin aika - - Arabiemiirikuntien normaaliaika @@ -3955,7 +4060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havaijin-Aleuttien normaaliaika + Havaijin normaaliaika @@ -4016,6 +4121,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iranin kesäaika + + + Irlannin aika + Irlannin kesäaika + + Irkutskin aika @@ -4083,11 +4194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgisian aika - - - Sri Lankan aika - - Linesaarten aika @@ -4100,13 +4206,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howen kesäaika - - - Macaon aika - Macaon normaaliaika - Macaon kesäaika - - Magadanin aika @@ -4222,11 +4321,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronhan kesäaika - - - Pohjois-Mariaanien aika - - Novosibirskin aika @@ -4306,13 +4400,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pjongjangin aika - - - Qızılordan aika - Qızılordan normaaliaika - Qızılordan kesäaika - - Réunionin aika @@ -4339,9 +4426,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoan aika Samoan normaaliaika - Samoan kesäaika @@ -4434,6 +4519,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguayn kesäaika + + + Ürümqin aika + + Uzbekistanin aika @@ -4582,9 +4672,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4964,11 +5051,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiinan juan (offshore) Kiinan juania (offshore) - - Kiinan kansanpankin dollari - Kiinan kansanpankin dollari - Kiinan kansanpankin dollaria - Kiinan juan Kiinan juan @@ -8116,9 +8198,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} teekuppia - nesteunssit - {0} nesteunssi - {0} nesteunssia + nesteunssit – m + {0} nesteunssi – m + {0} nesteunssia – m eekkerijalat @@ -8154,8 +8236,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kupit - {0} kuppi - {0} kuppia nesteunssit @@ -8261,11 +8341,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} weber {0} weberiä - - valon nopeus - {0} valon nopeus - {0} valon nopeus - miljardisosat {0} miljardisosa @@ -8641,7 +8716,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/br. gal - kp + akp {0} kuppi {0} kuppia @@ -8849,11 +8924,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} kohde {0} kohdetta - - osa - {0} osa - {0} osa - {0}ppm {0}ppm @@ -8873,7 +8943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol - gluk {0} gluk {0} gluk @@ -9295,6 +9364,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg {0}mmHg + + {0} Hg + {0} Hg + {0}psi {0}psi @@ -9505,16 +9578,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt br. {0}qt br. + + {0} sr + {0} sr + + + {0} kat + {0} kat + + + {0} C + {0} C + + + {0} F + {0} F + + + {0} H + {0} H + + + {0} S + {0} S + - cal-IT + {0} cal-IT + {0} cal-IT + + + {0} Bq + {0} Bq + + + {0} Sv + {0} Sv + + + {0} Gy + {0} Gy - kp {0} kp {0} kp + + {0} T + {0} T + + + {0} Wb + {0} Wb + - valon nopeus {0}valon nopeus {0}valon nopeus diff --git a/make/data/cldr/common/main/fil.xml b/make/data/cldr/common/main/fil.xml index 0702c698495b..2284f429eefb 100644 --- a/make/data/cldr/common/main/fil.xml +++ b/make/data/cldr/common/main/fil.xml @@ -102,6 +102,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dargwa Taita German + Austrian German + Swiss High German Dogrib Zarma Dogri @@ -116,10 +118,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Efik Ekajuk Greek - Ingles + English + Australian English + Canadian English + British English Ingles sa UK - Ingles (American) - Ingles sa US + American English + US English Esperanto Spanish Latin American na Espanyol @@ -130,13 +135,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ewondo Persian Dari - Fulah + Fula Finnish Filipino Fijian Faroese Fon French + Canadian French + Swiss French Cajun French Hilagang Frisian Friulian @@ -336,6 +343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Nigerian Pidgin Pijin Polish + Piedmontese Maliseet-Passamaquoddy Prussian Pashto @@ -472,9 +480,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Standard Moroccan Tamazight Chinese Chinese, Mandarin - Pinasimpleng Chinese - Pinasimpleng Mandarin Chinese - Tradisyonal na Chinese + Simplified Chinese + Simplified Mandarin Chinese + Traditional Chinese Tradisyonal na Mandarin Chinese Zulu Zuni @@ -866,24 +874,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kalendaryo Format ng Pera Pag-uuri-uri ng Mga Ignore Symbol - Pag-uuri-uri ng Baliktad na Accent - Uppercase/Lowercase na Pagsusunud-sunod + Reversed Accent na Pag-uuri + Uppercase/Lowercase na Pagsusunod-sunod Case Sensitive na Pag-uuri-uri Pagkakasunud-sunod ng Ayos Normalized na Pag-uuri-uri Numeric na Pag-uuri-uri + Script/Block na Pag-reorder Lakas ng Pag-uuri-uri Pera + Transform Destination + Mga Dictionary Break Exclusion Presentation ng Emoji + Unang araw ng linggo + Mixed-in Siklo ng Oras (12 laban sa 24) + Paraan ng Pag-input + Keyboard + Balewalain ang Pinakamataas CJK na Line Break Mga Line Break sa Mga Salita + Mga Transform Rule Sistema ng Pagsukat + Unit ng Pagsukat Mga Numero + Rehiyon para sa Karagdagang Data + Transform Source + Subdivision ng Rehiyon Sentence Break Pagkatapos ng Abbr. + Transform + Machine Translated Time Zone Lokal na Variant Pribadong Paggamit + Private-Use Transform Kalendaryo ng Buddhist @@ -896,27 +920,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dangi Kalendaryo ng Ethiopia Ethiopic - Kalendaryong Ethiopic Amete Alem + Ethiopic Amete Alem Calendar Ethiopic Amete Alem - Gregorian na Kalendaryo + Gregorian Calendar Gregorian - Hebrew na Kalendaryo + Hebrew Calendar Hebrew Pambansang Kalendaryong Indian - Kalendaryong Hijiri + Indian National + Hijri Calendar Hijri - Kalendaryong Hijri (tabular, Civil epoch) + Hijri Calendar (tabular, civil epoch) Hijri (tabular, civil epoch) Kalendaryong Islamiko (Saudi Arabia, sighting) + Hijri, Saudi Arabia sighting Kalendaryong Islamiko (tabular, astronomikal na epoch) - Kalendaryong Hijri (Umm al-Qura) + Hijri (tabular, astronomical epoch) + Hijri Calendar (Umm al-Qura) Hijri (Umm al-Qura) - Kalendaryong Gregorian (Unang Taon) - Kalendaryong Japanese + Gregorian Calendar (ISO 8601 Weeks) + Gregorian + Japanese Calendar Japanese - Kalendaryong Persian + Persian Calendar Persian - Kalendaryong Minguo + Minguo Calendar Minguo Format ng Pera sa Accounting Accounting @@ -927,43 +955,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pag-uri-uriin ang Mga Accent nang Normal Pag-uri-uriin ang Mga Accent nang Baliktad Lowercase Muna ang Pag-uri-uriin + Lowercase Pag-uri-uriin ang Ayos ng Normal na Case + Lowercase Uppercase Muna ang Pag-uri-uriin + Uppercase Pag-uri-uriin ang Hindi Case Sensitive Pag-uri-uriin ang Case Sensitive Nakaraang Pagkakasunud-sunod ng Pag-uuri, para sa compatibility + Compatibility Pagkakasunud-sunod ng Pag-uuri ng Diksyunaryo + Dictionary Default na Pagkakasunud-sunod ng Ayos ng Unicode Default na Unicode Pagkakasunud-sunod ng Pag-uuri ng Emoji + Emoji Mga Tuntunin ng European na Pagkakasunud-sunod + Mga panuntunan sa Europe Pagkakasunud-sunod ng Pag-uuri ng Phonebook + Phonebook Phonetic na Ayos ng Pag-uuri-uri + Phonetic Pagkakasunud-sunod ng Pag-uuri ng Pinyin + Pinyin Pangkalahatang Paghahanap Maghanap Maghanap Ayon sa Unang Katinig ng Hangul + Korean initial consonant Karaniwang Pagkakasunud-sunod ng Ayos Karaniwan Pagkakasunud-sunod ng Pag-uuri ng Stroke + Stroke Tradisyunal na Pagkakasunud-sunod ng Pag-uuri + Traditional Pagkakasunud-sunod ng Pag-uuri ng Radical-Stroke + Radical-Stroke Zhuyin na Pagkakasunud-sunod ng Pag-uuri + Zhuyin Pag-uri-uriin nang Walang Pag-normalize Pag-uri-uriin ang Unicode nang Normalized Pag-uri-uriin ang Mga Digit nang Indibidwal Pag-uri-uriin ang Mga Digit nang Numerical + Currency + Mga Digit + Bantas + Whitespace + Simbolo Pag-uri-uriin Lahat + Lahat Mga Base na Titik Lang ang Pag-uri-uriin + Mga Base na Titik Lang Pag-uri-uriin ang Mga Accent/Case/Lapad/Kana + Base, Mga Accent, Case, Mga Variant, Kana Pag-uri-uriin ang Mga Accent + Base, Mga Accent Pag-uri-uriin ang Mga Accent/Case/Lapad + Base, Mga Accent, Case, Mga Variant Hanggang sa Fullwidth Hanggang sa Halfwidth Numeric Default Emoji Text + 12 Oras na Sistema + 12 + 24 na Oras na Sistema + 24 12 Oras na Sistema (0–11) 12 (0–11) 12 Oras na Sistema (1–12) @@ -972,6 +1029,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 na Oras na Sistema (1–24) 24 (1–24) + I-shift ang mga Space, bantas, lahat ng simbolo + I-shift ang mga space, bantas + I-shift ang mga Space, bantas + I-shift ang mga Space, bantas, hindi currency na simbolo Loose na Istilo ng Line Break Loose Normal na Istilo ng Line Break @@ -993,8 +1054,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ahom na mga Digit Arabic-Indic na Mga Digit Extendend Arabic-Indic na Mga Digit + Extended Arabic-Indic Mga Armenian Numeral Armenian Lowercase Numerals + Armenian lowercase Balinese na Mga Digit Mga Bengali Digit Brahmi na Mga Digit @@ -1004,61 +1067,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mga Devanagari Digit Mga Ethiopic Numeral Mga Pampinansyang Numeral + Financial Mga Full-Width Digit + Full-width Georgian na Mga Numeral Masaram Gondi na mga digit Greek na Mga Numeral Greek Lowercase na Mga Numeral + Greek lowercase Mga Gujarati Digit Mga Gurmukhi Digit + Han-character na pagnunumero sa araw ng buwan para sa mga tradisyonal na kalendaryo Mga Chinese Decimal na Numeral + Positional decimal system gamit ang mga Chinese number ideograph bilang mga digit Simplified Chinese na Mga Numeral Simplified Chinese na Mga Numeral para sa Pananalapi + Simplified Chinese financial Traditional Chinese na Mga Numeral Traditional Chinese na Mga Numeral para sa Pananalapi + Traditional Chinese financial Mga Hebrew Numeral Pahawh Hmong na Mga Digit Javanese na Mga Digit Mga Japanese Numeral Mga Japanese Numeral sa Pananalapi + Japanese financial + Japanese first-year Gannen na pagnunumero Kayah Li na Mga Digit Mga Khmer na Digit Mga Kannada na Digit Tai Tham Hora na Mga Digit Tai Tham Tham na Mga Digit + Tai Tham Tham (ecclesiastical) Mga Lao na Digit Mga Kanluraning Digit Lepcha Mga Digit Limbu na Mga Digit Matematikal na Bold na Mga Digit + Mathematical bold Matematikal na Dobleng-Struck na Mga Digit + Mathematical double-struck Matematikal na Mga Digit na May Isang Puwang + Mathematical monospace Matematikal na Sans-Serif Bold na Mga Digit + Mathematical sans-serif bold Matematikal na Sans-Serif na Mga Digit + Mathematical sans-serif Mga Malayalam na Digit Modi na Mga Digit Mongolian Digits Mro na Mga Digit Meetei Mayek na Mga Digit Mga Myanmar na Digit + Myanmar Eastern Pwo Karen + Myanmar Pao Maynmar Shan na Mga Digit + Myanmar Shan Myanmar Tai Laing na Mga Digit + Myanmar Tai Laing Mga Native na Digit + Mga native digit N’Ko na Mga Digit Mga Digit ng Ol Chiki Mga Odia na Digit + Naka-outline Mga Roman Numeral + Roman uppercase Roman Lowercase na Mga Numeral + Roman lowercase + Segmented Tamil na Mga Numeral Mga Tamil na Digit + Modern Tamil Mga Telugu na Digit Mga Thai na Digit Mga Tibetan na Digit Mga Tradisyunal na Numeral + Mga tradisyonal na numeral Mga Vai na Digit Naka-off Naka-on + Hindi Natukoy na Machine Translation + Variant ng POSIX + + Naka-off + Naka-on + Metriko @@ -1247,6 +1342,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y–y G @@ -1487,6 +1585,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1524,6 +1625,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G MMM d, y G E, MMM d, y G + MMMM y G + MMMM d, y G + E, MMMM d, y G h:mm a h:mm:ss a h:mm:ss a v @@ -1542,11 +1646,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'ika'-w 'linggo' 'ng' Y 'linggo' w 'ng' Y + + {1}, {0} + {0} {1} + {1}, {0} + h – h B @@ -1621,6 +1732,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + M/y – M/y M/y – M/y @@ -2184,15 +2298,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Makipot na Look ng Rankin - - - Oras sa Tag-init ng Britain - - - - - Standard na Oras sa Ireland - + + Chagos Archipelago Canton Island @@ -2218,6 +2325,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cancun + + Kerguelen Islands + Puwerto ng Espanya @@ -2227,6 +2337,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lungsod ng Ho Chi Minh + + + Acre Time + Acre Standard Time + Acre Summer Time + + Oras sa Afghanistan @@ -2234,7 +2351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Gitnang Africa + Central Africa Time @@ -2249,7 +2366,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Kanlurang Africa + West Africa Time @@ -2409,6 +2526,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Oras sa Tag-init ng Brasilia + + + British Time + British Summer Time + + Oras sa Brunei Darussalam @@ -2416,9 +2539,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Cape Verde + Cape Verde Time Standard na Oras sa Cape Verde - Oras sa Tag-init ng Cape Verde + Cape Verde Summer Time @@ -2552,7 +2675,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Katimugang France at Antartiko + French Southern Territories Time @@ -2582,6 +2705,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Greenwich Mean Time + + + Greenland Time + Greenland Standard Time + Greenland Summer Time + + Oras sa Silangang Greenland @@ -2608,7 +2738,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Standard na Oras sa Hawaii-Aleutian + Hawaii Time @@ -2639,7 +2769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Indian Ocean + Indian Ocean Time @@ -2669,6 +2799,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Daylight Time sa Iran + + + Irish Time + Irish Standard Time + + Oras sa Irkutsk @@ -2692,14 +2828,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Petropavlovsk-Kamchatski - Standard Time sa Petropavlovsk-Kamchatski - Summer Time sa Petropavlovsk-Kamchatski + Kamchatka Time + Kamchatka Standard Time + Kamchatka Summer Time - Oras ng Kazakhstan + Kazakhstan Time @@ -2777,9 +2913,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Mauritius - Standard na Oras sa Mauritius - Oras sa Tag-init ng Mauritius + Mauritius Time + Mauritius Standard Time + Mauritius Summer Time @@ -2944,7 +3080,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Reunion + Réunion Time @@ -2961,21 +3097,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Oras sa Samara - Standard Time sa Samara - Samara Daylight + Samara Time + Samara Standard Time + Samara Summer Time - Oras sa Samoa Standard na Oras sa Samoa - Daylight Time sa Samoa - Oras sa Seychelles + Seychelles Time @@ -3037,6 +3171,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Oras sa Chuuk + + + Türkiye Time + Türkiye Standard Time + Türkiye Summer Time + + Oras sa Turkmenistan @@ -3056,6 +3197,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Oras sa Tag-init ng Uruguay + + + Ürümqi Time + + Oras sa Uzbekistan @@ -3348,8 +3494,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ruble ng Belarus - ruble ng Belarus - rubles ng Belarus + Belarusian ruble + na Belarusian ruble р. @@ -3475,7 +3621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pound ng Falkland Islands - pound ng Falkland Islands + Falkland Islands pound pounds ng Falkland Islands @@ -3693,7 +3839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Malagasy Ariaries - Denar ng Macedonia + Macedonian Denar denar ng North Macedonia denari ng North Macedonia @@ -4093,9 +4239,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}-{1} - {0} mansanas - {0} na mansanas - Kunin ang ika-{0} (na) kanan. + {0} araw + {0} na araw + Lumiko sa ika-{0} kanan. + Lumiko sa ika-{0} (na) kanan. @@ -4293,10 +4440,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} na karat - {0} milligram per deciliter - {0} milligrams per deciliter + mga miligramo kada desilitro + {0} miligramo kada desilitro + {0} na miligramo kada desilitro + mga millimole kada litro {0} millimole per liter {0} millimoles per liter @@ -4307,7 +4456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ parts - {0} part + {0} part {0} parts @@ -4717,6 +4866,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} lumen + mga solar luminosity {0} solar luminosity {0} solar luminosity @@ -4908,7 +5058,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pound-force-feet {0} pound-force-foot - {0} pound-feet + {0} na pound-force-foot newton-meter @@ -4992,6 +5142,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} metric cup {0} na metric cup + + mga metric fluid ounce + {0} metric fluid ounce + {0} na metric fluid ounce + acre-feet {0} acre-foot @@ -5013,7 +5168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ quarts {0} quart - {0} na quarts + {0} na quart {0} pint @@ -5074,6 +5229,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ katals + {0} katal + {0} na katal coulombs @@ -5122,8 +5279,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ teslas + {0} tesla + {0} na tesla + mga weber {0} weber {0} webers @@ -5198,6 +5358,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ karat + + millimol/litro + + + {0} part + {0} na part + parts/million @@ -5209,6 +5376,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Glc + {0} Glc + {0} Glc litro/km @@ -5426,8 +5595,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lux + + candela + + + lumen + - solar luminosity + mga solar luminosity gramo @@ -5526,6 +5701,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mc {0} na mc + + {0} fl oz m. + {0} fl oz m. + acre ft @@ -5568,6 +5747,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Imp na kuwart + + {0} sr + {0} sr + + + {0} kat + {0} kat + {0} C {0} C @@ -5597,6 +5784,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Gy {0} Gy + + {0} kgf + {0} kgf + + + {0} T + {0} T + + + {0} Wb + {0} Wb + parts/billion @@ -5624,11 +5823,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}m/s² + rad {0}rad {0}rad deg + {0}° + {0}° {0}′ @@ -5675,6 +5877,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} item {0}item + + {0} part + {0} na part + ppm @@ -5684,9 +5890,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mol - - Glc - L/km @@ -5701,8 +5904,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mpg UK - {0}mpg - {0}mpg + {0}m/gUK + {0}m/gUK + + + PB + + + TB + + + Tb GB @@ -5710,6 +5922,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Gb + + MB + + + Mb + kB @@ -5755,6 +5973,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ms {0}ms + + amp + mA @@ -5858,6 +6079,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ R☉ + + L☉ + {0}t {0}t @@ -5932,7 +6156,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg - ng Hg {0} ng Hg {0} ng Hg @@ -6008,9 +6231,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mpt {0} mpt + + {0} mc + {0}mc + bushel + + qt + + + pt + Imp fl oz {0}fl oz Im @@ -6056,10 +6289,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt Imp. {0}qt-Imp. + + {0} C + {0} C + + + {0} F + {0} F + + + {0} H + {0} H + - cal-IT + {0} cal-IT + {0} cal-IT + + + {0} Bq + {0} Bq + + + {0} Sv + {0} Sv + + + {0} Gy + {0} Gy + ppb {0}ppb {0}ppb diff --git a/make/data/cldr/common/main/fo.xml b/make/data/cldr/common/main/fo.xml index e0a08a0f1231..9ae25dae9c69 100644 --- a/make/data/cldr/common/main/fo.xml +++ b/make/data/cldr/common/main/fo.xml @@ -877,7 +877,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Vjetnam Vanuatu Wallis- og Futunaoyggjar - Samoa + Sámoa óekta tónalag óektaður BIDI tekstur Kosovo @@ -988,7 +988,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic islamiskur kalendari islamiskur kalendari (talvuskapaður, fólkaligt tíðarskeið) islamiskur kalendari (Umm al-Qura) - ISO-8601 kalendari + gregorianskur kalendari (ISO 8601 vikur) japanskur kalendari persiskur kalendari minguo kalendari @@ -1002,6 +1002,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic vanlig siðbundin raðskipan zhuyin raðskipan + 12 tímar klokkuskipan + 24 tímar klokkuskipan 12 tímar klokkuskipan (0–11) 12 tímar klokkuskipan (1–12) 24 tímar klokkuskipan (0–23) @@ -1589,6 +1591,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic w. 'vika' 'í' Y + + {0}–{1} + {0}–{1} + {0}–{1} + h B – h B @@ -1603,21 +1610,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic y–y G - MM.y GGGGG – MM.y GGGGG - MM.y–MM.y GGGGG - MM.y–MM.y GGGGG + MM.y G – MM.y G + MM.y–MM.y G + MM.y–MM.y G - dd.MM.y–dd.MM.y GGGGG - dd.MM.y GGGGG – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG + dd.MM.y–dd.MM.y G + dd.MM.y G – dd.MM.y G + dd.MM.y – dd.MM.y G + dd.MM.y – dd.MM.y G - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y GGGGG – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG + E, dd.MM.y – E, dd.MM.y G + E, dd.MM.y G – E, dd.MM.y G + E, dd.MM.y – E, dd.MM.y G + E, dd.MM.y – E, dd.MM.y G MMM y G – MMM y G @@ -2266,7 +2273,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ókendur býur + Ókent stað Wien @@ -2301,22 +2308,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Føroyar - - - Bretsk summartíð - - Aten Suðurgeorgiaoyggjar - - - Írsk vanlig tíð - - Teheran @@ -2467,9 +2464,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Apia tíð - Apia vanlig tíð - Apia summartíð + Sámoa tíð + Sámoa vanlig tíð + Sámoa summartíð @@ -2573,9 +2570,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasilia summartíð + + + Bretsk tíð + Bretsk summartíð + + - Brunei Darussalam tíð + Brunei tíð @@ -2649,7 +2652,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Dumont-d’Urville tíð + Dumont d’Urville tíð @@ -2772,7 +2775,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaii-Aleutian vanlig tíð + Hawaii tíð @@ -2791,9 +2794,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hovd tíð - Hovd vanlig tíð - Hovd summartíð + Khovd tíð + Khovd vanlig tíð + Khovd summartíð @@ -2833,6 +2836,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran summartíð + + + Írsk tíð + Írsk vanlig tíð + + Irkutsk tíð @@ -3091,12 +3100,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ponape tíð + Pohnpei tíð - Pyongyang tíð + Norðurkorea tíð @@ -3118,9 +3127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoa tíð - Samoa vanlig tíð - Samoa summartíð + Amerikonsk Sámoa vanlig tíð @@ -3160,9 +3167,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Taipei tíð - Taipei vanlig tíð - Taipei summartíð + Taivan tíð + Taivan vanlig tíð + Taivan summartíð @@ -3322,14 +3329,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0 mió'.' 00 mió'.' 00 mió'.' - 000 mió'.' - 000 mió'.' + 000 mió + 000 mió 0 mia'.' 0 mia'.' 00 mia'.' 00 mia'.' - 000 mia'.' - 000 mia'.' + 000 mia + 000 mia 0 bió'.' 0 bió'.' 00 bió'.' @@ -3822,7 +3829,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Paraguai guarani - Katar rial + Katar rialur + Katar rialur + Katar rialar Rumenia leu diff --git a/make/data/cldr/common/main/fr.xml b/make/data/cldr/common/main/fr.xml index 3b27db0e7dca..01b0d712e6a1 100644 --- a/make/data/cldr/common/main/fr.xml +++ b/make/data/cldr/common/main/fr.xml @@ -823,6 +823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -840,6 +841,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + @@ -1331,18 +1333,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordre de tri tri normalisé tri numérique + réorganisation des scripts/blocs priorité du tri devise + destination de transformation + exclusions des césures du dictionnaire Présentation des Emoji + Premier jour de la semaine + mélangé système horaire (12 ou 24 heures) + Mode de saisie + Clavier + Les plus ignorés style de saut de ligne Sauts de ligne dans les mots + règles de transformation système de mesure + unité de mesure nombres + région pour données supplémentaires + source de transformation + subdivision de région Saut de phrase après une abréviation + transformation + traduction automatique fuseau horaire variante locale usage privé + transformation à usage privé calendrier bouddhiste @@ -1362,16 +1380,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendrier hébraïque hébraïque calendrier indien + national indien calendrier hégirien hégirien calendrier hégirien (tabulaire, époque civile) hégirien (tabulaire, époque civile) calendrier musulman (observé, Arabie Saoudite) + hégirien, observation saoudienne calendrier hégirien (tabulaire, époque astronomique) hégirien (tabulaire, époque astronomique) calendrier hégirien (Umm al-Qura) hégirien (Umm al-Qura) calendrier ISO 8601 + grégorien calendrier japonais japonais calendrier persan @@ -1387,8 +1408,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Trier les caractères accentués normalement Trier les caractères accentués dans l’ordre inverse Trier avec les minuscules d’abord + minuscules Trier sans ordre lié à la casse + minuscules Trier avec les majuscules d’abord + majuscules Trier sans tenir compte de la casse Trier en tenant compte de la casse ancien ordre de tri pour compatibilité @@ -1398,7 +1422,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordre de tri Unicode par défaut Unicode par défaut ordre des emoji + emoji règles de classement européen + règles européennes ordre de l’annuaire annuaire ordre de tri phonétique @@ -1408,6 +1434,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ recherche générique recherche rechercher par consonne initiale en hangeul + consonne initiale en coréen ordre de tri standard standard ordre des traits @@ -1422,17 +1449,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Trier avec normalisation Unicode Trier les chiffres individuellement Trier les chiffres par ordre numérique + devise + chiffres + ponctuation + espacement + symbole Tout trier + tout Ne trier que les lettres de base + lettres de base uniquement Trier en tenant compte des caractères accentués, de la casse, de la largeur et des caractères Kana + base, accents, casse, variantes, kanas Trier en tenant compte des caractères accentués + base, accents Trier en tenant compte des caractères accentués, de la casse et de la largeur + base, accents, casse, variantes + en minuscules en pleine chasse en demi-chasse Numérique par défaut Emoji texte + système horaire de 12 heures + 12 + système horaire de 24 heures + 24 système horaire de 12 heures (0–11) 12 (0–11) système horaire de 12 heures (1–12) @@ -1441,6 +1483,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) système horaire de 24 heures (1–24) 24 (1–24) + Décalage espaces, ponctuation, tous les symboles + Décalage espaces, ponctuation + Décalage espaces, ponctuation + Décalage espaces, ponctuation, symboles sauf devises style de saut de ligne permissif permissif style de saut de ligne normal @@ -1462,8 +1508,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres ahoms chiffres arabes chiffres arabes étendus + arabes étendus chiffres arméniens chiffres arméniens minuscules + arméniens minuscules chiffres balinais chiffres bengalis chiffres brahmis @@ -1474,27 +1522,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres dives akuru chiffres éthiopiens Chiffres financiers + financiers chiffres pleine chasse + pleine chasse chiffres garays chiffres géorgiens chiffres gondi gunjala chiffres gondi masaram chiffres grecs chiffres grecs minuscules + grecs minuscules chiffres goudjarâtîs chiffres gurung khemas chiffres gourmoukhîs + numérotation des jours du mois en caractères han pour les calendriers traditionnels nombres décimaux chinois + système décimal positionnel utilisant les idéogrammes de nombres chinois comme chiffres chiffres en chinois simplifié chiffres financiers en chinois simplifié + financiers en chinois simplifié chiffres en chinois traditionnel chiffres financiers en chinois traditionnel + financiers en chinois traditionnel chiffres hébreux chiffres pahawh hmongs chiffres nyiakeng puachue hmong chiffres javanais chiffres japonais chiffres financiers japonais + financiers japonais + numérotation japonaise gannen (première année) chiffres kayah li chiffres kawis chiffres khmers @@ -1502,15 +1559,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres kirat rais chiffres lannas horas chiffres lannas thams + chiffres Taï Tham (liturgiques) chiffres laotiens chiffres occidentaux chiffres lepchas chiffres limbous chiffres gras mathématiques + mathématiques gras chiffres ajourés mathématiques + mathématiques double barre chiffres à chasse fixe mathématiques + mathématiques à chasse fixe chiffres gras linéaux mathématiques + mathématiques gras sans empattement chiffres linéaux mathématiques + mathématiques sans empattement chiffres malayâlams chiffres modis chiffres mongols @@ -1518,21 +1581,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres meitei-mayeks chiffres birmans chiffres birmans de pwo karen de l’Est + karen pwo de l’Est de Birmanie chiffres birmans pao + pa’o de Birmanie chiffres birmans shans + shan de Birmanie chiffres birmans tai laings + tai laing de Birmanie chiffres nag mundaris chiffres locaux + chiffres locaux chiffres n’kos chiffres ol-chikis chiffres ol onals chiffres oriyas chiffres osmanyas chiffres entourés + contours chiffres rohingyas hanifis chiffres romains + romains majuscules chiffres romains minuscules + romains minuscules chiffres saurashtras + segmentés chiffres sharadas chiffres khudawadis chiffres cinghalais liths @@ -1543,18 +1615,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres néo-taï-luës chiffres tamouls traditionnels chiffres tamouls + tamouls modernes chiffres télougous chiffres thaïs chiffres tibétains chiffres tirhutas chiffres tangsas Chiffres traditionnels + chiffres traditionnels chiffres en vaï chiffres warang-citis chiffres wantcho Désactivé Activé + traduction automatique non spécifiée + variante POSIX + + Désactivé + Activé + métrique impérial @@ -1906,6 +1986,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}er + {0} + + + @@ -1971,15 +2059,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d/M/y G MMM y G d MMM y G + ddd MMM y G E d MMM y G + E ddd MMM y G h:mm a h:mm:ss a HH 'h' v dd/MM E dd/MM d MMM + ddd MMM E d MMM + E ddd MMM d MMMM + ddd MMMM y G y G MM/y GGGGG @@ -1987,7 +2080,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd/MM/y GGGGG MMM y G d MMM y G + ddd MMM y G E d MMM y G + E ddd MMM y G MMMM y G QQQ y G QQQQ y G @@ -2095,6 +2190,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d MMM – E d MMM E d MMM – E d MMM + + d – d MMMM + d MMMM – d MMMM + y – y G @@ -2182,6 +2281,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}er + {0} + + + @@ -2341,6 +2448,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -2387,18 +2497,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd/MM/y GGGGG MMM y G d MMM y G + ddd MMM y G E d MMM y G - HH 'h' + E ddd MMM y G + MMMM y G + d MMMM y G + ddd MMMM y G + E d MMMM y G + E ddd MMMM y G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH 'h' v dd/MM E dd/MM d MMM + ddd MMM E d MMM + E ddd MMM d MMMM + ddd MMMM + E d MMMM + E ddd MMMM 'semaine' W (MMMM) 'semaine' W (MMMM) MM/y @@ -2406,14 +2526,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd/MM/y MMM y d MMM y + ddd MMM y E d MMM y + E ddd MMM y MMMM y + d MMMM y + ddd MMMM y + E d MMMM y + E ddd MMMM y QQQ y QQQQ y 'semaine' w 'de' Y 'semaine' w 'de' Y + + {0} {1} + + + {0} – {1} + h – h B @@ -2511,6 +2643,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d – E d MMM E d MMM – E d MMM + + d – d MMMM + d MMMM – d MMMM + MM/y – MM/y MM/y – MM/y @@ -2712,11 +2848,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - M/y G - E d/M/y G + ddd MMM y G + E ddd MMM y G + ddd MMM + E ddd MMM + ddd MMMM M/y GGGGG d/M/y GGGGG E d/M/y GGGGG + ddd MMM y G + E ddd MMM y G @@ -2730,37 +2871,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - Tempyō (729–749) - Tempyō-kampō (749-749) - Tempyō-shōhō (749-757) - Tempyō-hōji (757-765) - Temphō-jingo (765-767) - Kemmu (1334–1336) - Hōryaku (1751–1764) - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Ten-ei (1110-1113) - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Ten-ei (1110-1113) - - d/M @@ -2890,9 +3000,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ a - l’an dernier - cette année - l’an prochain +{0} a +{0} a @@ -3372,7 +3479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +HH:mm;−HH:mm UTC{0} - UTC heure : {0} {0} (heure d’été) {0} (heure standard) @@ -3384,7 +3490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ temps universel coordonné - TU + TU @@ -3481,9 +3587,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Îles Féroé - - heure d’été britannique - Londres @@ -3507,11 +3610,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Macassar - - - heure d’été irlandaise - - Jérusalem @@ -3788,13 +3886,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de l’Alaska - - - heure d’Alma Ata - heure normale d’Alma Ata - heure d’été d’Alma Ata - - heure de l’Amazonie @@ -3839,23 +3930,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - heure d’Apia - heure normale d’Apia - heure d’été d’Apia - - - - - heure d’Aktaou - heure normale d’Aktaou - heure d’été d’Aktaou - - - - - heure d’Aqtöbe - heure normale d’Aqtöbe - heure d’été d’Aqtöbe + heure des Samoa occidentales + heure normale des Samoa occidentales + heure d’été des Samoa occidentales @@ -3959,6 +4036,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de Brasilia + + + heure britannique + heure d’été britannique + + heure du Brunei @@ -4137,9 +4220,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure moyenne de Greenwich - GMT + GMT + + + heure du Groenland + heure normale du Groenland + heure d’été du Groenland + + heure de l’Est du Groenland @@ -4154,11 +4244,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de l’Ouest du Groenland - - - heure de Guam - - heure du Golfe @@ -4171,7 +4256,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - heure normale d’Hawaï - Aléoutiennes + heure d’Hawaï @@ -4232,6 +4317,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été d’Iran + + + heure irlandaise + heure d’été irlandaise + + heure d’Irkoutsk @@ -4255,9 +4346,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - heure de Petropavlovsk-Kamchatski - heure normale de Petropavlovsk-Kamchatski - heure d’été de Petropavlovsk-Kamchatski + heure du Kamtchatka + heure normale du Kamtchatka + heure d’été du Kamtchatka @@ -4299,11 +4390,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure du Kirghizistan - - - heure de Lanka - - heure des îles de la Ligne @@ -4316,13 +4402,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de Lord Howe - - - heure de Macao - heure normale de Macao - heure d’été de Macao - - heure de Magadan @@ -4438,11 +4517,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de Fernando de Noronha - - - heure des îles Mariannes du Nord - - heure de Novossibirsk @@ -4527,13 +4601,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure de Pyongyang - - - heure de Kyzylorda - heure normale de Kyzylorda - heure d’été de Kyzylorda - - heure de La Réunion @@ -4560,9 +4627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - heure des Samoa heure normale des Samoa - heure d’été des Samoa @@ -4633,7 +4698,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure de Turquie heure normale de Turquie - heure avancée de Turquie + heure d’été de Turquie @@ -4655,6 +4720,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ heure d’été de l’Uruguay + + + heure d’Ürümqi + + heure de l’Ouzbékistan @@ -5161,6 +5231,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ franc suisse franc suisse francs suisses + fr. franc WIR @@ -5188,11 +5259,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yuan chinois (zone extracôtière) yuans chinois (zone extracôtière) - - dollar de la Banque populaire chinoise - dollar de la Banque populaire chinoise - dollars de la Banque populaire chinoise - yuan renminbi chinois yuan renminbi chinois @@ -6418,8 +6484,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ or du Zimbabwe - or du Zimbabwe - or du Zimbabwe dollar zimbabwéen (2009) @@ -6688,7 +6752,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ parts - {0} parts + {0} part {0} parts @@ -7849,7 +7913,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} items - {0} parts + {0} part {0} parts @@ -8667,7 +8731,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}items - {0} parts + {0} part {0} parts @@ -8686,9 +8750,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol {0}mol - - Glc - {0}l/km {0}l/km @@ -9066,11 +9127,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mmHg {0} mmHg - - de Hg - {0} de Hg - {0} de Hg - {0} lb/po² {0} lb/po² @@ -9276,7 +9332,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt imp. - cal-IT + {0} cal-IT + {0} cal-IT + + + {0} Sv + {0} Sv + + + {0} Gy + {0} Gy {0}ppb diff --git a/make/data/cldr/common/main/fr_CA.xml b/make/data/cldr/common/main/fr_CA.xml index 4d92bf3f0aed..36ef55aa96c8 100644 --- a/make/data/cldr/common/main/fr_CA.xml +++ b/make/data/cldr/common/main/fr_CA.xml @@ -48,6 +48,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic kalaallisut kashmiri chambala + kurde kurmanji live luba-katanga @@ -147,29 +148,64 @@ CLDR data files are interpreted according to the LDML specification (http://unic Vietnam + réorganisation des écritures et des blocs + transformer la destination Présentation des émojis + mixte + plus élevé ignoré + région de données supplémentaires + transformer la source + subdivision par région + transformer + hégirien, observation en Arabie saoudite par compatibilité ordre de tri du dictionnaire du dictionnaire + émoji ordre multilingue européen ordre de tri de l’annuaire de l’annuaire ordre de tri pinyin Rechercher par consonne initiale en hangeul + consonne initiale coréenne ordre de tri des traits des traits ordre de tri traditionnel ordre de tri zhuyin + lettres de base seulement + base, accents, casse, variantes, kana pleine chasse demi-chasse émoji + espaces, ponctuation, tous les symboles + espaces, ponctuation + espaces, ponctuation + espaces, ponctuation, symboles autres que les devises BGN (commission de toponymie des États-Unis) GENUNG chiffres gujaratis + numérotation selon le jour du mois en caractères Han pour les calendriers traditionnels + système décimal positionnel avec idéogrammes de nombres chinois comme chiffres + numérotation japonaise selon la première année d’une ère + chiffres taï tham (ecclésiastiques) + mathématiques en gras de tableau noir + mathématiques à espacement constant + mathématiques sans empattements gras + mathématiques sans empattements Chiffres mongols + chiffres birmans karène pwo oriental + chiffres birmans pa-o + chiffres birmans shan + chiffre birmans tai laing + chiffres creux + traduction automatique non précisée + + désactivé + activé + langue : {0} écriture : {0} @@ -349,6 +385,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic y-MM G + + {0}–{1} + h 'h' B – h 'h' B h – h 'h' B @@ -405,6 +444,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d – E d MMM + + d–d MMMM + d MMMM–d MMMM + y-MM – y-MM G y-MM – y-MM G @@ -524,6 +567,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + {1}, {0} @@ -569,6 +615,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic h 'h' mm a v HH 'h' mm v h 'h' a v + HH 'h' v MM-dd E MM-dd MM-dd @@ -670,6 +717,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM + + d–d MMMM + y – y @@ -1058,6 +1108,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} (heure avancée) {0} (heure normale) + + + UTC + + Dumont d’Urville @@ -1082,16 +1137,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic îles Féroé - - - heure avancée britannique - - - - - heure avancée irlandaise - - île de Man @@ -1154,13 +1199,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de l’Alaska - - - heure d’Alma Ata - heure normale d’Alma Ata - heure avancée d’Alma Ata - - heure de l’Amazonie @@ -1225,25 +1263,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - heure d’Apia - heure normale d’Apia + heure des Samoa occidentales + heure normale des Samoa occidentales heure avancée d’Apia - - - heure d’Aktaou - heure normale d’Aktaou - heure avancée d’Aktaou - - - - - heure d’Aqtöbe - heure normale d’Aqtöbe - heure avancée d’Aqtöbe - - heure de l’Arabie @@ -1340,6 +1364,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de Brasilia + + + heure britannique + heure avancée britannique + + heure du Brunéi @@ -1441,6 +1471,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de Géorgie + + + heure du Groenland + heure normale du Groenland + heure avancée du Groenland + + heure de l’Est du Groenland @@ -1455,11 +1492,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de l’Ouest du Groenland - - - heure normale d’Hawaï-Aléoutiennes - - heure d’Hawaï-Aléoutiennes @@ -1493,6 +1525,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée d’Iran + + + heure irlandaise + heure avancée irlandaise + + heure d’Irkoutsk @@ -1516,8 +1554,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic - heure de Petropavlovsk-Kamchatski - heure normale de Petropavlovsk-Kamchatski + heure du Kamtchatka + heure normale du Kamtchatka heure avancée de Petropavlovsk-Kamchatski @@ -1542,13 +1580,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de Lord Howe - - - heure de Macao - heure normale de Macao - heure avancée de Macao - - heure de Magadan @@ -1695,13 +1726,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic heure avancée de Sakhaline - - - heure des Samoa - heure normale des Samoa - heure avancée des Samoa - - heure de Taipei @@ -1811,18 +1835,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 0 k ¤ - 0 k ¤ - 00 k ¤ - 00 k ¤ - 000 k ¤ - 000 k ¤ - 0 M ¤ - 0 M ¤ - 00 M ¤ - 00 M ¤ - 000 M ¤ - 000 M ¤ 0 G ¤ 0 G ¤ 00 G ¤ @@ -2038,9 +2050,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} cube - {0} cube {0} cubes - {0} cubes force g @@ -2064,7 +2074,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} items - {0} part + {0} part {0} parts @@ -2258,17 +2268,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} chevaux-vapeur - {0} de mercure - {0} de mercure + {0} de mercure + {0} de mercure {0} livre-force par pouce carré {0} livres-force par pouce carré - - {0} bar - {0} bars - {0} pascal {0} pascals @@ -2351,10 +2357,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} chopine {0} chopines - - {0} tasse - {0} tasses - {0} once liquide {0} onces liquides @@ -2388,13 +2390,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic gobelet doseur - {0} gobelet doseur - {0} gobelets doseurs pincée - {0} pincée - {0} pincées feminine @@ -2411,20 +2409,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} katals - {0} coulomb - {0} coulombs + {0} coulomb + {0} coulombs - {0} farad - {0} farads + {0} farad + {0} farads - {0} henry - {0} henrys + {0} henry + {0} henrys - {0} siemens - {0} siemens + {0} siemens + {0} siemens {0} calorie [IT] @@ -2435,8 +2433,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} becquerels - {0} sievert - {0} sieverts + {0} sievert + {0} sieverts {0} gray @@ -2447,8 +2445,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kilogrammes-force - {0} tesla - {0} teslas + {0} tesla + {0} teslas {0} weber @@ -2459,8 +2457,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} parties par milliard - {0} nuit - {0} nuits {0} par nuit @@ -2664,10 +2660,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} h {0} h - - {0} min - {0} min - {0} s {0} s @@ -2957,8 +2949,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} mm Hg - {0} de Hg - {0} de Hg + {0} de Hg + {0} de Hg psi @@ -3195,20 +3187,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kat - {0} C - {0} C + {0} C + {0} C - {0} F - {0} F + {0} F + {0} F - {0} H - {0} H + {0} H + {0} H - {0} S - {0} S + {0} S + {0} S {0} cal-IT @@ -3219,8 +3211,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Bq - {0} Sv - {0} Sv + {0} Sv + {0} Sv {0} Gy @@ -3231,8 +3223,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kgf - {0} T - {0} T + {0} T + {0} T {0} Wb @@ -3391,8 +3383,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mmHg - {0}deHg - {0}deHg + {0}deHg + {0}deHg {0}psi @@ -3407,9 +3399,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}nd {0}nd - - Bf - {0}lb-pi {0}lb-pi @@ -3501,20 +3490,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kat - {0}C - {0}C + {0}C + {0}C - {0}F - {0}F + {0}F + {0}F - {0}H - {0}H + {0}H + {0}H - {0}S - {0}S + {0}S + {0}S {0}cal-IT @@ -3525,8 +3514,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}Bq - {0}Sv - {0}Sv + {0}Sv + {0}Sv {0}Gy @@ -3537,8 +3526,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kgf - {0}T - {0}T + {0}T + {0}T {0}Wb diff --git a/make/data/cldr/common/main/fr_GF.xml b/make/data/cldr/common/main/fr_GF.xml index c767d963292d..f479aa1fb8d6 100644 --- a/make/data/cldr/common/main/fr_GF.xml +++ b/make/data/cldr/common/main/fr_GF.xml @@ -18,6 +18,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic GFT + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + diff --git a/make/data/cldr/common/main/fr_RW.xml b/make/data/cldr/common/main/fr_RW.xml index 64cf21635cfd..1d89d025546a 100644 --- a/make/data/cldr/common/main/fr_RW.xml +++ b/make/data/cldr/common/main/fr_RW.xml @@ -12,6 +12,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + , + RF diff --git a/make/data/cldr/common/main/frr.xml b/make/data/cldr/common/main/frr.xml deleted file mode 100644 index e8809ee64bf0..000000000000 --- a/make/data/cldr/common/main/frr.xml +++ /dev/null @@ -1,5478 +0,0 @@ - - - - - - - - - - - Abchaasisk - Achineesk - Adangme - Adygeesk - Afrikaans - Aghem - Ainu - Akan - Aleutisk - Süüd Altai - Amhaarisk - Aragoneesk - Obolo - Angika - Araabisk - Modern Standard Araabisk - Mapuche - Arapaho - Najdi Araabisk - Asameesk - Asu - Astuurisk - Atikamekw - Awaarisk - Awadhi - Aymara - Aserbaidschaansk - Aseeri - Baschkiirisk - Belutschisk - Balineesk - Basaa - Witjrüsk - Bemba - Bena - Bulgaarsk - Haryanvi - Bhoipuurisk - Bislama - Bini - Siksiká - Anii - Bambara - Bengaals - Tibetaans - Bretoonsk - Bodo - Bosnisk - Bugineesk - Blin - Katalaans - Cayuga - Chakma - Tschetscheensk - Cebuano - Chiga - Chamorro - Chuukese - Mari - Choctaw - Chipewyan - Cherokee - Cheyenne - Madel Kurdisk - Kurdisk, Madel - Kurdisk, Sorani - Chilcotin - Korsisk - Michif - Süüdelk Uast Cree - Plains Cree - Nuurdelk Uast Cree - Moose Cree - Carolina Algonkin - Tschechisk - Swampy Cree - Tschuwaschisk - Waliisk - Deensk - Dakota - Dargwa - Taita - Tjiisk - Uastenriks Tjiisk - Sweitser Huuchtjiisk - Dogrib - Zarma - Dogri - Liachsorbisk - Duala - Divehi - Jola-Fonyi - Dzongkha - Dazaga - Embu - Ewe - Efik - Ekajuk - Greks - Ingelsk - Austraalisk Ingelsk - Kanaadsk Ingelsk - Britisk Ingelsk - UK Ingelsk - Amerikoonsk Ingelsk - US Ingelsk - Esperanto - Spaans - Amerikoonsk Spaans - Europeesk Spaans - Meksikoons Spaans - Eestnisk - Baskisk - Ewondo - Persisk - Dari - Fula - Finsk - Filipiinsk - Fidschiaans - Färöisk - Fon - Fransöösk - Kanaadsk Fransöösk - Sweitser Fransöösk - Cajun Fransöösk - Nordfriisk - Friaulisk - Waastfresk - Iirsk - Ga - Skots Geelisk - Geez - Gilberteesk - Galitsisk - Guarani - Gorontalo - Sweitsertjiisk - Gujarati - Gusii - Manx - Gwichʼin - Hausa - Haida - Hawaiiaans - Süüd Haida - Hebreews - Hindi - Hiligaynon - Hmong - Kroatisk - Huuchsorbisk - Haitiaans Kreool - Ungaars - Hupa - Halkomelem - Armeensk - Herero - Interlingua - Iban - Ibibio - Indoneesk - Interlingue - Igbo - Sichuan Yi - Waast Kanaadsk Inuktitut - Iloko - Inguschisk - Ido - Isluns - Itajeensk - Inuktitut - Japaans - Lojban - Ngomba - Machame - Jawaneesk - Georgisk - Kabyle - Jingpo - Kaje - Kamba - Kabardisk - Tyap - Makonde - Kabuverdianu - Koro - Kaingang - Khasi - Koyra Chiini - Kikuyu - Kuanyama - Kasachisk - Kako - Kalaallisut - Kalenjin - Khmer - Kimbundu - Kannada - Koreaans - Konkani - Kpelle - Kanuri - Karachay-Balkar - Kareelisk - Kurukh - Kaschmiirisk - Shambala - Bafia - Kölsch - Kurdisk - Kurdisk (Kurmanji) - Kurmanji - Kumyk - Komi - Kornisk - Kwakʼwala - Kuvi - Kirgiisk - Latiinsk - Ladiinsk - Langi - Luksemborigs - Lesgisk - Ganda - Limburgs - Liguurisk - Lillooet - Lakota - Lombardisk - Lingala - Laotisk - Louisiana Kreool - Lozi - Nuurd Luri - Saamia - Litauisk - Luba-Katanga - Luba-Lulua - Lunda - Luo - Mizo - Luyia - Letisk - Madureesk - Magahi - Maithili - Makasar - Masai - Moksha - Mende - Meru - Mauritiaans - Malagasy - Makhuwa-Meetto - Metaʼ - Marshaleesk - Maori - Mi'kmaw - Minangkabau - Matsedoonsk - Malayalam - Mongoolsk - Manipuri - Innu-aimun - Mohawk - Mossi - Marathi - Malaiisk - Malteesk - Mundang - Flook spriaken - Muscogee - Mirandees - Burmeesk - Erzya - Mazanderani - Nauru - Neapolitaans - Nama - Noorsk Bokmål - Nuurd Ndebele - Plaattjiisk - Nepaleesk - Newari - Ndonga - Nias - Niueaans - Holuns - Flaams - Kwasio - Noorsk Nynorsk - Ngiemboon - Noorsk - Nogai - N’Ko - Süüd Ndebele - Nuurd Sotho - Nuer - Navajo - Nyanja - Nyankole - Oksitaans - Nuurdwaast Ojibwa - Madel Ojibwa - Oji-Cree - Waast Ojibwa - Okanagan - Oromo - Odia - Oseetisk - Panjabi - Pangasineesk - Pampanga - Papiamento - Palauisk - Nigeriaans Pidgin - Salomoonen Pidgin - Poolsk - Maliseet-Passamaquoddy - Preusisk - Paschtu - Portugiisk - Brasiliaans Portugiisk - Europeesk Portugiisk - Ketschua - Rajastaans - Rapanui - Rarotongaans - Rohingya - Rätoromaans - Rundi - Rumeensk - Rombo - Rüsk - Arumeensk - Kinyarwanda - Rwa - Sanskrit - Sandawe - Jakutisk - Samburu - Santali - Ngambay - Sangu - Sardiinsk - Sitsiliaans - Skots - Sindhi - Nuurd Saamisk - Sena - Koyraboro Senni - Sango - Tachelhit - Shan - Sinhala - Slowaakisk - Sloweensk - Süüd Lushootseed - Samoaans - Inari Sami - Skoltsaamisk - Shona - Soninke - Somaalisk - Albaansk - Serbisk - Sranan Tongo - Swati - Süüd Sotho - Straits Salish - Sundaneesk - Sukuma - Sweedsk - Suaheli - Komoorisk - Syrisk - Sleesisk - Tamiilisk - Süüd Tutchone - Telugu - Timne - Teso - Tetum - Tadjikisk - Tagish - Thai - Tahltan - Tigrinya - Tigre - Turkmeensk - Klingoonisk - Tlingit - Tsuana - Tongaans - Toki Pona - Tok Pisin - Türkisk - Taroko - Tsonga - Tataarisk - Nuurd Tutchone - Tumbuka - Tuwaaluu - Tasawaq - Tahitiaans - Tuwiinisk - Madel Atlas Tamazight - Udmurtisk - Uiguurisk - Ukrainisk - Umbundu - Ünbekäänd spriik - Urdu - Usbeekisk - Vai - Venda - Veneetisk - Wjetnameesk - Makuva - Vunjo - Waloons - Walsertjiisk - Wolaytta - Waray - Wolof - Wu Schineesk - Kalmükisk - Xhosa - Kangri - Soga - Yangben - Yemba - Jidisk - Yoruba - Nheengatu - Kantoneesk - Schineesk, Kantoneesk - Zhuang - Maroko Standard Tamazight - Schineesk - Mandariin Schineesk - Kurt Schineesk - Kurt Mandariin Schineesk - Lung Schineesk - Lung Mandariin Schineesk - Zulu - Zuni - Nian spriak - Zaza - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wäält - Afrikoo - Nuurdameerikoo - Süüdameerikoo - Oseaanien - Waastafrikoo - Madelameerikoo - Uastafrikoo - Nuurdafrikoo - Madelafrikoo - Süüdelk Afrikoo - Ameerikoo - Nuurdelk Ameerikoo - Kariibik - Uastaasien - Süüdaasien - Süüduastaasien - Süüdeuroopa - Austraalaasien - Melaneesien - Mikroneesien - Polyneesien - Aasien - Madelaasien - Waastaasien - Euroopa - Uasteuroopa - Nuurdeuroopa - Waasteuroopa - Süüdelk Sahara Afrikoo - Latiinsk Ameerikoo - Ascension Eilun - Andora - Ferianigt Araabisk Emiraaten - Afghaanistaan - Antiigua an Barbuuda - Anguilla - Albaanien - Armeenien - Angoola - Antarktikaa - Argentiinien - Amerikoonsk Samoa - Uastenrik - Austraalien - Aruuba - Åland Eilunen - Aserbaidschaan - Bosnien an Hertsegowina - Barbaados - Bangladesch - Belgien - Burkiina Faaso - Bulgaarien - Bachrain - Burundi - Beniin - St. Barthélemy - Bermuuda - Brunei - Boliiwien - Kariibisk Neederlunen - Brasiilien - Bahaamas - Bhuutaan - Bouvet Eilun - Botsuana - Witjruslun - Belize - Kanada - Cocos Eilunen - Kongo - Kinshasa - Demokraatisk Republiik Kongo - Madelafrikoonsk Republiik - Kongo - Brazzaville - Republiik Kongo - Sweits - Côte d’Ivoire - Elfenbianküst - Cook Eilunen - Chiile - Kameruun - Schiina - Kolumbien - Clipperton Eilun - Sark - Costa Rica - Kuuba - Kapwerden - Curaçao - Jul Eilun - Tsypern - Tschechien - Tschechisk Republiik - Tjiisklun - Diego Garcia - Djibuti - Denemark - Domiinika - Dominikaans Republiik - Algeerien - Ceuta an Melilla - Ekwadoor - Eestlun - Egypten - Waastsahara - Eritrea - Spoonien - Etioopien - Europeesk Unioon - Eurorüm - Finlun - Fidschi - Falkland Eilunen - Falkland Eilunen (Malwiinen) - Tuupslööden Stooten faan Mikroneesien - Färöer Eilunen - Frankrik - Gabuun - Ferianigt Köningrik - UK - Grenaada - Georgien - Fransöösk Guayaana - Guernsey - Ghaana - Gibraltaar - Greenlun - Gambia - Guinea - Guadeloupe - Ekwatoriaalguinea - Griichenlun - Süüdgeorgien an Süüdelk Sandwich Eilunen - Guatemaala - Guam - Guinea-Bissau - Guyaana - Prowins Hongkong - Hongkong - Heard an McDonald Eilunen - Honduuras - Kroaatien - Haiti - Ungarn - Kanaarisk Eilunen - Indoneesien - Irlun - Israel - Eilun Man - Indien - Britisk Teritoorium uun a Indisk Oosean - Chagos Eilunen - Iraak - Iraan - Islun - Itaalien - Jersey - Jamaika - Jordaanien - Jaapan - Keenia - Kirgistaan - Kambodscha - Kiribaati - Komooren - St. Kitts an Nevis - Nuurdkorea - Süüdkorea - Kuwait - Kaiman Eilunen - Kasachstaan - Laos - Liibanon - St. Lucia - Liechtenstein - Sri Lanka - Libeeria - Lesotho - Litauen - Luksemborig - Letlun - Liibyen - Maroko - Monako - Moldaawien - Monteneegro - St. Martin - Madagaskar - Marshall Eilunen - Nuurdmatsedoonien - Maali - Mjanmaar - Mongolei - Prowins Macao - Macao - Nuurdelk Mariaanen - Martinique - Mauretaanien - Montserrat - Malta - Mauritius - Malediiwen - Malaawi - Meksiko - Malaysia - Mosambik - Namiibia - Nei Kaledoonien - Niiger - Norfolk Eilun - Nigeeria - Nikaraagua - Neederlunen - Norweegen - Neepaal - Nauru - Niue - Neisialun - Aotearoa - Omaan - Panama - Peruu - Fransöösk Polyneesien - Papua Nei Guinea - Filipiinen - Pakistaan - Poolen - St. Pierre an Miquelon - Pitcairn Eilunen - Puerto Riko - Stoot Palestiina - Palestiina - Portugal - Palau - Paraguay - Kataar - Faarder Oseaanien - Réunion - Rumeenien - Serbien - Ruslun - Ruanda - Saudi Araabien - Salomon Eilunen - Seschelen - Sudaan - Sweeden - Singapuur - St. Helena - Sloweenien - Svalbard an Jan Mayen - Slowakei - Sierra Leone - San Marino - Seenegal - Somaalia - Suurinam - Süüdsudaan - São Tomé an Príncipe - El Salvador - Sint Maarten - Syrien - Eswatini - Swaasilun - Tristan da Cunha - Turks an Caicos Eilunen - Tschad - Fransöösk Süüd- an Antarktisregiuunen - Toogo - Thailun - Tadjikistaan - Tokelau - Timor-Leste - Uast Timor - Turkmeenistaan - Tuneesien - Tonga - Türkiye - Türkei - Trinidad an Tobaago - Tuwaalu - Taiwan - Tansania - Ukraine - Uganda - United States Minor Outlying Islands - Feriand Natsioonen - Ferianagt Stooten - USA - Uruguay - Usbekistaan - Watikaanstääd - St. Vincent an Grenadiinen - Weenesuela - Britisk Jongfoomen Eilunen - Amerikoonsk Jongfoomen Eilunen - Wjetnam - Wanuaatuu - Wallis an Futuna - Samoa - Pseudo-Accents - Pseudo-Bidi - Kosowo - Jemen - Mayotte - Süüdafrikoo - Sambia - Simbabwe - Ünbekäänd Regiuun - - - Kalender - Münt Formaat - Sortiaring - Münt - Emoji Presentatsion - Stünjen Formaat (12 of 24) - Rä Ambreeg String - Rä ambreeg uun wurden - Miat Süsteem - Taalen - Sats aanj efter ufk. - - - Buddhistisk Kalender - Buddhistisk - Schineesk Kalender - Schineesk - Koptisk Kalender - Koptisk - Dangi Kalender - Dangi - Etioopisk Kalender - Etioopisk - Etioopisk Amete Alem Kalender - Etioopisk Amete Alem - Gregoriaans Kalender - Gregoriaans - Hebreewsk Kalender - Hebreewsk - Islaamisk Kalender - Islaamisk - Islaamisk Bürgerlik Kalender - Islaamisk Bürgerlik - Islaamisk Umalkura Kalender - Islaamisk Umalkura - ISO-8601 Kalender - Japoonsk Kalender - Japoonsk - Persisk Kalender - Persisk - Minguo Kalender - Minguo - Konto Münt Formaat - Konto - Standard Münt Formaat - Standard - Unicode Sortiaring - Normool Unicode - Normool Schük - Schük - Standard Sortiaring - Standard - Normool - Emoji - Tekst - 12 Stünj Süsteem (0–11) - 12 (0–11) - 12 Stünj Süsteem (1–12) - 12 (1–12) - 24 Stünj Süsteem (0–23) - 24 (0–23) - 24 Stünj Süsteem (1–24) - 24 (1–24) - Luas Rä Ambreeg Stiil - Luas - Normool Rä Ambreeg Stiil - Normool - String Rä Ambreeg Stiil - String - Aal ambreeg - Aal hual - Normool - Hual uun fraasen - Meetrisk Süsteem - Meetrisk - UK Süsteem - UK - US Süsteem - US - Ahom Taalen - Araabisk Taalen - Ütjwidjet Araabisk Taalen - Armeensk Taalen - Armeensk Letj Taalen - Balineesk Taalen - Bangla Taalen - Brahmi Taalen - Chakma Taalen - Cham Taalen - Kyrilisk Taalen - Devanagari Taalen - Dives Akuru Taalen - Etioopisk Taalen - Ütjwidjet Taalen - Garay Taalen - Georgisk Taalen - Gunjala Gondi Taalen - Masaram Gondi Taalen - Greks Taalen - Greks Letj Taalen - Gujarati Taalen - Gurung Khema Taalen - Gurmukhi Taalen - Schineesk Deesimaal Taalen - Ianfach Schineesk Taalen - Ianfach Schineesk Finans Taalen - Ual Schineesk Taalen - Ual Schineesk Finans Taalen - Hebreewsk Taalen - Pahawh Hmong Taalen - Nyiakeng Puachue Hmong Taalen - Jawaans Taalen - Japoonsk Taalen - Japoonsk Finans Taalen - Kayah Li Taalen - Kawi Taalen - Khmer Taalen - Kanaada Taalen - Kirat Rai Taalen - Tai Tham Hora Taalen - Tai Tham Tham Taalen - Laotisk Taalen - Europeesk Taalen - Lepcha Taalen - Limbu Taalen - Malayalam Taalen - Meetei Mayek Taalen - Mjanmaar Taalen - Ol Chiki Taalen - Oriya Taalen - Röömsk Taalen - Röömsk Letj Taalen - Ual Tamil Taalen - Tamil Taalen - Telugu Taalen - Thai Taalen - Tibetaans Taalen - Vai Taalen - Uf - Uun - - - Meetrisk - Britisk - US-Amerikoonsk - - - Spriik: {0} - Skraft: {0} - Regiuun: {0} - - - - [aåäā b c dđ eē f g h i j k l m n oö p r s t uü w] - [áàăâã æ ç éèĕêë ğ íìĭîïİī ı ñ óòŏôøō œ q ş ß úùŭûū v x yÿ z] - [\- ‐‑ – — , ; \: ! ? . … '‘‚ "“„ « » ( ) \[ \] \{ \} § @ * / \& #] - - - - - - - - G y MMMM d, EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1}, {0} - - - {1} 'am' {0} - - - {1} 'am' {0} - - - - - {1}, {0} - - - {1} 'am' {0} - - - {1} 'am' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - E, h B - E, h a - E, HH:mm - E, HH:mm:ss - MMM, d - G y MMM, d - - - - - - - - Jan - Feb - Mar - Apr - Mei - Jün - Jül - Aug - Sep - Okt - Nof - Det - - - Janewoore - Febrewoore - Maarts - April - Mei - Jüüne - Jüüle - August - September - Oktuuber - Nofember - Detsember - - - - - J - F - M - A - M - J - J - A - S - O - N - D - - - - - - - Sön - Mun - Tei - Wed - Tür - Fre - San - - - Sö - Mu - Te - We - Tü - Fr - Sa - - - Söndai - Mundai - Teisdai - Weedensdai - Tüürsdai - Freidai - Saninj - - - - - - - 1.Q - 2.Q - 3.Q - 4.Q - - - iarst kwartaal - naist kwartaal - traad kwartaal - fjuard kwartaal - - - - - 1.Q - 2.Q - 3.Q - 4.Q - - - I - II - III - IV - - - - - - - i/m - e/m - - - i - e - - - de iarmade - de eftermade - - - - - i - e - - - iarmade - eftermade - - - - - - föör Krast - föör üüs tidjreegning - - - f.Kr. - AD - - - - - - EEEE, d. MMMM y - - - - - d. MMMM y - - - - - d. MMM y - - - - - dd/MM/yy - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1}, {0} - - - {1} 'am' {0} - - - {1} 'am' {0} - - - - - {1}, {0} - - - {1} 'am' {0} - - - {1} 'am' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - d. - E, h B - E, h:mm B - E, h:mm:ss B - E, d. - E, h a - E, h:mm a - E, HH:mm - E, h:mm:ss a - E, HH:mm:ss - G M/y - G d/M/y - G E, d/M/y - G MMM y - G d. MMM y - G E, d. MMM y - h a - h:mm a - h:mm:ss a - h:mm:ss a v - h:mm a v - d/M - E d/M - d. MMM - E, d. MMM - d. MMMM - 'weg' W 'faan' MMMM - M/y - d/M/y - E, d/M/y - MMM y - d. MMM y - E, d. MMM y - MMMM y - QQQ y - QQQQ y - 'weg' w 'faan' Y - - - - d. – d. - - - G y – G y - G y – y - - - G M/y – G M/y - G M/y – M/y - G M/y – M/y - - - G d/M/y – d/M/y - G d/M/y – G d/M/y - G d/M/y – d/M/y - G d/M/y – d/M/y - - - G E, d/M/y – E, d/M/y - G E, d/M/y – G E, d/M/y - G E, d/M/y – E, d/M/y - G E, d/M/y – E, d/M/y - - - G MMM y – G MMM y - G MMM – MMM y - G MMM y – MMM y - - - G d. – d. MMM y - G d. MMM y – G d. MMM y - G d. MMM – d. MMM y - G d. MMM y – d. MMM y - - - G E, d. MMM – E, d. MMM y - G E, d. MMM y – G E, d. MMM yE - G E, d. MMM y – E, d. MMM y - G E, d. MMM y – E, d. MMM y - - - h a – h a - h – h a - - - HH – HH - - - h:mm a – h:mm a - h:mm – h:mm a - h:mm – h:mm a - - - HH:mm – HH:mm - HH:mm – HH:mm - - - h:mm a – h:mm a v - h:mm – h:mm a v - h:mm – h:mm a v - - - HH:mm – HH:mm v - HH:mm – HH:mm v - - - h a – h a v - h – h a v - - - HH – HH v - - - M – M - - - d/M – d/M - d/M – d/M - - - E, d/M – E, d/M - E, d/M – E, d/M - - - LLL – LLL - - - d. – d. MMM - d. MMM – d. MMM - - - E, d. MMM – E, d. MMM - E, d. MMM – E, d. MMM - - - y – y - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - - - MMM – MMM y - MMM y – MMM y - - - d. – d. MMM y - d. MMM – d. MMM y - d. MMM y – d. MMM y - - - E, d. MMM – E, d. MMM y - E, d. MMM y – E, d. MMM y - E, d. MMM y – E, d. MMM y - - - MMMM – MMMM y - MMMM y – MMMM y - - - - - - - - tidjrüm - - - juar - letst juar - das juar - naist juar - - uun {0} juaren - - - föör {0} juaren - - - - j. - letst j. - das j. - naist j. - - uun {0} j. - - - föör {0} j. - - - - j - - - kwartjuar - iarst kwartaal - das kwartaal - naist kwartaal - - uun {0} kwartaalen - - - föör {0} kwartaalen - - - - kwrt. - letst kw. - das kw. - naist kw. - - uun {0} kwn. - - - föör {0} kwn. - - - - kwrt - letst kw. - das kw. - naist kw. - - uun {0} kwn. - - - föör {0} kwn. - - - - muun - letst muun - das muun - naist muun - - uun {0} muuner - - - föör {0} muuner - - - - m. - letst m. - das m. - naist m. - - - m - letst m - das m - naist m - - uun {0} m - - - föör {0} m - - - - weg - letst weg - das weg - naist weg - - uun {0} w - - - föör {0} w - - at weg faan {0} - - - w. - letst w. - das w. - naist w. - - uun {0} w - - - föör {0} w - - - - w - - uun {0} w - - - föör {0} w - - - - weg faan muun - - - w. faan m. - - - dai - jister - daaling - maaren - - uun {0} daar - - - föör {0} daar - - - - d. - - - d - - uun {0} d - - - föör {0} d - - - - dai faan juar - - - dai faan j. - - - wegdai - - - wegdai faan muun - - - wegd. faan m. - - - wegd. faan m. - - - letst Söndai - das Söndai - naist Söndai - - uun {0} Söndaar - - - föör {0} Söndaar - - - - letst Sön. - das Sön. - naist Sön. - - uun {0} Sön. - - - föör {0} Sön. - - - - letst Sö - das Sö - naist Sö - - uun {0} Sö - - - föör {0} Sö - - - - letst Mundai - das Mundai - naist Mundai - - uun {0} Mundaar - - - föör {0} Mundaar - - - - letst Mun. - das Mun. - naist Mun. - - uun {0} Mun. - - - föör {0} Mun. - - - - letst Mun. - das Mun. - naist Mun. - - uun {0} Mun. - - - föör {0} Mun. - - - - letst Teisdai - das Teisdai - naist Teisdai - - uun {0} Teisdaar - - - föör {0} Teisdaar - - - - letst Tei. - das Tei. - naist Tei. - - uun {0} Tei. - - - föör {0} Tei. - - - - letst Tei - das Tei - naist Tei - - uun {0} Tei - - - föör {0} Tei - - - - letst Weedensdai - das Weedensdai - naist Weedensdai - - uun {0} Weedensdaar - - - föör {0} Weedensdaar - - - - letst Weed. - das Weed. - naist Weed. - - uun {0} Weed. - - - föör {0} Weed. - - - - letst Weed - das Weed - naist Weed - - uun {0} Weed - - - föör {0} Weed - - - - letst Tüürsdai - das Tüürsdai - naist Tüürsdai - - uun {0} Tüürsdaar - - - föör {0} Tüürsdaar - - - - letst Tüü. - das Tüü. - naist Tüü. - - uun {0} Tüü. - - - föör {0} Tüü. - - - - letst Tüü. - das Tüü. - naist Tüü. - - uun {0} Tüü. - - - föör {0} Tüü. - - - - letst Freidai - das Freidai - naist Freidai - - uun {0} Freidaar - - - föör {0} Freidaar - - - - letst Fr. - das Fr. - naist Fr. - - uun {0} Fr. - - - föör {0} Fr. - - - - letst Fr - das Fr - naist Fr - - uun {0} Fr - - - föör {0} Fr - - - - letst Saninj - das Saninj - naist Saninj - - uun {0} Saninjer - - - föör {0} Saninjer - - - - letst San. - das San. - naist San. - - uun {0} San. - - - föör {0} San. - - - - letst Sa - das Sa - naist Sa - - uun {0} Sa - - - föör {0} Sa - - - - iarm./efterm. - - - iarmade/eftermade - - - IM/EM - - - stünj - das stünj - - uun {0} stünjen - - - föör {0} stünjen - - - - s. - das st. - - uun {0} st. - - - föör {0} st. - - - - s - - uun {0} st - - - föör {0} st - - - - minüt - das minüüt - - uun {0} minüüten - - - föör {0} minüüten - - - - min. - - uun {0} min. - - - föör {0} min. - - - - min - - uun {0} min - - - föör {0} min - - - - sekund - nü - - uun {0} sekunden - - - föör {0} sekunden - - - - sek. - - uun {0} sek. - - - föör {0} sek. - - - - sek - - uun {0} s - - - föör {0} s - - - - tidjsoon - - - soon - - - - {0} Tidj - {0} Somertidj - {0} Standard Tidj - - - Ufstemet Wäälttidj - - - - Ünbekäänd steed - - - Andora - - - Antiigua - - - Tirana - - - Jerewan - - - Wostok - - - Wiin - - - Aruuba - - - Barbaados - - - Brüssel - - - Bachrain - - - Bermuuda - - - Cocos Eilunen - - - Zürich - - - Puask Eilunen - - - Urumtschi - - - Schanghai - - - Kapwerden - - - Jul Eilun - - - Nikosia - - - Praag - - - Kopenhuuwen - - - Domiinika - - - Algier - - - Kairo - - - Kanaaren - - - Fidschi - - - Färöern - - - Pariis - - - - Britisk Somertidj - - - - Grenaada - - - Tiflis - - - Gibraltaar - - - Atheen - - - Süüdgeorgien - - - Guatemaala - - - Guyaana - - - Hongkong - - - - Iirsk Standard Tidj - - - - Eilun Man - - - Kalkuta - - - Bagdad - - - Teheran - - - Room - - - Tokio - - - Bischkek - - - Pjöngjang - - - Wjentiane - - - Luksemborig - - - Riiga - - - Tripolis - - - Monako - - - Ranguun - - - Chowd - - - Malediiwen - - - Bahia de Banderas - - - Meksiko Steed - - - Kutsching - - - Norfolk Eilun - - - Maskat - - - Karatschi - - - Warschau - - - Puerto Riko - - - Atsooren - - - Lisabon - - - Kataar - - - Bukarest - - - Belgrad - - - Moskau - - - Wolgograd - - - Saratow - - - Astrachan - - - Uljanowsk - - - Jekaterinburg - - - Nowosibirsk - - - Nowokusnetsk - - - Krasnojarsk - - - Jakutsk - - - Wladiwostok - - - Sachalin - - - Kamtschatka - - - Riad - - - Singapuur - - - Damaskus - - - Duschanbe - - - Aschgabat - - - Taipee - - - Kiew - - - Beulah, Nuurd Dakota - - - New Salem, Nuurd Dakota - - - Center, Nuurd Dakota - - - Taschkent - - - Watikaanstääd - - - Ho Chi Minh Steed - - - - Afghaanistaan Tidj - - - - - Sentraal Afrikoo Tidj - - - - - Uast Afrikoo Tidj - - - - - Süüdelk Afrikoo Standard Tidj - - - - - Waast Afrikoo Tidj - - - - - Alaska Tidj - Alaska Standard Tidj - Alaska Somertidj - - - - - Amazonas Tidj - Amazonas Standard Tidj - Amazonas Somertidj - - - - - Sentraal Ameerikoo Tidj - Sentraal Ameerikoo Standard Tidj - Sentraal Ameerikoo Somertidj - - - - - Uast Ameerikoo Tidj - Uast Ameerikoo Standard Tidj - Uast Ameerikoo Somertidj - - - - - Waast Ameerikoo Tidj - Waast Ameerikoo Standard Tidj - Waast Ameerikoo Somertidj - - - - - Ameeriko Pasiifik Tidj - Ameerikoo Pasiifik Standard Tidj - Ameerikoo Pasiifik Somertidj - - - - - Samoa Tidj - Samoa Standard Tidj - Samoa Somertidj - - - - - Araabisk Tidj - Araabisk Standard Tidj - Araabisk Somertidj - - - - - Argentiinien Tidj - Argentiinien Standard Tidj - Argentiinien Somertidj - - - - - Waast Argentiinien Tidj - Waast Argentiinien Standard Tidj - Waast Argentiinien Somertidj - - - - - Armeenien Tidj - Armeenien Standard Tidj - Armeenien Somertidj - - - - - Ameerikoo Atlantik Tidj - Ameerikoo Atlantik Standard Tidj - Ameerikoo Atlantik Somertidj - - - - - Austraalisk Sentraal Tidj - Austraalisk Sentraal Standard Tidj - Austraalisk Sentraal Somertidj - - - - - Austraalisk Madelwaast Tidj - Austraalisk Madelwaast Standard Tidj - Austraalisk Madelwaast Somertidj - - - - - Uast Austraalisk Tidj - Uast Austraalisk Standard Tidj - Uast Austraalisk Somertidj - - - - - Waast Austraalisk Tidj - Waast Austraalisk Standard Tidj - Waast Austraalisk Somertidj - - - - - Aserbaidschaan Tidj - Aserbaidschaan Standard Tidj - Aserbaidschaan Somertidj - - - - - Atsooren Tidj - Atsooren Standard Tidj - Atsooren Somertidj - - - - - Bangladesch Tidj - Bangladesch Standard Tidj - Bangladesch Somertidj - - - - - Bhuutaan Tidj - - - - - Boliiwien Tidj - - - - - Brasiilien Tidj - Brasiilien Standard Tidj - Brasiilien Somertidj - - - - - Brunei Tidj - - - - - Kapwerden Tidj - Kapwerden Standard Tidj - Kapwerden Sommertidj - - - - - Chamorro Tidj - - - - - Chatham Tidj - Chatham Standard Tidj - Chatham Somertidj - - - - - Chiile Tidj - Chiile Standard Tidj - Chiile Somertidj - - - - - Schiina Tidj - Schiina Standard Tidj - Schiina Somertidj - - - - - Jul Eilun Tidj - - - - - Cocos Eilunen Tidj - - - - - Kolumbien Tidj - Kolumbien Standard Tidj - Kolumbien Somertidj - - - - - Cook Eilunen Tidj - Cook Eilunen Standard Tidj - Cook Eilunen Somertidj - - - - - Kuuba Tidj - Kuuba Standard Tidj - Kuuba Somertidj - - - - - Davis Tidj - - - - - Dumont d’Urville Tidj - - - - - Uast Tiimor Tidj - - - - - Puask Eilun Tidj - Puask Eilun Standard Tidj - Puask Eilun Somertidj - - - - - Ekwadoor Tidj - - - - - Madeleuropeesk Tidj - Madeleuropeesk Standard Tidj - Madeleuropeesk Somertidj - - - - - Uasteuropeesk Tidj - Uasteuropeesk Standard Tidj - Uasteuropeesk Somertidj - - - - - Faarder Uasteuropeesk Tidj - - - - - Waasteuropeesk Tidj - Waasteuropeesk Standard Tidj - Waasteuropeesk Somertidj - - - - - Falklun Eilunen Tidj - Falklun Eilunen Standard Tidj - Falklun Eilunen Somertidj - - - - - Fidschi Tidj - Fidschi Standard Tidj - Fidschi Somertidj - - - - - Fransöösk Guayaana Tidj - - - - - Fransöösk Süüd an Antarktis Tidj - - - - - Galapagos Tidj - - - - - Gambier Tidj - - - - - Georgien Tidj - Georgien Standard Tidj - Georgien Somertidj - - - - - Gilbert Eilunen Tidj - - - - - Madel Greenwich Tidj - - - - - Uast Greenlun Tidj - Uast Greenlun Standard Tidj - Uast Greenlun Somertidj - - - - - Waast Greenlun Tidj - Waast Greenlun Standard Tidj - Waast Greenlun Somertidj - - - - - Golf Tidj - - - - - Guyaana Tidj - - - - - Hawaii-Aleuten Standard Tidj - - - - - Hawaii-Aleuten Tidj - Hawaii-Aleuten Standard Tidj - Hawaii-Aleuten Somertidj - - - - - Hongkong Tidj - Hongkong Standard Tidj - Hongkong Somertidj - - - - - Chowd Tidj - Chowd Standard Tidj - Chowd Somertidj - - - - - Indisk Tidj - - - - - Indisk Ooseaan Tidj - - - - - Indoschiina Tidj - - - - - Sentraal Indoneesien Tidj - - - - - Uast Indoneesien Tidj - - - - - Waast Indoneesien Tidj - - - - - Iraan Tidj - Iraan Standard Tidj - Iraan Somertidj - - - - - Irkutsk Tidj - Irkutsk Standard Tidj - Irkutsk Somertidj - - - - - Israel Tidj - Israel Standard Tidj - Israel Somertidj - - - - - Jaapan Tidj - Jaapan Standard Tidj - Jaapan Somertidj - - - - - Kasachstaan Tidj - - - - - Uast Kasachstaan Tidj - - - - - Waast Kasachstaan Tidj - - - - - Korea Tidj - Korea Standard Tidj - Korea Somertidj - - - - - Kosrae Tidj - - - - - Krasnojarsk Tidj - Krasnojarsk Standard Tidj - Krasnojarsk Somertidj - - - - - Kirgistaan Tidj - - - - - Line Eilunen Tidj - - - - - Lord Howe Tidj - Lord Howe Standard Tidj - Lord Howe Somertidj - - - - - Magadan Tidj - Magadan Standard Tidj - Magadan Somertidj - - - - - Malaysia Tidj - - - - - Malediiwen Tidj - - - - - Marquesas Tidj - - - - - Marshall Eilunen Tidj - - - - - Mauritius Tidj - Mauritius Standard Tidj - Mauritius Somertidj - - - - - Mawson Tidj - - - - - Meksiko Pasiifik Tidj - Meksiko Pasiifik Standard Tidj - Meksiko Pasiifik Somertidj - - - - - Ulaanbaatar Tidj - Ulaanbaatar Standard Tidj - Ulaanbaatar Somertidj - - - - - Moskau Tidj - Moskau Standard Tidj - Moskau Somertidj - - - - - Mjanmaar Tidj - - - - - Nauru Tidj - - - - - Neepaal Tidj - - - - - Neikaledoonien Tidj - Neikaledoonien Standard Tidj - Neikaledoonien Somertidj - - - - - Neisialun Tidj - Neisialun Standard Tidj - Neisialun Somertidj - - - - - Neifundlun Tidj - Neifundlun Standard Tidj - Neifundlun Somertidj - - - - - Niue Tidj - - - - - Norfolk Eilun Tidj - Norfolk Eilun Standard Tidj - Norfolk Eilun Somertidj - - - - - Fernando de Noronha Tidj - Fernando de Noronha Standard Tidj - Fernando de Noronha Somertidj - - - - - Nowosibirsk Tidj - Nowosibirsk Standard Tidj - Nowosibirsk Somertidj - - - - - Omsk Tidj - Omsk Standard Tidj - Omsk Somertidj - - - - - Pakistaan Tidj - Pakistaan Standard Tidj - Pakistaan Somertidj - - - - - Palau Tidj - - - - - Papua Neiguinea Tidj - - - - - Paraguay Tidj - Paraguay Standard Tidj - Paraguay Somertidj - - - - - Peruu Tidj - Peruu Standard Tidj - Peruu Somertidj - - - - - Filipiinen Tidj - Filipiinen Standard Tidj - Filipiinen Somertidj - - - - - Phoenix Eilunen Tidj - - - - - St. Pierre an Miquelon Tidj - St. Pierre an Miquelon Standard Tidj - St. Pierre an Miquelon Somertidj - - - - - Pitcairn Eilunen Tidj - - - - - Pohnpei Tidj - - - - - Pjöngjang Tidj - - - - - Réunion Tidj - - - - - Rothera Tidj - - - - - Sachalin Tidj - Sachalin Standard Tidj - Sachalin Somertidj - - - - - Amrikoons Samoa Tidj - Amerikoons Samoa Standard Tidj - Amerikoons Samoa Somertidj - - - - - Seschelen Tidj - - - - - Singapuur Tidj - - - - - Salomoonen Tidj - - - - - Süüdgeorgien Tidj - - - - - Suurinam Tidj - - - - - Syowa Tidj - - - - - Tahiti Tidj - - - - - Taiwan Tidj - Taiwan Standard Tidj - Taiwan Somertidj - - - - - Tadjikistaan Tidj - - - - - Tokelau Tidj - - - - - Tonga Tidj - Tonga Standard Tidj - Tonga Somertidj - - - - - Chuuk Tidj - - - - - Turkmeenistaan Tidj - Turkmeenistaan Standard Tidj - Turkmeenistaan Somertidj - - - - - Tuwaalu Tidj - - - - - Uruguay Tidj - Uruguay Standard Tidj - Uruguay Somertidj - - - - - Usbekistaan Tidj - Usbekistaan Standard Tidj - Usbekistaan Somertidj - - - - - Vanuatu Tidj - Vanuatu Standard Tidj - Vanuatu Somertidj - - - - - Weenesuela Tidj - - - - - Wladiwostok Tidj - Wladiwostok Standard Tidj - Wladiwostok Somertidj - - - - - Wolgograd Tidj - Wolgograd Standard Tidj - Wolgograd Somertidj - - - - - Wostok Tidj - - - - - Wake Eilun Tidj - - - - - Wallis an Futuna Tidj - - - - - Jakutsk Tidj - Jakutsk Standard Tidj - Jakutsk Somertidj - - - - - Jekaterinburg Tidj - Jekaterinburg Standard Tidj - Jekaterinburg Somertidj - - - - - Yukon Tidj - - - - - - - , - . - nian taal - - - - - 0 düüsen - 00 düüsen - 000 düüsen - 0 miljoon - 00 miljoon - 000 miljoon - 0 miljaard - 00 miljaard - 000 miljaard - 0 biljoon - 00 biljoon - 000 biljoon - - - - - - - ¤ 00K - ¤ 000K - ¤ 0M - ¤ 00M - ¤ 000M - - - - - - Ferianagt Araabisk Emiraaten Dirham - Ferianagt Araabisk Emiraaten Dirhams - - - Afghaans Afghani - Afghaans Afghanis - - - Albaansk Lek - - - Armeensk Dram - Armeensk Drams - - - Neederluns Antilen Gulden - - - Angolaans Kwanza - Angolaans Kwanzas - - - Argentiinsk Peeso - Argentiinsk Peesos - - - Austraalisk Dooler - Austraalisk Doolers - - - Aruuba Florin - - - Aserbaidschaans Manat - Aserbaidschaans Manats - - - Bosnisk-Hertsegowiinsk Waksel Mark - - - Barbaados Dooler - Barbaados Doolers - - - Bangladesch Taka - Bangladesch Takas - - - Bulgaarsk Lew - Bulgaarsk Lewa - - - Bachrains Dinaar - Bachrains Dinaaren - - - Burundi Franc - Burundi Francs - - - Bermuuda Dooler - Bermuuda Doolers - - - Brunei Dooler - Brunei Doolers - - - Boliwiaans Boliwiano - Boliwiaans Boliwianos - - - Brasiliaans Real - Brasiliaans Reals - - - Bahaamas Dooler - Bahaamas Doolers - - - Bhuutaans Ngultrum - Bhuutaans Ngultrums - - - Botsuana Pula - Botsuana Pulas - - - Witjrüsk Ruubel - - - Belize Dooler - Belize Doolers - - - Kanaadsk Dooler - Kanaadsk Doolers - - - Kongoleesk Franc - Kongoleesk Francs - - - Sweitser Franken - - - Chileens Peeso - Chileens Peesos - - - Schineesk Bütjluns Yuan - - - Schineesk Yuan - - - Kolumbiaans Peeso - Kolumbiaans Peesos - - - Cost Rica Colon - Costa Rica Colons - - - Kubaans Waksel Peeso - Kubaans Waksel Peesos - - - Kubaans Peeso - Kubaans Peesos - - - Kapwerden Eskuudo - Kapwerden Eskuudos - - - Tschechisk Krüün - Tschechisk Krüünen - - - D-Mark - - - Djibouti Franc - Djibouti Francs - - - Däänsk Krüün - Däänsk Krüünen - - - Dominikaans Peeso - Dominikaans Peesos - - - Algeerisk Dinaar - Algeerisk Dinaaren - - - Egyptisk Pünj - - - Eritreesk Nakfa - Eritreesk Nakfas - - - Etioopisk Birr - Etioopisk Birrs - - - Euro - Euros - - - Fidschi Dooler - Fidschi Doolers - - - Falklun Eilunen Pünj - - - Britisk Pünj - - - Georgisk Lari - Georgisk Laris - - - Ghanaask Cedi - Ghanaask Cedis - - - Gibraltaar Pünj - - - Gambisk Delasi - Gambisk Delasis - - - Guineesk Franc - Guineesk Francs - - - Guatemalteesk Quetzal - Guatemalteesk Quetzals - - - Guayaneesk Dooler - Guayaneesk Doolers - - - Hongkong Dooler - Hongkong Doolers - - - Honduraans Lempira - Honduraans Lempiras - - - Kroaatisk Kuna - Kroaatisk Kunas - - - Haitiaans Gourde - Haitiaans Gourdes - - - Ungaars Forint - Ungaars Forints - - - Indoneesk Rupie - Indoneesk Rupien - - - Israeels Nei Scheekel - Israeels Nei Scheekels - ILS - - - Indisk Rupie - Indisk Rupien - INR - - - Iraaks Dinaar - Iraaks Dinaaren - - - Iraans Rial - Iraans Rials - - - Isluns Krüün - Isluns Krüünen - - - Jamaikaans Dooler - Jamaikaans Doolers - - - Jordaansk Dinaar - Jordaansk Dinaaren - - - Japoonsk Yen - - - Keniaans Skalang - Keniaans Skalanger - - - Kirgisk Som - Kirgisk Soms - - - Kambodschaansk Riel - Kambodschaansk Riels - - - Komooren Franc - Komooren Francs - - - Nuurdkoreaans Won - - - Süüdkoreaans Won - KRW - - - Kuwaits Dinaar - Kuwaits Dinaaren - - - Cayman Eilunen Dooler - Cayman Eilunen Doolers - - - Kasachstaans Tenge - Kasachstaans Tenges - - - Laootisk Kip - Laootisk Kips - - - Libaneesk Pünj - - - Sri Lankas Rupie - Sri Lankas Rupien - - - Libeerisk Dooler - Libeerisk Doolers - - - Lesotho Loti - Lesotho Lotis - - - Liibysk Dinaar - Liibysk Dinaaren - - - Marokaans Dirham - Marokaans Dirhams - - - Moldaawisk Leu - Moldaawisk Lei - - - Madagaskar Ariary - Madagaskar Ariarys - - - Matsedoonsk Dinaar - Matsedoonsk Dinaaren - - - Mjanmaar Kyat - Mjanmaar Kyats - - - Mongoolisk Tugrik - Mongoolisk Tugriks - - - Macau Pataca - Macau Patacas - - - Mauritiaans Ouguiya - Mauritiaans Ouguiyas - - - Mauritiaans Rupie - Mauritiaans Rupien - - - Malediiwisk Rufiyaa - Malediiwisk Rufiyaas - - - Malaawwisk Kwacha - Malaawisk Kwachas - - - Meksikoons Peeso - Meksikoons Peesos - - - Malaysisk Ringgit - Malaysisk Ringgits - - - Mosambikaans Metical - Mosambikaans Meticals - - - Namiibisk Dooler - Namiibisk Doolers - - - Nigeriaans Naira - Nigeriaans Nairas - - - Nikaraaguaans Cordoba - Nikaraaguaans Cordobas - - - Noorsk Krüün - Noorsk Krüünen - - - Nepaleesk Rupie - Nepaleesk Rupien - - - Neisialun Dooler - Neisialun Doolers - - - Omaans Rial - Omaans Rials - - - Panameesk Balboa - Panameesk Balboas - - - Peruaans Sol - Peruaans Sols - - - Papua Neiguineesk Kina - - - Filipiinsk Peeso - Filipiinsk Peesos - PHP - - - Pakistaans Rupie - Pakistaans Rupien - - - Poolsk Sloty - Poolsk Slotys - - - Paraguayaans Guarani - Paraguayaans Guaranis - - - Kataars Riyal - Kataars Riyals - - - Rumeensk Leu - Rumeensk Lei - - - Serbisk Dinaar - Serbisk Dinaaren - - - Rüsk Ruubel - - - Ruanda Franc - Ruanda Francs - - - Saudi Araabisk Riyal - Saudi Araabisk Riyals - - - Salomoonen Dooler - Salomoonen Doolers - - - Seschelen Rupie - Seschelen Rupien - - - Sudaneesk Pünj - - - Sweedsk Krüün - Sweedsk Krüünen - - - Singapuur Dooler - Singapuur Doolers - - - St. Helena Pünj - - - Sierra Leones Leone - Sierra Leones Leones - - - Sierra Leones Leone (1964—2022) - Sierra Leones Leones (1964—2022) - - - Somaali Skalang - Somaali Skalanger - - - Surinameesk Dooler - Surinameesk Doolers - - - Süüdsudaneesk Pünj - - - São Tomé an Príncipe Dobra - São Tomé an Príncipe Dobras - - - Syrisk Pünj - - - Eswatini Lilangeni - Eswatini Emalengeni - - - Thai Baht - - - Tadjikisk Somoni - Tadjikisk Somonis - - - Turkmeensk Manat - - - Tuneesisk Dinaar - Tuneesisk Dinaaren - - - Tongaans Pa’anga - - - Türkisk Lira - - - Trinidad an Tobago Dooler - Trinidad an Tobago Doolers - - - Nei Taiwan Dooler - Nei Taiwan Doolers - - - Tansaanisk Skalang - Tansaanisk Skalanger - - - Ukrainisk Griwna - Ukrainisk Griwni - - - Ugandisk Skalang - Ugandisk Skalanger - - - US Dooler - US Doolers - - - Uruguayaans Peeso - Uruguayaans Peesos - - - Usbeekisk Som - Usbeekisk Soms - - - Weenesulaans Bolivar - Weenesulaans Bolivars - - - Wjetnameesk Dong - VND - - - Wanuaatuu Vatu - Wanuaatuu Vatus - - - Samoaans Tala - - - Sentraal Afrikoonsk Franc - Sentraal Afrikoonsk Francs - - - Uast Kariibik Dooler - Uast Kariibik Doolers - - - Kariibisk Gulden - Kariibisk Gulden - XCG - - - Waastafrikoonsk CFA Franc - Waastafrikoonsk CFA Francs - - - CFP Franc - CFP Francs - - - Ünbekäänd Münt - ünbekäänd münt - - - Jeemens Rial - Jeemens Rials - - - Süüdafrikoons Rand - - - Sambisk Kwacha - Sambisk Kwachas - - - Simbabwe Gul - Simbabwe Gul - - - - {0} daar - Nem det {0}st rochts. - - - - - - deesi{0} - - - senti{0} - - - mili{0} - - - mikro{0} - - - nano{0} - - - piko{0} - - - femto{0} - - - atto{0} - - - zepto{0} - - - yokto{0} - - - ronto{0} - - - quekto{0} - - - deka{0} - - - hekto{0} - - - kilo{0} - - - mega{0} - - - giga{0} - - - tera{0} - - - peta{0} - - - exa{0} - - - zetta{0} - - - yotta{0} - - - ronna{0} - - - kwetta{0} - - - kibi{0} - - - mebi{0} - - - gibi{0} - - - tebi{0} - - - pebi{0} - - - exbi{0} - - - zebi{0} - - - yobi{0} - - - {0} per {1} - - - kwadroot {0} - - - kubiik {0} - - - {0}⋅{1} - - - g-krääft - - - meetern per kwadrootsekunden - {0} meetern per kwadrootsekunden - - - amdreiangen - {0} amdreiangen - - - radiant - {0} radiant - - - graad - {0} graad - - - böögminüüten - {0} böögminüüten - - - böögsekunden - {0} böögsekunden - - - kwadrootkilomeetern - {0} kwadrootkilomeetern - {0} per kwadrootkilomeeter - - - {0} hektaar - - - kwadrootmeetern - {0} per kwadrootmeeter - - - kwadrootsentimeetern - {0} kwadrootsentimeetern - {0} per kwadrootsentimeeter - - - kwadrootmiilen - {0} kwadrootmiilen - {0} per kwadrootmiil - - - {0} acres - - - kwadrootyards - {0} kwadrootyards - - - kwadrootfut - {0} kwadrootfut - - - kwadroottol - {0} kwadroottol - {0} per kwadroottol - - - karaat - {0} karaat - - - miligram per deziliter - {0} miligram per deziliter - - - milimol per liter - {0} milimol per liter - - - items - {0} items - - - parts - {0} parts - - - prosent - {0} prosent - - - promil - {0} promil - - - promyriad - {0} promyriad - - - glukoos - {0} glukoos - - - litern per kilomeeter - {0} litern per kilomeeter - - - litern per 100 kilomeeter - {0} litern per 100 kilomeeter - - - miilen per US galoon - {0} miilen per US galoon - - - miilen per ingelsk galoon - {0} miilen per ingelsk galoon - - - petabyte - {0} petabyte - - - terabyte - {0} terabyte - - - terabit - {0} terabit - - - gigabyte - {0} gigabyte - - - gigabit - {0} gigabit - - - megabyte - {0} megabyte - - - megabit - {0} megabit - - - kilobyte - {0} kilobyte - - - kilobit - {0} kilobit - - - juarhunerten - {0} juarhunerten - - - juartjiinten - {0} juartjiinten - - - {0} juaren - {0} per juar - - - kwartaalen - {0} kwartaalen - - - {0} muuner - {0} per muun - - - {0} wegen - {0} per weg - - - {0} per dai - - - {0} stünjen - {0} per stünj - - - minüten - {0} minüten - {0} per minüt - - - sekunden - {0} sekunden - {0} per sekund - - - millisekunden - {0} millisekunden - - - mikrosekunden - {0} mikrosekunden - - - nanosekunden - {0} nanosekunden - - - ampere - {0} ampere - - - milliampere - {0} milliampere - - - {0} ohm - - - {0} volt - - - kilokaloriin - {0} kilokaloriin - - - kaloriin - {0} kaloriin - - - kilojoule - {0} kilojoule - - - {0} joule - - - kilowattstünjen - {0} kilowattstünjen - - - elektroonenvolt - {0} elektroonenvolt - - - British thermal units - {0} British thermal units - - - US therms - {0} US therms - - - pounds of force - {0} pounds of force - - - newton - {0} newton - - - kilowattstünjen per 100 kilomeeter - {0} kilowattstünjen per 100 kilomeeter - - - gigahertz - {0} gigahertz - - - megahertz - {0} megahertz - - - kilohertz - {0} kilohertz - - - hertz - {0} hertz - - - typograafisk ems - {0} ems - - - {0} pixel - - - {0} megapixel - - - pixel per sentimeeter - {0} pixel per sentimeeter - - - pixel per tol - {0} pixel per tol - - - {0} eerd raadius - - - kilomeetern - {0} kilomeetern - {0} per kilomeeter - - - meetern - {0} meetern - {0} per meeter - - - deesimeetern - {0} deesimeetern - - - sentimeetern - {0} sentimeetern - {0} per sentimeeter - - - milimeetern - {0} milimeetern - - - mikromeetern - {0} mikromeetern - - - nanomeetern - {0} nanomeetern - - - pikomeetern - {0} pikomeetern - - - {0} miilen - - - {0} yards - - - {0} per fut - - - {0} per tol - - - {0} parsecs - - - laachtjuaren - {0} laachtjuaren - - - astronoomisk ianhaiden - {0} astronoomisk ianhaiden - - - {0} foraglengden - - - siamiilen - {0} siamiilen - - - skandinaawisk miilen - {0} skandinaawisk miilen - - - {0} points - - - {0} san raadien - - - lux - {0} lux - - - candela - {0} candela - - - lumen - {0} lumen - - - san laachten - {0} san laachten - - - tonen - {0} tonen - - - kilogram - {0} kilogram - {0} per kilogram - - - {0} gram - {0} per gram - - - miligram - {0} miligram - - - mikrogram - {0} mikrogram - - - amerikoonsk tonen - {0} amerikoonsk tonen - - - stones - {0} stones - - - ingelsk pünj - {0} ingelsk pünj - {0} per ingelsk pünj - - - unsen - {0} unsen - {0} per uns - - - troy unsen - {0} troy unsen - - - karaat - {0} karaat - - - daltons - {0} daltons - - - eerd masen - {0} eerd masen - - - san masen - {0} san masen - - - grains - {0} grains - - - gigawatt - {0} gigawatt - - - megawatt - {0} megawatt - - - kilowatt - {0} kilowatt - - - {0} watt - - - miliwatt - {0} miliwatt - - - pe-es - {0} pe-es - - - milimeetern kwaksalwer - {0} milimeetern kwaksalwer - - - kwaksalwer - {0} kwaksalwer - - - tol kwaksalwer - {0} tol kwaksalwer - - - milibar - {0} milibar - - - atmosfeeren - {0} atmosfeeren - - - pascal - {0} pascal - - - hektopascal - {0} hectopascal - - - kilopascal - {0} kilopascal - - - megapascal - {0} megapascal - - - stünjenkilomeeter - {0} stünjenkilomeeter - - - meetern per sekund - {0} meetern per sekund - - - miilen per stünj - {0} miilen per stünj - - - knooter - {0} knooter - - - Beaufort - {0} Beaufort - - - {0} graad - - - graad Celsius - {0} graad Celsius - - - graad Fahrenheit - {0} graad Fahrenheit - - - kelvin - {0} kelvin - - - pound-force-feet - {0} pound-force-feet - - - newtonmeeter - {0} newtonmeeter - - - kubiik kilomeetern - {0} kubiik kilomeetern - - - kubiik meetern - {0} kubiik meetern - {0} per kubiik meeter - - - kubiik sentimeetern - {0} kubiik sentimeetern - {0} per kubiik sentimeeter - - - kubiik miilen - {0} kubiik miilen - - - kubiik yard - {0} kubiik yard - - - kubiik fut - {0} kubiik fut - - - kubiik tol - {0} kubiik tol - - - megalitern - {0} megalitern - - - hektolitern - {0} hektolitern - - - litern - {0} litern - {0} per liter - - - deesilitern - {0} deesilitern - - - sentilitern - {0} sentilitern - - - mililitern - {0} mililitern - - - hualew litern - {0} hualew litern - - - fjuarden litern - {0} fjuarden litern - - - meetrisk fluid ounces - {0} meetrisk fluid ounces - - - acre-feet - {0} acre-feet - - - bushels - {0} bushels - - - US galoonen - {0} US galoonen - {0} per US galoon - - - ingelsk galoonen - {0} ingelsk galoonen - {0} per ingelsk galoon - - - quarts - {0} quarts - - - pints - {0} pints - - - cups - {0} cups - - - US fluid ounces - {0} US fluid ounces - - - ingelsk fluid ounces - {0} ingelsk fluid ounces - - - tablespoons - {0} tablespoons - - - teaspoons - {0} teaspoons - - - barrels - {0} barrels - - - dessert spoons - {0} dessert spoons - - - ingelsk dessert spoons - {0} ingelsk dessert spoons - - - drops - {0} drops - - - jiggers - {0} jiggers - - - pinches - {0} pinches - - - ingelsk quarts - {0} ingelsk quarts - - - steradiant - {0} steradiant - - - katal - {0} katal - - - coulomb - {0} coulomb - - - farad - {0} farad - - - henry - {0} henry - - - siemens - {0} siemens - - - kaloriin [IT] - {0} kaloriin [IT] - - - becquerel - {0} becquerel - - - sievert - {0} sievert - - - gray - {0} gray - - - kilopond - {0} kilopond - - - tesla - {0} tesla - - - weber - {0} weber - - - laacht faard - {0} laacht faard - - - naachter - {0} naachter - {0}/naacht - - - hemelswai - {0} uast - {0} nuurd - {0} süüd - {0} waast - - - - - {0}{1} - - - g-krääft - - - amdr - {0} amdr - - - graad - - - {0} arcmin - - - {0} arcsec - - - hektaar - - - acres - - - tol² - {0} tol² - {0}/tol² - - - karaat - - - milimol/liter - - - {0} items - - - Glc - - - litern/km - - - juarh - {0} juarh - - - juartj - {0} juartj - - - juaren - {0} jrn - {0}/j - - - kwrt - {0} kwrtn - {0}/kw - - - muuner - {0} mnr - - - wegen - {0} wgn - - - daar - {0} daar - - - stünjen - {0} st - - - sekn - {0} sek - - - millisekn - - - μsekn - - - nanosekn - - - kilojoule - - - kW-stünj - - - elektroonenvolt - - - pound-force - - - newton - - - pixel - - - megapixel - - - eerd raadius - - - m - - - μmeetern - - - miilen - - - yards - - - fut - - - tol - {0} tol - {0}/tol - - - parsecs - - - laachtjrn - {0} lj - - - AI - {0} AI - - - foraglengden - {0} for - - - faaden - {0} faaden - - - sm - {0} sm - - - points - - - san raadien - - - lux - - - candela - - - lumen - - - amerikoonsk tonen - {0} amerikoonsk tonen - - - stones - - - karaat - - - daltons - - - eerd masen - - - san masen - - - grains - - - PS - {0} PS - - - tol Hg - {0} tol Hg - - - {0} Bft - - - graad - - - Nm - {0} Nm - - - litern - {0} L - {0}/L - - - hualew liter - {0} hualew litern - - - fjuarden liter - {0} fjuarden litern - - - bushels - {0} bushels - - - quarts - {0} quarts - - - pints - {0} pints - - - cups - {0} cup - - - drops - {0} drops - - - jiggers - {0} jiggers - - - pinches - {0} pinches - - - cal-IT - - - kp - {0} kp - - - c - {0} c - - - naachter - {0} naachter - {0}/naacht - - - wai - {0} U - {0} N - {0} S - {0} W - - - - - g-krääft - - - amdr - {0} amdr - - - ° - - - acre - - - karaat - - - milimol/liter - - - {0} items - - - Glc - - - litern/km - - - jrn - {0} j - - - {0} kw - - - muun - {0} m - - - wgn - {0} w - - - dai - {0} d - - - stünj - {0} h - - - sek - {0} s - - - μsek - - - ns - - - kWh - - - elektroonenvolt - - - pound-force - - - N - - - px - - - MP - - - R⊕ - - - lj - - - R☉ - - - lux - - - candela - - - lumen - - - amerikoonsk ton - {0} amerikoonsk tonen - - - stone - - - karaat - - - daltons - - - grains - - - PS - {0} pe-es - - - ″ Hg - {0}″ Hg - - - {0} Bft - - - Nm - {0}Nm - - - {0} L - {0}/L - - - 1/2 L - {0} hualew litern - - - 1/4 L - {0} fjuarden litern - - - bushel - {0} bushels - - - quarts - {0} quarts - - - pints - {0} pints - - - cups - {0} cup - - - drops - {0} drops - - - cal-IT - - - kp - {0} kp - - - c - {0} c - - - naachter - {0} naachter - {0}/naacht - - - {0}U - {0}N - {0}S - {0}W - - - - - - {0} an {1} - {0} an {1} - - - {0} of {1} - {0} of {1} - - - - - ja:j - naan:n - - - - {0} — aal - {0} — kompatibiliteet - {0} — iinbünjen - {0} — ütjwidjet - {0} lachts am - {0} rochts am - {0} — iar - {0} — ölers wat - {0} — öler - skraften — {0} - {0} streger - jipsteld {0} - huuchsteld {0} - aktiwiteet - Afrikoonsk skraft - Amerikoonsk skraft - diarten - diarten of natüür - piil - lif - raam tiaken - gebüüde - ponkt of stäär - konsonant jamo - münt teeken - streg - taal - smok teeken - spuaien - deel piil - deel ap piil - Uast Asiaatisk skraft - Europeesk skraft - wiifelk - flagen - iidj an drank - formaat - formaat an rüm - fol-briad skak - geomeetrisk furem - hualew-briad skak - Han buksteew - Han grünjfurem - Hanja - Hanzi (ianfach) - Hanzi (normool) - hart - ual skraft - ideograafisk teeken - Japoonsk kana - lachts piil - lachts rochts piil - buksteew liket teeken - beknaapet brük - menelk - matemaatisk teeken - Madel Uast skraft - ölers wat - modern skraft - skafter - musikaalisk teeken - natüür - naar steld - taalen - objekt - öler - paaret - persuun - foneetisk alfabeet - piktogram - steed - plaant - sats teeken - rochts piil - teeken - letj ferskeel - smiley of persuun - Süüd Aasien skraft - Süüduast Aasien skraft - ufstant - teeken - technisk teeken - tuun teeken - rais - rais of steed - ap piil - ferskeel - wokaal jamo - weder - Waast Aasien skraft - witj rüm - - - kursiif - optisk grate - sküüns - breetje - gewicht - kursiif - bil tekst - tekst - auerskraft - uunwise - plakoot - lachts sküüns - aprocht - sküüns - muar sküüns - noch muar tuupfaadet - muar tuupfaadet - tuupfaadet - hualew tuupfaadet - normool - hualew ütjwidjet - ütjwidjet - muar ütjwidjet - noch muar ütjwidjet - smääl - muar laacht - laacht - hualew laacht - buk - reguleer - madel - hualew fäät - fäät - muar fäät - suart - muar suart - wertikaal bröök - gratbuksteewen rüm - optionaal ligatuuren - diagonaal bröök - rä numern - ual taalen - ordinaal taalen - proportionaal taalen - letj gratbuksteewen - tabel taalen - nol mä streg - - - und frr - informal - - {title} {given} {given2} {surname} {generation}, {credentials} - - - {given-informal} {surname} - - - {title} {surname} - - - {given-informal} {surname} - - - {given-informal-monogram-allCaps}{surname-monogram-allCaps} - - - {given} {given2-initial} {surname} {generation}, {credentials} - - - {given-informal} {surname} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {given-initial} {given2-initial} {surname} - - - {given-informal} {surname-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname}, {title} {given} {given2} {generation}, {credentials} - - - {surname}, {given-informal} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps}{given-informal-monogram-allCaps} - - - {surname}, {given} {given2-initial} {generation}, {credentials} - - - {surname}, {given-informal} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname}, {given-initial} {given2-initial} - - - {surname}, {given-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname-core}, {given} {given2} {surname-prefix} - - - {surname}, {given-informal} - - - {surname-core}, {given} {given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - {surname-core}, {given-initial} {given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - Matje - - - Tatje - Peters - - - Jan - Simon - Willems - - - ∅∅∅ - Hinrich - Hine - Philipp - ∅∅∅ - Ricklefs - ∅∅∅ - di jonger - MP - - - Herrmann - - - Hans - Petersen - - - Hans - Herrmann - Petersen - - - Prof. Dr. - Jan - Jani - Peter - faan - Glücksburg - ∅∅∅ - di jonger - MD DDS - - - diff --git a/make/data/cldr/common/main/frr_DE.xml b/make/data/cldr/common/main/frr_DE.xml deleted file mode 100644 index 4640d18fcacd..000000000000 --- a/make/data/cldr/common/main/frr_DE.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/fur.xml b/make/data/cldr/common/main/fur.xml index aa8d14a7134d..4db2c24db232 100644 --- a/make/data/cldr/common/main/fur.xml +++ b/make/data/cldr/common/main/fur.xml @@ -924,6 +924,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0} – {1} + {0}–{1} + h a – h a h–h a @@ -1027,6 +1032,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic mês + ca di {0} mês ca di {0} mês diff --git a/make/data/cldr/common/main/fy.xml b/make/data/cldr/common/main/fy.xml index 913f9f9e4a84..e7cc1d61098b 100644 --- a/make/data/cldr/common/main/fy.xml +++ b/make/data/cldr/common/main/fy.xml @@ -1157,6 +1157,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Volledige breedte Halve breedte Numeriek + 12-oeresysteem + 12-oeresysteem 12-oeresysteem (0-11) 12-oeresysteem (1-12) 12-oeresysteem (0-23) @@ -1824,12 +1826,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'wike' w 'fan' Y 'wike' w 'fan' Y + + {0} – {1} + {0}–{1} + {0}–{1} + h B – h B @@ -2637,7 +2646,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Standaardtiid {0} - koördinearre wrâldtiid + Koördinearre Wrâldtiid @@ -2743,9 +2752,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Parys - - Britse simmertiid - Londen @@ -2760,11 +2766,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Boedapest - - - Ierse simmertiid - - Jeruzalem @@ -2966,13 +2967,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Alaska-simmertiid - - - Alma-Ata-tiid - Alma-Ata-standerttiid - Alma-Ata-simmertiid - - Amazone-tiid @@ -3022,20 +3016,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Apia-simmertiid - - - Aqtau-tiid - Aqtau-standerttiid - Aqtau-simmertiid - - - - - Aqtöbe-tiid - Aqtöbe-standerttiid - Aqtöbe-simmertiid - - Arabyske tiid @@ -3137,6 +3117,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brazyljaanske simmertiid + + + Britse tiid + Britse simmertiid + + Bruneise tiid @@ -3339,11 +3325,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic West-Groenlânske simmertiid - - - Guamese standerttiid - - Golf standerttiid @@ -3356,7 +3337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaii-Aleoetyske standerttiid + Hawaii tiid @@ -3417,6 +3398,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iraanske simmertiid + + + Ierse tiid + Ierse simmertiid + + Irkoetsk-tiid @@ -3484,11 +3471,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kirgizyske tiid - - - Lanka-tiid - - Line-eilânske tiid @@ -3501,13 +3483,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lord Howe-eilânske simmertiid - - - Macause tiid - Macause standerttiid - Macause simmertiid - - Magadan-tiid @@ -3623,11 +3598,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fernando de Noronha-simmertiid - - - Noardlike Mariaanske tiid - - Novosibirsk-tiid @@ -3707,13 +3677,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pyongyang-tiid - - - Qyzylorda-tiid - Qyzylorda-standerttiid - Qyzylorda-simmertiid - - Réunionse tiid @@ -3740,9 +3703,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoaanske tiid Samoaanske standerttiid - Samoaanske simmertiid diff --git a/make/data/cldr/common/main/ga.xml b/make/data/cldr/common/main/ga.xml index feeb7c1adc32..fc751a0dfc7f 100644 --- a/make/data/cldr/common/main/ga.xml +++ b/make/data/cldr/common/main/ga.xml @@ -374,6 +374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Páilis Pijin Polainnis + de chuid Phíodmant Maliseet-Passamaquoddy Prúisis Paistis @@ -1085,15 +1086,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Féilire Formáid Airgeadra + Sórtáil Siombailí "Tabhair Neamhaird ar" + Sórtáil de réir Fada Tiontaithe Thart + Cuir in Ord de réir Cás Uachtair/Cás Íochtair + Sórtáil chásíogair Ord Sórtála + Sórtáil Normalaithe + Sórtáil Uimhriúil + Athord a chur ar Chlónna/ar Bhloclitreacha + Neart Sórtála Airgeadra + Ceann Scríbe Claochlaithe + Eisiamh Briste Foclóra Léiriú mar Emoji + An chéad lá den tseachtain + Measctha Timthriall Uaire (12 vs 24) + Modh Ionchuir + Méarchlár + An líon ar a dtugtar neamhaird is mó Déine Briste Líne Bristeacha Líne laistigh d’Fhocail + Rialacha Claochlaithe Córas Tomhais + Aonad Tomhais Uimhreacha + Réigiún le haghaidh Sonraí Forlíontacha + Foinse Claochlaithe + Foroinn Réigiúin Briseadh Frása tar éis Giorrúcháin + Claochlaigh + Aistrithe ag Meaisín + Crios Ama + Leagan Logchaighdeáin + Úsáid Phríobháideach + Claochlú Úsáide Príobháidí Féilire Búdaíoch @@ -1113,15 +1140,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Féilire na nEabhrach Eabhrach Féilire Náisiúnta na hIndia + Náisiúnach de chuid na hIndia Féilire na Moslamach Moslamach Féilire na Moslamach (táblach, seanré shibhialta) Moslamach (táblach, seanré shibhialta) Féilire Ioslamach (an Araib Shádach, dearcadh) + Hijri, Saudi Arabia, radharc gealaí Féilire Ioslamach (táblach, seanré réalteolaíoch) + Hijri (i bhfoirm tábla, aga réalteolaíoch) Féilire na Moslamach (Umm al-Qura) Moslamach (Umm al-Qura) Féilire Ghréagóra (an bhliain ag an tús) + Greagórach Féilire Seapánach Seapánach Féilire Peirseach @@ -1132,26 +1163,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cuntasaíocht Formáid Airgeadra Caighdeánach Caighdeánach + Cás íochtair + Cás íochtair + Cás uachtair Ord Sórtála Roimhe Seo, ar son na comhoiriúnachta + Comhoiriúnacht Ord Sórtála Foclóirí + Foclóir Ord Sórtála Réamhshocraithe Unicode Réamhshocraithe Unicode Ord Sórtála Emoji + Emoji Rialacha Ordaithe Eorpacha + Rialacha Eorpacha Ord sórtála an eolaire teileafóin + Eolaí teileafóin + Foghraíochta Ord sórtála pinyin + Pinyin Cuardach Ilfhóinteach Cuardach Cuardach de réir Consan Tosaigh Hangul + Consan tosaigh Cóiréise Ord Sórtála Caighdeánach Caighdeánach Ord sórtála stríce + Stríoc Ord sórtála traidisiúnta + Traidisiúnta Ord Sórtála Stríce Radacaí + Fréamh-Stríoc Ord Sórtála Zhuyin + Zhuyin + Airgeadra + Digití + Poncaíocht + Spás bán + Siombail + Gach + Bonnlitreacha Amháin + Bonnlitir, Fada, Cás, Leaganacha, Kana + Bonnlitir, Fada + Bonnlitir, Fada, Cás, Leaganacha + Go Lánleithid + Go Leathleithid Réamhshocraithe Emoji Téacs + Córas 12 Uair + 12 + Córas 24 Uair + 24 Córas 12 Uair (0–11) 12 (0–11) Córas 12 Uair (1–12) @@ -1160,6 +1222,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) Córas 24 Uair (1–24) 24 (1–24) + Spásanna Iomlaoide, poncaíocht, gach siombail + Spásanna iomlaoide, poncaíocht + Spásanna iomlaoide, poncaíocht + Spásanna Iomlaoide, poncaíocht, siombailí neamhairgeadra Stíl Scaoilte Briste Líne Scaoilte Gnáthstíl Briste Líne @@ -1170,6 +1236,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Coinnigh gach rud Gnách Coinnigh i bhfrásaí + Traslitriú BGN SAM + Traslitriú GEGN NA Córas Méadrach Méadrach Córas Tomhais Reachtúil @@ -1179,8 +1247,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Digití Ahom Digití Ind-Arabacha Digití Ind-Arabacha Breisithe + Indic-Araibis Sínte Uimhreacha Airméanacha Uimhreacha Cáis Íochtair Airméanacha + Cás Íochtair Airméinise Digití Bailíocha Digití Beangálacha Digití Brahmi @@ -1189,52 +1259,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uimhreacha Coireallacha Digití Déiveanágracha Uimhreacha Aetóipice + Airgeadais Digití Lánleithid + Lánleithid Uimhreacha Seoirseacha Digití Masaram Gondi Uimhreacha Gréagacha Uimhreacha Cáis Íochtair Gréagacha + Cás Íochtair Gréagach Digití Gúisearátacha Digití Gurmúcacha + Uimhriú lá na míosa le carachtar Han le haghaidh féilirí traidisiúnta Uimhreacha Deachúlacha Síneacha + Córas deachúil suímh ina n-úsáidtear ideagraif uimhreacha Síneacha mar dhigití Uimhreacha na Sínise Simplithe Uimhreacha Airgeadais na Sínise Simplithe + Airgeadais na Sínise Simplithe Uimhreacha na Sínise Traidisiúnta Uimhreacha Airgeadais na Sínise Traidisiúnta + Airgeadais na Sínise Traidisiúnta Uimhreacha Eabhracha Digití Pahawh Hmong Digití Iávacha Uimhreacha Seapánacha Uimhreacha Airgeadais Seapánacha + Airgeadais Seapánach + Uimhriú Seapánach Gannen (An bhliain bunúis) Digití Kayah Li Digití Ciméaracha Digití Cannadacha Digití Tai Tham Hora Digití Tai Tham Tham + Tai Tham Tham (eaglasta) Digití Laosacha Digití Iartharacha Digití Lepcha Digití Limbu Digití Troma Matamaiticiúla + Cló trom matamaiticiúil Digití Stríce Dúbailte Matamaiticiúla + Double-struck matamaiticiúil Digití Aonspáis Matamaiticiúla + Monaspás matamaiticiúil Digití Troma Sans-Serif Matamaiticiúla + Sans-serif matamaiticiúil i gcló trom Digití Sans-Serif Matamaiticiúla + Sans-serif matamaiticiúil Digití Mailéalamacha Digití Modi Digití Mongólacha Digití Mro Digití Meetei Mayek Digití Maenmaracha + Cairéinis Pao Oirthearach Mhaenmar + Pao Maenmar Digití Myanmar Shan + Shan Maenmar Digití Myanmar Tai Laing + Tai Laing Maenmar + Digití Dúchasacha + Digití dúchasacha Digití N’ko Digití Ol Chiki Digití Oiríseacha Digití Osmanya + Imlínithe Uimhreacha Rómhánacha + Cás uachtair Romhánach Uimhreacha Cáis Íochtair Rómhánacha + Cás íochtair Romhánach Digití Saurashtra + Deighilte Digití Sharada Digití Khudawadi Digití Sinhala Lith @@ -1244,15 +1339,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Digití Tai Lue Nua Uimhreacha Tamalacha Traidisiúnta Digití Tamalacha + Tamailis Nua Digití Teileagúcha Digití Téalannacha Digití Tibéadacha Digití Tirhuta + Uimhreacha traidisiúnta Digití Vadhacha Digití Warang Citi Múchta Ar siúl + Meaisínaistriúchán Neamhshonraithe + Leagan POSIX + + Múchta + Ar siúl + Méadrach RA @@ -1479,6 +1582,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d MMM – E d MMM E d MMM – E d MMM + + MMMM d – d + y – y G @@ -1691,6 +1797,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1734,6 +1843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E d MMM y G + MMMM y G + MMMM d, y G + E, MMMM d, y G h:mm a h:mm:ss a h:mm:ss a v @@ -1744,6 +1856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E d MMM d MMMM + E, MMMM d MMMM: 'seachtain' W MMMM: 'seachtain' W MMMM: 'seachtain' W @@ -1756,6 +1869,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'seachtain' w 'in' Y @@ -1764,7 +1879,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'seachtain' w 'in' Y 'seachtain' w 'in' Y + + {0} {1} + + + {0} – {1} + {0} – {1} + h – h B @@ -1865,6 +1987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d MMM – E d MMM E d MMM – E d MMM + + MMMM d – d + y – y @@ -2631,7 +2756,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MAG{0} - MAG + AUL{0} + AUL+? Honolulu @@ -2639,6 +2765,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Uilíoch Lárnach + + AUL + Láthair Anaithnid @@ -2803,9 +2932,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Páras - - Am Samhraidh na Breataine - ASB @@ -2857,9 +2983,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Macasar - - Am Caighdéanach na hÉireann - ACÉ @@ -3156,13 +3279,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Alasca - - - Am Almaty - Am Caighdeánach Almaty - Am Samhraidh Almaty - - Am na hAmasóine @@ -3197,11 +3313,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Caighdeánach an Aigéin Chiúin Am Samhraidh an Aigéin Chiúin - - AAC - ACAC - ASAC - @@ -3217,20 +3328,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Shamó - - - Am Aqtau - Am Caighdeánach Aqtau - Am Samhraidh Aqtau - - - - - Am Aqtobe - Am Caighdeánach Aqtobe - Am Samhraidh Aqtobe - - Am na hAraibe @@ -3332,6 +3429,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Bhrasília + + + Am na Breataine + Am Samhraidh na Breataine + + Am Bhrúiné Darasalám @@ -3528,6 +3631,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MAG + + + Am na Graonlainne + Am Caighdeánach na Graonlainne + Am Samhraidh na Graonlainne + + Am Oirthear na Graonlainne @@ -3542,11 +3652,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Iarthar na Graonlainne - - - Am Caighdeánach Ghuam - - Am Caighdeánach na Murascaille @@ -3559,7 +3664,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Am Caighdeánach Haváí-Ailiúit + Am Caighdeánach Haváí @@ -3620,6 +3725,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh na hIaráine + + + Am na hÉireann + Am Caighdéanach na hÉireann + + Am Irkutsk @@ -3644,8 +3755,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Phetropavlovsk-Kamchatski - Am Caighdeánach Phetropavlovsk-Kamchatski - Am Samhraidh Phetropavlovsk-Kamchatski + Am Caighdeánach Kamchatka + Am Samhraidh Kamchatka @@ -3687,11 +3798,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am na Cirgeastáine - - - Am Shrí Lanca - - Am Oileáin na Líne @@ -3704,13 +3810,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Lord Howe - - - Am Mhacao - Am Caighdeánach Mhacao - Am Samhraidh Mhacao - - Am Mhagadan @@ -3826,11 +3925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Fernando de Noronha - - - Am na nOileán Máirianach Thuaidh - - Am Novosibirsk @@ -3910,13 +4004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Pyongyang - - - Am Qyzylorda - Am Caighdeánach Qyzylorda - Am Samhraidh Qyzylorda - - Am Réunion @@ -3943,9 +4030,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Am Shamó Mheiriceá Am Caighdeánach Shamó Mheiriceá - Am Samhraidh Shamó Mheiriceá @@ -4012,6 +4097,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Chuuk + + + Am na Tuirce + Am Caighdeánach na Tuirce + Am Samhraidh na Tuirce + + Am na Tuircméanastáine @@ -4031,6 +4123,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Am Samhraidh Uragua + + + Am Ürümqi + + Am na hÚisbéiceastáine @@ -4172,16 +4269,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0k + 0k + 0k + 0k 0k 00k + 00k + 00k + 00k 00k 000k + 000k + 000k + 000k 000k 0B + 0B + 0B + 0B 0B 00B + 00B + 00B + 00B 00B 000B + 000B + 000B + 000B 000B @@ -6458,13 +6573,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} raidian {0} raidian - - {0} chéim - {0} chéim - {0} chéim - {0} gcéim - {0} céim - {0} nóiméad stua {0} nóiméad stua @@ -6559,7 +6667,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dúnaim - carait {0} charat {0} charat {0} charat @@ -6584,19 +6691,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ míreanna - {0} mhír - {0} mhír - {0} mhír - {0} mír - {0} mír codanna - {0} chuid - {0} chuid - {0} chuid - {0} gcuid - {0} cuid codanna sa mhilliún @@ -7128,7 +7225,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} lucsa - caindéilí {0} chaindéile {0} chaindéile {0} chaindéile @@ -7136,7 +7232,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} caindéile - lúmain {0} lúman {0} lúman {0} lúman @@ -7768,14 +7863,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} véibear {0} véibear - - solas - {0} solas - {0} sholas - {0} sholas - {0} solas - {0} solas - {0} oíche amháin {0} oíche @@ -8490,7 +8577,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ spbh - {0} spbh + {0} Spbh {0} spbh {0} spbh {0} spbh @@ -8663,9 +8750,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ céim - - nóim. stua - carat {0}ct @@ -8683,7 +8767,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mír - cod. {0} chuid {0} chuid {0} chuid @@ -8700,9 +8783,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mól {0}mól - - Glc - l/km {0}l/km @@ -8805,9 +8885,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ deich. blianta - - {0}/bl - {0} ctú {0} cna @@ -9065,7 +9142,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}míle Lochl. - lucs. {0}lx {0}lx {0}lx @@ -9080,7 +9156,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}cd - lúmain {0}lm {0}lm {0}lm @@ -9345,23 +9420,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dr l. {0}dr l. - - cal-IT - {0} cal-IT - {0} cal-IT - {0} cal-IT - {0} cal-IT - {0} cal-IT - - - {0} Wb - {0} Wb - {0} Wb - {0} Wb - {0} Wb - - solas {0}solas {0}sholas {0}sholas diff --git a/make/data/cldr/common/main/gaa.xml b/make/data/cldr/common/main/gaa.xml index 94a3dca6f5a7..64302f7415b4 100644 --- a/make/data/cldr/common/main/gaa.xml +++ b/make/data/cldr/common/main/gaa.xml @@ -667,6 +667,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1} 'be' 'ni' 'atswa' {0} @@ -704,11 +708,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y Y 'otsi' w + + {0} – {1} + {0} – {1} + {0}–{1} + y G – y G y – y G @@ -887,7 +898,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Be Yɛ Fɛi Beiaŋ - Be Ni Maji Ni Yɔɔ Jeŋ Fɛɛ Kɛtsuɔ Nii + Be Ni Maji Ni Yɔɔ Jeŋ Fɛɛ Kɛtsuɔ Nii @@ -914,6 +925,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic St. Barthélemy + + Nasau + Okpɔŋɔ Yɛŋ @@ -986,11 +1000,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tsuuk - - - Be Ni Britainbii Kɛtsuɔ Nii Yɛ Latsa Beiaŋ - - Ga @@ -1006,11 +1015,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Abladei Alɛjiadaamɔhe - - - Be Ni Irelandbii Kɛtsuɔ Nii - - Yerusalem @@ -1056,9 +1060,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nouakshott + + Montserat + + + Hermosilo + Tsihuahua + + Montere + Meziko Maŋ @@ -1114,7 +1127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ankorage - New Salem, Dakota Kooyigbɛ + Salem Manheiaŋ, Dakota Kooyigbɛ Maŋteŋ, Dakota Kooyigbɛ @@ -1123,19 +1136,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tsikago - Vinsennes, Indiana + Vinsenes, Indiana Osheku Maŋ, Indiana - Knos, Indiana + Nos, Indiana Winamak, Indiana + + Louisvile + - Montisello, Kentuky + Montiselo, Kentuky St. Vinsent @@ -1212,6 +1228,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Azores Be Yɛ Latsa Beiaŋ + + + Britin Be tsɔɔmɔ + Be Ni Britainbii Kɛtsuɔ Nii Yɛ Latsa Beiaŋ + + Kape Verde Be @@ -1233,7 +1255,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Betsɔɔmɔ ni ka ŋɛlɛ kome nɔ + Greenwich Be Tsɔɔmɔ @@ -1252,14 +1274,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaii-Aleutia Be Yɛ Fɛi Beiaŋ + Hawaii Be Yɛ Fɛi Beiaŋ - Hawaii-Aleutia Be - Hawaii-Aleutia Be Yɛ Fɛi Beiaŋ - Hawaii-Aleutia Be Yɛ Latsa Beiaŋ + Hawaii-Aleutia Be + Hawaii-Aleutia Be Yɛ Fɛi Beiaŋ + Hawaii-Aleutia Be Yɛ Latsa Beiaŋ @@ -1267,6 +1289,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Indian Ŋshɔ Lɛ Be + + + Ireland Be tsɔɔmɔ + Be Ni Irelandbii Kɛtsuɔ Nii + + Mauritius Be diff --git a/make/data/cldr/common/main/gd.xml b/make/data/cldr/common/main/gd.xml index c1668d18c05e..61b8a5fd4f8a 100644 --- a/make/data/cldr/common/main/gd.xml +++ b/make/data/cldr/common/main/gd.xml @@ -1306,15 +1306,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Mìosachan Fòrmat an airgeadra + Leig seachad seòrsachadh samhlaidhean + Seòrsachadh Aicinn Air Aiseag + Òrdachadh Litrichean Mòra/Litrean Ìosal + Seòrsachadh Mothachail air Cùis-chùis Òrdugh an t-seòrsachaidh + Seòrsachadh àbhaisteach + Seòrsachadh Àireamhach + Ath-òrdachadh Sgriobt/Bloc + Neart Seòrsachaidh Airgeadra + Transform Destination + Eisgeachdan Briseadh Faclair Riochdachadh nan Emoji + A’ chiad latha den t-seachdain + Measgaichte a-steach Cearcall an ama (12 no 24 uair) + Modh Cuir a-steach + Meur-chlàr + Air a leigeil seachad as àirde Stoidhle nam brisidhean-loidhe Brisidhean loidhne am broinn fhaclan + Riaghailtean Atharrachaidh Siostam tomhais + Aonad Tomhais Àireamhan + Roinn airson Dàta a bharrachd + Cruth-atharrachadh Stòr + Fo-roinn Roinneil Briseadh rosgrainn às dèidh giorr. + Cruth-atharrachadh + Eadar-theangaichte le inneal + Crios-Ùine + Caochladh Àite + Cleachdadh Prìobhaideach + Cruth-atharrachadh Cleachdadh Prìobhaideach Am Mìosachan Bùdach @@ -1340,11 +1366,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Am Mìosachan Hijri (clàrach, linn sìobhalta) Hijri (clàrach, linn sìobhalta) Am Mìosachan Hijri (Aràibia nan Sabhd, sealladh) + Hijri, sealladh air Saudi Arabia Am Mìosachan Hijri (clàrach, linn reul-eòlach) Hijri (clàrach, linn reul-eòlach) Am Mìosachan Hijri (Umm al-Qura) Hijri (Umm al-Qura) Mìosachan ISO-8601 + Griogairianach Am Mìosachan Seapanach Seapanach Am Mìosachan Pearsach @@ -1355,6 +1383,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Cunntasachd Fòrmat stannardach an airgeadra Stannardach + Litir bheag + Litir bheag + Litir-mhòr Òrdugh seòrsachaidh roimhe a chum co-chòrdalachd Co-chòrdalachd Òrdugh seòrsachaidh an fhaclair @@ -1362,7 +1393,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Òrdugh seòrsachaidh Unicode bunaiteach Unicode bunaiteach Òrdugh seòrsachaidh Emoji + Emoji Òrdugh seòrsachaidh Eòrpach + Riaghailtean Eòrpach Òrdugh seòrsachaidh nan leabhraichean-fòn Leabhar-fòn Tar-litreachadh @@ -1371,6 +1404,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lorg coitcheann Coitcheann Lorg leis a’ chiad chonnrag Hangul + Connrag tùsail Coirèanais Òrdugh seòrsachaidh stannardach Stannardach Òrdugh nan stràcan @@ -1381,12 +1415,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic Freumh is stràcan Òrdugh seòrsachaidh Zhuyin Zhuyin + Airgead + Figearan + Punndadh + Àite geal + Samhla + Uile + Litrichean Bunasach a-mhàin + Bun, Structan, Cùis, Caochlaidhean, Kana + Bunait, Aiseagan + Bonn, Structan, Cùis, Caochlaidhean Làn-Leud Leth-Leud Àireamhach Bunaiteach Emoji Teacsa + Cleoc 12 uair a thìde + 12 + Cleoc 24 uair a thìde + 24 Cleoc 12 uair a thìde (0–11) 12 (0–11) Cleoc 12 uair a thìde (1–12) @@ -1395,6 +1443,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) Cleoc 24 uair a thìde (1–24) 24 (1–24) + Àiteachan Shift, puingeachadh, a h-uile samhla + Gluasad beàrnan, puingeachadh + Gluasad beàrnan, puingeachadh + Àiteachan Shift, puingeachadh, samhlaidhean neo-airgead Brisidhean-loidhe fuasgailte Fuasgailte Brisidhean-loidhe àbhaisteach @@ -1416,8 +1468,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àireamhan Ahom Àireamhan Arabach-Innseanach Àireamhan Arabach-Innseanach leudaichte + Extended Arabic-Indic Àireamhan na h-Airmeinise Àireamhan beaga na h-Airmeinise + Litir bheag Airmeinis Àireamhan Bali Àireamhan na Beangailise Àireamhan Brahmi @@ -1427,27 +1481,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àireamhan Devanagari Àireamhan Dives Akuru Àireamhan Itiopach + Ionmhasail Àireamhan làn-leud + Leud slàn Àireamhan Garay Àireamhan na Cairtbheilise Àireamhan Gunjala Gondi Àireamhan Masaram Gondi Àireamhan na Greugaise Àireamhan beaga na Greugaise + Litir bheag Grèigeach Àireamhan Gujarati Àireamhan Gurung Khema Àireamhan Gurmukhi + Àireamhachadh latha na mìosa le caractar Han airson mìosachain traidiseanta Àireamhan deicheach na Sìnise + Siostam deicheach suidheachaidh a’ cleachdadh ideagrafaichean àireamhan Sìneach mar fhigearan Àireamhan na Sìnise Shimplichte Àireamhan ionmhasail na Sìnise Shimplichte + Ionmhas Sìneach Shìmplidh Àireamhan na Sìnise Thradaiseanta Àireamhan ionmhasail na Sìnise Thradaiseanta + Ionmhas traidiseanta Sìneach Àireamhan na h-Eabhra Àireamhan Pahawh Hmong Àireamhan Nyiakeng Puachue Àireamhan na Deàbhanaise Àireamhan na Seapanaise Àireamhan ionmhasail na Seapanaise + Ionmhas Iapanach + Àireamhachadh Gannen sa chiad bhliadhna ann an Iapan Àireamhan Kayah Li Àireamhan Kawi Àireamhan Cmèar @@ -1455,15 +1518,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àireamhan Kirat Rai Àireamhan Tai Tham Hora Àireamhan Tai Tham Tham + Tai Tham Tham (eaglaiseil) Àireamhan Làtho Àireamhan Siarach Àireamhan Lepcha Àireamhan Limbu Àireamhan matamataig troma + Matamataigeach trom Àireamhan matamataig le loidhne dhùbailte + Buille dùbailte matamataigeach Àireamhan matamataig aon-leud + Aon-àite matamataigeach Àireamhan matamataig sans-serif troma + Matamataigeach gun serif trom Àireamhan matamataig sans-serif + Matamataigeach gun serif trom Àireamhan Malayalam Àireamhan Modi Àireamhan na Mongolaise @@ -1471,20 +1540,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àireamhan Meetei Mayek Àireamhan Miànmar Àireamhan Pwo Karen Miànmar an Ear + Pwo Karen an Ear Mhianmar Àireamhan Pao Miànmar + Pao Mhianmar Àireamhan Shan Miànmar + Shan Mhianmar Àireamhan Tai Laing Miànmar + Tai Laing ann am Mianmar Àireamhan Nag Mundari + Figearan Dùthchasach + àireamhan dùthchasach Àireamhan N’Ko Àireamhan Ol Chiki Àireamhan Ol Onal Àireamhan Odia Àireamhan Osmanya Àireamhan oir-loidhnichte + Air a mhìneachadh Àireamhan Hanifi Rohingya Àireamhan Ròmanach + Litir mhòr Ròmanach Àireamhan beaga Ròmanach + Litir bheag Ròmanach Àireamhan Saurashtra + Air a roinneadh Àireamhan Sharada Àireamhan Khudawadi Àireamhan Lith na Sinhala @@ -1495,18 +1574,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àireamhan Tai Lue Ùr Àireamhan na Taimilise Tradaiseanta Àireamhan na Taimilise + Tamil Nuadh-aimsireil Àireamhan Telugu Àireamhan Tàidh Àireamhan na Tibeitise Àireamhan Tirhuta Àireamhan Tangsa Àireamhan Tolong Siki + Àireamhan traidiseanta Àireamhan Vai Àireamhan Warang Citi Àireamhan Wancho Dheth Air + Eadar-theangachadh Inneal Neo-shònraichte + Caochladh POSIX + + Dheth + Air + Meatrach RA @@ -2289,6 +2376,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -2378,6 +2468,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y LLLL y + d MMMM y + EEE, d MMMM y QQQ y QQQQ y 'seachdain' w 'dhe' Y @@ -2386,6 +2478,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'seachdain' w 'dhe' Y + + {0} – {1} + {0} – {1} + h – h B @@ -3462,9 +3558,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Paras - - Tìde samhraidh Bhreatainn - TSB @@ -3501,9 +3594,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guidheàna - - Bun-àm na h-Èireann - TSÈ (Èirinn) @@ -3724,18 +3814,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm Alaska Tìde samhraidh Alaska - - AKT - AKST - AKDT - - - - - Àm Almaty - Bun-àm Almaty - Tìde samhraidh Almaty - @@ -3750,11 +3828,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm Meadhan Aimeireaga Tìde samhraidh Meadhan Aimeireaga - - CT - CST - CDT - @@ -3762,11 +3835,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm Aimeireaga an Ear Tìde samhraidh Aimeireaga an Ear - - ET - EST - EDT - @@ -3774,11 +3842,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm Monadh Aimeireaga Tìde samhraidh Monadh Aimeireaga - - MT - MST - MDT - @@ -3786,11 +3849,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm a’ Chuain Shèimh Tìde samhraidh a’ Chuain Shèimh - - PT - PST - PDT - @@ -3806,20 +3864,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh Apia - - - Àm Aqtau - Bun-àm Aqtau - Tìde samhraidh Aqtau - - - - - Àm Aqtobe - Bun-àm Aqtobe - Tìde samhraidh Aqtobe - - Àm Arabach @@ -3854,11 +3898,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm a’ Chuain Shiar Tìde samhraidh a’ Chuain Shiar - - AT - AST - ADT - @@ -3926,6 +3965,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh Bhrasília + + + Ùine Bhreatainn + Tìde samhraidh Bhreatainn + + Àm Bhrùnaigh Dàr as-Salàm @@ -4143,11 +4188,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh na Graonlainn an Iar - - - Àm Guam - - Àm a’ Chamais @@ -4160,11 +4200,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Bun-àm nan Eileanan Hawai’i ’s Aleutach + Àm nan Eileanan Hawai’i - - HAST - @@ -4172,11 +4209,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bun-àm nan Eileanan Hawai’i ’s Aleutach Tìde Samhraidh nan Eileanan Hawai’i ’s Aleutach - - HAT - HAST - HADT - @@ -4229,6 +4261,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh Ioràin + + + Àm na h-Èireann + Bun-àm na h-Èireann + + Àm Irkutsk @@ -4296,11 +4334,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àm Cìorgastain - - - Àm Lanca - - Àm Eileanan Teraina @@ -4313,13 +4346,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh Lord Howe - - - Àm Macàthu - Bun-àm Macàthu - Tìde samhraidh Macàthu - - Àm Magadan @@ -4435,11 +4461,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde Samhraidh Fernando de Noronha - - - Àm nan Eileanan Mairianach a Tuath - - Àm Novosibirsk @@ -4519,13 +4540,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àm Pyeongyang - - - Àm Qızılorda - Bun-àm Qızılorda - Tìde samhraidh Qızılorda - - Àm Reunion @@ -4552,9 +4566,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Àm Samotha Bun-àm Samotha - Tìde samhraidh Samotha @@ -4621,6 +4633,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àm Chuuk + + + Ùine na Tuirc + Àm Coitcheann na Tuirc + Àm Samhraidh na Tuirc + + Àm Turcmanastàin @@ -4640,6 +4659,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tìde samhraidh Uruguaidh + + + Ùine Urumqi + + Àm Usbagastàn @@ -4772,10 +4796,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0B + 0B + 0B 0B 00B + 00B + 00B 00B 000B + 000B + 000B 000B @@ -5356,13 +5386,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic yuan Sìneach (far-thìreach) yuan Sìneach (far-thìreach) - - Dolar an t-sluagh-bhanca Shìnich - dolar an t-sluagh-bhanca Shìnich - dholar an t-sluagh-bhanca Shìnich - dolaran an t-sluagh-bhanca Shìnich - dolar an t-sluagh-bhanca Shìnich - Yuan Sìneach yuan Sìneach @@ -7031,10 +7054,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Òr Sìombabuthach - Òr Sìombabuthach - Òr Sìombabuthach - Òr Sìombabuthach - Òr Sìombabuthach Dolar Sìombabuthach (2009) @@ -7059,10 +7078,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} bhròig {0} brògan {0} bròg - Tionndaidh ris an làimh dheas aig an {0}s gobhal. Tionndaidh ris an làimh dheas aig a’ {0}d ghobhal. - Tionndaidh ris an làimh dheas aig a’ {0}mh gobhal. Tionndaidh ris an làimh dheas aig an {0}na gobhal. + Tionndaidh ris an làimh dheas aig an {0}s gobhal. + Tionndaidh ris an làimh dheas aig a’ {0}mh gobhal. @@ -7311,7 +7330,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} nì - pàirt {0} phàirt {0} phàirt {0} pàirtean @@ -9506,7 +9524,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}nì - pàirt {0}phàirt {0}phàirt {0}pàirt. @@ -9534,7 +9551,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mòl - Glc {0}Glc {0}Glc {0}Glc @@ -10203,7 +10219,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mm Hg - de Hg {0} de Hg {0} de Hg {0} de Hg @@ -10417,12 +10432,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mc {0}mc - - {0} fl oz m. - {0} fl oz m. - {0} fl oz m. - {0} fl oz m. - ac ft {0}ac ft @@ -10462,26 +10471,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}pt {0}pt - - pt ìmp. - {0} pt ìmp. - {0} pt ìmp. - {0} pt ìmp. - {0} pt ìmp. - {0}c {0}c {0}c {0}c - - cupa ìmp. - {0} c ìmp. - {0} c ìmp. - {0} c ìmp. - {0} c ìmp. - {0}fl oz {0}fl oz @@ -10597,7 +10592,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}S - cal-IT {0}cal-IT {0}cal-IT {0}cal-IT @@ -10634,14 +10628,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kgf - rd {0}rd {0}rd {0}rd {0}rd - ch {0}ch {0}ch {0}ch @@ -10666,7 +10658,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}°R - cld {0}cld {0}cld {0}cld @@ -10679,7 +10670,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}slug - peatr-ionn {0}pheatr-ionn {0}pheatr-ionn {0}peatr-ionn diff --git a/make/data/cldr/common/main/gez.xml b/make/data/cldr/common/main/gez.xml deleted file mode 100644 index d3905eef4167..000000000000 --- a/make/data/cldr/common/main/gez.xml +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - አፋርኛ - አብሐዚኛ - አፍሪቃንስኛ - አምሐረኛ - ዐርቢኛ - አሳሜዛዊ - አያማርኛ - አዜርባይጃንኛ - ባስኪርኛ - ቤላራሻኛ - ቡልጋሪኛ - ቢስላምኛ - በንጋሊኛ - ትበትንኛ - ብሬቶንኛ - ብሊን - ካታላንኛ - ኮርሲካኛ - ቼክኛ - ወልሽ - ዴኒሽ - ጀርመን - ድዞንግኻኛ - ግሪክኛ - እንግሊዝኛ - ኤስፐራንቶ - ስፓኒሽ - ኤስቶኒአን - ባስክኛ - ፐርሲያኛ - ፊኒሽ - ፊጂኛ - ፋሮኛ - ፈረንሳይኛ - ፍሪስኛ - አይሪሽ - እስኮትስ፡ጌልክኛ - ግዕዝኛ - ጋለጋኛ - ጓራኒኛ - ጉጃርቲኛ - ሃውሳኛ - ዕብራስጥ - ሐንድኛ - ክሮሽያንኛ - ሀንጋሪኛ - አርመናዊ - ኢንቴርሊንጓ - እንዶኒሲኛ - እንተርሊንግወ - እኑፒያቅኛ - አይስላንድኛ - ጣሊያንኛ - እኑክቲቱትኛ - ጃፓንኛ - ጃቫንኛ - ጊዮርጊያን - ካዛክኛ - ካላሊሱትኛ - ክመርኛ - ካናዳኛ - ኮሪያኛ - ካሽሚርኛ - ኩርድሽኛ - ኪርጊዝኛ - ላቲንኛ - ሊንጋላኛ - ላውስኛ - ሊቱአኒያን - ላትቪያን - ማላጋስኛ - ማዮሪኛ - ማከዶኒኛ - ማላያላምኛ - ሞንጎላዊኛ - ማራዚኛ - ማላይኛ - ማልቲስኛ - ቡርማኛ - ናኡሩ - ኔፓሊኛ - ደች - ኖርዌጂያን - ኦኪታንኛ - ኦሮምኛ - ኦሪያኛ - ፓንጃቢኛ - ፖሊሽ - ፑሽቶኛ - ፖርቱጋሊኛ - ኵቿኛ - ሮማንስ - ሩንዲኛ - ሮማኒያን - ሞልዳቫዊና - ራሽኛ - ኪንያርዋንድኛ - ሳንስክሪትኛ - ሲንድሂኛ - ሳንጎኛ - ስንሃልኛ - ሲዳምኛ - ስሎቫክኛ - ስሎቪኛ - ሳሞአኛ - ሾናኛ - ሱማልኛ - ልቤኒኛ - ሰርቢኛ - ስዋቲኛ - ሶዞኛ - ሱዳንኛ - ስዊድንኛ - ስዋሂሊኛ - ታሚልኛ - ተሉጉኛ - ታጂኪኛ - ታይኛ - ትግርኛ - ትግረ - ቱርክመንኛ - ታጋሎገኛ - ጽዋናዊኛ - ቶንጋ - ቱርክኛ - ጾንጋኛ - ታታርኛ - ትዊኛ - ኡዊግሁርኛ - ዩክረኒኛ - ኡርዱኛ - ኡዝበክኛ - ቪትናምኛ - ቮላፑክኛ - ዎሎፍኛ - ዞሳኛ - ይዲሻዊኛ - ዮሩባዊኛ - ዡዋንግኛ - ቻይንኛ - ዙሉኛ - - - - - - አንዶራ - የተባበሩት፡አረብ፡ኤምሬትስ - አልባኒያ - አርሜኒያ - አርጀንቲና - ኦስትሪያ - አውስትሬሊያ - አዘርባጃን - ቦስኒያ፡እና፡ሄርዞጎቪኒያ - ባርቤዶስ - ቤልጄም - ቡልጌሪያ - ባህሬን - ቤርሙዳ - ቦሊቪያ - ብራዚል - ቡህታን - ቤላሩስ - ቤሊዘ - የመካከለኛው፡አፍሪካ፡ሪፐብሊክ - ስዊዘርላንድ - ቺሊ - ካሜሩን - ቻይና - ኮሎምቢያ - ኬፕ፡ቬርዴ - ሳይፕረስ - ቼክ፡ሪፑብሊክ - ጀርመን - ዴንማርክ - ዶሚኒካ - ዶሚኒክ፡ሪፑብሊክ - አልጄሪያ - ኢኳዶር - ኤስቶኒያ - ግብጽ - ምዕራባዊ፡ሳህራ - ኤርትራ - ስፔን - ኢትዮጵያ - ፊንላንድ - ፊጂ - ሚክሮኔዢያ - ፈረንሳይ - እንግሊዝ - ጆርጂያ - የፈረንሳይ፡ጉዊአና - ጋምቢያ - ጊኒ - ኢኳቶሪያል፡ጊኒ - ግሪክ - ቢሳዎ - ጉያና - ሆንግ፡ኮንግ - ክሮኤሽያ - ሀይቲ - ሀንጋሪ - ኢንዶኔዢያ - አየርላንድ - እስራኤል - ህንድ - ኢራቅ - አይስላንድ - ጣሊያን - ጃማይካ - ጆርዳን - ጃፓን - ካምቦዲያ - ኮሞሮስ - ደቡብ፡ኮሪያ - ሰሜን፡ኮሪያ - ክዌት - ሊባኖስ - ሊቱዌኒያ - ላትቪያ - ሊቢያ - ሞሮኮ - ሞልዶቫ - ማከዶኒያ - ሞንጎሊያ - ማካዎ - ሞሪቴኒያ - ማልታ - ማሩሸስ - ሜክሲኮ - ማሌዢያ - ናሚቢያ - ኒው፡ካሌዶኒያ - ናይጄሪያ - ኔዘርላንድ - ኖርዌ - ኔፓል - ኒው፡ዚላንድ - ፔሩ - የፈረንሳይ፡ፖሊኔዢያ - ፓፑዋ፡ኒው፡ጊኒ - ፖላንድ - ፖርታ፡ሪኮ - ሮሜኒያ - ሰርቢያ - ራሺያ - ሳውድአረቢያ - ሱዳን - ስዊድን - ሲንጋፖር - ስሎቬኒያ - ስሎቫኪያ - ሴኔጋል - ሱማሌ - ሲሪያ - ቻድ - የፈረንሳይ፡ደቡባዊ፡ግዛቶች - ታይላንድ - ታጃኪስታን - ምስራቅ፡ቲሞር - ቱኒዚያ - ቱርክ - ትሪኒዳድ፡እና፡ቶባጎ - ታንዛኒያ - ዩጋንዳ - አሜሪካ - ዩዝበኪስታን - ቬንዙዌላ - የእንግሊዝ፡ድንግል፡ደሴቶች - የአሜሪካ፡ቨርጂን፡ደሴቶች - የመን - ደቡብ፡አፍሪካ - ዛምቢያ - - - - [፟ ᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሐ ሑ ሒ ሓ ሔ ሕ ሖ መ ሙ ሚ ማ ሜ ም ሞ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ረ ሩ ሪ ራ ሬ ር ሮ ሰ ሱ ሲ ሳ ሴ ስ ሶ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ በ ቡ ቢ ባ ቤ ብ ቦ ተ ቱ ቲ ታ ቴ ት ቶ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ አ ኡ ኢ ኣ ኤ እ ኦ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፐ ፑ ፒ ፓ ፔ ፕ ፖ] - [ሇ ሏ ⶀ ሗ ሟ ᎀ ᎁ ᎂ ᎃ ⶁ ሧ ሯ ⶂ ሷ ⶃ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ⶄ ቇ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ ቧ ᎄ ᎅ ᎆ ᎇ ⶅ ቮ ቯ ቷ ⶆ ቿ ⶇ ኇ ኗ ⶈ ኛ ኟ ⶉ ኧ ⶊ ኯ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ዏ ዟ ⶋ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ ዷ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጧ ⶏ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ⶐ ጷ ⶑ ጿ ፇ ፏ ᎈ ᎉ ᎊ ᎋ ፗ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ] - [ሀ ለ ሐ መ ሠ ረ ሰ ቀ ቈ በ ተ ኀ ኈ ነ አ ከ ኰ ወ ዐ ዘ የ ደ ገ ጐ ጠ ጰ ጸ ፀ ፈ ፐ] - - - - - - - - EEEE፥ dd MMMM መዓልት y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - h:mm:ss a zzzz - - - - - h:mm:ss a z - - - - - h:mm:ss a - - - - - h:mm a - - - - - - - - - ጠሐረ - ከተተ - መገበ - አኀዘ - ግንባት - ሠንየ - ሐመለ - ነሐሰ - ከረመ - ጠቀመ - ኀደረ - ኀሠሠ - - - - - ጠ - ከ - መ - አ - ግ - ሠ - ሐ - ነ - ከ - ጠ - ኀ - ኀ - - - - - - - እኁድ - ሰኑይ - ሠሉስ - ራብዕ - ሐሙስ - ዓርበ - ቀዳሚት - - - - - እ - ሰ - ሠ - ራ - ሐ - ዓ - ቀ - - - - - - - ጽባሕ - ምሴት - - - - - - ዓ/ዓ - ዓ/ም - - - - - - EEEE፥ dd MMMM መዓልት y G - GyMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - ወ - - - - - ¤#,##0.00 - - - - - - የብራዚል ሪል - - - የቻይና ዩአን ረንሚንቢ - - - የኢትዮጵያ ብር - - - አውሮ - - - የእንግሊዝ ፓውንድ ስተርሊንግ - - - የሕንድ ሩፒ - - - የጃፓን የን - - - የራሻ ሩብል - - - የአሜሪካን ዶላር - - - - diff --git a/make/data/cldr/common/main/gez_ER.xml b/make/data/cldr/common/main/gez_ER.xml deleted file mode 100644 index 58ae43dd5dd8..000000000000 --- a/make/data/cldr/common/main/gez_ER.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - Nfk - - - - diff --git a/make/data/cldr/common/main/gez_ET.xml b/make/data/cldr/common/main/gez_ET.xml deleted file mode 100644 index 5e45c54714a7..000000000000 --- a/make/data/cldr/common/main/gez_ET.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/gl.xml b/make/data/cldr/common/main/gl.xml index e82fac718fae..96d5e868ff75 100644 --- a/make/data/cldr/common/main/gl.xml +++ b/make/data/cldr/common/main/gl.xml @@ -43,8 +43,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ avar awadhi aimará - acerbaixano - azerí + azerí baxkir baluchi balinés @@ -345,6 +344,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pidgin nixeriano pijin polaco + piemontés malecite-passamaquoddy prusiano paxto @@ -877,18 +877,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ criterio de ordenación ordenación normalizada ordenación numérica + reordenación de alfabetos/bloques forza de ordenación moeda + destino da transformación + exclusións de quebra por dicionario representación como emoji + primeiro día da semana + mixto ciclo horario (12 ou 24) + método de introdución de texto + teclado + límite máximo ignorado estilo de quebra de liña quebra de liña dentro das palabras + regras de transformación sistema internacional de unidades + unidade de medida números + rexión para datos complementarios + orixe da transformación + subdivisión territorial quebra de liña tras as abreviaturas + transformación + tradución automática fuso horario variante rexional uso privado + transformación de uso privado calendario budista @@ -908,14 +924,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendario hebreo hebreo Calendario nacional indio + nacional indio calendario da héxira héxira calendario da héxira (tabular, época civil) héxira (tabular, época civil) Calendario islámico (Arabia Saudita, + héxira (avistamento en Arabia Saudita) + héxira (tabular, época astronómica) calendario da héxira (Umm al-Qura) héxira (Umm al-Qura) calendario ISO-8601 + gregoriano calendario xaponés xaponés calendario persa @@ -931,39 +951,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Clasificar acentos con normalidade Clasificar acentos invertidos Clasificar primeiro as minúsculas + minúsculas Clasificar orde de maiúsculas e minúsculas normal + minúsculas Clasificar primeiro as maiúsculas + maiúsculas Clasificar sen distinguir entre maiúsculas e minúsculas Clasificar distinguindo entre maiúsculas e minúsculas + compatibilidade Criterio de ordenación do dicionario + dicionario criterio de ordenación Unicode predeterminado Unicode predeterminado + emojis + regras europeas orde de clasificación da guía telefónica + directorio telefónico Orde de clasificación fonética + fonético Orde de clasificación pinyin + pinyin busca de carácter xeral busca Clasificar por consonante inicial hangul + consoante inicial coreana criterio de ordenación estándar estándar Orde de clasificación polo número de trazos + por trazos Orde de clasificación tradicional + tradicional Criterio de ordenación radical-trazo + por radical e trazos + zhuyin Clasificar sen normalización Clasificar Unicode normalizado Clasificar díxitos individualmente Clasificar díxitos numericamente + moeda + díxitos + puntuación + espazo en branco + símbolo Clasificar todo + todo Clasificar só letras de base + só letras base Clasificar acentos/maiúsculas e minúsculas/ancho/kana + letras base, acentos, maiúsculas/minúsculas, variantes, kana Clasificar acentos + letras base, acentos Clasificar acentos/maiúsculas e minúsculas/ancho + letras base, acentos, maiúsculas/minúsculas, variantes ancho completo ancho medio Numérico predeterminada emoji texto + sistema de 12 horas + 12 + sistema de 24 horas + 24 sistema de 12 horas (0–11) 12 (0–11) sistema de 12 horas (1–12) @@ -972,6 +1021,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) sistema de 24 horas (1–24) 24 (1–24) + espazos, puntuación, todos os símbolos + espazos, puntuación + espazos, puntuación + espazos, puntuación, símbolos (agás as moedas) estilo de quebra de liña flexible flexible estilo de quebra de liña normal @@ -992,51 +1045,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ EUA díxitos indoarábigos díxitos indoarábigos ampliados + díxitos indoarábigos ampliados numeración armenia numeración armenia en minúscula + armenios en minúscula díxitos bengalís díxitos chakmas díxitos devanagáricos numeración etíope Números financeiros + financeiros díxitos de ancho completo + ancho completo numeración xeorxiana numeración grega numeración grega en minúscula + gregos en minúscula díxitos guxaratis díxitos gurmukhis + numeración do día do mes en caracteres han para calendarios tradicionais numeración decimal chinesa + sistema decimal posicional usando ideogramas numéricos como díxitos numeración chinesa simplificada numeración financeira chinesa simplificada + financeiros chineses simplificados numeración chinesa tradicional numeración financeira chinesa tradicional + financeiros chineses tradicionais numeración hebrea díxitos xavaneses numeración xaponesa numeración financeira xaponesa + financeiros xaponeses + numeración xaponesa Gannen para o primeiro ano díxitos khmer díxitos kannarás + tai tham tham (eclesiásticos) díxitos laosianos díxitos occidentais + matemáticos en negra + matemáticos con dobre trazo + matemáticos sen serifa monoespazados + matemáticos sen serifa en negra + matemáticos sen serifa díxitos malabares Díxitos mongoles díxitos meitei mayek díxitos birmanos + birmanos (pwo oriental) + birmanos (pao) + birmanos (shan) + birmanos (tai laing) díxitos nativos + díxitos nativos díxitos ol chiki díxitos odiá + contornados numeración romana + romanos en maiúscula numeración romana en minúsculas - numeración támil tradicional + romanos en minúscula + segmentados + numeración támil (sistema tradicional) díxitos támiles + támiles (sistema moderno) díxitos telugus díxitos tailandeses díxitos tibetanos Numeros tradicionais + numeración tradicional díxitos vai activado desactivado + tradución automática sen especificar + variante POSIX + + desactivado + activado + métrico decimal británico @@ -1132,7 +1219,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM 'de' y G h:mm a h:mm:ss a - HH v dd/MM E, dd/MM dd/MM @@ -1163,6 +1249,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ 'de' y G + + {0} - {1} + {0}-{1} + {0}-{1} + y G – y G y–y G @@ -1241,6 +1332,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM – E, d 'de' MMM E, d 'de' MMM – E, d 'de' MMM + + d – d 'de' MMMM + d 'de' MMMM – d 'de' MMMM + y–y G @@ -1493,6 +1588,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1530,11 +1628,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM 'de' y G d 'de' MMM 'de' y G E, d 'de' MMM 'de' y G + MMMM 'de' y G + d 'de' MMMM 'de' y G + E, d 'de' MMMM 'de' y G h:mm a h:mm:ss a h:mm:ss a v + HH:mm:ss, v h:mm a v - HH v + HH:mm, v + HH, v d/M E, d/M dd/MM @@ -1552,12 +1655,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d 'de' MMM 'de' y E, d 'de' MMM 'de' y MMMM 'de' y + d 'de' MMMM 'de' y + E, d 'de' MMMM 'de' y QQQ y QQQQ 'de' y w.'ª' 'semana' 'de' Y w.'ª' 'semana' 'de' Y + + {0} {1} + + + {0} - {1} + {0}-{1} + {0}-{1} + y G – y G y–y G @@ -1628,6 +1741,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM – E, d 'de' MMM E, d 'de' MMM – E, d 'de' MMM + + d–d 'de' MMMM + d 'de' MMMM – d 'de' MMMM + M/y – M/y M/y – M/y @@ -2215,9 +2332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ París - - hora de verán británica - Londres @@ -2251,9 +2365,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iacarta - - hora estándar irlandesa - Dublín @@ -2685,6 +2796,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verán de Brasilia + + + hora británica + hora de verán británica + + hora de Brunei Darussalam @@ -2876,6 +2993,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + hora de Groenlandia + hora estándar de Groenlandia + hora de verán de Groenlandia + + hora de Groenlandia Oriental @@ -2902,7 +3026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hora estándar de Hawai-illas Aleutianas + hora de Hawai @@ -2963,6 +3087,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verán de Irán + + + hora irlandesa + hora estándar irlandesa + + hora de Irkutsk @@ -2986,9 +3116,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hora estándar de Petropavlovsk-Kamchatski - Horario estándar de Petropávlovsk-Kamchatski - Horario de verán de Petropávlovsk-Kamchatski + hora de Kamchatka + hora estándar de Kamchatka + hora de verán de Kamchatka @@ -3256,15 +3386,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de Samara - Horario estándar de Samara - Horario de verán de Samara + hora estándar de Samara + hora de verán de Samara - hora de Samoa hora estándar de Samoa - hora de verán de Samoa @@ -3331,6 +3459,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de Chuuk + + + hora de Turquía + hora estándar de Turquía + hora de verán de Turquía + + hora de Turkmenistán @@ -3350,6 +3485,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hora de verán do Uruguai + + + hora de Ürümqi + + hora de Uzbekistán @@ -3422,7 +3562,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ , - . +   @@ -3510,14 +3650,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 M ¤ 00 M ¤ 00 M ¤ - 000 M ¤ + 000 M¤ 000 M ¤ 0000 M ¤ 0000 M ¤ 00000 M ¤ 00000 M ¤ 000000 M ¤ + 000000 M ¤ 000000 M ¤ + 000000 M¤ 0 B ¤ 0 B ¤ 00 B ¤ @@ -4510,8 +4652,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ florín caribeño - florín caribeño - florín caribeño ƒ @@ -4555,12 +4695,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ouro de Zimbabwe - ouro de Zimbabwe - ouro de Zimbabwe + + {0}-{1} + + + {0}-{1} + {0} día + {0} de días {0} días Colle a {0}.ª curva á dereita. @@ -4773,8 +4918,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ partes - {0} parte - {0} partes partes por millón @@ -6221,15 +6364,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kt - - parte - {0} parte - {0} partes - - - Glc - {0} Glc - {0} Glc + + ppm l/km @@ -6338,10 +6474,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ W - - {0} Hg - {0} Hg - mi/h @@ -6364,10 +6496,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ l - - {0} fl oz m. - {0} fl oz m. - ac ft @@ -6386,59 +6514,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cto. imp. - - {0} sr - {0} sr - - - {0} kat - {0} kat - - - {0} C - {0} C - - - {0} F - {0} F - - - {0} H - {0} H - - - {0} S - {0} S - - - cal IT - {0} cal IT - {0} cal IT - - - {0} Bq - {0} Bq - - - {0} Sv - {0} Sv - - - {0} Gy - {0} Gy - - - {0} kgf - {0} kgf - - - {0} T - {0} T - - - {0} Wb - {0} Wb - ppmm diff --git a/make/data/cldr/common/main/gn.xml b/make/data/cldr/common/main/gn.xml deleted file mode 100644 index 04e9bf6dfbdc..000000000000 --- a/make/data/cldr/common/main/gn.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - avañe’ẽ - - - yvóra - África - América del Norte - América del Sur - Oceanía - América Central - América - Norteamérica - Caribe - Ásia - Európa - América Latina - Argentína - Bolívia - Brasil - Chíle - Colómbia - Ecuador - Union Européa - Eurozóna - Guyána Francésa - Groenlandia - Guyana - México - Peru - Paraguai - Surinam - Naciónes Unídas - Estados Unidos - EE. UU. - Uruguay - Venezuéla - - - - [aã {ch} eẽ g{g̃} h iĩ j k l m {mb} nñ {nd} {ng} {nt} oõ p r {rr} s t uũ v yỹ ʼ] - [b c d f q w x z] - [Aà {CH} EẼ G{G̃} H IĨ J K L M {MB} NÑ {ND} {NG} {NT} OÕ P R {RR} S T UŨ V YỸ ʼ] - - - - - - - - Jasyteĩ - Jasykõi - Jasyapy - Jasyrundy - Jasypo - Jasypoteĩ - Jasypokõi - Jasypoapy - Jasyporundy - Jasypa - Jasypateĩ - Jasypakõi - - - - - - - Arateĩ - Arakõi - Araapy - Ararundy - Arapo - Arapoteĩ - Arapokõi - - - - - - - - ary - - - jasy - - - ára - - - kuehe - ko ára - koʼẽrõ - - - arapokõindy - - - aravo’i - - - aravo’ive - - - - - - Bolivia óra - - - - - Ecuador óra - - - - - Galápagos óra - - - - - Venezuela óra - - - - - - - , - . - - - - ₲ - - - - diff --git a/make/data/cldr/common/main/gn_PY.xml b/make/data/cldr/common/main/gn_PY.xml deleted file mode 100644 index 69b8d3f67bf7..000000000000 --- a/make/data/cldr/common/main/gn_PY.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/gsw.xml b/make/data/cldr/common/main/gsw.xml index b8cf4fd827e0..4116f024ea58 100644 --- a/make/data/cldr/common/main/gsw.xml +++ b/make/data/cldr/common/main/gsw.xml @@ -192,7 +192,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ido Iisländisch Italiänisch - Inukitut + Inuktitut Japanisch Lojbanisch Jüüdisch-Persisch @@ -1316,6 +1316,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0}–{1} + {0}–{1} + d.–d. @@ -1747,13 +1752,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Alaska-Summerziit - - - Almaty-Ziit - Almaty-Schtandardziit - Almaty-Summerziit - - Amazonas-Ziit diff --git a/make/data/cldr/common/main/gu.xml b/make/data/cldr/common/main/gu.xml index 7c8a4c66ebdd..0b0f43845f8f 100644 --- a/make/data/cldr/common/main/gu.xml +++ b/make/data/cldr/common/main/gu.xml @@ -423,7 +423,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ફોનિશિયન પાલી પિજિન - પોલીશ + પોલિશ + પીડમોન્ટીઝ પોહપિએન મલિસીટ-પાસમાક્વોડ્ડી પ્રુસ્સીયન @@ -770,7 +771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ પશ્ચિમી યુરોપ સબ-સહારન આફ્રિકા લેટિન અમેરિકા - એસેન્શન આઇલેન્ડ + એસેન્શન આઇલૅન્ડ એન્ડોરા યુનાઇટેડ આરબ અમીરાત અફઘાનિસ્તાન @@ -818,12 +819,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ સ્વિટ્ઝર્લૅન્ડ કોટ ડીઆઇવરી આઇવરી કોસ્ટ - કુક આઇલેન્ડ્સ + કુક આઇલૅન્ડ્સ ચિલી કૅમરૂન ચીન કોલંબિયા - ક્લિપરટન આઇલેન્ડ + ક્લિપરટન આઇલૅન્ડ સાર્ક કોસ્ટા રિકા ક્યુબા @@ -866,13 +867,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ગ્વેર્નસે ઘાના જીબ્રાલ્ટર - ગ્રીનલેન્ડ + ગ્રીનલૅન્ડ ગેમ્બિયા ગિની ગ્વાડેલોપ ઇક્વેટોરિયલ ગિની ગ્રીસ - દક્ષિણ જ્યોર્જિયા અને દક્ષિણ સેન્ડવિચ આઇલેન્ડ્સ + દક્ષિણ જ્યોર્જિયા અને દક્ષિણ સેન્ડવિચ આઇલૅન્ડ્સ ગ્વાટેમાલા ગ્વામ ગિની-બિસાઉ @@ -884,7 +885,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ક્રોએશિયા હૈતિ હંગેરી - કૅનેરી આઇલેન્ડ્સ + કૅનેરી આઇલૅન્ડ્સ ઇન્ડોનેશિયા આયરલૅન્ડ ઇઝરાઇલ @@ -929,14 +930,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ મૉન્ટેનેગ્રો સેંટ માર્ટિન મેડાગાસ્કર - માર્શલ આઇલેન્ડ્સ + માર્શલ આઇલૅન્ડ્સ ઉત્તર મેસેડોનિયા માલી મ્યાંમાર (બર્મા) મંગોલિયા મકાઉ SAR ચીન મકાઉ - ઉત્તરી મારિયાના આઇલેન્ડ્સ + ઉત્તરી મારિયાના આઇલૅન્ડ્સ માર્ટીનીક મૌરિટાનિયા મોંટસેરાત @@ -950,16 +951,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ નામિબિયા ન્યુ સેલેડોનિયા નાઇજર - નોરફોક આઇલેન્ડ્સ + નોરફોક આઇલૅન્ડ્સ નાઇજેરિયા નિકારાગુઆ - નેધરલેન્ડ્સ + નેધરલૅન્ડ્સ નૉર્વે નેપાળ નૌરુ નીયુ ન્યુઝીલૅન્ડ - ઓટેરોઆ ન્યૂઝીલેન્ડ + ઓટેરોઆ ન્યુઝીલૅન્ડ ઓમાન પનામા પેરુ @@ -969,7 +970,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ પાકિસ્તાન પોલેંડ સેંટ પીએરી અને મિક્યુલોન - પીટકૈર્ન આઇલેન્ડ્સ + પીટકૈર્ન આઇલૅન્ડ્સ પ્યુઅર્ટો રિકો પેલેસ્ટિનિયન ટેરિટરી પેલેસ્ટાઇન @@ -984,7 +985,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ રશિયા રવાંડા સાઉદી અરેબિયા - સોલોમન આઇલેન્ડ્સ + સોલોમન આઇલૅન્ડ્સ સેશેલ્સ સુદાન સ્વીડન @@ -1004,14 +1005,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ સિંટ માર્ટેન સીરિયા એસ્વાટીની - સ્વાઝીલેન્ડ + સ્વાઝીલૅન્ડ ત્રિસ્તાન દા કુન્હા - તુર્ક્સ અને કેકોઝ આઇલેન્ડ્સ + તુર્ક્સ અને કેકોઝ આઇલૅન્ડ્સ ચાડ ફ્રેંચ સધર્ન ટેરિટરીઝ ટોગો થાઇલેંડ - તાજીકિસ્તાન + તાજિકિસ્તાન ટોકેલાઉ તિમોર-લેસ્તે પૂર્વ તિમોર @@ -1025,7 +1026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ તાંઝાનિયા યુક્રેન યુગાંડા - યુ.એસ. આઉટલાઇનિંગ આઇલેન્ડ્સ + યુ.એસ. આઉટલાઇનિંગ આઇલૅન્ડ્સ સંયુક્ત રાષ્ટ્ર યૂએન યુનાઇટેડ સ્ટેટ્સ @@ -1035,8 +1036,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ વેટિકન સિટી સેંટ વિન્સેંટ અને ગ્રેનેડાઇંસ વેનેઝુએલા - બ્રિટિશ વર્જિન આઇલેન્ડ્સ - યુએસ વર્જિન આઇલેન્ડ્સ + બ્રિટિશ વર્જિન આઇલૅન્ડ્સ + યુએસ વર્જિન આઇલૅન્ડ્સ વિયેતનામ વાનુઆતુ વૉલિસ અને ફ્યુચુના @@ -1070,18 +1071,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ સૉર્ટ ક્રમ સામાન્ય સૉર્ટિંગ આંકડાકીય સૉર્ટિંગ + લિપિ/બ્લૉક પુનઃક્રમાંકન સૉર્ટિંગ શક્તિ ચલણ + રૂપાંતરણ ગંતવ્ય + શબ્દકોશ બ્રેક અપવાદો ઇમોજી પ્રસ્તુતિ + અઠવાડિયાનો પહેલો દિવસ + મિશ્રિત કલાકનું આવર્તન (12 વિ.24) + ઇનપુટ પદ્ધતિ + કીબોર્ડ + ઉચ્ચતમ અવગણિત રેખા વિરામ પ્રકાર શબ્દોમાં રેખા વિરામ + રૂપાંતરણ નિયમ માપદંડ પદ્ધતિ + માપદંડ એકમ આંકડાઓ + પૂરક ડેટા માટેનો પ્રદેશ + રૂપાંતરણ સ્રોત + પ્રદેશ પેટાવિભાગ સંક્ષેપ પછી વાક્ય વિરામ + રૂપાંતરણ + મશીન અનુવાદિત સમય ઝોન લોકેલ વેરિએન્ટ ખાનગી-ઉપયોગ + ખાનગી-ઉપયોગ રૂપાંતરણ બુદ્ધિસ્ટ કેલેન્ડર @@ -1101,16 +1118,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ હિબ્રુ કેલેન્ડર હિબ્રુ ભારતીય રાષ્ટ્રીય કેલેન્ડર - ભારતીય રાષ્ટ્રીય + ભારતીય રાષ્ટ્રીય હિજરી કેલેન્ડર હિજરી હિજરી-નાગરિક કેલેન્ડર હિજરી-નાગરિક કેલેન્ડર ઇસ્લામિક કેલેન્ડર (સાઉદી અરેબિયા, નિરીક્ષણ) + હિજરી, સાઉદી અરેબિયા ચાંદ દર્શન ઇસ્લામિક કેલેન્ડર (ટેબ્યુલર, ખગોળશાસ્ત્રીય યુગ) + હિજરી-ખગોળીય કૅલેંડર હિજરી કેલેન્ડર (ઉમ અલ-કુરા) હિજરી (ઉમ અલ-કુરા) ISO-8601 કેલેન્ડર + ગ્રેગોરિઅન જાપાનીઝ કેલેન્ડર જાપાનીઝ પર્શિયન કેલેન્ડર @@ -1126,41 +1146,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ઉચ્ચારોને સામાન્ય રીતે સૉર્ટ કરો ઉચ્ચારોને વિપરીત સૉર્ટ કરો પ્રથમ લોઅરકેસ સૉર્ટ કરો + લોઅરકેસ સામાન્ય કેસના ક્રમમાં સૉર્ટ કરો + લોઅરકેસ પ્રથમ અપરકેસ સૉર્ટ કરો + અપરકેસ કેસ સંવેદીને સૉર્ટ કરો કેસ સંવેદી સૉર્ટ કરો અગાઉનો સોર્ટ ક્રમ, સુસંગતતા માટે + સુસંગતતા શબ્દકોશ અનુક્મ + શબ્દકોશ ડિફોલ્ટ યુનિકોડ સૉર્ટ ક્રમ ડિફોલ્ટ યુનિકોડ + ઇમોજી યુરોપીયન ક્રમ આપવાના નિયમો + યુરોપિયન નિયમો ફોનબુક અનુક્મ + ફોનબુક ધ્વન્યાત્મક સૉર્ટ ક્રમ + ફોનૅટિક પિનયિન અનુક્મ + પિનયિન સામાન્ય-ઉદ્દેશ શોધ શોધ હંગુલ પ્રારંભિક વ્યંજન દ્વારા શોધો + કોરિયન પ્રારંભિક વ્યંજન માનક સૉર્ટ ક્રમ માનક સ્ટ્રોક અનુક્મ + સ્ટ્રોક પરંપરાગત અનુક્મ + પરંપરાગત રેડિકલ-સ્ટ્રોક + રેડિકલ-સ્ટ્રોક + ઝુયિન સામાન્યકૃત વિના સૉર્ટ કરો યુનિકોડ સામાન્યકૃતને સૉર્ટ કરો અંકોને અલગથી સૉર્ટ કરોવ્યક્તિગત રીતે ક્રમમાં ગોઠવો અંકો અંકોને સંખ્યાત્મક રીતે સૉર્ટ કરો + ચલણ + અંક + વિરામચિહ્ન + વ્હાઇટસ્પેસ + પ્રતીક બધા સૉર્ટ કરો + તમામ ફક્ત આધાર અક્ષરોને સૉર્ટ કરો + માત્ર મૂળ અક્ષરો ઉચ્ચારો/કેસ/પહોળાઈ/કાના સૉર્ટ કરો + મૂળ અક્ષર, ઍક્સેંટ, કેસ, વેરિએંટ, કાના ઉચ્ચારો સૉર્ટ કરો + મૂળ અક્ષર, ઍક્સેંટ ઉચ્ચારો/કેસ/પહોળાઈ સૉર્ટ કરો + મૂળ અક્ષર, ઍક્સેંટ, કેસ, વેરિએંટ પૂર્ણપહોળાઇ અર્ધપહોળાઈ સંખ્યા ડિફૉલ્ટ ઇમોજી ટેક્સ્ટ + 12 કલાકની સિસ્ટમ + 12 + 24 કલાકની સિસ્ટમ + 24 12 કલાકની સિસ્ટમ (0–11) 12 (0–11) 12 કલાકની સિસ્ટમ (1–12) @@ -1169,6 +1218,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 કલાકની સિસ્ટમ (1–24) 24 (1–24) + શિફ્ટ સ્પેસ, વિરામચિહ્ન, તમામ ચિહ્ન + શિફ્ટ સ્પેસ, વિરામચિહ્ન + શિફ્ટ સ્પેસ, વિરામચિહ્ન + શિફ્ટ સ્પેસ, વિરામચિહ્ન, બિન-ચલણ ચિહ્ન શિથિલ રેખા વિરામ પ્રકાર શિથિલ સામાન્ય રેખા વિરામ પ્રકાર @@ -1189,51 +1242,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ અમેરિકન અરેબિક-ભારતીય અંકો વિસ્તૃત અરેબિક-ઇન્ડિક અંકો + વિસ્તૃત અરેબિક-ઇન્ડિક અર્મેનિયન સંખ્યાઓ અર્મેનિયન નાના અક્ષરની સંખ્યાઓ + અર્મેનિયન નાના અક્ષર બંગાળી અંકો ચકમા અંકો દેવનાગરી અંકો ઇથિયોપીક સંખ્યાઓ નાણાકીય સંખ્યાઓ + નાણાકીય પૂર્ણ પહોળાઈ અંકો + પૂર્ણ પહોળાઈ જ્યોર્જિઅન સંખ્યાઓ ગ્રીક સંખ્યાઓ ગ્રીક નાના અક્ષરની સંખ્યાઓ + ગ્રીક નાના અક્ષર ગુજરાતી અંકો ગુરમુખી અંકો + પારંપરિક કૅલેંડર માટે હાન-અક્ષર મહિનાના દિવસનું ક્રમાંકન ચાઇનીઝ દશાંશ સંખ્યાઓ + અંકો તરીકે ચાઇનીઝ સંખ્યાની ચિત્રલિપિનો ઉપયોગ કરતી સ્થાનીય દશાંશ પદ્ધતિ સરળીકૃત ચાઇનીઝ સંખ્યાઓ સરળીકૃત ચાઇનીઝ નાણાકીય સંખ્યાઓ + સરળીકૃત ચાઇનીઝ નાણાકીય પરંપરાગત ચાઇનીઝ સંખ્યાઓ પરંપરાગત ચાઇનીઝ નાણાકીય સંખ્યાઓ + પરંપરાગત ચાઇનીઝ નાણાકીય હિબ્રુ સંખ્યાઓ જાવાનીઝ અંકો જાપાનીઝ સંખ્યાઓ જાપાનીઝ નાણાકીય સંખ્યાઓ + જાપાનીઝ નાણાકીય + જાપાનીઝ પ્રથમ વર્ષનું ગૅનન ક્રમાંકન ખ્મેર અંકો કન્નડા અંકો + તાઈ થામ થામ (ધાર્મિક) લાઓ અંકો પશ્ચિમી અંકો + ગાણિતિક ઘાટા + ગાણિતિક ડબલ-સ્ટ્રક + ગાણિતિક મોનોસ્પેસ + ગાણિતિક સાન્સ-સેરિફ ઘાટા + ગાણિતિક સાન્સ-સેરિફ મલયાલમ અંકો મોંગોલિયન અંકો મેઇતેઇ માયેક અંકો મ્યાન્માર અંકો + મ્યાનમાર ઇસ્ટર્ન પ્વો કરેન + મ્યાનમાર પાઓ + મ્યાનમાર શાન + મ્યાનમાર તાઈ લાઈંગ મૂળ અંકો + મૂળ અંકો ઓલ ચિકી અંકો ઓરિયા અંકો + આઉટલાઇન કરેલ રોમન સંખ્યાઓ + રોમન મોટા અક્ષર રોમન નાના અક્ષરની સંખ્યા + રોમન નાના અક્ષર + વિભાજિત પારંપરિક તમિલ સંખ્યાઓ તમિલ અંકો + આધુનિક તમિલ તેલુગુ અંકો થાઇ અંકો તિબેટિયન અંકો પરંપરાગત અંકો + પારંપરિક સંખ્યાઓ વાઇ અંકો બંધ ચાલુ + અનિર્દિષ્ટ મશીન અનુવાદ + POSIX વેરિએંટ + + બંધ + ચાલુ + મેટ્રિક યુકે @@ -1316,12 +1403,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - d-MM- GGGGG y + d-MM GGGGG y GGGGGyMMd + + - + {1} {0} @@ -1355,9 +1445,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E, d MMM d MMMM - M/G y - d/M/G y - E, d/M/G y + M G y + d-MM G y + E, d-MM G y MM-y G MMM G y d MMM, G y @@ -1367,6 +1457,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ G y + + {0} – {1} + {0}–{1} + {0} – {1} GGGGG y-dd-MM – y-dd-MM @@ -1417,6 +1511,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + GGGG M/y – M/y GGGG M/y – M/y @@ -1651,6 +1749,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1677,12 +1778,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM, G y d MMM, G y E, d MMM, G y + MMMM, G y + d MMMM, G y + E, d MMMM, G y d/M E, d/M dd-MM d MMM E, d MMM d MMMM + E, d MMMM MMMMના W અઠવાડિયા MMMMના W અઠવાડિયા M/y @@ -1693,6 +1798,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM, y E, d MMM, y MMMM y + d MMMM, y + E, d MMMM, y Y ના w અઠવાડિયા Y ના w અઠવાડિયા @@ -1762,6 +1869,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y @@ -1825,19 +1936,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + ચૈત્ર + વૈશાખ + જેઠ + અષાઢ + શ્રાવણ + ભાદરવો + આસો + કારતક + માગશર + પોષ + મહા + ફાગણ + + + ચૈત્ર + વૈશાખ + જેઠ + અષાઢ + શ્રાવણ + ભાદરવો + આસો + કારતક + માગશર + પોષ + મહા + ફાગણ + + + + + ચૈત્ર + વૈશાખ + જેઠ + અષાઢ + શ્રાવણ + ભાદરવો + આસો + કારતક + માગશર + પોષ + મહા + ફાગણ + ચૈત્ર વૈશાખ - જ્યેષ્ઠ + જેઠ અષાઢ શ્રાવણ - ભાદો - અશ્વિન - કાર્તિક - અગ્રહાયણ + ભાદરવો + આસો + કારતક + માગશર પોષ મહા - ફાલ્ગુન + ફાગણ @@ -2178,9 +2333,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ક૰ - - ક૰ - મિનિટ આ મિનિટ @@ -2196,9 +2348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ મિ૰ - - મિ૰ - સેકંડ હમણાં @@ -2699,9 +2848,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ લિબ્રેવિલે - - બ્રિટિશ ગ્રીષ્મ સમય - લંડન @@ -2792,9 +2938,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ જયાપુરા - - આઈરિશ માનક સમય - ડબલિન @@ -3529,13 +3672,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ અલાસ્કા દિવસ સમય - - - અલ્માટી સમય - અલ્માટી પ્રમાણભૂત સમય - અલ્માટી ગ્રીષ્મ સમય - - એમેઝોન સમય @@ -3585,20 +3721,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ એપિયા દિવસ સમય - - - અક્તાઉ સમય - અક્તાઉ પ્રમાણભૂત સમય - અક્તાઉ ગ્રીષ્મ સમય - - - - - ઍક્ટોબ સમય - ઍક્ટોબ પ્રમાણભૂત સમય - ઍક્ટોબ ગ્રીષ્મ સમય - - અરેબિયન સમય @@ -3700,6 +3822,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ બ્રાઝિલિયા ગ્રીષ્મ સમય + + + બ્રિટિશ સમય + બ્રિટિશ ગ્રીષ્મ સમય + + બ્રુનેઇ દરુસલામ સમય @@ -3873,6 +4001,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ગ્રીનવિચ મધ્યમ સમય + + + ગ્રીનલૅન્ડ સમય + ગ્રીનલૅન્ડ માનક સમય + ગ્રીનલૅન્ડ ગ્રીષ્મ સમય + + પૂર્વ ગ્રીનલેન્ડ સમય @@ -3887,11 +4022,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ પશ્ચિમ ગ્રીનલેન્ડ ગ્રીષ્મ સમય - - - ગ્વામ પ્રમાણભૂત સમય - - ગલ્ફ માનક સમય @@ -3904,7 +4034,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - હવાઇ-એલ્યુશિઅન માનક સમય + હવાઇ સમય @@ -3968,6 +4098,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ઈરાન દિવસ સમય + + + આઈરિશ સમય + આઈરિશ માનક સમય + + ઇર્કુત્સ્ક સમય @@ -4035,11 +4171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ કિર્ગિઝ્સ્તાન સમય - - - લંકા સમય - - લાઇન આઇલેન્ડ્સ સમય @@ -4052,13 +4183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ લોર્ડ હોવ દિવસ સમય - - - મકાઉ સમય - મકાઉ પ્રમાણભૂત સમય - મકાઉ ગ્રીષ્મ સમય - - મગાડન સમય @@ -4174,11 +4298,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ફર્નાન્ડો દે નોરોહા ગ્રીષ્મ સમય - - - ઉત્તર મારિયાના આઇલેન્ડ્સ - - નોવસિબિર્સ્ક સમય @@ -4258,13 +4377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ પ્યોંગયાંગ સમય - - - કિઝિલોર્ડા સમય - કિઝિલોર્ડા પ્રમાણભૂત સમય - કિઝિલોર્ડા ગ્રીષ્મ સમય - - રીયુનિયન સમય @@ -4291,9 +4403,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - સમોઆ સમય સમોઆ માનક સમય - સમોઆ ગ્રીષ્મ સમય @@ -4360,6 +4470,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ચુઉક સમય + + + તુર્કિયે સમય + તુર્કિયે માનક સમય + તુર્કિયે ગ્રીષ્મ સમય + + તુર્કમેનિસ્તાન સમય @@ -4379,6 +4496,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ઉરુગ્વે ગ્રીષ્મ સમય + + + ઉરુમ્કી સમય + + ઉઝ્બેકિસ્તાન સમય @@ -4657,8 +4779,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ બાર્બાડિયન ડૉલર - બાર્બાડિયન ડૉલર - બાર્બાડિયન ડૉલર બાંગ્લાદેશી ટાકા @@ -4676,13 +4796,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ બર્મુડન ડૉલર - બર્મુડન ડૉલર - બર્મુડન ડૉલર બ્રુનેઇ ડૉલર - બ્રુનેઇ ડૉલર - બ્રુનેઇ ડૉલર બોલિવિયન બોલિવિયાનો @@ -4692,8 +4808,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ બહામિયન ડૉલર - બહામિયન ડૉલર - બહામિયન ડૉલર ભુતાનિઝ એંગુલ્ત્રમ @@ -4710,8 +4824,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ બેલિઝ ડૉલર - બેલિઝ ડૉલર - બેલિઝ ડૉલર કેનેડિયન ડૉલર @@ -4775,8 +4887,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ફિજિઅન ડૉલર - ફિજિઅન ડૉલર - ફિજિઅન ડૉલર ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ @@ -4806,8 +4916,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ગયાનિઝ ડૉલર - ગયાનિઝ ડૉલર - ગયાનિઝ ડૉલર હોંગ કોંગ ડૉલર @@ -4844,8 +4952,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ જમૈકિયન ડૉલર - જમૈકિયન ડૉલર - જમૈકિયન ડૉલર જોર્ડનિયન દિનાર @@ -4891,8 +4997,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ લિબેરિયન ડૉલર - લિબેરિયન ડૉલર - લિબેરિયન ડૉલર લેસોથો લોતી @@ -5017,8 +5121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ સોલોમન આઇલૅન્ડ્સ ડૉલર - સોલોમન આઇલૅન્ડ્સ ડૉલર - સોલોમન આઇલૅન્ડ્સ ડૉલર સેશેલોઈ રૂપી @@ -5046,8 +5148,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ સૂરીનામિઝ ડૉલર - સૂરીનામિઝ ડૉલર - સૂરીનામિઝ ડૉલર દક્ષિણ સુદાનિઝ પાઉન્ડ @@ -5085,8 +5185,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ત્રિનિદાદ અને ટોબેગો ડૉલર - ત્રિનિદાદ અને ટોબેગો ડૉલર - ત્રિનિદાદ અને ટોબેગો ડૉલર ન્યુ તાઇવાન ડૉલર @@ -5103,8 +5201,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ યુઍસ ડૉલર - યુઍસ ડૉલર - યુઍસ ડૉલર ઉરુગ્વેયન પેસો @@ -5134,13 +5230,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ઇસ્ટ કેરિબિયન ડૉલર - ઇસ્ટ કેરિબિયન ડૉલર - ઇસ્ટ કેરિબિયન ડૉલર કૅરિબિયન ગિલ્ડર - કૅરિબિયન ગિલ્ડર - કૅરિબિયન ગિલ્ડર પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક @@ -5167,8 +5259,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ઝીંબાબિયન ગોલ્ડ - ઝીંબાબિયન ગોલ્ડ - ઝીંબાબિયન ગોલ્ડ @@ -5178,11 +5268,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} કિલોગ્રામ {0} કિલોગ્રામ્સ + જમણી બાજુએ {0}લો વળાંક લો. + જમણી બાજુએ {0}જો વળાંક લો. જમણી બાજુએ {0}થો વળાંક લો. જમણી બાજુએ {0}ઠો વળાંક લો. - જમણી બાજુએ {0}લો વળાંક લો. જમણી બાજુએ {0}મો વળાંક લો. - જમણી બાજુએ {0}જો વળાંક લો. છોકરો {0} માટે બહાર રહ્યો. {0}ને લીપ વર્ષ માનવામાં આવે છે. અમે {0}નું બિલ ભેગું આપ્યું. @@ -5375,11 +5465,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} મિલિમોલ પ્રતિ લિટર {0} મિલિમોલ પ્રતિ લિટર - - ભાગ - {0} ભાગ - {0} ભાગ - masculine કણ પ્રતિ મિલિયન @@ -5404,11 +5489,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - - ગ્લૂકોઝ - {0} ગ્લૂકોઝ - {0} ગ્લૂકોઝ - લીટર પ્રતિ કિલોમીટર {0} લીટર પ્રતિ કિલોમીટર @@ -6865,11 +6945,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol/L - - ભાગ - {0} ભાગ - {0} ભાગ - ppm @@ -6882,11 +6957,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - ગ્લૂકોઝ - {0} ગ્લૂકોઝ - {0} ગ્લૂકોઝ - {0}લિ/100કિમી {0}લિ/100કિમી diff --git a/make/data/cldr/common/main/ha.xml b/make/data/cldr/common/main/ha.xml index a17f24d09fd6..98afe5e12674 100644 --- a/make/data/cldr/common/main/ha.xml +++ b/make/data/cldr/common/main/ha.xml @@ -154,6 +154,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Haida na Kudanci Ibrananci Harshen Hindi + Harshen Hindi (Gambiza da Turanci) Hiligaynon Hmong Kuroshiyan @@ -325,6 +326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pidgin na Najeriya Pijin Harshen Polan + Harshen Piedmontese Maliseet-Passamaquoddy Yaren Prussia Pashtanci @@ -827,15 +829,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kalanda Yanayin Kudi + Watsar da Ware Alamomi + Ware Lafazi da aka Juya + Tsarin Babban baƙi/Ƙaramin baƙi + Ware Ƙaramin baƙi da Babban baƙi Tsarin Rabewa + Warewa da aka Saba + Warewa na Lambobi + Rikodi na Rubutu/Gungu + Ƙarfin Warewa Kudin Kasa + Canza Wurin Zuwa + Kalmomi da Aka Ware Daga Shigarwa Cikin Ƙamus Gabatar da Imoji + Ranar farko ta mako + Cakuɗawa Zagayen Awowi (12 da 24) + Hanyar Sakawa + Allon madannai + Wanda aka fi watsi da shi Salo na Raba Layi Layi Zai Karye tsakanin Kalmomi + Dokokin Sauaywa Tsarin Awo + Kaso na Awo Lambobi + Bayanin Shiyya Domin na Wucin-gadi + Sauya Tushe + Ƙaramin Sashi na Shiyya Jimlar ta Karye Bayan Gajarcewa. + Sauya + Fassarar Inji + Lokacin Shiyya + Launi na Wuri + Keɓantaccen Amfani + Sauyi na Keɓantaccen Amfani Kalandar Buddist @@ -854,15 +882,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gregori Kalandar Ibrananci Yaren Hebrew + Na ƙasar Indiya Kalandar Musulunci Kaladar Musulunci Kalandar Musulunci (tabular, civil epoch) Kaladar Musulunci (ta ciki teburi, shekarar jamaʼa) + Kalandar Musulunci, kallon Saudiyya Kalandar Musulunci (tabular, astronomical epoch) Kalandar Musulunci (ta cikin teburi, shekarar taurari) Kalandar Musulunci (Umm al-Qura) Kalandar Musulunci (Ummu al-Qura Kalandar ISO-8601 + Ta Gregory Kalandar Jafan Ta ƙasar Japan Kalandar Farisa @@ -873,15 +904,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lissafin kuɗi Tsarin Kudi Nagartacce Daidaitacce + Ƙaramin baƙi + Ƙaramin baƙi + Babban baƙi + Dacewa + Ƙamus Tsarin Rabewa na Dan-maƙalu na Asali Tsararren Unicode + Emoji + Dokokin Turai + Littafin waya + Sautin murya + Pinyin Bincike na Dalilai-Gamagari Bincike + Baƙin farko na Korea Daidaitaccen Kasawa Daidaitacce + Karan tsaye + Na gargajiya + Tsarin Rubutun Ƙasar Sin + Zhuyin + Kuɗi + Lamba + Alamar rubutu + Farin sarari + Alama + Duka + Harufan Tushe Kawai + Tushe, Lafazi, Yanayin rubutu, Mabanbanta, Kana + Tushe, Lafazi + Tushe, Lafazi, Yanayin rubutu, Mabanbanta + Zuwa Haruffa Masu Ruɓin Girma + Zuwa Haruffa Masu Rabin Girma Tsararre Emoji Rubutu + Tsarin Awowi 12 + 12 + Tsarin Awowi 24 + 24 Tsarin Awowi 12 (0–11) 12 (0–11) Tsarin Awowi 12(1–12) @@ -890,6 +952,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) Tsarin Awowi 24(1–24) 24 (1–24) + Madannin tazara, alamar rubutu, dukkan alamomi + Madannin tazara, alamar rubutu + Madannin tazara, alamar rubutu + Madannin tazara, alamar rubutu, alamomi waɗanda ba alamomin kuɗi ba Salo na Raba Layi Sakakke Sakakke Salo na Raba Layi na Kodayaushe @@ -900,6 +966,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic A bar duka Na kodayaushe A bari cikin magana + Rubutun US BGN + Rubutun UN GEGN Tsarin Awo na Metric Awo Tsarin Awo na Imperial @@ -908,47 +976,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic Amurka Lambobi na Larabawan a Gabas Fitattun lambobin lissafi na Larabci + Fitattun Lambobin Larabci Lambobin ƙirga na Armenia Kananan Haruffan Armenia + Ƙananan haruffa na Armeniya Lambobin Yaren Bangla Lambobin Chakma Lambobin Tsarin Rubutu na Devangari Lambobin ƙirga na Ethiopia + Na kuɗi Lambobi masu Cikakken-Faɗi + Cikakken-faɗi Lambobin ƙirga na Georgia Lambobin ƙirga na Girka Kananan Haruffa na Girka + Ƙananan haruffa na Girka Lambobin Yaren Gujarati Lambobi na Tsarin Rubutun Gurmukhi + Tsarin rubuta lambobin kwanan wata na Daular Han domin kalandu na gargajiya Lambobin Gomiya na Yaren ƙasar Sin + Tsarin rubuta desimal ta amfani da alamomi na lambobin Ƙasan Sin a matsayin lamba Lambobin ƙirga na Yaren ƙasar Sin wanda aka Sauƙaƙa Lambobin Ƙirgan Kudi na Yaren ƙasar Sin wanda aka Sauƙaƙa + Lambobin Ƙirga na Yaren Ƙasar Sin wanda aka sauƙaƙa Lambobin Ƙirga na Yaren ƙasar Sin na Alʼada Lambobin Ƙirgan Kudi na Yaren ƙasar Sin na Alʼada + Lambobin Ƙirga na Yaren Ƙasar Sin na Alʼada Lambobin ƙirga na Hebrew Lambobin Javanese Lambobin ƙirga na Jafananci Lambobin ƙirgan Kudi na Jafananci + Lambobin ƙirga na Jafananci + Tsarin lambobin Japan na shekarar farko na Gannen Lambobin Yaren Khmer Lambobin Yaren Kannada + Tai Tham Tham (na mujamiʼa) Lambobin Yaren Lao Lambobi na Yammaci + Gwaragwaran alamomin lissafi + Tagwayen karan-tsaye na lissafi + Tilon sarari na lissafi + Gwaragwaran rubutun sans-serif na lissafi + Sans-serif na lissafi Lambobin Yaren Malayalam Lambobin Meetei Mayek Lambobin Myanmar + Gabacin Pwo Karen na Myanmar + Pao na Myanmar + Shan na Myanmar + Tai Laing na Myanmar + Lambobi na Ɗan ƙasa + Lambobi na ɗan ƙasa Lambobin Ol Chiki Lambobin Yaren Odia + An bayyana Lambobin Rumawa + Babban baƙi na Rumawa Lambobin Kirga Kanana na Rumawa + Ƙaramin baƙi na Rumawa + An daskarar Lambobin ƙirga na Tamil na Alʼada Lambobin Tamil + Sabon Tamil Lambobin yaren Telugu Lambobin yaren Thai Lambobin yaren Tibet + Lambobi na gargajiya Lambobin Vai Kashe Kunna + Fassarar Inji da ba a Fayyace ba + Launin POSIX + + Kashe + Kunna + Tsarin awo Tsarin awon ƙasar Ingila @@ -993,6 +1096,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {0}, {1} @@ -1231,6 +1337,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1266,7 +1375,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d M/y G + d/M/y G E, M/d/y G + G y, MMMM d + G y, MMMM d, E h:mm a h:mm:ss a M/d @@ -1280,11 +1392,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y d MMM, y MMMM y + y, MMMM d + y, MMMM d, E QQQ y QQQQ y 'sati' w 'cikin' Y 'sati' w 'cikin' Y + + {1}, {0} + {0} {1} + {1}, {0} + M/y G – M/y G @@ -1623,16 +1742,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Birni da ba a sani ba - - - Lokacin Bazara na Birtaniya - - - - - Tsayayyen Lokacin Irish - - Tsibirin Canton @@ -1645,6 +1754,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Center, Arewacin Dakota + + + Lokacin Acre + Tsayayyen Lokacin Acre + Lokacin Bazara na Acre + + Lokacin Afghanistan @@ -1714,9 +1830,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Lokacin Apia + Lokacin Yammacin Samoa Tsayayyen Lokacin Apia - Lokacin Rana na Apia + Lokacin Rana na Yammacin Samoa @@ -1820,6 +1936,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Bazara na Brasillia + + + Lokacin Birtaniya + Lokacin Bazara na Birtaniya + + Lokacin Brunei Darussalam @@ -1993,6 +2115,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Greenwich a Ingila + + + Lokacin Greenland + Tsayayyen Lokacin Greenland + Lokacin Bazara na Greenland + + Lokacin Gabas na Greenland @@ -2019,7 +2148,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Tsayayyen Lokacin Hawaii-Aleutian + Lokacin Hawaii @@ -2080,6 +2209,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Rana na Iran + + + Lokacin Ireland + Tsayayyen Lokacin Ireland + + Lokacin Irkutsk @@ -2101,6 +2236,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Hasken Rana na Japan + + + Lokacin Kamchatka + Tsayayyen Lokacin Kamchatka + Lokacin Bazara na Kamchatka + + Lokacin Kazakhstan @@ -2363,11 +2505,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Bazara na Sakhalin + + + Lokacin Samara + Tsayayyen Lokacin Samara + Lokacin Bazara na Samara + + - Lokacin Samoa Tsayayyen Lokacin Samoa - Lokacin Rana na Vote Samoa @@ -2434,6 +2581,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Chuuk + + + Lokacin Türkiye + Tsayayyen Lokacin Türkiye + Lokacin Bazara na Türkiye + + Lokacin Turkmenistan @@ -2453,6 +2607,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokacin Bazara na Uruguay + + + Lokacin Ürümqi + + Lokacin Uzbekistan @@ -2591,32 +2750,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ¤ 0K - ¤ 0K - ¤ 00D - ¤ 00D - ¤ 000D - ¤ 000D - ¤ 0B - ¤ 0B - ¤ 00B - ¤ 00B - ¤ 000B - ¤ 000B - ¤ 0T - ¤ 0T - ¤ 00T - ¤ 00T - ¤ 000T - ¤ 000T + ¤0K + ¤0K + ¤00D + ¤00D + ¤000D + ¤000D + ¤0M + ¤0M + ¤00M + ¤00M + ¤000M + ¤000M + ¤0B + ¤0B + ¤00B + ¤00B + ¤000B + ¤000B + ¤0T + ¤0T + ¤00T + ¤00T + ¤000T + ¤000T Dirham na Haɗaɗɗiyar Daular Larabawa - Dirham na Haɗaɗɗiyar Daular Larabawa - Dirham na Haɗaɗɗiyar Daular Larabawa Afghani na ƙasar Afghanistan @@ -2628,8 +2791,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dram na Armeniya - Dram na Armeniya - Dram na Armeniya Antillean Guilder na ƙasar Netherlands @@ -2638,8 +2799,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kwanza na Angola - Kwanza na Angola - Kwanza na Angola Peso na ƙasar Argentina @@ -2658,8 +2817,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Manat na Azebaijan - Manat na Azebaijan - Manat na Azebaijan Kuɗaɗen Bosnia da Herzegovina @@ -2677,13 +2834,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zinaren Bahrain - Zinaren Bahrain - Zinaren Bahrain Franc na Burundi - Franc na Burundi - Franc na Burundi Dalar ƙasar Bermuda @@ -2711,13 +2864,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pula na Batsuwana - Pula na Batsuwana - Pula na Batsuwana Ruble na Belarus - Ruble na Belarus - Ruble na Belarus Dalar ƙasar Belize @@ -2727,8 +2876,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Franc na Kongo - Franc na Kongo - Franc na Kongo Franc na Suwizilan @@ -2765,13 +2912,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Koruna na Czech - Koruna na Czech - Koruna na Czech Franc na Djibouti - Franc na Djibouti - Franc na Djibouti Krone na ƙasar Denmark @@ -2785,13 +2928,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dinarin Aljeriya - Dinarin Aljeriya - Dinarin Aljeriya Fam na Masar - Fam na Masar - Fam na Masar Kuɗin Eritireya @@ -2800,8 +2939,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Birr na Habasha - Birr na Habasha - Birr na Habasha Yuro @@ -2821,8 +2958,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lari na Georgia - Lari na Georgia - Lari na Georgia Cedi @@ -2832,18 +2967,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fam na Gibraltar - Fam na Gibraltar - Fam na Gibraltar Dalasi na Gambiya - Dalasi na Gambiya - Dalasi na Gambiya Franc na Guinea - Franc na Guinea - Franc na Guinea Kuɗin Gini @@ -2876,21 +3005,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Forint na Hungary - Forint na Hungary - Forint na Hungary Rupiah na ƙasar Indonesia Sabon shekel na Israʼila - Sabon shekel na Israʼila - Sabon shekel na Israʼila Rupee na ƙasar Indiya - Rupee na ƙasar Indiya - Rupee na ƙasar Indiya Dinarin Iraqi @@ -2932,8 +3055,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Franc na Kwamoras - Franc na Kwamoras - Franc na Kwamoras Won na ƙasar Koriya ta Arewa @@ -2956,13 +3077,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kip na ƙasar Laos - Kip na ƙasar Laos - Kip na ƙasar Laos Fam na Lebanon - Fam na Lebanon - Fam na Lebanon Rupee na ƙasar Sri Lanka @@ -2972,8 +3089,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Loti na Lesoto - Loti na Lesoto - Loti na Lesoto Dinarin Libya @@ -2992,16 +3107,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ariary na Malagasy - Ariary na Malagasy - Ariary na Malagasy Dinarin Macedonia Kyat na ƙasar Myanmar - Kyat na ƙasar Myanmar - Kyat na ƙasar Myanmar Tugrik na Mongolia @@ -3014,23 +3125,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ouguiya na Moritaniya - Ouguiya na Moritaniya - Ouguiya na Moritaniya Rupee na Moritus - Rupee na Moritus - Rupee na Moritus Rufiyaa na ƙasar Maldives - Rufiyaa na ƙasar Maldives - Rufiyaa na ƙasar Maldives Kwacha na Malawi - Kwacha na Malawi - Kwacha na Malawi Peso na ƙasar Mekziko @@ -3039,8 +3142,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ringgit na ƙasar Malaysia - Ringgit na ƙasar Malaysia - Ringgit na ƙasar Malaysia Kuɗin Mozambik @@ -3086,13 +3187,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kina na ƙasar Papua New Guinea - Kina na ƙasar Papua New Guinea - Kina na ƙasar Papua New Guinea Peso na ƙasar Philippine - Peso na ƙasar Philippine - Peso na ƙasar Philippine Rupee na ƙasar Pakistan @@ -3110,8 +3207,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Leu na Romania - Leu na Romania - Leu na Romania Dinarin Serbia @@ -3123,13 +3218,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Franc na Ruwanda - Franc na Ruwanda - Franc na Ruwanda Riyal ɗin Saudiyya - Riyal ɗin Saudiyya - Riyal ɗin Saudiyya Dalar Tsibiran Solomon @@ -3138,8 +3229,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Rupee na Seychellois - Rupee na Seychellois - Rupee na Seychellois Fam na Sudan @@ -3161,13 +3250,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Leone na Saliyo - Leone na Saliyo - Leone na Saliyo Leone na Saliyo (1964—2022) - Leone na Saliyo (1964—2022) - Leone na Saliyo (1964—2022) Sulen Somaliya @@ -3185,13 +3270,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dobra na Sawo Tome - Dobra na Sawo Tome - Dobra na Sawo Tome Fam ɗin Siriya - Fam ɗin Siriya - Fam ɗin Siriya Emalangeni na Swazi @@ -3209,16 +3290,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dinarin Tunusiya - Dinarin Tunusiya - Dinarin Tunusiya Paʻanga na ƙasar Tonga Lira na Turkiyya - Lira na Turkiyya - Lira na Turkiyya Dalar ƙasar Trinidad da Tobago @@ -3233,8 +3310,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hryvnia na Ukrain - Hryvnia na Ukrain - Hryvnia na Ukrain Sulen Yuganda @@ -3258,8 +3333,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dong na ƙasar Vietnam - Dong na ƙasar Vietnam - Dong na ƙasar Vietnam Vatu da ƙasar Vanuatu @@ -3277,8 +3350,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guilder na Caribbean - Guilder na Caribbean - Guilder na Caribbean Kuɗin Sefa na Afirka Ta Yamma @@ -3298,24 +3369,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Rand na Afirka ta Kudu - Rand na Afirka ta Kudu - Rand na Afirka ta Kudu Kuɗin Zambiya (1968–2012) Kwacha na Zambiya - Kwacha na Zambiya - Kwacha na Zambiya Dalar zimbabuwe Zinaren Zimbabwe - Zinaren Zimbabwe - Zinaren Zimbabwe @@ -3324,6 +3389,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic rana {0} kwanaki {0} + Ɗauki na {0}th daga dama. @@ -3398,9 +3464,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic g-force {0} - meters per second squared - meter per second squared {0} - meters per second squared {0} + mitoci a second squared + mitoci {0} a second squared + mitoci {0} a second squared revolutions @@ -3679,7 +3745,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic milliamperes - milliamperes {0} + milliampere {0} milliamperes {0} @@ -3692,28 +3758,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic volts {0} - kilokaloris + kilokaloris-kilokaloris kilokalori {0} - kilokaloris {0} + kilokaloris-kilokaloris {0} kaloris kalori {0} - kaloris {0} + kaloris-kaloris {0} - Kaloris + Kaloris-Kaloris Kalori {0} - Kaloris {0} + Kaloris-Kaloris {0} - kilojoules + kilojoules-kilojoules kilojoule {0} - kilojoules {0} + kilojoules-kilojoules {0} + joules-joules joule {0} - joules {0} + joules-joules {0} kilowatt-hours @@ -3731,7 +3798,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic British thermal units {0} - US therm {0} + US therms {0} US therms {0} @@ -3803,10 +3870,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic aya {0} a inci ayoyi {0} a inci - - aya {0} - aya {0} - faɗin duniya faɗin duniya {0} @@ -3938,9 +4001,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic metric tons {0} - kilogiramgiram + kilogiram-kilogiram kilogiram {0} - kilogiramgiram {0} + kilogiram-kilogiram {0} {0} a kilogiram @@ -3950,14 +4013,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} a giram - milligiramgiram + miligiram-miligiram milligiram {0} - milligiramgiram {0} + miligiram-miligiram {0} - makirogiramgiram + makrogiram-makogiram Makirogiram {0} - makirogiramgiram {0} + makrogiram-makogiram {0} tan {0} @@ -3968,13 +4031,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic stones {0} - Laba {0} + laba {0} laba-laba {0} + {0} a laba oza-oza - oza {0} - oza-oza {0} + ons {0} + ons-ons {0} {0} a oza @@ -3983,49 +4047,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic oza-ozar troy {0} - carat {0} - carats {0} + karat-karat + karat {0} + karat-karat {0} + dalton-dalton dalton {0} - daltons {0} + dalton-dalton {0} - Earth mas {0} + Earth mass {0} Earth masses {0} - solar mas {0} + solar mass {0} solar masses {0} - gigawatwat + gigawatts-gigawatts gigawat {0} - gigawatwat {0} + gigawatts-gigawatts {0} - megawatwat + megawatts-megawatts megawat {0} - megawatwat {0} + megawatts-megawatts {0} - kilowatwat - kilowat {0} - kilowatwat {0} + kilowatts-kilowatts + kilowatt {0} + kilowatts-kilowatts {0} wat {0} wat-wat {0} - milliwatwat + miliwatt-miliwatt milliwat {0} - milliwatwat {0} + miliwatt-miliwatt {0} - ƙarfin inji - ƙarfin inji {0} - ƙarfin inji {0} + ƙarfin doki + ƙarfin doki {0} + ƙarfin doki {0} millimitocin zaiba @@ -4089,8 +4155,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic mitoci a daƙiƙa - mita a daƙiƙa {0} - mitoci a daƙiƙa {0} + mita {0} a daƙiƙa + mitoci {0} a daƙiƙa mil-mil a saʼa @@ -4102,6 +4168,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic knot {0} knots {0} + + Beaufort + Beaufort {0} + Beaufort {0} + Digirin yanayi {0} digiri-digirin yanayi {0} @@ -4154,19 +4225,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic kubik mil-mil {0} - kubik yaduka - kubik yadi {0} - kubik yaduka {0} + yaduka kubik + yadi kubik {0} + yaduka kubik {0} - kubik ƙafafu - kubik ƙafa {0} - kubik ƙafafu {0} + ƙafafu kubik + ƙafa kubik {0} + ƙafafu kubik {0} - kubic incina - kubik inci {0} - kubik incina {0} + incina kubik + inci kubik {0} + incina kubik {0} megalitoci @@ -4248,9 +4319,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic kofuna {0} - fluid ounces - fluid ounce {0} - fluid ounces {0} + onces na ruwa + ounce {0} na ruwa + ounces {0} na ruwa Imp. fluid ounces @@ -4287,6 +4358,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic dram {0} drams {0} + + jiggers + jiggers {0} + jiggers {0} + + + pinches + pn {0} + pinches {0} + Imp. quarts Imp. quart {0} @@ -4304,12 +4385,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic coulomb {0} - coulomb {0} + coulombs {0} farads farad {0} - farad {0} + farads {0} henrys @@ -4363,8 +4444,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic sashi a cikin biliyan - sashi {0} a cikin biliyan - sashi {0} a cikin biliyan wurin fuskanta @@ -4664,6 +4743,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic mA {0} + ohms Ω {0} Ω {0} @@ -4712,8 +4792,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Btu {0} - US therm {0} - US therm {0} + US therms {0} + US therms {0} pounds-force @@ -4907,7 +4987,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic kg {0} - giram + giram-giram g {0} g {0} @@ -4944,14 +5024,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic oz t {0} - carats + karat-karat CD {0} CD {0} - daltons + dalton-dalton Da {0} - daltons {0} + Da {0} Earth masses @@ -4965,8 +5045,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ƙwaya - ƙwaya {0} - ƙwaya {0} + ƙy {0} + ƙy {0} GW {0} @@ -4990,9 +5070,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic mW {0} - ƙi - ƙi {0} - ƙi {0} + ƙd + ƙd {0} + ƙd {0} mmHg {0} @@ -5043,18 +5123,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic km/saʼa - km/s {0} - km/s {0} + km {0}/sa'a + km {0}/sa'a mitoci/daƙ - m/s {0} - m/s {0} + m {0}/d + m {0}/d mil-mil/saʼa - mas {0} - mas {0} + m {0} as + m {0} as kn {0} @@ -5173,6 +5253,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic gal Imp. {0} gal Imp.{0} + {0}/galImp qts @@ -5190,9 +5271,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic k {0} - fl oz - fl oz {0} - fl oz {0} + oz na ruwa + oz {0} na ruwa + oz {0} na ruwa fl oz Imp. {0} @@ -5200,13 +5281,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic bckl - bckl {0} - bckl {0} + Bckl {0} + Bckl {0} ƙmc ƙmc {0} - {0} tsp + ƙmc {0} gang {0} @@ -5217,8 +5298,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic dstspn {0} - dstspn Imp {0} - dstspn Imp {0} + Imp. dessert spoons + dsp-Imp. {0} + dsp-Imp. {0} ɗigo @@ -5226,20 +5308,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɗigo {0} - dram fl {0} - dram fl {0} + ruwan dram + dram {0} + drams {0} - jigger {0} - jigger {0} + jiggers + jiggers {0} + jiggers {0} - pinch {0} - pinch {0} + pinches + pn {0} + pn {0} - qt Imp. {0} - qt Imp. {0} + Imp. quarts + qt-Imp. {0} + qt-Imp. {0} sr {0} @@ -5416,20 +5502,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic abu{0} Abw{0} - - sashe - sashe {0} - sashe {0} - ppm ppm{0} ppm{0} - - %{0} - %{0} - ‰ @@ -5441,11 +5518,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic mol{0} mol{0} - - Glk - Glk {0} - Glk {0} - L/km L/km{0} @@ -5572,6 +5644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ns{0} + amp A{0} A{0} @@ -5680,12 +5753,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ppi{0} - dpcm dpcm{0} dpcm{0} - dpi dpi{0} dpi{0} @@ -5700,22 +5771,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic km{0} km{0} - km/{0} m{0} m{0} - m/{0} dm{0} dm{0} - sm sm{0} sm{0} - sm/{0} mm{0} @@ -5744,12 +5811,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}' {0}' - ƙafa/{0} {0}″ {0}″ - in/{0} fasek @@ -5817,6 +5882,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic kg{0} + giram-giram g{0} g{0} @@ -5853,7 +5919,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic oz t{0} - carat + karat CD{0} CD{0} @@ -5873,8 +5939,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic M☉{0} - ƙwaya{0} - ƙwaya{0} + ƙy + ƙy{0} + ƙy{0} GW{0} @@ -5898,8 +5965,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic mW{0} - ƙi{0} - ƙi{0} + ƙd + ƙd{0} + ƙd{0} mmHg @@ -5944,26 +6012,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic MPa{0} - km/s{0} - km/s{0} + km {0}/sa'a + km {0}/sa'a m/d - m/d{0} - m/d{0} + m{0}/d + m{0}/d - mas{0} - mas{0} + m{0}as + m{0}as kn{0} kn{0} + + B{0} + B{0} + °S - S°{0} - S°{0} °F @@ -5999,6 +6069,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic mi³{0} + yd³ yd³{0} yd³{0} @@ -6046,8 +6117,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic kimar awon ruwa. - kimar awon ruwa {0}. - kimar awon ruwa {0}. ek ƙf{0} @@ -6083,8 +6152,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic kfn{0} - fl oz{0} - fl oz{0} + oz na ruwa + oz{0} na ruwa + oz{0} na ruwa Imp fl oz @@ -6092,8 +6162,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic fl oz Im{0} - bckl{0} - bckl{0} + Bckl{0} + Bckl{0} ƙmc{0} @@ -6105,7 +6175,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic dsp - dsp{0} + dstspn {0} dsp{0} @@ -6123,6 +6193,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic fl.dr.{0} + jiggers jigger{0} jigger{0} @@ -6135,48 +6206,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic qt-Imp.{0} qt-Imp.{0} - - sr {0} - sr {0} - - - {0} kat - {0} kat - - - C {0} - C {0} - F {0} - {0} F + F {0} + + + H {0} + H {0} + + + S {0} + S {0} - kal-IT kal-IT{0} kal-IT {0} - - Bk - Bk {0} - Bk {0} - - - Sb - Sb {0} - Sb {0} - - - Gr - - - {0} kgf - {0} kgf - - - T {0} - T {0} - Wb{0} Wb{0} @@ -6220,6 +6265,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} — a kewaye {0} — faɗaɗaɗɗe {0} kallon gefe + {0} kallon dama {0} — na tarihi {0} — daban-daban {0} — wani dabam @@ -6384,6 +6430,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic und ha ko vi yue zh + informal {given-informal} {surname} @@ -6494,7 +6541,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ∅∅∅ Modibbo ∅∅∅ - ∅∅∅ + ƙarami MP @@ -6513,10 +6560,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Farf. Dr. Ada Cornelia Neele - Eva Sophia - van den - Wolf - Becker Schmidt + Kabiru Malami + Bala + Buhari + Garba Dauda Ƙarami M.D. Ph.D. diff --git a/make/data/cldr/common/main/ha_Arab.xml b/make/data/cldr/common/main/ha_Arab.xml deleted file mode 100644 index b80318bd2bab..000000000000 --- a/make/data/cldr/common/main/ha_Arab.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - 𞄒𞄫𞄱𞄔𞄩𞄴 - - - - [𞄱 𞄶 𞄲 𞄳 𞄰 𞄴 𞄵 𞅏 𞄼 𞄽 𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬 𞅎] - - [𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬] - [\- ‑ , . % + 𞅀 𞅁 𞅂 𞅃 𞅄 𞅅 𞅆 𞅇 𞅈 𞅉] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - 𞄆𞄬 - 𞄛𞄨𞄱𞄄𞄤𞄲𞄨 - 𞄒𞄫𞄰𞄒𞄪𞄱 - 𞄤𞄨𞄱 - 𞄀𞄪𞄴 - 𞄛𞄤𞄱𞄞𞄤𞄦 - 𞄔𞄩𞄴𞄆𞄨𞄰 - 𞄕𞄩𞄲𞄔𞄄𞄰𞄤 - 𞄛𞄤𞄱𞄒𞄤𞄰 - 𞄪𞄱𞄀𞄤𞄴 - 𞄚𞄦𞄲𞄤𞄚𞄄𞄰𞄫 - 𞄒𞄩𞄱𞄔𞄬𞄴 - - - - - - - 𞄎𞄤𞄲 - 𞄈𞄦 - 𞄆𞄨𞄰 - 𞄗𞄄𞄤𞄰𞄦 - 𞄙𞄤𞄱𞄨 - 𞄑𞄤𞄱𞄨 - 𞄊𞄧𞄳 - - - - - - - 𞅁 - 𞅂 - 𞅃 - 𞅄 - - - - - - 𞄜𞄆𞄪 - - - - - - - 𞄛𞄩 - - - - - hmnp - latn - - - 𞅎 - - - - diff --git a/make/data/cldr/common/main/hnj_Hmnp.xml b/make/data/cldr/common/main/hnj_Hmnp.xml deleted file mode 100644 index 333b6d17a787..000000000000 --- a/make/data/cldr/common/main/hnj_Hmnp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - + - + - + @@ -624,55 +631,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + - + - + + - + - - - - - - + + + + + + - - - - - - + + + + + + + - + - + - - - + + + - + - + @@ -683,18 +692,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + - + + + @@ -714,7 +725,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -726,14 +737,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + - - + + + @@ -742,10 +754,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + @@ -1132,18 +1144,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rendezési sorrend Normalizált rendezés Numerikus rendezés + Írásmódok/blokkok átrendezése Rendezés erőssége Pénznem + Transzformációs cél + Szótári elválasztási kivételek Emoji megjelenítése + A hét első napja + Vegyes Óraformátum (12 – 24) + Beviteli módszer + Billentyűzet + Legmagasabb figyelmen kívül hagyott Sortörés stílusa Szavakon belüli sortörések + Transzformációs szabályok Mértékegységrendszer + Mértékegység Számok + Régió kiegészítő adatokhoz + Forrás transzformáció + Régió közigazgatási egysége Mondattörés rövidítés után + Transzformáció + Gépi fordítású Időzóna Földrajzi helyvariáns Privát használatra + Magánhasználatú transzformáció Buddhista naptár @@ -1163,13 +1191,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Héber naptár Héber Indiai nemzeti naptár + Indiai nemzeti Hidzsra naptár Hidzsra Hidzsra naptár (táblázatos, polgári) Hidzsra (táblázatos, polgári) + Hidzsri, szaúd-arábiai megfigyelés + Hidzsri (táblázatos, csillagászati) Hidzsra naptár (Umm al-Qura) Hidzsra (Umm al-Qura) ISO-8601 naptár + Gergely Japán naptár Japán Perzsa naptár @@ -1185,8 +1217,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ékezetek normál rendezése Ékezetek szerinti fordított rendezés Kisbetűs szavak rendezése előre + Kisbetűs Kisbetűs-nagybetűs szavak normál rendezése + Kisbetűs Nagybetűs szavak rendezése előre + Nagybetűs Kis- és nagybetűket meg nem különböztető rendezés Rendezés kisbetű-nagybetű szerint Előző rendezési sorrend a kompatibilitás érdekében @@ -1196,7 +1231,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alapértelmezett Unicode rendezési sorrend Alapértelmezett Unicode Emodzsi rendezési sorrend + Emodzsi Európai rendezési szabályok + Európai szabályok Telefonkönyv sorrend Telefonkönyv Fonetikus rendezési sorrend @@ -1206,6 +1243,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Általános célú keresés Keresés Keresés hangul kezdő mássalhangzó szerint + Koreai kezdő mássalhangzó Normál rendezési sorrend Normál Vonássorrend @@ -1220,17 +1258,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unicode szerinti normalizált rendezés Számjegyek egyedi rendezése Számjegyek numerikus rendezése + Pénznem + Számjegyek + Írásjelek + Szóközök + Szimbólumok Összes rendezése + Összes Csak az alapbetűk rendezése + Csak alapbetűk Ékezetek/kisbetű-nagybetű/szélesség/kanák rendezése + Alap, ékezetek, kis- és nagybetűk, variánsok, kana Ékezetek rendezése + Alap, ékezetek Ékezetek/kisbetű-nagybetű/szélesség rendezése + Alap, ékezetek, kis- és nagybetűk, variánsok Teljes szélesség Fél szélesség Szám Alapértelmezett Emoji Szöveg + 12 órás rendszer + 12 + 24 órás rendszer + 24 12 órás rendszer (0–11) 12 (0–11) 12 órás rendszer (0–12) @@ -1239,6 +1291,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 órás rendszer (0–24) 24 (1–24) + Szóközök, írásjelek és minden szimbólum eltolása + Szóközök, írásjelek eltolása + Szóközök, írásjelek eltolása + Szóközök, írásjelek és nem pénznemjelek eltolása Tág stílusú sortörés Tág Normál stílusú sortörés @@ -1259,51 +1315,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Amerikai Arab-indiai számjegyek Kibővített arab-indiai számjegyek + Kibővített arab-indiai Örmény számok Örmény kisbetűs számok + Örmény kisbetűs Bengáli számjegyek Csakma számjegyek Dévanágari számjegyek Etióp számok Pénzügyi számok + Pénzügyi Teljes szélességű számjegyek + Teljes szélességű Grúz számok Görög számok Görög kisbetűs számok + Görög kisbetűs Gudzsaráti számjegyek Gurmuki számjegyek + Kínai írásjegyes napszámozás a hagyományos naptárakhoz Kínai tizedes számok + Kínai számjegy-ideogrammákat használó helyiértékes tizedes rendszer Egyszerűsített kínai számok Egyszerűsített kínai pénzügyi számok + Egyszerűsített kínai pénzügyi Hagyományos kínai számok Hagyományos kínai pénzügyi számok + Hagyományos kínai pénzügyi Héber számok Jávai számjegyek Japán számok Japán pénzügyi számok + Japán pénzügyi + Japán első éves Gannen számozás Khmer számjegyek Kannada számjegyek + Tai tham tham (egyházi) Lao számjegyek Nyugati számjegyek + Matematikai félkövér + Matematikai dupla szárú + Matematikai rögzített szélességű + Matematikai talpatlan félkövér + Matematikai talpatlan Malajálam számjegyek Mongol számjegyek Meitei Mayek számjegyek Mianmari számjegyek + Mianmari keleti pwo karen + Mianmari pao + Mianmari shan + Mianmari tai laing Natív számjegyek + Natív számjegyek Ol Chiki számjegyek Orija számjegyek + Körvonalas Római számok + Római nagybetűs Római kisbetűs számok + Római kisbetűs + Szegmenses Hagyományos tamil számjegyek Tamil számjegyek + Modern tamil Telugu számjegyek Thai számjegyek Tibeti számjegyek Hagyományos számok + Hagyományos számjegyek Vai számjegyek Ki Be + Meghatározatlan gépi fordítás + POSIX-variáns + + Ki + Be + metrikus angol @@ -1491,7 +1581,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y. G y. M. G y. M. d. - E, M/d/y G + G y. M. d., E G y. MMM G y. MMM d. G y. MMM d., E @@ -1581,6 +1671,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d., E – d., E MMM d., E – MMM d., E + + MMMM d–d. + MMMM d. – MMMM d. + G y–y. @@ -1864,6 +1958,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1902,6 +1999,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y. MMM G y. MMM d. G y. MMM d., E + G y. MMMM + G y. MMMM d. + G y. MMMM d., E a h H a h:mm @@ -1917,6 +2017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d. MMM d., E MMMM d. + MMMM d., E MMMM W. 'hete' MMMM W. 'hete' mm:ss @@ -1928,11 +2029,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y. MMM d. y. MMM d., E y. MMMM + y. MMMM d. + y. MMMM d., E y. QQQ y. QQQQ Y w. 'hete' Y w. 'hete' + + {0}, {1} + {1}, {0} + d–d. @@ -1991,6 +2098,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d., E – d., E MMM d., E – MMM d., E + + MMMM d–d. + MMMM d. – MMMM d. + y. MM–MM. y. MM. – y. MM. @@ -2571,11 +2682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Párizs - - - brit nyári idő - - Tbiliszi @@ -2600,11 +2706,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Makasar - - - ír nyári idő - - Jeruzsálem @@ -2944,13 +3045,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ alaszkai nyári idő - - - Almati idő - Almati zónaidő - Almati nyári idő - - amazóniai idő @@ -3000,20 +3094,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ apiai nyári idő - - - Aqtaui idő - Aqtaui zónaidő - Aqtaui nyári idő - - - - - Aqtobei idő - Aqtobei zónaidő - Aqtobei nyári idő - - arab idő @@ -3115,6 +3195,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ brazíliai nyári idő + + + brit időzóna + brit nyári idő + + Brunei Darussalam-i idő @@ -3311,6 +3397,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + grönlandi idő + grönlandi téli idő + grönlandi nyári idő + + kelet-grönlandi időzóna @@ -3325,11 +3418,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nyugat-grönlandi nyári idő - - - Guami zónaidő - - öbölbeli téli idő @@ -3342,7 +3430,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - hawaii-aleuti téli idő + hawaii idő @@ -3403,6 +3491,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ iráni nyári idő + + + ír időzóna + ír nyári idő + + irkutszki idő @@ -3426,9 +3520,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovszk-kamcsatkai idő - Petropavlovszk-kamcsatkai zónaidő - Petropavlovszk-kamcsatkai nyári idő + kamcsatkai idő + kamcsatkai téli idő + kamcsatkai nyári idő @@ -3470,11 +3564,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kirgizisztáni idő - - - Lankai idő - - sor-szigeteki idő @@ -3487,13 +3576,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe-szigeti nyári idő - - - Macaui idő - Macaui zónaidő - Macaui nyári idő - - magadáni idő @@ -3609,11 +3691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha-i nyári idő - - - Észak-mariana-szigeteki idő - - novoszibirszki idő @@ -3693,13 +3770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ phenjani idő - - - Qyzylordai idő - Qyzylordai zónaidő - Qyzylordai nyári idő - - réunioni idő @@ -3726,9 +3796,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - szamoai idő szamoai téli idő - szamoai nyári idő @@ -3821,6 +3889,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguayi nyári idő + + + ürümcsi idő + + üzbegisztáni idő @@ -3960,9 +4033,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4198,12 +4268,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unidad de Valor Real - Costa Rica-i colon + Costa Rica-i colón + Costa Rica-i colón + Costa Rica-i colón szerb dinár (2002–2006) - szerb dinár (2002–2006) - szerb dinár (2002–2006) Csehszlovák kemény korona @@ -4862,8 +4932,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ karibi forint - karibi forint - karibi forint Special Drawing Rights @@ -4953,8 +5021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zimbabwei arany - zimbabwei arany - zimbabwei arany Zimbabwei dollár (2009) @@ -5306,7 +5372,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} itemmé - rész {0} rész {0} rész @@ -5360,7 +5425,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} tízezrelékké - mól {0} mól {0} mólt {0} móllal @@ -6207,7 +6271,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} luxszá - kandela {0} kandela {0} kandelát {0} kandelával @@ -6947,6 +7010,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} weber {0} weber + + fény + {0} fény + {0} fény + {0} fény + {0} fény + {0} fény + {0} light + {0} light + {0} light + {0} light + {0} light + {0} éjszaka {0} éjszakát @@ -7360,6 +7436,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cal-IT + + fény + éjszakák {0} éjszaka @@ -7387,7 +7466,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol/l - rész {0} rész {0} rész @@ -7400,9 +7478,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‰ - - Glc - {0} l/100 km {0} l/100 km @@ -7456,8 +7531,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} csi {0} csi - - cal-IT + + fény diff --git a/make/data/cldr/common/main/hy.xml b/make/data/cldr/common/main/hy.xml index c2df5c89e9aa..8ce55c921743 100644 --- a/make/data/cldr/common/main/hy.xml +++ b/make/data/cldr/common/main/hy.xml @@ -758,7 +758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Հերդ կղզի և ՄակԴոնալդի կղզիներ Հոնդուրաս Խորվաթիա - Հայիթի + Հաիթի Հունգարիա Կանարյան կղզիներ Ինդոնեզիա @@ -938,15 +938,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ օրացույց արժույթի ձևաչափ - տեսակավորման կարգ + դասավորություն՝ առանց նշանները հաշվի առնելու + հետադարձ դասավորություն ըստ շեշտանիշի + մեծատառ/փոքրատառ դասավորություն + դուրճազգայուն դասավորություն + դասավորություն + նորմալացված դասավորություն + թվային դասավորություն + գիր/բլոկներ վերադասավորում + դասավորման զգայունություն արժույթ + փոխակերպման նպատակակետ + տողադարձի բառարանային կանոնների բացառություն էմոջիների ներկայացում - Ժամանակային համակարգ (12 կամ 24) + շաբաթվա առաջին օրը + խառը + ժամային համակարգ (12 կամ 24) + ներածման եղանակ + ստեղնաշար + անտեսման բարձրագույն մակարդակ տողանցման ոճ - Տողերի ընդհատումներ բառամիջում + Տողադարձեր բառերի միջև + փոխակերպման կանոններ չափման համակարգ + չափման միավոր թվեր + լրացուցիչ տվյալների տարածաշրջան + փոխակերպումների աղբյուր + տարածաշրջանի ենթաբաժին Նախադասության ընդհատում հապավումից հետո․ + փոխակերպում + մեքենայական թարգմանություն + ժամային գոտի + տեղույթի տարբերակ + մասնավոր + մասնավոր փոխակերպում բուդդայական օրացույց @@ -965,13 +991,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ գրիգորյան հրեական օրացույց հրեական + հնդկական ազգային հիջրայի օրացույց հիջրա հիջրայի քաղաքացիական օրացույց (աղյուսակային) հիջրա (աղյուսակային, քաղաքացիական) + հիջրա, Սաուդյան Արաբիայում լուսնի դիտարկմամբ + հիջրա (աղյուսակային, աստղագիտական) հիջրայի օրացույց (Ում ալ Քուրա) հիջրա (Ում ալ Քուրա) ISO-8601 օրացույց + Գրիգորյան ճապոնական օրացույց ճապոնական պարսկական օրացույց @@ -982,15 +1012,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ հաշվապահական արժույթի ստանդարտ ձևաչափ ստանդարտ - Unicode-ի կանխադրված տեսակավորում - Unicode (կանխադրված) + սկզբում փոքրատառերը + սկզբում փոքրատառերը + սկզբում մեծատառերը + համատեղելիություն + ըստ բառարանի + Unicode-ի կանխադրված դասավորություն + կանխադրված Unicode + էմոջի + եվրոպական կանոններ + ըստ հեռախոսագրքի + հնչյունային + փինյին որոնում որոնում - տեսակավորման ստանդարտ կարգ + կորեերենի սկզբնական բաղաձայններ + ստանդարտ դասավորություն ստանդարտ + ըստ գծերի + ավանդական + ըստ բանալիների, հետո ըստ գծերի + ժուին + արժույթ + թվանշաններ + կետադրություն + բացատ + նշան + բոլորը + միայն հիմնական տառերը + հիմնական, շեշտանիշեր, ստեղնաշարք, տարբերակներ, կանա + հիմնական, շեշտանիշեր + հիմնական, շեշտանիշեր, ստեղնաշարք, տարբերակներ + լիալայնք նշաններ + կիսալայնք նշաններ կանխադրված էմոջի տեքստ + 12-ժամյա համակարգ + 12 + 24-ժամյա համակարգ + 24 12-ժամյա համակարգ (0-11) 12 (0–11) 12-ժամյա համակարգ (1-12) @@ -999,65 +1060,106 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-ժամյա համակարգ (1-24) 24 (1–24) + բացատներ, կետադրություն, բոլոր նշանները + բացատներ, կետադրություն + բացատներ, կետադրություն + բացատներ, կետադրություն, ոչ արժույթային նշաններ փափուկ տողանցում փափուկ սովորական տողանցում սովորական կոշտ տողանցում կոշտ - Ընդհատել բոլորը - Պահել բոլորը + Տողադարձել բոլորը + Չտողադարձել Սովորական - Պահել արտահայտություններում - մետրիկ համակարգ - մետրիկ + Չտողադարձել բառակապակցություններում + տառադարձման BGN համակարգ + տառադարձման ՄԱԿ-ի համակարգ + մետրական համակարգ + մետրական անգլիական համակարգ - ՄԹ + անգլիական ամերիկյան համակարգ - ԱՄՆ + ամերիկյան արաբա-հնդկական թվանշաններ արաբա-հնդկական թվերի ընդլայնված համակարգ + արաբա-հնդկական ընդլայնված հայկական թվանշաններ հայկական փոքր թվանշաններ + հայկական փոքր բենգալական թվանշաններ չակմա թվանշաններ դևանագարի թվանշաններ եթովպական թվանշաններ - ամբողջ լայնքով թվանշաններ + ֆինանսական ձևաչափ + լիալայնք թվանշաններ + լիալայնք վրացական թվանշաններ հունական թվանշաններ - հունական փոքրատառ թվանիշեր + հունական փոքր թվանշաններ + հունական փոքր գուջարաթի թվանշաններ գուրմուխի թվանշաններ + ամսվա օրերի գրառում հանյան նշաններով՝ ավանդական օրացույցների համար չինական տասնորդական թվանշաններ + Դիրքային տասնորդական թվային համակարգ, որտեղ որպես թվանշաններ օգտագործվում են չինական թվային գաղափարագրերը պարզեցված չինարենի թվանշաններ պարզեցված չինարենի ֆինանսական թվանշաններ - չինական ավանդական թվանիշեր + պարզեցված չինարենի ֆինանսական + ավանդական չինարենի թվանշաններ ավանդական չինարենի ֆինանսական թվանշաններ + ավանդական չինարենի ֆինանսական եբրայական թվանշաններ ճավայական թվանշաններ ճապոնական թվանշաններ ճապոնական ֆինանսական թվանշաններ + ճապոնական ֆինանսական + ճապոնական տարեթվարկում՝ առաջին տարվա «գաննեն» նշումով քմերական թվանշաններ կաննադա թվանշաններ + թաի թամ թամ (կրոնական) լաոսական թվանշաններ արևմտյան թվանշաններ + մաթեմատիկական թավ + մաթեմատիկական երկգծային + մաթեմատիկական միալայնք + մաթեմատիկական թավ Sans-Serif + մաթեմատիկական Sans-Serif մալայալամ թվանշաններ մանիպուրի թվանշաններ բիրմական թվանշաններ + բիրմայական արևելյան փվո կարենական թվանշաններ + բիրմայական պաո + բիրմայական շանական + բիրմայական թայ-լայ + բնիկ ժողովուրդների թվանշաններ + բնիկ ժողովուրդների թվանշաններ օլ չիկի թվանշաններ օրիյա թվանշաններ + ուրվագծված հռոմեական թվանշաններ + հռոմեական մեծ հռոմեական փոքր թվանշաններ + հռոմեական փոքր + սեգմենտավորված թամիլական ավանդական թվանշաններ թամիլական թվանշաններ + ժամանակակից թամիլական թելուգու թվանշաններ թայական թվանշաններ տիբեթական թվանշաններ + ավանդական թվանշաններ վայական թվանշաններ Անջ․ Միաց․ + չհատկորոշված մեքենայական թարգմանություն + POSIX տարբերակ + + Անջ․ + Միաց․ + Մետրական Անգլիական @@ -1152,18 +1254,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ H v dd.MM dd.MM, E - y, G - y, G - G y թ. MM + G y թ․ + G y թ․ + G y թ. M d.M.y թ., G d.MM.y թ., G, E G y թ. LLL d MMM, y թ., G d MMM, y թ. G, E + G y թ․ LLLL G y թ, QQQ G y թ, QQQQ + + {0} – {1} + {0}–{1} + {0} - {1} B h–ից B h-ը @@ -1381,9 +1488,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ կգ․ - ա կօ․ - հ առվ ցրկ երկ @@ -1429,13 +1534,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - dd MMMM, y թ. + y թ. MMMM d yMMMMdd - dd MMM, y թ. + y թ. MMM d yMMMdd @@ -1469,6 +1574,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1508,6 +1616,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y թ. MMM G y թ․ MMM d G y թ. MMM d, E + G y թ․ LLLL + G y թ․ MMMM d + G y թ․ MMMM d, E H H:mm H:mm:ss @@ -1517,18 +1628,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM MMMM W-ին շաբաթ MMMM W-րդ շաբաթ + y թ․ MM.y dd.MM.y d.MM.y, E y թ. LLL - d MMM, y թ. + y թ. MMM d y թ. MMM d, E y թ․ LLLL + y թ․ MMMM d + y թ․ MMMM d, E y թ. QQQ y թ. QQQQ Y թ․ w-ին շաբաթ Y թ․ w-րդ շաբաթ + + {1}, {0} + {0} – {1} @@ -1580,12 +1697,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ H–H - H:mm–H:mm - H:mm–H:mm + H:mm – H:mm + H:mm – H:mm - H:mm–H:mm, v - H:mm–H:mm, v + H:mm – H:mm, v + H:mm – H:mm, v H–H, v @@ -1601,9 +1718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd.MM – E, dd.MM E, dd.MM – E, dd.MM - - MMM–MMM - MMM dd–dd MMM dd – MMM dd @@ -2536,9 +2650,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Լիբրևիլ - - Բրիտանական ամառային ժամանակ - Լոնդոն @@ -2629,9 +2740,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ջայպուրա - - Իռլանդական ստանդարտ ժամանակ - Դուբլին @@ -3327,6 +3435,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Հարարե + + + Ակրիի ժամանակ + Ակրիի ստանդարտ ժամանակ + Ակրիի ամառային ժամանակ + + Աֆղանստանի ժամանակ @@ -3502,6 +3617,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Բրազիլիայի ամառային ժամանակ + + + Բրիտանական ժամանակ + Բրիտանական ամառային ժամանակ + + Բրունեյի ժամանակ @@ -3675,6 +3796,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Գրինվիչի ժամանակ + + + Գրենլանդիայի ժամանակ + Գրենլանդիայի ստանդարտ ժամանակ + Գրենլանդիայի ամառային ժամանակ + + Արևելյան Գրենլանդիայի ժամանակ @@ -3701,7 +3829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Հավայան-ալեության ստանդարտ ժամանակ + Հավայան ժամանակ @@ -3762,6 +3890,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Իրանի ամառային ժամանակ + + + Իռլանդական ժամանակ + Իռլանդական ստանդարտ ժամանակ + + Իրկուտսկի ժամանակ @@ -3783,6 +3917,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ճապոնիայի ամառային ժամանակ + + + Կամչատկայի ժամանակ + Կամչատկայի ստանդարտ ժամանակ + Կամչատկայի ամառային ժամանակ + + Ղազախստանի ժամանակ @@ -4045,11 +4186,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Սախալինի ամառային ժամանակ + + + Սամարայի ժամանակ + Սամարայի ստանդարտ ժամանակ + Սամարայի ամառային ժամանակ + + - Սամոայի ժամանակ Սամոայի ստանդարտ ժամանակ - Սամոայի ամառային ժամանակ @@ -4116,6 +4262,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Տրուկի ժամանակ + + + Թուրքիայի ժամանակ + Թուրքիայի ստանդարտ ժամանակ + Թուրքիայի ամառային ժամանակ + + Թուրքմենստանի ժամանակ @@ -4135,6 +4288,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ուրուգվայի ամառային ժամանակ + + + Ուրումչիի ժամանակ + + Ուզբեկստանի ժամանակ @@ -4278,9 +4436,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4803,8 +4958,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ կարիբյան գուլդեն - կարիբյան գուլդեն - կարիբյան գուլդեն Արևմտյան Աֆրիկայի ԿՖԱ ֆրանկ @@ -4831,8 +4984,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Զիմբաբվեի ոսկի - Զիմբաբվեի ոսկի - Զիմբաբվեի ոսկի @@ -5172,11 +5323,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} միույթով {0} միույթում - - մաս - {0} մաս - {0} մաս - մաս միլիոնի վրա {0} մաս միլիոնի վրա @@ -5239,11 +5385,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} մոլով {0} մոլում - - գլյուկոզ - {0} գլյուկոզ - {0} գլյուկոզ - լիտր կիլոմետրի վրա {0} լիտր կիլոմետրի վրա @@ -5875,6 +6016,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} կետ մատնաչափի վրա {0} կետ մատնաչափի վրա + + կետիկ + {0} կետիկ + {0} կետիկ + երկրի շառավիղ {0} երկրի շառավիղ @@ -6050,16 +6196,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} սկանդինավյան մղոնում - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ - {0} կտ + կետ + {0} կետ + {0} կետից + {0} կետին + {0} կետով + {0} կետում + {0} կետ + {0} կետից + {0} կետին + {0} կետով + {0} կետում արեգակնային շառավիղ @@ -6765,7 +6912,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} կուլոն - ֆարադ {0} ֆարադ {0} ֆարադ @@ -6779,11 +6925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} սիմենս {0} սիմենս - - միջազգային կալորիա - {0} միջազգային կալորիա - {0} միջազգային կալորիա - բեքերել {0} բեքերել @@ -7356,9 +7497,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} կմչ - կետ - {0} կետ - {0} կետ + կտկ + {0} կտկ + {0} կտկ կմ @@ -7462,6 +7603,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ կտ + {0} կտ + {0} կտ լք @@ -8029,11 +8172,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}մոլ {0}մոլ - - գլյուկոզ - {0} գլյուկոզ - {0} գլյուկոզ - {0}լ/կմ {0}լ/կմ @@ -8183,6 +8321,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ կտ + + կտկ + {0} կտկ + {0} կտկ + յդ {0}յդ @@ -8206,6 +8349,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ֆատոմ + + {0} կտ + {0} կտ + {0}լք {0}լք @@ -8273,7 +8420,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} մմսս - ս․ս․ {0}սս {0}սս @@ -8427,51 +8573,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} sr - կատ {0}կատ {0}կատ Ֆ - {0} Ֆ - {0} Ֆ {0} S {0} S - - միջազգային կալորիա - {0} միջազգային կալորիա - {0} միջազգային կալորիա - - Բք {0}Բք {0}Բք - Զվ {0}Զվ {0}Զվ - Գր {0}Գր {0}Գր - կգ-ուժ {0}կգ-ուժ {0}կգ-ուժ - Տլ {0}Տլ {0}Տլ - Վբ {0}Վբ {0}Վբ diff --git a/make/data/cldr/common/main/ia.xml b/make/data/cldr/common/main/ia.xml index 0cdfb6b1eec0..506696c79498 100644 --- a/make/data/cldr/common/main/ia.xml +++ b/make/data/cldr/common/main/ia.xml @@ -878,6 +878,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic calendario hegiric (tabular, epocha astronomic) calendario hegiric (Umm al-Qura) calendario ISO-8601 + ISO-8601 calendario japonese calendario persa calendario del Republica de China @@ -898,6 +899,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ordinamento traditional ordinamento de tractos radical ordinamento zhuyin + systema de 12 horas + systema de 24 horas systema de 12 horas (0–11) systema de 12 horas (1–12) systema de 24 horas (0–23) @@ -1415,12 +1418,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E d MMM y MMMM y + d 'de' MMMM y + E 'le' d 'de' MMMM y QQQ y QQQQ 'de' y 'septimana' w 'de' Y 'septimana' w 'de' Y + + {0} – {1} + {0} – {1} + {0} – {1} + d – d @@ -2050,22 +2060,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Feroe - - - Hora estive britannic - - Athenas Hongkong - - - Hora estive irlandese - - Insula de Man @@ -2350,6 +2350,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora estive de Brasilia + + + Hora britannic + Hora estive britannic + + hora de Brunei @@ -2544,11 +2550,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora estive de Groenlandia occidental - - - hora normal de Guam - - hora normal del Golfo @@ -2561,7 +2562,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - hora normal de Hawaii-Aleutianas + hora normal de Hawaii @@ -2622,6 +2623,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic hora estive de Iran + + + Hora irlandese + Hora estive irlandese + + hora de Irkutsk @@ -2907,9 +2914,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - hora de Samoa american hora normal de Samoa american - hora estive de Samoa american diff --git a/make/data/cldr/common/main/id.xml b/make/data/cldr/common/main/id.xml index 829841989fd7..24c47b1dd93f 100644 --- a/make/data/cldr/common/main/id.xml +++ b/make/data/cldr/common/main/id.xml @@ -432,6 +432,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pali Pijin Polski + Piemonte Pohnpeia Maliseet-Passamaquoddy Prusia @@ -868,7 +869,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Benin Saint Barthélemy Bermuda - Brunei + Brunei Darussalam Bolivia Belanda Karibia Brasil @@ -1196,18 +1197,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Aturan Pengurutan Pengurutan Dinormalisasi Pengurutan Numerik + Pengurutan Ulang Aksara/Blok Kekuatan Pengurutan Mata Uang + Tujuan Transformasi + Pengecualian Pemenggalan Kamus Tampilan Emoji + Hari pertama + Campuran Siklus Jam (12 vs 24) + Metode Input + Keyboard + Paling Sering Diabaikan Gaya Pemisah Baris Pemisah Baris di antara Kata + Aturan Transformasi Sistem Pengukuran + Unit Pengukuran Angka + Wilayah untuk Data Tambahan + Sumber Transformasi + Subdivisi Wilayah Pemisah Kalimat Setelah Singkatan + Transformasi + Diterjemahkan Mesin Zona Waktu Varian Lokal Penggunaan Pribadi + Transformasi Penggunaan Pribadi Kalender Buddha @@ -1227,16 +1244,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kalender Ibrani Ibrani Kalender Nasional India + Nasional India Kalender Islam Hijriah Kalender Sipil Islam Hijri (tabular, epoch sipil) Kalender Islam (Arab Saudi, penglihatan) + Hijriah, pengamatan hilal Arab Saudi Kalender Astronomi Islam Hijriah (tabular, epoch astronomi) Kalender Islam (Umm al-Qura) Hijriah (tabular, Umm al-Qura) Kalender ISO-8601 + Masehi Kalender Jepang Jepang Kalender Persia @@ -1252,8 +1272,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortir Aksen Secara Normal Sortir Aksen Terbalik Sortir Huruf Kecil Dahulu + Huruf Kecil Sortir Urutan Ukuran Huruf Normal + Huruf Kecil Sortir Huruf Besar Dahulu + Huruf Besar Sortir Tidak Peka Huruf Besar Sortir Peka Huruf Besar Aturan Pengurutan Sebelumnya, untuk kompatibilitas @@ -1263,7 +1286,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Aturan Pengurutan Unicode Default Unicode Default Urutan Sortir Emoji + Emoji Aturan Pengurutan Eropa + Aturan Eropa Aturan Pengurutan Buku Telepon Buku Telepon Aturan Pengurutan Fonetik @@ -1273,6 +1298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pencarian Tujuan Umum Pencarian Pencarian Menurut Konsonan Awal Hangul + Konsonan awal Hangul Aturan Pengurutan Standar Standar Aturan Pengurutan Guratan @@ -1287,17 +1313,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortir Unicode Dinormalisasi Sortir Digit Satu Per Satu Sortir Digit Secara Numerik + Mata Uang + Digit + Tanda Baca + Spasi Kosong + Simbol Sortir Semua + Semua Sortir Huruf Dasar Saja + Huruf Dasar Saja Sortir Aksen/Ukuran Huruf/Lebar/Kana + Karakter Dasar, Diakritik, Huruf Besar/Kecil, Varian, Kana Sortir Aksen + Karakter Dasar, Diakritik Sortir Aksen/Ukuran Huruf/Lebar + Karakter Dasar, Diakritik, Varian Lebar penuh Lebar separuh Angka Bawaan Emoji Teks + Sistem 12 Jam + 12 + Sistem 24 Jam + 24 Sistem 12 Jam (0–11) 12 (0–11) Sistem 12 Jam (1–12) @@ -1306,6 +1346,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) Sistem 24 Jam (1–24) 24 (1–24) + Shift Spasi, tanda baca, semua simbol + Shift spasi, tanda baca + Shift spasi, tanda baca + Shift spasi, tanda baca, simbol non-mata uang Gaya Pemisah Baris Renggang Renggang Gaya Pemisah Baris Normal @@ -1327,8 +1371,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Angka Ahom Angka Arab Timur Angka Arab Timur Diperluas + Arab Timur Diperluas Angka Armenia Angka Huruf Kecil Armenia + Huruf Kecil Armenia Angka Bali Angka Bengali Angka Brahmi @@ -1339,56 +1385,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Angka Dives Akuru Angka Etiopia Angka Finansial + Keuangan Angka Lebar Penuh + Lebar penuh Angka Georgia Angka Gunjala Gondi Angka Masaram Gondi Angka Yunani Angka Yunani Huruf Kecil + Huruf kecil Yunani Angka Gujarat Angka Gurmukhi + Penomoran tanggal dengan karakter Han untuk kalender tradisional Angka Desimal Tionghoa + Sistem desimal posisional menggunakan karakter angka Tionghoa sebagai angka Angka Tionghoa Sederhana Angka Keuangan Tionghoa Sederhana + Keuangan Tionghoa Sederhana Angka Tionghoa Tradisional Angka Keuangan Tionghoa Tradisional + Keuangan Tionghoa Tradisional Angka Ibrani Angka Pahawh Hmong Angka Nyiakeng Puachue Hmong Angka Jawa Angka Jepang Angka Keuangan Jepang + Keuangan Jepang + Penomoran Gannen untuk tahun pertama Jepang Angka Kayah Li Angka Khmer Angka Kannada Angka Tai Tham Hora Angka Tai Tham Tham + Tai Tham Tham (keagamaan) Angka Laos Angka Latin Angka Lepcha Angka Limbu Angka Tebal Matematika + Tebal matematika Angka Double-Struck Matematika + Double-struck matematika Angka Monospace Matematika + Monospace matematika Angka Tebal Sans-Serif Matematika + Sans-serif matematika tebal Angka Sans-Serif Matematika + Sans-serif matematika Angka Malayalam Angka Modi Angka Mongolia Angka Mro Angka Meetei Mayek Angka Myanmar + Karen Pwo Timur Myanmar + Pao Myanmar Angka Myanmar Shan + Shan Myanmar Angka Myanmar Tai Laing + Tai Laing Myanmar Angka Asli + Angka Asli Angka N’Ko Angka Ol Chiki Angka Oriya Angka Osmanya + Hierarkis Angka Hanifi Rohingya Angka Romawi + Huruf besar Romawi Angka Huruf Kecil Romawi + Huruf kecil Romawi Angka Saurashtra + Tersegmentasi Angka Sharada Angka Khudawadi Angka Sinhala Lith @@ -1398,17 +1468,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Angka Tai Lue Baru Angka Tamil Tradisional Angka Tamil + Tamil Modern Angka Telugu Angka Thai Angka Tibet Angka Tirhuta Angka Tradisional + Angka tradisional Angka Vai Angka Warang Citi Angka Wancho Nonaktif Aktif + Terjemahan Mesin Tidak Spesifik + Varian POSIX + + Nonaktif + Aktif + Metrik AS @@ -1434,9 +1512,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ [áàăâåäãā æ ç éèĕêëē íìĭîïī ñ óòŏôöøō œ úùŭûüū ÿ] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - [\: ∶] - [,,﹐︐ ، ٫ 、﹑、︑] @@ -1700,7 +1775,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH.mm h.mm.ss a HH.mm.ss - HH v d/M E, d/M d MMM @@ -1721,51 +1795,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0}–{1} + + {0}–{1} - h – h B + h B–h B - h.mm B – h.mm B - h.mm – h.mm B - h.mm – h.mm B + h.mm B–h.mm B + h.mm–h.mm B + h.mm–h.mm B - y G – y G - y – y G + y G–y G + y–y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y G–M/y G + M/y–M/y G + M/y–M/y G - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y–d/M/y G + d/M/y G–d/M/y G + d/M/y–d/M/y G + d/M/y–d/M/y G - E, d/M/y – E, d/M/y GGGGG - E, d/M/y GGGGG – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG + E, d/M/y–E, d/M/y G + E, d/M/y G– E, d/M/y G + E, d/M/y–E, d/M/y G + E, d/M/y–E, d/M/y G - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G + MMM y G–MMM y G + MMM–MMM y G + MMM y–MMM y G - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G + d–d MMM y G + d MMM y G–d MMM y G + d MMM–d MMM y G + d MMM y–d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y G–E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y–E, d MMM y G h – h a @@ -1801,58 +1879,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M–M - d/M – d/M - d/M – d/M + d/M–d/M + d/M–d/M - E, d/M – E, d/M - E, d/M – E, d/M + E, d/M–E, d/M + E, d/M–E, d/M MMM–MMM d–d MMM - d MMM – d MMM + d MMM–d MMM - E, d MMM – E, d MMM - E, d MMM – E, d MMM + E, d MMM–E, d MMM + E, d MMM–E, d MMM + + + d–d MMMM + d MMMM–d MMMM y–y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y–M/y G + M/y–M/y G - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y–d/M/y G + d/M/y–d/M/y G + d/M/y–d/M/y G - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG + E, d/M/y–E, d/M/y G + E, d/M/y–E, d/M/y G + E, d/M/y–E, d/M/y G MMM–MMM y G - MMM y – MMM y G + MMM y–MMM y G d–d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G + d MMM–d MMM y G + d MMM y–d MMM y G - E, d MMM – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y–E, d MMM y G - MMMM – MMMM y G - MMMM y – MMMM y G + MMMM–MMMM y G + MMMM y–MMMM y G @@ -2000,7 +2082,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - dd/MM/yy + d/M/yy yyMMdd @@ -2028,6 +2110,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + . + {1} {0} @@ -2089,6 +2175,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G h.mm a HH.mm h.mm.ss a @@ -2112,59 +2201,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y 'minggu' 'ke'-w Y + + {0}–{1} + + {0}–{1} - h – h B + h B–h B - h.mm B – h.mm B - h.mm – h.mm B - h.mm – h.mm B + h.mm B–h.mm B + h.mm–h.mm B + h.mm–h.mm B - y G – y G - y – y G + y G–y G + y–y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y GGGGG–M/y G + M/y–M/y G + M/y–M/y G - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y–d/M/y G + d/M/y G–d/M/y G + d/M/y–d/M/y G + d/M/y–d/M/y G - E, d/M/y – E, d/M/y GGGGG - E, d/M/y GGGGG – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG - E, d/M/y – E, d/M/y GGGGG + E, d/M/y–E, d/M/y G + E, d/M/y G–E, d/M/y G + E, d/M/y–E, d/M/y G + E, d/M/y–E, d/M/y G - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G + MMM y G–MMM y G + MMM–MMM y G + MMM y–MMM y G - d – d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G + d–d MMM y G + d MMM y G–d MMM y G + d MMM–d MMM y G + d MMM y–d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y G–E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y–E, d MMM y G + + + h a–h a - h.mm a – h.mm a + h.mm a–h.mm a h.mm–h.mm a h.mm–h.mm a @@ -2173,7 +2271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH.mm–HH.mm - h.mm a – h.mm a v + h.mm a–h.mm a v h.mm–h.mm a v h.mm–h.mm a v @@ -2181,62 +2279,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH.mm–HH.mm v HH.mm–HH.mm v + + h a–h a v + M–M - d/M – d/M - d/M – d/M + d/M–d/M + d/M–d/M - E, d/M – E, d/M - E, d/M – E, d/M + E, d/M–E, d/M + E, d/M–E, d/M MMM–MMM d–d MMM - d MMM – d MMM + d MMM–d MMM - E, d MMM – E, d MMM - E, d MMM – E, d MMM + E, d MMM–E, d MMM + E, d MMM–E, d MMM - - y – y + + d–d MMMM + d MMMM–d MMMM - M/y – M/y - M/y – M/y + M/y–M/y + M/y–M/y - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y + d/M/y–d/M/y + d/M/y–d/M/y + d/M/y–d/M/y - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y - E, d/M/y – E, d/M/y + E, d/M/y–E, d/M/y + E, d/M/y–E, d/M/y + E, d/M/y–E, d/M/y MMM–MMM y - MMM y – MMM y + MMM y–MMM y d–d MMM y - d MMM – d MMM y - d MMM y – d MMM y + d MMM–d MMM y + d MMM y–d MMM y - E, d MMM – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y + E, d MMM–E, d MMM y + E, d MMM–E, d MMM y + E, d MMM y–E, d MMM y MMMM–MMMM y - MMMM y – MMMM y + MMMM y–MMMM y @@ -2333,10 +2435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - M/y G - E, d/M/y G - d – d @@ -2378,58 +2476,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + / + . + + + - - - Tempyō (729–749) - Tempyō-kampō (749-749) - Tempyō-shōhō (749-757) - Tempyō-hōji (757-765) - Temphō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Saiko (854–857) - Tennan (857–859) - Genkei (877–885) - Kampyō (889–898) - Shōhei (931–938) - Ten-en (973-976) - Ei-en (987-989) - Eiho (1081–1084) - Kaho (1094–1096) - Shōtoku (1097–1099) - Ten-ei (1110-1113) - Gen-ei (1118-1120) - Hoan (1120–1124) - Hoen (1135–1141) - Tenyō (1144–1145) - Hogen (1156–1159) - Nin-an (1166-1169) - Genryuku (1184–1185) - Ken-ei (1206-1207) - Shōgen (1207–1211) - Shōkyū (1219–1222) - Tempuku (1233–1234) - En-ō (1239-1240) - Bun-ō (1260-1261) - Bun-ei (1264-1275) - Enkei (1308–1311) - Genkyō (1321–1324) - Kareki (1326–1329) - Kemmu (1334–1336) - Bun-an (1444-1449) - Tenmon (1532–1555) - Genwa (1615–1624) - Kan-ei (1624-1644) - Shōō (1652–1655) - Meiryaku (1655–1658) - Tenwa (1681–1684) - Kan-en (1748-1751) - Hōryaku (1751–1764) - An-ei (1772-1781) - Man-en (1860-1861) - - @@ -2893,6 +2948,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Wina + + Urumchi + Kosta Rika @@ -2917,22 +2975,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kairo - - - Waktu Musim Panas Inggris - - Athena Georgia Selatan - - - Waktu Standar Irlandia - - Yerusalem @@ -3073,18 +3121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Alaska Waktu Musim Panas Alaska - - AKT - AKST - AKDT - - - - - Waktu Almaty - Waktu Standar Almaty - Waktu Musim Panas Almaty - @@ -3099,11 +3135,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Tengah Waktu Musim Panas Tengah - - CT - CST - CDT - @@ -3111,11 +3142,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Timur Waktu Musim Panas Timur - - ET - EST - EDT - @@ -3123,11 +3149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Pegunungan Waktu Musim Panas Pegunungan - - MT - MST - MDT - @@ -3135,11 +3156,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Pasifik Waktu Musim Panas Pasifik - - PT - PST - PDT - @@ -3155,20 +3171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Apia - - - Waktu Aqtau - Waktu Standar Aqtau - Waktu Musim Panas Aqtau - - - - - Waktu Aqtobe - Waktu Standar Aqtobe - Waktu Musim Panas Aqtobe - - Waktu Arab @@ -3203,11 +3205,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Atlantik Waktu Musim Panas Atlantik - - AT - AST - ADT - @@ -3275,6 +3272,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Brasil + + + Waktu Inggris + Waktu Musim Panas Inggris + + Waktu Brunei Darussalam @@ -3348,11 +3351,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Kuba Waktu Musim Panas Kuba - - CT (Kuba) - CST (Kuba) - CDT (Kuba) - @@ -3455,7 +3453,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Greenwich Mean Time + Waktu Greenwich + + + + + Waktu Greenland + Waktu Standar Greenland + Waktu Musim Panas Greenland @@ -3464,11 +3469,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Greenland Timur Waktu Musim Panas Greenland Timur - - EGT - EGST - EGDT - @@ -3477,11 +3477,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Greenland Barat - - - Waktu Guam - - Waktu Standar Teluk @@ -3494,11 +3489,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Waktu Standar Hawaii-Aleutian + Waktu Hawaii - - HAST - @@ -3506,11 +3498,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Hawaii-Aleutian Waktu Musim Panas Hawaii-Aleutian - - HAT - HAST - HADT - @@ -3572,6 +3559,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Iran + + + Waktu Irlandia + Waktu Standar Irlandia + + Waktu Irkutsk @@ -3595,9 +3588,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Waktu Petropavlovsk-Kamchatsky - Waktu Standar Petropavlovsk-Kamchatsky - Waktu Musim Panas Petropavlovsk-Kamchatski + Waktu Kamchatka + Waktu Standar Kamchatka + Waktu Musim Panas Kamchatka @@ -3639,11 +3632,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Kirgizstan - - - Waktu Lanka - - Waktu Kep. Line @@ -3656,13 +3644,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Lord Howe - - - Waktu Makau - Waktu Standar Makau - Waktu Musim Panas Makau - - Waktu Magadan @@ -3758,11 +3739,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Newfoundland Waktu Musim Panas Newfoundland - - NT - NST - NDT - @@ -3783,11 +3759,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Fernando de Noronha - - - Waktu Kep. Mariana Utara - - Waktu Novosibirsk @@ -3851,11 +3822,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Standar Saint Pierre dan Miquelon Waktu Musim Panas Saint Pierre dan Miquelon - - PMT - PMST - PMDT - @@ -3872,13 +3838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Pyongyang - - - Waktu Qyzylorda - Waktu Standar Qyzylorda - Waktu Musim Panas Qyzylorda - - Waktu Reunion @@ -3905,9 +3864,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Waktu Samoa Waktu Standar Samoa - Waktu Musim Panas Samoa @@ -3976,9 +3933,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Waktu Turki - Waktu Standar Turki - Waktu Musim Panas Turki + Waktu Turkiye + Waktu Standar Turkiye + Waktu Musim Panas Turkiye @@ -4000,6 +3957,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Waktu Musim Panas Uruguay + + + Waktu Urumchi + + Waktu Uzbekistan @@ -4118,29 +4080,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤0 rb - ¤ 0 rb ¤00 rb - ¤ 00 rb ¤000 rb - ¤ 000 rb ¤0 jt - ¤ 0 jt ¤00 jt - ¤ 00 jt ¤000 jt - ¤ 000 jt ¤0 M - ¤ 0 M ¤00 M - ¤ 00 M ¤000 M - ¤ 000 M ¤0 T - ¤ 0 T ¤00 T - ¤ 00 T ¤000 T - ¤ 000 T @@ -4975,7 +4925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guilder Karibia - Guilder Karibia Hak Khusus Menggambar @@ -5250,10 +5199,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ millimol per liter {0} millimol per liter - - bagian - {0} bagian - bagian per juta {0} bagian per juta @@ -6373,7 +6318,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol/L - bagian {0} bagian @@ -6390,7 +6334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - Glc + {0} Glc L/km @@ -6518,9 +6462,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ gr {0} gr - - {0} Hg - ″ Hg {0}″ Hg @@ -6574,13 +6515,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ qt Imp - - {0} sr + + {0} kat + + + {0} C + + + {0} F + + + {0} H + + + {0} S - kal-IT {0} kal-IT + + {0} kgf + + + {0} T + + + {0} Wb + bpm {0}bpm diff --git a/make/data/cldr/common/main/ie.xml b/make/data/cldr/common/main/ie.xml index 5636ac1c640e..b9f42a142f37 100644 --- a/make/data/cldr/common/main/ie.xml +++ b/make/data/cldr/common/main/ie.xml @@ -703,6 +703,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic standard órdine de strecs órdine de radicales + sistema 12-hor + sistema 24-hor sistema 12-hor (0..11) sistema 12-hor (1..12) sistema 24-hor (0..23) @@ -1199,6 +1201,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0} – {1} + {0} – {1} + {0} til {1} h – h B @@ -1650,7 +1657,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic TMG{0} - TMG TMG+? témpor de {0} témpor estival de {0} @@ -1798,11 +1804,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Feroe - - - britanic estival témpor - - Guadelupa @@ -1815,11 +1816,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hong-Kong - - - irlandesi standard témpor - - Insul de Man @@ -2016,6 +2012,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic témpor estival del Azores + + + britanic estival témpor + + témpor del Insul Christmas @@ -2104,6 +2105,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic témpor estival de Hawai e Aleutes + + + irlandesi standard témpor + + témpor del Insules Line diff --git a/make/data/cldr/common/main/ig.xml b/make/data/cldr/common/main/ig.xml index cb3ec017773a..d0dc2ffd57de 100644 --- a/make/data/cldr/common/main/ig.xml +++ b/make/data/cldr/common/main/ig.xml @@ -51,7 +51,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Betawi Bena Bulgarian - Haryanvi + Asụsụ Haryanvi Western Balochi Bojpuri Bislama @@ -104,23 +104,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dakota Dargwa Taita - German - Austrian German - Swiss High German + Asụsụ German + Asụsụ Austrian German + Asụsụ Swiss High German Dogrib Zarma Dogri - Lower Sorbian + Asụsụ Lower Sorbian Duala Divehi Jola-Fonyi Dọzngọka Dazaga Embu - Ewe + Asụsụ Ewe Efik Ekajuk - Grik + Asụsụ Grik Bekee Bekee ndị Australia Bekee ndị Canada @@ -128,80 +128,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bekee ndị UK Bekee ndị America Bekee ndị US - Esperanto - Spanish + Asụsụ Esperanto + Asụsụ Spanish Spanish ndị Latin America Spanish ndị Europe Spanish ndị Mexico - Estonian + Asụsụ Estonia Basque Ewondo Asụsụ Persia Dari - Fula - Finnish - Filipino + Asụsụ Fula + Asụsụ Finnish + Asụsụ Filipino Fijanị - Faroese + Asụsụ Faroese Fon - French - Canadian French - Swiss French + Asụsụ French + Asụsụ Canadian French + Asụsụ Swiss French Cajun French Northern Frisian Friulian Ọdịda anyanwụ Frisian - Irish - Ga + Asụsụ Irish + Asụsụ Ga Asụsụ Scottish Gaelic Geez Gilbertese - Galician + Asụsụ Galicia Guarani Gorontalo German Swiss - Gujarati + Asụsụ Gujarati Gusii Mansị Gwichʼin - Hausa + Asụsụ Hausa Haida Hawaịlịan Southern Haida - Hebrew - Hindi - Hinglish + Asụsụ Hebrew + Asụsụ Hindi + Asụsụ Hindi (Latin) + Asụsụ Hinglish Hiligayanon Hmong Hmong Njua Croatian - Upper Sorbian + Asụsụ Upper Sorbian Haịtịan ndị Cerọle - Hungarian + Asụsụ Hungaria Hupa Halkomelem Asụsụ Armenianị Herero - Interlingua + Asụsụ n’ime asụsụ Iban - Ibibio - Indonesian - Interlingue - Igbo - Sichuan Yi + Asụsụ Ibibio + Asụsụ Indonesia + Asụsụ na asụsụ + Asụsụ Igbo + Asụsụ Sichuan Yi Westarn Canadian Inuktitut Iloko Ingush Ido - Icelandic - Italian + Asụsụ Iceland + Asụsụ Italian Inuktitut - Japanese + Asụsụ Japanese Lojban Ngomba Machame - Javanese - Georgian + Asụsụ Javanese + Asụsụ Georgia Kara-Kalpak Kabyle Kachin @@ -210,70 +211,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kabadian Tyap Makonde - Kabụverdịanụ + Asụsụ Kabụverdịanụ Kenyang Koro - Kaingang + Asụsụ Kaingang Khasi Koyra Chiini Kikuyu Kuanyama - Kazakh + Asụsụ Kazakh Kako Kalaallisut Kalenjin - Khmer + Asụsụ Khmer Kimbundu - Kannada - Korean - Konkani + Asụsụ Kannada + Asụsụ Korean + Asụsụ Konkani Kpelle - Kanuri + Asụsụ Kanuri Karachay-Balkar Karelian Kurukh - Kashmiri + Asụsụ Kashmiri Shambala Bafịa Colognian - Kurdish + Asụsụ Kurdish Asụsụ Kurdish Asụsụ Kurmanji Kumik Komi Cornish Kwakʼwala - Kuvi - Kyrgyz + Asụsụ Kuvi + Asụsụ Kyrgyz Latin Ladino Langị - Luxembourgish + Asụsụ Luxembourg Lezghian Ganda Limburgish - Ligurian + Asụsụ Liguria Liloetị Lakota ID - Lombard + Asụsụ Lombard Lingala - Lao + Asụsụ Lao Louisiana Creole Lozi Northern Luri Saamia - Lithuanian + Asụsụ Lithuania Latgalian Luba-Katanga Luba-Lulua Lunda Mizo Luyia - Latvian + Asụsụ Latvia Madurese Magahi - Maithili + Asụsụ Maithili Makasar Masai Moksha @@ -285,18 +286,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Meta Marshallese mhnn - Māori + Asụsụ Māori Mi'kmaw Minangkabau - Macedonian - Malayalam - Mọngolịan + Asụsụ Macedonia + Asụsụ Malayalam + Asụsụ Mongolia Asụsụ Manipuri Innu-aimun Mohawk Mossi Asụsụ Marathi - Malay + Asụsụ Malay Asụsụ Malta Mundang Ọtụtụ asụsụ @@ -310,9 +311,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nama Norwegian Bokmål North Ndebele - Low German + Asụsụ Low German Low Saxon - Nepali + Asụsụ Nepali Newari Ndonga Nias @@ -320,13 +321,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dutch Flemish Kwasio - Norwegian Nynorsk + Asụsụ Norwegian Nynorsk Ngiemboon - Norwegian + Asụsụ Norwegian Nogai - N’Ko + Asụsụ N’Ko South Ndebele - Northern Sotho + Asụsụ Northern Sotho Nuer Navajo Nyanja @@ -337,8 +338,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oji-Cree Westarn Ojibwa Okanagan - Oromo - Ọdịa + Asụsụ Oromo + Asụsụ Odia Ossetic Osage Punjabi @@ -349,10 +350,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pidgin ndị Naijirịa Pijin Asụsụ Polish + Asụsụ Piedmonte Maliseet-Passamaquoddy - Prụssịan - Pashọ - Pọrtụgụese + Asụsụ Prussian + Asụsụ Pashọ + Asụsụ Portuguese Asụsụ Portugese ndị Brazil Asụsụ Portuguese ndị Europe Asụsụ Quechua @@ -369,7 +371,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Rombo Asụsụ Russia Aromanian - Kinyarwanda + Asụsụ Kinyarwanda Rwa Asụsụ Sanskrit Sandawe @@ -379,7 +381,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ngambay Sangu Asụsụ Sardini - Sicilian + Asụsụ Sicilian Scots Asụsụ Sindhi Southern Kurdish @@ -388,8 +390,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Koyraboro Senni Sango Tachịkịt - Shan - Sinhala + Asụsụ Shan + Asụsụ Sinhala Sidamo Asụsụ Slovak skrr @@ -402,41 +404,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Skolt sami Shona Soninke - Somali + Asụsụ Somali Asụsụ Albania Asụsụ Serbia Sranan Tongo Swati Saho - Southern Sotho + Asụsụ Southern Sotho Straits Salish Asụsụ Sundan Sukuma - Sụwidiishi + Asụsụ Swedish Asụsụ Swahili Comorian Sirịak Asụsụ Sileshia - Tamil + Asụsụ Tamil Southern Tutchone - Telugu + Asụsụ Telugu Timne Teso Tetum - Tajik + Asụsụ Tajik Tagish - Thai + Asụsụ Thai Tahitan - Tigrinya + Asụsụ Tigrinya Tigre - Turkmen + Asụsụ Turkmen Klingon Tlingit - Tswana - Tongan + Asụsụ Tswana + Asụsụ Tongan Toki Pona Tok pisin - Turkish + Asụsụ Turkish Taroko Torwali Tsonga @@ -446,19 +448,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tuvalu Tasawaq Tahitian - Tuvinian + Asụsụ Tuvinian Central Atlas Tamazight Udmurt - Uyghur + Asụsụ Uyghur Asụsụ Ukrain Umbundu Asụsụ a na-amaghị - Urdu + Asụsụ Urdu Uzbek Venda Asụsụ Veneshia Vietnamese - Makhuwa + Asụsụ Makhuwa Volapük Vunjo Walloon @@ -470,7 +472,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wu Chinese Kalmyk Xhosa - Kangri + Asụsụ Kangri Soga Yangben Yemba @@ -512,14 +514,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + @@ -558,24 +560,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic + - + - + - + - - + + - + - + @@ -592,12 +595,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + @@ -608,7 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -633,7 +636,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -641,7 +644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -649,14 +652,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - - + + - - + + + @@ -676,11 +680,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - Uwa + uwa Afrika Mpaghara Ugwu Amerịka Mpaghara Mgbada Ugwu America @@ -959,6 +963,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tunisia Tonga Türkiye + Turkey Trinidad na Tobago Tuvalu Taiwan @@ -992,15 +997,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kalenda Ụsọrọ egọ + Leghara Akara ngosi Nhazi + Nhazi Ụda olu Atụgharịrị + Nhazi Mkpụrụedemede ukwu/Mkpụrụedemede obere + Nhazi Mkpụrụedemede n’ogo Ukwu ma ọbụ Obere Ụsọrọ Nhazị + Nhazi emere nke ọma + Nhazi Ọnụọgụ + Nhazigharịa Edemede/Blọk + Ike nke Nhazi ihe Egọ + Gbanwee Ebe + Mwepu Nkwụsịtụ Akwụkwọ ọkọwa okwu Ngosiputa Emoji + Ụbọchị mbụ n’izu + Agwakọnyere Okịrịkịrị Awa (12 vs 24) - Akara akanka nkwụsị + Ụzọ Ntinye + Ahụigodo + Ndị Akacha Eleghara anya + Nkwụsị Akara CJK Nkwụsị Ahịrị n’ime Okwu + Iwu Mgbanwe Ụsọrọ Mmeshọ + Yunit Mmeshọ Nọmba + Mpaghara Maka Mgbakwụnye Data + Gbanwee Isi mmalite + Nkebi Mpaghara Nkwụsị ahịrịokwu mgbe nkenke gasịrị + Gbanwe + Nke Igwe Tụgharịrị + Oge Mpaghara + Mpaghara Dị iche iche + Ojiji Nkeonwe + Mgbanwe Ojiji nkeonwe Kalenda Bụddịst @@ -1020,54 +1051,95 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kalenda Hebrew Hebrew Kalenda India + Onye obodo India Kalenda Hijri Hijri Kalenda Hijri Hijri (tabular, civil epoch) Kalenda Hijri (Saudi Arabia, sighting) + Nhụta ọnwa Hijri, Saudi Arabia Kalenda Hijri (tabular, astronomical epoch) + Hijri (tabular, oge mbara igwe) Kalenda Hijri (Umm al-Qura) Hijri (Umm al-Qura) Kalenda ISO-8601 + Nke Gregory Kalenda Japanese Japanese Kalenda Persian Persian - Kalenda repụblic nke China + Kalenda Minguo Minguo Ụsọrọ akantụ egọ Akantụ egọ - Ụsọrọ egọ nzụgbe + Ụsọrọ Egọ Nzụgbe Ụkpụrụ - Default Unicode ụsọrọ nhazị + Mkpụrụedemede obere + Mkpụrụedemede obere + Mkpụrụedemede ukwu + Ndakọrịta + Akwụkwọ ọkọwa okwu + Ụsọrọ Nhazị Unicode Ndabere Unicode Ndabere + Emoji + Iwu Europe Nhazị akwụkwọ ebe a na-ede nọmba fon + Akwụkwọ ekwentị + Ụdaolu Pinyin ụsọrọ nhazị - Ọchụchụ nịle - Ọchụchụ - Usoro Nhazi + Pinyin + Ọchụchụ Ihe Nịle + Ọchụchọ + Ụdaume mbụ Korea + Usoro Nhazi Ọkọlọtọ Ụkpụrụ + Akara + Ọdịnala + Akara radikal + Zhuyin + Ego + Dijit + Akara edemede + Oghere + Akara + Ha niile + Mkpụrụedemede Ntọala Naanị + Ntọala, Ụda olu, Mkpụrụedemede ukwuu/obere, Ụdị, Kana + Ntọala, Ụda olu + Ntọala, Ụda olu, Mkpụrụedemede ukwuu/obere, Ụdị + Ruo N’obosara Zuru ezu + Ruo N’ọkara Obosara Ndabara emoji Ederede + Ụsọrọ Okịrịkịrị awa iri na abụọ + 12 + Ụsọrọ Okịrịkịrị + 24 Ụsọrọ Okịrịkịrị awa iri na abụọ (0–11) 12 (0–11) Ụsọrọ Okịrịkịrị awa iri na abụọ (0–12) 12 (1–12) - Ụsọrọ Okịrịkịrị (0–23) + Ụsọrọ Awa (0–23) 24 (0–23) - Ụsọrọ Okịrịkịrị (1–24) + Ụsọrọ Awa (1–24) 24 (1–24) - Akara akanka nkwụsị esịghị ịke + Gbanwee Oghere, akara edemede, akara niile + Gbanwee Oghere, akara edemede + Gbanwee Oghere, akara edemede + Gbanwee Oghere, akara edemede, akara ndị na-abụghị ego + Ụdị Nkwụsịtụ Akara Na-esịghị ịke Esịghị ịke - Akara akanka nkwụsị kwesịrị + Ụdị Nkwụsịtụ Akara Kwesịrị Kwesịrị - Akara akanka nkwụsị sịrị ịke + Ụdị Nkwụsịtụ Akara Sịrị ịke Sịrị ịke Kewaa nke niile Dobe nke niile Nkịtị Dobe na nkebiokwu + Ntughari okwu US BGN + Ntughari okwu UN GEGN Ụsọrọ Metric Metrik Ụsọrọ Mmeshọ ịmperịa @@ -1077,8 +1149,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnụ ọgụgụ Ahom Ọnụ ọgụgụ Arab na Indị Ọnụ ọgụgụ Arab na Indị agbatịrị + Arab na Indị agbatịrị Ọnụ ọgụgụ Armenịa ọbere ọnụ ọgụgụ Armenịa + Obere mkpụrụedemede Armenịa Balinese Digits Ọnụ ọgụgụ Bangla Brahmi Digits @@ -1088,27 +1162,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnụ ọgụgụ Devanagarị Ọnụ ọgụgụ Dives Akuru Ọnụ ọgụgụ Etọpịa + Ego Ọnụ ọgụgụ ọbọsara + Obosara zuru oke Ọnụ ọgụgụ Garay Ọnụ ọgụgụ Georgian Ọnụ ọgụgụ Gunjala Gondi Ọnụ ọgụgụ Masaram Gondi Ọnụ ọgụgụ Grik Ọbere ọnụ ọgụgụ Grik + Obere mkpụrụedemede Grik Ọnụ ọgụgụ Gụjaratị Ọnụ ọgụgụ Gurung Khema Onụ ọgụgụ Gụmụkh + Ngụ ụbọchị nke ọnwa nke Han-ha maka kalenda ọdịnala Ọnụ ọgụgụ ntụpọ Chịnese + Sistemụ ọnụọgụgụ ọnọdụ na-eji grafụ ọnụọgụ China dị ka ọnụọgụ Ọnụ ọgụgụ mfe Chịnese Ọnụ ọgụgụ akantụ mfe nke Chinese + Ego nke Chinese Mfe Ọnụ ọgụgụ ọdinala chinese - Ọnụ ọgụgụ akantụ ọdịnala Chinese + Ọnụ ọgụgụ Akantụ Ọdịnala Chinese + Ego Omenala China Ọnụ ọgụgụ Hebrew Ọnụ ọgụgụ Pahawh Hmong Ọnụ ọgụgụ Nyiakeng Puachue Hmong Ọnụ ọgụgụ Javanịsị Ọnụ ọgụgụ Japanese - Ọnụ ọgụgụ akantụ Japanese + Ọnụ ọgụgụ Akantụ Japanese + Ego Japan + Afo-mbụ Japan Gannen numbering Ọnụ ọgụgụ Kayah Li Ọnụ ọgụgụ Kawi Ọnụ ọgụgụ Khmer @@ -1116,15 +1199,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnụ ọgụgụ Kirat Rai Ọnụ ọgụgụ Tai Tham Hora Ọnụ ọgụgụ Tai Tham Tham + Tai Tham Tham (ecclesiastical) Ọnụ ọgụgụ Lao Ọnụ Ọgụgụ Mpaghara Ọdịda Anyanwụ Ọnụ ọgụgụ Lepcha Ọnụ ọgụgụ Limbu Ọnụ ọgụgụ Mathematical Bold + Mgbakọ na mwepụ mbodombo Ọnụ ọgụgụ Mathematical Double-Struck + Mgbakọ na mwepụ kụrụ okpukpu abụọ Ọnụ ọgụgụ Mathematical Monospace + Mgbakọ na mwepụ monospace Ọnụ ọgụgụ Mathematical Sans-Serif Bold + Mgbakọ na mwepụ sans-serif mbodombo Ọnụ ọgụgụ Mathematical Sans-Serif + Mgbakọ na mwepụ sans-serif Ọnụ ọgụgụ Malayala Ọnụ ọgụgụ Modi Ọnụ ọgụgụ Mongolian @@ -1132,20 +1221,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnụ ọgụgụ Meetei Mayek Ọnụ ọgụgụ Myamar Ọnụ ọgụgụ Myanmar Eastern Pwo Karen + Myanmar Eastern Pwo Karen Ọnụ ọgụgụ Myanmar Pao + Myanmar Pao Ọnụ ọgụgụ Myanmar Shan + Myanmar Shan Ọnụ ọgụgụ Myanmar Tai Laing + Myanmar Tai Laing Ọnụ ọgụgụ Nag Mundari + Ọnụọgụgụ Ọdịnala + Ọnụọgụgụ Ọdịnala Ọnụ ọgụgụ N’Ko Ọnụ ọgụgụ Ochiki Ọnụ ọgụgụ Ol Onal Ọnụ ọgụgụ Ọdịa Ọnụ ọgụgụ Osmanya Ọnụ ọgụgụ Outlined + E depụtara Ọnụ ọgụgụ Hanifi Rohingya Ọnụ ọgụgụ Roman + Nnukwu mkpurụèdèmèdè Roman Ọbere Ọnụ ọgụgụ Roman + Obere mkpurụèdèmèdè Roman Ọnụ ọgụgụ Saurashtra + Ekewara Ọnụ ọgụgụ Sharada Ọnụ ọgụgụ Khudawadi Ọnụ ọgụgụ Sinhala Lith @@ -1156,17 +1255,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnụ ọgụgụ New Tai Lue Ọnụ ọgụgụ ọdịnala Tamịl Ọnụ ọgụgụ Tamị + Tamil nke Oge a Ọnụ ọgụgụ Telụgụ Ọnụ ọgụgụ Taị Ọnụ ọgụgụ Tịbeta Ọnụ ọgụgụ Tirhuta Ọnụ ọgụgụ Tangsa + Ọnụọgụgụ ọdịnala Ọnụ ọgụgụ Vai Ọnụ ọgụgụ Warang Citi Ọnụ ọgụgụ Wancho Mgbanyụ Mgbanye + Ntụgharị Asụsụ igwe Akọwapụtaghị + POSIX Dị iche iche + + Mgbanyụ + Mgbanye + Metriik @@ -1254,6 +1361,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMMM y QQQ y QQQQ y + y G + M/y G + M/d/y G + E, M/d/y G + MMM y G @@ -1425,6 +1537,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1475,6 +1590,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + EEE, d MMMM y QQQ y QQQQ y 'Izu' w 'n' 'ime' Y @@ -1519,13 +1636,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic Afọ gara aga Afọ a Afọ na-abịa + + n’ime afọ {0} + + + afọ {0} gara aga + Afọ gara aga Afọ a afọ na-abịa + + n’ime afọ {0} + + + afọ {0} gara aga + + + n’ime afọ {0} + Afọ {0} gara aga @@ -1547,27 +1679,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọnwa gara aga Ọnwa a Ọnwa na-abịa + + n’ime ọnwa {0} + + + ọnwa {0} gara aga + + + + + n’ime ọnwa {0} + + + ọnwa {0} gara aga + + + + + n’ime ọnwa {0} + + + ọnwa {0} gara aga + Izu Izu gara aga Izu a Izu na-esote + + n’ime izu {0} + + + izu {0} gara aga + Izu nke{0} + + + n’ime izu {0} + + + izu {0} gara aga + + + + + n’ime izu {0} + + + izu {0} gara aga + + - ịzụ ọnwa + ịzụ nke ọnwa + + + ịzụ nke ọnwa + + + ịzụ nke ọnwa Ụbọchị - Ụnyaahụ - Taa - Echi + ụnyaahụ + taa + echi + + n’ụbọchị {0} + + + ụbọchị {0} gara aga + - Ụnyaahụ - Taata - Echi + ụnyaahụ + taa + echi n’ụbọchị {0} @@ -1575,6 +1763,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic n’ụbọchị {0} gara aga + + ụnyaahụ + taa + echi + ụbọchị na afọ @@ -1591,84 +1784,177 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ụbọchị ịzụ na ọnwa - Ụbọchị ụka gara aga - ụbọchị ụka a - ụbọchị ụka na abịa + Sọnde gara aga + ụbọchị Sọnde a + ụbọchị Sọnde na abịa + + n’ime Sọnde {0} + + + Sọnde {0} gara aga + - ụbọchị ụka gara aga - ubochị ụka a - ụbọchị ụka na abịa + ụbọchị Sọnde gara aga + ụbọchị Sọnde a + ụbọchị Sọnde na abịa + + n’ime sekọnd {0} + + + Sọnde {0} gara aga + ụbọchị Sọnde gara aga ụbọchị Sọnde a ụbọchị Sọnde na abịa + + n’ime sekọnd {0} + + + Sọnde {0} gara aga + ụbọchị Mọnde gara aga ụbọchị Mọnde a ụbọchị Monde a + + n’ime Mọnde {0} + + + Mọnde {0} gara aga + - Mon gara aga + ụbọchị Mọnde gara aga ụbọchị Mọnde a ụbọchị Mọnde na abịa + + n’ime Mọnde {0} + + + Mọnde {0} gara aga + ụbọchị Monde gara aga ụbọchị Monde a ụbọchị Monde na abịa + + n’ime Mọnde {0} + + + Mọnde {0} gara aga + ụbọchị Tuzde gara aga ụbọchị Tuzde a ụbọchị Tuzde na abịa + + n’ime Tuzdee {0} + + + Tuzdee {0} gara aga + - ụbọchị Tụesde gara aga - ụbọchị Tuzde a - ụbọchị Tuzde na abịa + + n’ime Tuzdee {0} + + + Tuzdee {0} gara aga + ụbọchị Tuzde gara aga ụbọchị Tuzde a ụbọchị Tuzde na abịa + + n’ime Tuzdee {0} + + + Tuzdee {0} gara aga + - ụbọchị wednesde gara aga - ụbọchị Wednesde a - ụbọchị Wednesde na abịa + ụbọchị Wenezde gara aga + ụbọchị Wenezde a + ụbọchị Wenezde na abịa + + n’ime Wenezdee {0} + + + Wenezde {0} gara aga + - ụbọchị Wednesde gara ag - ụbọchị Wednesde a - ụbọchị Wednesde na abịa + ụbọchị Wenezde gara aga + ụbọchị Wenezde a + ụbọchị Wenezde na abịa + + n’ime Wenezdee {0} + + + Wenezde {0} gara aga + - ụbọchị Wednesde gara ag - ụbọchị Wednesde a - ụbọchị Wednesde a + ụbọchị Wenezde gara aga + ụbọchị Wenezde a + ụbọchị Wenezde na abịa + + n’ime Wenezdee {0} + + + Wenezde {0} gara aga + ụbọchị Tọsdee gara aga ụbọchị Tọsdee a ụbọchị Tọsdee na abịa + + n’ime Tọzdee {0} + + + Tọzdee {0} gara aga + - Ụbọchị Tọsdee gara aga - ụbọchị Tọsdee a - ụbọchị Tọsdee na abịa + Ụbọchị Tọzdee gara aga + ụbọchị Tọzdee a + ụbọchị Tọzdee na abịa + + n’ime Tọzdee {0} + + + Tọzdee {0} gara aga + ụbọchị Tọsdee gara aga - ụbọchị Tọsdee a - ụbọchị Tọsdee na abịa + ụbọchị Tọzdee a + ụbọchị Tọzdee na abịa + + n’ime Tọzdee {0} + + + Tọzdee {0} gara aga + Ụbọchị faraịde gara aga ụbọchị Faraịde a ụbọchị Faraịde na abịa + + n’ime Friday {0} + + + n’ime Friday {0} gara aga + ụbọchị Faraịde gara aga @@ -1690,39 +1976,119 @@ CLDR data files are interpreted according to the LDML specification (http://unic ụbọchị Satụde gara aga ụbọchị Satụde a ụbọchị Satụde na abịa + + n’ime Satọde {0} + Ụbọchị Satụde {0} gara aga - Ụbọchị Satụde gara aga - ụbọchị Satụde a - ụbọchị Satụde na abịa + + n’ime Satọde {0} + + + Satọde {0} gara aga + ụbọchị Satụde gara aga ụbọchị Satụde a ụbọchị Satụde na abịa + + n’ime Satọde {0} + N’ụtụtụ/N’abalị - Elekere + elekere elekere a + + n’ime awa {0} + + + n’ime awa {0} gara aga + + + + + n’ime awa {0}. + + + awa {0} gara aga + + + + + n’ime awa {0} + + + awa {0} gara aga + Nkeji nkejị a + + n’ime nkeji {0} + + + nkeji {0} gara aga + + + + + n’ime nkeji {0}. + + + nkeji {0} gara aga + + + + + n’ime nkeji {0} + + + nkeji {0} gara aga + + sekọnd ụgbụa + + n’ime sekọnd {0} + + + sekọnd {0} gara aga + sekọnd + + n’ime sekọnd {0} + + + sekọnd {0} gara aga + + + + + n’ime sekọnd {0} + + + sekọnd {0} gara aga + - Mpaghara oge + oge mpaghara + + + oge mpaghara + + + oge mpaghara @@ -1735,18 +2101,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Obodo Amaghị + Ebe Amaghị - + - Oge Okpomọkụ Britain + Oge Acre + Oge Ọkọlọtọ Acre + Oge Okpomọkụ nke Acre - - - - Oge Okpomọkụ Ireland - - + Oge Afghanistan @@ -1922,6 +2285,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Okpomọkụ Brasilia + + + Oge Britain + Oge Okpomọkụ Britain + + Oge Brunei Darussalam @@ -2034,7 +2403,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Further-eastern European Time + Oge Ọwụwa Anyanwụ Europe @@ -2092,7 +2461,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Oge Mpaghara Greemwich Mean + Oge Mpaghara Greenwich Etịtị + + + + + Oge Greenland + Oge Ọkọlọtọ Greenland + Oge Okpomọkụ nke Greenland @@ -2127,7 +2503,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Hawaii-Aleutian - Oge Izugbe Hawaii-Aleutian + Oge Izugbe Hawaii Aleutian Oge Ihe Hawaii-Aleutian @@ -2182,6 +2558,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Ihe Iran + + + Oge Ireland + Oge Okpomọkụ Ireland + + Oge Irkutsk @@ -2203,6 +2585,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Ihe Japan + + + Oge Kamchatka + Oge Izugbe Kamchatka + Oge Okpomọkụ Kamchatka + + Oge Kazakhstan @@ -2465,11 +2854,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Okpomọkụ Sakhalin + + + Oge Samara + Oge Izugbe Samara + Oge Okpomọkụ nke Samara + + - Oge Samoa Oge Izugbe Samoa - Oge Ihe Samoa @@ -2536,6 +2930,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Chuuk + + + Oge Türkiye + Oge Izugbe Türkiye + Oge Okpomọkụ Türkiye + + Oge Turkmenist @@ -2555,6 +2956,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Oge Okpomọkụ Uruguay + + + Oge Ürümqi + + Oge Uzbekist @@ -2630,6 +3036,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic ‏+ ‏- + + + + 0 puku + 00 puku + 000 puku + 0 nde + 00 nde + 000 nde + 0 ijeri + 00 ijeri + 000 ijeri + 0 puku ijeri + 00 puku ijeri + 000 puku ijeri + + + @@ -2708,6 +3132,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Dram obodo Armenia + ego dram obodo Armenia Ego Antillean Guilder obodo Netherlands @@ -2744,9 +3169,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Dinar Obodo Bahrain + Ego dinar Obodo Bahrain Ego Franc obodo Burundi + ego franc obodo Burundi Dollar Bermuda @@ -2814,7 +3241,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego pesos obodo Cuba - Escudo Caboverdiano + Ego escudos Cape Verdean + Ego escudos Cape Verdean Ego Koruna obodo Czech @@ -2841,7 +3269,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Birr obodo Ethiopia - Ego birrs obodo Ethiopia + ego birrs obodo Ethiopia Euro @@ -2859,6 +3287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Lari Obodo Georgia + Ego lari obodo Georgia Ego Cedi obodo Ghana @@ -2899,6 +3328,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Shekel ọhụrụ obodo Israel + Ego shekel ọhụrụ obodo Israel Rupee India @@ -2918,6 +3348,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Dinar Obodo Jordan + Ego dinar Obodo Jordan Yen Japan @@ -2925,6 +3356,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Shilling obodo Kenya + ego shilling obodo Kenya Ego Som Obodo Kyrgyzstan @@ -2934,6 +3366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Franc obodo Comoros + ego franc obodo Comoros Ego Won Obodo North Korea @@ -2943,6 +3376,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Dinar Obodo Kuwait + Ego dinar Obodo Kuwait Ego Dollar obodo Cayman Islands @@ -2956,7 +3390,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Pound obodo Lebanon - Ego Pound Obodo Lebanon + Ego pound Obodo Lebanon Ego Rupee obodo Sri Lanka @@ -2979,7 +3413,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Ariary obodo Madagascar - Ego ariaries obodo Madagascar + ego ariaries obodo Madagascar Ego Denar Obodo Macedonia @@ -2999,6 +3433,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Rupee obodo Mauritania + ego rupee obodo Mauritania Ego Rufiyaa obodo Moldova @@ -3015,13 +3450,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Metical obodo Mozambique - Ego meticals obodo Mozambique + ego meticals obodo Mozambique Ego Dollar obodo Namibia - Naịra + Nigerian Naira + Naira Nigeria ₦ @@ -3039,7 +3475,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Rial obodo Oman - Ego rials Obodo Oman + Ego rial obodo Oman Ego Balboa obodo Panama @@ -3078,9 +3514,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Franc obodo Rwanda + ego franc obodo Rwanda Ego Riyal obodo Saudi + Ego riyal obodo Saudi Ego Dollar obodo Solomon Islands @@ -3088,7 +3526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Rupee obodo Seychelles - Ego rupees obodo Seychelles + ego rupees obodo Seychelles Ego Pound obodo Sudan @@ -3110,19 +3548,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego shilling obodo Somali + ego shilling obodo Somali Dollar Surinamese Ego Pound obodo South Sudan - Ego pounds mba ọdịda anyanwụ Sudan + ego pound obodo South Sudan Ego Dobra nke obodo Sāo Tomé na Principe Ego Pound obodo Syria + Ego pound obodo Syria Ego Lilangeni obodo Swaziland @@ -3132,7 +3572,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Baht obodo Thai - Who Somoni obodo Tajikistan + Ego Somoni obodo Tajikistan + Ego somoni obodo Tajikistan Ego Manat Obodo Turkmenistan @@ -3155,14 +3596,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Shilling Obodo Tanzania - Ego Shillings Obodo Tanzania + ego shillings obodo Tanzania Ego Hryvnia obodo Ukraine Ego Shilling obodo Uganda - Ego shillings obodo Uganda + ego shillings obodo Uganda Dollar US @@ -3198,7 +3639,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Guilder Caribbean - Ego Guilder Caribbean Ego CFA Franc obodo West Africa @@ -3214,6 +3654,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Rial obodo Yemeni + Ego rial obodo Yemeni Ego Rand obodo South Africa @@ -3221,11 +3662,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ego Kwacha Obodo Zambia - Ego kwachas obodo Zambia + ego kwachas obodo Zambia Ego Ọlaọcha Zimbabwe - Ego Ọlaọcha Zimbabwe @@ -3241,6 +3681,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic deci{0} + + senti{0} + + + milli{0} + obere{0} @@ -3250,6 +3696,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic kwekto{0} + + kilo{0} + mega{0} @@ -4071,15 +4520,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ihe - akụkụ {0}akụkụ {0}ppm - - Glc - {0}q @@ -4254,7 +4699,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}hp - nke Hg {0}nke Hg @@ -4357,9 +4801,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Imp. quarts {0}qt-Imp. - - cal-IT - {0}ìhè diff --git a/make/data/cldr/common/main/ii.xml b/make/data/cldr/common/main/ii.xml index cd9f13a5a3c1..526171d5dda5 100644 --- a/make/data/cldr/common/main/ii.xml +++ b/make/data/cldr/common/main/ii.xml @@ -312,6 +312,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic y MMM dꑍ,E + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} MMM dꑍ–dꑍ @@ -394,7 +399,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ꋧꃅꎕꏦꄮꈉ{0} - ꋧꃅꎕꏦꄮꈉ {0}ꄮꈉ {0}ꃅꎸꄮꈉ {0}ꎕꏦꄮꈉ diff --git a/make/data/cldr/common/main/io.xml b/make/data/cldr/common/main/io.xml deleted file mode 100644 index 46ba93b6c4e0..000000000000 --- a/make/data/cldr/common/main/io.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - Ido - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - diff --git a/make/data/cldr/common/main/io_001.xml b/make/data/cldr/common/main/io_001.xml deleted file mode 100644 index c5ff137d5067..000000000000 --- a/make/data/cldr/common/main/io_001.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/is.xml b/make/data/cldr/common/main/is.xml index bf2a67b14898..6d249da652d9 100644 --- a/make/data/cldr/common/main/is.xml +++ b/make/data/cldr/common/main/is.xml @@ -415,6 +415,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ palí pijin pólska + piedmontíska ponpeiska maliseet-passamaquoddy prússneska @@ -1027,18 +1028,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Röðun Stöðluð röðun Talnaröðun + Endurröðun skrifleturs/sérstafahópa Röðunarstyrkur Gjaldmiðill + Markmið umbreytingar + Undanþágur frá línuskiptingu úr orðabók Framsetning emoji + Fyrsti dagur viku + Blandað Tímakerfi (12 eða 24) + Innsláttaraðferð + Lyklaborð + Efri mörk fyrir undanskilið Línuskipting Línuskil innan orða + Umbreytingarreglur Mælingakerfi + Mælieining Tölur + Svæði fyrir viðbótargögn + Uppruni umbreytingar + Undirsvæði Hindranir á línuskiptingu + Umbreyting + Vélþýtt Tímabelti Landsstaðalsafbrigði Einkanotkun + Umbreyting til einkanota Búddískt tímatal @@ -1058,13 +1075,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hebreskt tímatal Hebreskt indverskt dagatal + Indverskt þjóðartímatal Íslamskt tímatal Íslamskt tímatal Íslamskt borgaradagatal Íslamskt borgaradagatal + Hijri, tungl séð í Sádi-Arabíu + Hijri (töfluform, stjarnfræðilegt tímabil) Íslamskt dagatal (Umm al-Qura) Íslamskt dagatal (Umm al-Qura) ISO-8601 tímatal + Gregorískt Japanskt tímatal Japanskt Persneskt tímatal @@ -1080,41 +1101,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Raða áherslum eðlilega Raða öfugt eftir áherslum Raða lágstöfum fyrst + Lágstafir Raða eðlilega eftir hástöfum og lágstöfum + Lágstafir Raða hástöfum fyrst + Hástafir Raða óháð hástöfum og lágstöfum Raða stafrétt Fyrri röðun, til samræmis + Samhæfi Orðabókarröð + Orðabók Sjálfgefin Unicode-röðun Sjálfgefin Unicode + Emoji Evrópskar reglur um röðun + Evrópskar reglur Símaskráarröðun + Símaskrá Hljóðfræðileg röð + Hljóðritun Pinyin-röðun + Pinyin Almenn leit Leit Leita eftir upphafssamhljóða í Hangul + Kóresk röðun eftir fyrsta samhljóða Stöðluð röðun Stöðluð Strikaröðun + Stroka Hefðbundin + Hefðbundin Röðun eftir grunnstrikum + Táknrót-stroka + Zhuyin Raða án stöðlunar Raða Unicode með stöðluðum hætti Raða tölustöfum sér Raða tölustöfum tölulega + Gjaldmiðill + Tölustafir + Greinarmerki + Bil + Tákn Raða öllu + Allt Raða aðeins grunnstöfum + Aðeins grunnstafir Raða áherslum/hástaf eða lágstaf/breidd/Kana + Grunnstafir, áherslutákn, há- og lágstafir, afbrigði, kana Raða áherslum + Grunnstafir, áherslutákn Raða áherslum/hástaf eða lágstaf/breidd + Grunnstafir, áherslutákn, há- og lágstafir, afbrigði Full breidd Hálfbreidd Tölulegur Staðlað Emoji Texti + 12 tíma kerfi + 12 + 24 tíma kerfi + 24 12 tíma kerfi (0–11) 12 (0–11) 12 tíma kerfi (1–12) @@ -1123,6 +1173,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 tíma kerfi (1–24) 24 (1–24) + Sleppa eyðum, greinarmerkjum, öllum táknum + Sleppa eyðum, greinarmerkjum + Sleppa eyðum, greinarmerkjum + Sleppa eyðum, greinarmerkjum, öllum táknum nema gjaldmiðilstáknum Laus línuskipting Laus Venjuleg línuskipting @@ -1144,51 +1198,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ahom-tölur Arabískar-indverskar tölur Auknar arabískar-indverskar tölur + Auknar arabískar-indverskar Armenskir tölustafir Armenskar lágstafatölur + Armenskir lágstafir Bengalskar tölur Chakma-tölur Devanagari tölur Eþíópískir tölustafir Viðskiptafræðileg töluorð + Fjármálatölur Tölur í fullri breidd + Full breidd Georgískir tölustafir Grískir tölustafir Grískar lágstafatölur + Grískir lágstafir Gujarati-tölur Gurmukhi-tölur + Tölusetning mánaðardaga með Han-táknum fyrir hefðbundin dagatöl Kínverskir tugatölustafir + Stöðutugakerfi með kínverskum tölumyndtáknum sem tölustöfum Einfaldaðir kínverskir tölustafir Einfaldaðar kínverskar fjármálatölur + Einfaldaðar kínverskar fjármálatölur Hefðbundnir kínverskir tölustafir Hefðbundnar kínverskar fjármálatölur + Hefðbundnar kínverskar fjármálatölur Hebreskir tölustafir Javanskar tölur Japanskir tölustafir Japanskar fjármálatölur + Japanskar fjármálatölur + Japönsk Gannen-talning út frá fyrsta ári Kmerískar tölur Kannada-tölur + Tai Tham Tham (kirkjulegt) Lao-tölur Vestrænar tölur + Feitletraðar tölur fyrir stærðfræði + Tvöfaldar tölur fyrir stærðfræði + Jafnstafasnið fyrir stærðfræði + Blokkstafa feitletur fyrir stærðfræði + Blokkstafir fyrir stærðfræði Malayalam-tölur Mongólskar tölur Meetei mayek-tölur Mjanmarskar tölur + Mjanmarskar austur Pwo Karen-tölur + Mjanmarskar Pao-tölur + Mjanmarskar Shan-tölur + Mjanmarskar Tai Laing-tölur Upprunalegir tölustafir + Upprunalegir tölustafir Ol chiki-tölur Odia-tölur + Holar tölur Rómverskir tölustafir + Rómverskir hástafir Rómverskar lágstafatölur + Rómverskir lágstafir + Reiknivélatölustafir Hefðbundnir tamílskir tölustafir Tamílskar tölur + Tamílskar nútímatölur Telúgú-tölur Tælenskar tölur Tíbeskir tölustafir Hefðbundin tölutákn + Hefðbundnir tölustafir Vai-tölustafir Slökkt Kveikt + Ótilgreind vélþýðing + POSIX-afbrigði + + Slökkt + Kveikt + metrakerfi breskt @@ -1292,7 +1380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - d.M.y GGGGG + d.M.y G GGGGGyMd @@ -1335,15 +1423,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y G - MM-y G - d/M/y GGGGG - E dd-MM-y G + M.y G + d.M.y G + E, d.M.y G MMM y G d. MMM y G E, d. MMM y G h:mm a h:mm:ss a - HH v d.M. E, d.M. d. MMM @@ -1371,21 +1458,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y–y G - MM.y GGGGG – MM.y GGGGG - MM.y – MM.y GGGGG - MM.y – MM.y GGGGG + M.y G – M.y G + M.–M.y G + M.y–M.y G - dd.MM.y – dd.MM.y GGGGG - dd.MM.y GGGGG – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG + d.–d.M.y G + d.M.y G – d.M.y G + d.M.–d.M.y G + d.M.y–d.M.y G - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y GGGGG – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG + E, d. – E, d.M.y G + E, d.M.y G – E, d.M.y G + E, d.M. – E, d.M.y G + E, d.M.y – E, d.M.y G MMM y G – MMM y G @@ -1395,11 +1482,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d.–d. MMM y G d. MMM y G – d. MMM y G - d. MMM – d MMM y G + d. MMM – d. MMM y G d. MMM y – d. MMM y G - E, d. MMM – E, d. MMM y G + E, d. – E, d. MMM y G E, d. MMM y G – E, d. MMM y G E, d. MMM – E, d. MMM y G E, d. MMM y – E, d. MMM y G @@ -1439,6 +1526,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM–MMMM + + d.–d. MMMM + d. MMMM – d. MMMM + y–y G @@ -1696,6 +1787,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1735,19 +1829,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, h:mm:ss a E, HH:mm:ss y G - M/y G - d/M/y G - E, d/M/y G + M.y G + d.M.y G + E, d.M.y G MMM y G d. MMM y G E, d. MMM y G + MMMM y G + d. MMMM y G + E, d. MMMM y G h:mm a h:mm:ss a h:mm:ss a v v – HH:mm:ss h:mm a v v – HH:mm - HH v + v HH d.M. E, d.M. d. MMM @@ -1756,18 +1853,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMMM 'viku' W 'í' MMMM 'viku' W 'í' MMMM - M. y + M.y d.M.y E, d.M.y MMM y d. MMM y E, d. MMM y MMMM y + d. MMMM y + E, d. MMMM y QQQ y QQQQ y 'viku' w 'af' Y 'viku' w 'af' Y + + {0} {1} + d.–d. @@ -1777,21 +1879,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y–y G - MM.y GGGGG – MM.y GGGGG - MM.y – MM.y GGGGG - MM.y – MM.y GGGGG + M.y G – M.y G + M.–M.y G + M.y–M.y G - dd.MM.y – dd.MM.y GGGGG - dd.MM.y GGGGG – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG - dd.MM.y – dd.MM.y GGGGG + d.–d.M.y G + d.M.y G – d.M.y G + d.M.y–d.M.y G + d.M.y–d.M.y G - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y GGGGG – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG - E, dd.MM.y – E, dd.MM.y GGGGG + E, d. – E, d.M.y G + E, d.M.y G – E, d.M.y G + E, d.M. – E, d.M.y G + E, d.M.y – E, d.M.y G MMM y G – MMM y G @@ -1805,7 +1907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y – d. MMM y G - E, d. MMM – E, d. MMM y G + E, d. – E, d. MMM y G E, d. MMM y G – E, d. MMM y G E, d. MMM – E, d. MMM y G E, d. MMM y – E, d. MMM y G @@ -1824,11 +1926,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M.–M. - d.M.–d.M. + d.–d.M. d.M.–d.M. - E, d.M. – E, d.M. + E, d. – E, d.M. E, d.M. – E, d.M. @@ -1845,18 +1947,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + d.–d. MMMM + d. MMMM – d. MMMM + - M.y – M.y - M.y – M.y + M.–M.y + M.y–M.y - d.M.y – d.M.y - d.M.y – d.M.y + d.–d.M.y + d.M.–d.M.y d.M.y – d.M.y - E, d.M.y – E, d.M.y - E, d.M.y – E, d.M.y + E, d. – E, d.M.y + E, d.M. – E, d.M.y E, d.M.y – E, d.M.y @@ -2593,9 +2699,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ París - - Sumartími í Bretlandi - Lundúnir @@ -2628,11 +2731,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Djakarta - - - Sumartími á Írlandi - - Jerúsalem @@ -2828,6 +2926,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jóhannesarborg + + + Tími í Acre + Staðaltími í Acre + Sumartími í Acre + + Afganistantími @@ -2904,9 +3009,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Tími í Apía - Staðaltími í Apía - Sumartími í Apía + Vestur-Samóatími + Staðaltími á Vestur-Samóa + Sumartími á Vestur-Samóa @@ -3010,6 +3115,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sumartími í Brasilíu + + + Tími í Bretlandi + Sumartími í Bretlandi + + Brúneitími @@ -3183,6 +3294,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Greenwich-staðaltími + + + Grænlandstími + Staðaltími á Grænlandi + Sumartími á Grænlandi + + Austur-Grænlandstími @@ -3209,14 +3327,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Staðaltími á Havaí og Aleúta + Havaítími - Tími á Havaí og Aleúta - Staðaltími á Havaí og Aleúta - Sumartími á Havaí og Aleúta + Tími á Havaí og Aleúteyjum + Staðaltími á Havaí og Aleúteyjum + Sumartími á Havaí og Aleúteyjum @@ -3270,6 +3388,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sumartími í Íran + + + Tími á Írlandi + Sumartími á Írlandi + + Tími í Irkutsk @@ -3293,9 +3417,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Tími í Petropavlovsk-Kamchatski - Staðaltími í Petropavlovsk-Kamchatski - Sumartími í Petropavlovsk-Kamchatski + Kamtsjatkatími + Staðaltími á Kamtsjatka + Sumartími á Kamtsjatka @@ -3569,9 +3693,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samóa-tími Staðaltími á Samóa - Sumartími á Samóa @@ -3638,6 +3760,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chuuk-tími + + + Tyrklandstími + Staðaltími í Tyrklandi + Sumartími í Tyrklandi + + Túrkmenistan-tími @@ -3657,6 +3786,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sumartími í Úrúgvæ + + + Tími í Ürümqi + + Úsbekistan-tími @@ -3795,9 +3929,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4816,8 +4947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Karíbahafsgyllini - Karíbahafsgyllini - Karíbahafsgyllini XCG @@ -4882,8 +5011,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ simbabveskt gold - simbabveskt gold - simbabveskt gold @@ -5248,8 +5375,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hlutar - {0} hluti - {0} hlutar masculine @@ -6617,6 +6742,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine + hálflítrar + {0} hálflítri + {0} hálflítra + {0} hálflítra + {0} hálflítra + {0} hálflítrar + {0} hálflítra + {0} hálflítrum + {0} hálflítra masculine @@ -6642,7 +6776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} á gallon - Breskt gallon + breskt gallon {0} breskt gallon {0} breskt gallon {0}/ á breskt gallon @@ -6767,11 +6901,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} veber {0} veber - - ljóshraði - {0} ljóshraði - {0} ljóshraðar - masculine hlutar á milljarð @@ -7470,11 +7599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmól/l {0}mmól/l - - hluti - {0} hluti - {0} hlutar - ppm {0}ppm @@ -7488,9 +7612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - l/100km {0}l/100km @@ -7611,11 +7732,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ oz t - - af Hg - {0} af Hg - {0} af Hg - inHg {0}" Hg @@ -7672,16 +7788,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} l.mál {0} l.mál - - kal-IT - {0} kal-IT - {0} kal-IT - - - ljóshraði - {0} ljóshraði - {0} ljóshraðar - n. {0} n. @@ -7750,7 +7856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ gjaldmiðilstákn þankastrik eða samtenging tala - dýrðartákn + spátákn niðurör ör niður og upp austur-asískt letur @@ -7792,7 +7898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ parað manneskja hljóðfræðilegt stafróf - myndrit + myndtákn staður planta greinarmerki @@ -7826,8 +7932,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ tengiskrift yfirskrift texti - titla - sýna + titill + áberandi plakat öfugt skáletur upprétt @@ -7859,10 +7965,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ óhóflega teygt óhóflega breitt þunnt - mjög ljóst - óhóflega ljóst - ljóst - hálfljóst + mjög grannt + ofurgrannt + grannt + hálfgrannt bók venjulegt miðlungs diff --git a/make/data/cldr/common/main/it.xml b/make/data/cldr/common/main/it.xml index cf2587d506ef..60bd57ac06a4 100644 --- a/make/data/cldr/common/main/it.xml +++ b/make/data/cldr/common/main/it.xml @@ -731,7 +731,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1219,18 +1219,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordinamento Ordinamento normalizzato Ordinamento numerico - Sicurezza ordinamento + Riordinamento scritture/blocchi + Criteri ordinamento Valuta + Destinazione trasformazione + Esclusioni di interruzioni basate sul dizionario Presentazione emoji + Primo giorno della settimana + Incorporato Sistema orario (12 o 24 ore) + Metodo di inserimento + Tastiera + Livello massimo ignorato Tipo di interruzione di riga Interruzioni di riga all’interno delle parole + Regole di trasformazione Sistema di misurazione + Unità di misura Numeri + Area geografica per i dati supplementari + Origine trasformazione + Suddivisione dell’area geografica Interruzione frase dopo abbreviaz. + Trasformazione + Tradotto automaticamente Fuso orario Variante lingua Uso privato + Trasformazione a uso privato Calendario buddista @@ -1250,15 +1266,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Calendario ebraico Ebraico calendario nazionale indiano + Nazionale indiano Calendario Hijri Hijri Calendario Hijri (tabulare, epoca civile) Hijri (tabulare, epoca civile) Calendario islamico (Arabia Saudita, osservazione) + Hijri, avvistamento in Arabia Saudita Calendario islamico (tabulare, era astronomica) + Hijri (tabulare, epoca astronomica) Calendario Hijri (Umm al-Qura) Hijri (Umm al-Qura) Calendario ISO-8601 + Gregoriano Calendario giapponese Giapponese Calendario persiano @@ -1274,8 +1294,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordina accenti normalmente Ordina accenti capovolti Ordina prima lettere minuscole + Minuscolo Ordina lettere maiuscole/minuscole normalmente + Minuscolo Ordina prima lettere minuscole + Maiuscolo Ordina senza distinzione tra maiuscole e minuscole Ordina distinzione tra maiuscole e minuscole Ordinamento precedente, per compatibilità @@ -1284,6 +1307,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dizionario Ordinamento Unicode predefinito Unicode predefinito + Emoji + Regole europee Ordinamento Elenco telefonico Elenco telefonico Ordinamento fonetico @@ -1293,6 +1318,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ricerca generica Ricerca Cerca per consonante hangul iniziale + Consonante iniziale coreana Ordinamento standard Standard Ordinamento tratti @@ -1307,17 +1333,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordina Unicode normalizzato Ordina cifre individualmente Ordina cifre numericamente + Valuta + Cifre + Punteggiatura + Spazio + Simbolo Ordina tutto + Tutti Ordina solo lettere di base + Solo lettere base Ordina accenti/lettere/larghezza/Kana + Base, accenti, maiuscole/minuscole, varianti, kana Ordina accenti + Base, accenti Ordina accenti/lettere/larghezza + Base, accenti, maiuscole/minuscole, varianti Larghezza intera Metà larghezza Numerica Default Emoji Testo + Sistema orario a 12 ore + 12 ore + Sistema orario a 24 ore + 24 ore Sistema orario a 12 ore (0–11) 12 ore (0–11) Sistema orario a 12 ore (1–12) @@ -1326,6 +1366,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 ore (0–23) Sistema orario a 24 ore (1–24) 24 ore (1–24) + Spazi, punteggiatura, tutti i simboli + Spazi, punteggiatura + Spazi, punteggiatura + Spazi, punteggiatura, simboli diversi dalle valute Interruzione di riga facoltativa Facoltativa Interruzione di riga normale @@ -1346,8 +1390,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Consuetudinario statunitense Cifre indo-arabe Cifre indo-arabe estese + Indo-arabi estesi Numeri armeni Numeri armeni minuscoli + Armeni minuscoli Cifre balinesi Cifre bengalesi Cifre brahmi @@ -1356,44 +1402,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cifre devanagari Numeri etiopi Numeri finanziari + Finanziari Cifre a larghezza intera + Larghezza intera Numeri georgiani Numeri greci Numeri greci minuscoli + Greci minuscoli Cifre gujarati Cifre gurmukhi + Numerazione dei giorni del mese in caratteri Han per i calendari tradizionali Numeri decimali cinesi + Sistema decimale posizionale che utilizza gli ideogrammi numerici cinesi come cifre Numeri in cinese semplificato Numeri finanziari in cinese semplificato + Finanziari in cinese semplificato Numeri in cinese tradizionale Numeri finanziari in cinese tradizionale + Finanziari in cinese tradizionale Numeri ebraici Cifre giavanesi Numeri giapponesi Numeri finanziari giapponesi + Finanziari giapponesi + Numerazione Gannen per il primo anno giapponese Cifre Kayah Li Cifre khmer Cifre kannada Cifre tai tham hora Cifre tai tham tham + Tai Tham Tham (ecclesiastici) Cifre lao Cifre occidentali Cifre lepcha Cifre limbu + Grassetto (matematica) + Grassetto da lavagna (matematica) Cifre matematiche a spaziatura fissa + Monospazio (matematica) + Grassetto senza grazie (matematica) + Senza grazie (matematica) Cifre malayalam Numeri mongoli Cifre Meetei Mayek Cifre birmane + Karen Pwo orientale, Myanmar + Pa’o, Myanmar Cifre shan birmane + Shan, Myanmar + Tai Laing, Myanmar Cifre native + Cifre native Cifre N’Ko Cifre Ol Chiki Cifre oriya Cifre osmanya + Contornati Numeri romani + Romani maiuscoli Numeri romani minuscoli + Romani minuscoli Cifre saurashtra + Segmentati Cifre sharada Cifre Sora Sompeng Cifre sundanesi @@ -1401,14 +1471,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cifre nuovo Tai Lue Numeri tamil tradizionali Cifre tamil + Tamil moderni Cifre telugu Cifre thailandesi Cifre tibetane Numeri tradizionali + Numeri tradizionali Cifre Vai Off On + Traduzione automatica non specificata + Variante POSIX + + Off + On + metrico britannico @@ -1574,7 +1652,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hh a hh:mm a hh:mm:ss a - HH v d/M E d/M d MMM @@ -1674,6 +1751,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd – E dd MMM E dd MMM – E dd MMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -1912,6 +1993,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1949,23 +2033,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y G - M/y G + MM/y G dd/MM/y G E dd/MM/y G MMM y G d MMM y G E d MMM y G - H + MMMM y G + d MMMM y G + E d MMMM y G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v dd/MM E dd/MM d MMM E d MMM d MMMM + E d MMMM 'settimana' W 'di' MMMM 'settimana' W 'di' MMMM MM/y @@ -1975,11 +2061,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'settimana' w 'del' Y 'settimana' w 'del' Y + + {0} {1} + h – h B @@ -2005,7 +2096,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E d/dMM/y GGGGG + E dd/MM/y GGGGG – E dd/MM/y GGGGG E dd/MM/y – E dd/MM/y GGGGG E dd/MM/y – E dd/MM/y GGGGG @@ -2058,6 +2149,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E dd – E dd MMM E dd MMM – E dd MMM + + d–d MMMM + d MMMM – d MMMM + MM/y – MM/y MM/y – MM/y @@ -2599,9 +2694,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Parigi - - Ora legale del Regno Unito - Londra @@ -2626,9 +2718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giacarta - - Ora legale dell’Irlanda - Dublino @@ -2793,6 +2882,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saint Thomas + + + Ora dell’Acre + Ora standard dell’Acre + Ora legale dell’Acre + + Ora dell’Afghanistan @@ -2869,9 +2965,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora di Apia - Ora standard di Apia - Ora legale di Apia + Ora delle Samoa occidentali + Ora standard delle Samoa occidentali + Ora legale delle Samoa occidentali @@ -2975,6 +3071,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora legale di Brasilia + + + Ora del Regno Unito + Ora legale del Regno Unito + + Ora del Brunei Darussalam @@ -3163,6 +3265,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora del meridiano di Greenwich + + + Ora della Groenlandia + Ora standard della Groenlandia + Ora legale della Groenlandia + + Ora della Groenlandia orientale @@ -3189,7 +3298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora standard delle Isole Hawaii-Aleutine + Ora standard delle Hawaii @@ -3250,6 +3359,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora legale dell’Iran + + + Ora dell’Irlanda + Ora legale dell’Irlanda + + Ora di Irkutsk @@ -3273,9 +3388,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora di Petropavlovsk-Kamchatski - Ora standard di Petropavlovsk-Kamchatski - Ora legale di Petropavlovsk-Kamchatski + Ora della Kamchatka + Ora standard della Kamchatka + Ora legale della Kamchatka @@ -3329,13 +3444,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora legale di Lord Howe - - - Ora di Macao - Ora standard di Macao - Ora legale di Macao - - Ora di Magadan @@ -3549,16 +3657,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora di Samara - Ora standard di Samara - Ora legale di Samara + Ora di Samara + Ora standard di Samara + Ora legale di Samara - Ora di Samoa Ora standard di Samoa - Ora legale di Samoa @@ -3625,6 +3731,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora del Chuuk + + + Ora della Turchia + Ora standard della Turchia + Ora legale della Turchia + + Ora del Turkmenistan @@ -3644,6 +3757,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora legale dell’Uruguay + + + Ora di Ürümqi + + Ora dell’Uzbekistan @@ -3750,12 +3868,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 0K - 0K - 00K - 00K - 000K - 000K 0 Mln 0 Mln 00 Mln @@ -3783,9 +3895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -4040,9 +4149,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pesos cileni - renmimbi cinese offshore - renmimbi cinese offshore - renmimbi cinesi offshore + yuan cinese offshore + yuan cinese offshore + yuan cinesi offshore yuan cinese @@ -4986,8 +5095,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabwe Gold - Zimbabwe Gold - Zimbabwe Gold dollaro zimbabwiano (2009) @@ -5121,6 +5228,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} cubi {0} cubiche + + {0} {1} + feminine {0} forza g @@ -5242,8 +5352,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ parti - {0} parte - {0} parti feminine @@ -6264,7 +6372,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine - luce feminine @@ -6350,9 +6457,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mpg - mi/Imp gal - {0} mi/Imp gal - {0} mi/Imp gal + miglia/gal imp. + {0} mpg imp. + {0} mpg imp. Pbyte @@ -6598,6 +6705,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ barile + + cucchiaini dessert imp. + {0} cd imp. + {0} cd imp. + goccia {0} goccia @@ -6614,9 +6726,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} pizzichi - imp qt - {0} imp qt - {0} imp qt + quarti imp. + {0} qt imp. + {0} qt imp. {0} sr @@ -6765,7 +6877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}elem. - parte {0}parte {0}parti @@ -6781,7 +6892,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol - Glc {0}Glc {0}Glc @@ -6794,8 +6904,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mpg - {0}mi/Imp gal - {0}mi/Imp gal + mpg imp. + {0}mpg imp. + {0}mpg imp. PB @@ -7216,11 +7327,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mm Hg {0}mm Hg - - di Hg - {0} di Hg - {0} di Hg - {0}psi {0}psi @@ -7294,8 +7400,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}lb-ft - {0}Nm - {0}Nm + {0}Nm + {0}Nm {0}km³ @@ -7420,9 +7526,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dstspn - dstspn im - {0}dstspn im - {0}dstspn im + cd imp. + {0}cd imp. + {0}cd imp. {0}goccia @@ -7442,8 +7548,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}pizzichi - {0}imp qt - {0}imp qt + qt imp. + {0}qt imp. + {0}qt imp. {0}sr @@ -7470,7 +7577,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}S - cal-IT {0}cal-IT {0}cal-IT @@ -7499,7 +7605,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}Wb - luce {0}l {0}l diff --git a/make/data/cldr/common/main/it_CH.xml b/make/data/cldr/common/main/it_CH.xml index bb712da7b8d9..48aa87f52f19 100644 --- a/make/data/cldr/common/main/it_CH.xml +++ b/make/data/cldr/common/main/it_CH.xml @@ -121,6 +121,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic MM.y + + {0} – {1} + {0}–{1} + dd.MM – dd.MM dd.MM – dd.MM diff --git a/make/data/cldr/common/main/iu.xml b/make/data/cldr/common/main/iu.xml deleted file mode 100644 index e3e0e252fb07..000000000000 --- a/make/data/cldr/common/main/iu.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - ᐅᐃᒍᐃᕐᒥᐅᖅ - ᐃᓄᒃᑎᑐᑦ - - - ᑲᓇᑕᒥ - - - - [ᐃ ᐄ ᐅ ᐆ ᐊ ᐋ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑉ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᑦ ᑭ ᑮ ᑯ ᑰ ᑲ ᑳ ᒃ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᒡ ᒥ ᒦ ᒧ ᒨ ᒪ ᒫ ᒻ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᓐ ᓕ ᓖ ᓗ ᓘ ᓚ ᓛ ᓪ ᓯ ᓰ ᓱ ᓲ ᓴ ᓵ ᔅ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᔾ ᕆ ᕇ ᕈ ᕉ ᕋ ᕌ ᕐ ᕕ ᕖ ᕗ ᕘ ᕙ ᕚ ᕝ ᕿ ᖀ ᖁ ᖂ ᖃ ᖅ ᖏ ᖑ ᖒ ᖓ ᖔ ᖕ ᙱ ᙲ ᙳ ᙴ ᙵ ᙶ ᖖ ᖠ ᖡ ᖢ ᖣ ᖤ ᖥ ᖦ] - [ᐃ ᐄ ᐅ ᐆ ᐊ ᐋ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᑦ ᑭ ᑮ ᑯ ᑰ ᑳ ᒃ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᒡ ᒥ ᒦ ᒨ ᒪ ᒫ ᒻ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᓐ ᓖ ᓗ ᓘ ᓚ ᓛ ᓪ ᓯ ᓰ ᓱ ᓲ ᓴ ᔅ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᔾ ᕆ ᕇ ᕈ ᕋ ᕌ ᕐ ᕕ ᕖ ᕗ ᕘ ᕙ ᕚ ᕝ ᕿ ᖁ ᖂ ᖃ ᖅ ᖏ ᖑ ᖒ ᖓ ᖔ ᖕ ᙱ ᙳ ᙴ ᙵ ᙶ ᖖ ᖠ ᖡ ᖢ ᖣ ᖤ ᖥ] - - - - - - - - EEEE, MMMM d, y G - - - - - MMMM d, y G - - - - - MMM d, y G - - - - - MM/dd/y GGGGG - - - - - - E, d - y G - MM/dd - E, MM/dd - E, MMM d - y - MM/y - MM/dd/y - E, MM/dd/y - MMM y - MMM d, y - E, MMM d, y - QQQ y - QQQQ y - - - - - - - - ᔭᓐᓄᐊᓕ - ᕕᕝᕗᐊᓕ - ᒫᑦᓯ - ᐊᐃᑉᐳᓗ - ᒪᐃ - ᔫᓂ - ᔪᓚᐃ - ᐊᐅᒡᒍᓯ - ᓯᑎᐱᕆ - ᐆᑦᑑᕝᕙ - ᓄᕕᐱᕆ - ᑎᓯᐱᕆ - - - - - - - ᓈᑦᑏᖑᔭᖅ - ᓇᒡᒐᔾᔭᐅ - ᓇᒡᒐᔾᔭᐅᓕᖅᑭ - ᐱᖓᑦᓯᖅ - ᓯᑕᒻᒥᖅ - ᑕᓪᓕᒻᒥᐅᑦ - ᓈᑦᓰᖑᔭᓛᕐᓂᐊᖅ - - - - - - - am - pm - - - - - - - EEEE, MMMM d, y - - - - - MMMM d, y - - - - - MMM d, y - - - - - MM/dd/y - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - E, d - y G - MM/dd - E, MM/dd - E, MMM d - MM/y - MM/dd/y - E, MM/dd/y - MMM y - MMM d, y - E, MMM d, y - QQQ y - QQQQ y - - - - - - diff --git a/make/data/cldr/common/main/iu_CA.xml b/make/data/cldr/common/main/iu_CA.xml deleted file mode 100644 index 9bfd664a91fd..000000000000 --- a/make/data/cldr/common/main/iu_CA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/iu_Latn.xml b/make/data/cldr/common/main/iu_Latn.xml deleted file mode 100644 index d4d8f41a937c..000000000000 --- a/make/data/cldr/common/main/iu_Latn.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - + + - - - + + + - + @@ -488,7 +489,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -506,10 +507,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + @@ -525,22 +526,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic Donya Afrika - Amérika Lor - Amérika Kidul - Oséania + Amerika Lor + Amerika Kidul + Oseania Afrika Kulon - Amérika Tengah - Afrika Wétan + Amerika Tengah + Afrika Wetan Afrika Lor - Afrika Sisih Tengah + Afrika Tengah Afrika Sisih Kidul - Amérika - Amérika Sisih Lor + Amerika + Amerika Sisih Lor Karibia - Asia Wétan + Asia Wetan Asia Kidul - Asia Kidul-wétan - Éropah Kidul + Asia Kidul-wetan + Eropa Sisih Kidul Australasia Melanesia Daerah Mikronesia @@ -548,61 +549,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic Asia Asia Tengah Asia Kulon - Éropah - Éropah Wétan - Éropah Lor - Éropah Kulon - Afrika Kidule Sahara - Amérika Latin + Eropah + Eropa Sisih Wetan + Eropa Sisih Lor + Eropa Sisih Kulon + Afrika Sub-Sahara + Amerika Latin Pulo Ascension - Andora - Uni Émirat Arab + Andorra + Uni Emirat Arab Afganistan Antigua lan Barbuda Anguilla - Albani - Arménia + Albania + Armenia Angola Antartika - Argèntina + Argentina Samoa Amerika - Ostenrik - Ostrali + Austria + Australia Aruba - Kapuloan Alan + Kapuloan Aland Azerbaijan - Bosnia lan Hèrségovina - Barbadhos - Banggaladésa - Bèlgi + Bosnia & Herzegovina + Barbados + Bangladesh + Belgia Burkina Faso - Bulgari + Bulgaria Bahrain Burundi - Bénin - Saint Barthélémi + Benin + Santo Bartlemi Bermuda - Brunéi + Brunei Bolivia Karibia Walanda Brasil Bahama Bhutan - Pulo Bovèt + Pulo Bouvet Botswana - Bélarus - Bélisé + Belarusia + Belize Kanada Kapuloan Cocos (Keeling) Kongo - Kinshasa - Républik Dhémokratik Kongo - Républik Afrika Tengah - Kongo - Brassaville - Républik Kongo - Switserlan - Pasisir Gadhing + Republik Demokratik Kongo + Republik Afrika Tengah + Kongo - Brazzaville + Republik Kongo + Swiss + Pante Gadhing Kapuloan Cook - Cilé + Chili Kamerun Tyongkok Kolombia @@ -610,225 +611,226 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sark Kosta Rika Kuba - Pongol Verdé - Kurasao + Tanjung Verde + Curaçao Pulo Natal Siprus - Céko - Républik Céko - Jérman + Ceko + Republik Ceko + Jerman Diego Garcia - Jibuti - Dhènemarken + Djibouti + Denmark Dominika - Républik Dominika - Aljasair - Séuta lan Melila - Ékuadhor - Éstonia + Republik Dominika + Aljazair + Ceuta & Melilla + Ekuador + Estonia Mesir Sahara Kulon - Éritréa - Sepanyol - Étiopia - Uni Éropah - Zona Éuro - Finlan + Eritrea + Spanyol + Ethiopia + Uni Eropah + Zona Euro + Finlandia Fiji Kapuloan Falkland Kapuloan Falkland (Islas Malvinas) - Féderasi Mikronésia + Mikronesia Kapuloan Faro Prancis Gabon - Karajan Manunggal - KM - Grénada - Géorgia + Britania Raya + Inggris Raya + Grenada + Georgia Guyana Prancis - Guernsei + Guernsey Ghana Gibraltar Greenland Gambia Guinea - Guadélup - Guinéa Katulistiwa - Grikenlan + Guadeloupe + Guinea Khatulistiwa + Yunani Georgia Kidul lan Kapuloan Sandwich Kidul - Guatémala + Guatemala Guam Guinea-Bissau Guyana - Laladan Administratif Astamiwa Hong Kong + Hong Kong Daerah Administratif Khusus Tyongkok Hong Kong Kapuloan Heard lan McDonald Honduras Kroasia Haiti - Honggari - Kapuloan Kanari - Indonésia - Républik Irlan - Israèl - Pulo Man - Indhia + Hungaria + Kapuloan Kanaria + Indonesia + Republik Irlandia + Israel + Isle of Man + India Wilayah Inggris ing Segara Hindia Kapuloan Chagos Irak Iran - Èslan - Itali + Islandia + Italia Jersey Jamaika Yordania Jepang - Kénya + Kenya Kirgistan Kamboja Kiribati Komoro - Saint Kits lan Nèvis + St. Kitts & Nevis Korea Lor - Koréa Kidul + Korea Kidul Kuwait - Kapuloan Kéman - Kasakstan + Kapuloan Cayman + Kazakhstan Laos - Libanon + Lebanon Santa Lusia - Liktenstén + Liechtenstein Sri Lanka - Libèria - Lésotho - Litowen + Liberia + Lesotho + Lithuania Luksemburg Latvia Libya Maroko Monako Moldova - Montenégro + Montenegro Santa Martin Madagaskar Kapuloan Marshall - Républik Makédonia Lor + Makedonia Lor Mali Myanmar (Burma) Mongolia - Laladan Administratif Astamiwa Makau - Macau + Makau Daerah Administratif Khusus Tyongkok + Makau Kapuloan Mariana Lor Martinik Mauritania - Monsérat + Montserrat Malta Mauritius - Maladéwa + Maladewa Malawi - Mèksiko + Meksiko Malaysia - Mosambik + Mozambik Namibia - Kalédonia Anyar - Nigér + Kaledonia Anyar + Niger Pulo Norfolk - Nigéria + Nigeria Nikaragua Walanda - Nurwègen - Népal + Norwegia + Nepal Nauru Niue Selandia Anyar + Aotearoa Selandia Anyar Oman Panama Peru Polinesia Prancis Papua Nugini - Pilipina + Filipina Pakistan - Polen - Saint Pièr lan Mikuélon + Polandia + Saint Pierre lan Miquelon Kapuloan Pitcairn - Puèrto Riko - Tlatah Palèstina - Palèstina + Puerto Riko + Tlatah Palestina + Palestina Portugal Palau Paraguay - Katar + Qatar Oseania Paling Njaba Réunion - Ruméni - Sèrbi + Rumania + Serbia Rusia Rwanda Arab Saudi - Kapuloan Suleman - Sésèl + Kapuloan Solomon + Seychelles Sudan - Swèdhen + Swedia Singapura - Saint Héléna - Slovénia + Saint Helena, Ascension, lan Tristan da Cunha + Slovenia Svalbard lan Jan Mayen - Slowak - Siéra Léoné + Slowakia + Siera Leone San Marino - Sénégal + Senegal Somalia Suriname Sudan Kidul Sao Tomé lan Principé - Èl Salvador - Sint Martén + El Salvador + Sint Maarten Suriah - Swasiland - (Swasiland) + Eswatini + Swaziland Tristan da Cunha - Turks lan Kapuloan Kaikos + Kapuloan Turks lan Caicos Chad Wilayah Prancis nang Kutub Kidul Togo - Tanah Thai + Thailand Tajikistan Tokelau Timor Leste - Timor Wétan - Turkménistan + Timor Timur + Turkmenistan Tunisia Tonga Turki Trinidad lan Tobago Tuvalu Taiwan - Tansania - Ukrania + Tanzania + Ukraina Uganda Kapuloan AS Paling Njaba - Pasarékatan Bangsa-Bangsa - Amérika Sarékat + Sarekat Bangsa-Bangsa + Amerika Serikat AS Uruguay - Usbèkistan + Uzbekistan Kutha Vatikan - Saint Vinsen lan Grénadin - Vénésuéla - Kapuloan Virgin Britania - Kapuloan Virgin Amérika - Viètnam + Saint Vincent & Grenadines + Venezuela + Kapuloan Virgin Britania Raya + Kapuloan Virgin Amerika Serikat + Vietnam Vanuatu Wallis lan Futuna Samoa Logat Semu - Rong Arah Semu + Bidi Semu Kosovo Yaman Mayotte Afrika Kidul - Sambia - Simbabwe + Zambia + Zimbabwe Daerah Ora Dikenali @@ -839,15 +841,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tanggalan Format Mata Uang + Lirwakake Pangurutan Simbol + Pangurutan Aksen Walikan + Urutan Aksara Gedhe/Cilik + Pangurutan Sensitif Aksara Gedhe/Cilik Urutan Pamilahan + Pangurutan sing Dinormalisasi + Pangurutan Numerik + Ngurutake Maneh Skrip/Blok + Kekuwatan Sortiran Mata Uang + Transformasi Tujuan + Pamisahan Jeda Bausastra Presentasi Emoji + Dina pisanan ing minggu + Dicampur Siklus Jam (12 vs 24) + Metode Input + Papan Ketik + Paling Dhuwur sing Dilirwakake Gaya Ganti Baris Ganti baris sajrone Tembung + Aturan Transformasi Sistem Pangukuran + Unit Pangukuran Angka + Wilayah kanggo Data Tambahan + Transformasi Sumber + Subdivisi Wilayah Pedhotan ukara sawise singkatan + Transformasi + Dijarwakake Mesin + Zona Wektu + Varian Lokal + Panggunaan Pribadi + Transformasi Panggunaan Pribadi Tanggalan Buddha @@ -866,15 +894,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gregorian Tanggalan Ibrani Ibrani + Nasional India Tanggalan Hijriah Hijriah Tanggalan Hijriah (tabel, jaman sipil) Hijriah (tabel, jaman sipil) + Hijriah, rukyat Arab Saudi Tanggalan Hijriah (tabel, jaman astronomis) Hijriah (tabel, jaman astronomis) Tanggalan Hijriah (Ummul Qura) Hijriah (Ummul Qura) Tanggalan ISO-8601 + Masehi Tanggalan Jepang Jepang Tanggalan Persia @@ -885,15 +916,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Akuntansi Format Mata Uang Standar Standar + Aksara Cilik + Aksara Cilik + Aksara Gedhe + Kompatibilitas + Bausastra Urutan Pamilahan Unicode Default Unicode Default + Emoji + Aturan Eropa + Buku tilpun + Fonetik + Pinyin Panlusuran Tujuan Umum Panlusuran - Standar Ngurutke Urutan + Konsonan wiwitan Korea + Urutan Ngurutake Standar Standar + Corekan + Tradisional + Corekan-Radikal + Zhuyin + Mata Uang + Digit + Tandha Wacan + Spasi Kosong + Simbol + Kabeh + Mung Aksara Dhasar + Dhasar, Aksen, Aksara Kapital, Varian, Kana + Dhasar, Aksen + Dhasar, Aksen, Aksara Kapital, Varian + Dadi Jembar Kebak + Dadi Jembar Separo Gawan Emoji Teks + Sistem 12 Jam + 12 + Sistem 24 Jam + 24 Sistem 12 Jam (0–11) 12 (0–11) Sistem 12 Jam (1–12) @@ -902,65 +964,106 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) Sistem 24 Jam (1–24) 24 (1–24) + Geseran spasi, tandha waca, kabeh simbol + Geseran spasi, tandha waca + Geseran spasi, tandha waca + Geseran spasi, tandha waca, simbol non-mata uang Gaya Ganti Baris Longgar Longgar Gaya Ganti Baris Normal Normal - Gaya Ganti Baris Strik + Gaya Ganti Baris Ketat Ketat Ganti baris kabeh Tetep kabeh Normal Pertahanake frasa + Transliterasi BGN AS + Transliterasi GEGN AS Sistem Metrik Metrik Sistem Pangukuran Imperial Inggris Sistem Pangukuran AS AS - Digit Hindu-Arab - Digit Hindu-Arab Diambakake + Angka Arab-India + Angka Arab-India sing Luwih Dawa + Basa Arab-India sing Dijembarake Angka Armenia Angka Huruf Cilik Armenia - Digit Bengali - Digit Chakma - Digit Devanagari + Aksara cilik Armenia + Angka Bengali + Angka Chakma + Angka Devanagari Angka Etiopia - Digit Amba Kebak + Finansial + Angka Amba Kebak + Amba kebak Angka Georgian Angka Yunani Angka Huruf Cilik Yunani - Digit Gujarat - Digit Gurmukhi - Angka Desimal Mandarin - Angka Mandarin Ringkes - Angka Finansial Mandarin Ringkes - Angka Mandarin Tradisional - Angka Finansial Mandarin Tradisional + Aksara cilik Yunani + Angka Gujarat + Angka Gurmukhi + Penomeran dina-ing-sasi karakter Han kanggo tanggalan tradisional + Angka Desimal Tyonghwa + Sistem desimal posisional sing nggunakake ideograf angka Tyonghwa minangka digit + Angka Tyonghwa Prasaja + Angka Finansial Tyonghwa Prasaja + Finansial Tyonghwa Prasaja + Angka Tyonghwa Tradhisional + Angka Finansial Tyonghwa Tradhisional + Finansial Tyonghwa Prasaja Angka Ibrani - Digit Jawa + Angka Jawa Angka Jepang Angka Finansial Jepang - Digit Khmer - Digit Kannada - Digit Lao - Digit Latin + Finansial Jepang + Penomeran Gannen taun pisanan Jepang + Angka Khmer + Angka Kannada + Tai Tham Tham (gerejawi) + Angka Lao + Angka Arab Kulon + Kandel matematika + Matematika papan tulis kandel + Matematika monospace + Matematika sans-serif kandel + Matematika sans-serif Digit Malayalam Digit Meetei Mayek Digit Myanmar + Pwo Karen Timur Myanmar + Pao Myanmar + Shan Myanmar + Tai Laing Myanmar + Digit Asli + Digit asli Digit Ol Chiki Digit Odia + Digaris pinggir Angka Romawi + Romawi huruf gedhe Angka Huruf Cilik Romawi + Romawi huruf cilik + Disegmentasi Angka Tamil Tradisional Digit Tamil + Tamil Modern Digit Telugu Digit Thailand Digit Tibet + Angka Tradisional Digit Vai Mati Urip + Jarwan Mesin sing Ora Spesifik + Varian POSIX + + Mati + Urip + Metrik BR @@ -1072,6 +1175,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0}–{1} + {0}–{1} + d – d @@ -1135,6 +1242,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d MMM – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM–d MMMM + y – y G @@ -1273,9 +1384,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + a + p + + + AM + PM + + + - Isuk - Wengi + AM + PM + + + AM + PM + + + AM + PM @@ -1374,17 +1503,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d E h:mm a E h:mm:ss a - h a + y G + MM-y G + dd-MM-y G + E, dd-MM-y G + MMM y G + d MMM y G + E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - dd/MM - E dd/MM + d-M + E, d-M d MMM E, d MMM d MMMM - 'pekan' W 'ing' MMMM + E, d MMMM + 'minggu' W 'ing' MMMM MM-y dd-MM-y E, dd-MM-y @@ -1392,98 +1531,133 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y - 'pekan' w 'ing' Y + 'minggu' w 'ing' Y + + {1}, {0} + {0} {1} + {1}, {0} + - - d – d + + {0}–{1} + + {0}–{1} + + y G–y G + y–y G - - h a – h a - h – h a + + M-y G–M-y G + M-y–M-y G + M-y–M-y G - - HH – HH + + d-M-y–d-M-y G + d-M-y G–d-M-y G + d-M-y–d-M-y G + d-M-y–d-M-y G - - h:mm a – h:mm a - h:mm – h:mm a - h:mm – h:mm a + + E, d-M-y–E, d-M-y G + E, d-M-y G–E, d-M-y G + E, d-M-y–E, d-M-y G + E, d-M-y–E, d-M-y G - - HH:mm – HH:mm - HH:mm – HH:mm + + MMM y G–MMM y G + MMM–MMM y G + MMM y–MMM y G - - h:mm a – h:mm a v - h:mm – h:mm a v - h:mm – h:mm a v + + d–d MMM y G + d MMM y G–d MMM y G + d MMM–d MMM y G + d MMM y–d MMM y G - - HH:mm – HH:mm v - HH:mm – HH:mm v + + E, d MMM–E, d MMM y G + E, d MMM y G–E, d MMM y G + E, d MMM–E, d MMM y G + E, d MMM y–E, d MMM y G - - h a – h a v - h – h a v + + h a–h a - - HH – HH v + + h:mm a–h:mm a + h:mm–h:mm a + h:mm–h:mm a + + + h:mm a–h:mm a v + h:mm–h:mm a v + h:mm–h:mm a v + + + h a–h a v - MM – MM + M–M - dd/MM – dd/MM - dd/MM – dd/MM + d-M–d-M + d-M–d-M - E, dd/MM – E, dd/MM - E, dd/MM – E, dd/MM + E, d-M–E, d-M + E, d-M–E, d-M + + + MMM–MMM - d MMM – d MMM + d–d MMM + d MMM–d MMM - E, d MMM – E, d MMM - E, d MMM – E, d MMM + E, d MMM–E, d MMM + E, d MMM–E, d MMM - - y – y + + d–d MMMM + d MMMM–d MMMM - MM-y – MM-y - MM-y – MM-y + M-y–M-y + M-y–M-y - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y + d-M-y–d-M-y + d-M-y–d-M-y + d-M-y–d-M-y - E, dd-MM-y – E, dd-MM-y - E, dd-MM-y – E, dd-MM-y - E, dd-MM-y – E, dd-MM-y + E, d-M-y–E, d-M-y + E, d-M-y–E, d-M-y + E, d-M-y–E, d-M-y - MMM – MMM y - MMM y – MMM y + MMM–MMM y + MMM y–MMM y - d – d MMM y - d MMM – d MMM y - d MMM y – d MMM y + d–d MMM y + d MMM–d MMM y + d MMM y–d MMM y - E, d MMM – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y + E, d MMM–E, d MMM y + E, d MMM–E, d MMM y + E, d MMM y–E, d MMM y - MMMM – MMMM y - MMMM y – MMMM y + MMMM–MMMM y + MMMM y–MMMM y @@ -1501,7 +1675,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Rej. Ruw. Pso. - Shaw. + Syaw. Slo. Bsar. @@ -1520,13 +1694,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic Besar + + + Sur. + Sap. + Mul. + B. Mul. + Jum. Aw. + Jum. Ak. + Rej. + Ruw. + Pso. + Syaw. + Dul. + Bsar. + + d E - MM-y G d/M/y GGGGG - E, dd-MM-y G M/y GGGGG @@ -1573,33 +1761,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic - pekan - pekan wingi - pekan iki - pekan ngarep + minggu + minggu kepungkur + minggu iki + minggu ngarep - ing {0} pekan + ing {0} minggu - {0} pekan kepungkur + {0} minggu kepungkur - pekan kaping {0} + minggu kaping {0} - pkn wingi - pkn iki - pkn ngarep + mgg. + mgg. kepungkur + mgg. iki + mgg. ngarep + + ing {0} mgg. + + + {0} mgg. kepungkur + + mgg. kaping {0} + + + mgg + mgg. kepungkur + mgg. iki + mgg. ngarep + + ing {0} minggu + + + {0} mgg. kepungkur + + mgg. kaping {0} - pekan jroning sesasi + minggu sajrone sesasi - pekan jroning sasi + mgg. sajrone sesasi + + + mgg. sajrone sesasi - dino + dina wingi - dino iki + dina iki sesuk ing {0} dina @@ -1608,22 +1820,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} dina kepungkur + + dina + wingi + dina iki + sesuk + - - {0} dino kepungkur - + dina + wingi + dina iki + sesuk - dina jroning taun + dina sajrone setaun + + + dina sajrone setaun + + + dina sajrone setaun - dino sepekan + dina sajrone seminggu + + + dina sajrone semgg. + + + dina sajrone semgg. - dina jroning sasi + dina kerja sajrone sesasi + + + dn. kerja sajrone sesasi - dino jroning sasi + dn. kerja sajrone sesasi Ahad wingi @@ -1637,14 +1871,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Senèn wingi - Senèn iki - Senèn ngarep + Senen kepungkur + Senen iki + Senen ngarep - ing {0} Senèn + ing {0} Senen - {0} Senèn kepungkur + {0} Senen kepungkur @@ -1659,7 +1893,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Sn wingi + Sn kepungkur Sn iki Sn ngarep @@ -1670,7 +1904,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Selasa wingi + Selasa kepungkur Selasa iki Selasa ngarep @@ -1681,7 +1915,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Sel. wingi + Sel. kepungkur Sel. iki Sel. ngarep @@ -1691,8 +1925,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Sel. kepungkur + + Sel kepungkur + Sel. iki + Sel. ngarep + - Rebo wingi + Rebo kepungkur Rebo iki Rebo ngarep @@ -1703,7 +1942,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Reb. wingi + Reb. kepungkur Reb. iki Reb. ngarep @@ -1713,8 +1952,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Reb. kepungkur + + Reb kepungkur + Reb. iki + Reb. ngarep + - Kemis wingi + Kemis kepungkur Kemis iki Kemis ngarep @@ -1725,7 +1969,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Kms. wingi + Kms. kepungkur Kms. iki Kms. ngarep @@ -1735,8 +1979,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Kms. kepungkur + + Kms kepungkur + Kms. iki + Kms. ngarep + - Jemuwah wingi + Jemuwah kepungkur Jemuwah iki Jemuwah ngarep @@ -1747,7 +1996,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Jem. wingi + Jem. kepungkur Jem. iki Jem. ngarep @@ -1757,8 +2006,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Jem. kepungkur + + Jem kepungkur + Jem. iki + Jem. ngarep + - Setu wingi + Setu kepungkur Setu iki Setu ngarep @@ -1769,7 +2023,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Set. wingi + Set. kepungkur Set. iki Set. ngarep @@ -1780,15 +2034,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic - St wingi + Set kepungkur St iki St ngarep ing {0} St + + AM/PM + - isuk/wengi + AM/PM + + + AM/PM jam @@ -1836,32 +2096,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lokasi Ora Dikenali - - Mendosa - - - Katamarka - - - Kordoba - - - Santa Barthelemy - - - Kuiaba - - - Kampo Grande - - - Belise - - - Benteng Nelson - - - Arus Banter + + Wina Teluk Cambridge @@ -1869,27 +2105,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic Halifak - - Teluk Goose - Teluk Glace - - Santa John - - Paskah + Pulo Paskah Kosta Rika - Kape Verde + Tanjung Verde Natal + + Praha + Kopenhagen @@ -1900,15 +2133,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kairo - Kanari - - - - Wektu Ketigo Inggris - - - - Kayenne + Kanaria Konakri @@ -1919,14 +2144,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Georgia Kidul - - Makasar - - - - Wektu Standar Irlandia - - Yerusalem @@ -1945,26 +2162,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic Roma + + Jamaika + Komoro - - Santa Kitts - - - Caiman - Kostanai - - Santa Lucia - Kolombo - Luksemburk + Luksemburg Kasablanka @@ -1975,23 +2186,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Macau - - Martinik - Maladewa - - Ciudad Juáres - - - Bahia Banderas - - Kutho Meksiko - - - Merida + Kutha Meksiko Cancun @@ -1999,6 +2198,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pelabuhan Moresby + + Warsawa + Puerto Riko @@ -2011,57 +2213,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic Damaskus - - Palabuhan Spanyol - Kiev - Beulah [Dakota Lor] + Beulah, Dakota Lor - Salem Anyar [Dakota Lor] + New Salem, Dakota Lor - Tengah [Dakota Lor] - - - Vincennes [Indiana] - - - Petersburg [Indiana] - - - Tell City [Indiana] - - - Knox [Indiana] - - - Winamac [Indiana] - - - Marengo [Indiana] - - - Vevay [Indiana] - - - Monticello [Kentucky] + Center, Dakota Lor Vatikan - - Santa Vincent - - - Karakas - - - Santa Thomas - + + + Wektu Acre + Wektu Standar Acre + Wektu Ketiga Acre + + Wektu Afghanistan @@ -2091,42 +2264,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Alaska Wektu Standar Alaska - Wektu Ketigo Alaska + Wektu Ketiga Alaska Wektu Amazon Wektu Standar Amazon - Wektu Ketigo Amazon + Wektu Ketiga Amazon Wektu Tengah Wektu Standar Tengah - Wektu Ketigo Tengah + Wektu Ketiga Tengah Wektu sisih Wetan Wektu Standar sisih Wetan - Wektu Ketigo sisih Wetah + Wektu Ketiga sisih Wetan - Wektu Giri - Wektu Standar Giri - Wektu Ketigo Giri + Wektu Pagunungan + Wektu Standar Pagunungan + Wektu Ketiga Pagunungan Wektu Pasifik Wektu Standar Pasifik - Wektu Ketigo Pasifik + Wektu Ketiga Pasifik @@ -2147,14 +2320,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Argentina Wektu Standar Argentina - Wektu Ketigo Argentina + Wektu Ketiga Argentina Wektu Argentina sisih Kulon Wektu Standar Argentina sisih Kulon - Wektu Ketigo Argentina sisih Kulon + Wektu Ketiga Argentina sisih Kulon @@ -2168,7 +2341,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Atlantik Wektu Standar Atlantik - Wektu Ketigo Atlantik + Wektu Ketiga Atlantik @@ -2210,7 +2383,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Azores Wektu Standar Azores - Wektu Ketigo Azores + Wektu Ketiga Azores @@ -2234,7 +2407,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Brasilia Wektu Standar Brasilia - Wektu Ketigo Brasilia + Wektu Ketiga Brasilia + + + + + Wektu Inggris + Wektu Ketiga Inggris @@ -2265,7 +2444,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Chili Wektu Standar Chili - Wektu Ketigo Chili + Wektu Ketiga Chili @@ -2289,7 +2468,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Kolombia Wektu Standar Kolombia - Wektu Ketigo Kolombia + Wektu Ketiga Kolombia @@ -2303,7 +2482,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Kuba Wektu Standar Kuba - Wektu Ketigo Kuba + Wektu Ketiga Kuba @@ -2325,7 +2504,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Pulo Paskah Wektu Standar Pulo Paskah - Wektu Ketigo Pulo Paskah + Wektu Ketiga Pulo Paskah @@ -2337,33 +2516,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Eropa Tengah Wektu Standar Eropa Tengah - Wektu Ketigo Eropa Tengah + Wektu Ketiga Eropa Tengah - Wektu Eropa sisih Wetan - Wektu Standar Eropa sisih Wetan - Wektu Ketigo Eropa sisih Wetan + Wektu Eropa Wetan + Wektu Standar Eropa Wetan + Wektu Ketiga Eropa Wetan - Wektu Eropa sisih Wetan seng Luwih Adoh + Wektu Eropa sisih Wetan Adoh Wektu Eropa sisih Kulon Wektu Standar Eropa sisih Kulon - Wektu Ketigo Eropa sisih Kulon + Wektu Ketiga Eropa sisih Kulon - Wektu Kepuloan Falkland - Wektu Standar Kepuloan Falkland - Wektu Ketigo Kepuloan Falkland + Wektu Kapuloan Falkland + Wektu Standar Kapuloan Falkland + Wektu Ketiga Kapuloan Falkland @@ -2375,7 +2554,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wektu Guiana Prancis + Wektu Guyana Prancis @@ -2410,18 +2589,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Rerata Greenwich + + + Wektu Greenland + Wektu Standar Greenland + Wektu Ketiga Greenland + + - Wektu Grinland Wetan - Wektu Standar Grinland Wetan - Wektu Ketigo Grinland Wetan + Wektu Greenland Wetan + Wektu Standar Greenland Wetan + Wektu Ketiga Greenland Wetan - Wektu Grinland Kulon - Wektu Standar Grinland Kulon - Wektu Ketigo Grinland Kulon + Wektu Greenland Kulon + Wektu Standar Greenland Kulon + Wektu Ketiga Greenland Kulon @@ -2436,14 +2622,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wektu Standar Hawaii-Aleutian + Wektu Standar Hawaii Wektu Hawaii-Aleutian - Wektu Standar Hawaii-Aleutian - Wektu Ketigo Hawaii-Aleutian + Wektu Standar Hawaii-Aleut + Wektu Ketiga Hawaii-Aleutian @@ -2497,11 +2683,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Ketigo Iran + + + Wektu Irlandia + Wektu Standar Irlandia + + Wektu Irkutsk Wektu Standar Irkutsk - Wektu Ketigo Irkutsk + Wektu Ketiga Irkutsk @@ -2518,6 +2710,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Ketiga Jepang + + + Wektu Kamchatka + Wektu Standar Kamchatka + Wektu Mangsa Panas Kamchatka + + Wektu Kazakhstan @@ -2549,7 +2748,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Krasnoyarsk Wektu Standar Krasnoyarsk - Wektu Ketigo Krasnoyarsk + Wektu Ketiga Krasnoyarsk @@ -2573,7 +2772,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Magadan Wektu Standar Magadan - Wektu Ketigo Magadan + Wektu Ketiga Magadan @@ -2600,7 +2799,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Mauritius Wektu Standar Mauritius - Wektu Ketigo Mauritius + Wektu Ketiga Mauritius @@ -2612,7 +2811,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Pasifik Meksiko Wektu Standar Pasifik Meksiko - Wektu Ketigo Pasifik Meksiko + Wektu Ketiga Pasifik Meksiko @@ -2624,9 +2823,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wektu Moscow - Wektu Standar Moscow - Wektu Ketigo Moscow + Wektu Moskow + Wektu Standar Moskow + Wektu Ketiga Moskow @@ -2662,7 +2861,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Newfoundland Wektu Standar Newfoundland - Wektu Ketigo Newfoundland + Wektu Ketiga Newfoundland @@ -2681,21 +2880,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Fernando de Noronha Wektu Standar Fernando de Noronha - Wektu Ketigo Fernando de Noronha + Wektu Ketiga Fernando de Noronha Wektu Novosibirsk Wektu Standar Novosibirsk - Wektu Ketigo Novosibirsk + Wektu Ketiga Novosibirsk Wektu Omsk Wektu Standar Omsk - Wektu Ketigo Omsk + Wektu Ketiga Omsk @@ -2719,14 +2918,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Paraguay Wektu Standar Paraguay - Wektu Ketigo Paraguay + Wektu Ketiga Paraguay Wektu Peru Wektu Standar Peru - Wektu Ketigo Peru + Wektu Ketiga Peru @@ -2745,7 +2944,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Santa Pierre lan Miquelon Wektu Standar Santa Pierre lan Miquelon - Wektu Ketigo Santa Pierre lan Miquelon + Wektu Ketiga Santa Pierre lan Miquelon @@ -2777,14 +2976,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Sakhalin Wektu Standar Sakhalin - Wektu Ketigo Sakhalin + Wektu Ketiga Sakhalin + + + + + Wektu Samara + Wektu Standar Samara + Wektu Mangsa Panas Samara - Wektu Samoa Amerika Wektu Standar Samoa Amerika - Wektu Ketiga Samoa Amerika @@ -2851,6 +3055,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Chuuk + + + Wektu Turki + Wektu Standar Turki + Wektu Mangsa Panas Turki + + Wektu Turkmenistan @@ -2867,7 +3078,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Uruguay Wektu Standar Uruguay - Wektu Ketigo Uruguay + Wektu Ketiga Uruguay + + + + + Wektu Urumqi @@ -2893,14 +3109,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Vladivostok Wektu Standar Vladivostok - Wektu Ketigo Vladivostok + Vote Wektu Ketiga Vladivostok Wektu Volgograd Wektu Standar Volgograd - Wektu Ketigo Volgograd + Wektu Ketiga Volgograd @@ -2922,14 +3138,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wektu Yakutsk Wektu Standar Yakutsk - Wektu Ketigo Yakutsk + Wektu Ketiga Yakutsk Wektu Yekaterinburg Wektu Standar Yekaterinburg - Wektu Ketigo Yekaterinburg + Wektu Ketiga Yekaterinburg @@ -2940,9 +3156,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - java - , . @@ -3482,7 +3695,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guilder Karibia - Guilder Karibia CFA Franc Afrika Kulon @@ -3504,7 +3716,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Emas Zimbabwe - Emas Zimbabwe @@ -4697,9 +4908,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic % - - Glc - mpg inggris {0}m/gUK @@ -4776,9 +4984,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}spt-lmp. - - cal-IT - @@ -4975,7 +5180,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic und jv - ko vi yue zh informal {given} {given2} {surname} {credentials} diff --git a/make/data/cldr/common/main/ka.xml b/make/data/cldr/common/main/ka.xml index 042f9aaecfb3..76ed22995c21 100644 --- a/make/data/cldr/common/main/ka.xml +++ b/make/data/cldr/common/main/ka.xml @@ -397,6 +397,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ პალი პიჯინი პოლონური + პიემონტური მალისეტ-პასამაკვოდი პრუსიული ძველი პროვანსული @@ -714,7 +715,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1101,15 +1102,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ კალენდარი ვალუტის ფორმატი + სიმბოლოების გარეშე სორტირება + მახვილების უკუდახარისხება + დიდი/პატარა ასოების დახარისხება + დახარისხება დიდი/პატარა ასოების გათვალისწინებით დახარისხების თანმიმდევრობა + ნორმალიზებული დახარისხება + რიცხვითი დახარისხება + ასოების/ბლოკების გადახარისხება + დახარისხების სიმძლავრე ვალუტა - სიცილაკების პრეზენტაცია + ტრანსფორმაციის მიმართულება + ლექსიკონური დაყოფიდან გამორიცხვა + ემოჯის პრეზენტაცია + კვირის პირველი დღე + შერეული დროის სისტემა (12 ან 24) - სტრიქონის წყვეტის სტილი + შეყვანის მეთოდი + კლავიატურა + უმაღლესი იგნორირებული + CJK სტრიქონის წყვეტა სტრიქონზე გადასვლა სიტყვებს შორის + ტრანსფორმაციის წესები საზომი სისტემა + ზომის ერთეული რიცხვები + რეგიონი დამატებითი მონაცემებისთვის + ტრანსფორმაციის წყარო + რეგიონის ქვედანაყოფი წინადადების წყვეტა შემოკლ. შემდეგ + ტრანსფორმაცია + მანქანური თარგმანი + დროის სარტყელი + ლოკალის ვარიანტი + კერძო გამოყენება + ტრანსფორმაცია კერძო გამოყენებისთვის ბუდისტური კალენდარი @@ -1129,13 +1156,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ებრაული კალენდარი ებრაული ინდოეთის ეროვნული კალენდარი + ინდური ეროვნული ჰიჯრის კალენდარი ჰიჯრი ჰიჯრის სამოქალაქო კალენდარი (ტაბულარული) ჰიჯრი (ტაბულარული, სამოქალაქო) + ჰიჯრი, საუდის არაბეთის მთვარის ხილვაზე დაფუძნებული + ჰიჯრი (ტაბულარული, ასტრონომიული ეპოქა) ჰიჯრის კალენდარი (უმ-ალ-ქურა) ჰიჯრი (უმ-ალ-ქურა) ISO-8601 კალენდარი + გრიგორიანული იაპონური კალენდარი იაპონური სპარსული კალენდარი @@ -1146,32 +1177,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ საბუღალტრო ვალუტის სტანდარტული ფორმატი სტანდარტული + პატარა ასოები + პატარა ასოები + დიდი ასოები + თავსებადობა ლექსიკონით + ლექსიკონი უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა უნიკოდის ნაგულისხმევი + ემოჯი + ევროპული წესები ტელეფონის წიგნით + ტელეფონების წიგნი + ფონეტიკური პინ-ინი + პინინი რეფორმირებული ზოგადი დანიშნულების ძიება ძიება ჰანგულის პირველი თანხმოვნით + კორეული საწყისი თანხმოვანი სტანდარტული დახარისხების თანმიმდევრობა სტანდარტული შტრიხით + შტრიხი ტრადიციული + ტრადიციული ძირითადი შტრიხით + გასაღებით და შტრიხით ჟუინი + ჟუინი + ვალუტა + ციფრები + პუნქტუაცია + შორისი + სიმბოლო + ყველა + მხოლოდ ძირითადი ასოები + ძირითადი, მახვილები, რეგისტრი, ვარიანტები, კანა + ძირითადი, მახვილები + ძირითადი, მახვილები, რეგისტრი, ვარიანტები + სრული სიგანის + ნახევარი სიგანის ნაგულისხმევი - სიცილაკი + ემოჯი ტექსტი + 12-საათიანი სისტემა + 12 + 24-საათიანი სისტემა + 24 12-საათიანი სისტემა (0-11) 12 (0–11) 12-საათიანი სისტემა (1-12) 12 (0–11) 24-საათიანი სისტემა (0-23) - 12 (0–23) + 24 (0–23) 24-საათიანი სისტემა (1-24) - 12 (0–23) + 24 (1–24) + შუალედების, პუნქტუაციისა და ყველა სიმბოლოს გამოტოვება + შუალედებისა და პუნქტუაციის გამოტოვება + შუალედებისა და პუნქტუაციის გამოტოვება + შუალედების, პუნქტუაციისა და არავალუტური სიმბოლოების გამოტოვება სტრიქონის რბილი წყვეტის სტილი თავისუფალი სტრიქონის ჩვეულებრივი წყვეტის სტილი @@ -1182,6 +1248,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ყველგან შენარჩუნება ნორმალური ფრაზებში შენარჩუნება + BGN ტრანსლიტერაცია + UNGEGN ტრანსლიტერაცია მეტრული სისტემა მეტრული ბრიტანული საზომი სისტემა @@ -1190,60 +1258,95 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ამერიკული არაბულ-ინდური ციფრები გაფართოებული არაბულ-ინდური ციფრები + გაფართოებული არაბულ-ინდური სომხური რიცხვები სომხური ქვედა რეგისტრის რიცხვები + სომხური ქვედა რეგისტრის ბალიური ციფრები ბენგალური ციფრები ჩაკმა ციფრები ჩამური ციფრები დევანაგარის ციფრები ეთიოპიური რიცხვები + ფინანსური სრულსიგანიანი ციფრები + სრული სიგანის ქართული რიცხვები ბერძნული რიცხვები ბერძნული ქვედა რეგისტრის რიცხვები + ბერძნული ქვედა რეგისტრის გუჯარათული ციფრები გურმუხული ციფრები + ტრადიციულ კალენდრებში თვის დღეების გამოსახვა ჰან ჩინური იეროგლიფებით ჩინური ათობითი რიცხვები + ჩინური ციფრული იდეოგრამების გამოყენებით პოზიციური ათობითი სისტემა გამარტივებული ჩინური რიცხვები გამარტივებული ჩინური ფინანსური რიცხვები + გამარტივებული ჩინურის ფინანსური ტრადიციული ჩინური რიცხვები ტრადიციული ჩინური ფინანსური რიცხვები + ტრადიციული ჩინური ფინანსური ებრაული რიცხვები იავური ციფრები იაპონური რიცხვები იაპონური ფინანსური რიცხვები + იაპონური ფინანსური + იაპონური ეპოქის პირველი წელი განენის ნუმერაციით კაიაჰ-ლისი ციფრები ქხმერული ციფრები კანადური რიცხვები ტაი თამის ჰორასი ციფრები ტაი თამის თამისი ციფრები + ტაილანდური ტამტამი (საეკლესიო) ლაოსური ციფრები დასავლური ციფრები რონგ-რინგის ციფრები ლიმბური ციფრები + მათემატიკური მუქი + მათემატიკური ორმაგი კონტური + მათემატიკური მონოდაშორების + მათემატიკური უსერიფო მუქი + მათემატიკური უსერიფო მალაიალამური ციფრები მონღოლური ციფრები - მანიპური ციფრები + მანიპურის მაიეკის ციფრული მიანმური ციფრები + მიანმური აღმოსავლური პვო კარენი + მიანმური პაო მიანმური შანი ციფრები + მიანმური შანი + მიანმური ტაი-ლაინი + ადგილობრივი ციფრები + ადგილობრივი ციფრები ნკოური ციფრები ოლ-ჩიკის ციფრები ორიული ციფრები + კონტურიანი რომაული ციფრები + რომაული ზედა რეგისტრის რომაული ქვედა რეგისტრის რიცხვები + რომაული ქვედა რეგისტრის საურაშტრული ციფრები + სეგმენტირებული სუნდანური ციფრები ახალი ტაი ლიუსი ციფრები ტრადიციული ტამილური რიცხვები ტამილური ციფრები + თანამედროვე ტამილური ტელუგუს ციფრები ტაილანდური ციფრები ტიბეტური ციფრები + ტრადიციული ციფრული სისტემები ვაიური ციფრები გამორთული ჩართული + დაუზუსტებელი მანქანური თარგმანი + POSIX ვარიანტი + + გამორთული + ჩართული + მეტრული ბრიტანული @@ -1271,6 +1374,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-ლი + {0} + {0} + + + @@ -1317,29 +1429,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d E - y G - d.M.y GGGGG + GGGGG d.M.y MMM, y G d MMM, y G - E, d MMM, y G + G ddd MMM, y + G E, d MMM, y + G E, ddd MMM, y d.M E, d.M d MMM + ddd MMM E, d MMM + E, MMM ddd d MMMM - y G - y G - M.y G - d.M.y G - E, d.M.y G - MMM, y G - d MMM, y G - E, d MMM, y G + ddd MMMM + G M.y + G d.M.y + G E, d.M.y + G MMM, y + G d MMM, y + G ddd MMM, y + G E, d MMM, y + G E, ddd MMM, y MMMM y G QQQ, y G QQQQ, y G + + {0} ‑ {1} + {0}‑{1} + {0}‑{1} + {0} – {1} h – h B @@ -1367,7 +1488,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d MMM - E, d MMM – E, d MMM + E, d MMM ‑ E, d MMM + + + d‑d MMMM + d MMMM ‑ d MMMM y–y G @@ -1456,6 +1581,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-ლი + {0} + {0} + + + @@ -1557,7 +1691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ძვ. წ. - ჩვ. ერამდე ახ. წ. ჩვ. ერა @@ -1609,6 +1742,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1637,14 +1773,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, HH:mm:ss y G d.M.y GGGGG - MMM. y G - d MMM. y G - E, d MMM. y G + G MMM. y + G d MMM. y + G ddd MMM y + G E, d MMM. y + G E, ddd MMM. y + G MMMM, y + G d MMMM, y + G ddd MMMM, y + G E, d MMMM, y + G E, ddd MMMM, y d.M E, d.M d MMM + ddd MMM E, d MMM + E, ddd MMM d MMMM + ddd MMMM + E, d MMMM + E, ddd MMMM MMMMს კვირა W MMMMს კვირა W M.y @@ -1652,15 +1800,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.M.y MMM. y d MMM. y + ddd MMM y E, d MMM. y + E, ddd MMM y MMMM, y + d MMMM, y + ddd MMMM, y + E, MMMM d, y + E, MMMM ddd, y QQQ, y QQQQ, y კვირა w, Y კვირა w, Y + + {1}, {0} + + + {0} ‑ {1} + {0}‑{1} + {0}‑{1} + {0} – {1} + + h B ‑ h B + h‑h B + M–M @@ -1683,6 +1849,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d MMM E, d MMM – E, d MMM + + MMMM d‑d + MMMM d ‑ MMMM d + MM.y – MM.y MM.y – MM.y @@ -2637,9 +2807,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ლიბრევილი - - ბრიტანეთის ზაფხულის დრო - ლონდონი @@ -2730,9 +2897,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ჯაიაპურა - - ირლანდიის სტანდარტული დრო - დუბლინი @@ -3428,6 +3592,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ჰარარე + + + აკოს დრო + აკოს სტანდარტული დრო + აკოს ზაფხულის დრო + + ავღანეთის დრო @@ -3497,9 +3668,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - აპიას დრო - აპიას სტანდარტული დრო - აპიას ზაფხულის დრო + დასავლეთ სამოას დრო + დასავლეთ სამოას სტანდარტული დრო + დასავლეთ სამოას ზაფხულის დრო @@ -3603,6 +3774,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ბრაზილიის ზაფხულის დრო + + + ბრიტანეთის დრო + ბრიტანეთის ზაფხულის დრო + + ბრუნეი-დარუსალამის დრო @@ -3776,6 +3953,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ გრინვიჩის საშუალო დრო + + + გრენლანდიის დრო + გრენლანდიის სტანდარტული დრო + გრენლანდიის ზაფხულის დრო + + აღმოსავლეთ გრენლანდიის დრო @@ -3802,7 +3986,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ჰავაისა და ალეუტის სტანდარტული დრო + ჰავაის დრო @@ -3863,6 +4047,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ირანის დროის სარტყელი + + + ირლანდიის დრო + ირლანდიის სტანდარტული დრო + + ირკუტსკის დრო @@ -3884,6 +4074,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ იაპონიის ზაფხულის დრო + + + კამჩატკის დრო + კამჩატკის სტანდარტული დრო + კამჩატკის ზაფხულის დრო + + ყაზახეთის დრო @@ -4126,7 +4323,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ფხენიანის დრო + ჩრდილოეთ კორეის დრო @@ -4146,11 +4343,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ სახალინის ზაფხულის დრო + + + სამარას დრო + სამარას სტანდარტული დრო + სამარას ზაფხულის დრო + + - სამოას დრო სამოას სტანდარტული დრო - სამოას ზაფხულის დრო @@ -4217,6 +4419,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ჩუუკის დრო + + + თურქეთის დრო + თურქეთის სტანდარტული დრო + თურქეთის ზაფხულის დრო + + თურქმენეთის დრო @@ -4236,6 +4445,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ურუგვაის ზაფხულის დრო + + + ურუმჩის დრო + + უზბეკეთის დრო @@ -4999,7 +5213,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ სიერა-ლეონეს ლეონე - სიერა-ლეონეს ლეონე (1964—2022) + სიერა-ლეონეს ლეონე (1964‑2022) + სიერა-ლეონეს ლეონე (1964‑2022) + იერა-ლეონეს ლეონე (1964‑2022) სომალური შილინგი @@ -5137,8 +5353,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ კარიბის გულდენი - კარიბის გულდენი - კარიბის გულდენი ევროპული სავალუტო ერთეული @@ -5192,8 +5406,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ზიმბაბვეს გოლდი - ზიმბაბვეს გოლდი - ზიმბაბვეს გოლდი @@ -5204,9 +5416,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ კალათში {0} X-ია. შეიძენთ მას? კალათში {0} X-ია. შეიძენთ მათ? - მე-{0} - {0}-ლი - {0}-ე + შეუხვიეთ მარჯვნივ {0}-ელ შესახვევში. + შეუხვიეთ მარჯვნივ {0}-ე შესახვევში. + შეუხვიეთ {0}-ე შესახვევში მარჯვნივ. @@ -5450,21 +5662,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ტერაბიტი {0} ტერაბიტი - - გიგაბაიტი - {0} გიგაბაიტი - {0} გიგაბაიტი - გიგაბიტი {0} გიგაბიტი {0} გიგაბიტი - - მეგაბაიტი - {0} მეგაბაიტი - {0} მეგაბაიტი - მეგაბიტი {0} მეგაბიტი @@ -7267,21 +7469,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} წმ {0} წმ - - წ. - {0} წ. - {0} წ. - - - მოლ - {0} მოლ - {0} მოლ - - - Glc - {0} Glc - {0} Glc - {0}ლ/100კმ {0}ლ/100კმ @@ -7326,11 +7513,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} კვტ.სთ {0} კვტ.სთ - - ნ - {0} ნ - {0} ნ - {0} პიქს/დუიმი {0} პიქს/დუიმი @@ -7438,75 +7620,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ბრიტანული თხევადი დრაქმა {0} ბრიტანული თხევადი დრაქმა - - სრ - {0} სრ - {0} სრ - - - კატ - {0} კატ - {0} კატ - - - კულ - {0} კულ - {0} კულ - - - ფ - {0} ფ - {0} ფ - - - ჰ - {0} ჰ - {0} ჰ - - - სიმ - {0} სიმ - {0} სიმ - - - კალ-IT - {0} კალ-IT - {0} კალ-IT - - - ბკ - {0} ბკ - {0} ბკ - - - ზვ - {0} ზვ - {0} ზვ - - - გრ - {0} გრ - {0} გრ - - - კგძ - {0} კგძ - {0} კგძ - - - ტლ - {0} ტლ - {0} ტლ - - - ვბ - {0} ვბ - {0} ვბ - c - {0} სინათლის სიჩქ. - {0}-მაგი სინათლის სიჩქ. ნ/მ @@ -7568,7 +7683,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ქვემოთ მიმართული ისრები ქვემოთ და ზემოთ მიმართული ისრები აღმოსავლეთ აზიური დამწერლობები - Emoji + ემოჯი ევროპული დამწერლობები ქალი დროშა diff --git a/make/data/cldr/common/main/kaa.xml b/make/data/cldr/common/main/kaa.xml deleted file mode 100644 index c34e4ac2cd1c..000000000000 --- a/make/data/cldr/common/main/kaa.xml +++ /dev/null @@ -1,734 +0,0 @@ - - - - - - - - - - - немецше - немецше (Австрия) - немецше (Швейцария) - Англичанша - французша - французша (Канада) - французша (Швейцария) - ҳиндше (латын) - ҳинглиш (латын) - итальянша - японша - қарақалпақша - корейсше - түрк тили - белгисиз тил - қытайша - қытайша (аңсатластырылған) - - - - - - - - - - - - - - - - дүнья - Африка - Арқа Америка - Қубла Америка - Океания - Батыс Африка - Орайлық Америка - Шығыс Африка - Арқа Африка - Орайлық Африка - Қубла Африка - Америка - Арқа Америка – AҚШ ҳәм Канада - Кариб бассейни - Шығыс Азия - Қубла Азия - Қубла-шығыс Азия - Қубла Европа - Австралазия - Меланезия - Микронезия - Полинезия - Азия - Орайлық Азия - Батыс Азия - Европа - Шығыс Европа - Арқа Европа - Батыс Европа - Тропикалық Африка - Латын Америкасы - Андорра - Бирлескен Араб Әмирликлери - Аўғанстан - Антигуа ҳәм Барбуда - Ангилья - Албания - Армения - Ангола - Аргентина - Австрия - Австралия - Аруба - Аланд атаўлары - Әзербайжан - Босния ҳәм Герцеговина - Барбадос - Бангладеш - Бельгия - Буркина-Фасо - Болгария - Бахрейн - Бурунди - Бенин - Сен-Бартелеми - Бермуд атаўлары - Бруней - Боливия - Бонэйр, Синт-Эстатиус ҳәм Саба - Бразилия - Багама атаўлары - Бутан - Буве атаўы - Ботсвана - Беларусь - Белиз - Канада - Кокос атаўлары - Конго - Киншаса - Конго (КДР) - Орайлық Африка Республикасы - Конго - Браззавиль - Конго Республикасы - Швейцария - Кот-дИвуар - Кот-д’Ивуар - Кук атаўлары - Чили - Камерун - Қытай - Колумбия - Коста-Рика - Куба - Кабо-Верде - Кюрасао - Кипр - Чехия - Чехия Республикасы - Германия - Джибути - Дания - Доминика - Доминикана Республикасы - Алжир - Сеута ҳәм Мелилья - Эквадор - Эстония - Мысыр - Батыс Сахара - Эритрея - Испания - Эфиопия - Европа Аўқамы - Еврозона - Финляндия - Фиджи - Фолкленд атаўлары - Фолкленд (Мальвин) атаўлары - Микронезия Федеративлик Штатлары - Фарер атаўлары - Франция - Габон - Уллы Британия - Британия - Гренада - Грузия - Француз Гвианасы - Гернси - Гана - Гибралтар - Гренландия - Гамбия - Гвинея - Гваделупа - Экваториальлық Гвинея - Греция - Қубла Георгия ҳәм Қубла Сэндвич атаўлары - Гватемала - Гуам - Гвинея-Бисау - Гайана - Гонконг ААР - Гонконг - Гондурас - Хорватия - Гаити - Венгрия - Канар атаўлары - Индонезия - Ирландия - Израиль - Мэн атаўы - Ҳиндстан - Британияныӊ Ҳинд океанындағы территориясы - Чагос архипелагы - Ирак - Иран - Исландия - Италия - Джерси - Ямайка - Иордания - Япония - Кения - Қырғызстан - Камбоджа - Кирибати - Комор атаўлары - Сент-Китс ҳәм Невис - Арқа Корея - Қубла Корея - Кувейт - Кайман атаўлары - Қазақстан - Лаос - Ливан - Сент-Люсия - Лихтенштейн - Шри-Ланка - Либерия - Лесото - Литва - Люксембург - Латвия - Ливия - Марокко - Монако - Молдова - Черногория - Сен-Мартен - Мадагаскар - Маршалл атаўлары - Арқа Македония - Мали - Мьянма (Бирма) - Монголия - Макао ААР - Макао - Мартиника - Мавритания - Монтсеррат - Мальта - Маврикий - Мальдив - Малави - Мексика - Малайзия - Мозамбик - Намибия - Жаӊа Каледония - Нигер - Нигерия - Никарагуа - Нидерландия - Норвегия - Непал - Науру - Жаӊа Зеландия - Оман - Панама - Перу - Папуа — Жаӊа Гвинея - Филиппин - Пакистан - Польша - Сен-Пьер ҳәм Микелон - Питкэрн атаўлары - Пуэрто-Рико - Палестина территориялары - Палестина - Португалия - Палау - Парагвай - Қатар - Сыртқы Океания - Реюньон - Румыния - Сербия - Россия - Руанда - Саудия Арабстаны - Соломон атаўлары - Сейшель атаўлары - Судан - Швеция - Сингапур - Словения - Шпицберген ҳәм Ян-Майен - Словакия - Сьерра-Леоне - Сан-Марино - Сенегал - Сомали - Суринам - Қубла Судан - Сан-Томе ҳәм Принсипи - Сальвадор - Синт-Мартен - Сирия - Эсватини - Свазиленд - Тёркс ҳәм Кайкос атаўлары - Чад - Француз Қубла территориялары - Того - Таиланд - Тәжикстан - Токелау - Шығыс Тимор - Тимор-Лесте - Түркменстан - Тунис - Тонга - Түркия - Тринидад ҳәм Тобаго - Тувалу - Тайвань - Танзания - Украина - Уганда - Бирлескен Миллетлер Шөлкеми - Америка Қурама Штатлары - АҚШ - Уругвай - Өзбекстан - Ватикан - Сент-Винсент ҳәм Гренадин атаўлары - Венесуэла - Британия Виргин атаўлары - Америка Виргин атаўлары - Вьетнам - Вануату - Самоа - қалпеки пәт - қалпеки Bidi - Косово - Йемен - Майотта - Қубла Африка Республикасы - Замбия - Зимбабве - белгисиз аймақ - - - григориан календарь - григориан - кестели ҳижрий календарь - кестели ҳижрий календарь (астрономиялық дәўир) - ISO-8601 календары - стандарт саралаў - - - Тил: {0} - Жазыў: {0} - Аймақ: {0} - - - - [а ә б в г ғ д её ж з и й к қ л м н ң о ө п р с т уў ү ф х ҳ ц ч ш щ ъ ы ь э ю я] - [А Ә Б В Г Ғ Д ЕЁ Ж З И Й К Қ Л М Н Ң О Ө П Р С Т УЎ Ү Ф Х Ҳ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я] - [\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - янв - фев - мар - апр - май - июн - июл - авг - сен - окт - ноя - дек - - - Я - Ф - М - А - М - И - И - А - С - О - Н - Д - - - январь - февраль - март - апрель - май - июнь - июль - август - сентябрь - октябрь - ноябрь - декабрь - - - - - Янв - Фев - Мар - Апр - Май - Июн - Июл - Авг - Сен - Окт - Ноя - Дек - - - Я - Ф - М - А - М - И - И - А - С - О - Н - Д - - - Январь - Февраль - Март - Апрель - Май - Июнь - Июль - Август - Сентябрь - Октябрь - Ноябрь - Декабрь - - - - - - - Екш - Дүй - Сий - Сәр - Пий - Жум - Шем - - - Е - Д - С - С - П - Ж - Ш - - - Ек - Дү - Си - Сә - Пи - Жу - Ше - - - екшемби - дүйшемби - сийшемби - сәршемби - пийшемби - жума - шемби - - - - - Екш - Дүй - Сий - Сәр - Пий - Жум - Шем - - - Е - Д - С - С - П - Ж - Ш - - - Ек - Дү - Си - Сә - Пи - Жу - Ше - - - екшемби - дүйшемби - сийшемби - сәршемби - пийшемби - жума - шемби - - - - - - - I ш. - II ш. - III ш. - IV ш. - - - I - II - III - IV - - - I шерек - II шерек - III шерек - IV шерек - - - - - I ш. - II ш. - III ш. - IV ш. - - - I - II - III - IV - - - I шерек - II шерек - III шерек - IV шерек - - - - - - бизиӊ эрамызға шекемги - бизиӊ эрамызға шекемги - бизиӊ эрамыздыӊ - бизиӊ эрамыздыӊ - - - б. э. ш. - б. э. - - - - - - - эра - - - жыл - өткен жыл - усы жыл - кейинги жыл - - - ж. - өткен ж. - усы ж. - кейинги ж. - - - ж - өтк. ж. - усы ж. - кей. ж. - - - шерек - - - шер. - - - шер - - - ай - өткен ай - усы ай - кейинги ай - - - ай - - - ай - өтк. ай - усы ай - кей. ай - - - ҳәпте - өткен ҳәпте - усы ҳәпте - кейинги ҳәпте - {0}-ҳәпте - - - ҳәп. - өткен ҳәп. - усы ҳәп. - кейинги ҳәп. - - - ҳәп - өтк. ҳәп. - усы ҳәп. - кей. ҳәп. - - - күн - кеше - бүгин - ертең - - - күн - - - күн - - - ҳәпте күни - - - AM/PM - - - саат - - - ст. - - - ст - - - минут - - - мин. - - - мин - - - секунд - - - сек. - - - сек - - - ўақыт зонасы - - - - - Белгисиз орын - - - - - - сан емес - - - - - {0} ҳәм {1} - {0} ҳәм {1} - - - {0} ямаса {1} - {0} ямаса {1} - - - {0} ямаса {1} - {0} ямаса {1} - - - {0} ямаса {1} - {0} ямаса {1} - - - {0} ҳәм {1} - {0} ҳәм {1} - - - diff --git a/make/data/cldr/common/main/kaa_Cyrl.xml b/make/data/cldr/common/main/kaa_Cyrl.xml deleted file mode 100644 index bf1d860229e5..000000000000 --- a/make/data/cldr/common/main/kaa_Cyrl.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - + @@ -448,15 +459,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + @@ -465,7 +479,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Amaḍal + amaḍal Taferka Tamrikt n ugafa Tamrikt n unẓul @@ -549,6 +563,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lacin Kulumbi Tigzirt n Klipirṭun + Sark Kusta Rika Kuba Tigzirin n yixef azegzaw @@ -748,7 +763,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tigzirin ibeɛden n Marikan Timura Iddukklen WDM - Marikan Urugway Uzbaxistan Awanek n Vatikan @@ -776,37 +790,85 @@ CLDR data files are interpreted according to the LDML specification (http://unic Amizwer deg ufr Tadrimt Anagraw usrig (12 mgal 24) + Anasiw Aɣanib n tuɣalin ar udur Anagraw n uktal Imḍanen + Yettwasuqqel s tmacint Awitay abudi + Abudi Awitay acinwa + Acinwa + Awitay aqebṭi + Aqebṭi Awitay n Dangi + Adangi Awitay n Ityupya Awitay agriguryan + agriguryan Awitay aɛebri - Awitay ineslem - Awitay ISO-8601 + Aɛebri + Awitay ahiǧri + Ahiǧri + Awitay agriguryan (Imalasen ISO-8601) + Agriguryan Awitay ajapuni + Ajapuni Awitay afarsi + Afarisi Awitay agdudan acinwa Amasal n tedrimt n tsiḍent Amasal n tedrimt izeɣ + Aslugan + Amawal Tanila n usemyizwer Unicod amezwaru + Unicode amezwaru + Imujjit + Pinyin Anadi amatu + Anadi Amizwer s ufran izeɣ + Aslugan + Asenqeḍ + Asenqeḍ + Azamul + Azamul + Akk + Imujjit + Aḍris + Anagraw usrig 12 + 12 + Anagraw usrig 24 + 24 Anagraw usrig 12 (0–11) + 12 (0–11) Anagraw usrig 12 (1–12) + 12 (1–12) Anagraw usrig 24 (0–23) + 24 (0–23) Anagraw usrig 24 (1–24) + 24 (1–24) + Anasiw 101-n tqeffalin + Anasiw 102-n tqeffalin + Anasiw n Android + Anasiw n ChromeOS + Anasiw n Colemak + Anasiw n Dvorak + Anasiw n Google uhlis + Anasiw n macOS + Anasiw n Windows Aɣanib n tuɣalin ar udur ilelli Aɣanib n tuɣalin ar udur amagnu Aɣanib n tuɣalin ar udur uḥriṣ. Anagraw amitran + Amitran Anagraw n uktal Impiryal Anagraw n uktal n Marikan + Silsyus + Fahrenhayt + Kilvin Izwilen aɛraben Izwilen aɛraben yettwasɣezfen Izwilen iṛminiyen @@ -842,6 +904,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Izwilen n Tilugu Izwilen n Ṭayland Izwilen Itibitanen + Seg ASCII + Seg ungal n Morse Amitran @@ -860,6 +924,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic [A B CČ DḌ E Ɛ F GǦ Ɣ HḤ I J K L M N P Q RṚ SṢ TṬ U W X Y ZẒ] [  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9] [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] + + [\: ∶] + « @@ -901,6 +968,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} 'ɣef' {0} + + {1} 'ɣef' {0} + @@ -909,6 +979,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} 'ɣef' {0} + + {1} 'ɣef' {0} + @@ -921,14 +994,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic - E, d + E d E h:mm a E h:mm:ss a y G + M/y G + dd/MM/y GGGGG + E d/M/y G MMM y G - d MMM, y G - E, d MMM, y G - h a + d MMM y G + E d MMM y G h:mm a h:mm:ss a M @@ -963,6 +1038,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQ y G QQQQ y G + + {1}, {0} + y G – y G @@ -1110,33 +1188,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - Acer - Arim - Aram - Ahad - Amhad - Sem - Sed - - - C - R - R - H - M - S - S - - - Acer - Arim - Aram - Ahad - Amhad - Sem - Sed - Acer Arim @@ -1148,15 +1199,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - Acer - Arim - Aram - Ahad - Amhad - Sem - Sed - - - - - - - - - Kaje - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - - - - - - EEEE, G y MMMM dd - GyMMMMEEEEdd - - - - - G y MMMM d - - - - - G y MMM d - - - - - GGGGG yy/MM/dd - GGGGGyyMMdd - - - - - - - - - A̱yr - A̱hw - A̱ta - A̱na - A̱pf - A̱ki - A̱ty - A̱ni - A̱ku - Swa - Sby - Sbh - - - Hywan A̱yrnig - Hywan A̱hwa - Hywan A̱tat - Hywan A̱naai - Hywan A̱pfwon - Hywan A̱kitat - Hywan A̱tyirin - Hywan A̱ninai - Hywan A̱kumviriyin - Hywan Swak - Hywan Swak B’a̱yrnig - Hywan Swak B’a̱hwa - - - - - - - Lad - Lin - Tal - Lar - Lam - Jum - Asa - - - Ladi - Lintani - Talata - Larba - Lamit - Juma - Asabar - - - - - - - A.M. - P.M. - - - - - - Gabanin Miladi - Miladi - - - G.M. - M. - - - - - - EEEE, y MMMM dd - yMMMMEEEEdd - - - - - y MMMM d - - - - - y MMM d - - - - - yy/MM/dd - yyMMdd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - - - - A̱naira - ₦ - - - - diff --git a/make/data/cldr/common/main/kaj_NG.xml b/make/data/cldr/common/main/kaj_NG.xml deleted file mode 100644 index b87d20b7e005..000000000000 --- a/make/data/cldr/common/main/kaj_NG.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/kbd.xml b/make/data/cldr/common/main/kbd.xml new file mode 100644 index 000000000000..c8889856bb24 --- /dev/null +++ b/make/data/cldr/common/main/kbd.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + инджылызыбзэ + къэбэрдеибзэ + + + + + + Урысей + Тыркуе + + + метрик + ПЗ + ШЗ + + + бзэ: {0} + тхэпкъылъэ {0} + щӏыналъэ: {0} + + + + [а б в г {гу} {гъ} {гъу} д {дж} {дз} её ж {жь} з и й к {ку} {кхъ} {кхъу} {къ} {къу} {кӏ} {кӏу} л {лъ} {лӏ} м н о п {пӏ} р с т {тӏ} у ф {фӏ} х {ху} {хъ} {хъу} {хь} ц {цӏ} ч ш щ {щӏ} ъ ы ь э ю я ӏ {ӏу}] + [{гь} {кӏь}] + [_ \- ‑ – , ; \: ! ? . … ' " « » ( ) \[ \] \{ \} @ * / \& # ` ~] + + + « + » + + + + + + + + щӏышылэм + мазаем + гъатхэпэм + мэлыжьыхьэм + накъыгъэм + мэкъуауэгъуэм + бадзэуэгъуэм + шыщхьэӏум + фокӏадэм + жэпуэгъуэм + щакӏуэгъуэм + дыгъэгъазэм + + + + + щӏышылэ + мазае + гъатхэпэ + мэлыжьыхь + накъыгъэ + мэкъуауэгъуэ + бадзэуэгъуэ + шыщхьэӏу + фокӏадэ + жэпуэгъуэ + щакӏуэгъуэ + дыгъэгъазэ + + + + + + + + тхьэмахуэ + блыщхьэ + гъубж + бэрэжей + махуэку + мэрем + щэбэт + + + + + тхьэмахуэ + блыщхьэ + гъубж + бэрэжей + махуэку + мэрем + щэбэт + + + + + + dd.MM.y + MMM 'и' d, y 'гъэ' + MMMM 'и' d, y 'гъэ' + MMMM 'и' d, y 'гъэ' E + + + + + + ГКС {0} + ДСЗ {0} + {0} сыхьэт + {0} гъэмахуэ сыхьэт + {0} щэпхъэ сыхьэт + + + Дунейпсэ сыхьат зэтегъэува + + + ДСЗ + + + + + Греенвич курыт сыхьатыр + + + + + + + , +   + ≈ + бжыгъэкъым + + + diff --git a/make/data/cldr/common/main/mdf_RU.xml b/make/data/cldr/common/main/kbd_RU.xml similarity index 60% rename from make/data/cldr/common/main/mdf_RU.xml rename to make/data/cldr/common/main/kbd_RU.xml index 38a104cade31..ffa3324b111e 100644 --- a/make/data/cldr/common/main/mdf_RU.xml +++ b/make/data/cldr/common/main/kbd_RU.xml @@ -4,11 +4,15 @@ For terms of use, see http://www.unicode.org/copyright.html SPDX-License-Identifier: Unicode-3.0 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) + +Proper interpretation of these files requires synthesis of missing items, as per +​https://www.unicode.org/reports/tr35/tr35-general.html#Annotations +Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations. --> - + diff --git a/make/data/cldr/common/main/kbd_TR.xml b/make/data/cldr/common/main/kbd_TR.xml new file mode 100644 index 000000000000..ba841c164db3 --- /dev/null +++ b/make/data/cldr/common/main/kbd_TR.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + щӏышылэм + мазаем + гъатхэпэм + мэлыжьыхьэм + накъыгъэм + мэкъуауэгъуэм + бадзэуэгъуэм + шыщхьэӏум + фокӏадэм + жэпуэгъуэм + щакӏуэгъуэм + дыгъэгъазэм + + + + + щӏышылэм + мазаем + гъатхэпэм + мэлыжьыхьэм + накъыгъэм + мэкъуауэгъуэм + бадзэуэгъуэм + шыщхьэӏум + фокӏадэм + жэпуэгъуэм + щакӏуэгъуэм + дыгъэгъазэм + + + + щӏышылэм + мазаем + гъатхэпэм + мэлыжьыхьэм + накъыгъэм + мэкъуауэгъуэм + бадзэуэгъуэм + шыщхьэӏум + фокӏадэм + жэпуэгъуэм + щакӏуэгъуэм + дыгъэгъазэм + + + + + + + тхьэмахуэ + блыщхьэ + гъубж + бэрэжей + махуэку + мэрем + щэбэт + + + + + тхьэмахуэ + блыщхьэ + гъубж + бэрэжей + махуэку + мэрем + щэбэт + + + + + + + diff --git a/make/data/cldr/common/main/kcg.xml b/make/data/cldr/common/main/kcg.xml deleted file mode 100644 index b30afbc0fc85..000000000000 --- a/make/data/cldr/common/main/kcg.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - Katab - - - - [a{a̱} b {ch} {chy} d e f g {gb} {gh} {ghw} {ghy} i{i̱} j {jhy} k {kh} {kp} l m n {ng} {ny} o p r s {sh} {shy} t {ts} u v w y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - - - - - - EEEE, G y MMMM dd - GyMMMMEEEEdd - - - - - G y MMMM d - - - - - G y MMM d - - - - - GGGGG yy/MM/dd - GGGGGyyMMdd - - - - - - - - - Juw - Swi - Tsa - Nya - Tsw - Ata - Ana - Ari - Aku - Swa - Man - Mas - - - Zwat Juwung - Zwat Swiyang - Zwat Tsat - Zwat Nyai - Zwat Tswon - Zwat Ataah - Zwat Anatat - Zwat Arinai - Zwat Akubunyung - Zwat Swag - Zwat Mangjuwang - Zwat Swag-Ma-Suyang - - - - - - - Lad - Tan - Tal - Lar - Lam - Jum - Asa - - - Ladi - Tanii - Talata - Larba - Lamit - Juma - Asabat - - - - - - Gabanin Miladi - Miladi - - - GM - M - - - - - - EEEE, y MMMM dd - yMMMMEEEEdd - - - - - y MMMM d - - - - - y MMM d - - - - - yy/MM/dd - yyMMdd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - - - - Nera - ₦ - - - - diff --git a/make/data/cldr/common/main/kcg_NG.xml b/make/data/cldr/common/main/kcg_NG.xml deleted file mode 100644 index cef7b4950b8f..000000000000 --- a/make/data/cldr/common/main/kcg_NG.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/kea.xml b/make/data/cldr/common/main/kea.xml index 0bcb15fa2c83..7b1d7091640a 100644 --- a/make/data/cldr/common/main/kea.xml +++ b/make/data/cldr/common/main/kea.xml @@ -621,6 +621,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Órdi padron di Unicode Piskiza di uzu jeral Órdi padron + Sistema di 12 ora + Sistema di 24 ora Sistema di 12 ora (0–11) Sistema di 12 ora (1–12) Sistema di 24 ora (0–23) @@ -1095,6 +1097,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic w'º' 'simana' 'di' Y + + {0} – {1} + {0} – {1} + {0} – {1} + h – h B @@ -1623,11 +1630,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Santu Dumingu - - - Ora di Veron Britániku - - Granada @@ -1637,11 +1639,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guatimala - - - Ora Padron di Irlanda - - Jamaika @@ -1804,6 +1801,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora di Veron di Austrália Osidental + + + Ora di Veron Britániku + + Ora di Kabu Verdi @@ -1870,6 +1872,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora di Veron di Avaí i Aleutas + + + Ora Padron di Irlanda + + Ora di Pasífiku Mexikanu diff --git a/make/data/cldr/common/main/kek.xml b/make/data/cldr/common/main/kek.xml index 8735406bdf7e..d74a0058b0f9 100644 --- a/make/data/cldr/common/main/kek.xml +++ b/make/data/cldr/common/main/kek.xml @@ -12,24 +12,298 @@ CLDR data files are interpreted according to the LDML specification (http://unic + Afrikaans ► af + Akan ► ak + Qʼanischiʼ + Qʼanischiʼ (AU) + Qʼanischiʼ (CA) + Qʼanischiʼ (GB) + Qʼanischiʼ (US) + Kaxlanchiʼ + Kaxlanchiʼ (Qachʼochʼil) Qʼeqchiʼ + Albanian ► sq + + + + Ruchichʼochʼ + Afrika + Xchʼochʼil li Xnim Uqʼ li Saqʼe + Xchʼochʼil saʼ Xtzʼe Uqʼ li Saqʼe + Palaw Chʼochʼ + Rokebʼaal li Saqʼe re Afika + Qachʼochil Laaʼo + Relebʼaal li Saqʼe re Afrika + Xmin Uqʼ li Saqʼe re Afrika + Xyi Xchʼochʼil Afika + Xtzʼe Uqʼ li Saqʼe re Afrika + Qachʼochʼil + Xchʼochil saʼ Xyi li Palaw Karibʼeʼ + Relebʼaal li Saqʼe re Asia + Xtzʼe Uqʼ li Saqʼe re Asia + Xtzʼe Relebʼaal li Saqʼe re Asia + Xtzʼe Uqʼ li Saqʼe re Europa + Ninki Chʼochʼ Sa Xyi li Tuulanil Palaw + Kokʼ Xchʼochʼil li Tuulanil Palaw Saʼ Xtzʼe Uqʼ l Saqʼe + Kokʼ Xchʼochʼil li Tuulanil Palaw + Xchʼochʼil Laj Polynesia + Asia + Xyi Xchʼochʼil Asia + Rokebʼaal li Saqʼe re Asia + Europa + Relebʼaal li Saqʼe re Europa + Xmin Uqʼ li Saqʼe re Europa + Rokebʼaal li Saqʼe re Europa + Raxi Chʼochʼil re Afrika + Xyi Xchʼochʼil laj Kaxlanchiʼ + Bʼermuta + Bʼelise + Kanataʼ + Kosta Rika + Molam Europeo + Xnaʼaj Europa + Raxchʼochʼ + Iximchʼochʼ + Honduras + Mexiko + Nikarawa + Panamaʼ + St. Pierre rikʼin Miquelon + Najtil Palaw Chʼochʼ + El Salvador Molam Rehebʼ Ninqi Tenamit + Junajunbʼilebʼ Estaad + JJEE + Akʼi Aksents + Akʼi Bʼidi Ebʼ li Naʼajej Moko Nawbʼilebʼ Ta + + Ajlebʼaal Kutan Krekorio + Krekorio + Ajlebʼaal Kutan Krekorio (ISO 8601 Xamaan) + Krekorio + Kʼulubʼanbʼil Xtusulal + Li Kʼulubʼanbʼil + Kaxlan Ajl + + + Meetriko + RU + JJEE + + + Language: {0} + Script: {0} + Region: {0} + - [a {aa} {bʼ} c {ch} {ch’} e {ee} h i {ii} j k {k’} l m n o {oo} p q {q’} r s t {t’} {tz} {tz’} u {uu} w x y] - [d f g v z] + [a {aa} {bʼ} {ch} {ch’} e {ee} h i {ii} j k {k’} l m n o {oo} p q {q’} r s t {t’} {tz} {tz’} u {uu} w x y] + [áä c d éë f g íï ñ óö úü v z] + [— .] [\- ‑ , ; \: ! ? . … ’ “” ( ) \[ \] \{ \} /] + + + + + d, EEEE, MMMM, y G + + + + + d, MMMM, y G + + + + + d, MMM, y G + + + + + dd/MM/Y G + + + + + + / + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + {0} {1} + + + + + {0}, {1} + + + {0} {1} + + + {0}, {1} + + + + y G + MM-y G + dd-MM-y G + E dd-MM-y G + MMM y G + d, MMM, y G + E, d MMM y G + dd-MM + E, dd-MM + d MMM + E, d MMM + d MMMM + y G + y G + MM-y G + dd/MM/y G + E, dd-MM-y G + MMM y G + d MMM y G + E, d MMM y G + MMMM y G + QQQQ y G + QQQQ y G + + + + y G – y G + y–y G + + + MM-y G – MM-y G + MM-y – MM-y G + MM-y – MM-y G + + + dd-MM-y – dd-MM-y G + dd-MM-y G – dd-MM-y G + dd-MM-y – dd-MM-y G + dd-MM-y – dd-MM-y G + + + e, dd-MM-y - E, dd-MM-y G + e, dd-MM-y G - E, dd-MM-y G + E, dd-MM-y – E, dd-MM-y G + E, dd-MM-y – E, dd-MM-y G + + + MMM y G – MMM y G + MMM–MMM y G + MMM y – MMM y G + + + d–d MMM y G + d MMM y G – d MMM y G + d MMM y – d MMM y G + d MMM y – d MMM y G + + + E, d MMM – E, d MMM y G + E,d MMM y G – E, d MMM y G + E, dMMM – E, d MMM y G + E, d MMM y – E, d MMM y G + + + dd-MM – dd-MM + dd-MM – dd MM + + + E, dd MM – E, d MM + E, dd MM – E, d MM + + + d–d MMM + d MMM – d MMM + + + e, d MMM - E,d MMM + E, d MMM – E, d MMM + + + d–d MMMM + d MMMM – d MMMM + + + y–y G + + + MM-y – MM-y G + MM-y – MM-y G + + + dd-MM-y – dd-MM-y G + dd-MM-y – dd-MM-y G + dd-MM-y – dd-MM-y G + + + E, dd-MM-y – E, dd-MM-y G + E, dd-MM-y – E,dd-MM-y G + E, dd-MM-y – E, dd-MM-y G + + + MMM–MMM y G + MMM y _ MMM y G + + + d–d MMM y G + d MMM – d MMM y G + d MMM y – d MMM y G + + + E, d MMM y – E,d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G + + + MMMM – MMMM y G + MMMM y – MMMM y G + + + + + + Bʼ + K + O + KAA + Oʼ + WQ + WU + WQ + BʼE + LA + JU + KBʼ + Xbʼeen Po Xkabʼ Po @@ -45,34 +319,1292 @@ CLDR data files are interpreted according to the LDML specification (http://unic Xkabʼlaj Po + + + Bʼ + K + O + KAA + Oʼ + WA + WU + WQ + BʼE + LA + JU + KBʼ + + + + XBʼ + LU + MA + MR + ROʼ + XWA + XWU + + + D + L + MA + MR + J + V + S + + + XBʼ + XK + RO + KA + ROʼ + XWA + XWU + + + Doʼkutan + Luʼkutan + Markutan + Merkutan + JueʼKutan + Vierkutan + Sabʼkutan + + + + + XBʼ + XK + RO + XKA + ROʼ + XWA + XWU + + + D + L + MA + MR + J + V + S + + + XBʼ + KK + RO + KA + ROʼ + XWA + XWU + Doʼkutan - LuʼKutan - MarʼKutan - MerʼKutan + Luʼkutan + Markutan + Merkutan JueʼKutan - VierʼKutan - SabʼKutan + Vierkutan + Sabʼkutan + + + + R1 + R2 + R3 + R4 + + + Xbʼeen Raqalil li Chihabʼ + Xkabʼ Raqalil li Chihabʼ + Rox Raqalil li Chihabʼ + Xkaa Raqalil li Chihabʼ + + + + + R1 + R2 + R3 + R4 + + + Xbʼeen Raqalil li Chihabʼ + Xkabʼ Raqalil li Chihabʼ + Rox Raqalil li Chihabʼ + Xkaa Raqalil li Chihabʼ + + + + + EQʼ + EW + + + Eʼ + E + + + EQʼ + EW + + + + + EQʼ + EW + + + EQʼ + EW + - Eqʼela - Ewu + EQʼ + EW + + + Majiʼ Kiyoʼla li Qaawaʼ Jesus + Najter Qʼe Kutan + Chirix li xYoʼlajik li Qaawaʼ Jesus + Qakutanil + + + MYQ + NQK + YQJ + QK + + + MYQ + NQK + YQJ + QK + + + + + + EEEE, d, MMMM, y + + + + + d, MMMM, y + + + + + d, MMM, y + + + + + d/M/yy + + + + + + + HH:mm:ss zzzz + + + + + HH:mm:ss z + + + + + HH:mm:ss + + + + + HH:mm + + + + + / + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + - dd-MM-y + h B E + h:mm B E + h:mm:ss B E + E, d + h a E + h:mm a E + y G + M/y G + d/M/y G + E, d/M/y G + MMM y G + d, MMM, y G + E, d, MMM, y G + MMMM y G + d MMMM y G + E, d MMMM y G + dd-MM + E, d/M + d MMM + d MMM, E + d MMMM + E, d MMMM + W 'xamaan' 're' MMMM + MM-y + d/M/y + E, d/M/y + MMM-y + d, MMM, y + E, d, MMM, y + MMM y + d MMMM y + E, d MMMM y + QQQ y + QQQQ y + w 'xamaan' 're' Y + + {1} – {0} + + y G – y G + y – y G + + + MM-y G – MM-y G + MM-y G – MM-y G + MM-y G – MM-y G + + + d-MM-y – d-MM-y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G + + + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + + + MMM y G – MMM y G + MMM – MMM y G + MMM y – MMM y G + + + d MMM – d, y G + d MMM, y G – d MMM, y G + d MMM – d MMM, y G + d MMM, y – d MMM, y G + + + E, d MMM – E, d MMM, y G + E, d MMM, y G – E, d MMM, y G + E, d MMM – E, d MMM, y G + E, d MMM, y – E, d MMM, y G + + + d/M – d/M + d/M – d/M + + + E, d/M – E, d/M + E, d/M – E, d/M + + + d–d MMM + d MMM – d MMM + + + E, d MMM – E, d MMM + E, d MMM – E, d MMM + + + d–d MMMM + d MMMM – d MMMM + + + MM-y – MM-y + M/y – M/y + + + d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y + + + E, d/M/y – E, d/M/y + E, d/M/y – E, d/M/y + E, d/M/y – E, d/M/y + + + MMM – MMM y + MMM y – MMM y + + + d – d MMM, y + d MMM – d MMM, y + d MMM, y – d MMM, y + + + E, d MMM – E, d MMM, y + E, d MMM – E, d MMM, y + E, d MMM, y – E, d MMM, y + + + MMMM – MMMM y + MMMM y – MMMM y + + + + + xqʼehil + + + xqʼehil + + + xqʼehil + + + chihabʼ + Junhabʼer + li chihabʼ aʼin + li chihabʼ chal re + + saʼ {0} chihabʼ + + + {0} chihabʼ chaq + + + + ch. + jun ch chaq + li ch aʼin + li ch chal re + + saʼ {0} ch + + + {0} ch chaq + + + + ch + jun hbʼ + li habʼ aʼin + li habʼ chal re + + saʼ {0} habʼ + + + {0} habʼ chaq + + + + raqal + jun xraqalil li chihabʼ chaq + xraqalil li chihabʼ aʼin + xraqalil li chihabʼ chal re + + saʼ {0} xraqalil li chihabʼ + + + {0} xraqalil li chihabʼ chaq + + + + rq. + + saʼ {0} RCH + + + {0} RCH + + + + rq + + saʼ {0} rch + + + {0} rch + + + + po + jun po chaq + li po aʼin + li po chal re + + saʼ {0} po + + + li {0} po chaq + + + + po. + po xnumeʼ + po aʼin + po chal re + + saʼ li {0} po + + + {0} po chaq + + + + p + li p. xnumeʼ + li p. aʼin + li p. chal re + + saʼ {0} p. + + + {0} p. chaq + + + + xamaan + Jun xamaan chaq + li xamaan aʼin + li xamaan chal re + + saʼ {0} xamaan + + + {0} xamaan chaq + + Li xamaan re {0} + + + xm. + Jun XN chaq + li XN aʼin + li XN chal re + + saʼ {0} XN + + + {0} XN chaq + + li {0} XN re + + + xm + Jun X chaq + li X aʼin + li X chal re + + saʼ {0} X + + + {0} X chaq + + li {0} X re + + + xamaan re po + + + xm. re po. + + + xm re po + + + kutan + ewer + anaqwan + hulaj + + saʼ {0} kutan + + + {0} kutan chaq + + + + kutan + ewer + li kutan aʼin + hulaj + + saʼ {0} k + + + {0} k chaq + + + + kutan + ewer + anaqwan + hulaj + + saʼ {0} k + + + {0} k chaq + + + + kutan re chihabʼ + + + kutan re ch. + + + kutan re ch. + + + kutan re xamaan + + + kutan re xm. + + + kutan re xm. + + + xkutanil kʼanjel re li po + + + kkʼ. re po. + + + kkʼ re po. + + + Doʼkutan xnumeʼ + Doʼkutan chal re + Doʼkutan chal re + + saʼ {0} Doʼkutan + + + {0} Doʼkutan chaq + + + + DK xnumeʼ + DK aʼin + DK chal re + + saʼ {0} DK + + + {0} DK chaq + + + + D xnumeʼ + D aʼin + D chal re + + saʼ {0} D + + + {0} D chaq + + + + Luʼkutan xnumeʼ + Luʼkutan aʼin + Luʼkutan chal re + + saʼ {0} Luʼkutan + + + {0} Luʼkutan chaq + + + + LK xnumeʼ + LK aʼin + LK chal re + + saʼ {0} LK + + + {0} LK + + + + L xnumeʼ + L aʼin + L chal re + + saʼ {0} L + + + {0} L chaq + + + + Markutan xnumeʼ + Markutan aʼin + Markutan chal re + + saʼ {0} Markutan + + + {0} Markutan + + + + MK xnumeʼ + MK aʼin + MK chal re + + saʼ {0} MK + + + {0} MK chaq + + + + M xnumeʼ + M aʼin + M chal re + + saʼ {0} M + + + {0} M chaq + + + + Merkutan xnumeʼ + Merkutan aʼin + Merkutan chal re + + saʼ {0} Merkutan + + + {0} Merkutan chaq + + + + MRK xnumeʼ + MRK aʼin + MRK chal re + + saʼ {0} MRK + + + {0} MRK chaq + + + + MR xnumeʼ + MR aʼin + MR chal re + + saʼ {0} MR + + + {0} MR chaq + + + + Jueʼkutan xnumeʼ + Jueʼkutan aʼin + Jueʼkutan chal re + + saʼ {0} Jueʼkutan + + + {0} Jueʼkutan chaq + + + + JK xnumeʼ + JK aʼin + JK chal re + + saʼ {0} JK + + + {0} JK chaq + + + + J xnumeʼ + J aʼin + J chal re + + saʼ {0} J + + + {0} J chaq + + + + Vierkutan xnumeʼ + Vierkutan aʼin + Vierkutan chal re + + saʼ {0} Vierkutan + + + {0} Vierkutan chaq + + + + VK xnumeʼ + VK aʼin + VK chal re + + saʼ {0} VK + + + {0} VK chaq + + + + V xnumeʼ + V aʼin + V chal re + + saʼ {0} V + + + {0} V chaq + + + + Sabʼkutan xnumeʼ + Sabʼkutan aʼin + Sabʼkutan chal re + + saʼ {0} Sabʼkutan + + + {0} Sabʼkutan chaq + + + + SK xnumeʼ + SK aʼin + SK chal re + + saʼ {0} SK + + + {0} SK chaq + + + + S xnumeʼ + S aʼin + S chal re + + saʼ {0} S + + + {0} S chaq + + + + E/EW + + + E/EW + + + E/EW + + + hoor + li honal aʼin + + saʼ {0} hoor + + + {0} hoor chaq + + + + hr. + li honal aʼin + + saʼ {0} h + + + {0} h chaq + + + + hr + saʼ li honal aʼin + + saʼ {0} h + + + {0} h chaq + + + + kʼasal + saʼ li kʼasal aʼin + + saʼ {0} kʼasal + + + {0} kʼasal chaq + + + + kʼas. + saʼ li kʼasal aʼin + + saʼ {0} kʼ + + + {0} kʼ chaq + + + + kʼas + saʼ li kʼasal aʼin + + saʼ {0} kʼ + + + {0} kʼ chaq + + + + kokʼ kʼas + anaqwan anaqwan + + saʼ {0} kokʼ kʼasal + + + {0} kokʼ kʼasal chaq + + + + kkʼ. + anaqw + + saʼ {0} kkʼ + + + {0} kkʼ chaq + + + + kkʼ + anaqw + + saʼ {0} kkʼ + + + {0} kkʼ chaq + + + + xnaʼaj hoonal + + + naʼajej + + + naʼajej + + + + {0} Xhoonal + {0} Xhoonal Saqʼe + {0} Li Hoonal + + + Xhoonal li Komonil Ruchichʼochʼ + + + + + Xhoonal Greenwich + + + + + + + + 0 mil + 00 mil + 000 mil + 0 millones + 00 millones + 000 millones + 0 mil de millones + 00 mil de millones + 000 mil de millones + 0 trillones + 00 trillones + 000 trillones + + + + + 0M + 00M + 000M + 0MM + 00MM + 000MM + 0M'.'M'.' + 00M'.'M'.' + 000M'.'M'.' + + + + + + + ¤ 0M + ¤ 00M + ¤ 000M + ¤ 0MM + ¤ 00MM + ¤ 000MM + ¤0 M'.'M'.' + ¤00 M'.'M'.' + ¤000 M'.'M'.' + + + + + + GAN + GAN + GAN + + + GAW + GAW + GAW + + + DBB + DBB + DBB + + + DBM + DBM + DBM + + + DBS + DBS + DBS + + + DBZ + DBZ + DBZ + + + DCA + DCA + $CA + + + Xtuminal Kosta Rika + Xtuminal Kosta Rica + + + Xtuminal Kubʼa + Xtuminal Kubʼa + + + PCU + PCU + PCU + + + PDO + PDO + PDO + + + GTQQ + QGT + + + LHN + LHN + LHN + + + GHT + GHT + GHT + + + DJM + DJM + DJM + + + DKY + DKY + DKY + + + PMX + PMX + $MX + + + CNI + CNI + CNI + $C + + + BPA + BPA + BPA + + + DTT + DTT + DTT + + + DEEUU + DEEUU + $ + + + DXC + DXC + $EC + + + GXC + GXC + gC. + + + + + + + lajeeʼhabʼ + {0} lajee'hab' + + + chihabʼebʼ + {0} chihab'eb' + {0} sut chi chihabʼ + + + rch + {0}/chb' + {0}/rch + + + pohebʼ + {0} sut chi po + + + kutanebʼ + {0} kutaneb' + {0} sut chi kutan + + + hoorebʼ + {0} /hb' + {0} sut chi hoor + + + kʼasalebʼ + {0} k'asaleb' + {0}/ sut chi kʼasal + + + kokʼ kʼasalebʼ + {0} kok' k'asaleb' + {0} sut chi kokʼ kʼasal + + + qʼoqyin + {0} q'oqyineb' + {0} sut chi qʼoqyin + + + Xchʼool li ruchichʼochʼ + {0} relebʼaal li saqʼe + {0} xnim uqʼ li saqʼe + {0} Xtzʼe uqʼ li saqʼe + {0} rokebʼaal li saqʼe + + + + + lajeeʼ + {0} lajee' + + + chihabʼebʼ + {0} chb' + {0}/ch + + + rch + {0} chb'eb' + {0}/chbʼ + + + pohebʼ + + + kutanebʼ + {0} kutaneb' + {0}/kutan + + + hoorebʼ + {0} hr + + + kʼasalbʼ + {0} k'aslb' + {0}/kʼas + + + kkʼsbʼ + {0} kk'sb' + {0}/kkʼs + + + qʼoqyinebʼ + {0} q'oqyineb' + {0}/qʼoqyin + + + chʼool naʼajej + {0} ES + {0} NU + {0} Tzʼ + {0} OS + + + + + lajeeʼ + {0} lajee' + + + ch + {0} ch + {0}/ch + + + rch + {0} chb' + {0}/ch + + + po + + + kutan + {0}k + {0}/kutan + + + hoor + {0}h + + + kʼasal + {0} k' + {0}/kʼas + + + kkʼs + {0} kk'sb' + {0}/kkʼs + + + qʼoqyinebʼ + {0}q'oqyineb' + {0}/qʼoqyin + + + chʼool naʼajej + {0} ES + {0} NU + {0} Tzʼ + {0} OS + + + + + + {0}, ut {1} + {0} ut {1} + + + {0}, maraj {1} + {0} maraj {1} + + + + + jokan:j + inkʼaʼ:i + + diff --git a/make/data/cldr/common/main/ken.xml b/make/data/cldr/common/main/ken.xml deleted file mode 100644 index 3cfa734473b3..000000000000 --- a/make/data/cldr/common/main/ken.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - Kɛnyaŋ - - - - [aáàǎ b c d eéèě ɛ{ɛ́}{ɛ̀}{ɛ̌} f g {gb} {gh} h i ɨ{ɨ́}{ɨ̀}{ɨ̌} j k {kp} m n {ny} ŋ oóòǒ ɔ{ɔ́}{ɔ̀}{ɔ̌} p r s t uúùǔ ʉ{ʉ́}{ʉ̀}{ʉ̌} w y] - [l q v x z] - [A bB C D E Ɛ F G h I Ɨ J K M N Ŋ O Ɔ pP R S T U Ʉ W yY] - [\- ‑ , ; \: ! ? . ‘’ “”] - - diff --git a/make/data/cldr/common/main/ken_CM.xml b/make/data/cldr/common/main/ken_CM.xml deleted file mode 100644 index 7aa16a55b0ed..000000000000 --- a/make/data/cldr/common/main/ken_CM.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/kgp.xml b/make/data/cldr/common/main/kgp.xml index a127ac97b4c0..593a704b8620 100644 --- a/make/data/cldr/common/main/kgp.xml +++ b/make/data/cldr/common/main/kgp.xml @@ -1114,6 +1114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tãpér kar Tãpér kuju Nĩkrer + 12 óra tuke + 24 óra tuke 12 óra tuke (0–11) 12 óra tuke (1–12) 24 óra tuke (0–23) @@ -1744,6 +1746,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'simỹnỹ' w, Y + + {0} – {1} + {0} – {1} + {0} – {1} + h B – h B h – h B @@ -2715,9 +2722,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rimreviri - - Óra Mritỹnĩku Rỹ Kã - Rãnere @@ -2802,9 +2806,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jaiapura - - Óra Pã Irỹna - Numrin @@ -3529,13 +3530,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Aranhka tá - - - Armaty tá óra - Óra Pã Armaty tá - Rỹ Kã óra Armaty tá - - Amỹjonỹ tá óra @@ -3590,20 +3584,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Apija tá - - - Óra Agtav tá - Óra Pã Agtav tá - Rỹ Kã óra Agtav tá - - - - - Óra Agtóme tá - Óra Pã Agtóme tá - Rỹ Kã óra Agtóme tá - - Óra Aramija tá @@ -3710,6 +3690,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ BRST + + + Óra Mritỹnĩku Rỹ Kã + + Óra Mrunẽj Narusarỹ tá @@ -3897,11 +3882,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Groẽrỹnija Rãpur tá - - - Óra Pã Guvỹm tá - - Óra Gorfu tá @@ -3975,6 +3955,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Irỹ tá + + + Óra Pã Irỹna + + Óra Irkutinhki tá @@ -4037,11 +4022,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Óra Kirginhtỹv tá - - - Óra Rỹnka tá - - Óra Vãfe Goj-vẽso tỹ tá @@ -4054,13 +4034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Rórni Hove tá - - - Óra Mỹkav tá - Óra Pã Mỹkav tá - Rỹ kã óra Mỹkav tá - - Óra Mỹganan tá @@ -4176,11 +4149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rỹ Kã óra Fernỹnu Nãrãja-tá tá - - - Óra Nãrti-Mỹrijỹnỹ Goj-vẽso tá - - Óra Simirsiki Tãg tá @@ -4260,13 +4228,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Óra Piãgiỹng tá - - - Óra Kysyrorna tá - Óra Pã Kysyrorna tá - Rỹ Kã óra Kysyrorna tá - - Óra Hujáv tá @@ -4293,9 +4254,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Óra Samãva tá Óra Pã Samãva tá - Rỹ Kã óra Samãva tá @@ -4481,29 +4440,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 0 mil 0 mil - 00 mil 00 mil - 000 mil 000 mil - 0 mi 0 mi - 00 mi 00 mi - 000 mi 000 mi - 0 bi 0 bi - 00 bi 00 bi - 000 bi 000 bi - 0 tri 0 tri - 00 tri 00 tri - 000 tri 000 tri @@ -4861,11 +4808,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sĩnỹ Yuãn (offshore) Sĩnỹ Yuãn ag (offshore) - - Nórar vẽnhkar mỹ máko mĩ Sĩnỹ tá - Nórar vẽnhkar mỹ máko mĩ Sĩnỹ tá - Nórar vẽnhkar mỹ máko mĩ Sĩnỹ tá ag - Sĩnỹ Yvỹn Sĩnỹ Yvỹn diff --git a/make/data/cldr/common/main/ki.xml b/make/data/cldr/common/main/ki.xml index 3a23222cabf9..d1a614fbf760 100644 --- a/make/data/cldr/common/main/ki.xml +++ b/make/data/cldr/common/main/ki.xml @@ -21,19 +21,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kichecki Kĩnjeremani Kigiriki - Gĩthungũ + Gĩthũngũ Kihispania Kiajemi Kĩbaranja Kihausa Kĩhĩndĩ + Kĩhĩndĩ (Kĩratini) + Kĩhĩndĩ (Gĩthũngũ) Kihungari Kiindonesia Kiigbo Kĩtaliano Kĩnjabani Kijava - Gikuyu + Gĩgĩkũyũ Kikambodia Kikorea Kimalesia @@ -58,6 +60,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kĩcaina Kizulu + + + + Andora Falme za Kiarabu @@ -288,6 +294,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic [a b c d e g h iĩ j k m n o r t uũ w y] [f l p q s v x z] [A B C D E G H I J K M N O R T U W Y] + [{ NBHY } \- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9] + [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] @ * / \& # † ‡ ′ ″] @@ -336,35 +344,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic - JEN - WKR - WGT - WKN - WTN - WTD - WMJ - WNN - WKD - WIK - WMW - DIT + MGA + MGE + KH + MŨTH + MGNJ + GATH + GATHN + MWNY + MŨGK + MWTH + KNY + GAT - Njenuarĩ - Mwere wa kerĩ - Mwere wa gatatũ - Mwere wa kana - Mwere wa gatano - Mwere wa gatandatũ - Mwere wa mũgwanja - Mwere wa kanana - Mwere wa kenda - Mwere wa ikũmi - Mwere wa ikũmi na ũmwe - Ndithemba + Mũgaa + Mũgetho + Kĩhu + Mũthatũ + Mũgiranjara + Gathathanwa + Gathano + Mworia Nyoni + Mũgaa wa Kerĩ + Mwania Thenge + Kanyua Hũngũ + Gatumu + + MGA + MGE + KH + MŨTH + MGNJ + GATH + GATHN + MWNY + MŨGK + MWTH + KNY + GAT + J K @@ -379,30 +401,71 @@ CLDR data files are interpreted according to the LDML specification (http://unic I D + + Mũgaa + Mũgetho + Kĩhu + Mũthatũ + Mũgĩranjara + Gathathanwa + Gathano + Mworia Nyoni + Mũgaa wa Kerĩ + Mwania Thenge + Kanyua Hũngũ + Gatumu + KMA - NTT - NMN - NMT - ART - NMA - NMM + MWA + WAĨ + WETŨ + WEN + WETO + NJU + + + K + MW + WA + WTŨ + WN + WTO + MŨT + + + KMA + MWA + WAĨ + WETŨ + WEN + WETO + NJU Kiumia - Njumatatũ - Njumaine - Njumatana - Aramithi - Njumaa - Njumamothi + Mwambĩrĩrio + Waĩrĩ + Wetatũ + Wena + Wetano + Njuuma + + KMA + MWA + WAĨ + WETŨ + WEN + WETO + MŨT + K N @@ -412,6 +475,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic N N + + KMA + MWA + WAĨ + WETŨ + WEN + WETO + MŨT + + + Kiumia + Mwambĩrĩrio + Waĩrĩ + Wetatũ + Wena + Wetano + Njuuma + @@ -436,12 +517,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kiroko Hwaĩ-inĩ + + Kĩroko + Hwaĩ-inĩ + + + Kĩroko + Hwaĩ-inĩ + + + + + Kĩroko + Hwaĩ-inĩ + + + Kĩroko + Hwaĩ-inĩ + + + Kĩroko + Hwaĩ-inĩ + - Mbere ya Kristo - Thutha wa Kristo + Mbere ya Kristũ + Thutha wa Kristũ MK @@ -495,18 +598,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm a + h:mm:ss a + h:mm:ss a v + HH:mm:ss v M/d E, M/d E, MMM d E, MMMM d M/y + dd-MM-y E, M/d/y MMM y + dd-MM-YYYY E, MMM d, y MMMM y + dd-MM-YYYY + dd-MM-YYYY E QQQ y QQQQ y + + + MMMM ‑ MMMM y + + @@ -516,12 +631,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic Mwaka + mwaka mũhĩtũku + mwaka ũyũ + mwaka ũroka + + + mwaka mũhĩtũku + mwaka ũyũ + mwaka ũroka + + + mwaka mũhĩtũku + mwaka ũyũ + mwaka ũroka Mweri + mweri mũhĩtũku + mweri ũyũ + mweri mũku + + + mweri mũhĩtũku + mweri ũyũ + mweri mũku + + + mweri mũhĩtũku + mweri ũyũ + mweri mũku - Kiumia + kiumia + kiumia kĩhĩtũku + kiumia tũrĩ + kiumia kĩroka + kiumia kĩa {0} + + + kiumia kĩhĩtũku + kiumia tũrĩ + kiumia kĩroka + kiumia kĩa {0} + + + kiumia hĩtũku + kiumia ĩno + kiumia njũku + kiumia kĩa {0} Mũthenya @@ -532,6 +689,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Mũthenya kiumia-inĩ + + Kiumia gĩthiru + Kiumia gĩkĩ + Kiumia gĩũku + + + Kiumia gĩthiru + Kiumia gĩkĩ + Kiumia gĩũku + + + Kiumia gĩthiru + Kiumia gĩkĩ + Kiumia gĩũku + Ithaa @@ -539,12 +711,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ndagĩka - Sekunde + ica Mũcooro wa mathaa + + + + Mũbango wa Ithaa rĩa Thĩ + + + MIT + + + + + Mathaa ma Abirika ya Gatagatĩ + + + + + Mathaa ma Abirika ya Irathĩro + + + + + Mathaa ma Abirika ya Mũhuro + + + + + Mathaa ma Abirika ya Ithũĩro + + + + + + GMT + + + diff --git a/make/data/cldr/common/main/kk.xml b/make/data/cldr/common/main/kk.xml index 0a548df3ed04..85dc63edead8 100644 --- a/make/data/cldr/common/main/kk.xml +++ b/make/data/cldr/common/main/kk.xml @@ -347,7 +347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пали тілі пиджин тілі поляк тілі - пьемонт тілі + пьемонт тілі малесит-пассамакводди тілі пруссия тілі пушту тілі @@ -549,9 +549,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + @@ -671,7 +671,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1107,15 +1107,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Күнтізбе Валюта форматы + Таңбаларды елемей сұрыптау + Диакритикалық таңбаларды кері сұрыптау + Бас пен кіші әріптердің реті + Регистрді ескеріп сұрыптау Сұрыптау реті + Бірыңғайланған сұрыптау + Сандық сұрыптау + Жазу жүйелерінің/блоктардың ретін өзгерту + Сұрыптау дәлдігі Валюта + Түрлендіру мақсаты + Сөздік бойынша бөлудің ерекше жағдайлары Эмоджи көрсетілімі + Аптаның бірінші күні + Аралас Уақыт форматы (12 не 24) + Енгізу әдісі + Пернетақта + Ең жоғары елемеу деңгейі Жолды тасымалдау стилі Сөздердегі жол бөліністері + Түрлендіру ережелері Өлшемдер жүйесі + Өлшем бірлігі Сандар + Қосымша деректер аймағы + Дереккөзді түрлендіру + Аймақтың ішкі бөлігі Қысқарған сөзден кейінгі сөйлем бөлінісі + Түрлендіру + Машиналық әдіспен аударылған + Уақыт белдеуі + Тіл нұсқасы + Жеке пайдалану + Жеке пайдалану үшін түрлендіру Будда күнтізбесі @@ -1130,20 +1156,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Эфиопия Эфиопияның Амете-Алем күнтізбесі Эфиопияның Амете-Алем - Грегориандық күнтізбе - Грегориан + Григориан күнтізбесі + Григориан Көне еврей күнтізбесі Көне еврей Үндістанның ұлттық күнтізбесі + Үнді күнтізбесі Ислам күнтізбесі Ислам Ислам күнтізбесі (кестелік, азаматтық дәуір) Ислам (кестелік, азаматтық дәуір) Ислам күнтізбесі (Сауд Арабиясы, жаңа ай) + Ислам, Сауд Арабиясында айды бақылау бойынша Ислам күнтізбесі (кестелік, астрономиялық дәуір) + Ислам (кестелік, астрономиялық дәуір) Ислам күнтізбесі (Умм аль-Кура) Ислам (Умм аль-Кура) ISO-8601 күнтізбесі + Григориан Жапон күнтізбесі Жапон Парсы күнтізбесі @@ -1154,27 +1184,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Есептік Стандартты валюта форматы Стандартты + Кіші әріптер + Кіші әріптер + Бас әріптер Сәйкестікке арналған алдыңғы сұрыптау реті + Үйлесімділік Сөздік бойынша сұрыптау реті + Сөздік Әдепкі уникод сұрыптау реті Әдепкі уникод Эмоджи сұрыптау реті + Эмоджи Еуропалық реттеу ережелері + Еуропалық ережелер Телефон кітапшасының сұрыптау реті + Телефон кітапшасы + Фонетикалық Пиньинь сұрыптау реті + Пиньинь Қайта қарастырылған сұрыптау реті Жалпы мақсаттағы іздеу Іздеу Корей тілінің бастапқы дауыссызы бойынша іздеу + Басындағы дауыссыз дыбыстар бойынша (Корей) Стандартты сұрыптау реті Стандартты Иероглифтер сызықтарын сұрыптау реті + Сызық Дәстүрлі сұрыптау реті + Дәстүрлі Иероглифтер сызықтарын түбегейлі сұрыптау реті + Кілттер мен сызықтар Чжуинь сұрыптау реті + Чжуинь + Валюта + Цифрлар + Тыныс белгілері + Бос орын + Таңба + Барлығы + Тек негізгі әріптер + Негізгі әріптер, Акценттер, Регистр, Жазылу нұсқалары, Кана + Негізгі әріптер, Акценттер + Негізгі әріптер, Акценттер, Регистр, Жазылу нұсқалары + Толық енге + Жарты енге Әдепкі Эмоджи Мәтін + 12 сағаттық жүйе + 12 + 24 сағаттық жүйе + 24 12 сағаттық жүйе (0–11) 12 (0–11) 12 сағаттық жүйе (1–12) @@ -1183,6 +1244,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 сағаттық жүйе (1–24) 24 (1–24) + Бос орындарды, тыныс белгілерін, барлық таңбаны елемеу + Бос орындарды, тыныс белгілерін елемеу + Бос орындарды, тыныс белгілерін елемеу + Бос орындарды, тыныс белгілерін, валютадан басқа таңбаларды елемеу Жолды тасымалдаудың еркін стилі Еркін Жолды тасымалдаудың қалыпты стилі @@ -1193,6 +1258,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бәрін қалдыру Қалыпты Фразаларда қалдыру + BGN транслитерациясы (АҚШ) + GEGN транслитерациясы (БҰҰ) Метрлік жүйе Метрлік Британиялық өлшемдер жүйесі @@ -1202,8 +1269,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ахом цифрлары Үнді-араб сандары Үнді-араб сандарының кеңейтілген жүйесі + Үнді-араб кеңейтілген жүйесі Армян сандары Кіші әріппен берілген армян сандары + Кіші әріппен берілген армян сандары Балий цифрлары Бенгал сандары Брахми цифрлары @@ -1213,57 +1282,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Деванагари сандары Дивес акуру цифрлары Эфиопия сандары + Қаржылық Толық енді цифрлар + Толық енді Грузин сандары Гунджала гонди цифрлары Масарама гонди цифрлары Грек сандары Кіші әріппен берілген грек сандары + Кіші әріппен берілген грек сандары Гуджарати сандары Гурмукхи сандары + Дәстүрлі күнтізбелер үшін ай күндерін иероглиф арқылы нөмірлеу Қытай ондық сандары + Қытай иероглифтік сандарын пайдаланатын позициялық ондық есептеу жүйесі Жеңілдетілген қытай сандары Қаржы саласындағы жеңілдетілген қытай сандары + Қаржы саласындағы жеңілдетілген қытай Дәстүрлі қытай сандары Қаржы саласындағы дәстүрлі қытай сандары + Қаржы саласындағы дәстүрлі қытай Иврит сандары Пахау цифрлары Ньякенг пуачуэ хмонг цифрлары Ява цифрлары Жапон сандары Қаржы саласындағы жапон сандары + Қаржы саласындағы жапон + Дәуірдің алғашқы жылын Ганнэн деп көрсету Кайях ли цифрлары Кави цифрлары Кхмер сандары Каннада сандары Тай тхам хора цифрдары Тай тхам тхам цифрдары + Тай Тхам жазуы (шіркеу стилі) Лаос сандары Батыс сандары Лепча цифрлары Лимбу цифрлары Математикалық қалың қаріпті цифрлар + Математикалық қалың Математикалық қос сызықты цифрлар + Математикалық контурлы Ені бекітілген математикалық цифрлар + Математикалық моноенді Математикалық қалың қаріпті сансериф цифрлары + Математикалық ұсақталған қалың Математикалық сансериф цифрлары + Математикалық ұсақталған Малаялам сандары Моди цифрлары Моңғол цифрлары Мро цифрлары Мейтей-майек цифрлары Мьянма сандары + Шығыс по-карен (Мьянма) + Пао (Мьянма) Мьянма шан цифрлары + Шан (Мьянма) Мьянма тай лэнг цифрлары + Тай-лаинг (Мьянма) Наг мундари цифрлары + Ұлттық цифрлар + Ұлттық цифрлар Н’ко цифрлары Ол-чики цифрлары Ория сандары Исмания цифрлары + Контурлық Ханифи цифрлары Рим сандары + Үлкен әріппен берілген рим сандары Кіші әріппен берілген рим сандары + Кіші әріппен берілген рим сандары Саураштра цифрлары + Сегменттелген Шарада цифрлары Кхудабади цифрлары Сингала лит цифрлары @@ -1273,17 +1367,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Жаңа лы жазуының цифрлары Дәстүрлі тамил сандары Тамил сандары + Заманауи тамил сандары Телугу сандары Тай сандары Тибет сандары Тирхута цифрлары Тангса цифрлары + Дәстүрлі сандар Вай цифрлары Варанг сити цифрлары Ванчо цифрлары Өшіру Қосу + Нақты көрсетілмеген машиналық аударма + POSIX нұсқасы + + Өшіру + Қосу + Метрлік Ағылшын @@ -1450,7 +1552,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm a h:mm:ss a h a, v - HH v dd.MM dd.MM, E d MMM @@ -1469,6 +1570,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y 'ж'. QQQQ + + {0} – {1} + {0} - {1} h – h B @@ -1519,6 +1623,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d (E) – d (E) MMM d MMM, E – d MMM, E + + d – d MMMM + d MMMM – d MMMM + G y–y 'жж'. @@ -1765,6 +1873,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1802,6 +1913,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y 'ж'. MMM G y 'ж'. d MMM G y 'ж'. d MMM, E + G y 'ж'. MMMM + G y 'ж'. d MMMM + G y 'ж'. d MMMM, E h:mm a h:mm:ss a h:mm:ss a v @@ -1812,6 +1926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM d MMM, E d MMMM + d MMMM, E MMMM 'айының' W-'аптасы' MMMM 'айының' W-'аптасы' MM.y @@ -1821,6 +1936,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y 'ж'. d MMM y 'ж'. d MMM, E y 'ж'. MMMM + y 'ж'. d MMMM + y 'ж'. d MMMM, E y 'ж'. QQQ y 'ж'. QQQQ Y 'жылдың' w-'аптасы' @@ -1887,6 +2004,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM, E – d MMM, E d MMM, E – d MMM, E + + d–d MMMM + d MMMM – d MMMM + MM.y – MM.y MM.y – MM.y @@ -2046,8 +2167,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ жыл - былтырғы жыл - биылғы жыл + былтыр + биыл келесі жыл {0} жылдан кейін @@ -2060,6 +2181,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ж. + былтыр + биыл + келесі жыл {0} ж. кейін {0} ж. кейін @@ -2069,6 +2193,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ж. бұрын + + былтыр + биыл + келесі жыл + ширек өткен тоқсан @@ -3004,9 +3133,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либревиль - - Ұлыбритания жазғы уақыты - Лондон @@ -3097,9 +3223,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Джаяпура - - Ирландия стандартты уақыты - Дублин @@ -3795,6 +3918,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Хараре + + + Акри уақыты + Акри стандартты уақыты + Акри жазғы уақыты + + Ауғанстан уақыты @@ -3970,6 +4100,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бразилия жазғы уақыты + + + Ұлыбритания уақыты + Ұлыбритания жазғы уақыты + + Бруней-Даруссалам уақыты @@ -4148,6 +4284,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Гринвич уақыты + + + Гренландия уақыты + Гренландия стандартты уақыты + Гренландия жазғы уақыты + + Шығыс Гренландия уақыты @@ -4174,7 +4317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Гавай және Алеут аралдары стандартты уақыты + Гавай уақыты @@ -4235,6 +4378,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Иран жазғы уақыты + + + Ирландия уақыты + Ирландия стандартты уақыты + + Иркутск уақыты @@ -4256,6 +4405,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Жапония жазғы уақыты + + + Камчатка уақыты + Камчатка стандартты уақыты + Камчатка жазғы уақыты + + Қазақстан уақыты @@ -4518,11 +4674,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сахалин жазғы уақыты + + + Самара уақыты + Самара стандартты уақыты + Самара жазғы уақыты + + - Самоа уақыты Самоа стандартты уақыты - Самоа жазғы уақыты @@ -4589,6 +4750,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Трук уақыты + + + Түркия уақыты + Түркия стандартты уақыты + Түркия жазғы уақыты + + Түрікменстан уақыты @@ -4608,6 +4776,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Уругвай жазғы уақыты + + + Үрімжі уақыты + + Өзбекстан уақыты @@ -4758,10 +4931,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - #,##0.00 - @@ -5286,8 +5455,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Кариб гульдені - Кариб гульдені - Кариб гульдені Батыс Африканың КФА франкі @@ -5311,8 +5478,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Зимбабве алтыны - Зимбабве алтыны - Зимбабве алтыны @@ -5516,14 +5681,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} миллимоль/литр - бөлік {0} бөлік {0} бөлік миллиондағы бөлік - {0} б/млн - {0} б/млн {0} пайыз @@ -5538,7 +5700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} промириад - глюкоза {0} глюкоза {0} глюкоза @@ -6116,11 +6277,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} метрлік кесе {0} метрлік кесе - - метрлік сұйық унция - {0} метрлік сұйық унция - {0} метрлік сұйық унция - {0} бушель {0} бушель @@ -6223,18 +6379,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ зиверт - {0} Зв - {0} Зв - Гр {0} Гр {0} Гр килограмм-күш - {0} кг-күш - {0} кг-күш тесла @@ -7378,15 +7529,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ фут² - - бөлік - {0} бөлік - {0} бөлік - б/млн - {0} б/млн - {0} б/млн % @@ -7394,11 +7538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‰ - - глюкоза - {0} Глк - {0} Глк - л/км @@ -7470,11 +7609,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} унция {0} унция - - с. б. - {0} с. б. - {0} с. б. - дюйм с.б. @@ -7499,81 +7633,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}° {0}° - - метрлік сұйық унция - {0} метрлік сұйық унция - {0} метрлік сұйық унция - имп. сұй. унц. {0} имп. сұй. унц. {0} имп. сұй. унц. - - ср - {0} ср - {0} ср - - - кат - {0} кат - {0} кат - - - Кл - {0} Кл - {0} Кл - - - Ф - {0} Ф - {0} Ф - - - Г - {0} Г - {0} Г - - - Си - {0} Си - {0} Си - - - халықаралық калория - {0} халықаралық калория - {0} халықаралық калория - - - Бк - {0} Бк - {0} Бк - - - Зв - {0} Зв - {0} Зв - - - Гр - {0} Гр - {0} Гр - - - кг-күш - {0} кг-күш - {0} кг-күш - - - Тл - {0} Т - {0} Т - - - Вб - {0} Вб - {0} Вб - б/млрд diff --git a/make/data/cldr/common/main/kk_Arab.xml b/make/data/cldr/common/main/kk_Arab.xml index b035031f0abd..2b372c0046c4 100644 --- a/make/data/cldr/common/main/kk_Arab.xml +++ b/make/data/cldr/common/main/kk_Arab.xml @@ -990,15 +990,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic كۇنتىزبە اقشا ءپىشىمى + تاڭبالاردى ەلەمەي سۇراپتاۋ + كەرى ەكپىندى سۇرىپتاۋ + باس نە كىشى ارىپتەر بويىنشا سۇرىپتاۋ + باس پەن كىشى ءارىپتى ەسكەرىپ سۇرىپتاۋ سۇرىپتاۋ رەتى + قالىپتى سۇرىپتاۋ + ساندىق سۇرىپتاۋ + جازۋ جۇيەسى نە بلوك بويىنشا قايتا سۇرىپتاۋ + سۇرىپتاۋ تيىمدىلىگى اقشا + تۇرلەندىرۋ ورنى + سوزدىك ءبولۋ ەرەكشەلىكتەرى ەمودجي كورسەتىلىمى + اپتانىڭ ءبىرىنشى كۇنى + ارالاس ۋاقىت فورماتى (12 نە 24) + ەنگىزۋ ءادىسى + پەرنەتاقتا + ەلەنبەيتىن ەڭ جوعارعى دەڭگەي جولدى تاسىمالداۋ ءستيلى سوزدەردەگى جول بولىنىستەرى + تۇرلەندىرۋ ەرەجەسى ولشەمدەر جۇيەسى + ولشەم بىرلىگى ساندار + قوسىمشا دەرەكتەر ايماعى + تۇرلەندىرۋ كوزى + ايماقتىڭ اكىمشىلىك ءبولىنىسى قىسقارعان سوزدەن كەيىنگى سويلەم ءبولىنىسى + تۇرلەندىرۋ + اۆتوماتتى اۋدارما + ۋاقىت ايماعى + ءتىل نۇسقاسى + جەكە قولدانۋعا ارنالعان + جەكە قولدانۋعا ارنالعان تۇرلەندىرۋ بۋددا كۇنتىزبەسى @@ -1024,11 +1050,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic يسلام كۇنتىزبەسى (كەستەلىك، ازاماتتىق ءداۋىر) يسلام (كەستەلىك، ازاماتتىق ءداۋىر) يسلام كۇنتىزبەسى (ساۋد ارابياسى، جاڭا اي) + يسلام، ساۋد ارابياسى يسلام كۇنتىزبەسى (كەستەلىك، استرونوميالىق ءداۋىر) يسلام (كەستەلىك، استرونوميالىق ءداۋىر) يسلام كۇنتىزبەسى (ۋمم ءال-قۇرا) يسلام (ۋمم ءال-قۇرا) - ISO-8601 كۇنتىزبەسى + گرەگوريان كۇنتىزبەسى (ISO 8601) + گرەگوريان جاپون كۇنتىزبەسى جاپون پارسى كۇنتىزبەسى @@ -1039,6 +1067,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ەسەپتىك ستاندارتتى اقشا ءپىشىمى ستاندارت + كىشى ءارىپ + كىشى ءارىپ + باس ءارىپ سايكەستىككە ارنالعان الدىڭعى سۇرىپتاۋ رەتى سايكەستىك سوزدىك بويىنشا سۇرىپتاۋ رەتى @@ -1046,7 +1077,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ادەپكى ۋنيكود سۇرىپتاۋ رەتى ادەپكى ۋنيكود ەموجي سۇرىپتاۋ رەتى + ەمودجي ەۋروپالىق رەتتەۋ ەرەجەلەرى + ەۋروپا ەرەجەلەرى تەلەفون كىتاپشاسىنىڭ سۇرىپتاۋ رەتى تەلەفون كىتاپشاسى فونەتيكالىق @@ -1055,6 +1088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic جالپى ماقساتتاعى ىزدەۋ ىزدەۋ كورەي ءتىلىنىڭ باستاپقى داۋىسسىزى بويىنشا ىزدەۋ + كورەي ءارپىنىڭ باستاپقى داۋىسسىزى ستاندارتتى سۇرىپتاۋ رەتى ستاندارت يەروگليفتەر سىزىقتارىن سۇرىپتاۋ رەتى @@ -1065,9 +1099,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic يەروگليفتەر سىزىقتارى جۋين سۇرىپتاۋ رەتى جۋين + ۆاليۋتا + ساندار + تىنىس بەلگىلەرى + بوس ورىن + تاڭبا + ءبارى + تەك نەگىزگى ارىپتەر + نەگىزگى، تاڭبالار، باس نە كىشىلەر، نۇسقالار، كانا + نەگىزگى، تاڭبالار + نەگىزگى، تاڭبالار، باس نە كىشىلەر، نۇسقالار + تولىق ەندى + جارتى ەندى ادەپكى ەمودجي ءماتىن + 12 ساعاتتىق جۇيە + 12 + 24 ساعاتتىق جۇيە + 24 12 ساعاتتىق جۇيە (0–11) 12 (0–11) 12 ساعاتتىق جۇيە (0–12) @@ -1076,6 +1126,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 ساعاتتىق جۇيە (0–24) 24 (1–24) + بوس ورىندار، تىنىس بەلگىلەرى مەن بارلىق تاڭبا + بوس ورىندار، تىنىس بەلگىلەرى + بوس ورىندار، تىنىس بەلگىلەرى + بوس ورىندار، تىنىس بەلگىلەرى مەن ۆاليۋتاعا جاتپايتىن تاڭبالار جولدى تاسىمالداۋدىڭ ەركىن ءستيلى ەركىن جولدى تاسىمالداۋدىڭ قالىپتى ءستيلى @@ -1086,6 +1140,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ءبارىن ساقتاۋ قالىپتى فرازالاردا ساقتاۋ + US BGN دىبىستىق اۋدارماسى + UN GEGN دىبىستىق اۋدارماسى مەترلىك جۇيە مەترلىك بريتانيالىق ولشەمدەر جۇيەسى @@ -1095,8 +1151,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic احوم تسيفرلارى ءۇندى-اراب ساندارى ءۇندى-اراب ساندارىنىڭ كەڭەيتىلگەن جۇيەسى + ءۇندى-اراب كەڭەيتىلگەن جۇيەسى ارميان ساندارى كىشى ارىپپەن بەرىلگەن ارميان ساندارى + كىشى ارىپپەن بەرىلگەن ارميان بالي ساندارى بەنگال ساندارى براحمي ساندارى @@ -1106,27 +1164,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic دەۆاناگاري ساندارى دەۆيس اكۋرۋ ساندارى ەفيوپيا ساندارى + قارجى تولىق ەندى ساندار + تولىق ەندى گاراي ساندارى گرۋزين ساندارى گۋنجالا گوندي ساندارى ماساراما گوندي ساندارى گرەك ساندارى كىشى ارىپپەن بەرىلگەن گرەك ساندارى + كىشى ارىپپەن بەرىلگەن گرەك گۋجاراتي ساندارى گۋرۋڭ حەما ساندارى گۋرمۋكحي ساندارى + ءداستۇرلى كۇنتىزبەلەردەگى اي كۇندەرىن قىتاي يەروگليفتەرىمەن بەلگىلەۋ قىتاي وندىق ساندارى + قىتاي سان يەروگليفتەرىنە نەگىزدەلگەن وندىق جۇيە جەڭىلدەتىلگەن قىتاي ساندارى قارجى سالاسىنداعى جەڭىلدەتىلگەن قىتاي ساندارى + قارجى سالاسىنداعى جەڭىلدەتىلگەن قىتاي ءداستۇرلى قىتاي ساندارى قارجى سالاسىنداعى ءداستۇرلى قىتاي ساندارى + قارجى سالاسىنداعى ءداستۇرلى قىتاي يۆريت ساندارى پاحاۋ ساندارى نياكەڭ پۋاچۋە حموڭ ساندارى ياۆا ساندارى جاپون ساندارى قارجى سالاسىنداعى جاپون ساندارى + قارجى سالاسىنداعى جاپون + جاپون كۇنتىزبەسىندە ءبىرىنشى جىلدى «گاننەن» دەپ بەلگىلەۋ كاياح لي ساندارى كاۋي ساندارى كحمەر ساندارى @@ -1134,15 +1201,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic كيرات راي ساندارى تاي تحام حورا ساندارى تاي تحام تحام ساندارى + تاي تحام تحام (ءدىني) لاوس ساندارى باتىس ساندارى لەپچا ساندارى ليمبۋ ساندارى ماتەماتيكالىق قالىڭ قارىپتى ساندار + ماتەماتيكالىق قالىڭ قارىپ ماتەماتيكالىق قوس سىزىقتى ساندار + ماتەماتيكالىق قوس سىزىقتى قارىپ ەنى بەكىتىلگەن ماتەماتيكالىق ساندار + ماتەماتيكالىق بىرقادامدى قارىپ ماتەماتيكالىق قالىڭ قارىپتى سانسەريف ساندار + ماتەماتيكالىق قالىڭ گروتەسك قارىپ ماتەماتيكالىق سانسەريف ساندار + ماتەماتيكالىق گروتەسك قارىپ مالايالام ساندارى مودي ساندارى موڭعول ساندارى @@ -1150,20 +1223,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic مەيتەي-مايەك ساندارى ميانمار ساندارى ميانمار شىعىس پحو كارەن ساندارى + ميانما شىعىس پۆو-كارەن ساندارى ميانمار پاو ساندارى + ميانما پا-و ساندارى ميانمار شان ساندارى + ميانما شان ساندارى ميانمار تاي لايڭ ساندارى + ميانما تاي-لايڭ ساندارى ناگ مۋنداري ساندارى + جەرگىلىكتى ساندار + جەرگىلىكتى ساندار نكو ساندارى ول-چيكي ساندارى ول-ونال ساندارى وريا ساندارى يسمانيا ساندارى سىزىلعان ساندار + جيەكتەلگەن حانيفي ساندارى ريم ساندارى + باس ءارىپتى ريم ساندارى كىشى ارىپپەن بەرىلگەن ريم ساندارى + كىشى ءارىپتى ريم ساندارى ساۋراشترا ساندارى + بولشەكتەلگەن شارادا ساندارى كحۋدابادي ساندارى سينگالا ليت ساندارى @@ -1174,17 +1257,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic جاڭا لۋ جازۋىنىڭ ساندارى ءداستۇرلى تاميل ساندارى تاميل ساندارى + زاماناۋي تاميل ساندارى تەلۋگۋ ساندارى تاي ساندارى تيبەر ساندارى تيرحۋتا ساندارى تاڭسا ساندارى + تولوڭ سيكي ساندارى + ءداستۇرلى ساندار ۆاي ساندارى ۋاراڭ سيتي ساندارى ۋانچو ساندارى ءوشىرۋ قوسۋ + كورسەتىلمەگەن اۆتوماتتى اۋدارما + POSIX نۇسقاسى + + ءوشىرۋ + قوسۋ + مەترلىك اعىلشىن @@ -1279,58 +1371,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic از سۋىق قاتتى سۋىق - - كوكتەم باسى - جاڭبىر سۋى - جاندىكتەر ويانۋى - كوكتەمگى توقىراۋ - اشىق اسپان - استىق جاڭبىر - جاز باسى - از تولۋ - استىق ەگۋ - جازعى توقىراۋ - وتكىر ىستىق - شىلىڭگىر ىستىق - كۇزدىڭ باسى - قوڭىر سالقىن - اق شىق - كۇزگى توقىراۋ - سۋىق شىق - قىراۋ ءتۇسۋ - قىس باسى - از قار - قالىڭ قار - قىسقى توقىراۋ - از سۋىق - قاتتى سۋىق - - - كوكتەم باسى - جاڭبىر سۋى - جاندىكتەر ويانۋى - كوكتەمگى توقىراۋ - اشىق اسپان - استىق جاڭبىر - جاز باسى - از تولۋ - استىق ەگۋ - جازعى توقىراۋ - وتكىر ىستىق - شىلىڭگىر ىستىق - كۇزدىڭ باسى - قوڭىر سالقىن - اق شىق - كۇزگى توقىراۋ - سۋىق شىق - قىراۋ ءتۇسۋ - قىس باسى - از قار - قالىڭ قار - قىسقى توقىراۋ - از سۋىق - قاتتى سۋىق - @@ -1349,34 +1389,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic يت دوڭىز - - تىشقان - سيىر - بارىس - قويان - ۇلۋ - جىلان - جىلقى - قوي - مەشىن - تاۋىق - يت - دوڭىز - - - تىشقان - سيىر - بارىس - قويان - ۇلۋ - جىلان - جىلقى - قوي - مەشىن - تاۋىق - يت - دوڭىز - @@ -1477,6 +1489,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y G MMM d، y G E، MMM d، y G + HHس v M/d E، M/d E، MMM d @@ -1493,6 +1506,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0} – {1} + y G – y G y – y G @@ -1654,10 +1670,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 1- توقسان - 2- توقسان - 3- توقسان - 4- توقسان + 1-توقسان + 2-توقسان + 3-توقسان + 4-توقسان ءبىرىنشى توقسان @@ -1668,10 +1684,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 1- توقسان - 2- توقسان - 3- توقسان - 4- توقسان + 1-توقسان + 2-توقسان + 3-توقسان + 4-توقسان @@ -1714,12 +1730,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic كەش ءتۇن - - تال ءتۇس - ت د - تال ءتۇس ت ك @@ -1739,17 +1751,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic - y، d- MMMM، EEEE + y، d-MMMM، EEEE - y، d- MMMM + y، d-MMMM - y، d- MMM + y، d-MMM @@ -1811,22 +1823,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic d E G d-M-y G y-MM-dd، E - G y، d- MMM - G y، d- MMM، E + G y، d-MMM + G y، d-MMM، E + HHس v d-M d-M، E - d- MMM - d- MMM، E - d- MMMM - MMMM ايىنىڭ W اپتاسى - MMMM ايىنىڭ W اپتاسى + d-MMM + d-MMM، E + d-MMMM + MMMM ايىنىڭ W-اپتاسى + MMMM ايىنىڭ W-اپتاسى M-y y-d-M y-d-M، E y d- MMM y d- MMM، E - Y جىلدىڭ w اپتاسى - Y جىلدىڭ w اپتاسى + Y جىلدىڭ w-اپتاسى + Y جىلدىڭ w-اپتاسى @@ -1910,8 +1923,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic جىل - بىلتىرعى جىل - بيىلعى جىل + بىلتىر + بيىل كەلەسى جىل {0} جىلدان كەيىن @@ -1922,6 +1935,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} جىل بۇرىن + + بىلتىر + بيىل + كەلەسى جىل + + + بىلتىر + بيىل + كەلەسى جىل + شيرەك وتكەن توقسان @@ -2133,9 +2156,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic دۇنيەجۇزىلىك ۇيلەستىرىلگەن ۋاقىت + + دۇنيەجۇزىلىك ۋاقىت + - بەلگىسىز قالا + بەلگىسىز ورىن اندوررا @@ -2603,9 +2629,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ليبرەۆيل - - ۇلىبريتانيا جازعى ۋاقىتى - لوندون @@ -2696,9 +2719,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic جاياپۋرا - - يرلانديا ستاندارتتى ۋاقىتى - دۋبلين @@ -3394,6 +3414,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic حارارە + + + اكري ۋاقىتى + اكري ستاندارتتى ۋاقىتى + اكري جازعى ۋاقىتى + + اۋعانستان ۋاقىتى @@ -3426,18 +3453,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic الاسكا جازعى ۋاقىتى - - - الماتى ۋاقىتى - الماتى ستاندارتتى ۋاقىتى - الماتى جازعى ۋاقىتى - - - الماتى - الماتى - الماتى قالاسى - - امازون ۋاقىتى @@ -3475,34 +3490,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - اپيا ۋاقىتى - اپيا ستاندارتتى ۋاقىتى - اپيا جازعى ۋاقىتى - - - - - اقتاۋ ۋاقىتى - اقتاۋ ستاندارتتى ۋاقىتى - اقتاۋ جازعى ۋاقىتى + ساموا ۋاقىتى + ساموا ستاندارتتى ۋاقىتى + ساموا جازعى ۋاقىتى - - اقتاۋ - اقتاۋ - اقتاۋ قالاسى - - - - - اقتوبە ۋاقىتى - اقتوبە ستاندارتتى ۋاقىتى - اقتوبە جازعى ۋاقىتى - - - اقتوبە - اقتوبە - اقتوبە قالاسى - @@ -3541,7 +3532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ورتالىق اۋستراليا ۋاقىتى + اۋستراليا ورتالىق ۋاقىتى اۋستراليا ستاندارتتى ورتالىق ۋاقىتى اۋستراليا جازعى ورتالىق ۋاقىتى @@ -3555,14 +3546,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - شىعىس اۋستراليا ۋاقىتى + اۋستراليا شىعىس ۋاقىتى اۋستراليا ستاندارتتى شىعىس ۋاقىتى اۋستراليا جازعى شىعىس ۋاقىتى - باتىس اۋستراليا ۋاقىتى + اۋستراليا باتىس ۋاقىتى اۋستراليا ستاندارتتى باتىس ۋاقىتى اۋستراليا جازعى باتىس ۋاقىتى @@ -3605,9 +3596,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic برازيليا جازعى ۋاقىتى + + + ۇلىبريتانيا ۋاقىتى + ۇلىبريتانيا جازعى ۋاقىتى + + - برۋنەي-دارۋسسالام ۋاقىتى + برۋنەي ۋاقىتى @@ -3681,12 +3678,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ديۋمون-ديۋرۆيل ۋاقىتى + ديۋمون ديۋرۆيل ۋاقىتى - شىعىس تيمور ۋاقىتى + تيمور-لەستە ۋاقىتى @@ -3778,6 +3775,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic گرينۆيچ ۋاقىتى + + + گرەنلانديا ۋاقىتى + گرەنلانديا ستاندارتتى ۋاقىتى + گرەنلانديا جازعى ۋاقىتى + + شىعىس گرەنلانديا ۋاقىتى @@ -3804,14 +3808,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - گاۆاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى + حاۋاي ۋاقىتى - گاۆاي جانە الەۋت ارالدارى ۋاقىتى - گاۆاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى - گاۆاي جانە الەۋت ارالدارى جازعى ۋاقىتى + حاۋاي جانە الەۋت ارالدارى ۋاقىتى + حاۋاي جانە الەۋت ارالدارى ستاندارتتى ۋاقىتى + حاۋاي جانە الەۋت ارالدارى جازعى ۋاقىتى @@ -3865,6 +3869,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic يران جازعى ۋاقىتى + + + يرلانديا ۋاقىتى + يرلانديا ستاندارتتى ۋاقىتى + + يركۋتسك ۋاقىتى @@ -3886,6 +3896,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic جاپونيا جازعى ۋاقىتى + + + كامشاتكا ۋاقىتى + كامشاتكا ستاندارتتى ۋاقىتى + كامشاتكا جازعى ۋاقىتى + + قازاق ەلى ۋاقىتى @@ -4140,20 +4157,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic - پحەنيان ۋاقىتى - - - - - قىزىلوردا ۋاقىتى - قىزىلوردا ستاندارتتى ۋاقىتى - قىزىلوردا جازعى ۋاقىتى + سولتۇستىك كورەيا ۋاقىتى - - قىزىلوردا - قىزىلوردا - قىزىلوردا قالاسى - @@ -4172,11 +4177,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ساحالين جازعى ۋاقىتى + + + سامارا ۋاقىتى + سامارا ستاندارتتى ۋاقىتى + سامارا جازعى ۋاقىتى + + - ساموا ۋاقىتى - ساموا ستاندارتتى ۋاقىتى - ساموا جازعى ۋاقىتى + امەريكا ساموا ستاندارتتى ۋاقىتى @@ -4216,9 +4226,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - تايبەي ۋاقىتى - تايبەي ستاندارتتى ۋاقىتى - تايبەي جازعى ۋاقىتى + تايۋان ۋاقىتى + تايۋان ستاندارتتى ۋاقىتى + تايۋان جازعى ۋاقىتى @@ -4243,6 +4253,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ترۋك ۋاقىتى + + + تۇركيا ۋاقىتى + تۇركيا ستاندارتتى ۋاقىتى + تۇركيا جازعى ۋاقىتى + + تۇرىكمەنستان ۋاقىتى @@ -4262,6 +4279,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ۋرۋگۆاي جازعى ۋاقىتى + + + ءۇرىمجى ۋاقىتى + + وزبەكستان ۋاقىتى @@ -4333,6 +4355,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic +   سان ەمەس @@ -4394,32 +4417,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + #,##0.00¤ + #,##0.00 ¤ + + + #,##0.00¤;(#,##0.00¤) + #,##0.00 ¤;(#,##0.00 ¤) + + - ¤ 0 مىڭ - ¤ 0 مىڭ - ¤ 00 مىڭ - ¤ 00 مىڭ - ¤ 000 مىڭ - ¤ 000 مىڭ - ¤ 0 ميلليون - ¤ 0 ميلليون - ¤ 00 ميلليون - ¤ 00 ميلليون - ¤ 000 ملن - ¤ 000 ملن - ¤ 0 ميلليارد - ¤ 0 ميلليارد - ¤ 00 ملرد - ¤ 00 ملرد - ¤ 000 ملرد - ¤ 000 ملرد - ¤ 0 تريلليون - ¤ 0 تريلليون - ¤ 00 ترلن - ¤ 00 ترلن - ¤ 000 ترلن - ¤ 000 ترلن + 0 مىڭ ¤ + 0 مىڭ ¤ + 00 مىڭ ¤ + 00 مىڭ ¤ + 000 مىڭ ¤ + 000 مىڭ ¤ + 0 ميلليون ¤ + 0 ميلليون ¤ + 00 ميلليون ¤ + 00 ميلليون ¤ + 000 ملن ¤ + 000 ملن ¤ + 0 ميلليارد ¤ + 0 ميلليارد ¤ + 00 ملرد ¤ + 00 ملرد ¤ + 000 ملرد ¤ + 000 ملرد ¤ + 0 تريلليون ¤ + 0 تريلليون ¤ + 00 ترلن ¤ + 00 ترلن ¤ + 000 ترلن ¤ + 000 ترلن ¤ @@ -4635,8 +4668,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic كەنيا شيللينگى - كەنيا شيللينگى - كەنيا شيللينگى قىرعىس سومى @@ -4887,8 +4918,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic كاريب گۋلدەرى - كاريب گۋلدەرى - كاريب گۋلدەرى باتىس افريكانىڭ فرانكى @@ -4912,14 +4941,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic زيمباب التىنى - زيمباب التىنى - زيمباب التىنى {0} كۇن {0} كۇن - مۇرات {0}- سىنىپقا كوشتى. + مۇرات {0}-مەكتەپكە كوشتى. + مۇرات {0}-سىنىپقا كوشتى. @@ -5036,15 +5064,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ميليمول/ليتىر {0} ميليمول/ليتىر - - بولىك - {0} بولىك - {0} بولىك - - - {0} ميلليوندىق ۇلەس - {0} ميلليوندىق ۇلەس - {0} پايىز {0} پايىز @@ -5057,11 +5076,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} پروميرياد {0} پروميرياد - - گليۋكوزا - {0} گليۋكوزا - {0} گليۋكوزا - {0} ليتىر/كيلومەتىر {0} ليتىر/كيلومەتىر @@ -5171,17 +5185,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} مەتىرلىك توننا {0} مەتىرلىك توننا - - {0}/g - - - lb - - - مەركۋري ءديۋيمى - {0} مەركۋري ءديۋيمى - {0} مەركۋري ءديۋيمى - تەمپەراتۋرا گرادۋسى {0} گرادۋس @@ -5203,84 +5206,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} نيۋتون-مەتىر {0} نيۋتون-مەتىر - - سۇ. ۋن. - {0} سۇ. ۋن. - {0} سۇ. ۋن. - يمپ سۇيىق ۋنسيا {0} يمپ سۇيىق ۋنسيا - ستەراديان {0} ستەراديان {0} ستەراديان - - كاتال - {0} كاتال - {0} كاتال - - - كۋلون - {0} كۋلون - {0} كۋلون - - - فاراد - {0} فاراد - {0} فاراد - - - حەنري - {0} حەنري - {0} حەنري - - سيمەنس {0} سيمەنس {0} سيمەنس - - كالو. - {0} كالو. - {0} كالو. - - بەككەرەل {0} بەككەرەل {0} بەككەرەل - - زيۆەرت - {0} زيۆەرت - {0} زيۆەرت - - - گىرەي - {0} گىرەي - {0} گىرەي - - - كيلوگرام-كۇش - {0} كيلوگرام-كۇش - {0} كيلوگرام-كۇش - - - ت - {0} تەسلا - {0} تەسلا - - - ۋەبەر - {0} ۋەبەر - {0} ۋەبەر - - - {0} ميللياردتىق ۇلەس - {0} ميللياردتىق ۇلەس - نەگىزگى باعىت {0} شىعىس @@ -5534,8 +5475,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ميل/يمپ گاللون - {0} ميل/يمپ گاللون - {0} ميل/يمپ گاللون + {0} mpg Imp. + {0} mpg Imp. پەتابايت @@ -5860,8 +5801,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic كۇن جارىقتىعى - {0} كۇن جارىقتىعى - {0} كۇن جارىقتىعى + {0} L☉ + {0} L☉ مەتىرلىك توننا @@ -5926,13 +5867,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic جەر ماسساسى - {0} M⊕ - {0} M⊕ كۇن ماسساسى - {0} M☉ - {0} M☉ گران @@ -6318,8 +6255,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ميللياردتىق ۇلەس - {0} ميللياردتىق ۇلەس - {0} ميللياردتىق ۇلەس + {0} ppb + {0} ppb ءتۇن @@ -6329,43 +6266,170 @@ CLDR data files are interpreted according to the LDML specification (http://unic باعىت - {0} ش - {0} س - {0} و - {0} ب + {0} شىعىس + {0} سولتۇستىك + {0} وڭتۇستىك + {0} باتىس - - بولىك - {0} بولىك - {0} بولىك + + d{0} + + + c{0} + + + m{0} + + + μ{0} + + + n{0} + + + p{0} + + + f{0} + + + a{0} + + + z{0} + + + y{0} + + + r{0} + + + q{0} + + + da{0} + + + h{0} + + + k{0} + + + M{0} + + + G{0} + + + T{0} + + + P{0} + + + E{0} + + + Z{0} + + + Y{0} + + + R{0} + + + Q{0} + + + Ki{0} + + + Mi{0} + + + Gi{0} + + + Ti{0} + + + Pi{0} + + + Ei{0} + + + Zi{0} + + + Yi{0} + + + {0}rad + {0}rad - - {0} ميلليوندىق ۇلەس - {0} ميلليوندىق ۇلەس + + {0}° + {0}° + + + {0}′ + {0}′ + + + {0}″ + {0}″ + + + {0}kt + {0}kt + + + {0}ەلەمەنت + {0}ەلەمەنت + + + {0} بولىك + {0} بولىك - گليۋكوزا - {0} گليۋكوزا - {0} گليۋكوزا + {0} گليۋكوزا + {0} گليۋكوزا + + + {0}mpg + {0}mpg + + + {0}m/gUK + {0}m/gUK B + + {0}lbf + {0}lbf + + + {0}L☉ + {0}L☉ + kg {0}kg {0}kg - {0}‎/kg {0}g {0}g - {0}/g - mg {0}mg {0}mg @@ -6378,7 +6442,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}tn - lb {0}lb {0}lb @@ -6417,75 +6480,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}gr {0}gr - - مەركۋري ءديۋيمى - {0} مەركۋري ءديۋيمى - {0} مەركۋري ءديۋيمى + + {0}lbf⋅ft + {0}lbf⋅ft - - سۇ. ۋن. - {0} سۇ. ۋن. - {0} سۇ. ۋن. + + {0} sr + {0} sr - كاتال - {0} كاتال - {0} كاتال - - - كۋلون - {0} كۋلون - {0} كۋلون - - - فاراد - {0} فاراد - {0} فاراد - - - حەنري - {0} حەنري - {0} حەنري - - - كالو. - {0} كالو. - {0} كالو. + {0} kat + {0} kat - بەككەرەل {0} بك {0} بك - - زيۆەرت - {0} زيۆەرت - {0} زيۆەرت - - - گىرەي - {0} گىرەي - {0} گىرەي - - كيلوگرام-كۇش - {0} كيلوگرام-كۇش - {0} كيلوگرام-كۇش + {0} kgf + {0} kgf - ت - {0} ت - {0} ت + {0} T + {0} T - ۋەبەر - {0} ۋەبەر - {0} ۋەبەر + {0} Wb + {0} Wb - {0} ميللياردتىق ۇلەس - {0} ميللياردتىق ۇلەس + {0}ppb + {0}ppb + + {0} شىعىس + {0} سولتۇستىك + {0} وڭتۇستىك + {0} باتىس + @@ -6672,13 +6704,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic und kk - {given} {surname} {generation}، {credentials} + {title} {given} {given2} {surname} {generation}, {credentials} - {given-informal} + {given-informal} {surname} - {surname} + {title} {surname} {given-informal} @@ -6689,11 +6721,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {given-informal-monogram-allCaps} + + {given} {given2-initial} {surname} {generation}, {credentials} + - {given-informal} + {given-informal} {surname} - {surname} + {title} {surname} {given-informal} @@ -6705,13 +6740,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {given-informal-monogram-allCaps} - {given-initial} {surname} + {given-initial} {given2-initial} {surname} - {given-informal} + {given-informal} {surname-initial} - {surname} + {title} {surname} {given-informal} @@ -6723,13 +6758,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {given-informal-monogram-allCaps} - {surname} {given} + {surname} {title} {given} {given2} {generation}, {credentials} {surname} {given-informal} - {surname} + {title} {surname} {given-informal} @@ -6740,11 +6775,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname-monogram-allCaps}{given-informal-monogram-allCaps} + + {surname} {given} {given2-initial} {generation}, {credentials} + {surname} {given-informal} - {surname} + {title} {surname} {given-informal} @@ -6762,7 +6800,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname} {given-initial} - {surname} + {title} {surname} {given-informal} diff --git a/make/data/cldr/common/main/kl.xml b/make/data/cldr/common/main/kl.xml index 5d29b79d7e3c..2db2e5b8f084 100644 --- a/make/data/cldr/common/main/kl.xml +++ b/make/data/cldr/common/main/kl.xml @@ -725,6 +725,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic y QQQQ + + {0} – {1} + {0} – {1} + {0} – {1} + h a – h a h–h a diff --git a/make/data/cldr/common/main/km.xml b/make/data/cldr/common/main/km.xml index 7d14dcae6bc0..e66de2d62fb8 100644 --- a/make/data/cldr/common/main/km.xml +++ b/make/data/cldr/common/main/km.xml @@ -332,6 +332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ភាសាទំនាក់ទំនងនីហ្សេរីយ៉ា ពីជីន ប៉ូឡូញ + ភីម៉ន ម៉ាលីស៊ីត ប៉ាសាម៉ាខ្វូឌី ព្រូស៊ាន បាស្តូ @@ -892,15 +893,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ប្រតិទិន ទម្រង់រូបិយប័ណ្ណ + ការតម្រៀបដោយមិនអើពើនឹងនិមិត្តសញ្ញា + ការតម្រៀបតុងបញ្ច្រាស + ការតម្រៀបលំដាប់អក្សរធំ/អក្សរតូច + ការតម្រៀបដែលបែងចែកអក្សរធំតូច លំដាប់​តម្រៀប + ការតម្រៀបដែលមានប្រក្រតីកម្ម + ការតម្រៀបលេខ + ការតម្រៀបលំដាប់ស្គ្រីប/ប្លុកឡើងវិញ + កម្លាំងនៃការតម្រៀប រូបិយប័ណ្ណ + ទិសដៅបំប្លែង + ការមិនរួមបញ្ចូលការបំបែកតាមវចនានុក្រម រូបរាងរូបអារម្មណ៍ + ថ្ងៃដំបូងនៃសប្ដាហ៍ + លាយឡំគ្នា វដ្តម៉ោង (12 vs 24) + វិធីបញ្ចូល + ក្ដារចុច + មិនអើពើនឹងខ្ពស់បំផុត ការចុះបន្ទាត់ភាសា CJK ការចុះបន្ទាត់ក្នុងពាក្យ + វិធានបំប្លែង ប្រព័ន្ធវាស់វែង + ខ្នាតរង្វាស់ លេខ - ការបំបែកប្រយោគបន្ទាប់ពី Abbr ។ + តំបន់សម្រាប់ទិន្នន័យបំពេញបន្ថែម + ប្រភពបំប្លែង + ផ្នែករងតំបន់ + ការបំបែកប្រយោគបន្ទាប់ពីអក្សរកាត់ + បំប្លែង + បកប្រែដោយម៉ាស៊ីន + ល្វែងម៉ោង + វ៉ារ្យ៉ង់ភាសា + ប្រើឯកជន + ការបំប្លែងប្រើឯកជន ប្រតិទិនពុទ្ធសាសនា @@ -919,13 +946,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ហ្គ្រីហ្គររៀន ប្រតិទិនហេប្រឺ ហេប្រឺ + ជាតិឥណ្ឌា ប្រតិទិនអ៊ីស្លាម ហ៊ីជ្រី ប្រតិទិនអ៊ិស្លាម (តារាង, សម័យស៊ីវិល) ហ៊ីជ្រី (តាមតារាង, សម័យស៊ីវិល) + ហ៊ីជ្រី ការមើលព្រះចន្ទនៅអារ៉ាប៊ីសាអូឌីត + ហ៊ីជ្រី (យុគសម័យតារាសាស្ត្រ តារាង) ប្រតិទិនអ៊ិស្លាម (អ៊ុំអាល់គូរ៉ា) ហ៊ីជ្រី (អ៊ុំអាល់គូរ៉ា) ប្រតិទិនហ្គ្រីហ្គររៀន (ឆ្នាំនៅពីមុខ) + ហ្គ្រីហ្គររៀន ប្រតិទិន​ជប៉ុន ជប៉ុន ប្រតិទិនពែក្ស @@ -936,15 +967,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ គណនេយ្យ ទម្រង់រូបិយប័ណ្ណស្តង់ដា ស្តង់ដា + អក្សរតូច + អក្សរតូច + អក្សរធំ + ភាពត្រូវគ្នា + វចនានុក្រម លំដាប់​តម្រៀប​យូនីកូដ​លំនាំដើម យូនីកូដ​លំនាំដើម + រូបអារម្មណ៍ + វិធានអឺរ៉ុប + សៀវភៅសូរសព្ទ + សូរសព្ទ + ភីនអ៊ីន ការស្វែងរកក្នុងគោលបំណងទូទៅ ស្វែងរក + ព្យញ្ជនៈដើមកូរ៉េ លំដាប់​តម្រៀប​ស្តង់ដា ស្តង់ដា + គំនូស + ប្រពៃណី + គំនូសរ៉ាឌីកាល់ + ជូយីន + រូបិយប័ណ្ណ + លេខ + វណ្ណយុត្ត + ចន្លោះទទេ + និមិត្តសញ្ញា + ទាំងអស់ + អក្សរគោលតែប៉ុណ្ណោះ + គោល, តុង, ករណី, វ៉ារ្យ៉ង់, កាណា + គោល, តុង + គោល, តុង, ករណី, វ៉ារ្យ៉ង់ + ទៅទទឹងពេញ + ទៅទទឹងកន្លះ លំនាំដើម រូបអារម្មណ៍ អក្សរ + ប្រព័ន្ធ 12 ម៉ោង + 12 + ប្រព័ន្ធ 24 ម៉ោង + 24 ប្រព័ន្ធ 12 ម៉ោង (0–11) 12 (0–11) ប្រព័ន្ធ 12 ម៉ោង (1–12) @@ -953,6 +1015,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) ប្រព័ន្ធ 24 ម៉ោង (1–24) 24 (1–24) + Shift Spaces, វណ្ណយុត្ត, និមិត្តសញ្ញាទាំងអស់ + Shift spaces, វណ្ណយុត្ត + Shift spaces, វណ្ណយុត្ត + Shift spaces, វណ្ណយុត្ត, និមិត្តសញ្ញាមិនមែនរូបិយប័ណ្ណ បែបបទចុះបន្ទាត់ធូររលុង ធូររលុង បែបបទចុះបន្ទាត់ធម្មតា @@ -963,6 +1029,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ រក្សាទាំងអស់ ធម្មតា រក្សាក្នុងឃ្លា + ការបកប្រែតាមសូរសព្ទដើម US BGN + ការបកប្រែតាមសូរសព្ទដើម UN GEGN ប្រព័ន្ធម៉ែត្រ ម៉ែត្រ ប្រព័ន្ធរង្វាស់អង់គ្លេស @@ -971,47 +1039,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ សហរដ្ឋអាម៉េរិក លេខ​ឥណ្ឌា-អារ៉ាប់ លេខ​ឥណ្ឌា-អារ៉ាប់​ពង្រីក + ឥណ្ឌា-អារ៉ាប់​ពង្រីក លេខ​អាមេនី លេខ​តូច​អាមេនី + អក្សរតូចអាមេនី លេខ​បង់ក្លា លេខចាក់ម៉ា លេខ​ឌីវ៉ាណាការី លេខ​អេត្យូពី + ហិរញ្ញវត្ថុ លេខ​ទទឹង​ពេញ + ទទឹងពេញ លេខ​ហ្សកហ្សី លេខ​ក្រិក លេខ​តូច​ក្រិក + អក្សរតូចក្រិក លេខ​ហ្កុយ៉ារាទី លេខ​កុមុឃី + ការបង់លេខថ្ងៃនៃខែដោយប្រើអក្សរហានសម្រាប់ប្រតិទិនប្រពៃណី លេខ​ទសភាគ​ចិន + ប្រព័ន្ធទសភាគផ្អែកតាមទីតាំងដែលប្រើនិមិត្តសញ្ញាតំណាងលេខចិនជាលេខ លេខ​ចិន​អក្សរ​កាត់ លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​កាត់ + ហិរញ្ញវត្ថុជាភាសាចិនអក្សរកាត់ លេខ​ចិន​អក្សរ​ពេញ លេខ​ហិរញ្ញវត្ថុ​ចិន​អក្សរ​ពេញ + ហិរញ្ញវត្ថុជាភាសាចិនអក្សរពេញ លេខហេប្រឺ លេខជ្វា លេខ​ជប៉ុន លេខ​ហិរញ្ញវត្ថុ​ជប៉ុន + ហិរញ្ញវត្ថុជប៉ុន + ការបង់លេខហ្កាននេនឆ្នាំដំបូងជប៉ុន លេខ​ខ្មែរ លេខខាណាដា + តៃថាមថាម (ប្រើក្នុងសាសនាគ្រិស្ត) លេខ​ឡាវ - លេខ​បច្ចឹម​ប្រទេស - លេខ​មលយាល័ម + លេខ​បស្ចិម​ប្រទេស + ដិតគណិត + ពីរឆ្នូតគណិត + ឯកទំហំគណិត + ដិត sans-serif គណិត + sans-serif គណិត + លេខ​ម៉ាឡាយ៉ាឡាម លេខមីតីម៉ាយ៉ែក - លេខ​ភូមា + លេខ​មីយ៉ាន់ម៉ា + ភូការ៉ែនបូព៌ាមីយ៉ាន់ម៉ា + ប៉ាវមីយ៉ាន់ម៉ា + សានមីយ៉ាន់ម៉ា + តៃលាំងមីយ៉ាន់ម៉ា + លេខដើម + លេខដើម លេខអូលឈិគិ លេខអូឌៀ - លេខ​រ៉ូមាំង + បន្ទាត់ក្រៅ + លេខ​រ៉ូម៉ាំង + អក្សរធំ​រ៉ូម៉ាំង លេខ​តូច​រ៉ូមាំង - លេខ​តាមីល + អក្សរតូច​រ៉ូម៉ាំង + ជាផ្នែក + លេខ​តាមីលប្រពៃណី លេខ​តាមីល + តាមីលទំនើប លេខ​តេលុគុ លេខ​ថៃ លេខទីបេ + លេខប្រពៃណី លេខវ៉ៃ បិទ បើក + ការបកប្រែដោយម៉ាស៊ីនដែលមិនបានបញ្ជាក់ + វ៉ារ្យ៉ង់ POSIX + + បិទ + បើក + រង្វាស់​ប្រវែង ចក្រភព​អង់គ្លេស @@ -1065,7 +1168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - {1}, {0} + {1} {0} {1} នៅ​ម៉ោង {0} @@ -1076,7 +1179,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - {1}, {0} + {1} {0} {1} នៅ​ម៉ោង {0} @@ -1087,7 +1190,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - {1}, {0} + {1} {0} {1} {0} @@ -1098,7 +1201,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - {1}, {0} + {1} {0} {1} {0} @@ -1108,13 +1211,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - d E + E d y G M/y G E d/M/y G MMM y G d MMM y G - E, d MMM y G + E d MMM y G HH v d/M E d/M @@ -1128,7 +1231,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d/M/y GGGGG MMM y G d MMM y G - E, d MMM y G + E d MMM y G + MMMM y G QQQ y G QQQQ y G @@ -1218,6 +1322,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y G @@ -1439,6 +1547,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1481,16 +1592,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d E y G M/y G + d/M/y G E d/M/y G MMM y G d MMM y G E d MMM y G - HH v + MMMM y G + d MMMM y G + E d MMMM y G d/M E d/M d MMM E d MMM d MMMM + E d MMMM សប្តាហ៍ទី W នៃខែ MMMM M/y d/M/y @@ -1499,6 +1614,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y សប្តាហ៍ទី w នៃឆ្នាំ Y @@ -1603,6 +1720,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d MMM – E d MMM E d MMM – E d MMM + + d – d MMMM + d MMMM – d MMMM + y – y @@ -1860,7 +1981,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​សកល {0} - ម៉ោង​សកល ម៉ោង​នៅ​ {0} ម៉ោង​ពេល​ថ្ងៃ​នៅ​ {0} ម៉ោង​ស្តង់ដារ​នៅ ​{0} @@ -1885,7 +2005,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ កាប៊ុល - អង់ទីហ្គា + អង់ទីហ្កា អង់ហ្គីឡា @@ -2008,7 +2128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ឡតហូវ៉េ - អារ៉ូបា + អារូបា ម៉ារៀហាំ @@ -2341,9 +2461,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ លីប្រីវីល - - ម៉ោង​រដូវ​ក្ដៅ​​នៅ​ចក្រភព​អង់គ្លេស - ឡុងដ៍ @@ -2434,9 +2551,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ចាយ៉ាភូរ៉ា - - ម៉ោង​រដូវ​ក្ដៅ​នៅ​អៀរឡង់​ - ឌុយប្លាំង @@ -3004,7 +3118,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ណូម - អង់ចូរ៉ាក + អង់ឃើរេច យ៉ាគូតាត @@ -3132,6 +3246,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ហារ៉ារ៉េ + + + ម៉ោងនៅអាក្រឺ + ម៉ោងស្តង់ដានៅអាក្រឺ + ម៉ោងនារដូវក្ដៅនៅអាក្រឺ + + ម៉ោង​នៅ​អាហ្វហ្គានីស្ថាន @@ -3167,8 +3288,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​នៅ​អាម៉ាហ្សូន - ម៉ោងស្តង់ដារ​នៅ​អាម៉ាហ្សូន - ម៉ោង​នៅ​អាម៉ាហ្សូននារដូវក្តៅ + ម៉ោងស្តង់ដានៅ​អាម៉ាហ្សូន + ម៉ោង​នារដូវក្តៅនៅ​អាម៉ាហ្សូន @@ -3307,6 +3428,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​នៅ​ប្រាស៊ីលីយ៉ានា​​រដូវ​ក្ដៅ + + + ម៉ោងអង់គ្លេស + ម៉ោង​រដូវ​ក្ដៅ​​នៅ​ចក្រភព​អង់គ្លេស + + ម៉ោងនៅព្រុយណេដារូសាឡឹម @@ -3480,18 +3607,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោងនៅគ្រីនវិច + + + ម៉ោងនៅហ្គ្រោអង់ឡង់ + ម៉ោងស្តង់ដានៅហ្គ្រោអង់ឡង់ + ម៉ោងនារដូវក្ដៅនៅហ្គ្រោអង់ឡង់ + + - ម៉ោង​​នៅ​ហ្គ្រីនលែន​ខាង​កើត - ម៉ោង​​​ស្តង់ដារ​នៅ​​ហ្គ្រីនលែន​ខាង​កើត - ម៉ោង​នៅ​ហ្គ្រីនលែនខាង​កើតនា​រដូវ​ក្ដៅ + ម៉ោង​​នៅ​ហ្គ្រោអង់ឡង់​ខាង​កើត + ម៉ោង​​​ស្តង់ដានៅហ្គ្រោអង់ឡង់​ខាង​កើត + ម៉ោង​នារដូវក្ដៅនៅ​ហ្គ្រោអង់ឡង់ខាង​កើត - ម៉ោងនៅហ្គ្រីនលែនខាងលិច - ម៉ោងស្តង់ដារនៅហ្គ្រីនលែនខាងលិច - ម៉ោងនៅហ្គ្រីនលែនខាងលិចនារដូវក្តៅ + ម៉ោងនៅហ្គ្រោអង់ឡង់ខាងលិច + ម៉ោងស្តង់ដានៅហ្គ្រោអង់ឡង់ខាងលិច + ម៉ោង​នារដូវក្ដៅនៅ​ហ្គ្រោអង់ឡង់ខាង​លិច @@ -3506,14 +3640,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ម៉ោង​ស្តង់ដារ​​នៅ​ហាវៃ-អាល់ដ្យូសិន + ម៉ោងនៅហាវ៉ៃ - ម៉ោង​​នៅ​ហាវៃ-អាល់ដ្យូសិន - ម៉ោង​ស្តង់ដារ​​នៅ​ហាវៃ-អាល់ដ្យូសិន - ម៉ោង​ពេល​ថ្ងៃ​នៅ​ហាវៃ-អាល់ដ្យូសិន + ម៉ោងនៅហាវ៉ៃ-អាលូសិន + ម៉ោងស្តង់ដានៅហាវ៉ៃ-អាលូសិន + ម៉ោងពេលថ្ងៃនៅហាវ៉ៃ-អាលូសិន @@ -3567,6 +3701,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​ពេល​ថ្ងៃ​នៅ​អ៊ីរ៉ង់ + + + ម៉ោងអៀរឡង់ + ម៉ោង​រដូវ​ក្ដៅ​នៅ​អៀរឡង់​ + + ម៉ោងនៅអៀរគុតស្កិ៍ @@ -3588,6 +3728,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​ពេល​ថ្ងៃ​នៅជប៉ុន + + + ម៉ោងនៅកាំឆាត់ស្កា + ម៉ោងស្តង់ដានៅកាំឆាត់ស្កា + ម៉ោងនារដូវក្ដៅនៅកាំឆាត់ស្កា + + ពេលវេលានៅកាហ្សាក់ស្ថាន @@ -3731,7 +3878,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​​នៅញូវហ្វោនឡែន - ម៉ោង​​ស្តង់ដារ​​នៅ​ញូវហ្វោនឡែន + ម៉ោង​​ស្តង់ដា​នៅ​ញូវហ្វោនឡែន ម៉ោង​ពេលថ្ងៃ​នៅ​ញូវហ្វោនឡែន @@ -3813,9 +3960,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ម៉ោង​​​នៅសង់​ព្យែរ និង​មីគុយឡុង - ម៉ោង​ស្តង់ដារ​នៅសង់​ព្យែរ និង​មីគុយឡុង - ម៉ោង​ពេល​ថ្ងៃ​នៅសង់​ព្យែរ និង​មីគុយឡុង + ម៉ោង​​​នៅសាំងព្យែរ និង​មីគីឡុង + ម៉ោង​ស្តង់ដា​នៅសាំងព្យែរ និង​មីគីឡុង + ម៉ោង​ពេល​ថ្ងៃ​នៅសាំងព្យែរ និង​មីគីឡុង @@ -3850,11 +3997,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​នៅ​សាក់ខាលីននា​រដូវ​ក្ដៅ + + + ម៉ោងនៅសាម៉ារ៉ា + ម៉ោងស្តង់ដានៅសាម៉ារ៉ា + ម៉ោងនារដូវក្ដៅនៅសាម៉ារ៉ា + + - ម៉ោង​នៅ​សាម័រ ម៉ោង​ស្តង់ដារនៅ​សាម័រ - ម៉ោង​នៅ​សាម័រនារដូវក្តៅ @@ -3921,6 +4073,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​នៅ​ចូអុក + + + ម៉ោងនៅតួកគីយេ + ម៉ោងស្តង់ដានៅតួកគីយេ + ម៉ោងនារដូវក្ដៅនៅតួកគីយេ + + ម៉ោង​នៅ​តួកម៉េនីស្ថាន @@ -3940,6 +4099,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ម៉ោង​នៅ​អ៊ុយរូហ្គាយនា​​រដូវ​ក្ដៅ + + + ម៉ោងនៅអ៊ីរឹមឈិ + + ម៉ោង​នៅ​អ៊ូសបេគីស្ថាន @@ -4580,7 +4744,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ហ្គីលឌ័រការីបៀន - ហ្គីលឌ័រការីបៀន ហ្វ្រង់ CFA អាហ្វ្រិកខាងលិច @@ -4606,7 +4769,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ហ្កូលស៊ីមបាវ៉េ - ហ្កូលស៊ីមបាវ៉េ diff --git a/make/data/cldr/common/main/kn.xml b/make/data/cldr/common/main/kn.xml index f142f1043bd3..ae862795cce3 100644 --- a/make/data/cldr/common/main/kn.xml +++ b/make/data/cldr/common/main/kn.xml @@ -418,6 +418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಪಾಲಿ ಪಿಜಿನ್ ಪೊಲಿಶ್ + ಪೀಡ್‌ಮಾಂಟೀಸ್ ಪೋನ್‌‌ಪಿಯನ್ ಮ್ಯಾಲಿಸೀಟ್-ಪಸ್ಸಾಮಕ್ವಾಡ್ಡಿ ಪ್ರಶಿಯನ್ @@ -1063,18 +1064,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ವಿಂಗಡಣೆ ಕ್ರಮ ಸಾಮಾನ್ಯ ವಿಂಗಡಣೆ ಸಂಖ್ಯೆ ವಿಂಗಡಣೆ + ಸ್ಕ್ರಿಪ್ಟ್/ಬ್ಲಾಕ್ ರೀಆರ್ಡರಿಂಗ್ ವಿಂಗಡಣೆ ಸಾಮರ್ಥ್ಯ ಕರೆನ್ಸಿ + ಟ್ರಾನ್ಸ್‌ಫಾರ್ಮ್ ಡೆಸ್ಟಿನೇಷನ್ + ಡಿಕ್ಷನರಿ ಬ್ರೇಕ್ ಎಕ್ಸ್‌ಕ್ಲೂಶನ್‌ಗಳು ಎಮೋಜಿ ಪ್ರೆಸೆಂಟೇಶನ್ - ಕಾಲ ಚಕ್ರ (12 ವಿರುದ್ಧ 24) + ವಾರದ ಮೊದಲ ದಿನ + ಮಿಕ್ಸಡ್-ಇನ್ + ಕಾಲ ಚಕ್ರ (12 ವರ್ಸಸ್ 24) + ಇನ್‌ಪುಟ್ ವಿಧಾನ + ಕೀಬೋರ್ಡ್ + ಅತಿ ಹೆಚ್ಚು ನಿರ್ಲಕ್ಷಿಸಿರುವುದು ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ ಪದಗಳ ಮಧ್ಯ ಲೈನ್ ಬ್ರೇಕ್‌ಗಳು + ಟ್ರಾನ್ಸ್‌ಫಾರ್ಮ್ ನಿಯಮಗಳು ಮಾಪನ ವ್ಯವಸ್ಥೆ + ಮಾಪನ ಯೂನಿಟ್ ಸಂಖ್ಯೆಗಳು + ಪೂರಕ ಡೇಟಾಗಾಗಿ ಪ್ರದೇಶ + ಟ್ರಾನ್ಸ್‌ಫಾರ್ಮ್ ಸೋರ್ಸ್ + ಪ್ರದೇಶ ಉಪವಿಭಾಗ ಸಂಕ್ಷಿಪ್ತರೂಪದ ನಂತರ ವಾಕ್ಯ ವಿರಾಮ + ಟ್ರಾನ್ಸ್‌ಫಾರ್ಮ್ + ಮಷಿನ್ ಅನುವಾದಿಸಿರುವುದು ಸಮಯ ವಲಯ ಸ್ಥಳೀಯ ಭಿನ್ನತೆ ಖಾಸಗಿ ಬಳಕೆ + ಖಾಸಗಿ ಬಳಕೆಯ ಟ್ರಾನ್ಸ್‌ಫಾರ್ಮ್ ಬೌದ್ಧರ ಕ್ಯಾಲೆಂಡರ್ @@ -1100,9 +1117,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಇಸ್ಲಾಮಿಕ್-ಸಿವಿಲ್ ಕ್ಯಾಲೆಂಡರ್ ಹಿಜ್ರಿ (ಟ್ಯಾಬುಲರ್, ನಾಗರಿಕ ಯುಗ) ಇಸ್ಲಾಮಿಕ್‌ ಕ್ಯಾಲೆಂಡರ್‌ (ಸೌದಿ ಅರೇಬಿಯಾ, ಸೈಟಿಂಗ್‌)bia, sighting) + ಹಿಜ್ರಿ, ಸೌದಿ ಅರೇಬಿಯಾ ಪ್ರವಾಸಿ ಆಕರ್ಷಣೆಗಳ ವೀಕ್ಷಣೆ + ಹಿಜ್ರಿ (ಕೋಷ್ಟಕ, ಖಗೋಳ ಯುಗ) ಇಸ್ಲಾಮಿಕ್ ಕ್ಯಾಲೆಂಡರ್ (ಉಮ್ ಅಲ್-ಖುರಾ) ಹಿಜ್ರಿ (ಉಮ್ ಅಲ್-ಖುರಾ) ISO-8601 ಕ್ಯಾಲೆಂಡರ್ + ಗ್ರೆಗೊರಿಯನ್ ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್ ಜಪಾನೀಸ್ ಪರ್ಷಿಯನ್ ಕ್ಯಾಲೆಂಡರ್ @@ -1118,42 +1138,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಉಚ್ಛಾರಣೆಯನ್ನು ಸಾಮಾನ್ಯವಾಗಿ ವಿಂಗಡಿಸಿ ತಿರುಗು ಮುರುಗಾದ ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ ಮೊದಲು ಲೋವರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ + ಲೋವರ್‌ಕೇಸ್ ಸಾಮಾನ್ಯ ಕೇಸ್ ಕ್ರಮವನ್ನು ವಿಂಗಡಿಸಿ + ಲೋವರ್‌ಕೇಸ್ ಮೊದಲು ಅಪ್ಪರ್‌ಕೇಸ್ ಅನ್ನು ವಿಂಗಡಿಸಿ + ಅಪ್ಪರ್‌ಕೇಸ್ ಕೇಸ್ ಇನ್‌ಸೆಂಟೀವ್ ಅನ್ನು ವಿಂಗಡಿಸಿ ಕೇಸ್‌ ಸೆನ್ಸಿಟೀವ್‌‌ ವಿಂಗಡಿಸಿ ಹೊಂದಾಣಿಕೆಯ ಸಲುವಾಗಿ ಹಿಂದಿನ ವಿಂಗಡಣಾ ಕ್ರಮ + ಕಾಂಪ್ಯಾಟಿಬಿಲಿಟಿ ಡಿಕ್ಷನರಿ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ + ಡಿಕ್ಷನರಿ ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ ವಿಂಗಡಣೆ ಕ್ರಮ ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ + ಇಮೋಜಿ ಯುರೋಪಿನ ಅನುಕ್ರಮ ನಿಯಮಗಳು + ಯುರೋಪಿಯನ್ ನಿಯಮಗಳು ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ + ಫೋನ್‌ಬುಕ್‌ ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ + ಫೋನೆಟಿಕ್ ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ + ಪಿನ್ಯಿಯಿನ್ ಸಾಮಾನ್ಯ- ಉದ್ದೇಶ ಹುಡುಕಾಟ ಹುಡುಕಾಟ ಹಂಗುಲ್ ಆದ್ಯಕ್ಷರ ವ್ಯಂಜನದ ಮೂಲಕ ಹುಡುಕಿ + ಕೊರಿಯನ್ ಇನಿಶಿಯಲ್ ಕಾನ್ಸೊನೆಂಟ್ ಪ್ರಮಾಣೀಕೃತ ವಿಂಗಡಣೆ ಕ್ರಮ ಪ್ರಮಾಣೀಕೃತ ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ + ಸ್ಟ್ರೋಕ್ ಸಾಂಪ್ರದಾಯಿಕ ವಿಂಗಡಣೆ ಕ್ರಮ ಸಾಂಪ್ರದಾಯಿಕ ರ್ಯಾಡಿಕಲ್-ಸ್ಟ್ರೋಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ + ರ‍್ಯಾಡಿಕಲ್ ಸ್ಟ್ರೋಕ್ + ಝುಯಿನ್ ಸಾಮಾನ್ಯ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ ವಿಂಗಡಿಸಿ ಸಾಮಾನ್ಯವಾದ ಯೂನಿಕೋಡ್ ಅನ್ನು ವಿಂಗಡಿಸಿ ಅಂಕೆಗಳನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ವಿಂಗಡಿಸಿ ಅಂಕೆಗಳನ್ನು ಸಂಖ್ಯಾತ್ಮಕವಾಗಿ ವಿಂಗಡಿಸಿ + ಕರೆನ್ಸಿ + ಡಿಜಿಟ್‌ಗಳು + ವಿರಾಮಚಿಹ್ನೆ + ವೈಟ್‌ಸ್ಪೇಸ್ + ಚಿಹ್ನೆ ಎಲ್ಲವನ್ನೂ ವಿಂಗಡಿಸಿ + ಎಲ್ಲಾ ವಿಂಗಡಣೆ ಆಧರಿಸಿದ ಅಕ್ಷರಗಳನ್ನು ಮಾತ್ರ + ಬೇಸ್ ಅಕ್ಷರಗಳು ಮಾತ್ರ ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ/ಕಾನಾ ವಿಂಗಡಿಸಿ + ಬೇಸ್, ಉಚ್ಚಾರಣೆಗಳು, ಕೇಸ್, ರೂಪಾಂತರಗಳು, ಕನಾ ಉಚ್ಛಾರಣೆಗಳನ್ನು ವಿಂಗಡಿಸಿ + ಬೇಸ್, ಉಚ್ಚಾರಣೆಗಳು ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ ವಿಂಗಡಿಸಿ + ಬೇಸ್, ಉಚ್ಚಾರಣೆಗಳು, ಕೇಸ್, ರೂಪಾಂತರಗಳು ಪೂರ್ಣಅಗಲಕ್ಕೆ ಅರೆಅಗಲಕ್ಕೆ ಸಂಖ್ಯೆ ಡೀಫಾಲ್ಟ್ ಎಮೋಜಿ ಪಠ್ಯ + 12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ + 12 + 24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ + 24 12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (0–11) 12 (0–11) 12 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (1–12) @@ -1162,6 +1210,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 ಗಂಟೆ ವ್ಯವಸ್ಥೆ (1–24) 24 (1–24) + ಶಿಫ್ಟ್ ಸ್ಪೇಸ್‌ಗಳು, ವಿರಾಮಚಿಹ್ನೆ, ಎಲ್ಲಾ ಚಿಹ್ನೆಗಳು + ಶಿಫ್ಟ್ ಸ್ಪೇಸ್‌ಗಳು, ವಿರಾಮಚಿಹ್ನೆ + ಶಿಫ್ಟ್ ಸ್ಪೇಸ್‌ಗಳು, ವಿರಾಮಚಿಹ್ನೆ + ಶಿಫ್ಟ್ ಸ್ಪೇಸ್‌ಗಳು, ವಿರಾಮಚಿಹ್ನೆ, ಕರೆನ್ಸಿಯೇತರ ಚಿಹ್ನೆಗಳು ಲೂಸ್ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ ಲೂಸ್ ಸಾಮಾನ್ಯ ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ @@ -1182,51 +1234,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಅಮೇರಿಕಾ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು ವಿಸ್ತರಿಸಲಾದ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಅಂಕೆಗಳು + ವಿಸ್ತರಿಸಲಾದ ಅರೇಬಿಕ್-ಇಂಡಿಕ್ ಆರ್ಮೇನಿಯಾದ ಸಂಖ್ಯೆಗಳು ಅರ್ಮೇನಿಯಾದ ಸಣ್ಣಕ್ಷರ ಸಂಖ್ಯೆಗಳು + ಅರ್ಮೇನಿಯನ್ ಲೋವರ್‌ಕೇಸ್ ಬಾಂಗ್ಲಾ ಅಂಕೆಗಳು ಚಕ್ಮಾ ಅಂಕೆಗಳು ದೇವನಾಗರಿ ಅಂಕೆಗಳು ಇಥಿಯೋಪಿಯಾದ ಸಂಖ್ಯೆಗಳು ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು + ಹಣಕಾಸು ಪೂರ್ಣ ಅಗಲವಾದ ಸಂಖ್ಯೆಗಳು + ಫುಲ್-ವಿಡ್ತ್ ಜಾರ್ಜಿಯಾದ ಸಂಖ್ಯೆಗಳು ಗ್ರೀಕ್ ಸಂಖ್ಯೆಗಳು ಗ್ರೀಕ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು + ಗ್ರೀಕ್ ಲೋವರ್‌ಕೇಸ್ ಗುಜರಾತಿ ಅಂಕೆಗಳು ಗುರ್ಮುಖಿ ಅಂಕೆಗಳು + ಸಾಂಪ್ರದಾಯಿಕ ಕ್ಯಾಲೆಂಡರ್‌ಗಳಲ್ಲಿ ಹಾನ್ ಅಕ್ಷರದ ತಿಂಗಳ ದಿನ ಸಂಖ್ಯೆ ಚೀನಾದ ದಶಮಾಂಶ ಸಂಖ್ಯೆಗಳು + ಚೀನೀ ಸಂಖ್ಯಾ ಐಡಿಯೋಗ್ರಾಫ್‌ಗಳನ್ನು ಅಂಕೆಗಳಾಗಿ ಬಳಸುವ ಸ್ಥಾನಿಕ ದಶಮಾಂಶ ವ್ಯವಸ್ಥೆ. ಸರಳೀಕೃತ ಚೀನಿ ಸಂಖ್ಯೆಗಳು ಸರಳೀಕೃತ ಚೀನಿ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು + ಸರಳೀಕೃತ ಚೀನೀ ಹಣಕಾಸು ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಿ ಸಂಖ್ಯೆಗಳು ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಿ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು + ಸಾಂಪ್ರದಾಯಿಕ ಚೀನೀ ಹಣಕಾಸು ಹೀಬ್ರೂ ಸಂಖ್ಯೆಗಳು ಜಾವಾನೀಸ್ ಅಂಕೆಗಳು ಜಪಾನೀ ಸಂಖ್ಯೆಗಳು ಜಪಾನೀ ಆರ್ಥಿಕ ಸಂಖ್ಯೆಗಳು + ಜಾಪನೀಸ್ ಹಣಕಾಸು + ಜಾಪನೀಸ್ ಮೊದಲ ವರ್ಷದ ಗಾನೆನ್ ಸಂಖ್ಯೆಗಳು ಖಮೆ ಅಂಕೆಗಳು ಕನ್ನಡ ಅಂಕೆಗಳು + ತೈ ಥಾಮ್ ಥಾಮ್ (ಎಕ್ಲೆಸಿಯಸ್ಟಿಕಲ್) ಲಾವೋ ಅಂಕೆಗಳು ಪಾಶ್ಚಿಮಾತ್ಯ ಅಂಕೆಗಳು + ಮ್ಯಾಥೆಮೆಟಿಕಲ್ ಬೋಲ್ಡ್ + ಮ್ಯಾಥೆಮೆಟಿಕಲ್ ಡಬಲ್-ಸ್ಟ್ರಕ್ + ಮ್ಯಾಥೆಮೆಟಿಕಲ್ ಮೋನೊಸ್ಪೇಸ್ + ಮ್ಯಾಥೆಮೆಟಿಕಲ್ ಸ್ಯಾನ್ಸ್-ಸೆರಿಫ್ ಬೋಲ್ಡ್ + ಮ್ಯಾಥೆಮೆಟಿಕಲ್ ಸ್ಯಾನ್ಸ್-ಸೆರಿಫ್ ಮಲಯಾಳಂ ಅಂಕಿಗಳು ಮಂಗೋಲಿಯಾದ ಅಂಕೆಗಳು ಮೈಟಿ ಮಯೆಕ್ ಅಂಕೆಗಳು ಮ್ಯಾನ್ಮಾರ್ ಅಂಕೆಗಳು + ಮ್ಯಾನ್ಮರ್ ಈಸ್ಟರ್ನ್ ಪ್ವೋ ಕರೆನ್ + ಮ್ಯಾನ್ಮರ್ ಪವೊ + ಮ್ಯಾನ್ಮರ್ ಶಾನ್ + ಮ್ಯಾನ್ಮರ್ ಟೈ ಲೈಯಿಂಗ್ ಸ್ಥಳೀಯ ಅಂಕೆಗಳು + ನೇಟಿವ್ ಡಿಜಿಟ್‌ಗಳು ಓಲ್ ಚಿಕಿ ಅಂಕೆಗಳು ಒರಿಯಾ ಅಂಕೆಗಳು + ಔಟ್‌ಲೈನಡ್ ರೋಮನ್ ಸಂಖ್ಯೆಗಳು + ರೋಮನ್ ಅಪ್ಪರ್‌ಕೇಸ್ ರೋಮನ್ ಲೋವರ್‌ಕೇಸ್ ಸಂಖ್ಯೆಗಳು + ರೋಮನ್ ಲೋವರ್‌ಕೇಸ್ + ಸೆಗ್ಮೆಂಟ್ ಮಾಡಿರುವುದು ಸಾಂಪ್ರದಾಯಿಕ ತಮಿಳು ಸಂಖ್ಯೆಗಳು ತಮಿಳು ಅಂಕೆಗಳು + ಆಧುನಿಕ ತಮಿಳು ತೆಲುಗು ಅಂಕೆಗಳು ಥಾಯ್ ಅಂಕೆಗಳು ಟಿಬೇಟಿಯನ್ ಅಂಕೆಗಳು ಸಾಂಪ್ರದಾಯಿಕ ಸಂಖ್ಯೆಗಳು + ಸಾಂಪ್ರದಾಯಿಕ ಸಂಖ್ಯೆಗಳು ವಾಯ್ ಅಂಕೆಗಳು ಆಫ್ ಆನ್ + ನಿರ್ದಿಷ್ಟಪಡಿಸದ ಮಷಿನ್ ಅನುವಾದ + POSIX ವೇರಿಯಂಟ್ + + ಆಫ್ + ಆನ್ + ಮೆಟ್ರಿಕ್ ಯುಕೆ @@ -1316,6 +1402,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + {1} {0} @@ -1367,6 +1456,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MM-y G + + {0} – {1} + {0}–{1} + {0} – {1} M–M @@ -1386,6 +1479,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d –d MMM d MMM – d MMM + + MMMM d – d + y–y G @@ -1590,6 +1686,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1639,18 +1738,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E, d MMM d MMMM + E, d MMMM M/y d/M/y E, M/d/y MM-y MMM y - MMM d,y + d MMM y E, MMM d, y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y + + {0} – {1} + {0} – {1} h:mm – h:mm a @@ -1688,6 +1793,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d – d d MMM – d MMM + + MMMM d – d + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2497,7 +2606,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಫಮಾಗುಸ್ತಾ - ಪ್ರಾಗ್ವೆ + ಪ್ರಾಗ್ ಬುಸಿಂಜೆನ್ @@ -2578,9 +2687,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಲಿಬ್ರೆವೀಲ್ - - ಬ್ರಿಟಿಷ್ ಬೇಸಿಗೆ ಸಮಯ - ಲಂಡನ್ @@ -2671,10 +2777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಜಯಪುರ - - ಐರಿಷ್ ಪ್ರಮಾಣಿತ ಸಮಯ - - ಡುಬ್ಲಿನ್ + ಡಬ್ಲಿನ್ ಜೆರುಸಲೆಮ್ @@ -3371,9 +3474,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ಏಕರ್ ಸಮಯ - ಏಕರ್ ಪ್ರಮಾಣಿತ ಸಮಯ - ಏಕರ್ ಬೇಸಿಗೆ ಸಮಯ + ಏಕರ್ ಸಮಯ + ಏಕರ್ ಪ್ರಮಾಣಿತ ಸಮಯ + ಏಕರ್ ಬೇಸಿಗೆ ಸಮಯ @@ -3408,13 +3511,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‌ಅಲಾಸ್ಕಾ ಹಗಲು ಸಮಯ - - - ಆಲ್ಮೇಟಿ ಸಮಯ - ಆಲ್ಮೇಟಿ ಪ್ರಮಾಣಿತ ಸಮಯ - ಆಲ್ಮೇಟಿ ಬೇಸಿಗೆ ಸಮಯ - - ಅಮೆಜಾನ್ ಸಮಯ @@ -3464,20 +3560,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಅಪಿಯಾ ಹಗಲು ಸಮಯ - - - ಅಕ್ಟೌ ಸಮಯ - ಅಕ್ಟೌ ಪ್ರಮಾಣಿತ ಸಮಯ - ಅಕ್ಟೌ ಬೇಸಿಗೆ ಸಮಯ - - - - - ಅಕ್ಟೋಬೆ ಸಮಯ - ಅಕ್ಟೋಬೆ ಪ್ರಮಾಣಿತ ಸಮಯ - ಅಕ್ಟೋಬೆ ಬೇಸಿಗೆ ಸಮಯ - - ಅರೇಬಿಯನ್ ಸಮಯ @@ -3579,6 +3661,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಬ್ರೆಸಿಲಿಯಾ ಬೇಸಿಗೆ ಸಮಯ + + + ಬ್ರಿಟಿಷ್ ಸಮಯ + ಬ್ರಿಟಿಷ್ ಬೇಸಿಗೆ ಸಮಯ + + ಬ್ರೂನಿ ದಾರುಸಲೆಮ್ ಸಮಯ @@ -3752,6 +3840,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಗ್ರೀನ್‌ವಿಚ್ ಸರಾಸರಿ ಕಾಲಮಾನ + + + ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಸಮಯ + ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಪ್ರಮಾಣಿತ ಸಮಯ + ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಬೇಸಿಗೆ ಸಮಯ + + ಪೂರ್ವ ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಸಮಯ @@ -3766,11 +3861,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಪಶ್ಚಿಮ ಗ್ರೀನ್‌ಲ್ಯಾಂಡ್ ಬೇಸಿಗೆ ಸಮಯ - - - ಗುವಾಮ್ ಪ್ರಮಾಣಿತ ಸಮಯ - - ಗಲ್ಫ್ ಪ್ರಮಾಣಿತ ಸಮಯ @@ -3783,7 +3873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ಹವಾಯಿ-ಅಲ್ಯುಟಿಯನ್ ಪ್ರಮಾಣಿತ ಸಮಯ + ಹವಾಯಿ ಸಮಯ @@ -3847,6 +3937,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಇರಾನ್ ಹಗಲು ಸಮಯ + + + ಐರಿಷ್ ಸಮಯ + ಐರಿಷ್ ಪ್ರಮಾಣಿತ ಸಮಯ + + ಇರ್‌ಕುಟಸ್ಕ್ ಸಮಯ @@ -3870,9 +3966,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ಪೆತ್ರೋಪಾವ್ಲೋಸ್ಕ್‌‌-ಕಮ್ಚತ್ಸ್‌ಕೀ ಸಮಯ - ಪೆತ್ರೋಪಾವ್ಲೋಸ್ಕ್‌‌-ಕಮ್ಚತ್ಸ್‌ಕೀ ಪ್ರಮಾಣಿತ ಸಮಯ - ಪೆತ್ರೋಪಾವ್ಲೋಸ್ಕ್‌‌-ಕಮ್ಚತ್ಸ್‌ಕೀ ಬೇಸಿಗೆ ಸಮಯ + ಕಾಮ್‌ಚಾಟ್ಕಾ ಸಮಯ + ಕಾಮ್‌ಚಾಟ್ಕಾ ಪ್ರಮಾಣಿತ ಸಮಯ + ಕಾಮ್‌ಚಾಟ್ಕಾ ಬೇಸಿಗೆ ಸಮಯ @@ -3914,11 +4010,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಕಿರ್ಗಿಸ್ತಾನ್ ಸಮಯ - - - ಲಂಕಾ ಸಮಯ - - ಲೈನ್ ದ್ವೀಪಗಳ ಸಮಯ @@ -3931,13 +4022,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಲಾರ್ಡ್ ಹೋವ್ ಬೆಳಗಿನ ಸಮಯ - - - ಮಕಾವ್ ಸಮಯ - ಮಕಾವ್ ಪ್ರಮಾಣಿತ ಸಮಯ - ಮಕಾವ್ ಬೇಸಿಗೆ ಸಮಯ - - ಮಗಡಾನ್ ಸಮಯ @@ -4053,11 +4137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಫರ್ನಾಂಡೋ ದೆ ನೊರೊನ್ಹಾ ಬೇಸಿಗೆ ಸಮಯ - - - ಉತ್ತರ ಮರಿಯಾನಾ ದ್ವೀಪಗಳ ಸಮಯ - - ನೊವೊಸಿಬಿರ್‌ಸ್ಕ್ ಸಮಯ @@ -4137,13 +4216,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಪ್ಯೊಂಗ್ಯಾಂಗ್ ಸಮಯ - - - ಕೋಜಿಲೋರ್ಡಾ ಸಮಯ - ಕೋಜಿಲೋರ್ಡಾ ಪ್ರಮಾಣಿತ ಸಮಯ - ಕೋಜಿಲೋರ್ಡಾ ಬೇಸಿಗೆ ಸಮಯ - - ರಿಯೂನಿಯನ್ ಸಮಯ @@ -4163,16 +4235,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ಸಮರ ಸಮಯ - ಸಮರ ಪ್ರಮಾಣಿತ ಸಮಯ - ಸಮರ ಬೇಸಿಗೆ ಸಮಯ + ಸಮಾರ ಸಮಯ + ಸಮಾರ ಪ್ರಮಾಣಿತ ಸಮಯ + ಸಮಾರ ಬೇಸಿಗೆ ಸಮಯ - ಸಮೋವಾ ಸಮಯ ಸಮೋವಾ ಪ್ರಮಾಣಿತ ಸಮಯ - ಸಮೋವಾ ಬೇಸಿಗೆ ಸಮಯ @@ -4241,9 +4311,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ಟರ್ಕಿ ಸಮಯ - ಟರ್ಕಿ ಪ್ರಮಾಣಿತ ಸಮಯ - ಟರ್ಕಿ ಬೇಸಿಗೆ ಸಮಯ + ತುರ್ಕಿಯೇ ಸಮಯ + ತುರ್ಕಿಯೇ ಪ್ರಮಾಣಿತ ಸಮಯ + ತುರ್ಕಿಯೇ ಬೇಸಿಗೆ ಸಮಯ @@ -4265,6 +4335,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಉರುಗ್ವೇ ಬೇಸಿಗೆ ಸಮಯ + + + ಉರುಮ್‌ಕಿ ಸಮಯ + + ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸಮಯ @@ -5257,8 +5332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್ - ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್ - ಜಿಂಬಾಬ್ವಿಯನ್ ಗೋಲ್ಡ್ @@ -5919,26 +5992,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter ಶತಮಾನಗಳು - {0} ಶತಮಾನವು + {0} ಶತಮಾನ {0} ಶತಮಾನವನ್ನು {0} ಶತಮಾನಕ್ಕೆ {0} ಶತಮಾನದ {0} ಶತಮಾನದಲ್ಲಿ {0} ಶತಮಾನ - {0}ಶತಮಾನಗಳು + {0} ಶತಮಾನಗಳು {0} ಶತಮಾನಗಳನ್ನು {0} ಶತಮಾನಗಳಿಗೆ {0} ಶತಮಾನಗಳ {0} ಶತಮಾನಗಳಲ್ಲಿ + {0} ಶತಮಾನಗಳು neuter ದಶಕಗಳು - {0} ದಶಕವು + {0} ದಶಕ {0} ದಶಕವನ್ನು {0} ದಶಕಕ್ಕೆ {0} ದಶಕದ {0} ದಶಕದಲ್ಲಿ + {0} ದಶಕ {0} ದಶಕಗಳು {0} ದಶಕಗಳನ್ನು {0} ದಶಕಗಳಿಗೆ @@ -5952,7 +6027,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ವರ್ಷಕ್ಕೆ {0} ವರ್ಷದ {0} ವರ್ಷದಲ್ಲಿ - {0} ವರ್ಷ {0} ವರ್ಷಗಳು {0} ವರ್ಷಗಳನ್ನು {0} ವರ್ಷಗಳಿಗೆ @@ -5963,7 +6037,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter ತ್ರೈಮಾಸಿಕಗಳು - {0} ತ್ರೈಮಾಸಿಕವು + {0} ತ್ರೈಮಾಸಿಕ {0} ತ್ರೈಮಾಸಿಕವನ್ನು {0} ತ್ರೈಮಾಸಿಕಕ್ಕೆ {0} ತ್ರೈಮಾಸಿಕದ @@ -5992,11 +6066,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter - {0} ವಾರವು + {0} ವಾರ {0} ವಾರವನ್ನು {0} ವಾರಕ್ಕೆ {0} ವಾರದ {0} ವಾರದಲ್ಲಿ + {0} ವಾರ {0} ವಾರಗಳು {0} ವಾರಗಳನ್ನು {0} ವಾರಗಳಿಗೆ @@ -6006,11 +6081,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter - {0} ದಿನವು + {0} ದಿನ {0} ದಿನವನ್ನು {0} ದಿನಕ್ಕೆ {0} ದಿನದ {0} ದಿನದಲ್ಲಿ + {0} ದಿನ {0} ದಿನಗಳು {0} ದಿನಗಳನ್ನು {0} ದಿನಗಳಿಗೆ @@ -6034,11 +6110,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter - {0} ನಿಮಿಷವು + {0} ನಿಮಿಷ {0} ನಿಮಿಷವನ್ನು {0} ನಿಮಿಷಕ್ಕೆ {0} ನಿಮಿಷದ {0} ನಿಮಿಷದಲ್ಲಿ + {0} ನಿಮಿಷ {0} ನಿಮಿಷಗಳು {0} ನಿಮಿಷಗಳನ್ನು {0} ನಿಮಿಷಗಳಿಗೆ @@ -6048,11 +6125,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter + ಸೆಕೆಂಡ್‌ಗಳು {0} ಸೆಕೆಂಡ್ - {0} ಸೆಕೆಂಡನ್ನು + {0} ಸೆಕೆಂಡ್ ಅನ್ನು {0} ಸೆಕೆಂಡಿಗೆ - {0} ಸೆಕೆಂಡಿನ - {0} ಸೆಕೆಂಡಿನಲ್ಲಿ + {0} ಸೆಕೆಂಡ್‌ನ + {0} ಸೆಕೆಂಡ್‌ನಲ್ಲಿ {0} ಸೆಕೆಂಡುಗಳು {0} ಸೆಕೆಂಡುಗಳನ್ನು {0} ಸೆಕೆಂಡುಗಳಿಗೆ @@ -6062,34 +6140,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter + ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳು {0} ಮಿಲಿಸೆಕೆಂಡ್ {0} ಮಿಲಿಸೆಕೆಂಡ್ ಅನ್ನು - {0} ಮಿಲಿಸೆಕೆಂಡಿಗೆ - {0} ಮಿಲಿಸೆಕೆಂಡಿನ - {0} ಮಿಲಿಸೆಕೆಂಡಿನಲ್ಲಿ - {0} ಮಿಲಿಸೆಕೆಂಡುಗಳು + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗೆ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ನ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ನಲ್ಲಿ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳು {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳನ್ನು - {0} ಮಿಲಿಸೆಕೆಂಡುಗಳಿಗೆ - {0} ಮಿಲಿಸೆಕೆಂಡುಗಳ - {0} ಮಿಲಿಸೆಕೆಂಡುಗಳಲ್ಲಿ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳಿಗೆ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳ + {0} ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳಲ್ಲಿ neuter - ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು + ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳು {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್ {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್ ಅನ್ನು {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗೆ {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ನ {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ನಲ್ಲಿ - {0} ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳು + {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳು {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳನ್ನು {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳಿಗೆ - {0} ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳ - {0} ಮೈಕ್ರೊಸೆಕೆಂಡುಗಳಲ್ಲಿ + {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳ + {0} ಮೈಕ್ರೊಸೆಕೆಂಡ್‌ಗಳಲ್ಲಿ neuter - ನ್ಯಾನೊಸೆಕೆಂಡುಗಳು + ನ್ಯಾನೊಸೆಕೆಂಡ್‌ಗಳು {0} ನ್ಯಾನೊಸೆಕೆಂಡ್ {0} ನ್ಯಾನೊಸೆಕೆಂಡ್ ಅನ್ನು {0} ನ್ಯಾನೊಸೆಕೆಂಡ್‌ಗೆ @@ -7754,7 +7833,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ಶ - ದಶ + ದಶಕ {0} ದಶ {0} ದಶ @@ -7801,13 +7880,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/ನಿಮಿ - ಸೆಕೆಂಡುಗಳು + ಸೆಕೆಂಡ್‌ಗಳು {0} ಸೆಕೆಂ {0} ಸೆಕೆಂ {0}/ಸೆ - ಮಿಲಿಸೆಕೆಂಡುಗಳು + ಮಿಲಿಸೆಕೆಂಡ್‌ಗಳು {0} ಮಿ.ಸೆ. {0} ಮಿ.ಸೆ. @@ -8643,11 +8722,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ವಸ್ತು {0}ವಸ್ತು - - ಪಾರ್ಟ್ - {0} ಪಾರ್ಟ್ - {0} ಪಾರ್ಟ್ - ಭಾಪ್ರಮಿ {0}ಭಾಪ್ರಮಿ @@ -8666,11 +8740,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ಮೋಲ್ {0}ಮೋಲ್ - - Glc - {0} Glc - {0} Glc - ಲೀ/ಕಿಮೀ @@ -8738,6 +8807,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ಬಿಟ್ {0}ಬಿಟ್ + + {0}ಶ + {0}ಶ + ದಶಕ {0} ದಶಕ @@ -9264,13 +9337,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt-Imp. {0}qt-Imp. - - ಕ್ಯಾಟ್ - {0} ಕ್ಯಾಟ್ - {0} ಕ್ಯಾಟ್ - - - cal-IT + + {0} H + {0} H ರಾತ್ರಿಗಳು diff --git a/make/data/cldr/common/main/ko.xml b/make/data/cldr/common/main/ko.xml index 23c3962d005e..e7f7bd5b8095 100644 --- a/make/data/cldr/common/main/ko.xml +++ b/make/data/cldr/common/main/ko.xml @@ -433,6 +433,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 팔리어 피진어 폴란드어 + 피에몬테어 폰틱어 폼페이어 말리시트 파사마쿼디어 @@ -1161,24 +1162,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 정렬 순서 표준 정렬 숫자 정렬 + 스크립트/블록 순서 변경 정렬 강도 통화 + 변환 대상 + 사전 단어 분리 제외 이모티콘 표시 + 일주일의 첫날 + 혼합 시간표시법(12시, 24시) + 입력기 + 키보드 + 최상위 무시 항목 줄바꿈 스타일 단어의 줄바꿈 + 변환 규칙 계량법 + 측정 단위 숫자 + 추가 데이터용 지역 + 변환 원본 + 지역 하위 구분 약어 뒤 문장 구분 + 변환 + 기계 번역 시간대 방언 - 공개 여부 + 사용자 정의 + 사용자 정의 변환 불교력 불교 음력 - 음 + 음력 콥트력 콥트 단기력 @@ -1188,17 +1205,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 에티오피아 아메테 알렘력 에티오피아 아메테 알렘 양력 - 양 + 양력 히브리력 히브리 인도력 + 인도 국정력 히즈라력 히즈라 히즈라 상용력 히즈라 상용 + 히즈라력(사우디아라비아 초승달 관측) + 히즈라력(표 계산 방식, 천문학적 기준) 히즈라력(움 알 쿠라) 히즈라(움 알 쿠라) - ISO-8601 달력 + 양력(ISO-8601) + 양력 일본력 일본 페르시안력 @@ -1214,59 +1235,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 악센트 일반 정렬 악센트 역순 정렬 첫 소문자 정렬 + 소문자 일반 대/소문자 정렬 순서 + 소문자 대문자 우선 정렬 + 대문자 대/소문자 무시 정렬 대/소문자 구분 정렬 호환성을 위해 이전 정렬 순서 - 호환성 - 사전 정렬순 - 사전 + 호환성 + 사전 정렬 순서 + 사전 기본 유니코드 정렬 순서 - 기본 유니코드 + 기본 유니코드 + 이모티콘 유럽 정렬 규칙 - 전화번호부순 + 유럽 규칙 + 전화번호부 정렬 순서 전화번호부 - 소리나는 대로 정렬 순서 - 소리나는 대로 - 병음순 + 발음 정렬 순서 + 발음 + 병음 정렬 순서 병음 범용 검색 검색 한글 자음으로 검색 + 한글 초성 표준 정렬 순서 표준 - 자획순 + 자획 정렬 순서 자획 - 전통 역법 + 전통 역법 정렬 순서 전통 - 부수순 + 부수 정렬 순서 부수 - 주음순 + 주음 정렬 순서 주음 표준화 없이 정렬 유니코드 표준화 정렬 숫자별 정렬 숫자 정렬 + 통화 + 숫자 + 구두점 + 공백 + 기호 모두 정렬 + 모두 기본 문자만 정렬 + 기본 문자만 악센트/대소문자/전반각/가나 정렬 + 기본, 악센트, 대소문자, 변형, 가나 악센트 정렬 + 기본, 악센트 악센트/대소문자/전반각 정렬 + 기본, 악센트, 대소문자, 변형 전각 반각 숫자 기본 이모티콘 텍스트 - 12시간제(0–11) - 12(0–11) - 12시간제(1–12) - 12(1–12) - 24시간제(0–23) - 24(0–23) - 24시간제(1–24) - 24(1–24) + 12시간제 + 12 + 24시간제 + 24 + 12시간제(0~11) + 12(0~11) + 12시간제(1~12) + 12(1~12) + 24시간제(0~23) + 24(0~23) + 24시간제(1~24) + 24(1~24) + 공백, 구두점, 모든 기호 + 공백, 구두점 + 공백, 구두점 + 공백, 구두점, 통화 이외의 기호 줄바꿈 - 넓게 넓게 줄바꿈 - 보통 @@ -1287,8 +1332,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 미국식 아라비아-인도식 숫자 확장형 아라비아-인도식 숫자 + 확장형 아라비아-인도식 아르메니아 숫자 아르메니아 소문자 숫자 + 아르메니아 소문자 발리 숫자 뱅골 숫자 브라미 숫자 @@ -1297,54 +1344,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 데바나가리 숫자 에티오피아 숫자 재무 숫자 + 재무 전자 숫자 + 전자 조지아 숫자 그리스 숫자 그리스어 소문자 숫자 + 그리스어 소문자 구자라트 숫자 굴묵키 숫자 + 전통 달력용 한자 날짜 표기 중국어 십진 숫자 + 중국 숫자 한자 기반 십진법 표기 체계 중국어 간체 숫자 - 중국어 간체 재무 숫자 + 중국어 간체 금융 회계용 숫자 + 중국어 간체 금융 회계용 중국어 번체 숫자 - 중국어 번체 재무 숫자 + 중국어 번체 금융 회계용 숫자 + 중국어 번체 금융 회계용 히브리 숫자 자바 숫자 일본 숫자 - 일본 재무 숫자 + 일본어 금융 회계용 숫자 + 일본어 금융 회계용 + 일본 연호 원년 표기 카야 리식 숫자 크메르 숫자 칸나다 숫자 타이 탐 호라 숫자 타이 탐탐 숫자 + 타이탐 문자(종교용) 라오 숫자 서양 숫자 렙차 숫자 림부 숫자 + 수학용 굵은체 + 수학용 이중 획 + 수학용 고정폭 + 수학용 산세리프 굵은체 + 수학용 산세리프 말라얄람 숫자 몽골 숫자 메이테이 마옉 숫자 미얀마 숫자 + 미얀마 동부 포 카렌어 + 미얀마 파오어 미얀마 샨 숫자 - 기본 숫자 + 미얀마 샨어 + 미얀마 타이 라잉어 + 고유 숫자 + 고유 숫자 올치키 숫자 오리야 숫자 오스마냐 숫자 + 윤곽선 로마 숫자 + 로마 대문자 로마 소문자 숫자 + 로마 소문자 사우라슈트라 숫자 + 구획형 샤라다 숫자 순다 숫자 고대 타밀 숫자 타밀 숫자 + 현대 타밀어 텔루구 숫자 태국 숫자 티벳 숫자 전통적인 숫자 + 전통 숫자 바이 숫자 끔 켬 + 지정되지 않은 기계 번역 + POSIX 변형 + + 끔 + 켬 + 미터법 영국식 @@ -1766,18 +1845,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G y. M. d. + G y/M/d GyMd - G y. M. d. + G y/M/d GyMd + + / + {1} {0} @@ -1827,19 +1909,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ a h시 v H시 v M월 - M. d. - M. d. (E) - M. d. EEEE + M/d + M/d E + M/d EEEE M월 d일 M월 d일 (E) M월 d일 EEEE M월 d일 G y년 G y년 - G y. M. - G y. M. d. - G y. M. d. (E) - G y. M. d. EEEE + G y/M + G y/M/d + G y/M/d E + G y/M/d EEEE G y년 M월 G y년 M월 d일 G y년 M월 d일 (E) @@ -1849,56 +1931,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y년 QQQQ - {0} ~ {1} + {0}~{1} - B h시 ~ B h시 - B h시 ~ h시 + B h시~B h시 + B h시~h시 - B h:mm ~ B h:mm - B h:mm ~ h:mm - B h:mm ~ h:mm + B h:mm~B h:mm + B h:mm~h:mm + B h:mm~h:mm - d일 ~ d일 + d일~d일 - G y년 ~ G y년 + G y년~G y년 G y년~y년 - GGGGG y년 M월 ~ GGGGG y년 M월 - GGGGG y년 M월 ~ y년 M월 - GGGGG y년 M월 ~ y년 M월 + G y/M~G y/M + G y/M~y/M + G y/M~y/M - GGGGG y년 M월 d일 ~ y년 M월 d일 - GGGGG y년 M월 d일 ~ GGGGG y년 M월 d일 - GGGGG y년 M월 d일 ~ y년 M월 d일 - GGGGG y년 M월 d일 ~ y년 M월 d일 + G y/M/d~y/M/d + G y/M/d~G y/M/d + G y/M/d~y/M/d + G y/M/d~y/M/d - GGGGG y년 M월 d일 E요일 ~ y년 M월 d일 E요일 - GGGGG y년 M월 d일 E요일 ~ GGGGG y년 M월 d일 E요일 - GGGGG y년 M월 d일 E요일 ~ y년 M월 d일 E요일 - GGGGG y년 M월 d일 E요일 ~ y년 M월 d일 E요일 + G y/M/d E~y/M/d E + G y/M/d E~G y/M/d E + G y/M/d E~y/M/d E + G y/M/d E~y/M/d E - G y년 M월 ~ G y년 M월 - G y년 M월 ~ y년 M월 - G y년 M월 ~ y년 M월 + G y년 MMM~G y년 MMM + G y년 M월~y년 M월 + G y년 M월~y년 M월 - G y년 M월 d일 ~ d일 - G y년 M월 d일 ~ y년 M월 d일 - G y년 M월 d일 ~ M월 d일 - G y년 M월 d일 ~ y년 M월 d일 + G y년 M월 d일~d일 + G y년 M월 d일~y년 M월 d일 + G y년 M월 d일~M월 d일 + G y년 M월 d일~y년 M월 d일 - G y년 M월 d일 e요일 – M월 d일 e요일 - G y년 M월 d일 E요일 ~ G y년 M월 d일 E요일 - G y년 M월 d일 E요일 ~ M월 d일 E요일 - G y년 M월 d일 E요일 ~ y년 M월 d일 E요일 + G y년 MMM d일 E요일~MMM d일 E요일 + G y년 M월 d일 E요일~G y년 M월 d일 E요일 + G y년 M월 d일 E요일~M월 d일 E요일 + G y년 M월 d일 E요일~y년 M월 d일 E요일 a h시 ~ a h시 @@ -1933,26 +2015,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH ~ HH시 v - M월 ~ M월 + M월~M월 - M. d ~ M. d - M. d ~ M. d + M/d~M/d + M/d~M/d - M. d (E) ~ M. d (E) - M. d (E) ~ M. d (E) + M/d E~M/d E + M/d E~M/d E - M월 ~ M월 + M월~M월 - M월 d일 ~ d일 - M월 d일 ~ M월 d일 + M월 d일~d일 + M월 d일~M월 d일 - M월 d일 (E) ~ d일 (E) - M월 d일 (E) ~ M월 d일 (E) + M월 d일 (E)~d일 (E) + MMM d일 (E)~MMM d일 (E) M월 d일 EEEE ~ d일 EEEE @@ -1961,36 +2043,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL ~ LLLL + + MMMM d일~d일 + MMMM d일~MMMM d일 + - G y년 ~ y년 + G y년~y년 - G y. M ~ y. M - G y. M ~ y. M + G y/M~y/M + G y/M~y/M - G y. M. d. ~ y. M. d. - G y. M. d. ~ y. M. d. - G y. M. d. ~ y. M. d. + G y/M/d~y/M/d + G y/M/d~y/M/d + G y/M/d~y/M/d - G y. M. d. (E) ~ y. M. d. (E) - G y. M. d. (E) ~ y. M. d. (E) - G y. M. d. (E) ~ y. M. d. (E) + G y/M/d E~y/M/d E + G y/M/d E ~y/M/d E + G y/M/d E ~y/M/d E G y년 M월~M월 - G y년 M월 ~ y년 M월 + G y년 M월~y년 M월 G y년 M월 d일~d일 - G y년 M월 d일 ~ M월 d일 - G y년 M월 d일 ~ y년 M월 d일 + G y년 M월 d일~M월 d일 + G y년 M월 d일~y년 M월 d일 - G y년 M월 d일 (E) ~ d일 (E) - G y년 M월 d일 (E) ~ M월 d일 (E) - G y년 M월 d일 (E) ~ y년 M월 d일 (E) + G y년 M월 d일 (E)~d일 (E) + G y년 M월 d일 (E)~M월 d일 (E) + G y년 M월 d일 (E)~y년 M월 d일 (E) G y년 M월 d일 EEEE ~ d일 EEEE @@ -1998,8 +2084,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y년 M월 d일 EEEE ~ y년 M월 d일 EEEE - G y년 MM월 ~ MM월 - G y년 MM월 ~ y년 MM월 + G y년 MM월~MM월 + G y년 MM월~y년 MM월 @@ -2101,28 +2187,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 저녁 밤 - - 오전 - 오후 - - - 오전 - 오후 - - - - - 오전 - 오후 - - - 오전 - 오후 - - - 오전 - 오후 - @@ -2222,7 +2286,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ (E) B h:mm:ss d일 (E) d일 EEEE - (E) a h + E a h시 (E) a h:mm (E) HH:mm (E) a h:mm:ss @@ -2235,14 +2299,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y년 MMM d일 G y년 MMM d일 (E) G y년 MMM d일 EEEE + G y년 MMMM + G y년 MMMM d일 + G y년 MMMM d일 (E) a h시 H시 HH:mm:ss a h:mm a h:mm:ss - H시 m분 s초 a h:mm:ss v - H시 m분 s초 v a h:mm v a h시 v H시 v @@ -2254,24 +2319,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d일 (E) MMM d일 EEEE MMMM d일 + MMMM d일 (E) MMMM W번째 주 mm:ss y년 - y. M. - y. M. d. - y. M. d. (E) - y. M. d. EEEE - y. M. + y/M + y/M/d + y/M/d E + y/M/d EEEE + y/M y년 MMM y년 MMM d일 y년 MMM d일 (E) y년 MMM d일 EEEE y년 MMMM + y년 MMMM d일 + y년 MMMM d일 (E) y년 QQQ y년 QQQQ Y년 w번째 주 + + {0} ({1}) + ({1}) {0} + + + {0}~{1} + {0}~{1} + {0}~{1} + {0} ~ {1} B h시 ~ B h시 @@ -2380,6 +2457,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL + + MMMM d일 – d일 + MMMM d일 – MMMM d일 + y년 ~ y년 @@ -2518,238 +2599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 다이카 (645 ~ 650) - 하쿠치 (650 ~ 671) - 하쿠호 (672 ~ 686) - 슈초 (686 ~ 701) - 다이호 (701 ~ 704) - 게이운 (704 ~ 708) - 와도 (708 ~ 715) - 레이키 (715 ~ 717) - 요로 (717 ~ 724) - 진키 (724 ~ 729) - 덴표 (729 ~ 749) - 덴표칸포 (749 ~ 749) - 덴표쇼호 (749 ~ 757) - 덴표호지 (757 ~ 765) - 덴표진고 (765 ~ 767) - 진고케이운 (767 ~ 770) - 호키 (770 ~ 780) - 덴오 (781 ~ 782) - 엔랴쿠 (782 ~ 806) - 다이도 (806 ~ 810) - 고닌 (810 ~ 824) - 덴초 (824 ~ 834) - 조와 (834 ~ 848) - 가쇼 (848 ~ 851) - 닌주 (851 ~ 854) - 사이코 (854 ~ 857) - 덴난 (857 ~ 859) - 조간 (859 ~ 877) - 간교 (877 ~ 885) - 닌나 (885 ~ 889) - 간표 (889 ~ 898) - 쇼타이 (898 ~ 901) - 엔기 (901 ~ 923) - 엔초 (923 ~ 931) - 조헤이 (931 ~ 938) - 덴교 (938 ~ 947) - 덴랴쿠 (947 ~ 957) - 덴토쿠 (957 ~ 961) - 오와 (961 ~ 964) - 고호 (964 ~ 968) - 안나 (968 ~ 970) - 덴로쿠 (970 ~ 973) - 덴엔 (973 ~ 976) - 조겐 (976 ~ 978) - 덴겐 (978 ~ 983) - 에이간 (983 ~ 985) - 간나 (985 ~ 987) - 에이엔 (987 ~ 989) - 에이소 (989 ~ 990) - 쇼랴쿠 (990 ~ 995) - 조토쿠 (995 ~ 999) - 조호 (999 ~ 1004) - 간코 (1004 ~ 1012) - 조와 (1012 ~ 1017) - 간닌 (1017 ~ 1021) - 지안 (1021 ~ 1024) - 만주 (1024 ~ 1028) - 조겐 (1028 ~ 1037) - 조랴쿠 (1037 ~ 1040) - 조큐 (1040 ~ 1044) - 간토쿠 (1044 ~ 1046) - 에이쇼 (1046 ~ 1053) - 덴기 (1053 ~ 1058) - 고헤이 (1058 ~ 1065) - 지랴쿠 (1065 ~ 1069) - 엔큐 (1069 ~ 1074) - 조호 (1074 ~ 1077) - 쇼랴쿠 (1077 ~ 1081) - 에이호 (1081 ~ 1084) - 오토쿠 (1084 ~ 1087) - 간지 (1087 ~ 1094) - 가호 (1094 ~ 1096) - 에이초 (1096 ~ 1097) - 조토쿠 (1097 ~ 1099) - 고와 (1099 ~ 1104) - 조지 (1104 ~ 1106) - 가쇼 (1106 ~ 1108) - 덴닌 (1108 ~ 1110) - 덴에이 (1110 ~ 1113) - 에이큐 (1113 ~ 1118) - 겐에이 (1118 ~ 1120) - 호안 (1120 ~ 1124) - 덴지 (1124 ~ 1126) - 다이지 (1126 ~ 1131) - 덴쇼 (1131 ~ 1132) - 조쇼 (1132 ~ 1135) - 호엔 (1135 ~ 1141) - 에이지 (1141 ~ 1142) - 고지 (1142 ~ 1144) - 덴요 (1144 ~ 1145) - 규안 (1145 ~ 1151) - 닌페이 (1151 ~ 1154) - 규주 (1154 ~ 1156) - 호겐 (1156 ~ 1159) - 헤이지 (1159 ~ 1160) - 에이랴쿠 (1160 ~ 1161) - 오호 (1161 ~ 1163) - 조칸 (1163 ~ 1165) - 에이만 (1165 ~ 1166) - 닌난 (1166 ~ 1169) - 가오 (1169 ~ 1171) - 조안 (1171 ~ 1175) - 안겐 (1175 ~ 1177) - 지쇼 (1177 ~ 1181) - 요와 (1181 ~ 1182) - 주에이 (1182 ~ 1184) - 겐랴쿠 (1184 ~ 1185) - 분지 (1185 ~ 1190) - 겐큐 (1190 ~ 1199) - 쇼지 (1199 ~ 1201) - 겐닌 (1201 ~ 1204) - 겐큐 (1204 ~ 1206) - 겐에이 (1206 ~ 1207) - 조겐 (1207 ~ 1211) - 겐랴쿠 (1211 ~ 1213) - 겐포 (1213 ~ 1219) - 조큐 (1219 ~ 1222) - 조오 (1222 ~ 1224) - 겐닌 (1224 ~ 1225) - 가로쿠 (1225 ~ 1227) - 안테이 (1227 ~ 1229) - 간키 (1229 ~ 1232) - 조에이 (1232 ~ 1233) - 덴푸쿠 (1233 ~ 1234) - 분랴쿠 (1234 ~ 1235) - 가테이 (1235 ~ 1238) - 랴쿠닌 (1238 ~ 1239) - 엔오 (1239 ~ 1240) - 닌지 (1240 ~ 1243) - 간겐 (1243 ~ 1247) - 호지 (1247 ~ 1249) - 겐초 (1249 ~ 1256) - 고겐 (1256 ~ 1257) - 쇼카 (1257 ~ 1259) - 쇼겐 (1259 ~ 1260) - 분오 (1260 ~ 1261) - 고초 (1261 ~ 1264) - 분에이 (1264 ~ 1275) - 겐지 (1275 ~ 1278) - 고안 (1278 ~ 1288) - 쇼오 (1288 ~ 1293) - 에이닌 (1293 ~ 1299) - 쇼안 (1299 ~ 1302) - 겐겐 (1302 ~ 1303) - 가겐 (1303 ~ 1306) - 도쿠지 (1306 ~ 1308) - 엔쿄 (1308 ~ 1311) - 오초 (1311 ~ 1312) - 쇼와 (1312 ~ 1317) - 분포 (1317 ~ 1319) - 겐오 (1319 ~ 1321) - 겐코 (1321 ~ 1324) - 쇼추 (1324 ~ 1326) - 가랴쿠 (1326 ~ 1329) - 겐토쿠 (1329 ~ 1331) - 겐코 (1331 ~ 1334) - 겐무 (1334 ~ 1336) - 엔겐 (1336 ~ 1340) - 고코쿠 (1340 ~ 1346) - 쇼헤이 (1346 ~ 1370) - 겐토쿠 (1370 ~ 1372) - 분추 (1372 ~ 1375) - 덴주 (1375 ~ 1379) - 고랴쿠 (1379 ~ 1381) - 고와 (1381 ~ 1384) - 겐추 (1384 ~ 1392) - 메이토쿠 (1384 ~ 1387) - 가쿄 (1387 ~ 1389) - 고오 (1389 ~ 1390) - 메이토쿠 (1390 ~ 1394) - 오에이 (1394 ~ 1428) - 쇼초 (1428 ~ 1429) - 에이쿄 (1429 ~ 1441) - 가키쓰 (1441 ~ 1444) - 분안 (1444 ~ 1449) - 호토쿠 (1449 ~ 1452) - 교토쿠 (1452 ~ 1455) - 고쇼 (1455 ~ 1457) - 조로쿠 (1457 ~ 1460) - 간쇼 (1460 ~ 1466) - 분쇼 (1466 ~ 1467) - 오닌 (1467 ~ 1469) - 분메이 (1469 ~ 1487) - 조쿄 (1487 ~ 1489) - 엔토쿠 (1489 ~ 1492) - 메이오 (1492 ~ 1501) - 분키 (1501 ~ 1504) - 에이쇼 (1504 ~ 1521) - 다이에이 (1521 ~ 1528) - 교로쿠 (1528 ~ 1532) - 덴분 (1532 ~ 1555) - 고지 (1555 ~ 1558) - 에이로쿠 (1558 ~ 1570) - 겐키 (1570 ~ 1573) - 덴쇼 (1573 ~ 1592) - 분로쿠 (1592 ~ 1596) - 게이초 (1596 ~ 1615) - 겐나 (1615 ~ 1624) - 간에이 (1624 ~ 1644) - 쇼호 (1644 ~ 1648) - 게이안 (1648 ~ 1652) - 조오 (1652 ~ 1655) - 메이레키 (1655 ~ 1658) - 만지 (1658 ~ 1661) - 간분 (1661 ~ 1673) - 엔포 (1673 ~ 1681) - 덴나 (1681 ~ 1684) - 조쿄 (1684 ~ 1688) - 겐로쿠 (1688 ~ 1704) - 호에이 (1704 ~ 1711) - 쇼토쿠 (1711 ~ 1716) - 교호 (1716 ~ 1736) - 겐분 (1736 ~ 1741) - 간포 (1741 ~ 1744) - 엔쿄 (1744 ~ 1748) - 간엔 (1748 ~ 1751) - 호레키 (1751 ~ 1764) - 메이와 (1764 ~ 1772) - 안에이 (1772 ~ 1781) - 덴메이 (1781 ~ 1789) - 간세이 (1789 ~ 1801) - 교와 (1801 ~ 1804) - 분카 (1804 ~ 1818) - 분세이 (1818 ~ 1830) - 덴포 (1830 ~ 1844) - 고카 (1844 ~ 1848) - 가에이 (1848 ~ 1854) - 안세이 (1854 ~ 1860) - 만엔 (1860 ~ 1861) - 분큐 (1861 ~ 1864) - 겐지 (1864 ~ 1865) - 게이오 (1865 ~ 1868) 메이지 다이쇼 쇼와 @@ -3496,9 +3345,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 리브르빌 - - 영국 하계 표준시 - 런던 @@ -3589,9 +3435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 자야푸라 - - 아일랜드 표준시 - 더블린 @@ -4326,13 +4169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 알래스카 하계 표준시 - - - 알마티 표준 시간 - 알마티 표준 표준시 - 알마티 하계 표준시 - - 아마존 시간 @@ -4356,7 +4192,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 미 산지 시간 + 미 산악 시간 미 산악 표준시 미 산지 하계 표준시 @@ -4382,20 +4218,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 아피아 하계 표준시 - - - 악타우 표준 시간 - 악타우 표준 표준시 - 악타우 하계 표준시 - - - - - 악퇴베 표준 시간 - 악퇴베 표준 표준시 - 악퇴베 하계 표준시 - - 아라비아 시간 @@ -4497,6 +4319,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 브라질리아 하계 표준시 + + + 영국 시간 + 영국 하계 표준시 + + 브루나이 시간 @@ -4675,6 +4503,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 그리니치 표준시 + + + 그린란드 시간 + 그린란드 표준시 + 그린란드 하계 표준시 + + 그린란드 동부 시간 @@ -4689,11 +4524,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 그린란드 서부 하계 표준시 - - - 괌 표준 시간 - - 걸프만 표준시 @@ -4706,7 +4536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 하와이 알류샨 표준시 + 하와이 시간 @@ -4767,6 +4597,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 이란 하계 표준시 + + + 아일랜드 시간 + 아일랜드 표준시 + + 이르쿠츠크 시간 @@ -4790,9 +4626,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 페트로파블롭스크-캄차츠키 시간 - 페트로파블롭스크-캄차츠키 표준시 - 페트로파블롭스크-캄차츠키 하계 표준시 + 캄차카 시간 + 캄차카 표준시 + 캄차카 하계 표준시 @@ -4834,11 +4670,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 키르기스스탄 시간 - - - 랑카 표준 시간 - - 라인 제도 시간 @@ -4851,13 +4682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 로드 하우 하계 표준시 - - - 마카오 시간 - 마카오 표준 시간 - 마카오 하계 표준시 - - 마가단 시간 @@ -4973,11 +4797,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 페르난도 데 노로냐 하계 표준시 - - - 북마리아나 제도 표준 시간 - - 노보시비르스크 시간 @@ -5057,13 +4876,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 평양 시간 - - - 키질로르다 시간 - 키질로르다 표준 시간 - 키질로르다 하계 표준시 - - 레위니옹 시간 @@ -5090,9 +4902,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 사모아 시간 사모아 표준시 - 사모아 하계 표준시 @@ -5161,9 +4971,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 터키 시간 - 터키 표준시 - 터키 일광 절약 시간 + 튀르키예 시간 + 튀르키예 표준시 + 튀르키예 하계 표준시 @@ -5185,6 +4995,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 우루과이 하계 표준시 + + + 우루무치 시간 + + 우즈베키스탄 시간 @@ -6130,7 +5945,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 카리브 길더 - 카리브 길더 특별인출권 @@ -6204,7 +6018,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 짐바브웨 골드 - 짐바브웨 골드 짐바브웨 달러 (2009) @@ -7721,13 +7534,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - {0}part - - - Glc - {0}Glc - B @@ -7755,65 +7561,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}HP - - {0}Hg - {0}mph B{0} - - {0}fl oz m. - dsp Imp {0}dsp-Imp - - {0}sr - - - {0}kat - - - {0}C - - - {0}F - - - {0}H - - - {0}S - - - cal-IT - {0}cal-IT - - - {0}Bq - - - {0}Sv - - - {0}Gy - - - {0}kgf - - - {0}T - - - {0}Wb - - - {0}light - diff --git a/make/data/cldr/common/main/kok.xml b/make/data/cldr/common/main/kok.xml index 1db48bd14be8..2ab1d4109417 100644 --- a/make/data/cldr/common/main/kok.xml +++ b/make/data/cldr/common/main/kok.xml @@ -337,6 +337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic नायजिरियन पिजिन पिजिन पोलिश + पिएडमॉन्टीस मालिसीत-पास्सामाखिडी प्रुसियन पश्तो @@ -849,15 +850,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic दिनदर्शिका चलनाचें स्वरूप + चिन्नां क्रमवारी कडेन दुर्लक्ष करचें + उलट उच्चार क्रमवारी करप + व्हड/ल्हान अक्षरांचो क्रमवारी + केस संवेदनशील क्रमवारी वर्गवारी क्रम + सामान्यीकृत क्रमवारी करप + संख्यात्मक क्रमवारी करप + स्क्रिप्ट/ब्लॉक पुनर्क्रमण करप + क्रमवारी करपाची तांक चलन + गंतव्याचें रुपांतर करचें + शब्दकोश ब्रेक वगडावप इमोजी सादरीकरण + सप्तकाचो पयलो दीस + मिक्स-इन केल्लें वराचें चक्र (12 वि 24) + Input Method + कीबोर्ड + सगळ्यांत चड दुर्लक्षीत रेग खंड करपाची शैली शब्दां भितर ओळी मोडप + नेमांत रुपांतर करप मापन प्रणाली + मापनाचो एकक संख्या + पूरक डेटा खातीर प्रदेश + स्त्रोत रुपांतरीत करप + प्रदेश उपविभाग वाक्य विराम उपरांत Abbr. + रुपांतर करप + मशीन अणकारीत केल्लें + वेळ क्षेत्र + लोकेल वेरिएंट + खाजगी-उपयोग + खाजगी-उपयोग रुपांतर बौद्ध दिनदर्शिका @@ -882,9 +909,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ईस्लामीक ईस्लामीक दिनदर्शिका (कोश्टक, नागरी शक) ईस्लामीक (कोश्टक, नागरी शक) + हिजरी, साउदी अरेबिया दृश्टीकोन + हिजरी (सारणी, खगोलीय पद्दत) २ ईस्लामीक दिनदर्शिका (उम अल-कुरा) ईस्लामीक (उम अल-कुरा) आयएसओ-8601 दिनदर्शिका + ग्रेगोरियन हांणी केला जपानी दिनदर्शिका जपानी पर्शियन दिनदर्शिका @@ -895,15 +925,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic लेखा चलन प्रमाणित चलन स्वरुप प्रमाणित + ल्हान अक्षरां + ल्हान अक्षरां + व्हडले अक्षर + सुसंगतताय + शब्दकोश डिफॉल्ट युनिकोड वर्गवारी क्रम डिफॉल्ट युनिकोड + इमोजी + युरोपीय नेम + फोनबुक + ध्वनीविज्ञानीक + पिनयिन हें नांव सामान्य-उद्देशान केल्लो सोद सोद + कोरियन सुरवातीचो व्यंजन प्रमाणित वर्गवारी क्रम वर्गवारी + आघात + पारंपारीक + रेडिकल-स्ट्रोक + झॅड-टायगर कारण + चलन + अंक + विरामचिन्न + व्हायटस्पेस + चिन्न + सगलें + बेस लेटर्स फक्त + बेस, उच्चार, केस, वेरिएंट, काना + बेस, उच्चार + बेस, उच्चार, केस, वेरिएंट + फुलविड्थ मेरेन + अर्दरुंदी मेरेन डिफॉल्ट इमोजी लिखीत + 12 वरांची यंत्रणा + 12 + 24 वरांची यंत्रणा + 24 12 वरांची यंत्रणा (0–11) 12 (0–11) 12 वरांची यंत्रणा (1–12) @@ -912,6 +973,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 वरांची यंत्रणा (1–24) 24 (1–24) + शिफ्ट जागो, विरामचिन्न, सगळीं चिन्नां + शिफ्ट जागो, विरामचिन्न + शिफ्ट जागो, विरामचिन्न + शिफ्ट जागो, विरामचिन्न, बिगर चलन चिन्नां सुटी रेग खंड शैली सुटी सामान्य रेग खंड शैली @@ -922,6 +987,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic सगळें दवरात सामान्य वाक्यांशांत दवरात + अमेरिकेची बीजीएन लिप्यंतरण + UN AGAINST लिप्यंतरण मॅट्रीक प्रणाली मॅट्रीक भव्य मापन प्रणाली @@ -930,47 +997,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic US अरेबिक-भारतीय अंक विस्तारीत अरेबीक-भारतीय अंक + विस्तारीत अरबी-इंडिक आर्मेनियन संख्या आर्मेनियन लोवरकेस संख्या + Armenian lowercase बांग्ला अंक चाक्मा अंक देवनागरी अंक इथियोपिक संख्या + अर्थिक पूर्ण-रुंदी अंक + पुराय रुंदायेची जॉर्जियन संख्या ग्रीक संख्या ग्रीक लोवरकेस संख्या + ग्रीक लघु अक्षर गुजराती अंक गुरुमुखी अंक + पारंपारीक पंचांगांखातीर हान-अक्षर दिसाचो म्हयनो क्रमांकन चिनी दशांश संख्या + चीनी संख्या विचारलेखांक अंक म्हणून वापरून स्थिती दशांश पद्दत सोंपी केल्ली चिनी संख्या सोंपी केल्ली चिनी महसूल संख्या + सोंपेपणान चीनी अर्थीक पारंपारीक चिनी संख्या पारंपारीक चिनी महसूल संख्या + पारंपारीक चीनी अर्थीक हिब्रू संख्या जावानीज अंक जपानी संख्या जपानी महसूल संख्या + जपानी अर्थीक + जपानी पयल्या वर्साच्या गॅनेन क्रमांकन कंबोडियन अंक कन्नड अंक + ताई थाम थाम (पाद्री) लाओ अंक अस्तंतीय अंक + गणितीय बोल्ड + गणितीय दुप्पट मारलेले + गणितीय मोनोस्पेस + गणितीय संस-सेरिफ बोल्ड + गणितीय संस-सेरिफ मल्याळम अंक मीतेई मायेक अंक म्यानमार अंक + म्यानमार उदेंत पवो कॅरन + म्यानमार पाओ + म्यानमार शान + म्यानमार ताई लायंग + मुळ अंक + मुळ अंक ओल चिकी अंक ओडिया अंक + रेखांकित केल्लें रोमन संख्या + रोमन व्हडले अक्षर रोमन लोवरकेस संख्या + रोमन ल्हान अक्षरां + विभागणी केल्ली पारंपारीक तमिळ संख्या तमिळ अंक + आधुनिक तमिळ तेलुगू अंक थाय अंक तिबेतियन अंक + पारंपारीक अंक वाई अंक बंद करचें चालू + अनिर्दिश्ट मशीन अणकार + POSIX वेरिएंट + + बंद करचें + चालू + मॅट्रिक युके @@ -983,7 +1085,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - [़ ० १ २ ३ ४ ५ ६ ७ ८ ९ ॐ ं ँ ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क{क़} ख{ख़} ग{ग़} घ ङ च छ ज{ज़} झ ञ ट ठ ड{ड़} ढ{ढ़} ण त थ द ध न प फ{फ़} ब भ म य{य़} र ल व श ष स ह ळ ऽ ा ि ी ु ू ृ ॅ े ै ॉ ो ौ ्] + [़ ॐ ं ँ ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क{क़} ख{ख़} ग{ग़} घ ङ च छ ज{ज़} झ ञ ट ठ ड{ड़} ढ{ढ़} ण त थ द ध न प फ{फ़} ब भ म य{य़} र ल व श ष स ह ळ ऽ ा ि ी ु ू ृ ॅ े ै ॉ ो ौ ्] [\u200C\u200D ॄ] [अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ] [\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९] @@ -1222,20 +1324,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic नोव्हें डिसें - - जा - फे - मा - ए - मे - जू - जु - ऑ - स - ऑ - नो - डि - जानेवारी फेब्रुवारी @@ -1367,13 +1455,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic रात - मध्यान a PM - सकाळ - दनपार - सांज - रात मध्यानरात @@ -1386,20 +1469,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - मध्यान - सकाळ - दनपार - सांज - रात - - - मध्यान - सकाळ - दनपार - सांज - रात - मध्यानरात सकाळीं @@ -1550,10 +1619,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y d MMM, y MMMM, y + d MMMM, y + y MMMM d, EEE Y हाचो सप्तक w Y हाचो सप्तक w + + {0} – {1} + {0} – {1} + B h – B h @@ -1712,6 +1787,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + h वाजतां B + + + @@ -1720,7 +1802,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic वर्स पोरूं - हें वर्स + औंदू फुडलें वर्स {0} वर्सान @@ -1733,20 +1815,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic पोरूं - हें वर्स + औंदू फुडलें वर्स - - {0} वर्सान - {0} वर्सांनीं - - - {0} वर्स आदीं - {0} वर्सां आदीं - पोरूं - हें वर्स + औंदू फुडलें वर्स {0}वर्सान @@ -1775,10 +1849,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलें तिम्ह. हें तिम्ह. फुडलें तिम्ह. - - {0} तिम्हयनाळ्यान - {0} तिम्हयनाळ्यांनीं - {0} तिम्ह. आदीं {0} तिम्ह. आदीं @@ -1815,10 +1885,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो म्ह. हो म्ह. फुडलो म्ह. - - {0} म्हयन्यान - {0} म्हयन्यानीं - {0} म्ह. आदीं {0} म्ह. आदीं @@ -1852,19 +1918,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} चो सप्तक - - फाटलो सप्तक - हो सप्तक - फुडलो सप्तक - - {0} सप्तकान - {0} सप्तकांनीं - - - {0} सप्तक आदीं - {0} सप्तकां आदीं - - फाटलो सप्त हो सप्त @@ -1896,12 +1949,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} दीस आदीं - - - {0} दिसान - {0} दिसानीं - - {0}दिसान @@ -1921,12 +1968,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic म्हयन्यांत दीसाचो प्रसंग - - म्हयन्यांत दीसाचो प्रसंग - - - म्हयन्यांत दीसाचो प्रसंग - फाटलो आयतार हो आयतार @@ -1944,10 +1985,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो आयत हो आयत फुडलो आयत - - {0} आयतारान - {0} आयतारानीं - {0} आयत. आदीं {0} आयत आदीं @@ -1957,10 +1994,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो आ हो आ फुडलो आ - - {0} आयतारान - {0} आयतारानीं - {0} आ आदीं {0} आ आदीं @@ -1983,10 +2016,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो सोम. हो सोम. फुडलो सोम. - - {0} सोमारान - {0} सोमारानीं - {0} सोम. आदीं {0} सोम. आदीं @@ -1996,10 +2025,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो सो हो सो फुडलो सो - - {0} सोमारान - {0} सोमारानीं - {0} सो आदीं {0} सो आदीं @@ -2022,10 +2047,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो मंग. हो मंग. फुडलो मंग. - - {0} मंगळारान - {0} मंगळारानीं - {0} मंग. आदीं {0} मंग. आदीं @@ -2035,10 +2056,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो मं हो मं फुडलो मं - - {0} मंगळारान - {0} मंगळारानीं - {0} मं आदीं {0} मं आदीं @@ -2061,10 +2078,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो बुध. हो बुध. फुडलो बुध. - - {0} बुधवारान - {0} बुधवारानीं - {0} बुध. आदीं {0} बुध. आदीं @@ -2074,10 +2087,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो बु हो बु फुडलो बु - - {0} बुधवारान - {0} बुधवारानीं - {0} बु आदीं {0} बु आदीं @@ -2100,10 +2109,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो ब्रेस्त. हो ब्रेस्त. फुडलो ब्रेस्त. - - {0} बिरेस्तारान - {0} बिरेस्तारानीं - {0} ब्रेस्त. आदीं {0} ब्रेस्त. आदीं @@ -2113,10 +2118,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो ब्रे हो ब्रे फुडलो ब्रे - - {0} बिरेस्तारान - {0} बिरेस्तारानीं - {0} ब्रे आदीं {0} ब्रे आदीं @@ -2139,10 +2140,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो सुक्र. हो सुक्र. फुडलो सुक्र. - - {0} सुक्रारान - {0} सुक्रारानीं - {0} सुक्र. आदीं {0} सुक्र. आदीं @@ -2152,10 +2149,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो सुक्र हो सुक्र फुडलो सुक्र - - {0} सुक्रारान - {0} सुक्रारानीं - {0} सुक्र आदीं {0} सुक्र आदीं @@ -2178,10 +2171,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो शेन. हो शेन. फुडलो शेन. - - {0} शेनवारान - {0} शेनवारानीं - {0} शेन. आदीं {0} शेन. आदीं @@ -2191,10 +2180,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic फाटलो शे हो शे फुडलो शे - - {0} शेनवारान - {0} शेनवारानीं - {0} शे आदीं {0} शे आदीं @@ -2215,16 +2200,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} वरां आदीं - - - {0} वरान - {0} वरांनीं - - - {0} वर आदीं - {0} वरां आदीं - - {0}वरान @@ -2282,10 +2257,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - {0} सॅकंडान - {0} सॅकंडानीं - {0} सॅक. आदीं {0} सॅक. आदीं @@ -2307,9 +2278,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic क्षेत्र - - क्षेत्र - {0} वेळ @@ -2319,6 +2287,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic समन्वित वैश्विक वेळ + + यूटीसी + अज्ञात शार @@ -2789,9 +2760,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic लिब्रेविले - - ब्रिटिश ग्रीष्म वेळ - लंडन @@ -2882,9 +2850,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जायापुरा - - आयरिश प्रमाणित वेळ - डब्लिन @@ -3580,6 +3545,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic हरारे + + + आक्रि + एकर मानक वेळ + एकर उन्हाळ्याचो वेळ + + अफगानिस्तान वेळ @@ -3755,6 +3727,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ब्राझिलिया ग्रीष्म वेळ + + + ब्रिटीश काळांतलो + ब्रिटिश ग्रीष्म वेळ + + ब्रुनेइ दारूस्सलाम वेळ @@ -3928,6 +3906,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ग्रीनविच मध्य वेळ + + + ग्रीनलँड वेळ + ग्रीनलँड मानक वेळ + ग्रीनलँड उन्हाळ्याचो वेळ + + उदेंत ग्रीनलँड वेळ @@ -3954,7 +3939,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - हवाई-अलेयुशिन प्रमाणीत वेळ + हवाई प्रमाणीत वेळ @@ -4018,6 +4003,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic इरान डेलायट वेळ + + + आयरीश वेळ + आयरिश प्रमाणित वेळ + + इर्कुटस्क वेळ @@ -4039,6 +4030,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic जपान डेलायट वेळ + + + कामचटका वेळ + कामचटका मानक वेळ + कामचटका उन्हाळ्याचो वेळ + + कझाखस्तान वेळ @@ -4301,11 +4299,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic सखलिन ग्रीष्म वेळ + + + समरा वेळ + समारा मानक वेळ + समारा उन्हाळ्याचो वेळ + + - सामोआ वेळ सामोआ प्रमाणित वेळ - सामोआ डेलायट वेळ @@ -4372,6 +4375,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic चुक वेळ + + + तुर्किये वेळ + तुर्किये मानक वेळ + तुर्किये उन्हाळ्याचो वेळ + + तुर्कमेनिस्तान @@ -4391,6 +4401,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic उरुग्वे ग्रीष्म वेळ + + + उरुमकी वेळ + + उज़्बेकिस्तान वेळ @@ -4605,7 +4620,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ¤#,##,##0.00 ¤ #,##,##0.00 #,##,##0.00 @@ -5730,8 +5744,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic कॅरिबियन गिल्डर - कॅरिबियन गिल्डर - कॅरिबियन गिल्डर अस्तंत आफ्रिकी सीएफए फ्रँक @@ -5755,8 +5767,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic झिंबाब्वेचें भांगर - झिंबाब्वेचें भांगर - झिंबाब्वेचें भांगर @@ -5765,6 +5775,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} वांटो {0} वांटे + {0} वी उजवे वटेन घेयात. + {0} आनी उजवे वटेन घेयात. + {0} व्या उजव्यान घेवचें. {0}व्या उजव्या वाटेन वच. @@ -6054,8 +6067,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} दशकां - {0} वर्स - {0} वर्सां दर वर्स {0} @@ -6070,7 +6081,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic दर म्हयनो {0} - सप्तकां {0} सप्तक {0} सप्तकां दर सप्तकाक {0} @@ -6214,7 +6224,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} पिक्सेल्स - मॅगा-चित्र-तत्वां {0} MP {0} मॅगोपिक्सेल्स @@ -6499,7 +6508,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} नॉट - अंश तापमान {0} अंश तापमान {0} अंश तापमान @@ -6682,8 +6690,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} प्रकाश - {0} रात - {0} राती दर रात {0} @@ -7463,16 +7469,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic वर्स {0}वर्स {0}वर्स - {0}/वर्स - तिम्ह {0}तिम्ह {0}तिम्ह - {0}/तिम्ह - म्ह {0}म्ह {0}म्ह @@ -7508,7 +7510,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}मिसे - मायसॅक {0}मायसॅक {0}मायसॅक @@ -8026,7 +8027,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}qt-Imp. - पंद्र {0} पंद्र {0} पंद्र @@ -8040,7 +8040,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}राती - दिशा {0}उदें {0}उत्त {0}दक्ष @@ -8053,9 +8052,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}, वा {1} {0} वा {1} - - {0}, or {1} - {0} or {1} + + {0} वा {1} {0}, {1} diff --git a/make/data/cldr/common/main/kok_Latn.xml b/make/data/cldr/common/main/kok_Latn.xml index cf7f72264dfe..20b62f433fd8 100644 --- a/make/data/cldr/common/main/kok_Latn.xml +++ b/make/data/cldr/common/main/kok_Latn.xml @@ -216,7 +216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ostonti Afrika Modlo America Udenti Afrika - Ut’tori Amerika + Ut’tori Afrika Modlo Afrika Dokxinni Afrika Purai Amerika @@ -507,6 +507,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbabwe Onollkhi Prant + + bond + chalu + Britix Ameriki @@ -868,14 +872,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 4them timhoinallem - - - 1lem timhoinallem - 2rem timhoinallem - 3rem timhoinallem - 4them timhoinallem - - @@ -906,13 +902,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - modhyan - sokall - donpar - sanj - rat - md sk @@ -1060,12 +1049,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM, y E, d MMM, y MMMM y + d MMMM, y + E, d MMMM, y QQQ y QQQQ y Y -'acho' 'suman' w Y -'acho' 'suman' w + + {0} – {1} + {0} – {1} + {0} – {1} + B h 'vaztam' – B h 'vaztam' B h – h 'vaztam' @@ -1204,6 +1200,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + h 'vaztam' B + h 'vaztam' a + HH'v' + MMMM 'suman' W + MMMM 'suman' W + Y 'suman' w + Y 'suman' w + + + + h 'vaztam' B – h 'vaztam' B + h–h 'vaztam' a + + + h 'vaztam' a – h 'vaztam' a + h–h 'vaztam' a + + + HH–HH'v' + + + h 'vaztam' a – h 'vaztam' a v + h–h 'vaztam' a v + + + HH–HH'v' v + + + + @@ -1223,23 +1252,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} vorsam adim - - porum - ondum - fuddlem voros - - {0} vorsan - {0} vorsanim - - - {0} voros adim - {0} vorsam adim - - - porum - ondum - fuddlem voros {0}vorsan {0}vorsanim @@ -1268,10 +1281,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlem timho. hem timho. fuddlem timho. - - {0} timhoinallean - {0} timhoinalleanim - {0} timho. adim {0} timho. adim @@ -1310,10 +1319,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo mho. ho mho. fuddlo mho. - - {0} mhoinean - {0} mhoineanim - {0} mho. adim {0} mho. adim @@ -1348,12 +1353,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} cho suman - - - {0} sumanan - {0} sumananim - - sum fattlo sum @@ -1389,12 +1388,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} dis adim - - - {0} disan - {0} disanim - - d kal @@ -1424,12 +1417,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic mhoineant disacho prosong - - mhoineant disacho prosong - - - mhoineant disacho prosong - fattlo Aitar ho Aitar @@ -1447,10 +1434,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Ait. ho Ait. fuddlo Ait. - - {0} Aitaran - {0} Aitaranim - {0} Ait. adim {0} Ait. adim @@ -1460,10 +1443,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Ai ho Ai fuddlo Ai - - {0} Aitaran - {0} Aitaranim - {0} Ai adim {0} Ai adim @@ -1486,10 +1465,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Som. ho Som. fuddlo Som. - - {0} Somaran - {0} Somaranim - {0} Som. adim {0} Som. adim @@ -1499,10 +1474,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Sm ho Sm fuddlo Sm - - {0} Somaran - {0} Somaranim - {0} Sm adim {0} Sm adim @@ -1525,10 +1496,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Mon. ho Mon. fuddlo Mon. - - {0} Mongllaran - {0} Mongllaranim - {0} Mon. adim {0} Mon. adim @@ -1538,10 +1505,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Mg ho Mg fuddlo Mg - - {0} Mongllaran - {0} Mongllaranim - {0} Mg adim {0} Mg adim @@ -1564,10 +1527,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Bud. ho Bud. fuddlo Bud. - - {0} Budhvaran - {0} Budhvaranim - {0} Bud. adim {0} Bud. adim @@ -1577,10 +1536,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Bu ho Bu fuddlo Bu - - {0} Budhvaran - {0} Budhvaranim - {0} Bu adim {0} Bu adim @@ -1603,10 +1558,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Bre. ho Bre. fuddlo Bre. - - {0} Birestaran - {0} Birestaranim - {0} Bre. adim {0} Bre. adim @@ -1616,10 +1567,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Br ho Br fuddlo Br - - {0} Birestaran - {0} Birestaranim - {0} Br adim {0} Br adim @@ -1642,10 +1589,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Suk. ho Suk. fuddlo Suk. - - {0} Sukraran - {0} Sukraranim - {0} Suk. adim {0} Suk. adim @@ -1655,10 +1598,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Su ho Su fuddlo Su - - {0} Sukraran - {0} Sukraranim - {0} Su adim {0} Su adim @@ -1681,10 +1620,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Son. ho Son. fuddlo Son. - - {0} Sonvaran - {0} Sonvaranim - {0} Son. adim {0} Son. adim @@ -1694,10 +1629,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic fattlo Sn ho Sn fuddlo Sn - - {0} Sonvaran - {0} Sonvaranim - {0} Sn adim {0} Sn adim @@ -1718,16 +1649,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} voram adim - - - {0} voran - {0} voranim - - - {0} vor adim - {0} voram adim - - {0}voran @@ -1788,10 +1709,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic sek. - - {0} sekondan - {0} sekondanim - {0} sek. adim {0} sek. adim @@ -1955,11 +1872,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}-{1} - - onx - {0} onx - {0} onx - choukon kilomiter {0} choukon kilomiter @@ -2037,11 +1949,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kilobit - - bayt - {0} bayt - {0} bayt - xekdde {0} xekddo @@ -2053,8 +1960,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} doskam - {0} voros - {0} vorsam dor voros {0} @@ -2108,12 +2013,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} nanosekond - chitr-totvam {0} chitr-totv {0} chitr-totvam - mega-chitr-totvam {0} mega-chitr-totv {0} mega-chitr-totvam @@ -2171,7 +2074,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} picomiter - mil {0} mil {0} mil @@ -2181,7 +2083,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} paund dor choukon inch - onx tapman {0} onx tapman {0} onx tapman @@ -2238,8 +2139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} pondros - {0} rat - {0} rati dor rat {0} @@ -2394,22 +2293,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic - onx + {0}° + {0}° - - PBayt - - - TBayt + + Tb - - GBayt + + Gb - - MBayt + + Mb - - kBayt + + kb B @@ -2479,7 +2376,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}nsek - pondr {0} pondr {0} pondr @@ -2488,7 +2384,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}rati - dixa {0}UD {0}UT {0}DO @@ -2505,20 +2400,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}, vo {1} {0} vo {1} - - {0}, vo {1} - {0} vo {1} - - - {0}, vo {1} - {0} vo {1} + + {0}, {1} + {0}, {1} {0}, & {1} {0} & {1} - {0} ani {1} + {0}, {1} + {0}, {1} {0} {1} @@ -2526,6 +2418,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} {1} {0} {1} + + {0}, {1} + {0}, {1} + diff --git a/make/data/cldr/common/main/kpe.xml b/make/data/cldr/common/main/kpe.xml deleted file mode 100644 index 35e5742a8db5..000000000000 --- a/make/data/cldr/common/main/kpe.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - Kpɛlɛɛ - - - - [a b ɓ d e ə ɛ f gĝ {gb} {gw} ɣ h i j k {kp} {kw} l m n {ny} ɲ ŋ {ŋw} o ɔ p t u v w y z] - [A B Ɓ C D E Ə Ɛ F G Ɣ H I J K L M N Ɲ Ŋ O Ɔ P Q R S T U V W X Y Z] - - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - $ - - - - diff --git a/make/data/cldr/common/main/kpe_GN.xml b/make/data/cldr/common/main/kpe_GN.xml deleted file mode 100644 index fee6e87b0453..000000000000 --- a/make/data/cldr/common/main/kpe_GN.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - HH:mm:ss zzzz - HHmmsszzzz - - - - - HH:mm:ss z - HHmmssz - - - - - HH:mm:ss - HHmmss - - - - - HH:mm - HHmm - - - - - - - - - - FG - - - LRD - - - - diff --git a/make/data/cldr/common/main/kpe_LR.xml b/make/data/cldr/common/main/kpe_LR.xml deleted file mode 100644 index ff96c60e11ca..000000000000 --- a/make/data/cldr/common/main/kpe_LR.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ks.xml b/make/data/cldr/common/main/ks.xml index 552832c9d810..cda0235d08aa 100644 --- a/make/data/cldr/common/main/ks.xml +++ b/make/data/cldr/common/main/ks.xml @@ -958,6 +958,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + @@ -1134,13 +1141,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic - جنؤری - فرؤری - مارٕچ + جنوری + فروری + مارچ اپریل مئی جوٗن - جُلَے + جُلایی اگست ستمبر اکتوٗبر @@ -1148,25 +1155,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic دسمبر - جنؤری - فرؤری - مارٕچ + جنوری + فروری + مارچ اپریل مئی جوٗن - جُلَے + جُلایی اگست ستمبر اکتوٗبر نومبر - دَسَمبَر + دسمبر - جنؤری - فرؤری - مارٕچ + جنوری + فروری + مارچ اپریل مئی جوٗن @@ -1192,9 +1199,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ن - جنؤری - فرؤری - مارٕچ + جنوری + فروری + مارچ اپریل مئی جوٗن @@ -1212,14 +1219,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic آتھوار ژٔندٕروار - بۆموار + Tue بودوار برؠسوار جُمہ بٹوار - اَتھوار + آتھوار ژٔندرٕروار بۆموار بودوار @@ -1332,6 +1339,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -1372,17 +1383,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic ہفتہ W از MMMM ہفتہ W از MMMM M/y - M/d/y E, M/d/y MMM y E, MMM d, y MMMM y + y MMMM d + EEE, MMMM d, y QQQ y QQQQ y ہفتہ w از Y ہفتہ w از Y + + {0} – {1} + {0} – {1} + {0} – {1} + M/y G – M/y G M/y – M/y G @@ -1559,7 +1576,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - جی ایم ٹی {0} وَکھ {0} ڈے لائٹ وَکھ {0} معیٲری وَکھ @@ -1570,6 +1586,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic کوآرڈنیٹڈ یونیورسل وَکھ + + - + غٲر زان @@ -2031,9 +2050,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic لِبَروِل - - برطٲنوی سَمَر ٹایِم - لَندَن @@ -2124,9 +2140,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic جَیاپوٗرا - - اَیرِش سَمَر ٹایِم - ڈَبلِن @@ -2852,13 +2865,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic اؠلاسکا ڈےلایِٔٹ ٹایِم - - - اؠلمؠٹی ٹایِم - اؠلمؠٹی سٹینڑاڑ ٹایِم - اؠلمؠٹی سَمَر ٹایِم - - اؠمَزَن ٹایِم @@ -2901,20 +2907,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic اؠنڑیٖر سَمَر ٹایِم - - - اؠکٹاؤ ٹایِم - اؠکٹاؤ سٹینڑاڑ ٹایِم - اؠکٹاؤ سَمَر ٹایِم - - - - - اؠکٹوب ٹایِم - اؠکٹوب سٹینڑاڑ ٹایِم - اؠکٹوب سَمَر ٹایِم - - ارؠبِیَن ٹایِم @@ -3016,6 +3008,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic برؠسِلِیا سَمَر ٹایِم + + + برٹِش ٹایم + برطٲنوی سَمَر ٹایِم + + بروٗنَے دَروٗسَلَم ٹایِم @@ -3023,7 +3021,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - کیپ ؤرڑو ٹایِم + کیپ ؤرڑ ٹایِم کیپ ؤرڑو سٹینڈرڈ ٹایِم کیپ سَمَر ٹایِم @@ -3203,11 +3201,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic مغرِبی گریٖن لینڈُک سَمَر ٹایِم - - - گُوؠم ٹایِم - - گَلف سٹینڈرڈ ٹایِم @@ -3226,7 +3219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic حَواے اؠلیوٗٹِیَن ٹایِم - حَواے اؠلیوٗٹِیَن سٹینڑاڑ ٹایِم + ہوائی ایلیوشن سٹینڈرڈ ٹایم حَواے اؠلیوٗٹِیَن سَمَر ٹایِم @@ -3281,6 +3274,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic اِیٖرٲنی سَمَر ٹایِم + + + آیرِش ٹایِم + اَیرِش سَمَر ٹایِم + + اِرکُٹسک ٹایِم @@ -3343,11 +3342,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic کرغزستان ٹائم - - - لَنکا ٹایِم - - لایِٔن ججیٖرُک ٹایِم @@ -3360,13 +3354,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic لعاڑ ڑےلایٔٹ ٹایِم - - - مَکَعوٗ ٹایِم - مَکَعوٗ سٹینڑاڑ ٹایِم - مَکَعوٗ سَمَر ٹایِم - - مَگَدَن ٹایِم @@ -3482,11 +3469,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic فرنینڈو ڈی نورونہا سَمَر ٹائم - - - شُمٲلی مَرِیانا ٹایِم - - نۄوۄسِبٔرسک ٹایِم @@ -3566,13 +3548,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic یونگ یانگ ٹائم - - - قِزلوڑا ٹایِم - قِزلوڑا سٹینڑاڑ ٹایِم - قِزلوڑا سَمَر ٹایِم - - رِیوٗنِیَن ٹایِم @@ -3599,9 +3574,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - سؠموآ ٹایِم سؠموآ سٹینڑاڑ ٹایِم - سؠموآ سَمَر ٹایِم diff --git a/make/data/cldr/common/main/ks_Deva.xml b/make/data/cldr/common/main/ks_Deva.xml index 388e55bed735..1945d874c366 100644 --- a/make/data/cldr/common/main/ks_Deva.xml +++ b/make/data/cldr/common/main/ks_Deva.xml @@ -96,6 +96,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + + + + + - + + + + + + + - + + + + + + + - + + + @@ -120,6 +155,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + {1} {0} @@ -366,6 +404,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -398,10 +440,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm:ss a v M/d/y MMM d, y + MMMM d, y + y MMMM d, EEE - - {0} – {1} - @@ -448,7 +489,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जी एम टी {0} - जी एम टी {0} वख {0} डे लाइट वख {0} मयॉरी वख @@ -456,6 +496,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic कोऑर्डनैटिड यूनवर्सल वख + + यू टी सी + नमोलुम शहर @@ -524,6 +567,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + % + + + - + + + + + - + diff --git a/make/data/cldr/common/main/ksh.xml b/make/data/cldr/common/main/ksh.xml index c2bd5ef20440..327801ca9e9c 100644 --- a/make/data/cldr/common/main/ksh.xml +++ b/make/data/cldr/common/main/ksh.xml @@ -875,6 +875,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic H:mm h:mm:ss a H:mm:ss + h:mm:ss a v + H:mm:ss a v E d. M. d. MMM E d. MMM @@ -1151,6 +1153,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic H:mm h:mm:ss a H:mm:ss + h:mm:ss a v + H:mm:ss a v E d. M. d. MMM E d. MMM @@ -1165,6 +1169,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0}–{1} + + {0} – {1} h:mm a – h:mm a h:mm–h:mm a @@ -1408,11 +1417,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Färör - - - Jrußbretannije sing Summerzick - - Tiblis @@ -1434,11 +1438,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sagreb - - - Irland sing Summerzick - - Ensel Män @@ -1637,6 +1636,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic de Azore ier Summerzick + + + Jrußbretannije sing Zick + Jrußbretannije sing Summerzick + + Kapvärdejaansche Zigg @@ -1690,6 +1695,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic dem Indische Ozejan sing Zick + + + Irland sing Zick + Irland sing Summerzick + + Zigg vun Mauritius @@ -1759,28 +1770,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic + 0 tsd 0 tsd 0 tsd + 00 tsd 00 tsd 00 tsd + 000 tsd 000 tsd 000 tsd + 0 Mio 0 Mio 0 Mio + 00 Mio 00 Mio 00 Mio + 000 Mio 000 Mio 000 Mio + 0 Mrd 0 Mrd 0 Mrd + 00 Mrd 00 Mrd 00 Mrd + 000 Mrd 000 Mrd 000 Mrd + 0 Bio 0 Bio 0 Bio + 00 Bio 00 Bio 00 Bio + 000 Bio 000 Bio 000 Bio @@ -2919,6 +2942,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}m/s + °C {0}° {0}° {0}° diff --git a/make/data/cldr/common/main/ku.xml b/make/data/cldr/common/main/ku.xml index 5d6b72c7be21..a11b58a2de72 100644 --- a/make/data/cldr/common/main/ku.xml +++ b/make/data/cldr/common/main/ku.xml @@ -1892,6 +1892,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'hefteya' w'an' 'ya' Y'an' + + {0} – {1} + {0} – {1} + {0} – {1} + M/y G – M/y G G M/y – M/y @@ -2236,12 +2241,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic çax - - çax - - - çax - sal sala borî @@ -2971,9 +2970,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lîbrevîl - - Saeta Havînê ya Brîtanyayê - Londra @@ -3004,9 +3000,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Cayapûra - - Saeta Îrlandayê ya Standard - Dûblîn @@ -3294,13 +3287,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Alaskayê - - - Saeta Almatîyê - Saeta Almatîyê ya Standard - Saeta Havînê ya Almatîyê - - Saeta Amazonê @@ -3350,20 +3336,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Apiayê - - - Saeta Aqtauyê - Saeta Aqtauyê ya Standard - Saeta Havînê ya Aqtauyê - - - - - Saeta Aqtobeyê - Saeta Aqtobeyê ya Standard - Saeta Havînê ya Aqtobeyê - - Saeta Erebistanê @@ -3465,6 +3437,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Brasîlyayê + + + Saeta Havînê ya Brîtanyayê + + Saeta Brûneyê @@ -3664,11 +3641,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Grînlanda Rojava - - - Saeta Guamê ya Standard - - Saeta Kendavê ya Standard @@ -3742,6 +3714,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Îranê + + + Saeta Îrlandayê ya Standard + + Saeta Irkutskê @@ -3809,11 +3786,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Qirxizistanê - - - Saeta Lankayê - - Saeta Giravên Lîneyê @@ -3826,13 +3798,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Lord Howeyê - - - Saeta Macaoyê - Saeta Macaoyê ya Standard - Saeta Havînê ya Macaoyê - - Saeta Magadanê @@ -3948,11 +3913,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Havînê ya Fernando de Noronhayê - - - Saeta Giravên Marianaya Bakur - - Saeta Novosibirskê @@ -4032,13 +3992,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saeta Pyongyangê - - - Saeta Qizilordayê - Saeta Qizilordayê ya Standard - Saeta Havînê ya Qizilordayê - - Saeta Réunionê @@ -4065,9 +4018,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Saeta Samoayê Saeta Samoayê ya Standard - Saeta Havînê ya Samoayê @@ -5422,11 +5373,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic yûanê çînî (offshore) yûanên çînî (offshore) - - dolarê Banka Xelkî ya çînî - dolarê Banka Xelkî ya çînî - dolarên Banka Xelkî ya çînî - yûanê çînî yûanê çînî diff --git a/make/data/cldr/common/main/ku_Arab.xml b/make/data/cldr/common/main/ku_Arab.xml deleted file mode 100644 index 8657fb1f6b83..000000000000 --- a/make/data/cldr/common/main/ku_Arab.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Mundus - Africa - America Septentrionalis - America Australis - Oceania - Africa Occidentalis - America Centralis - Africa Orientalis - Africa Septentrionalis - Africa Australis (regio) - America - Caribaeum - Asia Orientalis - Asia Meridiorientalis - Europa Centralis - Australasia - Melanesia - Micronesia (regio) - Polynesia - Asia - Media Asia - Europa - Europa Orientalis - Europa Septentrionalis - Europa Occidentalis - Andorra - Phylarchiarum Arabicarum Confoederatio - Afgania - Antiqua et Barbuda - Anguilla - Albania - Armenia - Angolia - Argentina - Samoa Americana - Austria - Australia - Aruba - Alandia - Atropatene - Bosnia et Herzegovina - Barbata - Bangladesha - Belgica - Burkina Faso - Bulgaria - Baharina - Burundia - Beninum - Insula Sancti Bartholomaei - Bermuda - Bruneium - Bolivia - Brasilia - Insulae Bahamenses - Butania - Insula Bouvet - Botswana - Ruthenia Alba - Beliza - Canada - Insulae Cocos seu Keeling - Res publica Democratica Congensis - Res publica Africae Mediae - Res publica Congoliae - Helvetia - Litus Eburneum - Insulae Cook - Chilia - Cameronia - Res publica popularis Sinarum - Columbia - Costarica - Cuba - Res publica Capitis Viridis - Insula Curacensis - Insula Christi Natalis - Cyprus - Cechia - Germania - Gibutum - Dania - Dominica - Res publica Dominicana - Algerium - Aequatoria - Estonia - Aegyptus - Sahara Occidentalis - Erythraea - Hispania - Aethiopia - Finnia - Viti - Insulae Malvinae - Micronesia - Faeroae insulae - Francia - Gabonia - Britanniarum Regnum - Granata - Georgia - Guiana Francica - Lisia - Gana - Gibraltar - Groenlandia - Gambia - Guinea - Guadalupa - Guinea Aequatorensis - Graecia - Guatimalia - Guama - Guinea Bissaviensis - Guiana - Hongcongum - Honduria - Croatia - Haitia - Hungaria - Indonesia - Hibernia - Israël - Monapia - India - Iracum - Irania - Islandia - Italia - Caesarea Insula - Iamaica - Iordania - Iaponia - Kenia - Chirgisia - Cambosia - Kiribati - Insulae Comorianae - Sanctus Christophorus et Nevis - Res publica Popularis Democratica Coreana - Res publica Coreana - Cuvaitum - Insulae Caimanenses - Kazachstania - Laotia - Libanus - Sancta Lucia - Lichtenstenum - Taprobane - Liberia - Lesothum - Lituania - Luxemburgum - Lettonia - Libya - Marocum - Monoecus - Res publica Moldavica - Mons Niger - Madagascaria - Insulae Marsalienses - Res publica Macedonica - Malium - Mongolia - Macaum - Insulae Marianae Septentrionales - Martinica - Mauritania - Montserrat - Melita - Mauritia - Insulae Maldivae - Malavium - Mexicum - Malaesia - Mozambicum - Namibia - Nova Caledonia - Res publica Nigritana - Insula Norfolcia - Nigeria - Nicaragua - Nederlandia - Regnum Nederlandiae - Norvegia - Nepalia - Nauru - Niue - Nova Zelandia - Omania - Panama - Peruvia - Polynesia Francica - Papua Nova Guinea - Philippinae - Pakistania - Polonia - Insulae Sancti Petri et Miquelonensis - Insulae Pitcairn - Portus Dives - Territoria Palaestinensia - Portugallia - Belavia - Paraquaria - Quataria - Reunio - Romania - Serbia - Russia - Ruanda - Arabia Saudiana - Insulae Salomonis - Insulae Seisellenses - Sudania - Suecia - Singapura - Sancta Helena, Ascensio et Tristan da Cunha - Slovenia - Slovacia - Mons Leoninus - Res publica Sancti Marini - Senegalia - Somalia - Surinamia - Sudania Australis - Insulae Sancti Thomae et Principis - Salvatoria - Syria - Swazia - Insulae Turcenses et Caicenses - Tzadia - Togum - Thailandia - Tadzikistania - Tokelau - Timoria Orientalis - Turcomannia - Tunesia - Tonga - Turcia - Trinitas et Tabacum - Tuvalu - Res publica Sinarum - Tanzania - Ucraina - Uganda - Civitates Foederatae Americae - Uraquaria - Uzbecia - Civitas Vaticana - Sanctus Vincentius et Granatinae - Venetiola - Virginis Insulae Britannicae - Virginis Insulae Americanae - Vietnamia - Vanuatu - Vallis et Futuna - Samoa - Kosovia - Iemenia - Maiotta - Africa Australis - Zambia - Zimbabua - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - Ian - Feb - Mar - Apr - Mai - Iun - Iul - Aug - Sep - Oct - Nov - Dec - - - Ianuarii - Februarii - Martii - Aprilis - Maii - Iunii - Iulii - Augusti - Septembris - Octobris - Novembris - Decembris - - - - - Ianuarius - Februarius - Martius - Aprilis - Maius - Iunius - Iulius - Augustus - September - October - November - December - - - - - - - Sol - Dom - Lun - Mar - Mer - Iov - Ven - Sat - Sab - - - dies Solis - Dominica - dies Lunae - dies Martis - dies Mercurii - dies Iovis - dies Veneris - dies Saturni - dies Sabbati - - - - - Dominica - Sabbatum - - - - - - - Q1 - Q2 - Q3 - Q4 - - - prima quarta - secunda quarta - tertia quarta - quarta quarta - - - - - - - a.m. - p.m. - - - - - - ante Christum natum - post Christum natum - - - a.C.n. - p.C.n. - - - - - - EEEE, 'die' d MMMM y G - GyMMMMEEEEd - - - - - 'die' d MMMM y G - GyMMMMd - - - - - 'die' d MMM y G - GyMMMd - - - - - d M y G - GyMd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1} 'de' {0} - - - - - {1} 'de' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - - - - - eare - - - anno - priore anno - hoc anno - postero anno - - in {0} anno - in {0} annis - - - abhinc {0} annum - abhinc {0} annos - - - - an. - priore an. - hoc an. - postero an. - - in {0} an. - in {0} an. - - - abhinc {0} an. - abhinc {0} an. - - - - quarter - priore quarta - hac quarta - postera quarta - - in {0} quarta - in {0} quartis - - - abhinc {0} quartam - abhinc {0} quartas - - - - qrt. - priore qrt. - hac qrt. - postera qrt. - - in {0} qrt. - in {0} qrt. - - - abhinc {0} qrt. - abhinc {0} qrt. - - - - mensis - priore mense - hac mense - postera mense - - in {0} mense - in {0} mensibus - - - abhinc {0} mensem - abhinc {0} menses - - - - men. - priore men. - hac men. - postera men. - - in {0} men. - in {0} men. - - - abhinc {0} men. - abhinc {0} men. - - - - hebdomas - priore hebdomade - hac hebdomade - postera hebdomade - - in {0} hebdomade - in {0} hebdomadibus - - - abhinc {0} hebdomadem - abhinc {0} hebdomades - - - - hebd. - priore hebd. - hac hebd. - postera hebd - - in {0} hebd. - in {0} hebd. - - - abhinc {0} hebd. - abhinc {0} hebd. - - - - dies - pridie - hodie - cras - - in {0} die - in {0} diebus - - - abhinc {0} diem - abhinc {0} dies - - - - day of the week - - - priore die Solis - hoc die Solis - postero die Solis - - in {0} die Solis - in {0} diebus Solis - - - abhinc {0} diem Solis - abhinc {0} dies Solis - - - - prior. die Sol. - hoc die Sol. - post. die Sol. - - in {0} die Sol. - in {0} dieb. Sol. - - - abhinc {0} diem Sol. - abhinc {0} dies Sol. - - - - priore die Lunae - hoc die Lunae - postero die Lunae - - in {0} die Lunae - in {0} diebus Lunae - - - abhinc {0} diem Lunae - abhinc {0} dies Lunae - - - - priore die Lun. - hoc die Lun. - postero die Lun. - - in {0} die Lun. - in {0} diebus Lun. - - - abhinc {0} diem Lun. - abhinc {0} dies Lun. - - - - priore die Martis - hoc die Martis - postero die Martis - - in {0} die Martis - in {0} diebus Martis - - - abhinc {0} diem Martis - abhinc {0} dies Martis - - - - priore die Mar. - hoc die Mar. - postero die Mar. - - in {0} die Mar. - in {0} diebus Mar. - - - abhinc {0} diem Mar. - abhinc {0} dies Mar. - - - - priore die Mercurii - hoc die Mercurii - postero die Mercurii - - in {0} die Mercurii - in {0} diebus Mercurii - - - abhinc {0} diem Mercurii - abhinc {0} dies Mercurii - - - - priore die Merc. - hoc die Merc. - postero die Merc. - - in {0} die Merc. - in {0} diebus Merc. - - - abhinc {0} diem Merc. - abhinc {0} dies Merc. - - - - priore die Iovis - hoc die Iovis - postero die Iovis - - in {0} die Iovis - in {0} diebus Iovis - - - abhinc {0} diem Iovis - abhinc {0} dies Iovis - - - - priore die Iov. - hoc die Iov. - postero die Iov. - - in {0} die Iov. - in {0} diebus Iov. - - - abhinc {0} diem Iov. - abhinc {0} dies Iov. - - - - priore die Veneris - hoc die Veneris - postero die Veneris - - in {0} die Veneris - in {0} diebus Veneris - - - abhinc {0} diem Veneris - abhinc {0} dies Veneris - - - - priore die Ven. - hoc die Ven. - postero die Ven. - - in {0} die Ven. - in {0} diebus Ven. - - - abhinc {0} diem Ven. - abhinc {0} dies Ven. - - - - priore die Saturni - hoc die Saturni - postero die Saturni - - in {0} die Saturni - in {0} diebus Saturni - - - abhinc {0} diem Saturni - abhinc {0} dies Saturni - - - - priore die Sat. - hoc die Sat. - postero die Sat. - - in {0} die Sat. - in {0} diebus Sat. - - - abhinc {0} diem Sat. - abhinc {0} dies Sat. - - - - hora - hac hora - - in {0} hora - in {0} horis - - - abhinc {0} horam - abhinc {0} horas - - - - hr. - - in {0} hr. - in {0} hr. - - - abhinc {0} hr. - abhinc {0} hr. - - - - minuta - hac minuta - - in {0} minuta - in {0} minutis - - - abhinc {0} minutam - abhinc {0} minutas - - - - min. - - in {0} min. - in {0} min. - - - abhinc {0} min. - abhinc {0} min. - - - - secunda - nunc - - in {0} secunda - in {0} secundis - - - abhinc {0} secundam - abhinc {0} secundas - - - - sec. - - in {0} sec. - in {0} sec. - - - abhinc {0} sec. - abhinc {0} sec. - - - - time zone - - - - - - , -   - - - - - 0 mille - 0 millia - 00 millia - 00 millia - 000 millia - 000 millia - 0 milio - 0 miliones - 00 miliones - 00 miliones - 000 miliones - 000 miliones - 0 miliardum - 0 miliarda - 00 miliarda - 00 miliarda - 000 miliarda - 000 miliarda - 0 milies miliardum - 0 milies miliarda - 00 milies miliarda - 00 milies miliarda - 000 milies miliarda - 000 milies miliarda - - - - - 0M - 0M - 00M - 00M - 000M - 000M - 0 Mn - 0 Mn - 00 Mn - 00 Mn - 000 Mn - 000 Mn - 0 Md - 0 Md - 00 Md - 00 Md - 000 Md - 000 Md - 0 mil Md - 0 mil Md - 00 mil Md - 00 mil Md - 000 mil Md - 000 mil Md - - - - - - - ¤ 0M - ¤ 0M - ¤ 00M - ¤ 00M - ¤ 000M - ¤ 000M - ¤ 0 Mn - ¤ 0 Mn - ¤ 00 Mn - ¤ 00 Mn - ¤ 000 Mn - ¤ 000 Mn - ¤ 0 Md - ¤ 0 Md - ¤ 00 Md - ¤ 00 Md - ¤ 000 Md - ¤ 000 Md - ¤ 0 mil Md - ¤ 0 mil Md - ¤ 00 mil Md - ¤ 00 mil Md - ¤ 000 mil Md - ¤ 000 mil Md - - - - - - Francus Helveticus - - - Euro - - - Marca Finniae - - - Libra sterlingorum - - - Drachma - - - Dollarium Hongkongense - - - Lira Italiana - - - Yen - - - Pensum Mexicanum - - - Corona Norvegiae - - - Nuevo Sol - - - Rubelus Russicus - - - Dollarium Civitatum Foederatarum - - - Argentum - - - Aurum - - - Palladium - - - Platinum - - - - - - {0} et {1} - {0} et {1} - - - {0}, {1} - - - - - ita:i - non:n - - - diff --git a/make/data/cldr/common/main/la_VA.xml b/make/data/cldr/common/main/la_VA.xml deleted file mode 100644 index 6385e04df917..000000000000 --- a/make/data/cldr/common/main/la_VA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/lb.xml b/make/data/cldr/common/main/lb.xml index e9416554e04e..0456d8d3d6db 100644 --- a/make/data/cldr/common/main/lb.xml +++ b/make/data/cldr/common/main/lb.xml @@ -249,7 +249,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ido-Sprooch Islännesch Italienesch - Inukitut + Inuktitut Ischoresch Japanesch Jamaikanesch-Kreolesch @@ -839,6 +839,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Chrëschtdagsinsel Zypern Tschechien + Tschechesch Republik Däitschland Diego Garcia Dschibuti @@ -855,6 +856,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Spanien Ethiopien Europäesch Unioun + Eurozon Finnland Fidschi Falklandinselen @@ -1025,6 +1027,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ukrain Uganda Amerikanesch-Ozeanien + Vereent Natiounen Vereenegt Staaten US Uruguay @@ -1112,6 +1115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ethiopesche Kalenner Ethiopesche Kalenner "Amete Alem" Gregorianesche Kalenner + Gregorianesch Hebräesche Kalenner Indeschen Nationalkalenner Islamesche Kalenner @@ -1128,6 +1132,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Allgemeng Sich Sich no Ufanksbuschtawen aus dem koreaneschen Alphabet Standard Zortéierreiefolleg + Standard Stréchfolleg Traditionell Zortéierregelen Radikal-Stréch-Zortéierregelen @@ -1625,6 +1630,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0}–{1} + {0}–{1} + d.–d. @@ -2181,11 +2191,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Färöer - - - Britesch Summerzäit - - Tiflis @@ -2198,11 +2203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Port Numbay - - - Iresch Summerzäit - - Kalkutta @@ -2389,13 +2389,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Alaska-Summerzäit - - - Almaty-Zäit - Almaty-Normalzäit - Almaty-Summerzäit - - Amazonas-Zäit @@ -2539,6 +2532,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasília-Summerzäit + + + Britesch-zäit + Britesch Summerzäit + + Brunei-Zäit @@ -2721,11 +2720,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Westgrönland-Summerzäit - - - Guam-Zäit - - Golf-Zäit @@ -2738,7 +2732,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaii-Aleuten-Normalzäit + Hawaii-Normalzäit @@ -2799,6 +2793,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iranesch Summerzäit + + + Iresch-zäit + Iresch Summerzäit + + Irkutsk-Zäit @@ -3088,9 +3088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoa-Zäit Samoa-Normalzäit - Samoa-Summerzäit @@ -5341,6 +5339,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} a(n) {1} {0} a(n) {1} + + {0} oder {1} + {0} oder {1} + + + {0}, {1} + {0}, {1} + + + {0} & {1} + {0} & {1} + {0} {1} {0} {1} diff --git a/make/data/cldr/common/main/lij.xml b/make/data/cldr/common/main/lij.xml index cbb86724f27d..06a1eb594ead 100644 --- a/make/data/cldr/common/main/lij.xml +++ b/make/data/cldr/common/main/lij.xml @@ -30,8 +30,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ aragoneise obolo angika - arabo - arabo moderno standard + arabo + arabo moderno standard mapuche arpaho arabo najd @@ -45,16 +45,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ azerbaigian azero baschiro + baloci balineise basaa bielloruscio bemba bena burgao + haryanvi bhojpuri bislama bini siksika + anii bambara bengaleise tibetan @@ -111,7 +114,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ efik ekajuk grego - ingleise + ingleise ingleise d’Australia ingleise do Canadà ingleise britannico @@ -119,14 +122,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ingleise d’America ingleise (SUA) esperanto - spagnòllo - spagnòllo d’America - spagnòllo da Spagna - spagnòllo do Mescico + spagnòllo + spagnòllo d’America + spagnòllo da Spagna + spagnòllo do Mescico estone basco ewondo - perscian + perscian dari fulah finlandeise @@ -143,7 +146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ frisian de ponente irlandeise ga - gaelico scoçeise + gaelico scoçeise geez gilberteise galiçian @@ -160,7 +163,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ haida do meridion ebreo hindi - hinglish + hinglish hiligaynon hmong croato @@ -175,6 +178,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ iban ibibio indonesian + interlingue igbo yi do settentrion inuktitut canadeise de ponente @@ -184,7 +188,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ islandeise italian inuktitut - giapponeise + giaponeise lojban ngomba machame @@ -223,10 +227,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bafia colonieise curdo + curdo + kurmangi kumyk komi còrnico kwakʼwala + kuvi kirghiso latin giudeo-spagnòllo @@ -238,6 +245,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ligure lillooet lakota + lombardo lingala lao creolo da Louisiana @@ -319,7 +327,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ oromo ödia oscetico - punjabi + punjabi pangasinan pampanga papiamento @@ -327,12 +335,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pidgin nigerian pijin polacco + piemonteise malecite-passamaquoddy - pashto - portogheise - portogheise do Braxî - portogheise d’Euröpa - quechua + pruscio + pashto + portogheise + portogheise do Braxî + portogheise d’Euröpa + quechua + rajasthani rapanui rarotonga rohingya @@ -340,7 +351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ rundi romen rombo - ruscio + ruscio aromen kinyarwanda rwa @@ -351,8 +362,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ santali ngambay sangu - sardo - siçilian + sardo + siçilian scoçeise sindhi sami do settentrion @@ -363,7 +374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ shan sinhala slovacco - sloven + sloven lushootseed do meridion samoan sami de Inari @@ -372,17 +383,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ soninke sòmalo arbaneise - serbo + serbo sranan tongo swati sotho do meridion salish di streiti sundaneise sukuma - svedeise - swahili + svedeise + swahili comörian - sciriaco + sciriaco + silesian tamil tutchone do meridion telugu @@ -422,7 +434,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uzbeco vai venda + veneto vietnamita + makhuwa vunjo vallon walser @@ -432,6 +446,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cineise wu kalmyk xhosa + kangri soga yangben yemba @@ -440,6 +455,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nheengatu cantoneise cineise cantoneise + zhuang tamazight standard do Maròcco cineise cineise mandarin @@ -600,6 +616,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ciña Colombia Isoa de Clipperton + Sark Còsta Rica Cubba Cappo Verde @@ -824,60 +841,162 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ region desconosciua - lunäio - formato de monæa - ordine - monæa - scistema oräio (12 ò 24 oe) - stilo de interruçion de linia - scistema de mesuaçion - numeri + lunäio + formato de monæa + ordinamento sensa scimboli + ordinamento di açenti con inverscion + ordinamento maiuscole/minuscole + ordinamento maiuscole/minuscole + ordinamento + ordinamento normalizzou + ordinamento numerico + reordinamento scrittue/blòcchi + prioritæ de l’ordinamento + monæa + trasforma destinaçion + escluxoin de separaçion pe diçionäio + Presentaçion emoji + Primmo giorno da settemaña + Mescciou + scistema oräio (12 ò 24 oe) + metodo d’inserçion + tastea + livello mascimo ignorou + stilo de interruçion de linia + Interruçioin de linia drento de poule + regole de trasformaçion + scistema de mesuaçion + unitæ de mesua + numeri + Interruçion de frase dòppo abbr. - lunäio buddista - lunäio cineise - lunäio còpto - lunäio dangi - lunäio etiope - lunäio etiope Amete Alem - lunäio gregorian - lunäio ebraico - lunäio egirian - lunäio çivile egirian - lunäio egirian (Umm al-Qura) - lunäio ISO-8601 - lunäio giapponeise - lunäio perscian - lunäio repubrican cineise - formato de monæa contabile - formato de monæa standard - ordine predefinio de Unicode - reçerca generica - ordine standard - scistema oräio à 12 oe (0–11) - scistema oräio à 12 oe (1–12) - scistema oräio à 24 oe (0–23) - scistema oräio à 24 oe (1–24) - stilo de interruçion de linia flescibile - stilo de interruçion de linia standard - stilo de interruçion de linia sforsou - scistema metrico - scistema de mesuaçion imperiale - scistema de mesuaçion american - giffre indo-arabe - giffre indo-arabe esteise - numeri ermeni - numeri ermeni piccin - giffre bengaleixi - giffre chakma - giffre devanagari - numeri etiopi - giffre à ampiessa intrega - numeri georgien - numeri greghi - numeri greghi piccin - giffre gujarati - giffre gurmuki + lunäio buddista + buddista + lunäio cineise + cineise + lunäio còpto + còpto + lunäio dangi + dangi + lunäio etiope + etiope + lunäio etiope Amete Alem + etiope Amete Alem + lunäio gregorian + gregorian + lunäio ebraico + ebraico + naçionale indian + lunäio egirian + egirian + lunäio çivile egirian + egirian (çivile) + egirian, osservaçion saudita + egirian (tabulare, epoca astronòmica) + lunäio egirian (Umm al-Qura) + egirian (Umm al-Qura) + lunäio ISO-8601 + gregorian + lunäio giaponeise + giaponeise + lunäio perscian + perscian + lunäio repubrican cineise + cineise + formato de monæa contabile + contabile + formato de monæa standard + standard + minuscole + minuscole + maiuscole + compatibilitæ + diçionäio + ordinamento predefinio de Unicode + Unicode predefinio + emoji + regole europee + elenco telefònico + fonetico + pinyin + reçerca generica + reçerca + consonante iniçiale coreaña + ordinamento standard + standard + træti + tradiçionale + træti radicali + zhuyin + monæa + giffre + pontezzatua + spaçi + scimboli + tutti + solo lettie base + base, açenti, maiuscole/minuscole, variante, kana + base, açenti + base, açenti, maiuscole/minuscole, variante + à larghixe intrega + à meza larghixe + Default + Emoji + Testo + scistema oräio à 12 oe + 12 + scistema oräio à 24 oe + 24 + scistema oräio à 12 oe (0–11) + 12 oe (0–11) + scistema oräio à 12 oe (1–12) + 12 oe (1–12) + scistema oräio à 24 oe (0–23) + 24 oe (0–23) + scistema oräio à 24 oe (1–24) + 24 oe (1–24) + spaçi, pontezzatua, tutti i scimboli + spaçi, pontezzatua + spaçi, pontezzatua + spaçi, pontezzatua, scimboli che no en de monæe + stilo de interruçion de linia flescibile + flescibile + stilo de interruçion de linia standard + standard + stilo de interruçion de linia sforsou + sforsou + Dividdi tutte + Conserva tutte + Normale + Conserva inti sintagmi + trasliteraçion US BGN + trasliteraçion US GEGN + scistema metrico + metrico + scistema de mesuaçion imperiale + imperiale britannico + scistema de mesuaçion american + imperiale american + giffre indo-arabe + giffre indo-arabe esteise + indo-arabe esteise + numeri ermeni + numeri ermeni piccin + ermeni piccin + giffre bengaleixi + giffre chakma + giffre devanagari + numeri etiopi + finançiäi + giffre à larghixe intrega + larghixe intrega + numeri georgien + numeri greghi + numeri greghi piccin + greghi piccin + giffre gujarati + giffre gurmuki numeri deçimali cineixi numeri cineixi semplificæ numeri finansiäi in cineise semplificou @@ -890,7 +1009,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ giffre khmer giffre kannada giffre lao - giffre occidentale + giffre occidentale giffre malayalam giffre meetei mayek giffre birmañe @@ -905,15 +1024,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ giffre tibetañe giffre vaii + + Off + On + - metrico - imperiale - american + metrico + imperiale + american - Lengua: {0} - Scrittua: {0} - Region: {0} + Lengua: {0} + Scrittua: {0} + Region: {0} @@ -935,171 +1058,187 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - EEEE d 'de' MMMM 'do' y G + EEEE d 'de' MMMM 'do' y G - d 'de' MMMM 'do' y G + d 'de' MMMM 'do' y G - d/M/y G + d/M/y G - d/M/yy GGGGG + d/M/yy GGGGG + + / + - {1}, {0} + {1}, {0} - {1} 'à' {0} + {1} 'à' {0} + + + {1} 'à' {0} - {1}, {0} + {1}, {0} - {1} 'à' {0} + {1} 'à' {0} + + + {1} 'à' {0} - {1}, {0} + {1}, {0} - {1}, {0} + {1}, {0} - E d - y G - d/M/y GGGGG - LLL y G - d MMM y G - E d MMM y G - d/M - E d/M - d MMM - E d MMM - d MMMM - y G - y G - M/y G - d/M/y G - E d/M/y GGGGG - LLL y G - d MMM y G - E d MMM y G - LLLL 'do' y G - QQQ y G - QQQQ y G + E d + y G + M/y G + d/M/y GGGGG + E d/M/y GGGGG + LLL y G + d MMM y G + E d MMM y G + 'h'HH v + d/M + E d/M + d MMM + E d MMM + d MMMM + y G + y G + M/y G + d/M/y G + E d/M/y GGGGG + LLL y G + d MMM y G + E d MMM y G + LLLL 'do' y G + QQQ y G + QQQQ y G - y G – y G - y–y G + y G – y G + y–y G - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y GGGGG – M/y GGGGG + M/y – M/y GGGGG + M/y – M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y GGGGG – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y – d/M/y GGGGG + d/M/y GGGGG – d/M/y GGGGG + d/M/y – d/M/y GGGGG + d/M/y – d/M/y GGGGG - E d/M/y – E d/M/y GGGGG - E d/M/y GGGGG – E d/M/y GGGGG - E d/M/y – E d/M/y GGGGG - E d/M/y – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG + E d/M/y GGGGG – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG - MMM y G – MMM y G - MMM–MMM y G - MMM y – MMM y G + MMM y G – MMM y G + MMM–MMM y G + MMM y – MMM y G - d–d MMM, y G - d MMM y G – d MMM y G - d MMM y G – d MMM y G - d MMM y G – d MMM y G + d–d MMM, y G + d MMM y G – d MMM y G + d MMM y G – d MMM y G + d MMM y G – d MMM y G - E d MMM – E d MMM y G - E d MMM y G – E d MMM y G - E d MMM y – E d MMM y G - E d MMM y – E d MMM y G + E d MMM – E d MMM y G + E d MMM y G – E d MMM y G + E d MMM y – E d MMM y G + E d MMM y – E d MMM y G - M–M + M–M - d/M – d/M - d/M – d/M + d/M – d/M + d/M – d/M - E d/M – E d/M - E d/M – E d/M + E d/M – E d/M + E d/M – E d/M - MMM–MMM + MMM–MMM - d–d MMM - d MMM – d MMM + d–d MMM + d MMM – d MMM - E d – E d MMM - E d MMM – E d MMM + E d – E d MMM + E d MMM – E d MMM + + + d–d MMMM + d MMMM – d MMMM - y–y G + y–y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y GGGGG + M/y – M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG - d/M/y – d/M/y GGGGG + d/M/y – d/M/y GGGGG + d/M/y – d/M/y GGGGG + d/M/y – d/M/y GGGGG - E d/M/y – E d/M/y GGGGG - E d/M/y – E d/M/y GGGGG - E d/M/y – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG + E d/M/y – E d/M/y GGGGG - MMM–MMM y G - MMM 'do' y – MMM 'do' y G + MMM–MMM y G + MMM 'do' y – MMM 'do' y G - d–d MMM 'do' y G - d MMM – d MMM 'do' y G - d MMM 'do' y – d MMM 'do' y G + d–d MMM 'do' y G + d MMM – d MMM 'do' y G + d MMM 'do' y – d MMM 'do' y G - E d MMM – E d MMM 'do' y G - E d MMM – E d MMM 'do' y G - E d MMM 'do' y – E d MMM 'do' y G + E d MMM – E d MMM 'do' y G + E d MMM – E d MMM 'do' y G + E d MMM 'do' y – E d MMM 'do' y G - MMMM–MMMM 'do' y G - MMMM 'do' y – MMMM 'do' y G + MMMM–MMMM 'do' y G + MMMM 'do' y – MMMM 'do' y G @@ -1108,272 +1247,315 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - de zen. - de fre. - de mar. - d’arv. - de maz. - de zug. - de lug. - d’ago. - de set. - d’ott. - de nov. - de dex. + de zen. + de fre. + de mar. + d’arv. + de maz. + de zug. + de lug. + d’ago. + de set. + d’ott. + de nov. + de dex. - de zenâ - de frevâ - de marso - d’arvî - de mazzo - de zugno - de luggio - d’agosto - de settembre - d’ottobre - de novembre - de dexembre + de zenâ + de frevâ + de marso + d’arvî + de mazzo + de zugno + de luggio + d’agosto + de settembre + d’ottobre + de novembre + de dexembre - zen. - fre. - mar. - arv. - maz. - zug. - lug. - ago. - set. - ott. - nov. - dex. + zen. + fre. + mar. + arv. + maz. + zug. + lug. + ago. + set. + ott. + nov. + dex. - ZN - FR - MR - AR - MZ - ZG - LG - AG - ST - OT - NV - DX + ZN + FR + MR + AR + MZ + ZG + LG + AG + ST + OT + NV + DX - zenâ - frevâ - marso - arvî - mazzo - zugno - luggio - agosto - settembre - ottobre - novembre - dexembre + zenâ + frevâ + marso + arvî + mazzo + zugno + luggio + agosto + settembre + ottobre + novembre + dexembre - dom. - lun. - mät. - mäc. - zeu. - ven. - sab. + dom. + lun. + mät. + mäc. + zeu. + ven. + sab. - domenega - lunesdì - mätesdì - mäcordì - zeuggia - venardì - sabbo + domenega + lunesdì + mätesdì + mäcordì + zeuggia + venardì + sabbo - D - L - M - M - Z - V - S + D + L + M + M + Z + V + S - T1 - T2 - T3 - T4 + Q1 + Q2 + Q3 + Q4 - 1º trimestre - 2º trimestre - 3º trimestre - 4º trimestre + 1º quadrimestre + 2º quadrimestre + 3º quadrimestre + 4º quadrimestre + + + + + Q1 + Q2 + Q3 + Q4 - mëzaneutte - mëzogiorno - da mattin - do poidisnâ - da seia - da neutte + mëzaneutte + mëzogiorno + da mattin + de poidisnâ + da seia + da neutte - m. - p. + mëzaneutte + m. + mëzogiorno + p. + da mattin + de poidisnâ + da seia + da neutte + + + mëzaneutte + mëzogiorno + da mattin + de poidisnâ + da seia + da neutte - mattin - poidisnâ - seia - neutte + mattin + poidisnâ + seia + neutte - m. - p. + m. + p. - avanti de Cristo - avanti de l’era commun - dòppo de Cristo - de l’era commun + avanti de Cristo + avanti de l’era commun + dòppo de Cristo + de l’era commun - aC - AEC - dC - EC + aC + AEC + dC + EC - EEEE d MMMM 'do' y + EEEE d MMMM 'do' y - d MMMM 'do' y + d MMMM 'do' y - d MMM 'do' y + d MMM 'do' y - dd/MM/yy + dd/MM/yy - HH:mm:ss zzzz + HH:mm:ss zzzz - HH:mm:ss z + HH:mm:ss z - HH:mm:ss + HH:mm:ss - HH:mm + HH:mm + + / + - {1}, {0} + {1}, {0} - {1} 'à' {0} + {1} 'à' {0} + + + {1} 'à' {0} - {1}, {0} + {1}, {0} - {1} 'à' {0} + {1} 'à' {0} + + + {1} 'à' {0} - {1}, {0} + {1}, {0} - {1} {0} + {1}, {0} - {1}, {0} + {1}, {0} - E d - y G - d/M/y G - MMM y G - d MMM 'do' y G - E d MMM 'do' y G - h:mm:ss a v - h:mm a v - d/M - E d/M - d MMM - E d MMM - d MMMM - W'ª' 'settemaña' MMMM - W'ª' 'settemaña' MMMM - M/y - d/M/y - E d/M/y - LLL 'do' y - d MMM 'do' y - E d MMM 'do' y - LLLL 'do' y - QQQ y - QQQQ 'do' y - w'ª' 'settemaña' 'do' Y - w'ª' 'settemaña' 'do' Y + E d + y G + M/y G + d/M/y G + E d/M/y G + LLL y G + d MMM 'do' y G + E d MMM 'do' y G + LLLL 'do' y G + d MMMM 'do' y G + E d MMMM 'do' y G + h:mm:ss a + h:mm:ss a v + h:mm a v + d/M + E d/M + d MMM + E d MMM + d MMMM + E d MMMM + W'ª' 'settemaña' MMMM + W'ª' 'settemaña' MMMM + M/y + d/M/y + E d/M/y + LLL 'do' y + d MMM 'do' y + E d MMM 'do' y + LLLL 'do' y + d MMMM 'do' y + E d MMMM 'do' y + QQQ y + QQQQ 'do' y + w'ª' 'settemaña' 'do' Y + w'ª' 'settemaña' 'do' Y + + {0} {1} + h B – h B @@ -1382,102 +1564,102 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm B – h:mm B - y G – y G - y–y G + y G – y G + y–y G - M/y G – M/y G - M/y – M/y G - M/y – M/y G + M/y G – M/y G + M/y – M/y G + M/y – M/y G - d/M/y – d/M/y G - d/M/y G – d/M/y G - d/M/y – d/M/y G - d/M/y – d/M/y G + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G - E d/M/y – E d/M/y G - E d/M/y – E d/M/y G - E d/M/y – E d/M/y G - E d/M/y – E d/M/y G + E d/M/y – E d/M/y G + E d/M/y – E d/M/y G + E d/M/y – E d/M/y G + E d/M/y – E d/M/y G - LLL 'do' y G – LLL 'do' y G - LLL – LLL 'do' y G - LLL 'do' y – LLL 'do' y G + LLL 'do' y G – LLL 'do' y G + LLL – LLL 'do' y G + LLL 'do' y – LLL 'do' y G - d–d MMM 'do' y G - d MMM 'do' y G – d MMM 'do' y G - d MMM – d MMM 'do' y G - d MMM 'do' y – d MMM 'do' y G + d–d MMM 'do' y G + d MMM 'do' y G – d MMM 'do' y G + d MMM – d MMM 'do' y G + d MMM 'do' y – d MMM 'do' y G - E d MMM – E d MMM 'do' y G - E, d MMM 'do' y G – E d MMM 'do' y G - E d MMM – E d MMM 'do' y G - E d MMM 'do' y – E d MMM 'do' y G + E d MMM – E d MMM 'do' y G + E d MMM 'do' y G – E d MMM 'do' y G + E d MMM – E d MMM 'do' y G + E d MMM 'do' y – E d MMM 'do' y G - h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v - - - h a – h a v - h–h a v + h:mm a – h:mm a v + h:mm–h:mm a v + h:mm–h:mm a v - M–M + M–M - d/M – d/M - d/M – d/M + d/M – d/M + d/M – d/M - E d/M – E d/M - E d/M – E d/M + E d/M – E d/M + E d/M – E d/M - d–d MMM - d MMM – d MMM + d–d MMM + d MMM – d MMM - E d – E d MMM - E d MMM – E d MMM + E d – E d MMM + E d MMM – E d MMM + + + d–d MMMM + d MMMM – d MMMM - M/y – M/y - M/y – M/y + M/y – M/y + M/y – M/y - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y - E d/M/y – E d/M/y - E d/M/y – E d/M/y - E d/M/y – E d/M/y + E d/M/y – E d/M/y + E d/M/y – E d/M/y + E d/M/y – E d/M/y - LLL–LLL 'do' y - LLL 'do' y – LLL 'do' y + LLL–LLL 'do' y + LLL 'do' y – LLL 'do' y - d–d MMM 'do' y - d MMM – d MMM 'do' y - d MMM 'do' y – d MMM 'do' y + d–d MMM 'do' y + d MMM – d MMM 'do' y + d MMM 'do' y – d MMM 'do' y - E d – E d MMM 'do' y - E d MMM – E d MMM 'do' y - E d MMM 'do' y – E d MMM 'do' y + E d – E d MMM 'do' y + E d MMM – E d MMM 'do' y + E d MMM 'do' y – E d MMM 'do' y - LLLL–LLLL 'do' y - LLLL 'do' y – LLLL 'do' y + LLLL–LLLL 'do' y + LLLL 'do' y – LLLL 'do' y @@ -1977,19 +2159,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - +HH:mm;−HH:mm - UTC{0} - UTC - oa: {0} - oa de stæ: {0} - oa standard: {0} + +HH:mm;−HH:mm + UTC+? + oa: {0} + oa de stæ: {0} + oa standard: {0} - tempo universale coordinou + tempo universale coordinou - çittæ desconosciua + pòsto desconosciuo Andòrra @@ -2007,7 +2188,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Bahrein - San Bertomê + San Bertomê San Poulo @@ -2022,14 +2203,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Bogotà - Còsta Rica + Còsta Rica Cappo Verde - - Curaçao - Praga @@ -2055,13 +2233,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pariggi - - oa de stæ britannica - Londra - Granada + Granada Caieña @@ -2070,7 +2245,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Gibertâ - Guadaluppa + Guadaluppa Atene @@ -2085,9 +2260,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giacarta - - oa de stæ d’Irlanda - Doblin @@ -2108,12 +2280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Comöre - - San Cristoffa - - - Santa Luçia - Luxemburgo @@ -2124,13 +2290,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ulan Bator - Martinica + Martinica Maldive - Çittæ do Mescico + Çittæ do Mescico Nouméa @@ -2201,9 +2367,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Samarcanda - - San Viçenso - Maiòtta @@ -2234,9 +2397,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de l’Alaska - oa standard de l’Alaska - oa de stæ de l’Alaska + oa de l’Alaska + oa standard de l’Alaska + oa de stæ de l’Alaska @@ -2276,9 +2439,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Apia - oa standard de Apia - oa de stæ de Apia + oa de Samoa + oa standard de Samoa + oa de stæ de Samoa @@ -2382,16 +2545,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ oa de stæ de Brasilia + + + oa britannica + oa de stæ britannica + + - oa do Brunei Darussalam + oa do Brunei - oa de Cappo Verde - oa standard de Cappo Verde - oa de stæ de Cappo Verde + oa de Cao Verde + oa standard de Cao Verde + oa de stæ de Cao Verde @@ -2458,12 +2627,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Dumont-d’Urville + oa de Dumont d’Urville - oa de Timor Est + oa de Timor-Leste @@ -2552,21 +2721,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa do meridian de Greenwich + oa do meridian de Greenwich + + + + + oa da Groenlandia + oa standard da Groenlandia + oa de stæ da Groenlandia - oa da Groenlandia de levante - oa standard da Groenlandia de levante - oa de stæ da Groenlandia de levante + oa da Groenlandia de levante + oa standard da Groenlandia de levante + oa de stæ da Groenlandia de levante - oa da Groenlandia de ponente - oa standard da Groenlandia de ponente - oa de stæ da Groenlandia de ponente + oa da Groenlandia de ponente + oa standard da Groenlandia de ponente + oa de stæ da Groenlandia de ponente @@ -2581,14 +2757,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa standard de Hawaii-Aleutiñe + oa standard de Hawaii - oa de Hawaii-Aleutiñe - oa standard de Hawaii-Aleutiñe - oa de stæ de Hawaii-Aleutiñe + oa de Hawaii-Aleutiñe + oa standard de Hawaii-Aleutiñe + oa de stæ de Hawaii-Aleutiñe @@ -2600,9 +2776,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Hovd - oa standard de Hovd - oa de stæ de Hovd + oa de Khovd + oa standard de Khovd + oa de stæ de Khovd @@ -2642,6 +2818,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ oa de stæ de l’Iran + + + oa d’Irlanda + oa de stæ d’Irlanda + + oa de Irkutsk @@ -2658,9 +2840,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa do Giappon - oa standard do Giappon - oa de stæ do Giappon + oa do Giapon + oa standard do Giapon + oa de stæ do Giapon + + + + + oa do Kazakistan @@ -2750,9 +2937,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa do Paçifico mescicaña - oa standard do Paçifico mescicaña - oa de stæ do Paçifico mescicaña + oa do Paçifico mescicaña + oa standard do Paçifico mescicaña + oa de stæ do Paçifico mescicaña @@ -2800,9 +2987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Tæraneuva - oa standard de Tæraneuva - oa de stæ de Tæraneuva + oa de Tæraneuva + oa standard de Tæraneuva + oa de stæ de Tæraneuva @@ -2883,9 +3070,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de San Pê e Miquelon - oa standard de San Pê e Miquelon - oa de stæ de San Pê e Miquelon + oa de San Pê e Miquelon + oa standard de San Pê e Miquelon + oa de stæ de San Pê e Miquelon @@ -2900,7 +3087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Pyongyang + oa da Corea do Nòrd @@ -2922,9 +3109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Samoa - oa standard de Samoa - oa de stæ de Samoa + oa standard de Samoa americañe @@ -2964,9 +3149,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa de Taipei - oa standard de Taipei - oa de stæ de Taipei + oa de Taiwan + oa standard de Taiwan + oa de stæ de Taiwan @@ -3074,7 +3259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - oa do Yukon + oa do Yukon @@ -3145,13 +3330,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - #,##0.00 ¤ + #,##0.00 ¤ #,##0.00 ¤ - #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00 ¤;(#,##0.00 ¤) #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00;(#,##0.00) + #,##0.00;(#,##0.00) @@ -3182,14 +3367,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 000 Bio ¤ - {0} {1} - {0} {1} - dirham di Emirati Arabi Unii - dirham di EAU - dirham di EAU + dirham di Emirati Arabi Unii + dirham di EAU + dirham di EAU afghani @@ -3200,9 +3383,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lekë arbaneixi - dram ermeno - dram ermeno - dram ermeni + dram ermeno + dram ermeno + dram ermeni fiorin de Antille olandeixi @@ -3227,9 +3410,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ fiorin d’Aruba - manat azero - manat azero - manat azeri + manat azero + manat azero + manat azeri marco convertibile da Bòsnia-Herzegòvina @@ -3252,7 +3435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ leva burgai - dinar do Bahrein + dinar do Bahrein franco do Burundi @@ -3420,9 +3603,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GBP - lari georgian - lari georgian - lari georgien + lari georgian + lari georgian + lari georgien cedi ghaneise @@ -3486,9 +3669,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ rupie indonesiañe - neuvo sciclo israelian - neuvo sciclo israelian - neuvi scicli israelian + neuvo sciclo israelian + neuvo sciclo israelian + neuvi scicli israelien rupia indiaña @@ -3497,7 +3680,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ INR - dinar irachen + dinar irachen rial iranian @@ -3515,9 +3698,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dòllai giamaichen - dinar giordan - dinar giordan - dinar giorden + dinar giordan + dinar giordan + dinar giorden yie giapponeise @@ -3557,7 +3740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ KRW - dinar do Kuwait + dinar do Kuwait dòllao de isoe Cayman @@ -3575,9 +3758,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kip laotien - sterliña libaneise - sterliña libaneise - sterliña libaneixi + sterliña libaneise + sterliña libaneise + sterliñe libaneixi rupia do Sri Lanka @@ -3694,7 +3877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ NZD - rial de l’Oman + rial de l’Oman balboa de Panama @@ -3733,7 +3916,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ guaraníes paraguayen - rial do Qatar + rial do Qatar leu romen @@ -3756,9 +3939,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ franchi do Rwanda - rial saudita - rial saudita - rial sauditi + rial saudita + rial saudita + rial sauditi dòllao de Isoe Salomon @@ -3815,9 +3998,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dobras de Sao Tomé e Prinçipe - sterliña sciriaña - sterliña sciriaña - sterliñe sciriañe + sterliña sciriaña + sterliña sciriaña + sterliñe sciriañe lilangeni do Swaziland @@ -3850,9 +4033,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ paʻanga tonghen - lia turca - lia turca - lie turche + lia turca + lia turca + lie turche dòllao de Trinidad e Tobago @@ -3922,6 +4105,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dòllai di Caraibi de levante XCD + + fiorin di Caraibi + fiorin di Caraibi + fiorin di Caraibi + franco CFA BCEAO franco CFA BCEAO @@ -3938,7 +4126,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ (monæe desconosciue) - rial do Yemen + rial do Yemen rand sudafrican @@ -3950,6 +4138,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kwacha zambian kwacha zambien + + öo do Zimbabwe + öo do Zimbabwe + öi do Zimbabwe + {0}-{1} @@ -3993,6 +4186,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yocto{0} + + ronto{0} + + + quecto{0} + deca{0} @@ -4023,6 +4222,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ yotta{0} + + ronna{0} + + + quetta{0} + kibi{0} @@ -4165,6 +4370,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} elemento {0} elementi + + parte + {0} parte + {0} parte + parte pe mion {0} parte pe mion @@ -4190,6 +4400,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} möle {0} möle + + de glucòsio + {0} de glucòsio + {0} de glucòsio + litri pe chillòmetri {0} litro pe chillòmetri @@ -4679,6 +4894,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} millimetro de mercuio {0} millimetri de mercuio + + de mercuio + {0} de mercuio + {0} de mercuio + lie-fòrsa pe pòlliçe quaddro {0} lia-fòrsa pe pòlliçe quaddro @@ -4739,6 +4959,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} nödo {0} nödi + + Beaufort + graddi {0} graddo @@ -4847,6 +5070,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} tassa metrica {0} tasse metriche + + onse fluide metriche + {0} onsa fluida metrica + {0} onse fluide metriche + acri-pê {0} acro-pê @@ -4929,6 +5157,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} quarto imperiale {0} quarti imperiali + + steradianti + {0} steradiante + {0} steradianti + + + katal + {0} katal + {0} katal + + + coulomb + {0} coulomb + {0} coulomb + + + farad + {0} farad + {0} farad + + + henry + {0} henry + {0} henry + + + siemens + {0} siemens + {0} siemens + + + calorie [IT] + {0} calorie [IT] + {0} calorie [IT] + + + becquerel + {0} becquerel + {0} becquerel + + + sievert + {0} sievert + {0} sievert + + + gray + {0} gray + {0} gray + + + chillogrammi-fòrsa + {0} chillogrammo-fòrsa + {0} chillogrammi-fòrsa + + + tesla + {0} tesla + {0} tesla + + + weber + {0} weber + {0} weber + + + luxe + {0} luxe + {0} luxe + + + parte pe miliardo + {0} parte pe miliardo + {0} parte pe miliardo + + + neutte + {0} neutte + {0} neutte + {0} pe neutte + ponto cardinâ {0} est @@ -4971,6 +5280,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} elem. {0} elem. + + parte + {0} parte + {0} parte + + + Glc + l/km {0} l/km @@ -4998,8 +5315,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sec. - {0} sec. - {0} sec. + {0} sec. + {0} sec. dëx. @@ -5114,6 +5431,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mmHg {0} mmHg + + de Hg + {0} de Hg + {0} de Hg + Ml {0} Ml @@ -5193,6 +5515,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt imp. {0} qt imp. + + cal-IT + + + luxe + {0} luxe + {0} luxe + + + parte/miliardo + {0} ppmd + {0} ppmd + + + neutte + {0} neutte + {0} neutte + {0}/neutte + ponto {0} E @@ -5267,6 +5608,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}elem {0}elem + + parte + {0} parte + {0} parte + {0}ppm {0}ppm @@ -5275,6 +5621,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol {0}mol + + Glc + {0}l/km {0}l/km @@ -5683,6 +6032,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg {0}mmHg + + de Hg + {0} de Hg + {0} de Hg + {0}psi {0}psi @@ -5893,6 +6247,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt im {0}qt im + + cal-IT + + + luxe + {0}luxe + {0}luxe + + + ppmd + {0} ppmd + {0} ppmd + + + neutte + {0}neutte + {0}neutte + {0}/neutte + {0}E {0}N @@ -5922,6 +6295,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} — compatibilitæ {0} — çerciou {0} — esteiso + {0} in sciâ manciña + {0} in sciâ drita {0} — stòrico {0} — vario {0} — atro @@ -6065,143 +6440,167 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ und lij - {title} {given} {given2} {surname} + {title} {given} {given2} {surname} - {given-informal} {surname} + {given-informal} {surname} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {given-informal-monogram-allCaps}{surname-monogram-allCaps} + {given-informal-monogram-allCaps}{surname-monogram-allCaps} - {given} {given2-initial} {surname} + {given} {given2-initial} {surname} - {given-informal} {surname} + {given-informal} {surname} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {given-informal-monogram-allCaps}{surname-monogram-allCaps} + {given-informal-monogram-allCaps}{surname-monogram-allCaps} - {given-initial} {given2-initial} {surname} + {given-initial} {given2-initial} {surname} - {given-informal} {surname-initial} + {given-informal} {surname-initial} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {surname-monogram-allCaps} + {surname-monogram-allCaps} - {given-informal-monogram-allCaps} + {given-informal-monogram-allCaps} - {surname} {given} {given2} + {surname} {given} {given2} - {surname} {given-informal} + {surname} {given-informal} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {surname-monogram-allCaps}{given-informal-monogram-allCaps} + {surname-monogram-allCaps}{given-informal-monogram-allCaps} - {surname} {given} {given2-initial} + {surname} {given} {given2-initial} - {surname} {given-informal} + {surname} {given-informal} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {surname-monogram-allCaps}{given-monogram-allCaps} + {surname-monogram-allCaps}{given-monogram-allCaps} - {surname-monogram-allCaps}{given-informal-monogram-allCaps} + {surname-monogram-allCaps}{given-informal-monogram-allCaps} - {surname} {given-initial} {given2-initial} + {surname} {given-initial} {given2-initial} - {surname} {given-informal-initial} + {surname} {given-informal-initial} - {title} {surname} + {title} {surname} - {given-informal} + {given-informal} - {surname-monogram-allCaps} + {surname-monogram-allCaps} - {given-informal-monogram-allCaps} + {given-informal-monogram-allCaps} - {surname-core}, {title} {given} {given2} {surname-prefix} + {surname-core}, {title} {given} {given2} {surname-prefix} - {surname-core}, {given-informal} {surname-prefix} + {surname-core}, {given-informal} {surname-prefix} - {surname-core}, {given} {given2-initial} {surname-prefix} + {surname-core}, {given} {given2-initial} {surname-prefix} - {surname-core}, {given-informal} {surname-prefix} + {surname-core}, {given-informal} {surname-prefix} - {surname-core}, {given-initial} {given2-initial} {surname-prefix} + {surname-core}, {given-initial} {given2-initial} {surname-prefix} - {surname-core}, {given-informal-initial} {surname-prefix} + {surname-core}, {given-informal-initial} {surname-prefix} - Zane + Zane - Luçia - Cangiaxo + Luçia + Cangiaxo - Françesco - Maria - Parödi + Françesco + Maria + Parödi - Dott.a Prof.a - Maria Giöxeppiña - Maiòllo - Reusa Texa - De - Franchi - Carcagno Baçigalô - OMRI + Dott.a Prof.a + Maria Giöxeppiña + Maiòllo + Reusa Texa + De + Franchi + Carcagno Baçigalô + II + OMRI + + + Sinbad + + + Käthe + Müller + + + Zäzilia + Hamish + Stöber + + + Prof. Dr. + Ada Cornelia + Neele + César Martín + von + Brühl + González Domingo + Jr + MD DDS diff --git a/make/data/cldr/common/main/lld.xml b/make/data/cldr/common/main/lld.xml index b729f8febe31..fd6546bd2290 100644 --- a/make/data/cldr/common/main/lld.xml +++ b/make/data/cldr/common/main/lld.xml @@ -27,22 +27,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic azerbaijan bashkir baluchi + basaa belarus + bemba + betawi + bena bulgar + haryanvi + bhojpuri anii bambara bengalesc tibetan bakhtiari breton + bodo bosniach akoose + blin catalan atsam cecen + cebuano cherokee corsich cech + Swampy Cree slav eclesiastich ciuvascich galesc @@ -102,6 +112,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic iapanesc giavanesc georgian + kabuverdianu kaingang kikuyu kazakh @@ -109,25 +120,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic khmer kannada corean + konkani kashmiri bafia curdich + curdich + kurmanji cornich + kuvi kyrgyz latin lussemburghesc ganda ladin + lombert lingala lao lituan luba-katanga leton + maithili malgasich maori macedonich malayalam mongolich + manipuri marathi malesc maltesc @@ -139,6 +157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic flamesc norvegesc nynorsk norvegesc + n’ko ndebele dl süd navajan nyanja @@ -153,6 +172,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic portoghesc (BR) portoghesc (PT) quechua + Rajasthani rumanc rundi rumen @@ -160,10 +180,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic rus kinyarwanda sanscrit + yakut + santali sard + sizilian sindhi sami dl nord sango + shan singalesc slovach sloven @@ -177,6 +201,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic svedesc swahili swahili dl Congo + siriach + silesian tamilich telugu tajich @@ -188,6 +214,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic türch tsonga tatarich + tuvinian uigurich ucrainich lingaz nia conesciü @@ -195,10 +222,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic uzbech venda vietnamesc + makhuwa volapük valonesc wolof xhosa + kangri yiddish yoruba nheengatu @@ -210,17 +239,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic cinesc tradizional cinesc mandarin tradizional zulu + degun contignü linguistich + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -364,7 +437,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guyana Regiun aministrativa speziala de Hong Kong Hong Kong - Isoles Heard y McDonald + Isoles Heard y Isoles McDonald Honduras Croazia Haiti @@ -472,7 +545,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sudan Svezia Singapur - St. Helena + St. Helena, Ascension & Tristan da Cunha Slovenia Svalbard y Jan Mayen Slovachia @@ -491,7 +564,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tristan da Cunha Isoles Turks y Caicos Ciad - Teritori franzesc dl Süd y dl’Antartica + Teritori franzesc dl Süd y dl Antartich Togo Thailandia Tajikistan @@ -532,18 +605,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbabwe Raiun nia conesciü + + calënder + valüta + pröm de dl’edema + tastadöra + zona orara + - Calënder gregorian - Gregorian - Calënder ISO-8601 + calënder budist + budist + calënder cinesc + cinesc + calënder coptich + coptich + calënder dangi + dangi + calënder etiopich + etiopich + calënder etiopich-amete-alem + etiopich-amete-alem + calënder gregorian + gregorian + calënder ebraich + ebraich + calënder gregorian (edemes aladô de ISO-8601) + gregorian + calënder iapanesc + iapanesc + calënder persian + persian + calënder minguo + minguo + standard Ordinamënt standard Standard + valüta + emoji + test + sistem metrich + metrich Zifres ozidentales metrich - Gran Bretagna - Stac Unis + Gran Bretagna + Stac Unis Lingaz: {0} @@ -555,7 +662,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic [aáàâ b cć d eéèêë f g h iíî j k l m n oóôö p q r s t uúü v w x y z] [ăåäãąā ĉčċç ð ěėē ğ ìïī ńňñ òŏőõō ŕř śŝş ß ùûůűū ýÿ źžż] [\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9] - [\- ‑ , ; \: ! ? . '’ “”„ « » ( ) \[ \] \{ \} @ * / \& # < >] + [\- ‑ , ; \: ! ? . '‘’ “”„ « » ( ) \[ \] \{ \} @ * / \& # < >] ” @@ -589,6 +696,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1}, {0} @@ -655,20 +765,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic - M.y – M.y GGGGG - M.y – M.y GGGGG + M.y – M.y G + M.y – M.y G - d.M.y – d.M.y GGGGG + d.M.y – d.M.y G d.M.y GGGGG – d.M.y GGGGG - d.M.y – d.M.y GGGGG - d.M.y – d.M.y GGGGG + d.M.y – d.M.y G + d.M.y – d.M.y G - E, d.M.y – E, d.M.y GGGGG - E, d.M.y – E, d.M.y GGGGG - E, d.M.y – E, d.M.y GGGGG - E, d.M.y – E, d.M.y GGGGG + E, d.M.y – E, d.M.y G + E, d.M.y – E, d.M.y G + E, d.M.y – E, d.M.y G + E, d.M.y – E, d.M.y G MMM y G – MMM y G @@ -709,6 +819,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, dd – E, dd MMM E, dd MMM – E, dd MMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -923,6 +1037,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -969,11 +1086,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLL y G d MMM y G E, d MMM y G + G y, MMMM + G y, d MMMM + G y, E d MMMM d.M. E, d.M. d MMM E, d MMM d MMMM + E, d MMMM 'edema' W MMMM 'edema' W MMMM MM.y @@ -983,6 +1104,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y LLLL y + d MMMM y + E, d MMMM y QQQ y QQQQ y 'edema' w 'dl' Y @@ -1046,6 +1169,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + MM.y – MM.y MM.y – MM.y @@ -1647,7 +1774,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Cité nia conesciüda + Posiziun nia reconesciüda Tirana @@ -1686,9 +1813,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Faroer - - Ora da d’isté britanica - Londra @@ -1703,11 +1827,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Giacarta - - - Ora da d’isté dl’Irlanda - - Ierusalem @@ -1822,6 +1941,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ho Chi Minh City + + + Ora de Acre + Ora standard de Acre + Ora da d’isté de Acre + + Ora dl Afghanistan @@ -1891,9 +2017,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de Apia - Ora standard de Apia - Ora da d’isté de Apia + Ora dles Somoa ozidentales + Ora standard dles Somoa ozidentales + Ora da d’isté dles Somoa ozidentales @@ -1997,9 +2123,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora da d’isté de Brasilia + + + Ora da d’isté britanica + + - Ora dl Brunei Darussalam + Ora dl Brunei @@ -2056,7 +2187,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora dles Isoles Cook Ora standard dles Isoles Cook - Ora da d’isté mesana dles Isoles Cook + Ora da d’isté dles Isoles Cook @@ -2073,12 +2204,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de Dumont-d’Urville + Ora de Dumont d’Urville - Ora de Timor Ost + Ora de Timor-Leste @@ -2140,7 +2271,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora di Teritori franzesc dl Süd y dl’Antartica + Ora di Teritori franzesc dl Süd @@ -2170,6 +2301,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora mesana de Greenwich + + + Ora dla Groenlandia + Ora standard dla Groenlandia + Ora da d’isté dla Groenlandia + + Ora dla Groenlandia orientala @@ -2215,9 +2353,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de Hovd - Ora standard de Hovd - Ora da d’isté de Hovd + Ora de Khovd + Ora standard de Khovd + Ora da d’isté de Khovd @@ -2257,6 +2395,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora da d’isté dl Iran + + + Ora da d’isté dl’Irlanda + + Ora de Irkutsk @@ -2278,6 +2421,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora da d’isté dl Iapan + + + Ora de Kamchatka + Ora standard de Kamchatka + Ora da d’isté de Kamchatka + + Ora dl Kazakhstan @@ -2515,12 +2665,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de Ponape + Ora de Pohnpei - Ora de Pjöngjang + Ora dla Corea dl Nord @@ -2540,11 +2690,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora da d’isté de Sachalin + + + Ora de Samara + Ora standard de Samara + Ora da d’isté de Samara + + - Ora de Samoa - Ora standard de Samoa - Ora da d’isté de Samoa + Ora standard dles Samoa americanes @@ -2584,9 +2739,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de Taipei - Ora standard de Taipei - Ora da d’isté de Taipei + Ora dl Taiwan + Ora standard dl Taiwan + Ora da d’isté dl Taiwan @@ -2611,6 +2766,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora dl Chuuk + + + Ora dla Turchia + Ora standard dla Turchia + Ora da d’isté dla Turchia + + Ora dl Turkmenistan @@ -2630,6 +2792,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora da d’isté dl Uruguay + + + Ora de Ürümqi + + Ora dl Uzbekistan @@ -3565,8 +3732,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic rainesc di Caraibi - rainesc di Caraibi - rainesc di Caraibi Franch CFA dl’Africa ozidentala @@ -3605,13 +3770,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic - {0} de - {0} dis + Té la {0} a man dërta. + + metri + {0} n meter + {0} metri + {0} al meter + + + zentimetri + {0} n zentimeter + {0} zentimetri + + + milimetri + {0} n milimeter + {0} milimetri + + + micrometri + {0} n micrometer + {0} micrometri + + + nanometri + {0} n nanometer + {0} nanometri + + + picometri + {0} n picometer + {0} picometri + punt cardinal {0} ost @@ -3621,6 +3820,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + m + + + μmetri + direziun {0}O @@ -3628,6 +3833,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + m + + + μmetri + {0} O {0} N @@ -3646,4 +3857,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} o {1} + + + ê + no + + diff --git a/make/data/cldr/common/main/lmo.xml b/make/data/cldr/common/main/lmo.xml index 5652f7697bf3..f4350b63fb4a 100644 --- a/make/data/cldr/common/main/lmo.xml +++ b/make/data/cldr/common/main/lmo.xml @@ -72,14 +72,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - d MMM y - - + + + Temp Universàl Coordinàa + + Temp Medi de Greenwich diff --git a/make/data/cldr/common/main/lo.xml b/make/data/cldr/common/main/lo.xml index c68bd4775bac..28bea16b95c1 100644 --- a/make/data/cldr/common/main/lo.xml +++ b/make/data/cldr/common/main/lo.xml @@ -421,6 +421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ປາລີ ປິຈິນ ໂປລິຊ + ປີເອມອນເຕ ພອນເພ ມາລິຊີດ ພາສຊາມາໂຄດດີ ປຣັສຊຽນ @@ -1136,15 +1137,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ປະຕິທິນ ຮູບແບບສະກຸນເງິນ + ການຮຽງລຳດັບແບບຍົກເວັ້ນສັນຍາລັກ + ການຮຽງລຳດັບແບບຍ້ອນກັບເຄື່ອງໝາຍການອອກສຽງ + ການຮຽງລຳດັບຕົວພິມໃຫຍ່/ຕົວພິມນ້ອຍ + ການຮຽງລຳດັບແບບແຍກຕົວພິມໃຫຍ່-ນ້ອຍ ຮຽງລຳດັບ + ການຈັດລຽງແບບປັບໃຫ້ເປັນມາດຕະຖານ + ການຈັດລຽງຕາມຕົວເລກ + ການຈັດລໍາດັບສະຄຣິບ/ບລັອກໃໝ່ + ລະດັບຄວາມແມ່ນຍຳໃນການຈັດລຽງ ສະກຸນເງິນ + ຈຸດໝາຍປັບປ່ຽນ + ຂໍ້ຍົກເວັ້ນການຕັດແຖວຕາມວັດຈະນານຸກົມ ການນໍາສະເໜີອີໂມຈິ + ມື້ທຳອິດຂອງອາທິດ + ແບບປະສົມ ຮອບວຽນຊົ່ວໂມງ( 12 ຫຼື 24) + ວິທີການປ້ອນຂໍ້ມູນ + ແປ້ນພິມ + ຄ່າສູງສຸດທີ່ຖືກລະເວັ້ນ ຮູບແບບເສັ້ນຂັ້ນ ຮູບແບບເສັ້ນຂັ້ນພາຍໃນຄໍາສັບ + ກົດເກນການປັບປ່ຽນ ລະບົບການວັດແທກ + ຫົວໜ່ວຍການວັດແທກ ຕົວເລກ + ພາກພື້ນສຳລັບຂໍ້ມູນເສີມ + ແຫຼ່ງຂໍ້ມູນການຫັນປ່ຽນ + ເຂດຍ່ອຍຂອງພາກພື້ນ ຮູບແບບປະໂຫຍກຂັ້ນຫຼັງຕົວອັກສອນຫຍໍ້ + ປັບປ່ຽນ + ແປໂດຍເຄື່ອງຈັກ + ເຂດເວລາ + ຕົວເລືອກທ້ອງຖິ່ນຍ່ອຍ + ໃຊ້ສ່ວນຕົວ + ປັບປ່ຽນແບບໃຊ້ສ່ວນຕົວ ປະຕິທິນ ພຸດທະສັງກາດ @@ -1158,19 +1185,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ປະຕິທິນເອທິໂອເປຍ ເອທິໂອເປຍ ປະຕິທິນປີໂອເອທິໂອເປຍ - ໂອເອທິໂອເປຍ + ເອທິໂອປິກ ອະເມເຕ ອາເລັມ ປະຕິທິນເກຣໂກຣຽນ ເກຣໂກຣຽນ ປະ​ຕິ​ທິນ​ຮີບ​ຣິວ ​ຮີບ​ຣິວ ປະຕິທິນແຫ່ງຊາດອິນເດຍ - ປະຕິທິນອິສະລາມ + ແຫ່ງຊາດອິນເດຍ + ປະຕິທິນອິດສະລາມ ປະຕິທິນອິດສະລາມ ປະຕິທິນອິດສະລາມ ປະຕິທິນອິດສະລາມ + ປະຕິທິນອິດສະລາມ, ສັງເກດດວງຈັນຊາອຸດິ ອາຣາເບຍ + ປະຕິທິນອິດສະລາມ (ແບບຕາຕະລາງ, ສັກກະລາດທາງດາລາສາດ) ປະຕິທິນອິດສະລາມ (ອຳອາວຄິວຣາ) ປະຕິທິນອິດສະລາມ (ອຳອາວຄິວຣາ) ປະ​ຕິ​ທິນ ISO-8601 + ຈໍຈຽນ ປະຕິທິນຍີ່ປຸ່ນ ຍີ່ປຸ່ນ ປະຕິທິນເປີຊຽນ @@ -1181,22 +1212,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ການບັນຊີ ຮູບແບບສະກຸນເງິນມາດຕະຖານ ມາດຕະຖານ + ຕົວພິມນ້ອຍ + ຕົວພິມນ້ອຍ + ຕົວພິມໃຫຍ່ + ຄວາມເຂົ້າກັນໄດ້ ລຽງຕາມພົດຈະນານຸກົມ + ວັດຈະນານຸກົມ ຮຽງຕາມລຳດັບຢູນິໂຄດເລີ່ມຕົ້ນ ຢູນິໂຄດເລີ່ມຕົ້ນ + ອີໂມຈິ + ຫຼັກເກນເອີຣົບ ລຽງຕາມສະໝຸດໂທລະສັບ + ປຶ້ມເບີໂທ + ສຽງສະກົດ ລຽງຕາມການອອກສຽງພາສາຈີນ + ພິນອິນ ການຊອກຫາທົ່ວໄປ ການຊອກຫາ ຄົ້ນຫາຕາມພະຍັນຊະນະຂຶ້ນຕົ້ນທີ່ເປັນຮັງກີຣ + ພະຍັນຊະນະຕົ້ນພາສາເກົາຫຼີ ຮຽງຕາມມາດຕະຖານ ມາດຕະຖານ ລຽງຕາມການລາກເສັ້ນ + ເສັ້ນຂີດ ລຽງຕາມແບບດັ້ງເດີມ + ແບບດັ້ງເດີມ ລຽງລຳດັບຕາມຈຳນວນຂີດ + ໝວດອັກສອນ-ເສັ້ນຂີດ + ຈູອິນ + ສະກຸນເງິນ + ຕົວເລກ + ເຄື່ອງໝາຍວັກຕອນ + ພື້ນທີ່ຫວ່າງ + ສັນຍະລັກ + ທັງໝົດ + ຕົວອັກສອນພື້ນຖານເທົ່ານັ້ນ + ພື້ນຖານ, ເຄື່ອງໝາຍກຳກັບສຽງ, ຕົວພິມໃຫຍ່-ນ້ອຍ, ຮູບແບບຍ່ອຍ, ຄານະ + ພື້ນຖານ, ເຄື່ອງໝາຍກຳກັບສຽງ + ພື້ນຖານ, ເຄື່ອງໝາຍກຳກັບສຽງ, ຕົວພິມໃຫຍ່-ນ້ອຍ, ຮູບແບບຍ່ອຍ + ປ່ຽນເປັນແບບເຕັມຄວາມກວ້າງ + ປ່ຽນເປັນແບບເຕັມຄວາມກວ້າງເຄິ່ງໜຶ່ງ ຄ່າເລີ່ມຕົ້ນ ອີໂມຈິ ຂໍ້ຄວາມ + ຕາມລະບົບ 12 ຊົ່ວໂມງ + 12 + ຕາມລະບົບ 24 ຊົ່ວໂມງ + 24 ຕາມລະບົບ 12 ຊົ່ວໂມງ (0–11) 12 (0–11) ຕາມລະບົບ 12 ຊົ່ວໂມງ (1–12) @@ -1205,6 +1267,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) ຕາມລະບົບ 24 ຊົ່ວໂມງ (1–24) 24 (1–24) + ຍ້າຍຍະຫວ່າງ, ເຄື່ອງໝາຍວັກຕອນ, ສັນຍະລັກທັງໝົດ + ຍ້າຍຍະຫວ່າງ, ເຄື່ອງໝາຍວັກຕອນ + ຍ້າຍຍະຫວ່າງ, ເຄື່ອງໝາຍວັກຕອນ + ຍ້າຍຍະຫວ່າງ, ເຄື່ອງໝາຍວັກຕອນ, ສັນຍະລັກທີ່ບໍ່ແມ່ນສະກຸນເງິນ ຮູບແບບເສັ້ນຂັ້ນແບບຫຼວມ ແບບຫຼວມ ຮູບແບບເສັ້ນຂັ້ນແບບປົກກະຕິ @@ -1215,6 +1281,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ຮັກສາທັງໝົດໄວ້ ປົກກະຕິ ຮັກສາໄວ້ໃນປະໂຫຍກ + ການຖອດອັກສອນແບບ BGN ຂອງສະຫະລັດ + ການຖອດອັກສອນແບບ GEGN ຂອງສະຫະລັດ ລະບົບເມທຣິກ ເມທຣິກ ລະບົບການວັດແທກແບບອິມເພີຣຽວ @@ -1223,60 +1291,95 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ US ຕົວເລກອາຣາບິກ-ອິນດິກ ຕົວເລກອາຣາບິກ-ອິນດິກຕົວເຕັມ + ອາຣາບິກ-ອິນດິກຕົວເຕັມ ຕົວເລກອາເມນຽນ ຕົວເລກອາເມນຽນຕົວພິມນ້ອຍ + ອາເມນຽນຕົວພິມນ້ອຍ ຕົວເລກບາລີ ຕົວເລກບັງກລາ ຕົວເລກຈັກກະມາ ຕົວເລກຊຣາມ ຕົວເລກເດວານາກາຣີ ຕົວເລກເອທິໂອປິກ + ການເງິນ ຕົວເລກຄວາມກວ້າງເຕັມ + ຄວາມກວ້າງເຕັມ ຕົວເລກຈໍຈຽນ ຕົວເລກກຣີກ ຕົວເລກກຣີກຕົວພິມນ້ອຍ + ກຣີກຕົວພິມນ້ອຍ ຕົວເລກກຸຈາຣາທີ ຕົວເລກກົວມູຄິ + ຕົວເລກວັນທີຂອງເດືອນເປັນຕົວອັກສອນຮັນ ສຳລັບປະຕິທິນແບບດັ້ງເດີມ ຕົວເລກທົດສະນິຍົມຈີນ + ລະບົບເລກຖານສິບແບບຕຳແໜ່ງທີ່ໃຊ້ອັກສອນຕົວເລກຈີນເປັນຫຼັກເລກ ຕົວເລກຈີນແບບຮຽບງ່າຍ ຕົວເລກທາງການເງິນແບບຮຽບງ່າຍຂອງຈີນ + ການເງິນແບບຮຽບງ່າຍຂອງຈີນ ຕົວເລກຈີນແບບດັ້ງເດີມ ຕົວເລກທາງການເງິນແບບດັ້ງເດີມຂອງຈີນ + ການເງິນແບບດັ້ງເດີມຂອງຈີນ ຕົວເລກຮິບຣິວ ຕົວເລກຊົວ ຕົວເລກຍີ່ປຸ່ນ ຕົວເລກທາງການເງິນຂອງຍີ່ປຸ່ນ + ການເງິນຂອງຍີ່ປຸ່ນ + ລະບົບການນັບປີທຳອິດແບບ "ກັນເນັນ" ຂອງຍີ່ປຸ່ນ ຕົວເລກກາຢາ ຕົວເລກຂະແມ ຕົວເລກແຄນນາດາ ຕົວເລກໄທທຳໂຮລາ ຕົວເລກໄທທຳທຳ + ຕົວເລກໄທທຳທຳ (ທາງສາສະໜາ) ຕົວເລກລາວ ຕົວເລກຕາເວັນຕົກ ຕົວເລກເລຊາ ຕົວເລກລິມບູ + ຕົວອັກສອນຄະນິດສາດແບບເຂັ້ມ + ຕົວອັກສອນຄະນິດສາດແບບເສັ້ນຄູ່ + ຕົວອັກສອນຄະນິດສາດແບບໂມໂນສະເປດ + ຕົວອັກສອນຄະນິດສາດແບບແຊນເຊີຣີຟເຂັ້ມ + ຕົວອັກສອນຄະນິດສາດແບບແຊນເຊີຣີຟ ຕົວເລກມາເລອາລຳ ຕົວເລກມ່ອງໂກເລຍ ຕົວເລກເມໄຕມາເຢກ ຕົວເລກມຽນມາ + ມຽນມາ ກະລ່ຽງໂພຕາເວັນອອກ + ມຽນມາເປົາ ຕົວເລກຊານພະມ້າ + ມຽນມາຊັນ + ມຽນມາ ໄຕແລງ + ຕົວເລກພື້ນເມືອງ + ຕົວເລກພື້ນເມືອງ ຕົວເລກເອັນໂກ້ ຕົວເລກໂອລຈິກິ ຕົວເລກໂອດິອາ + ແບບເສັ້ນຂອບ ຕົວເລກໂຣມັນ + ໂຣມັນຕົວພິມໃຫຍ່ ຕົວເລກໂຣມັນຕົວພິມນ້ອຍ + ໂຣມັນຕົວພິມນ້ອຍ ຕົວເລກເສົາລັດທາ + ແບບແບ່ງສ່ວນ ຕົວເລກຊຸນດາ ຕົວເລກໄຕລື້ໃໝ່ ຕົວເລກທາມິລແບບດັ້ງເດີມ ຕົວເລກທາມິວ + ທາມິວທັນສະໄໝ ຕົວເລກເຕລູກູ ຕົວເລກໄທ ຕົວເລກທິເບດ + ຕົວເລກແບບດັ້ງເດີມ ຕົວເລກໃນລະບົບໄວ ປິດ ເປີດ + ແປໂດຍເຄື່ອງຈັກທີ່ບໍ່ໄດ້ລະບຸ + ຕົວເລືອກ POSIX ຍ່ອຍ + + ປິດ + ເປີດ + ເມທຣິກ ສະຫະລາດຊະອານາຈັກອັງກິດ @@ -1595,6 +1698,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d/M d MMM E d MMM + d MMMM G M/y G d/M/y E, G d/M/y @@ -1605,6 +1709,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G QQQ y + + {0} – {1} + {0} – {1} + {0}–{1} + {0} – {1} GGGGG M/y – GGGGG M/y @@ -1648,13 +1757,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM – MMM - MM-d – d + d – d MMM d-MM – d-MM E, d-MM – E, d-MM E, d-MM – E, d-MM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y GGGGG M/y – M/y GGGGG @@ -1903,6 +2016,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1933,6 +2049,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM, G y d MMMM, G y E d MMMM, G y + MMMM G y + d MMMM, G y + E, d MMMM, G y h ໂມງa h ໂມງa v d/M @@ -1940,6 +2059,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E d MMM d MMMM + E, d MMMM ອາທິດທີ່ W ຂອງເດືອນ M M/y d/M/y @@ -1948,11 +2068,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM, y QQQ y QQQQ y ອາທິດທີ່ w ຂອງປີ Y + + {1}, {0} + + + {0} – {1} + {0} – {1} M/G y – M/G y @@ -2007,6 +2135,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d/MM – E, d/MM E, d/MM – E, d/MM + + d – d MMMM + d MMMM – d MMMM + MM/y – MM/y MM/y – MM/y @@ -2214,238 +2346,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ທະອິກະ (645–650) - ຮາກູຊິ (650–671) - ຮາກູໂຮ (672–686) - ຊູໂຊ (686–701) - ທາອິໂຮ (701–704) - ເຄອຸງ (704–708) - ວະໂດ (708–715) - ເຣອິກິ (715–717) - ໂຢໂຣ (717–724) - ຈິງກິ (724–729) - ເທັມປຽວ (729–749) - ເທັມປຽວ-ຄໍາໂປ (749–749) - ເທັມປຽວ-ໂຊໂຮ (749–757) - ເທັມປຽວ-ໂຮຈິ (757–765) - ເທັມປຽວ-ຈິງໂງະ (765–767) - ຈິງໂງະ-ເຄອຸງ (767–770) - ໂຮກິ (770–780) - ເທັນ-ໂອ (781–782) - ເອັນຣຢາກຸ (782–806) - ດາອິໂດ (806–810) - ໂກນິນ (810–824) - ເທັນໂຊ (824–834) - ໂຊວະ (834–848) - ກະໂຈ (848–851) - ນິນຈູ (851–854) - ສະອິໂກະ (854–857) - ເທັນນານ (857–859) - ໂຈງານ (859–877) - ເກັນເກ (877–885) - ນິນນາ (885–889) - ກໍາປຽວ (889–898) - ໂຊຕາອິ (898–901) - ເອັນງິ (901–923) - ເອັນໂຊ (923–931) - ໂຊເຮ (931–938) - ເທັນງຽວ (938–947) - ເທັນຣຢາກູ (947–957) - ເທັນໂຕະກຸ (957–961) - ໂອວະ (961–964) - ໂກໂຮ (964–968) - ອານະ (968–970) - ເທັນໂຣະກຸ (970–973) - ເທັນ-ເອັນ (973–976) - ໂຈເງັນ (976–978) - ເທັນເງັນ (978–983) - ເອການ (983–985) - ການນະ (985–987) - ເອ-ເອັນ (987–989) - ເອໂຊ (989–990) - ໂຊຣຢະກຸ (990–995) - ໂຊໂຕະກຸ (995–999) - ໂຊໂຮ (999–1004) - ການໂກ (1004–1012) - ໂຊຫວະ (1012–1017) - ການນິງ (1017–1021) - ຈິອານ (1021–1024) - ມານຈຸ (1024–1028) - ໂຊເງັນ (1028–1037) - ໂຊເຣຢະກຸ (1037–1040) - ໂຊຄິວ (1040–1044) - ການໂຕະກຸ (1044–1046) - ເອະໂຊ (1046–1053) - ເທັນງິ (1053–1058) - ໂກເຮ (1058–1065) - ຈິເຣຢະກຸ (1065–1069) - ເອັນຄິວ (1069–1074) - ໂຊະໂຮ (1074–1077) - ໂຊະເຣຢະກຸ (1077–1081) - ເອໂຊະ (1081–1084) - ໂອໂຕະກຸ (1084–1087) - ການຈິ (1087–1094) - ກາໂຊ (1094–1096) - ເອະໂຊະ (1096–1097) - ໂຊະໂຕະກຸ (1097–1099) - ໂກະວະ (1099–1104) - ໂຊະຈິ (1104–1106) - ກາໂຊະ (1106–1108) - ເທັນນິນ (1108–1110) - ເທັນ-ອິ (1110–1113) - ເອກິວ (1113–1118) - ເຄັນ-ເອ (1118–1120) - ໂຮະອານ (1120–1124) - ເທັນຈິ (1124–1126) - ດາອິຈິ (1126–1131) - ເທັນໂຊະ (1131–1132) - ໂຊະໂຊະ (1132–1135) - ໂຮເອັນ (1135–1141) - ເອຈິ (1141–1142) - ໂກະຈິ (1142–1144) - ເທັນໂຢະ (1144–1145) - ຄິວອານ (1145–1151) - ນິນເປ (1151–1154) - ຄິວຈຸ (1154–1156) - ໂຮເຄັນ (1156–1159) - ເຮຈິ (1159–1160) - ເອເຣຢະກຸ (1160–1161) - ໂອໂຊ (1161–1163) - ໂຊະການ (1163–1165) - ເອມານ (1165–1166) - ນິນ-ອານ (1166–1169) - ກະໂອ (1169–1171) - ໂຊະອານ (1171–1175) - ອານເຄັນ (1175–1177) - ຈິໂຊະ (1177–1181) - ໂຢະວະ (1181–1182) - ຈຸເອະ (1182–1184) - ເຄັນເຣຢຸກິ (1184–1185) - ບັນຈິ (1185–1190) - ເກັນຄິວ (1190–1199) - ໂຊຈິ (1199–1201) - ເກັນນິນ (1201–1204) - ເຄັນກິວ (1204–1206) - ເກັນ-ເອະ (1206–1207) - ໂຊະເຄັນ (1207–1211) - ເກັນເຣຢະກຸ (1211–1213) - ເກັນໂປະ (1213–1219) - ໂຊະກິວ (1219–1222) - ໂຈະໂອະ (1222–1224) - ເຄັນນິນ (1224–1225) - ກາໂຮກຸ (1225–1227) - ອານເຕະ (1227–1229) - ການກິ (1229–1232) - ໂຈະເອະ (1232–1233) - ເທັມປຸກຸ (1233–1234) - ບັນເຣຢະກຸ (1234–1235) - ກາເຕະ (1235–1238) - ເຣຢະກຸນິນ (1238–1239) - ເອັນ-ໂອ (1239–1240) - ນິນຈີ (1240–1243) - ຄານເຈນ (1243–1247) - ໂຫຈີ (1247–1249) - ເຄນໂຊ (1249–1256) - ໂຄເຈນ (1256–1257) - ໂຊກາ (1257–1259) - ໂຊເກນ (1259–1260) - ບຸນ-ໂອ (1260–1261) - ໂຄໂຊ (1261–1264) - ບຸນ-ອີ (1264–1275) - ເຄນຈີ (1275–1278) - ເຄິນ (1278–1288) - ໂຊ (1288–1293) - ອິນນິນ (1293–1299) - ເຊີນ (1299–1302) - ເຄນເຈນ (1302–1303) - ຄາເຈນ (1303–1306) - ໂຕກູຈິ (1306–1308) - ອິນກິ (1308–1311) - ໂອໂຊ (1300–1312) - ໂຊວາ (1312–1317) - ບຸນໂປ (1317–1319) - ຈີໂນ (1319–1321) - ເຈນກຽວ (1321–1324) - ໂຊຊິ (1324–1326) - ຄາຣາກິ (1326–1329) - ເຈນໂຕກູ (1329–1331) - ເຈນໂກ (1331–1334) - ເກັມມຸ (1334–1336) - ເອັນເຈັນ (1336–1340) - ໂກໂກກຸ (1340–1346) - ໂຊຊິ (1346–1370) - ເຄນໂຕກຸ (1370–1372) - ບຸນຊຸ (1372–1375) - ເທັນຈຸ (1375–1379) - ຄໍຢາກຸ (1379–1381) - ໂກວາ (1381–1384) - ເຈັນຊຸ (1384–1392) - ມີໂຕກຸ (1384–1387) - ກາກິ (1387–1389) - ຄູ (1389–1390) - ມິໂຕກຸ (1390–1394) - ໂອອິ (1394–1428) - ໂຊໂຊ (1428–1429) - ອິກຽວ (1429–1441) - ກາກິຊຸ (1441–1444) - ບຸນ-ອານ (1444–1449) - ໂຫໂຕກຸ (1449–1452) - ກຽວໂຕກຸ (1452–1455) - ເກໂຊ (1455–1457) - ໂຊໂຣກຸ (1457–1460) - ຄານໂຊ (1460–1466) - ບຸນໂຊ (1466–1467) - ໂອນິນ (1467–1469) - ບຸນມິ (1469–1487) - ໂຊກຽວ (1487–1489) - ເອັນໂຕກຸ (1489–1492) - ມິໂອ (1492–1501) - ບຸນກິ (1501–1504) - ອິໂຊ (1504–1521) - ໄຕອິ (1521–1528) - ກຽວໂຣກຸ (1528–1532) - ເທັນມອນ (1532–1555) - ໂກຈິ (1555–1558) - ອິໂຣກຸ (1558–1570) - ເຈັນກິ (1570–1573) - ເທັນໂຊ (1573–1592) - ບຸນໂຣກຸ (1592–1596) - ຄິໂຊ (1596–1615) - ເກັນວາ (1615–1624) - ຄານ-ອິ (1624–1644) - ໂຊໂຊ (1644–1648) - ຄຽນ (1648–1652) - ຊຸ (1652–1655) - ເມຍຢາກຸ (1655–1658) - ແມນຈິ (1658–1661) - ການບຸນ (1661–1673) - ເອັນໂປ (1673–1681) - ເທັນວາ (1681–1684) - ໂຈກຽວ (1684–1688) - ເຈັນໂຣກຸ (1688–1704) - ໂຫອິ (1704–1711) - ຊຸຕຸກຸ (1711–1716) - ກຽວຫຸ (1716–1736) - ເຈັນບຸນ (1736–1741) - ຄານໂປ (1741–1744) - ເອັນກຽວ (1744–1748) - ຄານ-ອິນ (1748–1751) - ໂຫຢາກຸ (1751–1764) - ເມຍວາ (1764–1772) - ເອັນ-ອິ (1772–1781) - ເທັນມິ (1781–1789) - ຄານຊິ (1789–1801) - ກຽວວາ (1801–1804) - ບຸນກາ (1804–1818) - ບຸນຊິ (1818–1830) - ເທັນໂປ (1830–1844) - ກຸກາ (1844–1848) - ກາອິ (1848–1854) - ແອັນຊິ (1854–1860) - ແມັນ-ເອັນ (1860–1861) - ບຸນກຸ (1861–1864) - ເຈນຈີ (1864–1865) - ຄີໂອ (1865–1868) ມີຈີ ໄຕໂຊ ໂຊວາ @@ -3282,9 +3182,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ລິເບຼີວິວ - - ເວ​ລາ​ລະ​ດູ​ຮ້ອນ​ອັງ​ກິດ - ລອນດອນ @@ -3375,9 +3272,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ຈາຢາປູຣະ - - ເວ​ລາ​ມາດ​ຕະ​ຖານ​ໄອ​ຣິ​ຊ - ດັບບລິນ @@ -4112,13 +4006,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາກາງເວັນອະລັສກາ - - - ເວລາອໍມາຕີ - ເວລາມາດຕະຖານອໍມາຕີ - ເວລາລະດູຮ້ອນອໍມາຕີ - - ເວລາຕາມເຂດອາເມຊອນ @@ -4161,20 +4048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາກາງເວັນອາເພຍ - - - ເວລາອັດຕາອູ - ເວລາມາດຕະຖານອັດຕາອູ - ເວລາລະດູຮ້ອນອັດຕາອູ - - - - - ເວລາອັດໂຕເບ - ເວລາມາດຕະຖານອັດໂຕເບ - ເວລາລະດູຮ້ອນອັດໂຕເບ - - ເວ​ລາ​ອາ​ຣາ​ບຽນ @@ -4276,6 +4149,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາຕາມເຂດລະດູຮ້ອນຕາມເຂດບຣາຊີເລຍ + + + ເວລາອັງກິດ + ເວ​ລາ​ລະ​ດູ​ຮ້ອນ​ອັງ​ກິດ + + ​ເວ​ລາບຣູ​ໄນດາ​ຣຸສ​ຊາ​ລາມ @@ -4454,6 +4333,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວ​ລາກຣີນ​ວິ​ຊ + + + ເວລາກຣີນແລນ + ເວລາມາດຕະຖານກຣີນແລນ + ເວລາລະດູຮ້ອນກຣີນແລນ + + ເວລາຕາເວັນອອກຂອງກຣີນແລນ @@ -4468,11 +4354,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາຕອນທ່ຽງກຣີນແລນຕາເວັນຕົກ - - - ເວລາກວມ - - ເວ​ລາ​ກູ​ລ​໌ຟ @@ -4485,7 +4366,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ເວລາມາດຕະຖານຮາວາຍ-ເອລູທຽນ + ເວລາຮາວາຍ @@ -4546,6 +4427,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວ​ລາ​ຕອນ​ທ່ຽງ​ອີ​ຣາ​ນ + + + ເວ​ລາ​​ໄອ​ຣິ​ຊ + ເວ​ລາ​ມາດ​ຕະ​ຖານ​ໄອ​ຣິ​ຊ + + ເວ​ລ​າອີ​ຄຸດ​ສ​ຄ໌ @@ -4567,6 +4454,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວ​ລາ​ຕອນ​ທ່ຽງ​ຍີ່​ປຸ່ນ + + + ເວລາຄຳຊາດຄາ + ເວລາມາດຕະຖານຄຳຊາດຄາ + ເວລາລະດູຮ້ອນຄຳຊາດຄາ + + ເວລາຄາຊັກສຖານ @@ -4606,11 +4500,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາເຄຍກິສຖານ - - - ເວລາລັງກາ - - ເວ​ລາ​ໝູ່​ເກາະ​ລາຍ @@ -4623,13 +4512,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ​ເວ​ລ​ສາ​ຕອນ​​ທ່ຽງ​ລອດ​ເຮົາ​ - - - ເວລາມາເກົາ - ເວລາມາດຕະຖານມາເກົາ - ເວລາລະດູຮ້ອນມາເກົາ - - ເວລາເມັກກາເດນ @@ -4745,11 +4627,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາລະດູຮ້ອນເຟນັນໂດເດໂນຮອນຮາ - - - ເວລາຫມູ່ເກາະມາເຣຍນາເຫນືອ - - ເວ​ລາ​ໂນ​ໂບ​ຊິ​ບິ​ສ​ຄ໌ @@ -4829,13 +4706,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາປຽງຢາງ - - - ເວລາຄີວລໍດາ - ເວລາມາດຕະຖານຄີວລໍດາ - ເວລາລະດູຮ້ອນຄີວລໍດາ - - ເວ​ລາ​ເຣ​ອູ​ນິ​ຢົງ @@ -4853,11 +4723,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວ​ລາ​ລະ​ດູ​ຮ້ອນຊາ​ຮາ​ລິນ + + + ເວ​ລາ​ຊາມາຣາ + ເວ​ລາ​ມາດ​ຕະ​ຖານຊາມາຣາ + ເວລາລະດູຮ້ອນຊາມາຣາ + + - ເວລາຊາມົວ ເວລາມາດຕະຖານຊາມົວ - ເວລາລະດູຮ້ອນຊາມົວ @@ -4924,6 +4799,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວລາຊຸກ + + + ເວລາຕຸຣກີ + ເວລາມາດຕະຖານຕຸຣກີ + ເວລາລະດູຮ້ອນຕຸຣກີ + + ເວລາຕວກເມນິສຖານ @@ -4943,6 +4825,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ເວ​ລາ​ລະ​ດູ​ຮ້ອນ​ອູ​ຣູ​ກວຍ + + + ເວລາອູຣູມຊີ + + ເວລາອຸສເບກິດສະຖານ @@ -5098,10 +4985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ¤ #,##0.00;¤-#,##0.00 - #,##0.00 - ¤ #,##0.00;¤-#,##0.00 #,##0.00 @@ -5141,11 +5024,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤#,##0.00;¤-#,##0.00 ¤ #,##0.00;¤-#,##0.00 - #,##0.00 - - - ¤ #,##0.00;¤-#,##0.00 - #,##0.00 @@ -6002,7 +5880,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ຄາຣິບຽນ ກິວເດີ - ຄາຣິບຽນ ກິວເດີ ສິດທິຖອນເງິນພິເສດ @@ -6079,7 +5956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ຊິມບັບວຽນ ໂກລ - ຊິມບັບວຽນ ໂກລ ດອນລາ ຊິມບັບເວ (2009) @@ -6391,7 +6267,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ກິໂລຈູນ - ຈູນ {0} ຈູນ @@ -6520,8 +6395,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ຄວາມ​ແຈ້ງດວງ​ຕາ​ເວັນ - ໂຕນ - {0} ໂຕນ + ເມທຣິກໂຕນ + {0} ເມທຣິກໂຕນ {0} ກິໂລກຣາມ @@ -7274,9 +7149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‰ - - Glc - {0} ລ / 100 ກມ @@ -7299,9 +7171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ຄລ - - ຈູນ - {0}kWh/100km diff --git a/make/data/cldr/common/main/lt.xml b/make/data/cldr/common/main/lt.xml index 5ca013e3d420..8b8ab857a83b 100644 --- a/make/data/cldr/common/main/lt.xml +++ b/make/data/cldr/common/main/lt.xml @@ -240,6 +240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pietų Haidos hebrajų hindi + hindi anglų Fidžio hindi hiligainonų hititų @@ -1201,18 +1202,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ rikiavimas Normalizuotas rikiavimas Skaitinis rikiavimas + Scenarijaus / bloko pertvarkymas Rikiavimo intensyvumas valiuta + keisti paskirties vietą + žodyno skilimo išimtys Jaustukų pateiktis + Pirma savaitės diena + sumaišytas valandų ciklas (12 ir 24) + įvesties metodas + klaviatūra + labiausiai ignoruojami teksto laužymo stilius Eilučių laužymas + Transformacijos taisyklės matų sistema + Matavimo vienetas skaičiai + papildomų duomenų regionas + transformacijos šaltinis + regiono padalinys tarpas po trumpinio + transformuoti + mašininio vertimo Laiko juosta Lokalės variantas Naudoti privačiai + Privataus naudojimo transformacija budistų kalendorius @@ -1232,15 +1249,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hebrajų kalendorius hebrajų nacionalinis indų kalendorius + indų (nacionalinis) musulmonų kalendorius Islamo musulmonų kalendorius (lentelinis, pilietinė era) musulmonų (lentelinis, pilietinė era) Islamo kalendorius (Saudo Arabija) + musulmonų (Saudo Arabijos) Islamo kalendorius (lentelinis, astronominė era) + musulmonų (lentelinis, astronominė era) musulmonų kalendorius (Umm al-Qura) musulmonų (Umm al-Qura) ISO 8601 kalendorius + Grigaliaus japonų kalendorius japonų persų kalendorius @@ -1256,42 +1277,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rikiuoti diakritinius ženklus įprastai Rikiuoti diakritinius ženklus atvirkščiai Rikiuoti suteikiant pirmumą mažosioms raidėms + Mažosios raidės Rikiuoti įprasta didžiųjų ir mažųjų raidžių tvarka + Mažosios raidės Rikiuoti suteikiant pirmumą didžiosioms raidėms + Didžiosios raidės Rikiuoti neskiriant didžiųjų ir mažųjų raidžių Rikiuoti skiriant didžiąsias ir mažąsias raides ankstesnė rūšiavimo tvarka, skirta suderinamumui + suderinamumas žodyno rūšiavimo tvarka + žodynas numatytasis unikodo rikiavimas numatytasis unikodo + jausmaženklis rūšiavimo tvarka daugiakalbės Europos dokumentų + europietiškos taisyklės telefonų knygos rūšiavimo tvarka + telefono knyga Fonetinė rikiavimo tvarka + fonetinis supaprastinta kiniškų hieroglifų rūšiavimo tvarka + pinjinas bendroji paieška paieška ieškoti pagal hangul pirmines priebalses + korėjiečių pradinis priebalsis standartinis rikiavimas standartinis Įprasta kiniško požymio rūšiavimo tvarka + rikiavimas pagal brūkšnius įprasta rūšiavimo tvarka + tradicinis Šaknies ženklų ir brūkšnių rūšiavimo tvarka + raktai ir brūkšniai Zhuyin rikiavimo tvarka + džujinas Rikiuoti nenormalizuojant Rikiuoti normalizuojant unikodą Rikiuoti skaitmenis atskirai Rikiuoti skaitmenis pagal skaičius + Valiuta + Skaitmenys + Skyryba + Tarpai + Simboliai Rikiuoti viską + Viskas Rikiuoti tik pagal pamatines raides + Tik pagrindinės raidės Rikiuoti pagal didžiąsias ir mažąsias raides / plotį / diakritinius / kanos ženklus + Bazė, akcentai, atvejis, variantai, Kana Rikiuoti diakritinius ženklus + Bazė, akcentai Rikiuoti pagal diakritinius ženklus / didžiąsias ir mažąsias raides / plotį + Bazė, akcentai, atvejis, variantai viso pločio vidutinio pločio Skaitinis numatytasis jausmaženklis tekstas + 12 valandų sistema + 12 + 24 valandų sistema + 24 12 valandų sistema (0–11) 12 (0–11) 12 valandų sistema (1–12) @@ -1300,6 +1350,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 valandų sistema (1–24) 24 (1–24) + SHIFT tarpai, skyryba, visi simboliai + SHIFT tarpai, skyryba + SHIFT tarpai, skyryba + SHIFT tarpai, skyryba, ne valiutos simboliai laisvas teksto laužymo stilius laisvas įprastas teksto laužymo stilius @@ -1320,8 +1374,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ JAV arabų-indų skaitmenys išplėstiniai arabų-indų skaitmenys + išplėstiniai arabų-indų armėnų skaitmenys armėnų skaitmenys mažosiomis raidėmis + armėnų mažosiomis raidėmis bali skaitmenys bengalų skaitmenys Brahmi skaitmenys @@ -1330,43 +1386,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ devanagari skaitmenys Etiopijos skaitmenys Finansiniai skaičiai + finansiniai viso pločio skaitmenys + viso pločio gruzinų skaitmenys graikų skaitmenys graikų skaitmenys mažosiomis raidėmis + graikų mažosiomis raidėmis gudžaratų skaitmenys gurmuki skaitmenys + Han simbolių mėnesio dienų numeracija tradiciniuose kalendoriuose kinų dešimtainiai skaitmenys + Pozicinė dešimtainė sistema, naudojanti kinų skaičių ideografus kaip skaitmenis supaprastintos kinų k. skaitmenys supaprastintos kinų k. finans. skaitmenys + supaprastintos kinų k. finansiniai tradicinės kinų k. skaitmenys tradicinės kinų k. finans. skaitmenys + tradicinės kinų k. finansiniai hebrajų skaitmenys javiečių skaitmenys japonų skaitmenys japonų finans. skaitmenys + japonų finansiniai + japonų pirmųjų eros metų numeracija Kayah Li skaitmenys khmerų skaitmenys kanadų skaitmenys Tai Tham Hora skaitmenys Tai Tham Tham skaitmenys + Tai Tham Tham (bažnytinis) laosiečių skaitmenys lotyniški skaitmenys Lepcha skaitmenys Limbu skaitmenys + matematiniai pajuodinti + matematiniai su dvigubu brūkšniu + matematiniai vienodo pločio + matematiniai pajuodinti be užraitų + matematiniai be užraitų malajalių skaitmenys mongolų skaitmenys Meetei Mayek skaitmenys mianmariečių skaitmenys + mianmariečių rytų Pwo Karen + mianmariečių Pao Myanmar Shan skaitmenys + mianmariečių Shan + mianmariečių Tai Laing Vietiniai skaitmenys + vietiniai skaitmenys N’Ko skaitmenys Ol Chiki skaitmenys orijų skaitmenys Osmanų skaitmenys + už kontūro romėniški skaitmenys + romėniški didžiosiomis raidėmis romėniški skaitmenys mažosiomis raidėmis + romėniški mažosiomis raidėmis Sauraštrų skaitmenys + segmentuoti Šaradų skaitmenys Sora Sompeng skaitmenys Sudaniečių skaitmenys @@ -1374,14 +1454,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Naujieji Tai Lue skaitmenys tradicinės tamilų skaitmenys tamilų skaitmenys + šiuolaikinės tamilų telugų skaitmenys tajų skaitmenys tibetiečių skaitmenys Tradiciniai skaičiai + tradiciniai skaitmenys vai skaitmenys išjungta įjungta + nenurodytas mašininis vertimas + POSIX variantas + + išjungta + įjungta + metrinė JK @@ -1399,9 +1487,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ [AĄ B C Č D EĘĖ F G H IĮY J K L M N O P R S Š T UŲŪ V Z Ž] [  , % ‰ + − 0 1 2 3 4 5 6 7 8 9] [\- ‐‑ – — , ; \: ! ? . … “„ ( ) \[ \] \{ \}] - - [\: ∶] - [\--﹣ ‑ ‒ −⁻₋ ➖] [,,﹐︐ ، ٫ 、﹑、︑] @@ -2011,7 +2096,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ HH:mm:ss; v hh:mm a; v HH:mm; v - HH v + HH; v MM MM-d MM-dd @@ -2036,6 +2121,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Y w 'sav'. Y w 'sav'. + + {1}, {0} + {0} {1} + {1}, {0} + hh–hh B @@ -2051,10 +2141,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL–LLLL - - MMMM d–d - MMMM d – MMMM d - MMMM d, E – MMMM d, E MMMM d, E – MMMM d, E @@ -2079,189 +2165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hakuči (650–671) - Hakuho (672–686) - Šučo (686–701) - Taiho (701–704) - Vado (708–715) - Joro (717–724) - Tempio (729–749) - Tempio-kampo (749–749) - Tempio-šoho (749–757) - Tempio-hodzi (757–765) - Tempo-dzingo (765–767) - Dzingo-keiun (767–770) - Hoki (770–780) - Ten-o (781–782) - Enrjaku (782–806) - Daido (806–810) - Konin (810–824) - Tenčo (824–834) - Šova (834–848) - Kajo (848–851) - Saiko (854–857) - Tenan (857–859) - Jogan (859–877) - Genkei (877–885) - Ninja (885–889) - Kampjo (889–898) - Šotai (898–901) - Enčo (923–931) - Šohei (931–938) - Tengjo (938–947) - Tenriaku (947–957) - Ova (961–964) - Koho (964–968) - Ana (968–970) - Ten-en (973–976) - Jogen (976–978) - Kana (985–987) - Ei-en (987–989) - Šorjaku (990–995) - Čotoku (995–999) - Čoho (999–1004) - Kanko (1004–1012) - Čova (1012–1017) - Kanin (1017–1021) - Džian (1021–1024) - Mandžiu (1024–1028) - Čogen (1028–1037) - Čorjaku (1037–1040) - Čokju (1040–1044) - Eišo (1046–1053) - Kohei (1058–1065) - Džirjaku (1065–1069) - Enkju (1069–1074) - Šoho (1074–1077) - Šorjaku (1077–1081) - Eiho (1081–084) - Otoku (1084–1087) - Kandži (1087–1094) - Kaho (1094–1096) - Eičo (1096–1097) - Šotoku (1097–1099) - Kova (1099–1104) - Čodži (1104–1106) - Kašo (1106–1108) - Tenin (1108–1110) - Eikju (1113–1118) - Gen-ei (1118–1120) - Hoan (1120–1124) - Tendži (1124–1126) - Daidži (1126–1131) - Tenšo (1131–1132) - Čošo (1132–1135) - Hoen (1135–1141) - Eidži (1141–1142) - Kodži (1142–1144) - Tenjo (1144–1145) - Kjuan (1145–1151) - Kjuju (1154–1156) - Hogen (1156–1159) - Heidži (1159–1160) - Eirjaku (1160–1161) - Oho (1161–1163) - Čokan (1163–1165) - Nin-an (1166–1169) - Kao (1169–1171) - Šoan (1171–1175) - Džišo (1177–1181) - Jova (1181–1182) - Džuei (1182–1184) - Genrjuku (1184–1185) - Bundži (1185–1190) - Kenkju (1190–1199) - Šodži (1199–1201) - Kenin (1201–1204) - Genkju (1204–1206) - Ken-ei (1206–1207) - Šogen (1207–1211) - Kenrjaku (1211–1213) - Kenpo (1213–1219) - Šokju (1219–1222) - Džu (1222–1224) - Genin (1224–1225) - Džoei (1232–1233) - Tempuku (1233–1234) - Bunrjaku (1234–1235) - Rjakunin (1238–1239) - En-o (1239–1240) - Nindži (1240–1243) - Hodži (1247–1249) - Kenčo (1249–1256) - Kogen (1256–1257) - Šoka (1257–1259) - Šogen (1259–1260) - Bun-o (1260–1261) - Kočo (1261–1264) - Bun-ei (1264–1275) - Kendži (1275–1278) - Koan (1278–1288) - Šu (1288–1293) - Šoan (1299–1302) - Tokudži (1306–1308) - Enkei (1308–1311) - Očo (1311–1312) - Šova (1312–1317) - Bunpo (1317–1319) - Dženo (1319–1321) - Dženkjo (1321–1324) - Šoču (1324–1326) - Kareki (1326–1329) - Genko (1331–1334) - Kemu (1334–1336) - Kokoku (1340–1346) - Šohei (1346–1370) - Bunču (1372–1375) - Tendžu (1375–1379) - Korjaku (1379–1381) - Kova (1381–1384) - Genču (1384–1392) - Ku (1389–1390) - Oei (1394–1428) - Šočo (1428–1429) - Eikjo (1429–1441) - Bun-an (1444–1449) - Hotoku (1449–1452) - Kjotoku (1452–1455) - Košo (1455–1457) - Čoroku (1457–1460) - Kanšo (1460–1466) - Bunšo (1466–1467) - Onin (1467–1469) - Čokjo (1487–1489) - Meio (1492–1501) - Eišo (1504–1521) - Kjoroku (1528–1532) - Tenmon (1532–1555) - Kodži (1555–1558) - Tenšo (1573–1592) - Keičo (1596–1615) - Genva (1615–1624) - Kan-ei (1624–1644) - Šoho (1644–1648) - Šu (1652–1655) - Meirjaku (1655–1658) - Mandži (1658–1661) - Enpo (1673–1681) - Tenva (1681–1684) - Džokjo (1684–1688) - Hoei (1704–1711) - Šotoku (1711–1716) - Kjoho (1716–1736) - Kanpo (1741–1744) - Enkjo (1744–1748) - Kan-en (1748–1751) - Horjaku (1751–1764) - Meiva (1764–1772) - An-ei (1772–1781) - Kjova (1801–1804) - Tenpo (1830–1844) - Koka (1844–1848) - Man-en (1860–1861) - Bunkju (1861–1864) - Gendži (1864–1865) - Keiko (1865–1868) Meidži Taišo Šova @@ -3273,9 +3176,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevilis - - Britanijos vasaros laikas - Londonas @@ -3363,9 +3263,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Džajapura - - Airijos vasaros laikas - Dublinas @@ -4000,9 +3897,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ako laikas - Ako standartinis laikas - Ako vasaros laikas + Akrės laikas + Akrės žiemos laikas + Akrės vasaros laikas @@ -4037,13 +3934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Aliaskos vasaros laikas - - - Almatos laikas - Almatos žiemos laikas - Almatos vasaros laikas - - Amazonės laikas @@ -4093,20 +3983,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apijos vasaros laikas - - - Aktau laikas - Aktau žiemos laikas - Aktau vasaros laikas - - - - - Aktobės laikas - Aktobės žiemos laikas - Aktobės vasaros laikas - - Arabijos laikas @@ -4208,6 +4084,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brazilijos vasaros laikas + + + Britų laikas + Britanijos vasaros laikas + + Brunėjaus Darusalamo laikas @@ -4386,6 +4268,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Grinvičo laikas + + + Grenlandijos laikas + Grenlandijos žiemos laikas + Grenlandijos vasaros laikas + + Grenlandijos rytų laikas @@ -4400,11 +4289,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Grenlandijos vakarų vasaros laikas - - - Guamo laikas - - Persijos įlankos laikas @@ -4417,7 +4301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havajų–Aleutų žiemos laikas + Havajų ir Aleutų žiemos laikas @@ -4478,6 +4362,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Irano vasaros laikas + + + Airijos laikas + Airijos vasaros laikas + + Irkutsko laikas @@ -4545,11 +4435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgistano laikas - - - Lankos laikas - - Laino Salų laikas @@ -4562,13 +4447,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lordo Hau vasaros laikas - - - Makau laikas - Makau žiemos laikas - Makau vasaros laikas - - Magadano laikas @@ -4684,11 +4562,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronjos vasaros laikas - - - Šiaurės Marianos Salų laikas - - Novosibirsko laikas @@ -4768,13 +4641,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pchenjano laikas - - - Kyzylordos laikas - Kyzylordos žiemos laikas - Kyzylordos vasaros laikas - - Reunjono laikas @@ -4801,9 +4667,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa laikas Samoa žiemos laikas - Samoa vasaros laikas @@ -4896,6 +4760,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugvajaus vasaros laikas + + + Urumčio laikas + + Uzbekistano laikas @@ -5029,28 +4898,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 tūkst'.' + 0 tūkst'.' + 0 tūkst'.' 0 tūkst'.' 00 tūkst'.' + 00 tūkst'.' + 00 tūkst'.' 00 tūkst'.' 000 tūkst'.' + 000 tūkst'.' + 000 tūkst'.' 000 tūkst'.' 0 mln'.' + 0 mln'.' + 0 mln'.' 0 mln'.' 00 mln'.' + 00 mln'.' + 00 mln'.' 00 mln'.' 000 mln'.' + 000 mln'.' + 000 mln'.' 000 mln'.' 0 mlrd'.' + 0 mlrd'.' + 0 mlrd'.' 0 mlrd'.' 00 mlrd'.' + 00 mlrd'.' + 00 mlrd'.' 00 mlrd'.' 000 mlrd'.' + 000 mlrd'.' + 000 mlrd'.' 000 mlrd'.' 0 trln'.' + 0 trln'.' + 0 trln'.' 0 trln'.' 00 trln'.' + 00 trln'.' + 00 trln'.' 00 trln'.' 000 trln'.' + 000 trln'.' + 000 trln'.' 000 trln'.' @@ -5068,9 +4961,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5585,13 +5475,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kinijos Užsienio juanio Kinijos Užsienio juanių - - Kinijos "People" banko doleris - Kinijos "People" banko doleris - Kinijos "People" banko doleriai - Kinijos "People" banko dolerio - Kinijos "People" banko dolerių - Kinijos ženminbi juanis Kinijos ženminbi juanis @@ -7222,10 +7105,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabvės auksas - Zimbabvės auksas - Zimbabvės auksas - Zimbabvės auksas - Zimbabvės auksas Zimbabvės doleris (2009) @@ -7907,13 +7786,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} elementų {0} elementų - - dalelė - {0} dalelė - {0} dalelės - {0} dalelės - {0} dalelių - feminine milijoninės dalys @@ -8028,7 +7900,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} molių - gliukozė gliukozės kiekis – {0} gliukozės kiekis – {0} gliukozės kiekis – {0} @@ -11113,10 +10984,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ šviesos greitis - {0} šm - {0} šm - {0} šm - {0} šm feminine @@ -11150,7 +11017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine naktis {0} naktis - {0} naktis + {0} naktį {0} nakčiai {0} nakties {0} naktimi @@ -11429,9 +11296,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ V - - kal. - cal {0} cal @@ -11792,11 +11656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} imp. kv. - cal - {0} cal - {0} cal - {0} cal - {0} cal + cal-IT šm @@ -11861,7 +11721,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ft² - dalelė {0} dal. {0} dal. {0} dal. @@ -11870,9 +11729,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ % - - gliukozė - {0} mi/gal {0} mi/gal @@ -11901,6 +11757,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} s {0} s + + cal + km/h {0} km/h @@ -11930,27 +11789,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl oz {0} fl oz - - cal - {0} cal - {0} cal - {0} cal - {0} cal - - - šm - {0} šm - {0} šm - {0} šm - {0} šm - - - dalis/mlrd. - {0} dal./mlrd. - {0} dal./mlrd. - {0} dal./mlrd. - {0} dal./mlrd. - hh:mm diff --git a/make/data/cldr/common/main/ltg.xml b/make/data/cldr/common/main/ltg.xml deleted file mode 100644 index 88c59f0d80ee..000000000000 --- a/make/data/cldr/common/main/ltg.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - angļu - latgalīšu - latvīšu - - - Latveja - - - Volūda: {0} - Raksteiba: {0} - Regions: {0} - - - - [aā b cč d eē f gģ h iī j kķ lļ m nņ oō p r sš t uū v y zž] - [q ŗ w x] - [\- ‑ , % ‰ + − 0 1 2 3 4 5 6 7 8 9] - [\- ‐‑ – — , ; \: ! ? . … '‘’‚ "“”„ ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - janvars - februars - marts - apreļs - majs - juņs - juļs - augusts - septembris - oktobris - novembris - decembris - - - - - janvars - februars - marts - apreļs - majs - juņs - juļs - augusts - septembris - oktobris - novembris - decembris - - - - - - - svātdīne - pyrmūdīne - ūtardīne - trešdīne - catūrtdīne - pīktdīne - sastdīne - - - - - - - 1. catūrksnis - 2. catūrksnis - 3. catūrksnis - 4. catūrksnis - - - - - 1. - 2. - 3. - 4. - - - - - - - prīškpušdīnē - piecpušdīnē - - - - - - pyrma myusu erys - pyrma myusu erys - myusu erā - myusu erā - - - p.m.e. - m.e. - - - - - h:mm a - h:mm:ss a - h:mm:ss a v - d.MM.y. - y. 'g'. d. MMM - - - - - - Laika jūsla: {0} - {0}: vosorys laiks - {0}: standarta laiks - - - Griničys laiks - - - - - - - , -   - - - - eiro - eiro - - - Latvejis lats - Latvejis lati - - - Latvejis rublis - - - - diff --git a/make/data/cldr/common/main/ltg_LV.xml b/make/data/cldr/common/main/ltg_LV.xml deleted file mode 100644 index 6fff09cb2d1c..000000000000 --- a/make/data/cldr/common/main/ltg_LV.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/lv.xml b/make/data/cldr/common/main/lv.xml index 5d62294255ff..92d115eb0a8b 100644 --- a/make/data/cldr/common/main/lv.xml +++ b/make/data/cldr/common/main/lv.xml @@ -413,6 +413,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pāli pidžinvaloda poļu + pjemontiešu ponapiešu malisetu-pasamakvodi prūšu @@ -1021,18 +1022,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kārtošanas secība normalizēta kārtošana kārtošana skaitliskā secībā + rakstību/bloku pārkārtošana kārtošanas pakāpe valūta + Pārveidošanas mērķis + Izņēmumi vārdnīcas segmentēšanai Emocijzīmes attēlojums + Pirmā nedēļas diena + Jaukti Stundu formāts (12 vai 24) + Ievades metode + Tastatūra + Visvairāk ignorētās rakstzīmes Rindiņas pārtraukuma stils Rindiņu pārtraukumi vārdos + Pārveidošanas noteikumi mērvienību sistēma + Mērvienība Cipari + Reģions papildu datiem + Transformācijas avots + Reģiona apakšiedalījums Teikuma beigas pēc abr. + Transformācija + Mašīntulkots laika josla lokalizācijas variants personīgai lietošanai + Personīgai lietošanai paredzēta transformācija budistu kalendārs @@ -1052,13 +1069,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ebreju kalendārs ebreju Indijas nacionālais kalendārs + Indijas nacionālais Hidžrī kalendārs Hidžrī Hidžrī kalendārs (pilsoņu) Hidžrī (pilsoņu) + Hidžrī kalendārs (Saūda Arābijas mēness novērojums) + Hidžrī (tabulārais, astronomiskās ēras) Hidžrī kalendārs (Umm al-kura) Hidžrī (Umm al-kura) - ISO 8601 kalendārs + Gregora kalendārs (nedēļu numerācija pēc ISO 8601) + Gregora japāņu kalendārs japāņu persiešu kalendārs @@ -1074,41 +1095,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kārtot diakritiskās zīmes parastā secībā Kārtot diakritiskās zīmes apgrieztā secībā Kārtot pēc pirmā mazā burta + mazie burti Kārtot burtu reģistra parastā secībā + mazie burti Kārtot pēc pirmā lielā burta + lielie burti Kārtot reģistrnejutīgas rakstzīmes Kārtot reģistrjutīgās rakstzīmes saderīgā kārtošanas secība + saderība Vārdnīcas kārtošanas secība + vārdnīca noklusējuma unikoda kārtošanas secība noklusējuma unikods + emocijzīme Eiropas rakstību kārtošanas secīa + Eiropas noteikumi tālruņu grāmatas kārtošanas secība + telefongrāmata Fonētiskā kārtošanas secība + fonētisks piņjiņa kārtošanas secība + piņjiņs vispārīga meklēšana meklēšana Meklēt pēc Hangul sākuma līdzskaņa + korejiešu sākuma līdzskanis standarta kārtošanas secība standarta Stroke kārtošanas secība + vilcienu skaits tradicionālā kārtošanas secība + tradicionālā secība Radikālā kārtošanas secība pēc vilkumu skaita + radikāļu un vilcienu skaita secība + Džujins Kārtot bez normalizēšanas Kārtot unikodu normalizējot Kārtot ciparus atsevišķi Kārtot ciparus skaitliskā secībā + valūta + cipari + interpunkcija + tukšzīme + simbols Kārtot visus + visi Kārtot tikai pamata burtus + tikai pamatburti Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma/Kana rakstzīmes + pamatburti, diakritiskās zīmes, lielie/mazie burti, varianti, Kana Kārtot diakritiskās zīmes + pamatburti, diakritiskās zīmes Kārtot diakritiskās zīmes/reģistrjutīgās rakstzīmes/rakstzīmes pēc platuma + pamatburti, diakritiskās zīmes, lielie/mazie burti, varianti Pilna platuma Pusplatuma Ciparu Noklusējuma Emocijzīmes Teksts + 12 stundu sistēma + 12 + 24 stundu sistēma + 24 12 stundu sistēma (0–11) 12 (0–11) 12 stundu sistēma (1–12) @@ -1117,6 +1167,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 stundu sistēma (1–24) 24 (1–24) + ignorēt atstarpes, pieturzīmes un visus simbolus + ignorēt atstarpes un pieturzīmes + ignorēt atstarpes un pieturzīmes + ignorēt atstarpes, pieturzīmes un simbolus, kas nav valūtas simboli Brīvais rindiņas pārtraukuma stils Brīvais Parastais rindiņas pārtraukuma stils @@ -1137,51 +1191,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ASV Arābu-indiešu cipari Izvērstie arābu-indiešu cipari + Izvērstie arābu-indiešu Armēņu cipari Mazie armēņu cipari + Mazie armēņu Bengāļu cipari Čakmas cipari Devanāgarī cipari Etiopiešu cipari Finanšu cipari + finanšu Pilna platuma cipari + pilna platuma Gruzīnu cipari Grieķu cipari Mazie grieķu cipari + mazie grieķu Gudžaratu cipari Gurmuki cipari + Mēneša dienu numerācija ar haņu rakstzīmēm tradicionālajos kalendāros Ķīniešu decimāldaļskaitļi + pozicionālā decimālsistēma ar ķīniešu ciparu rakstzīmēm Vienkāršotie ķīniešu cipari Vienkāršotie ķīniešu cipari finanšu dokumentiem + Vienkāršotās ķīniešu finanšu ciparzīmes Tradicionālie ķīniešu cipari Tradicionālie ķīniešu cipari finanšu dokumentiem + Tradicionālās ķīniešu finanšu ciparzīmes Ivrita cipari Javas cipari Japāņu cipari Japāņu cipari finanšu dokumentiem + Japāņu finanšu ciparzīmes + Japāņu pirmā gada numerācija Khmeru cipari Kannadu cipari + Tai Tham Tham (reliģiskais lietojums) Laosiešu cipari Arābu cipari + Matemātiskais treknraksts + Matemātiskais dubultsvītrojums + Matemātiskais vienplatuma raksts + Matemātiskais bezserifa treknraksts + Matemātiskais bezserifa raksts Malajalu cipari Mongoļu cipari Mītei majek cipari Birmiešu cipari + Mjanmas austrumu pvo karenu + Mjanmas pao + Mjanmas šaņu + Mjanmas tai laingu Vietējie cipari + Vietējie cipari Olčiki cipari Oriju cipari + Kontūrveida Romiešu cipari + Romiešu lielie cipari Mazie romiešu cipari + Romiešu mazie cipari + Segmentēti Tamilu tradicionālie cipari Tamilu cipari + Mūsdienu tamilu Telugu cipari Tajiešu cipari Tibetiešu cipari Tradicionālā ciparu sistēma + Tradicionālie cipari VAI cipari Izsl. Iesl. + Nenorādīta mašīntulkošana + POSIX variants + + Izsl. + Iesl. + metriskā angļu @@ -1225,6 +1313,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1254,6 +1349,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1342,7 +1444,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, y. 'g'. d. MMM G h:mm a h:mm:ss a - HH v dd.MM. E, dd.MM. d. MMM @@ -1679,6 +1780,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1708,10 +1812,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, h:mm:ss a E, HH:mm:ss G y. 'g'. - GGGGG dd-MM-y + d.M.y. G G y. 'g'. MMM G y. 'g'. d. MMM - E, G y. 'g'. d. MMM + E, y. 'g'. d. MMM, G + y. 'gada' MMMM, G + y. 'gada' d. MMMM, G + E, y. 'gada' d. MMMM, G h:mm a h:mm:ss a h:mm:ss a v @@ -1733,13 +1840,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y. 'g'. MMM y. 'g'. d. MMM E, y. 'g'. d. MMM - y. 'g'. MMMM + y. 'gada'. MMMM + y. 'gada' d. MMMM + E, y. 'gada' d. MMMM y. 'g'. QQQ y. 'g'. QQQQ Y. 'g'. w. 'nedēļa' Y. 'g'. w. 'nedēļa' Y. 'g'. w. 'nedēļa' + + {1}, {0} + {1}, {0} + d.–d. @@ -1811,6 +1924,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMM – E, d. MMM E, d. MMM – E, d. MMM + + d. MMMM – d. MMMM + y.–y. @@ -2917,9 +3033,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevila - - Lielbritānijas vasaras laiks - Londona @@ -3004,9 +3117,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Džajapura - - Īrijas ziemas laiks - Dublina @@ -3603,6 +3713,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Johannesburga + + + Akres laiks + Akres ziemas laiks + Akres vasaras laiks + + Afganistānas laiks @@ -3785,6 +3902,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brazīlijas vasaras laiks + + + Lielbritānijas laiks + Lielbritānijas vasaras laiks + + Brunejas Darusalamas laiks @@ -3973,6 +4096,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Griničas laiks + + + Grenlandes laiks + Grenlandes ziemas laiks + Grenlandes vasaras laiks + + Austrumgrenlandes laiks @@ -3999,7 +4129,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havaju–Aleutu ziemas laiks + Havaju laiks @@ -4060,6 +4190,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Irānas vasaras laiks + + + Īrijas laiks + Īrijas ziemas laiks + + Irkutskas laiks @@ -4083,9 +4219,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovskas-Kamčatskas laiks - Petropavlovskas-Kamčatskas ziemas laiks - Petropavlovskas-Kamčatskas vasaras laiks + Kamčatkas laiks + Kamčatkas ziemas laiks + Kamčatkas vasaras laiks @@ -4359,9 +4495,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa laiks Samoa ziemas laiks - Samoa vasaras laiks @@ -4454,6 +4588,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugvajas vasaras laiks + + + Urumči laiks + + Uzbekistānas laiks @@ -4573,28 +4712,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + 0 tūkst'.' 0 tūkst'.' 0 tūkst'.' + 00 tūkst'.' 00 tūkst'.' 00 tūkst'.' + 000 tūkst'.' 000 tūkst'.' 000 tūkst'.' + 0 milj'.' 0 milj'.' 0 milj'.' + 00 milj'.' 00 milj'.' 00 milj'.' + 000 milj'.' 000 milj'.' 000 milj'.' + 0 mljrd'.' 0 mljrd'.' 0 mljrd'.' + 00 mljrd'.' 00 mljrd'.' 00 mljrd'.' + 000 mljrd'.' 000 mljrd'.' 000 mljrd'.' + 0 trilj'.' 0 trilj'.' 0 trilj'.' + 00 trilj'.' 00 trilj'.' 00 trilj'.' + 000 trilj'.' 000 trilj'.' 000 trilj'.' @@ -4606,9 +4757,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5692,9 +5840,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Karību guldenis - Karību guldenis - Karību guldenis - Karību guldenis Speciālās aizņēmuma tiesības @@ -5773,9 +5918,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabves zelts - Zimbabves zelts - Zimbabves zelts - Zimbabves zelts Zimbabves dolārs (2009) @@ -7868,12 +8010,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} dzīvsudraba stabiņa milimetru {0} dzīvsudraba stabiņa milimetros - - pēc dzīvsudraba staba - {0} pēc dzīvsudraba staba - {0} pēc dzīvsudraba staba - {0} pēc dzīvsudraba staba - mārciņas uz kvadrātcollu {0} mārciņu uz kvadrātcollu @@ -9273,17 +9409,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dunams - daļa {0} daļu {0} daļa {0} daļa - - Glc - {0} Glc - {0} Glc - {0} Glc - {0} cet. {0} c. @@ -9426,7 +9555,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}W - pēc dzīvsudraba staba {0} pēc dzīvsudraba staba {0} pēc dzīvsudraba staba {0} pēc dzīvsudraba staba @@ -9486,49 +9614,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mi³ {0}mi³ - - {0} C - {0} C - {0} C - - - {0} F - {0} F - {0} F - - - {0} H - {0} H - {0} H - - - {0} S - {0} S - {0} S - - - cal-IT - - - {0} Bq - {0} Bq - {0} Bq - - - {0} Sv - {0} Sv - {0} Sv - - - {0} Gy - {0} Gy - {0} Gy - - - {0} Wb - {0} Wb - {0} Wb - diff --git a/make/data/cldr/common/main/lzz.xml b/make/data/cldr/common/main/lzz.xml deleted file mode 100644 index 97e4fb5fcfaa..000000000000 --- a/make/data/cldr/common/main/lzz.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - İngilizuri - Lazuri - - - - [a b cç{ç̌} d {dz} e f gğ h iİ j kǩ l m n o p{p̌} q r sş t{t̆} {ts} {tz} u v x y z] - [ı ö ü w ž ʒǯ] - [A B CÇ{Ç̌} D E F GĞ H İ J KǨ L M N O P{P̌} Q R SŞ T{T̆} U V W X Y Z] - - diff --git a/make/data/cldr/common/main/lzz_TR.xml b/make/data/cldr/common/main/lzz_TR.xml deleted file mode 100644 index 8a02775f6ccc..000000000000 --- a/make/data/cldr/common/main/lzz_TR.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/mai.xml b/make/data/cldr/common/main/mai.xml index 0c8b33868f44..3b434b9ea83d 100644 --- a/make/data/cldr/common/main/mai.xml +++ b/make/data/cldr/common/main/mai.xml @@ -848,6 +848,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic डिफाल्ट यूनिकोड सॉर्ट क्रम सामान्य प्रयोजन वाली खोज मानक सॉर्ट क्रम + 12 घंटे वाला प्रारूप + 24 घंटे वाला प्रारूप 12 घंटे वाला प्रारूप (0–11) 12 घंटे वाला प्रारूप (1–12) 24 घंटे वाला प्रारूप (0–23) @@ -918,6 +920,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + dd--MM-y G + + + + + + + - + + + + + + + - + + + + + + + - + + + + + + + - + + + @@ -937,12 +977,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - G d/M/y + G y-MM-dd GyMd + + - + {1}, {0} @@ -1154,6 +1197,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -1204,9 +1251,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y + + + {0} – {1} + {0}–{1} + {0}–{1} + + + + + + + + - + @@ -1234,6 +1297,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + + + + + - + + + @@ -1463,14 +1547,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic जीएमटी{0} - जीएमटी {0} समय {0} डेलाइट समय {0} मानक समय - समन्वित वैश्विक समय + कोर्डिनेटेड यूनिवर्सल टाइम + + यूटीसी + अज्ञात शहर @@ -2925,7 +3011,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - हवाई-एल्यूटियन मानक टाइम + हवाई एल्यूटियन मानक टाइम @@ -3201,9 +3287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - सामोआ समय सामोआ मानक समय - सामोआ समर समय diff --git a/make/data/cldr/common/main/mdf.xml b/make/data/cldr/common/main/mdf.xml deleted file mode 100644 index 045c4f31234a..000000000000 --- a/make/data/cldr/common/main/mdf.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - Саксонь кяль - Англань кяль - Испаниянь кяль - Кранциянь кяль - Италиянь кяль - Япононь кяль - мокшень кяль - Поляконь кяль - Португалонь кяль - Рузонь кяль - Туркань кяль - - - - - - - масторланга - Африкась - Кельмеширень Америкась - Лямбеширень Америкась - Кучкань Америкась - Кучкань Африкась - Америкась - Азиясь - Европась - Аргентина - Бермуда - Боливия - Бразилия - Канада - Чили - Колумбия - Куба - Алжир - Египет - Эуропонь соткс - Гренада - Гренландия - Мексика - Никарагуа - Панама - Перу - - - - [а б в г д её ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я] - [ӓ ә є җ ѕ і ԕ ҥ ԗ ў ѡ џ ѣ ԙ ѳ ѵѷ] - [А Б В Г Д ЕЁ Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я] - [  , % ‰ + − 0 1 2 3 4 5 6 7 8 9] - [, ; ! ? .] - - - - - киза - меля - тядде - сай кизоня - - - ков - ётай ковть - тя ковть - сай ковть - - - недяля - ётай недялять - тя недялять - сай недялять - - - ши - исяк - тячи - ванды - - - част - - - минута - - - секунда - - - - - - - ₽ - - - - diff --git a/make/data/cldr/common/main/mg.xml b/make/data/cldr/common/main/mg.xml index 1f92e6e9511a..8563506d7d32 100644 --- a/make/data/cldr/common/main/mg.xml +++ b/make/data/cldr/common/main/mg.xml @@ -552,6 +552,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0}–{1} + {0}–{1} + h a – h a h–h a diff --git a/make/data/cldr/common/main/mhn.xml b/make/data/cldr/common/main/mhn.xml deleted file mode 100644 index 377cd791258e..000000000000 --- a/make/data/cldr/common/main/mhn.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - [aáà b c d eéèë f g h iíì j k l m n oóò p q r s t uúù v w x y z] - [\- ‑ , + 0 1 2 3 4 5 6 7 8 9] - [, ; ! ? . ' "] - - diff --git a/make/data/cldr/common/main/mhn_IT.xml b/make/data/cldr/common/main/mhn_IT.xml deleted file mode 100644 index 8bae1c7693ec..000000000000 --- a/make/data/cldr/common/main/mhn_IT.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/mi.xml b/make/data/cldr/common/main/mi.xml index 816b26218e55..ca5a685d8e25 100644 --- a/make/data/cldr/common/main/mi.xml +++ b/make/data/cldr/common/main/mi.xml @@ -118,7 +118,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ingarihi US Eheperāto Pāniora - Pāniora o Amerika Rātini + Pāniora Amerika Rātini Pāniora Ūropi Pāniora Mehikana Etōniana @@ -327,8 +327,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Marahiti-Pehamakoare Pāhitō Pōtukīhi - Pōtukīhi Parahi - Pōtukīhi Uropi + Pōtukīhi Parīhi + Pōtukīhi Potukara Kētua Ratiahitani Rapanui @@ -659,7 +659,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Airani Iharaira Te Moutere Mana - Inia + Īnia Te Rohe o te Moana Īniana Piritihi Te Rohe o te Moana Īnia Piritene Irāka @@ -840,6 +840,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Maramataka Hitiuri (tūtohi, wā o naiānei) Maramataka Hitiuri (Uma ara Kura) Maramataka Pākehā (Tau Tuatahi) + Pākehā Maramataka Hapanihi Maramataka Pāhia Maramataka Minguo @@ -849,6 +850,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Rapunga Arowhānui Raupapa Kōmaka Arowhānui Arowhānui + Pūnaha Haora 12 + Pūnaha Haora 24 Pūnaha Haora 12 (0–11) Pūnaha Haora 12 (1–12) Pūnaha Haora 24 (0–23) @@ -974,6 +977,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ki te {1} + + MMM – MMM + + + MMM d – d + GGGGG y-MM – y-MM @@ -1011,7 +1020,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hānuere Pēpuere Māehe - Āpereira + Āperira Mei Hune Hūrae @@ -1220,6 +1229,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + EEE, d MMMM y QQQ y QQQQ y 'wiki' w 'o' Y @@ -1882,9 +1893,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Parī - - Wā Piritana Raumati - Rānana @@ -1912,9 +1920,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tiakāta - - Wā Airihi Arowhānui - Tapurini @@ -2088,6 +2093,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Āpia + + + Wā Acre + Wā Arowhānui Acre + Wā Raumati Acre + + Wā Awhekenetāna @@ -2110,7 +2122,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wā o Āwherika ki te uru + Wā Āwherika ki te Uru @@ -2263,6 +2275,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Parīhia Raumati + + + Wā Piritana + Wā Raumati Piritana + + Wā Poronai Darussalam @@ -2361,28 +2379,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wā Uropi Waenga - Wā Arowhānui Uropi Waenga - Wā Raumati Uropi Waenga + Wā Ūropi Waenga + Wā Arowhānui Ūropi Waenga + Wā Raumati Ūropi Waenga - Wā Uropi Rāwhiti - Wā Arowhānui Uropi Rāwhiti - Wā Raumati Uropi Rāwhiti + Wā Ūropi ki te Rāwhiti + Wā Arowhānui Ūropi ki te Rāwhiti + Wā Raumati Ūropi ki te Rāwhiti - Wā Ūropi ki te rāwhiti rawa + Wā Ūropi ki te Rāwhiti-atu - Wā Uropi Uru - Wā Arowhānui Uropi Uru - Wā Raumati Uropi Uru + Wā Ūropi ki te Uru + Wā Arowhānui Ūropi ki te Uru + Wā Raumati Ūropi ki te Uru @@ -2436,6 +2454,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Toharite Kiriwīti + + + Wā Kārikirana + Wā Arowhānui Kārikirana + Wā Rāumati Kārikirana + + Wā Whenuakāriki ki te rāwhiti @@ -2462,7 +2487,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wā Arowhānui Hawaii-Aleutian + Wā Hawaii @@ -2523,6 +2548,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Irāna Awatea + + + Wā Airana + Wā Arowhānui Airana + + Wā Irkutsk @@ -2544,6 +2575,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Hapani Awatea + + + Wā Kamchatka + Wā Kamchatka Arowhānui + Wā Kamchatka Raumati + + Wā Katatānga @@ -2806,11 +2844,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Sakhalin Raumati + + + Wā Samara + Wā Samara Arowhānui + Wā Samara Raumati + + - Wā Hāmoa Wā Hāmoa Arowhānui - Wā Hāmoa Awatea @@ -2877,6 +2920,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Chuuk + + + Wā Tākei + Wā Arowhānui Tākei + Wā Raumati Tākei + + Wā Tukumanatānga @@ -2896,6 +2946,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wā Urukoi Raumati + + + Wā Ürümqi + + Wā Uhipeketāne @@ -2966,6 +3021,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + ¤ 0B + ¤ 00B + ¤ 000B + + + Dirham UAE @@ -3574,7 +3638,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Guilder Karapīana - Guilder Karapīana + guilder Karapīana Franc CFA Āwherika ki te Uru @@ -3602,7 +3666,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kōura Timuwawe - Kino Tāone o Timuwawe + kōura Timuwawe diff --git a/make/data/cldr/common/main/mic.xml b/make/data/cldr/common/main/mic.xml deleted file mode 100644 index e9ed12b3497c..000000000000 --- a/make/data/cldr/common/main/mic.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - Lʼnuiʼsuti - - - - - - - [aá eé i ɨ j k l m n oó p q s t uú w y ʼ] - [b c d f g h r v x z] - [AÁ EÉ I Ɨ J K L M N OÓ P Q S T UÚ W Y] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - EEEE, MMMM d, y - - - - - MMMM d, y - - - - - MMM d, y - - - - - y-MM-dd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - diff --git a/make/data/cldr/common/main/mic_CA.xml b/make/data/cldr/common/main/mic_CA.xml deleted file mode 100644 index 8e68097fdfbd..000000000000 --- a/make/data/cldr/common/main/mic_CA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/mk.xml b/make/data/cldr/common/main/mk.xml index 3e29cb0b6315..49251c5d38af 100644 --- a/make/data/cldr/common/main/mk.xml +++ b/make/data/cldr/common/main/mk.xml @@ -51,7 +51,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ асамски асу американски знаковен јазик - астурски + астуриски атикамек аварски котава @@ -1118,6 +1118,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Свети Мартин Сирија Есватини + Свазиленд Тристан да Куња Острови Туркс и Каикос Чад @@ -1176,15 +1177,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Календар Формат на валута + Не подредувај според симболи + Подредување според акценти во обратен редослед + Подредување според голема/мала буква + Подредување со разликување големи и мали букви Подредување + Нормализирано подредување + Нумеричко подредување + Промена на редослед на скрипти/блокови + Степен на чувствителност при подредување Валута + Дестинација за трансформација + Исклучоци за разделување зборови според речник Приказ на емоџи + Прв ден во седмицата + Комбинирано со Часовен циклус (12 или 24) + Начин на внес + Тастатура + Највисоко игнорирано ниво Стил за разделување редови Разделување редови во рамки на зборови + Правила за трансформација Мерен систем + Мерна единица Броеви + Регион за дополнителни податоци + Извор на трансформација + Потподелба на регион Разделување реченица по кратенка + Трансформација + Машински превод + Временска зона + Локална варијанта + Приватна употреба + Трансформација за приватна употреба Будистички календар @@ -1204,15 +1231,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Еврејски календар Еврејски Индиски национален календар + Индиски национален Исламски календар Исламски Исламски граѓански календар Исламски (граѓански) Исламски календар (Саудиска Арабија) + Исламски, според младата месечина во Саудиска Арабија Исламски календар (астрономска епоха) + Исламски (граѓански, астрономски календар) Исламски календар (Ум ал-Кура) Исламски (Ум ал-Кура) Календар ISO-8601 + Грегоријански Јапонски календар Јапонски Персиски календар @@ -1223,27 +1254,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сметководствен Стандарден формат на валута Стандарден + Мали букви + Мали букви + Големи букви Претходно подредување + Компатибилност Подредување по азбучен редослед + Речник Стандардно подредување во уникод Стандардно во уникод Подредување емотикони + Емоџи Европски правила за подредување + Европски правила Азбучен редослед + Телефонски именик + Фонетски Сортирање Pinyin + Пинјин Реформирано подредување Општо пребарување Пребарување Пребарување според почетна согласка хангул + Почетна согласка во корејското писмо Стандардно подредување Стандардно Ритмички редослед + Потег Традиционално сортирање + Традиционално Подредување унихан + Подредување според радикал и број на потези Подредување жујин + Џујин + Валута + Цифри + Интерпункција + Празно место + Симбол + Сите + Само основни букви + Основни букви, акценти, големина на букви, варијанти, кана + Основни букви, акценти + Основни букви, акценти, големина на букви, варијанти + До целосна ширина + До половина ширина Стандардно Емоџи Текст + 12-часовен систем + 12 + 24-часовен систем + 24 12-часовен систем (0 – 11) 12 (0 – 11) 12-часовен систем (1 – 12) @@ -1252,6 +1314,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0 – 23) 24-часовен систем (1 – 24) 24 (1 – 24) + Простори на поместување, интерпункција, сите симболи + Простори на поместување, интерпункција + Простори на поместување, интерпункција + Простори на поместување, интерпункција, симболи кои не се валута Допустлив стил за разделување редови Допустлив стил Нормален стил за разделување редови @@ -1262,6 +1328,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Задржи ги сите Нормално разделување Задржи во фрази + Транслитерација според системот на САД за географски имиња + Транслитерација според системот на ОН за географски имиња Метрички систем Метрички Империјален мерен систем @@ -1271,47 +1339,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ахомски цифри Арапско-индиски цифри Проширени арапско-индиски цифри + Проширени арапско-индиски Ерменски броеви Ерменски мали броеви + Ерменски мали Бенгалски цифри Чакмански цифри Деванагарски цифри Етиопски броеви + Финансиски Цифри со целосна ширина + Со целосна ширина Грузиски броеви Грчки броеви Грчки мали броеви + Грчки мали Гуџарати цифри Гурмуки цифри + Нумерирање на денот од месецот со знаците Хан за традиционални календари Кинески децимални броеви + Позиционен децимален систем што користи кинески бројчени идеограми како цифри Поедноставени кинески броеви Поедноставени кинески финансиски броеви + Поедонставени кинески финансиски Традиционални кинески броеви Традиционални кинески финансиски броеви + Традиционални кинески финансиски Хебрејски броеви Јавански цифри Јапонски броеви Јапонски финансиски броеви + Јапонски финансиски + Јапонски систем „Ганен“ за означување на првата година Кмерски цифри Каннада цифри + Таи Там Там (црковен) Лаошки цифри Арапски броеви + Математички задебелени + Математички двојно прецртани + Математички монопросторни + Математички sans-serif задебелени + Математички sans-serif Малајалски цифри Мејтејски цифри Мјанмарски цифри + Мјанмарски источен пво карен + Мјанмарски пао + Мјанмарски шан + Мјанмарски таи лаинг + Изворни цифри + Изворни цифри Цифри ол чики Одиски цифри + Со контури Римски броеви + Римски големи Римски мали броеви + Римски мали + Сегментирани Традиционални тамилски броеви Тамилски цифри + Современи тамилски Телугу цифри Тајландски цифри Тибетски цифри + Традиционални броеви Цифри ваи Исклучено Вклучено + Неодреден машински превод + Варијанта за POSIX + + Исклучено + Вклучено + метрички британски @@ -1468,6 +1571,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + r.MM.dd + + + + @@ -1555,6 +1667,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-ви + {0}-ри + {0}-ми + {0}-ти + + + @@ -1630,18 +1752,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d.M.y 'г'. G MMM y 'г'. G d MMM y 'г'. G + ddd MMM y 'г'. G E, d MMM y 'г'. G + E, ddd MMM y 'г'. G H h:mm a H:mm h:mm:ss a H:mm:ss - HH v + H 'ч'. v d.M E, d.M d MMM + ddd MMM E, d MMM + ddd MMM, E d MMMM + ddd MMMM E, d MMMM y 'г'. G y 'г'. G @@ -1650,12 +1777,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.M.y 'г'. G MMM y 'г'. G d MMM y 'г'. G + ddd MMM y 'г'. G E, d MMM y 'г'. G + E, ddd MMM y 'г'. G MMMM y 'г'. G QQQ y 'г'. G QQQ y 'г'. G + + {0} – {1} + h – h B @@ -1745,6 +1877,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL – LLLL + + d – d MMMM + d MMMM – d MMMM + y 'г'. – y 'г'. G @@ -1832,6 +1968,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-ви + {0}-ри + {0}-ми + {0}-ти + + + @@ -1980,6 +2126,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -2025,20 +2174,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.M.y 'г'. G MMM y 'г'. G d MMM y 'г'. G + ddd MMM y 'г'. G E, d MMM y 'г'. G + E, ddd MMM y 'г'. G + MMMM y 'г'. G + d MMMM y 'г'. G + ddd MMMM y 'г'. G + E, d MMMM y 'г'. G + E, ddd MMMM y 'г'. G H h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v + H 'ч'. v d.M d.M E, d.M d MMM + ddd MMM E, d MMM + E, ddd MMM d MMMM + ddd MMMM E, d MMMM + E, ddd MMMM W. 'седмица' 'од' MMMM W. 'седмица' 'од' MMMM y 'г'. @@ -2047,14 +2207,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.M.y 'г'. MMM y 'г'. d MMM y 'г'. + ddd MMM y 'г'. E, d MMM y 'г'. + E, ddd MMM y 'г'. MMMM y 'г'. + d MMMM y 'г' + ddd MMMM y 'г' + E, d MMMM y 'г' + E, ddd MMMM y 'г' QQQ y 'г'. QQQQ y 'г'. w. 'седмица' 'од' Y w. 'седмица' 'од' Y + + {0} {1} + + + {0} – {1} + {0} – {1} + h – h B @@ -2160,6 +2333,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL – LLLL + + d – d MMMM + d MMMM – d MMMM + y 'г'. – y 'г'. @@ -2511,6 +2688,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + y.MM.dd + + + + + + . + + + @@ -2605,17 +2796,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пред {0} тримес. - - тримес. - - за {0} тримес. - за {0} тримес. - - - пред {0} тримес. - пред {0} тримес. - - месец минатиот месец @@ -2657,9 +2837,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ сед. од мес. - - сед. од мес. - ден завчера @@ -2688,9 +2865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ден од нед. - - ден од нед. - ден од месецот @@ -2885,9 +3059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ претпладне/попладне - - претпл./попл. - час овој час @@ -3435,9 +3606,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либрвил - - Британско летно време - Лондон @@ -3528,9 +3696,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Џајапура - - Ирско стандардно време - Даблин @@ -4228,9 +4393,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Акре време - Акре стандардно време - Акре летно сметање на времето + Време во Акре + Стандардно време во Акре + Летно сметање на времето во Акре @@ -4415,6 +4580,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Летно сметање на времето во Бразилија + + + Британско време + Британско летно време + + Време во Брунеј Дарусалам @@ -4603,6 +4774,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Средно време по Гринич + + + Време во Гренланд + Стандардно време во Гренланд + Летно сметање на времето во Гренланд + + Време во Источен Гренланд @@ -4629,7 +4807,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Стандардно време во Хаваи - Алеутски острови + Стандардно време во Хаваи @@ -4690,6 +4868,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Летно сметање на времето во Иран + + + Ирско време + Ирско стандардно време + + Време во Иркутск @@ -4711,6 +4895,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Летно сметање на времето во Јапонија + + + Време во Камчатка + Стандардно време во Камчатка + Летно време во Камчатка + + Време во Казахстан @@ -4975,16 +5166,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Самара време - Самара стандардно време - Самара летно сметање на времето + Време во Самара + Стандардно време во Самара + Летно сметање на времето во Самара - Време во Самоа Стандардно време во Самоа - Летно време во Самоа @@ -5053,9 +5242,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Турција време - Турција стандардно време - Турција летно сметање на времето + Време во Турција + Стандардно време во Турција + Летно сметање на времето во Турција @@ -5077,6 +5266,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Летно сметање на времето во Уругвај + + + Време во Урумчи + + Време во Узбекистан @@ -5223,9 +5417,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5239,14 +5430,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 мил'.' ¤ 00 мил'.' ¤ 00 мил'.' ¤ - 000 М ¤ - 000 М ¤ + 000 мил'.' ¤ + 000 мил'.' ¤ 0 милј'.' ¤ 0 милј'.' ¤ 00 милј'.' ¤ 00 милј'.' ¤ 000 мј'.' ¤ - 000 ми'.' ¤ + 000 мј'.' ¤ 0 бил'.' ¤ 0 бил'.' ¤ 00 бил'.' ¤ @@ -5270,8 +5461,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Авганистански авган - Авганистански авган - Авганистански авган + Авганистански авгани + Авганистански авгани Албански лек @@ -5447,7 +5638,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Кинески јуан (офшор) - Кинески јуани (офшор) + Кинески јуан (офшор) Кинески јуани (офшор) @@ -6218,8 +6409,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Карипски гулден - Карипски гулден - Карипски гулден Западноафрикански франк @@ -6275,8 +6464,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Зимбабвеско злато - Зимбабвеско злато - Зимбабвеско злато @@ -6286,10 +6473,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ден {0} дена - Сврти на {0}-мата улица десно. Сврти на {0}-вата улица десно. - Сврти на {0}-тата улица десно. Сврти на {0}-рата улица десно. + Сврти на {0}-мата улица десно. + Сврти на {0}-тата улица десно. @@ -6506,8 +6693,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ делови - {0} дел - {0} делови делови на милион @@ -7300,10 +7485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} драм {0} драмови - - {0} џигер - {0} џигери - прстофат {0} прстофат @@ -7379,11 +7560,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} вебер {0} вебери - - светлосна - {0} светлосна - {0} светлосни - делови на милијарда {0} дел на милијарда @@ -7786,7 +7962,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ дунам - дел {0} дел {0} делови @@ -7794,9 +7969,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ‱ {0} ‱ - - Glc - mpg UK {0} m/gUK @@ -7997,10 +8169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl.dr. {0} fl.dr. - - {0} џигер - {0} џигери - pn {0} pn @@ -8011,15 +8179,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt-Imp. - cal [IT] {0} cal [IT] {0} cal [IT] - - светлосна - {0} светлосна - {0} светлосни - {0} н. {0} н. diff --git a/make/data/cldr/common/main/ml.xml b/make/data/cldr/common/main/ml.xml index 7bbc2640a451..c046cacb75d5 100644 --- a/make/data/cldr/common/main/ml.xml +++ b/make/data/cldr/common/main/ml.xml @@ -429,6 +429,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ പാലി പിജിൻ പോളിഷ് + പീഡ്‌മൊണ്ടീസ് പൊൻപിയൻ മലിസീറ്റ്-പസാമക്വുഡി പ്രഷ്യൻ @@ -1081,23 +1082,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ കറൻസി ഫോർമാറ്റ് ചിഹ്നങ്ങൾ പ്രകാരം അടുക്കുന്നത് അവഗണിക്കുക വിപരീതക്രമ ആക്‌സന്റ് പ്രകാരമുള്ള അടുക്കൽ - വലിയക്ഷര/ചെറിയക്ഷര പ്രകാരമുള്ള അടുക്കൽ + ലോവർകെയ്സ്/അപ്പർകെയ്സ് പ്രകാരമുള്ള ക്രമപ്പെടുത്തൽ കേസ് സെൻസിറ്റീവ് അടുക്കൽ അടുക്കൽ ക്രമം സാധാരണ അടുക്കൽ അക്കങ്ങൾ പ്രകാരമുള്ള അടുക്കൽ + സ്ക്രിപ്റ്റ്/ബ്ലോക്ക് പ്രകാരമുള്ള പുനഃക്രമീകരണം അടുക്കൽ ശക്തി - നാണയം + കറൻസി + ട്രാൻസ്ഫോം ഡെസ്റ്റിനേഷൻ + ഡിക്ഷണറി ബ്രേക്ക് ഒഴിവാക്കലുകൾ ഇമോജി അവതരണം + ആഴ്ചയിലെ ആദ്യ ദിവസം + മിക്സ്ഡ്-ഇൻ സമയ ഘടന (12 / 24) + ഇൻപുട്ട് രീതി + കീബോർഡ് + ഏറ്റവും കൂടുതൽ അവഗണിക്കപ്പെട്ടത് CJK ലൈൻ ബ്രേക്ക് വാക്കുകൾക്കുള്ളിലെ ലൈൻ ബ്രേക്ക് + ട്രാൻസ്ഫോം നിയമങ്ങൾ അളക്കൽ സംവിധാനം + അളവ് യൂണിറ്റ് അക്കങ്ങൾ‌ + സപ്ലിമെന്റൽ ഡാറ്റയ്ക്കുള്ള മേഖല + ട്രാൻസ്ഫോം സോഴ്സ് + പ്രദേശത്തിന്റെ ഉപവിഭാഗം ചുരുക്കരൂപത്തിന് ശേഷമുള്ള സെന്റൻസ് ബ്രേക്ക് + ട്രാൻസ്ഫോം + മെഷീൻ ട്രാൻസ്ലേറ്റഡ് സമയ മേഖല ഭാഷാ ഭേദം സ്വകാര്യ ഉപയോഗം + സ്വകാര്യ ഉപയോഗ ട്രാൻസ്ഫോം ബുദ്ധിസ്റ്റ് കലണ്ടർ @@ -1123,10 +1140,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഇസ്ലാമിക് കലണ്ടർ (ടാബുലർ, സിവിൽ ഇപോക്ക്) ഇസ്ലാമിക് (ടാബുലർ, സിവിൽ ഇപോക്ക്) ഇസ്ലാം-അറബിക് കലണ്ടർ + ഇസ്ലാമിക്, സൗദി അറേബ്യയിലെ മാസപ്പിറവി അടിസ്ഥാനമാക്കിയുള്ളത് ഇസ്ലാം-ജ്യോതിഷ കലണ്ടർ + ഇസ്ലാമിക് (ടാബുലർ, ജ്യോതിശാസ്ത്ര യുഗം) ഇസ്ലാമിക് കലണ്ടർ (ഉം അൽ ഖുറ) ഇസ്ലാമിക് (ഉം അൽ ഖുറ) ഐഎസ്ഓ 8601 കലണ്ടർ + ഗ്രിഗോറിയൻ ജാപ്പനീസ് കലണ്ടർ ജാപ്പനീസ് പേർഷ്യൻ കലണ്ടർ @@ -1142,44 +1162,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ സാധാരണ ആക്‌സന്റുകൾ പ്രകാരം അടുക്കുക ആക്‌സന്റുകളെ വിപരീതക്രമത്തിൽ അടുക്കുക ആദ്യം ചെറിയക്ഷര പ്രകാരം അടുക്കുക + ലോവർകെയ്സ് സാധാരണ കേസ് ക്രമത്തിൽ അടുക്കുക + ലോവർകെയ്സ് ആദ്യം വലിയക്ഷരപ്രകാരം അടുക്കുക + അപ്പർകെയ്സ് കേസ് സെൻസിറ്റീവ് പ്രകാരം അടുക്കുക കേസ് സെൻസിറ്റീവ് അടുക്കുക അനുയോജ്യതയ്‌ക്കായുള്ള മുൻ അടുക്കൽ ക്രമം + അനുയോജ്യത നിഘണ്ടു അടുക്കൽ ക്രമം + നിഘണ്ടു ഡിഫോൾട്ട് യൂണികോഡ് അടുക്കൽ ക്രമം ഡിഫോൾട്ട് യൂണികോഡ് ഇമോജി അടുക്കൽ ക്രമം + ഇമോജി യൂറോപ്യൻ അടുക്കൽ നിയമങ്ങൾ + യൂറോപ്യൻ നിയമങ്ങൾ ഫോൺബുക്കിലെ ക്രമീകരണം + ഫോൺബുക്ക് സ്വരസൂചക അടുക്കൽ ക്രമം + ഫൊണറ്റിക് പിൻ‌യിൻ ക്രമീകരണം + പിൻയിൻ നവീകരിച്ച അടുക്കൽ ക്രമം പൊതുവായ ആവശ്യത്തിനുള്ള തിരയൽ തിരയൽ ഹാംഗൽ പ്രാരംഭ വ്യഞ്ജനാക്ഷരം പ്രകാരം തിരയുക + കൊറിയൻ പ്രാരംഭ വ്യഞ്ജനാക്ഷരങ്ങൾ സ്റ്റാൻഡേർഡ് അടുക്കൽ ക്രമം സ്റ്റാൻഡേർഡ് സ്റ്റ്രോക്ക് ക്രമീകരണം + സ്ട്രോക്ക് പരമ്പരാഗത ക്രമീകരണം + പരമ്പരാഗതം റാഡിക്കൽ-സ്ട്രോക്ക് അടുക്കൽ ക്രമം + റാഡിക്കൽ സ്ട്രോക്ക് ജുയൻ അടുക്കൽ ക്രമം + ജൂയിൻ സാധാരണരീതി ഇല്ലാതെ അടുക്കുക സാധാരണ യൂണിക്കോഡ് അടുക്കുക ഓരോ ഡിജിറ്റുകൾ പ്രകാരം അടുക്കുക ഡിജിറ്റുകളെ സംഖ്യാപരമായി അടുക്കുക + കറൻസി + അക്കങ്ങൾ + വിരാമചിഹ്നം + വൈറ്റ്സ്പേസ് + ചിഹ്നം എല്ലാം അടുക്കുക + എല്ലാം അടിസ്ഥാന അക്ഷരങ്ങൾ മാത്രം അടുക്കുക + അടിസ്ഥാന അക്ഷരങ്ങൾ മാത്രം ആക്‌സന്റുകൾ/കേസ്/വീതി/Kana അടുക്കുക + അടിസ്ഥാനം, ആക്സന്റുകൾ, കെയ്സ്, വേരിയന്റുകൾ, കാന ആക്‌സന്റുകൾ അടുക്കുക + അടിസ്ഥാനം, ആക്സന്റുകൾ ആക്‌സന്റുകൾ/കേസ്/വീതി അടുക്കുക + അടിസ്ഥാനം, ആക്സന്റുകൾ, കെയ്സ്, വേരിയന്റുകൾ ഫുൾവിഡ്‌ത്തിലേക്ക് ഹാഫ്‌വിഡ്‌ത്തിലേക്ക് സംഖ്യാപരമായ ഡിഫോൾട്ട് ഇമോജി ടെക്സ്റ്റ് + 12 മണിക്കൂർ സംവിധാനം + 12 + 24 മണിക്കൂർ സംവിധാനം + 24 12 മണിക്കൂർ സംവിധാനം (0–11) 12 (0–11) 12 മണിക്കൂർ സംവിധാനം (1–12) @@ -1188,6 +1237,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 മണിക്കൂർ സംവിധാനം (1–24) 24 (1–24) + ഷിഫ്റ്റ് സ്‌പേസുകൾ, വിരാമചിഹ്നങ്ങൾ, എല്ലാ ചിഹ്നങ്ങളും + ഷിഫ്റ്റ് സ്‌പേസുകൾ, വിരാമചിഹ്നങ്ങൾ + ഷിഫ്റ്റ് സ്‌പേസുകൾ, വിരാമചിഹ്നങ്ങൾ + ഷിഫ്റ്റ് സ്‌പേസുകൾ, വിരാമചിഹ്നങ്ങൾ, കറൻസി-ഇതര ചിഹ്നങ്ങൾ ലൂസ് ലൈൻ ബ്രേക്ക് സ്റ്റൈൽ ലൂസ് നോർമൽ ലൈൻ ബ്രേക്ക് സ്റ്റൈൽ @@ -1208,9 +1261,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ യുഎസ് അഹോം അക്കങ്ങൾ അറബിക്-ഇന്ത്യ അക്കങ്ങൾ - വിപുലീകൃത അറബിക്-ഇന്ത്യ അക്കങ്ങൾ + വിപുലീകൃത അറബിക്-ഇന്ത്യൻ അക്കങ്ങൾ + വിപുലീകൃത അറബിക്-ഇന്ത്യൻ അർമേനിയൻ സംഖ്യകൾ - അർമേനിയൻ ചെറിയ സംഖ്യകൾ + അർമേനിയൻ ലോവർകെയ്സ് സംഖ്യകൾ + അർമേനിയൻ ലോവർകെയ്സ് ബെലിനീസ് അക്കങ്ങൾ ബംഗ്ലാ അക്കങ്ങൾ ബ്രാഹ്‌മി അക്കങ്ങൾ @@ -1220,53 +1275,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ദേവനാഗരി അക്കങ്ങൾ എത്യോപിക് സംഖ്യകൾ സാമ്പത്തിക സംഖ്യകൾ - പൂർണ വലുപ്പമുള്ള സംഖ്യകൾ + ധനകാര്യം + ഫുൾ-വിഡ്ത്ത് സംഖ്യകൾ + ഫുൾ-വിഡ്ത്ത് ജോർജിയൻ സംഖ്യകൾ മസാറം ഗോണ്ടി അക്കങ്ങൾ ഗ്രീക്ക് സംഖ്യകൾ - ഗ്രീക്ക് ചെറിയക്ഷര സംഖ്യകൾ + ഗ്രീക്ക് ലോവർകെയ്സ് സംഖ്യകൾ + ഗ്രീക്ക് ലോവർകെയ്സ് ഗുജറാത്തി അക്കങ്ങൾ ഗുരുമുഖി അക്കങ്ങൾ + പരമ്പരാഗത കലണ്ടറുകൾക്കായുള്ള ഹാൻ-ക്യാരക്ടർ മാസദിന നമ്പറിംഗ് ചൈനീസ് ദശാംശ സംഖ്യകൾ + ചൈനീസ് സംഖ്യാ ചിഹ്നങ്ങൾ അക്കങ്ങളായി ഉപയോഗിക്കുന്ന സ്ഥാനീയ ദശാംശ സമ്പ്രദായം ലളിതവൽക്കരിച്ച ചൈനീസ് സംഖ്യകൾ ലളിതവൽക്കരിച്ച ചൈനീസ് ധനകാര്യ സംഖ്യകൾ + ലളിതവൽക്കരിച്ച ചൈനീസ് ധനകാര്യം പരമ്പരാഗത ചൈനീസ് സംഖ്യകൾ പരമ്പരാഗത ചൈനീസ് ധനകാര്യ സംഖ്യകൾ + പരമ്പരാഗത ചൈനീസ് ധനകാര്യം ഹീബ്രു സംഖ്യകൾ പഹാവ് മോംഗ് അക്കങ്ങൾ ജാവനീസ് അക്കങ്ങൾ ജാപ്പനീസ് സംഖ്യകൾ ജാപ്പനീസ് ധനകാര്യ സംഖ്യകൾ + ജാപ്പനീസ് ധനകാര്യം + ജാപ്പനീസ് പ്രഥമ വർഷ ഗന്നെൻ നമ്പറിംഗ് കയാഹ് ലി അക്കങ്ങൾ ഖമേർ അക്കങ്ങൾ - കന്നഡ സംഖ്യകൾ + കന്നഡ അക്കങ്ങൾ തായ് താം ഹോറ അക്കങ്ങൾ തായ് താം താം അക്കങ്ങൾ + തായ് താം താം (എക്ലീസിയാസ്റ്റിക്കൽ) ലാവോ അക്കങ്ങൾ - പടിഞ്ഞാറൻ അക്കങ്ങൾ + വെസ്റ്റേൺ അക്കങ്ങൾ ലെപ്‌ച അക്കങ്ങൾ ലിംബു അക്കങ്ങൾ ഗണിത ബോൾഡ് അക്കങ്ങൾ + മാത്തമാറ്റിക്കൽ ബോൾഡ് ഗണിത ഏകസ്‌പെയ്‌സ് അക്കങ്ങൾ + മാത്തമാറ്റിക്കൽ ഡബിൾ-സ്ട്രക്ക് ഗണിത ഏകസ്‌പെയ്‌സ് അക്കങ്ങൾ + മാത്തമാറ്റിക്കൽ മോണോസ്പേസ് ഗണിത സാൻസ്‌-സെരീഫ് ബോൾഡ് അക്കങ്ങൾ + മാത്തമാറ്റിക്കൽ സാൻസ്-സെറിഫ് ബോൾഡ് ഗണിത സാൻസ്-സെരീഫ് അക്കങ്ങൾ + മാത്തമാറ്റിക്കൽ സാൻസ്-സെറിഫ് മലയാളം അക്കങ്ങൾ മോഡി അക്കങ്ങൾ മംഗോളിയൻ സംഖ്യകൾ മ്രോ അക്കങ്ങൾ മീറ്റെയ് മായെക് അക്കങ്ങൾ മ്യാൻമാർ അക്കങ്ങൾ + മ്യാൻമർ കിഴക്കൻ പ്വോ കരൻ + മ്യാൻമർ പാവോ മ്യാൻമാർ ഷാൻ അക്കങ്ങൾ + മ്യാൻമർ ഷാൻ മ്യാൻമാർ തായ് ലെയിംഗ് അക്കങ്ങൾ + മ്യാൻമർ തായ് ലെയിംഗ് തദ്ദേശീയ അക്കങ്ങൾ + തദ്ദേശീയ അക്കങ്ങൾ എൻകോ അക്കങ്ങൾ ഓൾ ചികി അക്കങ്ങൾ ഒഡിയ അക്കങ്ങൾ ഒസ്‌മാന്യ അക്കങ്ങൾ + ഘടനാപരമായത് റോമൻ സംഖ്യകൾ - റോമൻ ചെറിയ സംഖ്യകൾ + റോമൻ അപ്പർകെയ്സ് + റോമൻ ലോവർകെയ്സ് സംഖ്യകൾ + റോമൻ ലോവർകെയ്സ് സൗരാഷ്‌ട്ര അക്കങ്ങൾ + സെഗ്‌മെന്റഡ് ശാരദ അക്കങ്ങൾ ഖുഡവാഡി അക്കങ്ങൾ സിംഹള ലിത് അക്കങ്ങൾ @@ -1276,16 +1355,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ പുതിയ തായ് ലൂ അക്കങ്ങൾ പരമ്പരാഗത തമിഴ് സംഖ്യകൾ തമിഴ് അക്കങ്ങൾ + മോഡേൺ തമിഴ് തെലുങ്ക് സംഖ്യകൾ തായി അക്കങ്ങൾ ടിബറ്റൻ അക്കങ്ങൾ തിർഹുത്ത അക്കങ്ങൾ സാധാരണയായി ഉപയോഗിച്ചുവരുന്ന സംഖ്യകൾ + പരമ്പരാഗത സംഖ്യകൾ വായ് സംഖ്യകൾ വറാങ് സിറ്റി അക്കങ്ങൾ ഓഫ് ഓൺ + വ്യക്തമാക്കാത്ത മെഷീൻ ട്രാൻസ്ലേഷൻ + POSIX വേരിയന്റ് + + ഓഫ് + ഓൺ + മെട്രിക്ക് യുകെ @@ -1313,6 +1400,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + / + + + + + + + + d/M/r + + + + + + / + + + d/M/r + + + @@ -1350,6 +1461,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + / + + @@ -1388,6 +1504,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + / + + @@ -1408,7 +1529,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G y-MM-dd + G y/M/d @@ -1439,17 +1560,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - {1}, {0} - {1}, {0} - - {1}, {0} - B h @@ -1468,15 +1583,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd-MM MMMM d, E G y/M - G d/M/y - G d/M/y, E + G y/M/d + G y/M/d, E MM-y G + + {0}–{1} + {0}–{1} + {0} – {1} d – d + + G y/M – G y/M + G y/M – y/M + G y/M – y/M + + + G y/M/d – y/M/d + G y/M/d – G y/M/d + G y/M/d – y/M/d + G y/M/d – y/M/d + + + G y/M/d, E – y/M/d, E + G y/M/d, E – G y/M/d, E + G y/M/d, E – y/M/d, E + G y/M/d, E – y/M/d, E + M – M @@ -1721,6 +1857,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1747,28 +1886,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - {1}, {0} - {1}, {0} - - {1}, {0} - B h B h:mm B h:mm:ss + E, B h E, B h:mm E, B h:mm:ss E, h a - G y/M + y/M G G y/M/d - G d/M/y, E + G y/M/d, E v h:mm:ss a v HH:mm:ss v h:mm a @@ -1778,16 +1912,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d/M d/M, E dd/MM - MMMM d, E - MMMM - ആഴ്ച W - MMMM - ആഴ്ച W + MMMM - W-ാം വാരം + MMMM - W-ാം വാരം M/y d/M/y d/M/y, E MM/y - Y-ലെ ആഴ്ച w - Y-ലെ ആഴ്ച w + y MMMM d + y MMMM d, EEE + Y-ലെ w-ാമത്തെ ആഴ്ച + Y-ലെ w-ാമത്തെ ആഴ്ച + + {0}, {1} + {0} - {1} @@ -1911,6 +2049,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + / + + @@ -1950,6 +2093,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ശക + + + / + + @@ -2019,6 +2167,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഹിജറ + + + / + + + + + + + / + + @@ -2055,6 +2215,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + / + + @@ -2066,19 +2231,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ മിംഗ്വോ + + + / + + കാലഘട്ടം - - കാല. - വർഷം കഴിഞ്ഞ വർഷം - ഈ വർ‌ഷം + ഈ വർഷം അടുത്തവർഷം {0} വർഷത്തിൽ @@ -2125,7 +2292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ആഴ്ച - കഴിഞ്ഞ ആഴ്‌ച + കഴിഞ്ഞ ആഴ്ച ഈ ആഴ്ച അടുത്ത ആഴ്ച @@ -2363,9 +2530,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ജിഎംടി{0} - ജിഎംടി - ജിഎംടി+? {0} സമയം {0} ഡേലൈറ്റ് സമയം {0} സ്റ്റാൻഡേർഡ് സമയം @@ -2376,6 +2540,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ കോർഡിനേറ്റഡ് യൂണിവേഴ്‌സൽ സമയം + + യു.ടി.സി. + അജ്ഞാത നഗരം @@ -2846,9 +3013,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ലിബ്രെവില്ല - - ബ്രിട്ടീഷ് ഗ്രീഷ്‌മകാല സമയം - ലണ്ടൻ‌ @@ -2939,9 +3103,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ജയപുര - - ഐറിഷ് സ്റ്റാൻഡേർഡ് സമയം - ഡബ്ലിൻ @@ -3676,13 +3837,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ അലാസ്‌ക ഡേലൈറ്റ് സമയം - - - അൽമതി സമയം - അൽമതി സ്റ്റാൻഡേർഡ് സമയം - അൽമതി വേനൽക്കാല സമയം - - ആമസോൺ സമയം @@ -3727,23 +3881,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - അപിയ സമയം - അപിയ സ്റ്റാൻഡേർഡ് സമയം - അപിയ ഡേലൈറ്റ് സമയം - - - - - അഖ്തൌ സമയം - അഖ്തൌ സ്റ്റാൻഡേർഡ് സമയം - അഖ്തൌ വേനൽക്കാല സമയം - - - - - അഖ്തോബ് സമയം - അഖ്തോബ് സ്റ്റാൻഡേർഡ് സമയം - അഖ്തോബ് വേനൽക്കാല സമയം + വെസ്റ്റ് സമോവ സമയം + വെസ്റ്റ് സമോവ സ്റ്റാൻഡേർഡ് സമയം + വെസ്റ്റ് സമോവ ഡേലൈറ്റ് സമയം @@ -3847,6 +3987,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ബ്രസീലിയ ഗ്രീഷ്‌മകാല സമയം + + + ബ്രിട്ടീഷ് സമയം + ബ്രിട്ടീഷ് ഗ്രീഷ്‌മകാല സമയം + + ബ്രൂണൈ ദാറുസ്സലാം സമയം @@ -4020,23 +4166,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഗ്രീൻവിച്ച് മീൻ സമയം - + - കിഴക്കൻ ഗ്രീൻലാൻഡ് സമയം - കിഴക്കൻ ഗ്രീൻലാൻഡ് സ്റ്റാൻഡേർഡ് സമയം - കിഴക്കൻ ഗ്രീൻലാൻഡ് ഗ്രീഷ്‌മകാല സമയം + ഗ്രീൻലൻഡ് സമയം + ഗ്രീൻലൻഡ് സ്റ്റാൻഡേർഡ് സമയം + ഗ്രീൻലൻഡ് ഗ്രീഷ്‌മകാല സമയം - + - പടിഞ്ഞാറൻ ഗ്രീൻലാൻഡ് സമയം - പടിഞ്ഞാറൻ ഗ്രീൻലാൻഡ് സ്റ്റാൻഡേർഡ് സമയം - പടിഞ്ഞാറൻ ഗ്രീൻലാൻഡ് ഗ്രീഷ്‌മകാല സമയം + കിഴക്കൻ ഗ്രീൻലൻഡ് സമയം + കിഴക്കൻ ഗ്രീൻലൻഡ് സ്റ്റാൻഡേർഡ് സമയം + കിഴക്കൻ ഗ്രീൻലൻഡ് ഗ്രീഷ്‌മകാല സമയം - + - ഗ്വാം സ്റ്റാൻഡേർഡ് സമയം + പടിഞ്ഞാറൻ ഗ്രീൻലൻഡ് സമയം + പടിഞ്ഞാറൻ ഗ്രീൻലൻഡ് സ്റ്റാൻഡേർഡ് സമയം + പടിഞ്ഞാറൻ ഗ്രീൻലൻഡ് ഗ്രീഷ്‌മകാല സമയം @@ -4051,7 +4199,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ഹവായ്-അലൂഷ്യൻ സ്റ്റാൻഡേർഡ് സമയം + ഹവായ് സമയം @@ -4115,6 +4263,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഇറാൻ ഡേലൈറ്റ് സമയം + + + ഐറിഷ് സമയം + ഐറിഷ് സ്റ്റാൻഡേർഡ് സമയം + + ഇർകസ്ക് സമയം @@ -4138,9 +4292,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - പെട്രോപാവ്‌ലോസ്ക് കംചാസ്കി സമയം - പെട്രോപാവ്‌ലോസ്ക് കംചാസ്കി സ്റ്റാൻഡേർഡ് സമയം - പെട്രോപാവ്‌ലോസ്ക് കംചാസ്കി വേനൽക്കാല സമയം + കംചാത്ക ടൈം + കംചാത്ക സ്റ്റാൻഡേർഡ് ടൈം + കംചാത്ക സമ്മർ ടൈം @@ -4182,11 +4336,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ കിർഗിസ്ഥാൻ സമയം - - - ലങ്ക സമയം - - ലൈൻ ദ്വീപുകൾ സമയം @@ -4199,13 +4348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ലോർഡ് ഹോവ് ഡേലൈറ്റ് സമയം - - - മകൌ സമയം - മകൌ സ്റ്റാൻഡേർഡ് സമയം - മകൌ വേനൽക്കാല സമയം - - മഗാദൻ സമയം @@ -4321,11 +4463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഫെർണാഡോ ഡി നൊറോൻഹ ഗ്രീഷ്‌മകാല സമയം - - - നോർത്ത് മറിയാനാ ദ്വീപുകൾ സമയം - - നോവോസിബിർസ്‌ക് സമയം @@ -4405,13 +4542,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ പ്യോംഗ്‌യാംഗ് സമയം - - - ഖിസിലോർഡ സമയം - ഖിസിലോർഡ സ്റ്റാൻഡേർഡ് സമയം - ഖിസിലോർഡ വേനൽക്കാല സമയം - - റീയൂണിയൻ സമയം @@ -4431,16 +4561,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - സമാര സമയം + സമാറ സമയം സമാറ സ്റ്റാൻഡേർഡ് സമയം സമാറ വേനൽക്കാല സമയം - സമോവ സമയം സമോവ സ്റ്റാൻഡേർഡ് സമയം - സമോവാ ഗ്രീഷ്‌മകാല സമയം @@ -4509,9 +4637,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - തുർക്കി സമയം - തുർക്കി സ്റ്റാൻഡേർഡ് സമയം - തുർക്കി വേനൽക്കാല സമയം + തുർക്കിയ സമയം + തുർക്കിയ സ്റ്റാൻഡേർഡ് സമയം + തുർക്കിയ വേനൽക്കാല സമയം @@ -4533,6 +4661,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ഉറുഗ്വേ ഗ്രീഷ്‌മകാല സമയം + + + ഉറുംകി സമയം + + ഉസ്‌ബെക്കിസ്ഥാൻ സമയം @@ -4776,8 +4909,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ അർജന്റീൻ പെസോ - അർജന്റീൻ പെസോ - അർജന്റീൻ പെസോ ഓസ്ട്രേലിയൻ ഷില്ലിംഗ് @@ -5675,8 +5806,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ കരീബിയൻ ഗിൽഡർ - കരീബിയൻ ഗിൽഡർ - കരീബിയൻ ഗിൽഡർ സ്പെഷ്യൽ ഡ്രോയിംഗ് റൈറ്റ്സ് @@ -5777,8 +5906,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ സിംബാബ്‌വെയൻ ഗോൾഡ് - സിംബാബ്‌വെയൻ ഗോൾഡ് - സിംബാബ്‌വെയൻ ഗോൾഡ് @@ -6108,11 +6235,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഇനം {0} ഇനങ്ങൾ - - പാർട്ട് - {0} പാർട്ട് - {0} പാർട്ട് - neuter പാർട്ട്സ് / മില്ല്യൺ @@ -6120,7 +6242,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} പാർട്ട് / മില്ല്യണിനെ {0} പാർട്ട് / മില്ല്യണിന് {0} പാർട്ട് / മില്ല്യണിന്റെ - {0} പാർട്ട് / മില്ല്യൺ കൊണ്ട് + {0} പാർട്ട് / മില്ല്യണിനാൽ {0} പാർട്ട് / മില്ല്യണിൽ {0} പാർട്ട് / മില്ല്യണിനോട് {0} പാർട്ട്സ് / മില്ല്യൺ @@ -6348,9 +6470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} വർഷത്തോട് {0} / വർഷം - - പാദങ്ങൾ - neuter {0} മാസത്തെ @@ -6473,6 +6592,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter + ആമ്പിയർ {0} ആമ്പിയർ {0} ആമ്പിയറിനെ {0} ആമ്പിയറിന് @@ -6765,6 +6885,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} പൈക്കോമീറ്റർ {0} പൈക്കോമീറ്റർ + + യാർഡ് + {0} യാർഡ് + {0} യാർഡ് + {0} / അടി @@ -6821,12 +6946,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter + {0} ലക്സ് {0} ലക്സിനെ {0} ലക്‌സിന് {0} ലക്‌സിന്റെ {0} ലക്‌സിനാൽ {0} ലക്‌സിൽ {0} ലക്‌സിനോട് + {0} ലക്സ് {0} ലക്‌സിനെ {0} ലക്‌സിന് {0} ലക്‌സിന്റെ @@ -6970,8 +7097,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} കാരറ്റിനോട് + ഡാൽട്ടൺ {0} ഡാൽട്ടൺ - {0} ഡാൽട്ടണുകൾ + {0} ഡാൽട്ടൺ {0} ഭൂപിണ്ഡം @@ -7045,7 +7173,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ neuter - ബാറുകൾ {0} ബാറിനെ {0} ബാറിന് {0} ബാറിന്റെ @@ -7406,9 +7533,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഹെൻറി - സീമൺസ് - {0} സീമൺസ് - {0} സീമൺസ് + സീമൻസ് + {0} സീമൻസ് + {0} സീമൻസ് കലോറി [IT] @@ -7445,11 +7572,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} വെയ്ബർ {0} വെയ്ബർ - - പ്രകാശം - {0} പ്രകാശ - {0} പ്രകാശ - പാർട്ട്സ് / ബില്ല്യൺ {0} പാർട്ട് / ബില്ല്യൺ @@ -7475,22 +7597,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ജി-ഫോഴ്‌സ് - {0} ജി - {0} ജി + {0} G + {0} G - മീറ്റർ/സെക്കൻഡ്² - {0} മീ/സെ² - {0} മീ/സെ² - - - {0} rev - {0} rev + {0} m/s² + {0} m/s² റേഡിയൻ - {0} rad - {0} rad ഡിഗ്രി @@ -7498,64 +7613,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഡിഗ്രി - ആർക്ക്.മി. - {0} ആർക്ക്.മി. - {0} ആർക്ക്.മി. + {0} arcmin + {0} arcmins - ആർക്ക്.സെ. - {0} ആർക്ക്.സെ. - {0} ആർക്ക്.സെ. + {0} arcsec + {0} arcsecs - കി.മീ² - {0} കി.മീ² - {0} കി.മീ² - {0}/കി.മീ² + {0} km² + {0} km² - ഹെക്‌ടർ - {0} ഹെക്. - {0} ഹെക്. + ha + {0} ha + {0} ha - മീറ്റർ² - {0} മീ² - {0} മീ² - {0}/മീ² + {0} m² + {0} m² - സെ.മീ² - {0} സെ.മീ² - {0} സെ.മീ² - {0}/സെ.മീ² + {0} cm² + {0} cm² - ചതു.മൈൽ - {0} ചതു.മൈ - {0} ചതു.മൈ - {0}/മൈ² + {0} mi² + {0} mi² ഏക്കർ - {0} ഏക്ക. - {0} ഏക്ക. + {0} ac + {0} ac - വാര² - {0} വാ² - {0} വാ² + {0} yd² + {0} yd² - ചതു.അടി - {0} ചതു.അടി - {0} ചതു.അടി + {0} ft² + {0} ft² - ഇഞ്ച്² - {0} ഇഞ്ച്² - {0} ഇഞ്ച്² - {0}/ഇഞ്ച്² + {0} in² + {0} in² ദുനങ്ങൾ @@ -7564,18 +7665,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ കാരറ്റ് - {0} kt - {0} kt - മി.ഗ്രാം/ഡെ.ലി. - {0} മി.ഗ്രാം/ഡെ.ലി. - {0} മി.ഗ്രാം/ഡെ.ലി. + {0} mg/dL + {0} mg/dL - മില്ലിമോൾ/ലിറ്റർ - {0} മി.മോ/ലി. - {0} മി.മോ/ലി. + {0} mmol/L + {0} mmol/L ഇനം @@ -7588,30 +7685,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} പാർട്ട് - പാർട്ട്സ്/മില്ല്യൺ - {0} പാ.പെ.മി. - {0} പാ.പെ.മി. + {0} ppm + {0} ppm പെ൪മിറിയാഡ് മോൾ - {0} മോൾ - {0} മോൾ + {0} mol + {0} mol Glc - ലിറ്റർ/കി.മീ. - {0} ലി/കി.മീ. - {0} ലി/കി.മീ. + {0} L/km + {0} L/km - ലി./100 കി.മീ. - {0} ലി./100 കി.മീ. - {0} ലി./100 കി.മീ. + L/100 km + {0} L/100 km + {0} L/100 km മൈൽ/ഗാ. @@ -7620,50 +7715,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ മൈൽ/ഗാ. ഇംപീ. - {0} mpg Imp. - {0} mpg Imp. - - - {0} PB - {0} PB - - - ടെ.ബൈറ്റ് - {0} TB - {0} TB - - - ടെ.ബിറ്റ് - {0} Tb - {0} Tb - - - ജി.ബൈറ്റ് - {0} GB - {0} GB - - - ജി.ബിറ്റ് - - - മെ.ബൈറ്റ് - {0} MB - {0} MB - - - മെ.ബിറ്റ് - {0} Mb - {0} Mb - - - കി.ബൈറ്റ് - {0} kB - {0} kB - - - കി.ബിറ്റ് - {0} kb - {0} kb ബൈറ്റ് @@ -7672,8 +7723,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ബിറ്റ് - {0} ബിറ്റ് - {0} ബിറ്റ് + {0} bit + {0} bit നൂ. @@ -7716,46 +7767,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/ദി. - മണിക്കൂർ - {0} മ - {0} മ - {0}/മ. + {0} hr + {0} hr - മി. - {0} മി. - {0} മി. - {0}/മി. + {0} min + {0} min - സെക്കൻഡ് - {0} സെ. - {0} സെ. - {0}/സെ. + {0} sec + {0} sec - മില്ലിസെക്കൻഡ് - {0} മി.സെ. - {0} മി.സെ. + {0} ms + {0} ms - μ.സെ. - {0} μ.സെ. - {0} μ.സെ. + μsec + {0} μs + {0} μs - നാനോസെക്കൻഡ് - {0} നാ.സെ. - {0} നാ.സെ. - - - {0} A - {0} A + {0} ns + {0} ns മില്ലിആമ്പിയർ - {0} mA - {0} mA ഓം @@ -7764,37 +7801,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ വോൾട്ട് - കി.കലോ. - {0} കി.കലോ. - {0} കി.കലോ. + {0} kcal + {0} kcal - കലോ. - {0} കലോ. - {0} കലോ. + {0} cal + {0} cal - കലോ. - {0} കലോ. - {0} കലോ. + Cal + {0} Cal + {0} Cal - കി.ജൂ. - {0} കി.ജൂ. - {0} കി.ജൂ. + {0} kJ + {0} kJ ജൂൾ - {0} ജൂ. - {0} ജൂ. + {0} J + {0} J - കി.വാ/മ. - {0} കി.വാ/മ. - {0} കി.വാ/മ. - - - ഇലക്ട്രോൺവോൾട്ട് + {0} kWh + {0} kWh BTU @@ -7810,22 +7840,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ന്യൂട്ടൻ - - {0} GHz - {0} GHz - - - {0} MHz - {0} MHz - - - {0} kHz - {0} kHz - - - {0} Hz - {0} Hz - dpcm {0}dpcm @@ -7842,84 +7856,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഡോട്ട്സ് - കി.മീ. - {0} കി.മീ. - {0} കി.മീ. - {0}/കി.മീ. + {0} km + {0} km - മീറ്റർ - {0} മീ. - {0} മീ. - {0}/മീ. + m + {0} m + {0} m - ഡെ.മീ. - {0} ഡെ.മീ. - {0} ഡെ.മീ + {0} dm + {0} dm - സെ.മീ. - {0} സെ.മീ. - {0} സെ.മീ. - {0}/സെ.മീ. + {0} cm + {0} cm - മില്ലീമീറ്റർ - {0} മി.മീ. - {0} മി.മീ. + {0} mm + {0} mm - μമീറ്റർ - μമീ. - {0} μമീ. + {0} μm + {0} μm - നാ.മീ. - {0} നാ.മീ. - {0} നാ.മീ. + {0} nm + {0} nm - പൈ.മീ. - {0} പൈ.മീ. - {0} പൈ.മീ. + {0} pm + {0} pm മൈൽ - {0} മൈൽ - {0} മൈൽ + {0} mi + {0} mi - വാര - {0} വാര - {0} വാര + യാർഡ് + {0} yd + {0} yd അടി - {0} അടി - {0} അടി - {0}/അടി + {0} ft + {0} ft ഇഞ്ച് - {0} ഇഞ്ച് - {0} ഇഞ്ച് - {0}/ഇഞ്ച് + {0} in + {0} in പാർസെക് - {0} പാ.സെ. - {0} പാ.സെ. + {0} pc + {0} pc പ്രകാശവർഷം - {0} പ്ര.വ. - {0} പ്ര.വ. + {0} ly + {0} ly - ജ്യോ.യൂ. - {0} ജ്യോ.യൂ. - {0} ജ്യോ.യൂ. + {0} au + {0} au ഫർലോങ് @@ -7932,59 +7933,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഫാ. - നോ.മൈ. - {0} നോ.മൈ. - {0} നോ.മൈ. + {0} nmi + {0} nmi - സ്.മൈ. - {0} സ്.മൈ. - {0} സ്.മൈ. + {0} smi + {0} smi - പോയിന്റ് - {0} പോ. - {0} പോ. + {0} pt + {0} pt ലക്സ് - {0} lx - {0} lx സോളാർ ലുമിനോസിറ്റീസ് - ട. - {0} ട. - {0} ട. + {0} t + {0} t - കി.ഗ്രാം - {0} കി.ഗ്രാം - {0} കി.ഗ്രാം - {0}/കി.ഗ്രാം + {0} kg + {0} kg ഗ്രാം - {0} ഗ്രാം - {0} ഗ്രാം - {0}/ഗ്രാം + {0} g + {0} g - മി.ഗ്രാം. - {0} മി.ഗ്രാം. - {0} മി.ഗ്രാം. + {0} mg + {0} mg - μ.ഗ്രാം. - {0} μ.ഗ്രാം. - {0} μ.ഗ്രാം. + {0} μg + {0} μg ടൺ - {0} ടൺ - {0} ടൺ + {0} tn + {0} tn സ്റ്റോൺ @@ -7993,28 +7983,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ പൗണ്ട് - {0} പൗ - {0} പൗ - {0}/പൗ. + {0} lb + {0} lb - ഔ. - {0} ഔ. - {0} ഔ. - {0}/ഔ. + {0} oz + {0} oz - ട്രോ.ഔ. - {0} ട്രോ.ഔ. - {0} ട്രോ.ഔ. + {0} oz t + {0} oz t കാരറ്റ് - ഡാൽട്ടണുകൾ - {0} Da - {0} Da + ഡാൽട്ടൺ ഭൂപിണ്ഡം @@ -8028,34 +8012,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} gr - ഗി.വാ. - {0} ഗി.വാ. - {0} ഗി.വാ. + {0} GW + {0} GW - മെ.വാ. - {0} മെ.വാ. - {0} മെ.വാ. + {0} MW + {0} MW - കി.വാ. - {0} കി.വാ. - {0} കി.വാ. + {0} kW + {0} kW - വാട്ട് - {0} വാ. - {0} വാ. + W + {0} W + {0} W - മി.വാ. - {0} മി.വാ. - {0} മി.വാ. + {0} mW + {0} mW - എച്ച്.പി. - {0} എച്ച്.പി. - {0} എച്ച്.പി. + {0} hp + {0} hp mmHg @@ -8063,194 +8042,152 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mmHg - പിഎസ്ഐ - {0} പിഎസ്ഐ - {0} പിഎസ്ഐ - - - {0} inHg - {0} inHg + {0} psi + {0} psi - ബാർ - {0} ബാർ - {0} ബാർ + {0} bar + {0} bar - മി.ബാ - {0} മി.ബാ - {0} മി.ബാ - - - {0} Pa - {0} Pa - - - {0} hPa - {0} hPa + {0} mbar + {0} mbar - കി.മീ/മ. - {0} കി.മീ/മ. - {0} കി.മീ/മ. + {0} km/h + {0} km/h - മീറ്റർ/സെ. - {0} മീ/സെ. - {0} മീ/സെ. + {0} m/s + {0} m/s - മൈൽ/മ. - {0} മൈ/മ. - {0} മൈ/മ. + {0} mph + {0} mph - നോട്ട് - {0} നോട്ട് - {0} നോട്ട് + {0} kn + {0} kn - ഡിഗ്രി.സെ. - {0}°സെ - {0}°സെ + {0}°C + {0}°C - ഡിഗ്രി.ഫാ. - {0}° ഫാ - {0}°ഫാ + {0}°F + {0}°F - കി.മീ³ - {0} കി.മീ³ - {0} കി.മീ³ + {0} km³ + {0} km³ - മീ³ - {0} മീ³ - {0} മീ³ - {0}/മീ³ + {0} m³ + {0} m³ - സെ.മീ³ - {0} സെ.മീ³ - {0} സെ.മീ³ - {0}/സെ.മീ³ + {0} cm³ + {0} cm³ - മൈ³ - {0} മൈ³ - {0} മൈ³ + {0} mi³ + {0} mi³ - വാര³ - {0} വാ³ - {0} വാ³ + {0} yd³ + {0} yd³ - അടി³ - {0} അടി³ - {0} അടി³ + {0} ft³ + {0} ft³ - ഇഞ്ച്³ - {0} ഇഞ്ച്³ - {0} ഇഞ്ച്³ + {0} in³ + {0} in³ - മെ.ലി. - {0} മെ.ലി. - {0} മെ.ലി. + {0} ML + {0} ML - ഹെ.ലി. - {0} ഹെ.ലി. - {0} ഹെ.ലി. + {0} hL + {0} hL ലിറ്റർ - {0} ലി. - {0} ലി. - {0}/ലി. + {0} L + {0} L + {0}/L - ഡെ.ലി. - {0} ഡെ.ലി. - {0} ഡെ.ലി. + {0} dL + {0} dL - സെ.ലി. - {0} സെ.ലി. - {0} സെ.ലി. + {0} cL + {0} cL - മി.ലി. - {0} മി.ലി. - {0} മി.ലി. + {0} mL + {0} mL - മെ. പൈ. - {0} മെ. പൈ. - {0} മെ. പൈ. + {0} mpt + {0} mpt - മെ. ക. - {0} മെ. ക. - {0} മെ. ക. + {0} mc + {0} mc - ഫ്ലൂ ഔ മെ. - {0} ഫ്ലൂ ഔ മെ. - {0} ഫ്ലൂ ഔ മെ. + {0} fl oz m. + {0} fl oz m. - ഏ. അടി - {0} ഏ. അടി - {0} ഏ. അടി + {0} ac ft + {0} ac ft - ഗാ. - {0} ഗാ. - {0} ഗാ. - {0}/ഗാ. + gal + {0} gal + {0} gal - ഇംപീ. ഗാലൺ - {0} ഗാ. ഇംപീ. - {0} ഗാ. ഇംപീ. - {0}/ഗാ. ഇംപീ. + {0} gal Imp. + {0} gal Imp. + {0}/galImp - ക്വാ. - {0} ക്വാ. - {0} ക്വാ. + {0} qt + {0} qt പൈ. - {0} പൈ. - {0} പൈ. + {0} pt + {0} pt കപ്പ് - {0} കപ്പ് - {0} കപ്പ് + {0} c + {0} c - ഫ്ലൂ. ഔ. - {0} ഫ്ലൂ. ഔ. - {0} ഫ്ലൂ. ഔ. + fl oz + {0} fl oz + {0} fl oz - ടേ.സ്‌പൂ. - {0} ടേ.സ്‌പൂ. - {0} ടേ.സ്‌പൂ. + Tbsp + {0} Tbsp + {0} Tbsp - ടീ.സ്‌പൂ. - {0} ടീ.സ്‌പൂ. - {0} ടീ.സ്‌പൂ. + {0} tsp + {0} tsp - - ബാരൽ + + {0} dsp + {0} dsp തുള്ളി @@ -8264,8 +8201,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ നുള്ള് - {0} നുള്ള് - {0} നുള്ള് + {0} pn + {0} pn cal-IT @@ -8276,9 +8213,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} പ്രകാശ - പാർട്ട്സ്/ബില്ല്യൺ - {0} പി.പി.ബി. - {0} പി.പി.ബി. + {0} ppb + {0} ppb രാത്രികൾ @@ -8295,13 +8231,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + {0}G + {0}Gs + - മീ/സെ² - {0}മീ/സെ² - {0}മീ/സെ² + m/s² + {0}m/s² + {0}m/s² - rev {0}rev {0}rev @@ -8310,37 +8249,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}rad {0}rad + + {0}° + {0}° + + arcmin {0}′ {0}′ + arcsec {0}″ {0}″ - {0} ച.കിമീ - {0} ച.കിമീ + km² + {0}km² + {0}km² + {0}/km² - {0} ഹെ - {0} ഹെ + ha + {0}ha + {0}ha - {0} ച.മീ - {0} ച.മീ + m² + {0}m² + {0}m² + {0}/m² + + + cm² + {0}cm² + {0}cm² + {0}/cm² - {0} ച.മൈ - {0} ച.മൈ + mi² + {0}mi² + {0}mi² + {0}/mi² - {0} ഏ - {0} ഏക്ക + {0}ac + {0}ac + + + yd² + {0}yd² + {0}yd² - {0} ച. അടി - {0} ച.അടി + ft² + {0}ft² + {0}ft² + + + in² + {0}in² + {0}in² + {0}/in² ദുനം @@ -8349,27 +8319,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}kt {0}kt + + mg/dL + {0}mg/dL + {0}mg/dL + + + mmol/L + {0}mmol/L + {0}mmol/L + - പാർട്ട് {0} പാർട്ട് {0} പാർട്ട് - പാർട്ട്സ്/മില്ല്യൺ + ppm + {0}ppm + {0}ppm ‱ - - Glc + + {0}mol + {0}mol + + + L/km + {0}L/km + {0}L/km - {0}ലി/100കി.മീ. - {0}ലി/100കി.മീ + L/100km + {0}L/100km + {0}L/100km mpg - {0} mpg + {0}mpg {0} mpg @@ -8378,7 +8366,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}m/gUK - PB {0}PB {0}PB @@ -8409,8 +8396,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mb - {0} Mb - {0} Mb kB @@ -8427,6 +8412,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}B {0}B + + {0}bit + {0}bit + ദശാബ്‌ദം {0}ദശാ. @@ -8446,17 +8435,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ദി {0} ദി + + h + {0}h + {0}h + {0}/h + + + min + {0}m + {0}m + {0}/min + - സെ. + s + {0}s + {0}s + {0}/s - മി.സെ. + msec + {0}ms + {0}ms + + + μsec + {0}μs + {0}μs - നാ.സെ. + ns + {0}ns + {0}ns - amp {0}A {0}A @@ -8469,6 +8481,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}Ω {0}Ω + + kcal + {0}kcal + {0}kcal + + + cal + {0}cal + {0}cal + + + Cal + {0}Cal + {0}Cal + + + kJ + {0}kJ + {0}kJ + + + {0}J + {0}J + + + kWh + {0}kWh + {0}kWh + + + eV + lbf {0}lbf @@ -8478,22 +8522,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ N - GHz {0}GHz {0}GHz - - MHz - {0} MHz - {0} MHz - - kHz {0}kHz {0}kHz - Hz {0}Hz {0}Hz @@ -8502,42 +8538,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ഡോട്ട് {0} ഡോട്ട് + + km + {0}km + {0}km + {0}/km + + + m + {0}m + {0}m + {0}/m + + + dm + {0}dm + {0}dm + + + cm + {0}cm + {0}cm + {0}/cm + - മി.മീ. + mm + {0}mm + {0}mm - μമീ. - {0}μമീ. - {0}μമീ. + μm + {0}μm + {0}μm + + + nm + {0}nm + {0}nm - {0} പൈ.മീ - {0} പൈ.മീ + pm + {0}pm + {0}pm - {0} മൈ - {0} മൈ + mi + {0} mi + {0}mi - {0} യാ - {0} യാ + yd + {0} yd + {0} yd + ft {0}′ {0}′ + {0}/ft + in {0}″ {0}″ + {0}/in + + + {0}pc + {0}pc - പ്ര.വ. - {0} പ്ര.വ - {0} പ്ര.വ + ly + {0}ly + {0}ly - {0}ജ്യോ.യൂ - {0}ജ്യോ.യൂ + au + {0}au + {0}au {0}ഫർ. @@ -8548,17 +8626,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ഫാ. - {0}ന.മൈ. - {0}ന.മൈ. + nmi + {0}nmi + {0}nmi - {0}സ്.മൈ. - {0}സ്.മൈ. + smi + {0}smi + {0}smi - പോ. - {0}പോ. - {0}പോ. + pt + {0}pt + {0}pt {0}lx @@ -8578,42 +8658,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}L☉ - {0}ട. - {0}ട. + t + {0}t + {0}t - {0}കി.ഗ്രാം - {0}കി.ഗ്രാം + kg + {0}kg + {0}kg + {0}/kg + + + {0}g + {0}g + {0}/g - {0}മി.ഗ്രാം. - {0}മി.ഗ്രാം. + mg + {0}mg + {0}mg - {0}μ.ഗ്രാം. - {0}μ.ഗ്രാം. + μg + {0}μg + {0}μg - {0}ടൺ - {0}ടൺ + {0}tn + {0}tn {0}സ്റ്റോ. {0}സ്റ്റോ. - പൗ + lb + {0}# + {0}# + {0}/lb - {0} ഔ - {0} ഔ + oz + {0}oz + {0}oz + {0}/oz + + + oz t + {0}oz t + {0}oz t {0}CD {0}CD - ഡാ. + Da {0}Da {0}Da @@ -8626,43 +8726,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ grain + + GW + {0}GW + {0}GW + + + MW + {0}MW + {0}MW + + kW {0}kW {0}kW - {0} വാ - {0} വാ + W + {0}W + {0}W + + + mW + {0}mW + {0}mW + + + hp + {0}hp + {0}hp - mmHg {0}mmHg {0}mmHg + + psi + {0}psi + {0}psi + ″ Hg - {0}" Hg - {0}" Hg + {0}″ Hg + {0}″ Hg - {0} ബാർ - {0}ബാർ + bar + {0}bar + {0}bar - {0} മിബാ - {0} മിബാ + mbar + {0}mb + {0}mb {0}atm {0}atm - Pa {0}Pa {0}Pa - hPa {0}hPa {0}hPa @@ -8675,30 +8801,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}MPa - {0}കി.മീ/മ. - {0}കി.മീ/മ. + km/h + {0}km/h + {0}km/h - മീ/സെ. - {0} മീ/സെ - {0} മീ/സെ + m/s + {0}m/s + {0}m/s - മൈ/മ. - {0} മൈ/മ - {0} മൈ/മ + mi/hr + {0}mph + {0}mph - {0}നോട്ട് - {0}നോട്ട് + kn + {0}kn + {0}kn - °സെ + °C + {0}°C + {0}°C - °ഫാ - {0}°ഫാ - {0}°ഫാ + °F + {0}°F + {0}°F {0}K @@ -8709,22 +8839,145 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}lbf⋅ft - {0} കിമീ³ - {0} കിമീ³ + km³ + {0}km³ + {0}km³ + + + m³ + {0}m³ + {0}m³ + {0}/m³ + + + cm³ + {0}cm³ + {0}cm³ + {0}/cm³ + + + mi³ + {0}mi³ + {0}mi³ + + + yd³ + {0}yd³ + {0}yd³ + + + ft³ + {0}ft³ + {0}ft³ + + + in³ + {0}in³ + {0}in³ + + + ML + {0}ML + {0}ML + + + hL + {0}hL + {0}hL + + + {0}L + {0}L + {0}/L + + + dL + {0}dL + {0}dL + + + cL + {0}cL + {0}cL + + + mL + {0}mL + {0}mL + + + pt + {0}mpt + {0}mpt + + + mcup + {0}mc + {0}mc - ഫ്ലൂ ഔ മെ. - {0} ഫ്ലൂ ഔ മെ. - {0} ഫ്ലൂ ഔ മെ. + fl oz m. + {0} fl oz m. + {0} fl oz m. + + + ac ft + {0}ac ft + {0}ac ft {0} പറ {0} bu + + gal + {0}gal + {0}gal + {0}/gal + + + Imp gal + {0}gal-Im + {0}gal-Im + {0}/galIm + + + qt + {0}qt + {0}qt + + + pt + {0}pt + {0}pt + + + {0}c + {0}c + + + fl oz + {0}fl oz + {0}fl oz + + Imp fl oz {0}fl oz Im {0}fl oz Im + + Tbsp + {0}Tbsp + {0}Tbsp + + + tsp + {0}tsp + {0}tsp + + + bbl + dsp {0}dsp @@ -8745,18 +8998,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}fl.dr. {0}fl.dr. - - cal-IT + + pn + {0}pn + {0}pn - പ്രകാശം {0}പ്രകാശ {0}പ്രകാശ - പി.പി.ബി. - {0}പി.പി.ബി. - {0}പി.പി.ബി. + ppb + {0}ppb + {0}ppb {0}രാത്രി @@ -8775,22 +9029,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}, അല്ലെങ്കിൽ {1} {0} അല്ലെങ്കിൽ {1} - - {0}, {1} - - - {0}, {1} - {0}, {1} - {0} {1} {0} {1} {0} {1} - - {0}, {1} - {0}, {1} - diff --git a/make/data/cldr/common/main/mn.xml b/make/data/cldr/common/main/mn.xml index ce87ab47a009..d6ce9931f537 100644 --- a/make/data/cldr/common/main/mn.xml +++ b/make/data/cldr/common/main/mn.xml @@ -332,6 +332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ нигерийн пиджин пижин польш + пьемонт малесит-пассамакводди прусс пушту @@ -973,15 +974,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ цаглавар мөнгөн тэмдэгтийн хэлбэр + Тэмдэгтүүдийг алгасаж эрэмбэлэх + Өргөлтийг урвуугаар эрэмбэлэх + Том/жижиг үсгийн дараалал + Том, жижиг үсгийг ялгаж эрэмбэлэх эрэмбэлэх дараалал + Стандартчилж эрэмбэлэх + Тоон утгаар эрэмбэлэх + Бичиглэл/Блокийн дарааллыг өөрчлөх + Эрэмбэлэх нарийвчлал мөнгөн тэмдэгт + Хувиргах байршил + Толь бичгийн үг таслах дүрэмд үл хамаарах зүйлс Эможи үзүүлэн + Долоо хоногийн эхний өдөр + Холимог цагийн мөчлөг (12 эсвэл 24) + Оролтын арга + Гар + Хамгийн дээд түвшний алгасах тэмдэгт мөрийн зайн загвар үг хоорондын мөрийн зай + Хувиргах дүрэм нэгжийн систем + Хэмжих нэгж тоо + Нэмэлт өгөгдлийн муж + Хувиргах эх сурвалж + Дэд бүс Товчилсон үгийн дараа өгүүлбэр таслах + Хувиргах + Машинаар орчуулсан + Цагийн бүс + Хэлний тохиргооны хувилбар + Хувийн хэрэгцээний + Хувийн хэрэгцээний хувиргалт буддын цаглавар @@ -1001,15 +1028,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ еврей цаглавар еврей энэтхэгийн үндэсний цаглавар + энэтхэгийн үндэсний цаглавар исламын цаглавар исламын исламын цаглавар (хүснэгт, иргэний эрин үе) исламын (хүснэгт, иргэний эрин үе) исламийн цаглавар (саудын араб, газарзүйн) + исламын (Саудын Арабын шинэ сар харах арга) исламийн цаглавар (хүснэгтэн, одон орны эрин) + исламын (хүснэгт, одон орны тооцоолол) исламын цаглавар (Umm al-Qura) исламын (Umm al-Qura) - ISO-8601 цаглавар + Григорийн цаглавар (ISO 8601 долоо хоног) + Григорийн япон цаглавар японы перс цаглавар @@ -1020,25 +1051,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Нягтлан бодох бүртгэл мөнгөн тэмдэгтийн стандарт хэлбэр Стандарт + Жижиг үсгээр эхлэх + Жижиг үсгээр эхлэх + Том үсгээр эхлэх Нийцлийн үүднээс өмнөх эрэмбэлэх дараалал + Зохицол Тольны эрэмбэлэх дараалал + Толь бичиг юникодын үндсэн эрэмбэлэх дараалал өгөгдмөл юникод Эможи эрэмбэлэх дараалал + эможи Европийн эрэмбэлэх дүрэм + Европын стандарт дүрэм Утасны дэвтрийн эрэмбэлэх дараалал + Утасны жагсаалт + Авианы Пиньян эрэмбэлэх дараалал + Пиньинь ерөнхий хайлт хайлт Хангүлээр эхний гийгүүлэгчээр хайх + Солонгос хэлний эхний гийгүүлэгч стандарт эрэмбэлэх дараалал стандарт + Зуулт Хуучин эрэмбэлэх дараалал + Уламжлалт Язгуурын зураасны эрэмбэлэх дараалал + Түлхүүр үсэг ба зураасны тоо Жүяин эрэмбэлэх дараалал + Жуинь + Мөнгөн тэмдэгт + Цифр + Цэг + Сул зай + Тусгай тэмдэгт + Бүгд + Зөвхөн үндсэн үсгээр + Үндсэн үсэг, өргөлт, том/жижиг, хувилбарууд, кана + Үндсэн үсэг, өргөлт + Үндсэн үсэг, өргөлт, том/жижиг, хувилбарууд + Бүтэн хэмжээст рүү + Хагас хэмжээст рүү Өгөгдмөл Эможи Текст + 12 цагийн систем + 12 + 24 цагийн систем + 24 12 цагийн систем (0–11) 12 (0–11) 12 цагийн систем (1–12) @@ -1047,6 +1109,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 цагийн систем (1–24) 24 (1–24) + Сул зай, цэг, бүх тэмдэгтийг шилжүүлэх + Сул зай, цэг шилжүүлэх + Сул зай, цэг шилжүүлэх + Сул зай, цэг, валютын бус тэмдэгтүүдийг шилжүүлэх урт мөрийн зайн загвар урт энгийн мөрийн зайн загвар @@ -1057,6 +1123,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бүгдийг хадгалах Хэвийн Үг хэллэгээр хадгалах + АНУ-ын BGN стандарт галигчлал + НҮБ-ын GEGN стандарт галигчлал метрийн систем метрийн Англи нэгжийн систем @@ -1066,8 +1134,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ахом тоо араб-энэтхэг тоо өргөтгөсөн араб-энэтхэг тоо + өргөтгөсөн араб-энэтхэг армен тоо жижиг армен тоо + жижиг армен үсэг Бали тоо бенгал тоо Брахми тоо @@ -1077,57 +1147,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ деванагари тоо Дивэс Акүрү Тоо этиоп тоо + Санхүүгийн бүтэн-өргөнтэй тоо + Бүтэн өргөн гүрж тоо Гунжала Гонди тоо Масарам Гонди тоо грек тоо жижиг грек тоо + Жижиг грек үсэг гүжарати тоо гүрмүхи тоо + Уламжлалт цаглаварын сарын өдрийн ханз үсгийн дугаарлалт хятад аравтын тоо + Ханз үсгийг цифр болгон ашиглах байрлалт аравтын систем хялбаршуулсан хятад тоо хялбаршуулсан хятад санхүүгийн тоо + Хялбаршуулсан хятад санхүүгийн уламжлалт хятад тоо уламжлалт хятад санхүүгийн тоо + уламжлалт хятад санхүүгийн еврей тоо Пахав Хмонг тоо Няакенг Пуачэ Хмонг тоо жава тоо япон тоо япон санхүүгийн тоо + Японы санхүүгийн + Японы эриний эхний жилийг Ганнэнээр тэмдэглэх хэлбэр Каяа Ли тоо Кави тоо кхмер тоо каннада тоо Тай Там Хора тоо Тай Там Там тоо + Тай Там Там бичиг (шашны хэлбэр) лаос тоо араб тоо Лепча тоо Лимбу тоо Математикийн бүдүүн тоо + Математикийн тод хэв Математикийн хос зурлагат тоо + Математикийн давхар зураастай хэв Математикийн Monospace тоо + Математикийн ижил зайтай хэв Математикийн Sans-Serif Бүдүүн тоо + Математикийн шулуун тод хэв Математикийн Sans-Serif тоо + Математикийн шулуун хэв малаялам тоо Моди тоо монгол тоо Мро тоо мейтей маек тоо мьянмар тоо + Мьянмарын Зүүн Пво Карен хэл + Мьянмарын Па-О хэл Мьянмар Шан тоо + Мьянмарын Шан хэл Мьянмар Тай Лайнг тоо + Мьянмарын Тай Лаинг хэл Наг Мундари тоо + Үндэсний тоо + Үндэсний тоо N’Ko тоо ол чики тоо ория тоо Османи тоо + Хүрээлсэн хэв Ханифи Рохинж тоо ром тоо + Ром том тоо жижиг ром тоо + Ром жижиг тоо Саураштра тоо + Хэсэгчилсэн Шарада тоо Күдавади тоо Синхала Лит тоо @@ -1137,17 +1232,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Шинэ тай луэ тоо уламжлалт тамил тоо тамил тоо + Орчин үеийн Тамил хэл тэлүгү тоо тай тоо төвд тоо Тирхута тоо Тангса тоо + Уламжлалт тоо вай тоо Варанг сити тоо Ванчо тоо Унтраалттай Асаалттай + Тодорхойгүй машины орчуулга + POSIX хувилбар + + Унтраалттай + Асаалттай + метрийн систем ИБ @@ -1214,7 +1317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y 'оны' MMMM'ын' d. cccc 'гараг' - GyMMMMccccd + GyMMMMEEEEd @@ -1295,6 +1398,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y 'оны' QQQQ + + {0}–{1} + {0} – {1} d – d @@ -1339,6 +1445,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMMM/d E – MMMMM/d E MMMMM/d E – MMMMM/d E + + MM-'р' 'сарын' d–d + MM-'р' 'сарын' d – MM-'р' 'сарын' d + GGGGG y 'оны' MMMMM–MMMMM 'сар' GGGGG y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар' @@ -1574,6 +1684,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1608,6 +1721,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y 'оны' MMM G y 'оны' MMM'ын' d G y 'оны' MMM'ын' d. E + G y 'оны' MMMM + G y 'оны' MMMM'ын' d + G y 'оны' MMMM'ын' d, E h 'ц' a HH 'ц' h:mm a @@ -1623,6 +1739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM'ын' d MMM'ын' d. E MMMM'ын' d + MMMM'ын' d, E MMMM'ын' W-'р' 'долоо' 'хоног' MMMM'ын' W-'р' 'долоо' 'хоног' y MMMMM @@ -1632,15 +1749,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y 'оны' MMM'ын' d y 'оны' MMM'ын' d. E y 'оны' MMMM + y 'оны' MMMM'ын' d + y 'оны' MMMM'ын' d, E y 'оны' QQQ y 'оны' QQQQ Y 'оны' w-'р' 'долоо' 'хоног' Y 'оны' w-'р' 'долоо' 'хоног' + {0}, {1} + {0}, {1} {0} ({1}) + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} d – d @@ -1702,6 +1828,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMMM/d E – MMMMM/d E MMMMM/d E – MMMMM/d E + + MMMM'ын' d–d + MMMM'ын' d – MMMM'ын' d + y – y @@ -2587,9 +2717,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либревиль - - Британийн зуны цаг - Лондон @@ -2680,9 +2807,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Жайпур - - Ирландын стандарт цаг - Дублин @@ -3378,6 +3502,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Хараре + + + Акрийн цаг + Акрийн стандарт цаг + Акрийн зуны цаг + + Афганистаны цаг @@ -3553,6 +3684,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бразилийн зуны цаг + + + Британийн цаг + Британийн зуны цаг + + Бруней Даруссаламын цаг @@ -3726,6 +3863,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Гринвичийн цаг + + + Гренландын цаг + Гренландын стандарт цаг + Гренландын зуны цаг + + Зүүн Гренландын цаг @@ -3752,7 +3896,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Хавай-Алеутын стандарт цаг + Хавайн цаг @@ -3813,6 +3957,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ираны зуны цаг + + + Ирландын цаг + Ирландын стандарт цаг + + Эрхүүгийн цаг @@ -3834,6 +3984,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Японы зуны цаг + + + Камчаткын цаг + Камчаткын стандарт цаг + Камчаткын зуны цаг + + Казахстаны цаг @@ -4096,11 +4253,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сахалины зуны цаг + + + Самарын цаг + Самарын стандарт цаг + Самарын зуны цаг + + - Самоагийн цаг Самоагийн стандарт цаг - Самоагийн зуны цаг @@ -4167,6 +4329,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Чүүкийн цаг + + + Туркийн цаг + Туркийн стандарт цаг + Туркийн зуны цаг + + Туркменистаны цаг @@ -4186,6 +4355,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Уругвайн зуны цаг + + + Өрөмчийн цаг + + Узбекистаны цаг @@ -4291,11 +4465,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 0 мян'.' + 0 мян 0 мян - 00 мян'.' + 00 мян 00 мян - 000 мян'.' + 000 мян 000 мян 0 сая 0 сая @@ -4307,14 +4481,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 тэрбум 00 тэрбум 00 тэрбум - 000Т - 000Т - 0ИН - 0ИН - 00ИН - 00ИН - 000ИН - 000ИН + 000 т'.'бум + 000 т'.'бум + 0 их наяд + 0 их наяд + 00 и'.'наяд + 00 и'.'наяд + 000 их наяд + 000 их наяд @@ -4561,30 +4735,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ¤ 0 мян'.' - ¤ 0 мян - ¤ 00 мян'.' - ¤ 00 мян - ¤ 000 мян'.' - ¤ 000 мян - ¤ 0 сая - ¤ 0 сая - ¤ 00 сая - ¤ 00 сая - ¤ 000 сая - ¤ 000 сая - ¤ 0 тэрбум - ¤ 0 тэрбум - ¤ 00 тэрбум - ¤ 00 тэрбум - ¤ 000Т - ¤ 000Т - ¤ 0ИН - ¤ 0ИН - ¤ 00ИН - ¤ 00ИН - ¤ 000ИН + 0 мян ¤ + 0 мян ¤ + 00 мян ¤ + 00 мян ¤ + 000 мян ¤ + 000 мян ¤ + 0 сая ¤ + 0 сая ¤ + 00 сая ¤ + 00 сая ¤ + 000 сая ¤ + 000 сая ¤ + 0 тэрбум ¤ + 0 тэрбум ¤ + 00 тэрбум ¤ + 00 тэрбум ¤ + 000 тэрбум ¤ + 000 тэрбум ¤ + 0 их наяд ¤ + 0 их наяд ¤ + 00 их наяд ¤ + 00 их наяд ¤ + 000 их наяд ¤ + 000 их наяд ¤ ¤ 000ИН + 000 их наяд ¤ @@ -4623,9 +4799,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ¤ #,##0.00 - ¤ #,##0.00 #,##0.00 @@ -5328,8 +5501,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Карибын гулдер - Карибын гулдер - Карибын гулдер Баруун Африкийн франк @@ -5356,8 +5527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Зимбабвегийн гоулд - Зимбабвегийн гоулд - Зимбабвегийн гоулд @@ -6232,11 +6401,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} вебер {0} вебер - - гэрэл - {0} гэрэл - {0} гэрэл - мкг/кг {0} мкг/кг @@ -7280,9 +7444,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - л/км @@ -7425,25 +7586,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} аяга {0} аяга - - кат - {0} кат - {0} кат - - - кал-IT - {0} кал-IT - {0} кал-IT - - - {0} kgf - {0} kgf - - - гэрэл - {0} гэрэл - {0} гэрэл - мкг/кг {0} мкг/кг diff --git a/make/data/cldr/common/main/mn_Mong.xml b/make/data/cldr/common/main/mn_Mong.xml deleted file mode 100644 index 34588eadb3c8..000000000000 --- a/make/data/cldr/common/main/mn_Mong.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - ᠪᠷᠠᠽᠢᠯ - ᠬᠢᠳᠠᠳ - ᠭᠧᠷᠮᠠᠨ - ᠫᠷᠠᠨ᠋᠋ᠼᠠ - ᠶᠡᠺᠡ ᠪᠷᠢᠲ᠋ᠠᠨᠢ - ᠡᠨᠡᠳᠬᠡᠭ᠌ - ᠢᠲ᠋ᠠᠯᠢ - ᠶᠠᠫᠣᠨ - ᠮᠣᠩᠭᠣᠯ - ᠣᠷᠣᠰ - ᠠᠮᠸᠷᠢᠻᠠ ᠎ᠢᠢᠨ ᠨᠢᠭᠡᠳᠥᠭᠰᠡᠠ ᠡᠣᠯᠣᠰ - ᠳᠣᠳᠣᠷᠬᠠᠢ ᠥᠭᠡᠢ ᠪᠥᠰᠠ - - - ᠭᠸᠷᠸᠭᠣᠷᠢ ᠢᠨ ᠬᠣᠸᠠᠩᠯᠢ - ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠡᠷᠡᠮᠪᠡᠯᠡᠬᠥ ᠳᠠᠷᠠᠭᠠᠯᠠᠯ - ᠠᠷᠠᠪ ᠲᠣᠭ᠎ᠠ - ᠮᠣᠩᠭᠣᠯ ᠲᠣᠭ᠎ᠠ - - - ᠮᠧᠲ᠋ᠷ ᠦᠨ - ᠢ᠂ ᠪ - ᠠ᠂ ᠨ᠂ ᠣ - - - ᠺᠡᠯᠠ᠄ {0} - ᠪᠢᠴᠢᠭ᠌: {0} - ᠮᠣᠵᠢ᠄ {0} - - - - - - - - - y ᠤᠨ ᠣ MM ᠰᠠᠷ ᠠ ᠢᠢᠨ dd - yMMdd - - - - - y ᠣᠨ ᠎ᠤ MM ᠰᠠᠷ᠎ᠠ ᠎ᠢᠢᠨ dd - yMMdd - - - - - y MM d - yMMd - - - - - y-MM-dd - yMMdd - - - - - - {0} - {1} - - - - - - - - 1 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 2 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 3᠊ᠷ ᠰᠠᠷ᠎ᠠ - 4 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 5 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 6 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 7 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 8᠊ᠷ ᠰᠠᠷ᠎ᠠ - 9 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 10 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 11 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 12 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - - - ᠨᠢᠭᠡᠳᠥᠭᠡᠷ ᠰᠠᠷ᠎ᠠ - ᠬᠣᠶᠠᠳᠣᠭᠠᠷ ᠰᠠᠷ ᠠ - ᠭᠣᠷᠪᠡᠳᠣᠭᠠᠷ ᠰᠠᠷ ᠠ - ᠳᠥᠷᠪᠡᠳᠥᠭᠡᠷ ᠰᠠᠷ᠎ᠠ - ᠲᠠᠪᠣᠳᠣᠭᠠᠷ ᠰᠠᠷ ᠠ - ᠵᠢᠷᠭᠣᠭᠠᠳᠣᠭᠠᠷ ᠰᠠᠷ᠎ᠠ - ᠲᠣᠯᠣᠭᠠᠳᠣᠭᠠᠷ ᠰᠠᠷ᠎ᠠ - ᠨᠠᠢᠮᠠᠳᠥᠭᠠᠷ ᠰᠠᠷ᠎ᠠ - ᠶᠢᠰᠥᠳᠥᠭᠡᠷ ᠰᠠᠷ᠎ᠠ - ᠠᠷᠪᠠᠳᠣᠭᠠᠷ ᠰᠠᠷ᠎ᠠ - ᠠᠷᠪᠠᠨ ᠨᠢᠭᠡᠳᠥᠭᠡᠷ ᠰᠠᠷ᠎ᠠ - ᠠᠷᠪᠠᠨ ᠬᠣᠶᠠᠳᠣᠭᠠᠷ ᠰᠠᠷ᠎ᠠ - - - - - 1 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 2 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 3᠊ᠷ ᠰᠠᠷ᠎ᠠ - 4 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 5 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 6 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 7 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 8 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 9 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 10 ᠊ᠷ ᠰᠠᠷ᠎ᠠ - 11᠊ᠷ ᠰᠠᠷ᠎ᠠ - 12᠊ᠷ ᠰᠠᠷ᠎ᠠ - - - I - II - III - IV - V - VI - VII - VIII - IX - X - XI - XII - - - - - - - ᠨᠢ - ᠲᠠ - ᠮᠢᠭ - ᡀᠠ - ᠫᠥᠷ - ᠪᠠ - ᠪᠢᠮ - - - ᠨᠢ - ᠳᠠ - ᠮᠢᠭ - ᡀᠠ - ᠫᠥᠷ - ᠪᠠ - ᠪᠢ - - - ᠨᠢᠮ᠎ᠠ - ᠳᠠᠸᠠ - ᠮᠢᠠᠠᠮᠠᠷ - ᡀᠠᠭᠪᠠ - ᠫᠦᠷᠪᠦ - ᠪᠠᠰᠠᠩ - ᠪᠢᠮᠪᠠ - - - - - ᠨᠢ - ᠳᠠ - ᠮᠢᠭ - ᡀᠠ - ᠫᠦᠷ - ᠪᠠ - ᠪᠢᠮ - - - ᠨᠢ - ᠳᠠ - ᠮᠢᠭ - ᡀᠠ - ᠫᠥᠷ - ᠪᠠ - ᠪᠢᠮ - - - - - - - 1 ᠣᠯᠠᠷᠢᠯ - 2 ᠣᠯᠠᠷᠢᠯ - 3 ᠣᠯᠠᠷᠢᠯ - 4 ᠣᠯᠠᠷᠢᠯ - - - 1 ᠊ᠷ ᠣᠯᠠᠷᠢᠯ - 2 ᠊ᠷ ᠣᠯᠠᠷᠢᠯ - 3 ᠊ᠷ ᠣᠯᠠᠷᠢᠯ - 4 ᠊ᠷ ᠣᠯᠠᠷᠢᠯ - - - - - I - II - III - IV - - - I - II - III - IV - - - - - - - ᠦ᠂ ᠥ - ᠦ᠂ ᠬᠣ - - - - - - ᠮ᠂ ᠡᠡ᠂ ᠦ - ᠨ᠂ ᠲ᠂ ᠥ - ᠮ᠂ ᠡ - ᠨ᠂ ᠲ - - - - - - y ᠣᠨ ᠎᠎᠎ᠤ MMMM᠎᠎ᠢᠢᠨd. EEEE ᠋ᠭᠠᠷᠠᠭ - - - - - y ᠋ᠣᠨ ᠤMMMM᠎᠎ ᠤᠩ d - - - - - y.MM.dd - yMMdd - - - - - y.MM.dd - - - - - - - HH:mm:ss (zzzz) - - - - - HH:mm:ss (z) - - - - - - - - ᠡᠷᠢᠨ - - - ᠵᠢᠯ - - - ᠣᠯᠠᠷᠢᠯ - - - ᠰᠠᠷ ᠠ - - - ᠰᠡᠷ ᠠ - - - ᠳᠣᠯᠣᠭ᠎ᠠ ᠬᠣᠨᠣᠭ - - - 7 ᠬᠣᠨᠣᠭ - - - ᠡᠳᠥᠷ - ᠥᠴᠥᠬᠡᠳᠥᠷ - ᠥᠨᠥᠳᠥᠷ - ᠮᠠᠷᠭᠠᠰᠢ - - - ᠭᠠᠷᠠᠭ - - - ᠥᠳᠡ ᠡᠴᠠ ᠡᠮᠥᠨ᠎ᠠ / ᠥᠳᠡ ᠡᠴᠡ ᠬᠣᠢᠢᠰᠢ - - - ᠴᠠᠭ - - - ᠴ - - - ᠮᠢᠨᠥ᠋ᠲ᠋ᠠ - - - ᠮᠢᠨ - - - ᠰᠸᠻᠥ᠋ᠨ᠋ᠳᠡ - - - ᠰᠧᠻ - - - ᠴᠠᠭ ᠎ᠤᠨ ᠪᠥᠰᠡ - - - - GMT {0} - {0} ᠴᠠᠭ - {0} ᠵᠣᠨ ᠎᠎᠎ᠤ ᠴᠠᠭ - {0} ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - - - ᠣᠯᠠᠨ ᠣᠯᠣᠰ ᠤᠨ ᠵᠣᠬᠢᠴᠡᠭᠣᠯᠣᠯᠳᠠᠳᠠᠢ ᠴᠠᠭ - - - - ᠥᠯᠥ ᠮᠡᠳᠡᠭᠳᠡᠬᠥ ᠬᠣᠳᠠ - - - ᠬᠣᠪᠳᠣ - - - ᠣᠯᠠᠭᠠᠨᠪᠠᠭᠠᠳᠣᠷ - - - - ᠲᠥᠪ ᠴᠠᠭ - ᠳᠥᠪ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠲᠥᠪ ᠵᠣᠨ ᠎᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠵᠡᠭᠥᠨ ᠡᠷᠭᠡ ᠎ᠢᠢᠨ ᠴᠠᠭ - ᠵᠡᠭᠥᠨ ᠡᠷᠭᠡ ᠎ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠵᠡᠭᠥᠨ ᠡᠷᠭᠡ ᠎ᠢᠢᠨ ᠵᠣᠨ ᠎᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠠᠭᠣᠯᠠ ᠎᠎᠎᠎ᠢᠢᠨ ᠴᠠᠭ - ᠠᠭᠣᠯᠠ ᠎᠎᠎᠎ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠠᠭᠣᠯᠠ ᠎ᠢᠢᠨ ᠵᠣᠨ ᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠨᠣᠮᠣᠬᠠᠨ ᠳᠠᠯᠠᠢ ᠎ᠢᠢᠨ ᠴᠠᠭ - ᠨᠣᠮᠣᠬᠠᠨ ᠳᠠᠯᠠᠢ ᠎᠎ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠨᠣᠮᠣᠬᠠᠨ ᠳᠠᠯᠠᠢ ᠎ᠢᠢᠨ ᠵᠣᠨ ᠎᠎᠎ᠪ ᠴᠠᠭ - - - - - ᠠᠲ᠋ᠯᠠᠨ᠋ᠲ᠋ ᠎ᠤᠨ ᠴᠠᠭ - ᠠᠲ᠋ᠯᠠᠨ᠋ᠲ ᠎ᠤᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠠᠲ᠋ᠯᠠᠨ᠋ᠲ ᠎ᠤᠨ ᠵᠣᠨ ᠎ᠪ ᠴᠠᠭ - - - - - ᠲᠥᠪ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠴᠠᠭ - ᠲᠥᠪ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠲᠥᠪ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠵᠣᠨ ᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠵᠡᠭᠦᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠴᠠᠭ - ᠵᠡᠭᠦᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠵᠡᠭᠦᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠵᠣᠨ ᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠪᠠᠷᠠᠭᠣᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠴᠠᠭ - ᠪᠠᠷᠠᠭᠣᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠰᠲ᠋ᠠᠨ᠋ᠳᠠᠷᠳ᠋ ᠴᠠᠭ - ᠪᠠᠷᠠᠭᠣᠨ ᠡᠸᠣᠢᠷᠤᠫᠠ ᠢᠢᠨ ᠵᠣᠨ ᠎᠎ᠤ ᠴᠠᠭ - - - - - ᠭᠷᠢᠨ᠋ᠸᠢᠴᠢ ᠢᠢᠨ ᠴᠠᠭ - - - - - - - - - ¤#,##0.00 - - - - - - ᠪᠷᠠᠽᠢᠯ ᠤᠨ ᠷᠧᠠᠯ - ᠪᠷᠠᠽᠢᠯ ᠤᠨ ᠷᠧᠠᠯ - ᠪᠷᠠᠽᠢᠯ ᠤᠨ ᠷᠧᠠᠯ - - - ᠬᠢᠲᠠᠳ ᠶᠤᠸᠠᠨ - ᠬᠢᠲᠠᠳ ᠶᠤᠸᠠᠨ - ᠬᠢᠲᠠᠳ ᠶᠤᠸᠠᠨ - - - ᠶᠧᠸᠷᠣ - ᠶᠧᠸᠷᠣ - ᠶᠧᠸᠷᠣ - - - ᠪᠷᠢᠲ᠋ᠠᠨᠢ ᠢᠢᠨ ᠫᠤᠢᠨᠳ᠋ - ᠪᠷᠢᠲ᠋ᠠᠨᠢ ᠢᠢᠨ ᠫᠤᠢᠨᠳ᠋ - ᠪᠷᠢᠲ᠋ᠠᠨᠢ ᠢᠢᠨ ᠫᠤᠢᠨᠳ᠋ - - - ᠡᠨᠡᠳᠬᠡᠭ᠌ ᠷᠦᠫᠢ - ᠡᠨᠡᠳᠬᠡᠭ᠌ ᠷᠦᠫᠢ - ᠡᠨᠡᠳᠬᠡᠭ᠌ ᠷᠦᠫᠢ - - - ᠶᠠᠫᠣᠨ ᠧᠨ - ᠶᠠᠫᠣᠨ ᠧᠨ - ᠶᠠᠫᠣᠨ ᠧᠨ - - - ᠳᠥᠬᠥᠷᠢᠭ᠌ - ᠳᠥᠬᠥᠷᠢᠭ᠌ - ᠳᠥᠬᠥᠷᠢᠭ᠌ - ₮ - - - ᠣᠷᠥᠰ ᠷᠥᠪᠯᠢ - ᠣᠷᠥᠰ ᠷᠥᠪᠯᠢ - ᠣᠷᠥᠰ ᠷᠥᠪᠯᠢ - - - ᠠᠮᠸᠷᠢᠻᠠ ᠳ᠋ᠣᠯᠯᠠᠷ - ᠠᠮᠸᠷᠢᠻᠠ ᠳ᠋ᠣᠯᠯᠠᠷ - ᠠᠮᠸᠷᠢᠻᠠ ᠳ᠋ᠣᠯᠯᠠᠷ - - - ᠲᠣᠳᠣᠷᠬᠠᠢ ᠥᠭᠡᠢ ᠮᠥᠩᠭᠥᠨ ᠲᠡᠮᠳᠡᠭᠳᠥ - ᠲᠣᠳᠣᠷᠬᠠᠢ ᠥᠭᠡᠢ ᠮᠥᠩᠭᠥᠨ ᠲᠡᠮᠳᠡᠭᠳᠥ ᠢᠢᠨ ᠨᠢᠭᠡᠴᠡ - (ᠲᠣᠳᠣᠷᠬᠠᠢ ᠥᠭᠡᠢ ᠮᠥᠩᠭᠥᠨ ᠲᠡᠮᠳᠡᠭᠳᠥ) - - - - - - hh:mm - - - hh:mm:ss - - - - - ᠲᠡᠢᠢᠮᠣ᠄ ᠲ - ᠥᠬᠡᠢ᠄ ᠥ - - - diff --git a/make/data/cldr/common/main/mni.xml b/make/data/cldr/common/main/mni.xml index 860acf060570..ec59157943f6 100644 --- a/make/data/cldr/common/main/mni.xml +++ b/make/data/cldr/common/main/mni.xml @@ -112,6 +112,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + @@ -372,6 +386,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -409,6 +427,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y MMM d, y, E MMMM y + MMMM d, y + MMMM d, y, EEE @@ -459,7 +479,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic জি এম টি {0} - জি এম টি {0} টাইম {0} (+1) দেলাইট টাইম {0} (+0) ষ্টেন্দর্দ টাইম diff --git a/make/data/cldr/common/main/mni_Mtei.xml b/make/data/cldr/common/main/mni_Mtei.xml deleted file mode 100644 index f231e66eec01..000000000000 --- a/make/data/cldr/common/main/mni_Mtei.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - [꯬ ꯀ ꯁ ꯂ ꯃ ꯄ ꯅ ꯆ ꯇ ꯈ ꯉ ꯊ ꯋ ꯌ ꯍ ꯎ ꯏ ꯐ ꯑ ꯒ ꯓ ꯔ ꯕ ꯖ ꯗ ꯘ ꯙ ꯚ ꯣ ꯤ ꯥ ꯦ ꯧ ꯨ ꯩ ꯪ ꯛ ꯜ ꯝ ꯞ ꯟ ꯠ ꯡ ꯢ ꯭] - [\- ‑ , . % + 0꯰ 1꯱ 2꯲ 3꯳ 4꯴ 5꯵ 6꯶ 7꯷ 8꯸ 9꯹] - [\- ‑ , ; \: ! ? . … ꯫ ' " ( ) \[ \] @ * / \& #] - - - - - - - - EEEE, d MMMM, y - - - - - d MMMM, y - - - - - dd-MM-y - yMMdd - - - - - d-M-y - yMd - - - - - - - h.mm.ss a zzzz - ahmmsszzzz - - - - - h.mm.ss a z - ahmmssz - - - - - h.mm.ss a - ahmmss - - - - - h.mm. a - ahmm - - - - - - - - mtei - - diff --git a/make/data/cldr/common/main/mni_Mtei_IN.xml b/make/data/cldr/common/main/mni_Mtei_IN.xml deleted file mode 100644 index 0dfed58226f3..000000000000 --- a/make/data/cldr/common/main/mni_Mtei_IN.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - دنيا - اسيا تيمور - اسيا سلاتن - اسيا تڠݢارا - اسيا - اسيا تڠه - اسيا بارات - اميريک لاتين - بروني - البرازيل - چينا - جرمان - ڤرنچيس - إندونيسيا - اينديا - إيطاليا - جڤون - مليسيا - عرب سعودي - سيڠاڤورا - تايلان - تايوان - اميريک شريکت - ولايه تيدق دکتاهوءي - - - کومبڠ - ماتواڠ - نو - زون وقتو - - - کومبڠ بودا - کومبڠ چينا - کومبڠ کبڠساٴن اينديا - کومبڠ اسلام - کومبڠ سيۏيل اسلام - کومبڠ جڤون - کومبڠ ڤرسي - اتورن ايسيه قاموس - اتورن ايسيه بوکو تيليفون - اوروتن ايسيه فونيتيک - اتورن ايسيه ڤمبهاروان - چارين توجوان عموم - اتورن ايسيه تراديسيونل - اتورن ايسيه چوريتن راديکل - اڠک کأواڠن - اڠک ڤرڤولوهن چينا - اڠک چينا ريڠکس - اڠک کأواڠن چينا ريڠکس - اڠک چينا تراديسيونل - اڠک کأواڠن چينا تراديسيونل - اڠک جڤون - اڠک کأواڠن جڤون - ديݢيت بارات - ديݢيت مالايالم - ديݢيت اصل - اڠک تاميل - ديݢيت تاميل - اڠک تراديسيونل - - - ميتريک - - - - - right-to-left - - - - [ء آ أ ؤ إ ئ ا ب ة ت ث ج چ ح خ د ذ ر ز س ش ص ض ط ظ ع غ ڠ ف ڤ ق ك ک ݢ ل م ن ڽ ه و ۏ ى ي] - [ڬ ۑ] - ؟ - - - ” - “ - ’ - ‘ - - - - - - - - EEEE، d MMMM y G - - - - - d MMMM y G - - - - - dd/MM/y G - - - - - d/MM/y G - GyMMd - - - - - - E, d - d/M - E، d/M - M/y G - E، d/M/y G - MMM y G - d MMM y G - E، d MMM y G - - - - - - - - EEEE، U MMMM dd - UMMMMEEEEdd - - - - - U MMMM d - UMMMMd - - - - - U MMM d - UMMMd - - - - - y-M-d - yMd - - - - - - - - - EEEE، d MMMM y G - - - - - d MMMM y G - - - - - dd/MM/y G - GyMMdd - - - - - d/MM/yy GGGGG - GGGGGyyMMd - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d E - H:mm - d-M - E، d-M - dd/MM - d MMM - E، d MMM - d MMMM - y - M-y - d/M/y - E، d/M/y - MMM y - d MMM y - E، d MMM y - QQQ y - QQQQ y - - - {0} – {1} - - M–M - - - d/M – d/M - d/M – d/M - - - E، d/M – E، d/M - E، d/M – E، d/M - - - MMM–MMM - - - d–d MMM - d MMM – d MMM - - - E، d MMM – E، d MMM - E، d MMM – E، d MMM - - - y–y - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - - - MMM–MMM y - MMM y – MMM y - - - d–d MMM y - d MMM – d MMM، y - d MMM y – d MMM y - - - E، d MMM – E، d MMM، y - E، d MMM – E، d MMM، y - E، d MMM y – E، d MMM y - - - MMMM–MMMM y - MMMM y – MMMM y - - - - - - - - - جانواري - فيبواري - مچ - اڤريل - مي - جون - جولاي - ݢوس - سيڤتيمبر - اوکتوبر - نوۏيمبر - ديسيمبر - - - - - - - احد - اثنين - ثلاث - رابو - خميس - جمعة - سبتو - - - - - - - سوکو 1 - سوکو ک-2 - سوکو ک-3 - سوکو ک-4 - - - سوکو ڤرتام - سوکو ک-2 - سوکو ک-3 - سوکو ک-4 - - - - - - - EEEE، d MMMM y - - - - - d MMMM y - - - - - dd/MM/y - yMMdd - - - - - d/MM/yy - yyMMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d E - H:mm - d-M - E، d-M - dd/MM - d MMM - E، d MMM - d MMMM - M-y - d/M/y - E، d/M/y - MMM y - d MMM y - E، d MMM y - QQQ y - QQQQ y - - - {0} – {1} - - M–M - - - d/M – d/M - d/M – d/M - - - E، d/M – E، d/M - E، d/M – E، d/M - - - MMM–MMM - - - d–d MMM - d MMM – d MMM - - - E، d MMM – E، d MMM - E، d MMM – E، d MMM - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - - - MMM–MMM y - MMM y – MMM y - - - d–d MMM y - d MMM – d MMM، y - d MMM y – d MMM y - - - E، d MMM – E، d MMM، y - E، d MMM – E، d MMM، y - E، d MMM y – E، d MMM y - - - MMMM–MMMM y - MMMM y – MMMM y - - - - - - - - - EEEE، d MMMM y G - - - - - d MMMM y G - - - - - dd/MM/y G - - - - - d/MM/y G - GyMMd - - - - - - E، d - d/M - E، d/M - M/y G - E، d/M/y G - MMM y G - d MMM y G - E، d MMM y G - - - - - - - - EEEE، d MMMM y G - - - - - d MMMM y G - - - - - dd/MM/y G - - - - - d/MM/y G - GyMMd - - - - - - E، d - d/M - E، d/M - M/y G - E، d/M/y G - MMM y G - d MMM y G - E، d MMM y G - - - - - - - ايرا - - - تاهون - تاهون لڤس - تاهون ني - تاهون هدڤن - - دالم {0} تاهون - - - {0} تاهون لالو - - - - بولن - بولن لالو - بولن ني - بولن ستروسڽ - - دالم {0} بولن - - - {0} بولن لالو - - - - ميڠݢو - ميڠݢو لڤس - ميڠݢو ني - ميڠݢو ستروسڽ - - دالم {0} ميڠݢو - - - {0} ميڠݢو لالو - - - - هاري - هاري سبلوم سمالم - سمالم - هاري ني - ايسوق - هاري سلڤس ايسوق - - دالم {0} هاري - - - {0} هاري لالو - - - - هاري دالم ميڠݢو - - - جم - - دالم {0} جم - - - {0} جم لالو - - - - مينيت - - دالم {0} مينيت - - - {0} مينيت لالو - - - - کدوا - - دالم {0} ساعت - - - {0} ساعت لالو - - - - زون وقتو - - - - وقتو {0} - - باندر تيدق دکتاهوءي - - - سيڠاڤورا - - - - وقتو بروني دارالسلام - - - - - وقتو ڤياواي اينديا - - - - - وقتو لاٴوتن هيندي - - - - - وقتو إندونيسيا تڠه - - - - - وقتو إندونيسيا تيمور - - - - - وقتو إندونيسيا بارات - - - - - وقتو مليسيا - - - - - - - - - 0 ريبو - 00 ريبو - 000 ريبو - 0 جوتا - 00 جوتا - 000 جوتا - 0 بيليون - 00 بيليون - 000 بيليون - 0 تريليون - 00 تريليون - 000 تريليون - - - - - - - ¤#,##0.00 - - - ¤#,##0.00;(¤#,##0.00) - ¤ #,##0.00;(¤ #,##0.00) - #,##0.00;(#,##0.00) - - - {0} {1} - - - - دولر بروني - - - ڤاٴون ستيرليڠ بريتيش - - - روڤياە إندونيسيا - - - ريڠݢيت مليسيا - RM - - - دولر سيڠاڤورا - - - مات واڠ تيدق دکتاهوءي - - - - - - - {0} تاهون - - - {0} مينيت - - - - - {0} thn - - - {0} بولن - - - {0} ميڠݢو - - - {0} هاري - - - {0} جم - - - {0} ساعت - - - - diff --git a/make/data/cldr/common/main/ms_Arab_BN.xml b/make/data/cldr/common/main/ms_Arab_BN.xml deleted file mode 100644 index 65a4153f3213..000000000000 --- a/make/data/cldr/common/main/ms_Arab_BN.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - 𞄒𞄫𞄱𞄔𞄩𞄴 - - - - [𞄱 𞄶 𞄲 𞄳 𞄰 𞄴 𞄵 𞅏 𞄼 𞄽 𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬 𞅎] - - [𞄀 𞄁 𞄂 𞄃 𞄄 𞄅 𞄆 𞄇 𞄈 𞄉 𞄊 𞄋 𞄌 𞄍 𞄎 𞄏 𞄐 𞄑 𞄒 𞄓 𞄔 𞄕 𞄖 𞄗 𞄘 𞄙 𞄚 𞄛 𞄜 𞄝 𞄞 𞄟 𞄠 𞄡 𞄢 𞄣 𞄤 𞄥 𞄦 𞄧 𞄨 𞄩 𞄪 𞄫 𞄬] - [\- ‑ , . % + 𞅀 𞅁 𞅂 𞅃 𞅄 𞅅 𞅆 𞅇 𞅈 𞅉] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - 𞄆𞄬 - 𞄛𞄨𞄱𞄄𞄤𞄲𞄨 - 𞄒𞄫𞄰𞄒𞄪𞄱 - 𞄤𞄨𞄱 - 𞄀𞄪𞄴 - 𞄛𞄤𞄱𞄞𞄤𞄦 - 𞄔𞄩𞄴𞄆𞄨𞄰 - 𞄕𞄩𞄲𞄔𞄄𞄰𞄤 - 𞄛𞄤𞄱𞄒𞄤𞄰 - 𞄪𞄱𞄀𞄤𞄴 - 𞄚𞄦𞄲𞄤𞄚𞄄𞄰𞄫 - 𞄒𞄩𞄱𞄔𞄬𞄴 - - - - - - - 𞄎𞄤𞄲 - 𞄈𞄦 - 𞄆𞄨𞄰 - 𞄗𞄄𞄤𞄰𞄦 - 𞄙𞄤𞄱𞄨 - 𞄑𞄤𞄱𞄨 - 𞄊𞄧𞄳 - - - - - - - 𞅁 - 𞅂 - 𞅃 - 𞅄 - - - - - - 𞄜𞄆𞄪 - - - - - - - 𞄛𞄩 - - - - - hmnp - latn - - - 𞅎 - - - - diff --git a/make/data/cldr/common/main/mww_Hmnp.xml b/make/data/cldr/common/main/mww_Hmnp.xml deleted file mode 100644 index 1fe58ac5d106..000000000000 --- a/make/data/cldr/common/main/mww_Hmnp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - - Масторланго - Африка - Африкань чивалгома ёнкс - Африкань чилисема ёнкс - Африкань пелеве ёнкс - Африкань куншка - Америкат - Азиянь чилисема ёнкс - Азиянь чинеле ёнкс - Азиянь чинеле-чилисема ёнкс - Европань чипеле ёнкс - Азия - Азиянь куншка - Азиянь чивалгома ёнкс - Европа - Европань чилисема ёнкс - Европань пелеве ёнкс - Европань чивалгома ёнкс - Андорра - Афганистан - Албания - Арменэнь мастор - Ангола - Антарктида - Аргентина - Американь Самоа - Австрия - Австралия - Аландонь усият - Барбадос - Бангладеш - Белгия - Болгария - Бурунди - Бенин - Бермуда - Боливия - Бразил - Ботсвана - Беларусия - Канада - Швейцария - Кук усият - Чили - Китай - Колумбия - Куба - Чехия - Чех Раськемастор - Германия - Дания - Алгерия - Эстэнь мастор - Эритрея - Испания - Финнэнь мастор - Фиджи - Фарерэнь усият - Франция - Габон - Гренада - Гамбия - Грекень мастор - Гватемала - Гуам - Хорватия - Гаити - Венгрия - Ирландия - Ман усия - Индия - Иран - Исландия - Италия - Япононь мастор - Лихтенштейн - Литва - Люксембург - Латвия - Монако - Молдова - Монтенегро - Мали - Монголонь мастор - Малта - Малави - Намибия - Од Каледония - Нигер - Нигерия - Нидерланд - Норвегия - Непал - Науру - Од Зеландия - Аотеароа Од Зеландия - Панама - Перу - Пакистан - Польша - Португалонь мастор - Парагвай - Румыния - Сербень мастор - Рузонь мастор - Соломон усият - Судан - Шведэнь мастор - Словения - Словакия - Сенегал - Сомалия - Чад - Того - Таймастор - Тонга - Тувалу - Тайван - Танзания - Украина - Уганда - Вейсэндязь Раськетнень Организация - Американь Вейсэндявкс Штаттнэ - АВШ - Уругвай - Ватикан ош - Вануату - Самоа - Косово - Замбия - Зимбабве - Асодавикс Ёнкс - - - - [а б в г д её ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я] - [ӓ ә є җ ѕ і ҥ ў ѡ џ ѣ ѳ ѵѷ] - [А Б В Г Д ЕЁ Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я] - [\- ‐‑ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \& #] - - - - - - - - якшамков - даволков - эйзюрков - чадыков - панжиков - аштемков - медьков - умарьков - таштамков - ожоков - сундерьков - ацамков - - - - - якш - дав - эйз - чад - пан - ашт - мед - ума - таш - ожо - сун - аца - - - - - - - тар - атя - вас - кун - кал - сюк - шля - - - таргочистэ - атяньчистэ - вастаньчистэ - куншкачистэ - калоньчистэ - сюконьчистэ - шлямочистэ - - - - - таргочи - атяньчи - вастаньчи - куншкачи - калоньчи - сюконьчи - шлямочи - - - - - - - обедтэ икеле - обедтэ мейле - - - - - обедтэ икеле - обедтэ мейле - - - - - - Христосонь чачомадо икеле - Минек эрадо икеле - Христосонь чачомадо мейле - Минек эрасто - - - - - - - пинге - - - ие - мелят - тедиде - сы иестэ - - - нилеце пелькс - - - ков - ютазь ковсто - те ковсто - сы ковсто - - - тарго - ютазь таргосто - те таргосто - сы таргосто - {0} таргостонть - - - чи - исяк - течи - ванды - - - таргоютконь чи - - - час - - - минута - - - секунда - - - - - Асодавикс Ош - - - Андорра - - - Тирана - - - Вена - - - Баку - - - Сараево - - - Брюссель - - - София - - - Бермуда - - - Минской - - - Цюрих - - - Шанхай - - - Прага - - - Берлин - - - Копенгаген - - - Таллин - - - Мадрид - - - Хельсинки - - - Париж - - - Лондон - - - Гренада - - - Афины - - - Гонконг - - - Загреб - - - Будапешт - - - Дублин - - - Багдад - - - Рейкьявик - - - Рим - - - Токио - - - Сеул - - - Вадуц - - - Вильнюс - - - Люксембург - - - Рига - - - Монако - - - Подгорица - - - Скопье - - - Улан-батор - - - Мальта - - - Амстердам - - - Осло - - - Панама - - - Варшава - - - Мадейра - - - Лиссабон - - - Бухарест - - - Белград - - - Москов - - - Саратов - - - Киров - - - Самара - - - Омской - - - Томской - - - Сахалин - - - Стокгольм - - - Любляна - - - Лонгйирбюен - - - Братислава - - - Сан-Марино - - - Тайпей - - - Киев - - - Симферополь - - - Бойси - - - Денвер - - - Шикаго - - - Самарканд - - - Ташкент - - - Ватикан - - - - Афганистанонь шка - - - - - Аляскань шка - Аляскань свалонь шка - Аляскань кизэнь шка - - - - - Амазононь шка - Амазононь свалонь шка - Амазононь кизэнь шка - - - - - Бангладешень шка - Бангладешень свалонь шка - Бангладешень кизэнь шка - - - - - Базилиянь шка - Базилиянь свалонь шка - Базилиянь кизэнь шка - - - - - Чилинь шка - Чилинь свалонь шка - Чилинь кизэнь шка - - - - - Китаень шка - Китаень свалонь шка - Китаень кизэнь шка - - - - - Кубань шка - Кубань свалонь шка - Кубань кизэнь шка - - - - - Индиянь свалонь шка - - - - - Иранонь шка - Иранонь свалонь шка - Иранонь кизэнь шка - - - - - Япониянь шка - Япониянь свалонь шка - Япониянь кизэнь шка - - - - - Казахстанонь чилисемань шка - - - - - Казахстанонь чивалгомань шка - - - - - Кореань шка - Кореань свалонь шка - Кореань кизэнь шка - - - - - Московонь шка - Московонь свалонь шка - Московонь кизэнь шка - - - - - Од Зеландиянь шка - Од Зеландиянь свалонь шка - Од Зеландиянь кизэнь шка - - - - - Омскоень шка - Омскоень свалонь шка - Омскоень кизэнь шка - - - - - Парагваень шка - Парагваень свалонь шка - Парагваень кизэнь шка - - - - - Сахалинэнь шка - Сахалинэнь свалонь шка - Сахалинэнь кизэнь шка - - - - - Уругваень шка - Уругваень свалонь шка - Уругваень кизэнь шка - - - - - Узбекистанонь шка - Узбекистанонь свалонь шка - Узбекистанонь кизэнь шка - - - - - - - истя:и - арась:а - - - diff --git a/make/data/cldr/common/main/myv_RU.xml b/make/data/cldr/common/main/myv_RU.xml deleted file mode 100644 index a34235ed4681..000000000000 --- a/make/data/cldr/common/main/myv_RU.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/nds.xml b/make/data/cldr/common/main/nds.xml index 918d49f940bf..62cd51846e66 100644 --- a/make/data/cldr/common/main/nds.xml +++ b/make/data/cldr/common/main/nds.xml @@ -1325,6 +1325,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ({1}) + + {0} – {1} + {0} – {1} + {0}–{1} + d.–d. @@ -1503,7 +1508,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic +HH.mm;-HH.mm UTC{0} - UTC {0}-Tiet {0}-Summertiet {0}-Standardtiet diff --git a/make/data/cldr/common/main/ne.xml b/make/data/cldr/common/main/ne.xml index 1d8575409cd0..8966be3a8489 100644 --- a/make/data/cldr/common/main/ne.xml +++ b/make/data/cldr/common/main/ne.xml @@ -1086,15 +1086,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ पात्रो मुद्राको ढाँचा + चिन्ह वेवास्ता गर्ने गरी क्रमबद्ध गर्नु + विपरित स्वरचिन्ह क्रमबद्धता + ठूलो/सानो अक्षर क्रमीकरण + अक्षरको आकार-सचेत क्रमबद्धता क्रमबद्ध सुची + सामान्यीकृत क्रमीकरण + अङ्कीय क्रमबद्धता + लिपि/ब्लकको क्रम परिवर्तन + क्रमीकरण तीव्रता मुद्रा + परिवर्तन गन्तव्य + शब्दकोश विच्छेद अपवादहरू इमोजी प्रेजन्टेसन + हप्ताको पहिलो दिन + मिश्रित कोड घटक समय चक्र (12 तथा 24) + इनपुट विधि + कीबोर्ड + उच्चतम उपेक्षित पङ्क्ति विच्छेदको शैली शब्दबीचका लाइन ब्रेकहरू + परिवर्तन नियमहरू मापन प्रणाली + मापन एकाइ अङ्कहरू + पूरक डेटाका लागि क्षेत्र + रूपान्तरण स्रोत + क्षेत्रीय उपविभाजन संक्षिप्त शब्दपछि आउने वाक्यान्त + परिवर्तन गर्नुहोस् + मसिनद्वारा अनुवादित + समय क्षेत्र + लोकेल प्रकार + निजी-प्रयोग + निजी-प्रयोग रूपान्तरण बुद्धिष्ट पात्रो @@ -1119,9 +1145,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ हिज्री हिजरी पात्रो (टेबुलर, नागरिक युग) हिज्री (टेबुलर, सिभिल एपोच) + हिज्री साउदी अरेबिया दृष्टि + हिजरी (सारणीबद्ध, खगोलीय युग) इस्लामी पात्रो हिज्री (अन अल क्वारा) ISO-8601 पात्रो + ग्रिगोरियन जापानी पात्रो जापानी फारसी पात्रो @@ -1132,19 +1161,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ लेखापालन मानक मुद्राको ढाँचा मानक + सानो अक्षर + सानो अक्षर + ठुलो अक्षर + अनुकूलता + शब्दकोश पूर्वनिर्धारित युनिकोडको क्रमबद्धता सूची डिफल्ट युनिकोड + इमोजी + युरोपेली नियमहरू टेलिफोन पुस्तिका क्रमबद्धतापद्दति + सम्पर्क सूची + उच्चारण अनुसार पिनयिन क्रमबद्धता पद्दति + पिनयिन सामान्य उद्देशीय खोजी खोज + कोरियाली प्रारम्भिक व्यञ्जनवर्ण मानक क्रमबद्धता मानक स्ट्रोक क्रमबद्धता पद्दति + स्ट्रोक परम्परागत क्रमबद्धता पद्दति + परम्परागत + रेडिकल-स्ट्रोक + झुयिन + मुद्रा + अङ्क + विराम चिह्न + खाली ठाउँ + चिन्ह + सबै + मूल अक्षरहरू मात्र + मूल अक्षर, स्वरचिन्ह, ठूलो/सानो अक्षर, विविध रूप, काना + मूल अक्षर, स्वरचिन्ह + मूल अक्षर, स्वरचिन्ह, ठूलो/सानो अक्षर, विविध रूप + पूर्ण-चौडाइमा परिवर्तन + आधा-चौडाइमा परिवर्तन डिफल्ट इमोजी टेक्स्ट + १२ घन्टाको प्रणाली + १२ + २४ घन्टाको प्रणाली + २४ १२ घण्टे प्रणाली (०–११) १२ (०–११) १२ घन्टाको प्रणाली (१–१२) @@ -1153,6 +1213,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ २४ (०–२३) २४ घन्टाको प्रणाली (१–२४) २४ (१–२४) + खाली ठाउँ शिफ्ट गर्नुहोस्, विराम चिह्न, सबै प्रतीकहरू + खाली ठाउँ शिफ्ट गर्नुहोस्, विराम चिह्न + खाली ठाउँ शिफ्ट गर्नुहोस्, विराम चिह्न + खाली ठाउँ शिफ्ट गर्नुहोस्, विराम चिह्न, गैर-मुद्रा प्रतीकहरू पङ्क्ति विच्छेदको खुला शैली खुला पङ्क्ति विच्छेदको सामान्य शैली @@ -1163,6 +1227,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ सबै राख्नुहोस् सामान्य वाक्यांशमा राख्नुहोस् + अमेरिकी बीजीएन लिप्यन्तरण + अमेरिकी बीजीएन लिप्यन्तरण मेट्रिक प्रणाली मेट्रिक इम्पेरियल मापन प्रणाली @@ -1171,47 +1237,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ अमेरिकी अरबी भारतीय अङ्कहरू विस्तृत अरबी भारतीय अङ्कहरू + विस्तारित अरबी-इन्डिक आर्मेनियाली अङ्कहरू आर्मेनियाली साना अङ्कहरू + आर्मेनियाली साना अक्षरहरू बङ्गाली अङ्कहरू चाक्मा अङ्क देवानागरी इथियोपाली अङ्कहरू + वित्तीय पूरा चौंडाइका अङ्कहरू + पूर्ण-चौडाइ जर्जियाली अङ्कहरू ग्रीक अङ्कहरू ग्रीक साना अङ्कहरू + ग्रीक साना अक्षरहरू गुजराती अङ्कहरू गुरूमुखी अङ्कहरू + परम्परागत पात्रोका लागि हान-अक्षर महिना-दिन क्रमाङ्कन चिनियाँ दशमलव अङ्कहरू + चिनियाँ सङ्ख्या सङ्केतहरू प्रयोग गर्ने स्थानमान दशमलव प्रणाली सरलिकृत चिनियाँ अङ्कहरू सरलिकृत चिनियाँ वित्तीय अङ्कहरू + सरलीकृत चिनियाँ वित्तीय रूप परम्परागत चिनियाँ अङ्कहरू परम्परागत चिनियाँ वित्तीय अङ्कहरू + परम्परागत चिनियाँ वित्तीय रूप हिब्रु अङ्कहरू जाभानी अङ्क जापानी अङ्कहरू जापानी वित्तीय अङ्कहरू + जापानी वित्तीय रूप + जापानी पहिलो वर्ष (गान्नेन) सङ्ख्याङ्कन प्रणाली खमेर अङ्कहरू कन्नाडा अङ्कहरू + ताइ थाम थाम (धार्मिक अङ्कहरू) लाओ अङ्कहरू पश्चिमी अङ्कहरू + गणितीय मोटो अक्षर + गणितीय डबल-स्ट्रक + गणितीय मोनोस्पेस + गणितीय सान्स-सेरिफ बोल्ड + गणितीय सान्स-सेरिफ मलायलम अङ्कहरू मिटै मेएक अङ्क म्यान्मारका अङ्कहरू + म्यान्मार पूर्वी पो कारेन + म्यान्मार पाओ + म्यान्मार सान + म्यान्मार ताइ लाइङ + स्थानीय अङ्कहरू + स्थानीय अङ्कहरू ओइ चिकी अङ्क ओरिया अङ्कहरू + बाहिरी घेरा भएको रोमन अङ्कहरू + रोमन ठूला अक्षरहरू रोमन साना केसका अङ्कहरू + रोमन साना अक्षरहरू + खण्डिकृत परम्परागत तामिल अङ्कहरू तामिल अङ्कहरू + आधुनिक तमिल तेलेगु अङ्कहरू थाई अङ्कहरू तिब्बती अङ्कहरू + परम्परागत अङ्कहरू भाई अङ्क अफ अन + अनिर्दिष्ट मसिन अनुवाद + पोसिक्स भेरियन्ट + + अफ + अन + मेट्रिक संयुक्त अधिराज्य @@ -1298,16 +1399,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - M/d/y GGGGG - MM/dd, E - {0} – {1} - - MM/dd, E – MM/dd, E - MM/dd, E – MM/dd, E - @@ -1519,11 +1612,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d E - M/y G - M/d/y G - E, M/d/y G MMMM को W हप्ता MMMM को W हप्ता + y MMMM d + y MMMM d, EEE Y को w हप्ता Y को w हप्ता @@ -1533,9 +1625,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y G – y G y – y G - - M/y G – M/y G - @@ -1876,6 +1965,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ समन्वित विश्व समय + + यूटीसी + अज्ञात शहर @@ -2346,9 +2438,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ लिब्रेभिल्ले - - बेलायती ग्रीष्मकालीन समय - लण्डन @@ -2439,9 +2528,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ जयापुरा - - आइरिश मानक समय - डब्लिन @@ -3137,6 +3223,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ हरारे + + + एकर समय + एकर मानक समय + एकर ग्रीष्मकालीन समय + + अफगानिस्तान समय @@ -3312,6 +3405,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ब्राजिलीया ग्रीष्मकालीन समय + + + बेलायती समय + बेलायती ग्रीष्मकालीन समय + + ब्रुनाइ दारूस्सलम समय @@ -3485,6 +3584,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ग्रीनविच मिन समय + + + ग्रिनल्यान्ड समय + ग्रिनल्यान्ड मानक समय + ग्रिनल्यान्ड ग्रीष्मकालीन समय + + पूर्वी ग्रीनल्यान्डको समय @@ -3511,7 +3617,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - हवाई-एलुटियन मानक समय + हवाई समय @@ -3572,6 +3678,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ इरानी दिवा समय + + + आइरिस समय + आइरिश मानक समय + + ईर्कुट्स्क समय @@ -3593,6 +3705,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ जापान दिवा समय + + + कामचत्का समय + कामचत्का मानक समय + कामचत्का ग्रीष्मकालीन समय + + काजकस्तानको समय @@ -3855,11 +3974,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ साखालिन ग्रीष्मकालीन समय + + + सामारा समय + सामारा मानक समय + सामारा ग्रीष्मकालीन समय + + - सामोअ समय सामोअ मानक समय - सामोअ दिवा समय @@ -3926,6 +4050,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ चुउक समय + + + टर्की समय + टर्की मानक समय + टर्की ग्रीष्मकालीन समय + + तुर्कमेनिस्तान समय @@ -3945,6 +4076,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ उरुग्वे ग्रीष्मकालीन समय + + + उरुम्छी समय + + उज्बेकिस्तान समय @@ -4712,8 +4848,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ जिम्बाबेली सुन - जिम्बाबेली सुन - जिम्बाबेली सुन @@ -4872,7 +5006,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ वर्ग फिट - क्यारेट {0} क्यारेट {0} क्यारेट @@ -5217,7 +5350,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} माइल-स्क्यान्डिनेभियन - पोइन्ट {0} पोइन्ट {0} पोइन्ट @@ -5351,7 +5483,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ब्यूफोर्ट {0} - डिग्री तापक्रम {0} डिग्री तापक्रम {0} डिग्री तापक्रम @@ -5478,14 +5609,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} डेजर्ट चम्चा - इम्पिरियल डेजर्ट चम्चा {0} इम्पिरियल डेजर्ट चम्चा {0} इम्पिरियल डेजर्ट चम्चा ड्राम - {0} ड्राम - {0} ड्राम इम्पिरियल चौथाइ @@ -5554,8 +5682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ वेबर्स - {0} Wb - {0} Wb अंश प्रति बरब @@ -6226,6 +6352,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ब्यारल {0} ब्यारल + + डेजर्ट चम्चा + इम्पिरियल डेजर्ट चम्चा {0} इम्पिरियल डेजर्ट चम्चा @@ -6251,6 +6380,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} चुटकी {0} चुटकी + + इम्पेरियल क्वार्ट्स + {0} इम्पेरियल क्वार्ट्स + {0} इम्पेरियल क्वार्ट्स + {0} sr {0} sr @@ -6423,9 +6557,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ब.फु. {0} ब.फु. - - क्यारेट - {0}mmol/L {0}mmol/L @@ -6444,9 +6575,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}‰ {0}‰ - - Glc - {0}L/km {0}L/km @@ -6598,10 +6726,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dm {0}dm - - {0}मि.मि. - {0}मि.मि. - {0}μm {0}μm @@ -6783,7 +6907,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}dsp - इम्पिरियल डेजर्ट चम्चा {0}इम्पिरियल डेजर्ट चम्चा {0} इम्पिरियल डेजर्ट चम्चा @@ -6792,13 +6915,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}fl.dr. - {0}qt-Imp. - {0}qt-Imp. - - - काट - {0} काट - {0} काट + इम्पेरियल क्वार्ट्स + {0} इम्पेरियल क्वार्ट्स + {0} इम्पेरियल क्वार्ट्स क्याल-IT diff --git a/make/data/cldr/common/main/nl.xml b/make/data/cldr/common/main/nl.xml index 37dce9266f68..a7e082093fe0 100644 --- a/make/data/cldr/common/main/nl.xml +++ b/make/data/cldr/common/main/nl.xml @@ -1321,18 +1321,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sorteervolgorde Genormaliseerd sorteren Numeriek sorteren + Script/Blok herordenen Sorteervoorrang valuta + Bestemming transformeren + Afbreekuitzonderingen Emoji-presentatie + eerste dag van de week + Ingevoegd uursysteem (12 of 24) + invoermethode + toetsenbord + Hoogste genegeerd stijl regelafbreking Regelafbreking binnen woorden + Transformatieregels maatsysteem + meeteenheid cijfers + regio voor aanvullende gegevens + bron transformeren + regionale onderverdeling Zinsafbreking na afk. + transformeren + machinevertaald Tijdzone Landvariant Privégebruik + Transformeren voor privégebruik Boeddhistische kalender @@ -1352,17 +1368,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hebreeuwse kalender Hebreeuws Indiase nationale kalender - Indiaas nationaal + Indiaas nationaal Islamitische kalender Islamitisch Islamitische kalender (cyclisch) Islamitisch (cyclisch) Islamitische kalender (Saudi–Arabië) + Islamitisch, waarneming in Saoedi-Arabië Islamitische kalender (epoche) - Hijri (tabulair, astronomische epoche) + Hijri (tabulair, astronomische epoche) Islamitische kalender (Umm al-Qura) Islamitisch (Umm al-Qura) ISO-8601-kalender + ISO-8601 Japanse kalender Japans Perzische kalender @@ -1378,8 +1396,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Normaal sorteren op accenten Omgekeerd sorteren op accenten Eerst sorteren op kleine letters + kleine letters Sorteervolgorde algemeen hoofdlettergebruik + kleine letters Eerst sorteren op hoofdletters + hoofdletters Niet hoofdlettergevoelig sorteren Hoofdlettergevoelig sorteren vorige sorteervolgorde, voor compatibiliteit @@ -1389,7 +1410,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ standaard Unicode-sorteervolgorde standaard Unicode emojisorteervolgorde + emoji Europese sorteerregels + Europese regels Telefoonboeksorteervolgorde Telefoonboek Fonetische sorteervolgorde @@ -1399,6 +1422,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ algemeen zoeken zoeken Zoeken op eerste Hangul-medeklinker + Koreaanse beginconsonant standaard sorteervolgorde standaard Streeksorteervolgorde @@ -1413,17 +1437,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unicode genormaliseerd sorteren Cijfers afzonderlijk sorteren Cijfers numeriek sorteren + valuta + getallen + leestekens + witruimte + symbool Alles sorteren + alles Alleen sorteren op letters + alleen basisletters Sorteren op accenten/hoofdlettergebruik/breedte/Kana + basis, accenten, hoofd-/kleine letters, varianten, lettergreepschrift Sorteren op accenten + basis, accenten Sorteren op accenten/hoofdlettergebruik/breedte + basis, accenten, hoofd-/kleine letters, varianten Volledige breedte Halve breedte Numeriek standaard emoji tekst + 12-uursysteem + 12 + 24-uursysteem + 24 12-uursysteem (0-11) 12 (0–11) 12-uursysteem (1-12) @@ -1432,6 +1470,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-uursysteem (1-24) 24 (1–24) + Spaties, interpunctie, alle symbolen verschuiven + Spaties, interpunctie verschuiven + Spaties, interpunctie verschuiven + Spaties, interpunctie, niet-valutasymbolen verschuiven losse stijl regelafbreking los normale stijl regelafbreking @@ -1453,8 +1495,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ahom cijfers Arabisch-Indische cijfers uitgebreide Arabisch-Indische cijfers + uitgebreid Arabisch-Indisch Armeense cijfers kleine Armeense cijfers + Armeens klein Balinese cijfers Bengaalse cijfers Brahmi cijfers @@ -1465,58 +1509,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dives Akuru cijfers Ethiopische cijfers Financiële cijfers + financieel cijfers met volledige breedte + volledige breedte Georgische cijfers Gunjala Gondi cijfers Masaram Gondi cijfers Griekse cijfers kleine Griekse cijfers + Grieks klein Gujarati cijfers Gurmukhi cijfers + Han-tekens voor dagnummering in traditionele kalenders Chinese decimale getallen + Chinees decimaal vereenvoudigd Chinese cijfers vereenvoudigd Chinese financiële cijfers + vereenvoudigd Chinees financieel traditioneel Chinese cijfers traditioneel Chinese financiële cijfers + traditioneel Chinees financieel Hebreeuwse cijfers Pahawh Hmong cijfers Nyiakeng Puachue Hmong cijfers Javaanse cijfers Japanse cijfers Japanse financiële cijfers + Japans financieel + Gannen-nummering voor het eerste Japanse jaar Kayah Li cijfers kawi cijfers Khmer cijfers Kannada cijfers Tai Tham Hora cijfers Tai Tham Tham cijfers + Tai Tham Tham (religieus) Laotiaanse cijfers Westerse cijfers Lepcha cijfers Limbu cijfers vette wiskundige cijfers + wiskundig vet wiskundige cijfers met dubbele lijn + wiskundig dubbellijnig niet-proportionele wiskundige cijfers + wiskundig monospace schreefloze vette wiskundige cijfers + wiskundig schreefloos vet schreefloze wiskundige cijfers + wiskundig schreefloos Malayalam cijfers Modi cijfers Mongoolse cijfers Mro cijfers Meetei Mayek cijfers Myanmarese cijfers + Myanmarese Oost-Pwo Karen + Myanmarese Pa’o Myanmarese Shan cijfers + Myanmarese Shan Myanmar Tai Laing cijfers + Myanmarese Tai Laing Nag Mundari cijfers Binnenlandse cijfers + binnenlands N’Ko cijfers Ol Chiki cijfers Odia cijfers Osmanya cijfers + omlijnd Hanifi Rohingya cijfers Romeinse cijfers + Romeins kleine Romeinse cijfers + Romeins klein Saurashtra cijfers + gesegmenteerd Sharada cijfers Khudawadi cijfers Sinhala Lith cijfers @@ -1526,18 +1594,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nieuwe Tai Lue cijfers traditionele Tamil cijfers Tamil cijfers + Tamil Telugu cijfers Thaise cijfers Tibetaanse cijfers Tirhuta cijfers Tangsa cijfers Traditionele cijfers + traditioneel Vai cijfers Warang Citi cijfers Wancho cijfers uit aan + niet-gespecificeerde machinevertaling + POSIX + + uit + aan + metriek Brits @@ -2086,9 +2162,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d y G - M/y G + M/y G d/M/y GGGGG - E d/M/y G + E d/M/y G MMM y G d MMM y G E d MMM y G @@ -2191,6 +2267,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM–MMMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -2448,17 +2528,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d y G - M/y G - d/M/y GGGGG - E d/M/y G + M-y G + d-M-y G + E d-M-y G MMM y G d MMM y G E d MMM y G + MMMM y G + d MMMM y G + E d MMMM y G d-M E d-M d MMM E d MMM d MMMM + E d MMMM 'week' W 'van' MMMM 'week' W 'van' MMMM M-y @@ -2468,11 +2552,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'week' w 'in' Y 'week' w 'in' Y + + {0} {1} + y G – y G @@ -2537,6 +2626,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM–MMMM + + d–d MMMM + d MMMM – d MMMM + MM-y – MM-y MM-y – MM-y @@ -2791,57 +2884,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-hōji (757-765) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Kaho (1094–1096) - Shōtoku (1097–1099) - Ten-ei (1110-1113) - Gen-ei (1118-1120) - Hoan (1120–1124) - Hoen (1135–1141) - Hogen (1156–1159) - Ken-ei (1206-1207) - Shōgen (1207–1211) - Shōkyū (1219–1222) - Tempuku (1233–1234) - En-ō (1239-1240) - Bun-ō (1260-1261) - Bun-ei (1264-1275) - Enkei (1308–1311) - Genkyō (1321–1324) - Kareki (1326–1329) - Kemmu (1334–1336) - Bun-an (1444-1449) - Tenmon (1532–1555) - Genwa (1615–1624) - Kan-ei (1624-1644) - Shōō (1652–1655) - Meiryaku (1655–1658) - Tenwa (1681–1684) - Kan-en (1748-1751) - Hōryaku (1751–1764) - An-ei (1772-1781) - Man-en (1860-1861) - - - Tenpyō-kampō (749-749) - Tenpyō-shōhō (749-757) - Tenpyō-jingo (765-767) - Jingo-keiun (767-770) - Ten-ō (781-782) - Ten-an (857-859) - Enkei (1308–1311) - Kareki (1326–1329) - Enkei (1744–1748) - - @@ -3477,6 +3519,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ s + + over {0} s + over {0} s + + + {0} s geleden + {0} s geleden + tijdzone @@ -3564,9 +3614,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Parijs - - Britse zomertijd - Londen @@ -3581,11 +3628,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Boedapest - - - Ierse standaardtijd - - Jeruzalem @@ -3750,9 +3792,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Acre-tijd - Acre-standaardtijd - Acre-zomertijd + Acre-tijd + Acre-standaardtijd + Acre-zomertijd @@ -3786,18 +3828,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska-standaardtijd Alaska-zomertijd - - AKT - AKST - AKDT - - - - - Alma-Ata-tijd - Alma-Ata-standaardtijd - Alma-Ata-zomertijd - @@ -3812,11 +3842,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Central-standaardtijd Central-zomertijd - - CT - CST - CDT - @@ -3824,11 +3849,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Eastern-standaardtijd Eastern-zomertijd - - ET - EST - EDT - @@ -3836,11 +3856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mountain-standaardtijd Mountain-zomertijd - - MT - MST - MDT - @@ -3848,11 +3863,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pacific-standaardtijd Pacific-zomertijd - - PT - PST - PDT - @@ -3868,20 +3878,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia-zomertijd - - - Aqtau-tijd - Aqtau-standaardtijd - Aqtau-zomertijd - - - - - Aqtöbe-tijd - Aqtöbe-standaardtijd - Aqtöbe-zomertijd - - Arabische tijd @@ -3916,11 +3912,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Atlantic-standaardtijd Atlantic-zomertijd - - AT - AST - ADT - @@ -3988,6 +3979,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Braziliaanse zomertijd + + + Britse tijd + Britse zomertijd + + Bruneise tijd @@ -4186,9 +4183,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Groenlandse tijd - Groenlandse standaardtijd - Groenlandse zomertijd + Groenlandse tijd + Groenlandse standaardtijd + Groenlandse zomertijd @@ -4205,11 +4202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ West-Groenlandse zomertijd - - - Guamese standaardtijd - - Golf-standaardtijd @@ -4222,11 +4214,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleoetische standaardtijd + Hawaii-standaardtijd - - HAST - @@ -4234,11 +4223,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hawaii-Aleoetische standaardtijd Hawaii-Aleoetische zomertijd - - HAT - HAST - HADT - @@ -4291,6 +4275,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iraanse zomertijd + + + Ierse tijd + Ierse standaardtijd + + Irkoetsk-tijd @@ -4314,9 +4304,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovsk-Kamtsjatski-tijd - Petropavlovsk-Kamtsjatski-standaardtijd - Petropavlovsk-Kamtsjatski-zomertijd + Kamtsjatka-tijd + Kamtsjatka-standaardtijd + Kamtsjatka-zomertijd @@ -4358,11 +4348,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirgizische tijd - - - Lanka-tijd - - Line-eilandse tijd @@ -4375,13 +4360,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe-eilandse zomertijd - - - Macause tijd - Macause standaardtijd - Macause zomertijd - - Magadan-tijd @@ -4497,11 +4475,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha-zomertijd - - - Noordelijk Mariaanse tijd - - Novosibirsk-tijd @@ -4581,13 +4554,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pyongyang-tijd - - - Qyzylorda-tijd - Qyzylorda-standaardtijd - Qyzylorda-zomertijd - - Réunionse tijd @@ -4607,16 +4573,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samara-tijd - Samara-standaardtijd - Samara-zomertijd + Samara-tijd + Samara-standaardtijd + Samara-zomertijd - Samoaanse tijd Samoaanse standaardtijd - Samoaanse zomertijd @@ -4685,9 +4649,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Turkse tijd - Turkse standaardtijd - Turkse zomertijd + Turkse tijd + Turkse standaardtijd + Turkse zomertijd @@ -4709,6 +4673,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguayaanse zomertijd + + + Ürümqi-tijd + + Oezbeekse tijd @@ -4846,7 +4815,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4857,7 +4825,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4868,7 +4835,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4879,7 +4845,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4890,7 +4855,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4901,7 +4865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4912,7 +4875,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4923,7 +4885,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4934,7 +4895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4945,7 +4905,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4956,7 +4915,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4967,7 +4925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4978,7 +4935,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -4989,7 +4945,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5000,7 +4955,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5011,7 +4965,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5022,7 +4975,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5033,7 +4985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5044,7 +4995,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5055,7 +5005,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5066,7 +5015,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5078,7 +5026,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5113,7 +5060,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5124,7 +5070,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5135,7 +5080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5146,7 +5090,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5157,7 +5100,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5168,7 +5110,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5179,7 +5120,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5190,7 +5130,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5201,7 +5140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5212,7 +5150,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5223,7 +5160,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5234,7 +5170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5245,7 +5180,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5256,7 +5190,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5267,7 +5200,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5278,7 +5210,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5289,7 +5220,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5300,7 +5230,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5311,7 +5240,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5322,7 +5250,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5333,7 +5260,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5344,7 +5270,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5355,7 +5280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤ #,##0.00;¤ -#,##0.00 - #,##0.00 ¤ #,##0.00;(¤ #,##0.00) @@ -5536,7 +5460,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Belarussische roebel - р. + Br Wit-Russische roebel (2000–2016) @@ -5572,9 +5496,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chinese yuan (offshore) - - dollar van de Chinese Volksbank - Chinese yuan @@ -6326,8 +6247,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabwe Gold - Zimbabwe Gold - Zimbabwe Gold ZiG @@ -6584,11 +6503,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} onderdeel {0} onderdelen - - deel - {0} deel - {0} delen - common parts per million @@ -6615,6 +6529,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ common + glucose {0} glucose {0} glucose @@ -7057,8 +6972,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ common zonneradius - {0} solar radius - {0} solar radii + {0} zonneradius + {0} zonneradii common @@ -7406,9 +7321,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} metrische cup - metrische fluid ounces - {0} metrische fluid ounce - {0} metrische fluid ounces + metrische fluid ounces + {0} metrische fluid ounce + {0} metrische fluid ounces acre-feet @@ -7991,17 +7906,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/in² - - deel - {0} deel - {0} delen + + ppm % - - Glc - {0} m/gUK {0} m/gUK @@ -8118,13 +8028,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} sn {0} sn - - cal-IT - {0}licht {0}licht + + ppb + diff --git a/make/data/cldr/common/main/nl_AW.xml b/make/data/cldr/common/main/nl_AW.xml index b0d2b5633e5f..2e1d94fa91b0 100644 --- a/make/data/cldr/common/main/nl_AW.xml +++ b/make/data/cldr/common/main/nl_AW.xml @@ -11,6 +11,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + diff --git a/make/data/cldr/common/main/nl_BE.xml b/make/data/cldr/common/main/nl_BE.xml index 40b8ee950e87..507bee60271b 100644 --- a/make/data/cldr/common/main/nl_BE.xml +++ b/make/data/cldr/common/main/nl_BE.xml @@ -106,6 +106,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + #,##0.00 + + + + - - - - - - - - isiNdebele - - - - [a b c d e f g h i j k l m n o p q s t u v w x y z] - [r] - [A B C D E F G H I J K L M N O P Q S T U V W X Y Z] - - - ‘ - ’ - “ - ” - - - - - - - - Jan - Feb - Mat - Apr - Mey - Jun - Jul - Arh - Sep - Okt - Usi - Dis - - - Janabari - uFeberbari - uMatjhi - u-Apreli - Meyi - Juni - Julayi - Arhostosi - Septemba - Oktoba - Usinyikhaba - Disemba - - - - - - - Son - Mvu - Bil - Tha - Ne - Hla - Gqi - - - uSonto - uMvulo - uLesibili - Lesithathu - uLesine - ngoLesihlanu - umGqibelo - - - - - - BC - AD - - - - - - - - , -   - - - - - ¤#,##0.00 - - - - - - R - - - - diff --git a/make/data/cldr/common/main/nr_ZA.xml b/make/data/cldr/common/main/nr_ZA.xml deleted file mode 100644 index 8619d738fc62..000000000000 --- a/make/data/cldr/common/main/nr_ZA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/nso.xml b/make/data/cldr/common/main/nso.xml index 2c67a43cfc17..7c23a9813363 100644 --- a/make/data/cldr/common/main/nso.xml +++ b/make/data/cldr/common/main/nso.xml @@ -141,6 +141,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic a p + + mesong + thapama + @@ -197,6 +201,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + {1} 'ka' {0} @@ -229,10 +237,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'beke' 'ya' 'bo' W 'ya' MMM dd-MM-y d MMM y + d MMMM y + y MMMM d, EEE 'beke' 'ya' 'bo' w 'ya' Y 'beke' 'ya' 'bo' w 'ya' Y + + {0} – {1} + {0}–{1} + {0}–{1} + h a – h a h–h a @@ -327,6 +342,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + Nako ya {0} + Nako le Hlabile {0} + Nako ya Tlwaelo ya {0} + + + Nako ya Legohle yeo e Rulagantšwego + + Nako Palogare ya Greenwich diff --git a/make/data/cldr/common/main/nv.xml b/make/data/cldr/common/main/nv.xml deleted file mode 100644 index dbddcc3e872d..000000000000 --- a/make/data/cldr/common/main/nv.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - Diné Bizaad - - - - [aáą{ą́} b {ch} {ch’} d {dl} {dz} eéę{ę́} g {gh} h {hw} iíį{į́} j k {k’} {kw} lł m n oóǫ{ǫ́} s {sh} t {t’} {tł} {tł’} {ts} {ts’} w x y z {zh}] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - diff --git a/make/data/cldr/common/main/nv_US.xml b/make/data/cldr/common/main/nv_US.xml deleted file mode 100644 index 93e72f7a81eb..000000000000 --- a/make/data/cldr/common/main/nv_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ny.xml b/make/data/cldr/common/main/ny.xml deleted file mode 100644 index dde0095dba0d..000000000000 --- a/make/data/cldr/common/main/ny.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - Nyanja - - - - [a b c d e f g h i j k l m n o p r s t u wŵ y z] - [q v x] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - - - - - - Jan - Feb - Mal - Epu - Mei - Jun - Jul - Oga - Sep - Oku - Nov - Dis - - - Januwale - Febuluwale - Malichi - Epulo - Mei - Juni - Julai - Ogasiti - Seputemba - Okutoba - Novemba - Disemba - - - - - - - Mul - Lem - Wir - Tat - Nai - San - Wer - - - Lamulungu - Lolemba - Lachiwiri - Lachitatu - Lachinayi - Lachisanu - Loweruka - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - Malawian Kwacha - - - - diff --git a/make/data/cldr/common/main/ny_MW.xml b/make/data/cldr/common/main/ny_MW.xml deleted file mode 100644 index cc88552b8095..000000000000 --- a/make/data/cldr/common/main/ny_MW.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/oc.xml b/make/data/cldr/common/main/oc.xml index 5c73deee3daf..7439414decc0 100644 --- a/make/data/cldr/common/main/oc.xml +++ b/make/data/cldr/common/main/oc.xml @@ -858,6 +858,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'setmana' w 'de' Y + + {0} – {1} + {0} – {1} + {0} – {1} + h'h'mm B – h'h'mm B h'h'mm – h'h'mm B @@ -1099,7 +1104,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic UTC{0} - UTC ora de {0} {0} (ora d’estiu) {0} (ora estandard) @@ -1148,9 +1152,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic París - - ora d’estiu britanica - Londres @@ -1159,11 +1160,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Budapèst - - - ora estandarda irlandesa - - Calcuta @@ -1384,6 +1380,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ora d’estiu de Brasilia + + + ora d’estiu britanica + + ora de Brunei @@ -1644,6 +1645,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ora d’estiu d’Iran + + + ora estandarda irlandesa + + ora d’Irkutsk @@ -1924,9 +1930,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ora de Samoa ora estandard de Samoa - ora d’estiu de Samoa diff --git a/make/data/cldr/common/main/oc_ES.xml b/make/data/cldr/common/main/oc_ES.xml index fa82fdff46e5..74ae622b5647 100644 --- a/make/data/cldr/common/main/oc_ES.xml +++ b/make/data/cldr/common/main/oc_ES.xml @@ -29,7 +29,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic espanhòu de Mexic francés canadienc francés suís - hindi (latin) hinglish hongarés indonesi @@ -100,6 +99,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Isles Cook Colòmbia Isla Clipperton + Sark Cabo Verde Isla de Nadau Yibuti @@ -217,8 +217,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic calendari gregorian + gregorian calendari ISO-8601 ordre estandard + standard digits occidentaus @@ -298,7 +300,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + M/y G d/M/y GGGGG + E, d/M/y G MMM y G d MMM y G E, d MMM y G @@ -441,20 +445,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic nov dec - - G - H - M - A - M - J - J - A - S - O - N - D - gèr hereuèr @@ -888,12 +878,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ereván - - Río Gallegos - - - Tucumán - Còdoba @@ -924,30 +908,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bermudes - - Eirunepé - - MmManaos - - - Cuiabá - - - Santarém + Manaos Belén - - Araguaína - Sao paulo - - Maceió - Timbu @@ -972,9 +941,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Urumqui - - Bogotá - Còsta Rica @@ -993,9 +959,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Argel - - Galápagos - Tallin @@ -1041,11 +1004,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Makasar - - - ora d’estiu d’Irlanda - - Jerusalen @@ -1622,6 +1580,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ora d’estiu d’Iran + + + ora d’estiu d’Irlanda + + ora d’Irkutsk @@ -2115,6 +2078,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic , : + + + + 0 mila + 00 mila + 000 mila + 0 milions + 00 milions + 000 milions + 0 miliards + 00 miliards + 000 miliards + 0 bilions + 00 bilions + 000 bilions + + + + + 0 mila + 00 mila + 000 mila + 0 M + 00 M + 000 M + 0 mil M + 00 mil M + 000 mil M + 0 B + 00 B + 000 B + + + @@ -2312,6 +2309,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic #,##0.00 + + + 0 mila ¤ + 00 mila ¤ + 000 mila ¤ + 0 M ¤ + 00 M ¤ + 000 M ¤ + 0 mil M ¤ + 00 mil M ¤ + 000 mil M ¤ + 0 B ¤ + 00 B ¤ + 000 B ¤ + + @@ -2673,6 +2686,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic dòlar deth Caribe Occidentau dòlars deth Caribe Occidentau + + Florin caribenh + Florins caribenhs + Fc. + franc CFA d’Africa occidentau francs CFA d’Africa occidentau @@ -2685,6 +2703,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ZK + + Aur de Zimbabwe + Aurs de Zimbabwe + ~{0} diff --git a/make/data/cldr/common/main/oka.xml b/make/data/cldr/common/main/oka.xml deleted file mode 100644 index b8243ac53640..000000000000 --- a/make/data/cldr/common/main/oka.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - n̓səl̓xcin̓ - - - - [aá {aˤ}{áˤ} c{c̓}č ə ɣ h ií ɪ{ɪ́} k{k̓} {kʷ}{k̓ʷ} l{l̓} ɬ {ƛ̓} m{m̓} n{n̓} p{p̓} q{q̓} {qʷ}{q̓ʷ} r s t{t̓} uú w{w̓} x{x̌} {xʷ}{x̌ʷ} y{y̓} ʔ ʕ{ʕ̓} {ʕʷ}{ʕ̓ʷ}] - [b d e f g j o v z] - [\- ‑ , ; \: ! ? . '‘’ "“” ( ) \[ \] @ * / \& #] - - diff --git a/make/data/cldr/common/main/oka_CA.xml b/make/data/cldr/common/main/oka_CA.xml deleted file mode 100644 index 8f72e43509e9..000000000000 --- a/make/data/cldr/common/main/oka_CA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/oka_US.xml b/make/data/cldr/common/main/oka_US.xml deleted file mode 100644 index 73906d28b4e7..000000000000 --- a/make/data/cldr/common/main/oka_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/om.xml b/make/data/cldr/common/main/om.xml index 2e3f64c1718f..affb517653d2 100644 --- a/make/data/cldr/common/main/om.xml +++ b/make/data/cldr/common/main/om.xml @@ -487,6 +487,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + @@ -890,6 +904,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -922,6 +940,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y G MMM d, y G E, MMM d, y G + E, MMMM d, y G h:mm a h:mm:ss a h:mm:ss a v @@ -932,19 +951,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'torbee' W 'kan' MMMM 'torbee' W 'kan' MMMM M/y - M/d/y + d/M/y E, M/d/y MM/y MMM y MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'torbee' w 'kan' Y 'torbee' w 'kan' Y + + {0} – {1} + {0} – {1} + {0}–{1} + y G – y G y – y G @@ -1015,7 +1041,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/y – M/y - M/d/y – M/d/y + d/M/y – d/M/y M/d/y – M/d/y M/d/y – M/d/y @@ -1655,16 +1681,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Idil-Addunyaa Qindaa’e - - - Sa’aatii Bonaa Biritish - - - - - Sa’aatii Istaandaardii Aayiriish - - Sa’aatii Afgaanistaan @@ -1696,11 +1712,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Alaaskaa Sa’aatii Guyyaa Alaaskaa - - AKT - AKST - AKDT - @@ -1715,11 +1726,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Gidduugaleessaa Sa’aatii Guyyaa Gidduugaleessaa - - CT - CST - CDT - @@ -1727,11 +1733,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Bahaa Sa’aatii Guyyaa Bahaa - - ET - EST - EDT - @@ -1739,11 +1740,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Maawonteen Sa’aatii Guyyaa Maawonteen - - MT - MST - MDT - @@ -1751,11 +1747,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Paasfiik Sa’aatii Guyyaa Paasfiik - - PT - PST - PDT - @@ -1798,11 +1789,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Istaandaardii Atilaantiik Sa’aatii Guyyaa Atilaantiik - - AT - AST - ADT - @@ -1870,6 +1856,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Bonaa Biraaziliyaa + + + Sa’aatii Biritish + Sa’aatii Bonaa Biritish + + Sa’aatii Bruunee Darusalaam @@ -2057,11 +2049,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Bonaa Giriinlaand Dhihaa - - - Sa’aatii Istaandaardii Guwaam - - Sa’aatii Istaandaardii Gaalfii @@ -2074,23 +2061,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Sa’aatii Istaandaardii Haawayi-Alewutiyan + Sa’aatii Istaandardii Hawaayi - - HAS - Sa’aatii Haawayi-Alewutiyan - Sa’aatii Istaandaardii Haawayi-Alewutiyan + Sa’aatii Istaandardii Hawaayi-Alushiyaa Sa’aatii Guyyaa Haawayi-Alewutiyan - - HAT - HAS - HADT - @@ -2143,6 +2122,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Guyyaa Iraan + + + Sa’aatii Aayiriish + Sa’aatii Istaandaardii Aayiriish + + Sa’aatii Irkutsk @@ -2203,11 +2188,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Kiyirigiyistan - - - Sa’aatii Laankaa - - Sa’aatii Odoloota Line @@ -2335,11 +2315,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sa’aatii Bonaa Fernando de Noronha - - - Sa’aatii Odoloota Maariyaanaa Kaabaa - - Sa’aatii Novosibirisk @@ -2438,9 +2413,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Sa’aatii Saamowaa Sa’aatii Istaandaardii Saamowaa - Sa’aatii Guyyaa Saamowaa diff --git a/make/data/cldr/common/main/or.xml b/make/data/cldr/common/main/or.xml index f7962ac1cdfe..9389d2775bfe 100644 --- a/make/data/cldr/common/main/or.xml +++ b/make/data/cldr/common/main/or.xml @@ -409,6 +409,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ପାଲି ପିଜିନ୍ ପୋଲିଶ୍ + ପିଡ୍‌ମଣ୍ଟିଜ୍ ପୋହପିଏନ୍ ମାଲିସୀଟ-ପାସମକୁଅଡ୍ଡି ପ୍ରୁସିୟ @@ -1046,15 +1047,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ କ୍ୟାଲେଣ୍ଡର୍ ମୁଦ୍ରା ଫର୍ମାଟ୍‌ + ପ୍ରତୀକ କ୍ରମବିନ୍ୟାସ ଅଣଦେଖା କରନ୍ତୁ + ବିପରୀତ ଆକ୍ସେଣ୍ଟ୍ କ୍ରମବିନ୍ୟାସ + ଅପର୍‌କେସ୍/ଲୋଅର୍‌କେସ୍ କ୍ରମବିନ୍ୟାସ + କେସ୍ ଅନୁଯାୟୀ କ୍ରମବିନ୍ୟାସ ସର୍ଟ୍‌ କ୍ରମ + ସ୍ବାଭାବିକୀକୃତ କ୍ରମବିନ୍ୟାସ + ସାଂଖ୍ୟିକ କ୍ରମବିନ୍ୟାସ + ସ୍କ୍ରିପ୍ଟ୍/ବ୍ଲକ୍ ପୁନଃ କ୍ରମବିନ୍ୟାସ + କ୍ରମବିନ୍ୟାସ ଦୃଢ଼ତା ମୁଦ୍ରା + ଟ୍ରାନ୍ସ୍‌ଫର୍ମ୍ ଗନ୍ତବ୍ୟ + ଶବ୍ଦକୋଷ ବ୍ରେକ୍ ବହିର୍ଭୂତ ଦର୍ଶାଯାଇଥିବା ଇମୋଜି + ସପ୍ତାହର ପ୍ରଥମ ଦିନ + ମିଶ୍ରିତ ଘଣ୍ଟା ଚକ୍ର (12 ବନାମ 24) + ଇନ୍‌ପୁଟ୍ ପଦ୍ଧତି + କୀ‘ବୋର୍ଡ୍ + ସର୍ବାଧିକ ଉପେକ୍ଷିତ ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌ ଶବ୍ଦଗୁଡ଼ିକ ଥିବା ଲାଇନ ବ୍ରେକ + ରୂପାନ୍ତର ନିୟମାବଳୀ ମାପ ପଦ୍ଧତି + ମାପ ଏକକ ସଂଖ୍ୟା + ପରିପୂରକ ଡେଟା ପାଇଁ ଅଞ୍ଚଳ + ରୂପାନ୍ତର ସୋର୍ସ୍ + ଅଞ୍ଚଳ ସବ୍‌ଡିଭିଜନ୍ Abbr ପରେ ଥିବା ବାକ୍ୟ + ରୂପାନ୍ତର + ମଶୀନ୍ ଦ୍ବାରା ଅନୁବାଦିତ + ଟାଇମ୍ ଜୋନ୍ + ଭାଷା ଭାରିଆଣ୍ଟ୍ + ଗୋପନୀୟ-ବ୍ୟବହାର + ଗୋପନୀୟ-ବ୍ୟବହାର ରୂପାନ୍ତର ବୌଦ୍ଧ କ୍ୟାଲେଣ୍ଡର୍‌ @@ -1079,9 +1106,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ହିଜ୍ରି ହିଜ୍ରି କ୍ୟାଲେଣ୍ଡର (ଟାବୁଲାର୍, ନାଗରିକ ଯୁଗ) ହିଜ୍ରି (ଟାବୁଲାର୍, ସିଭିଲ୍‌ ଆରମ୍ଭ କାଳ) + ହିଜ୍ରି, ସାଉଦି ଆରବ ପର୍ଯ୍ୟବେକ୍ଷଣ + ହିଜ୍ରି (ଟାବୁଲାର୍, ଜ୍ୟୋତିର୍ବିଜ୍ଞାନ କାଳ) ହିଜ୍ରି କ୍ୟାଲେଣ୍ଡର (ଉମ୍ ଅଲ୍-କୁରା) ହିଜ୍ରି (ଉମ୍ ଅଲ୍-କୁରା) ISO-8601 କ୍ୟାଲେଣ୍ଡର୍‌ + ଗ୍ରେଗୋରିଆନ୍ ଜାପାନିଜ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌ ଜାପାନିଜ୍‌ ପର୍ସିଆନ୍‌ କ୍ୟାଲେଣ୍ଡର୍‌ @@ -1092,15 +1122,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଆକାଉଣ୍ଟିଂ ମାନକ ମୁଦ୍ରା ଫର୍ମାଟ୍‌ ମାନକ + ଲୋଅର୍‌କେସ୍ + ଲୋଅର୍‌କେସ୍ + ଅପର୍‌କେସ୍ + ସୁସଙ୍ଗତି + ଶବ୍ଦକୋଷ ଡିଫଲ୍ଟ ୟୁନିକୋଡ୍‌ ସର୍ଟ୍‌ କ୍ରମ ଡିଫଲ୍ଟ୍‌ ୟୁନିକୋଡ୍‌ + ଇମୋଜି + ୟୁରୋପୀୟ ନିୟମ + ଫୋନ୍‌ବୁକ୍ + ଫୋନେଟିକ୍ + ପିନ୍‌ୟିନ୍ ସାଧାରଣ ଉଦ୍ଦେଶ୍ୟ-ବିଶିଷ୍ଟ ସନ୍ଧାନ ସର୍ଚ୍ଚ୍‌ + କୋରିଆନ୍ ପ୍ରାରମ୍ଭିକ ବ୍ୟଞ୍ଜନ ବର୍ଣ୍ଣ ଷ୍ଟାଣ୍ଡାର୍ଡ୍‌ ସର୍ଟ୍‌ କ୍ରମ ଷ୍ଟାଣ୍ଡାର୍ଡ୍‌ + ଷ୍ଟ୍ରୋକ୍ + ପାରମ୍ପରିକ + ରାଡିକଲ୍-ଷ୍ଟ୍ରୋକ୍ + ଝୂଇନ୍ + ମୁଦ୍ରା + ଅଙ୍କ + ବିରାମ ଚିହ୍ନ + ଖାଲି ସ୍ପେସ୍ + ପ୍ରତୀକ + ସମସ୍ତ + କେବଳ ବେସ୍ ଅକ୍ଷର + ବେସ୍, ଆକ୍ସେଣ୍ଟ୍, କେସ୍, ଭାରିଆଣ୍ଟ୍, କାନା + ବେସ୍, ଆକ୍ସେଣ୍ଟ୍ + ବେସ୍, ଆକ୍ସେଣ୍ଟ୍, କେସ୍, ଭାରିଆଣ୍ଟ୍ + ଫୁଲ୍‌ୱିଡ୍‌ଥ୍‌କୁ + ହାଫ୍‌‌ୱିଡ୍‌ଥ୍‌କୁ ଡିଫଲ୍ଟ୍‌ ଇମୋଜି ଟେକ୍ସ୍‌ଟ୍‌ + 12 ଘଣ୍ଟିଆ ପଦ୍ଧତି + 12 + 24 ଘଣ୍ଟିଆ ପଦ୍ଧତି + 24 12 ଘଣ୍ଟିଆ ପଦ୍ଧତି (0–11) 12 (0–11) 12 ଘଣ୍ଟିଆ ପଦ୍ଧତି (1–12) @@ -1109,6 +1170,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 ଘଣ୍ଟିଆ ପଦ୍ଧତି (1–24) 24 (1–24) + ଶିଫ୍ଟ୍ ସ୍ପେସ୍, ବିରାମ ଚିହ୍ନ, ସମସ୍ତ ପ୍ରତୀକ + ଶିଫ୍ଟ୍ ସ୍ପେସ୍, ବିରାମ ଚିହ୍ନ + ଶିଫ୍ଟ୍ ସ୍ପେସ୍, ବିରାମ ଚିହ୍ନ + ଶିଫ୍ଟ୍ ସ୍ପେସ୍, ବିରାମ ଚିହ୍ନ, ଅଣ-ମୁଦ୍ରା ପ୍ରତୀକ କୋହଳ ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌ କୋହଳ ସାଧାରଣ ଲାଇନ୍‌ ବ୍ରେକ୍‌ ଷ୍ଟାଇଲ୍‌ @@ -1119,6 +1184,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ସବୁ ରଖନ୍ତୁ ସାଧାରଣ ବାକ‍୍ୟାଂଶରେ ରଖନ୍ତୁ + US BGN ଲିପ୍ୟନ୍ତରଣ + US GEGN ଲିପ୍ୟନ୍ତରଣ ମେଟ୍ରିକ୍‌ ପଦ୍ଧତି ମେଟ୍ରିକ୍‌ ଇମ୍ପେରିଆଲ୍‌ ମାପ ପଦ୍ଧତି @@ -1127,48 +1194,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ US ଆରବିକ୍‌-ଇଣ୍ଡିକ୍‌ ଅଙ୍କଗୁଡ଼ିକ ପରିବର୍ଦ୍ଧିତ ଆରବିକ୍‌-ଇଣ୍ଡିକ୍‌ ଅଙ୍କଗୁଡ଼ିକ + ପରିବର୍ଦ୍ଧିତ ଆରବିକ-ଭାରତୀୟ ଆର୍ମେନିୟ ସଂଖ୍ୟାଗୁଡ଼ିକ ଆର୍ମେନିୟ ଛୋଟ ଅକ୍ଷର ସଂଖ୍ୟାଗୁଡ଼ିକ + ଆର୍ମେନିୟ ଲୋଅର୍‌କେସ୍ ବଙ୍ଗଳା ଅଙ୍କଗୁଡ଼ିକ ଚକମା ଅଙ୍କଗୁଡ଼ିକ ଦେବନାଗରୀ ଅଙ୍କଗୁଡ଼ିକ ଇଥିଓପିକ୍‌ ସଂଖ୍ୟାଗୁଡ଼ିକ + ଆର୍ଥିକ ପୂର୍ଣ୍ଣ-ପ୍ରସ୍ଥ ଅଙ୍କଗୁଡ଼ିକ + ପୂର୍ଣ୍ଣ-ପ୍ରସ୍ଥ ଜର୍ଜିଆନ୍‌ ସଂଖ୍ୟାଗୁଡ଼ିକ ଗ୍ରୀକ୍‌ ସଂଖ୍ୟାଗୁଡ଼ିକ ଗ୍ରୀକ୍‌ ଛୋଟ ଅକ୍ଷର ସଂଖ୍ୟାଗୁଡ଼ିକ + ଗ୍ରୀକ୍ ଲୋଅର୍‌କେସ୍ ଗୁଜରାଟୀ ଅଙ୍କଗୁଡ଼ିକ ଗୁରମୁଖୀ ଅଙ୍କଗୁଡ଼ିକ + ପାରମ୍ପରିକ କ୍ୟାଲେଣ୍ଡର୍ ପାଇଁ ହାନ୍-କ୍ୟାରେକ୍ଟର୍ ମାସର-ଦିନ ଚାଇନିଜ୍‌ ଦଶମିକ ସଂଖ୍ୟା + ଚାଇନିଜ୍ ସଂଖ୍ୟା ଆଇଡିଓଗ୍ରାଫ୍‌କୁ ଡିଜିଟ୍ ଭାବରେ ବ୍ୟବହାର କରୁଥିବା ସ୍ଥାନିକ ଦଶମିକ ସିଷ୍ଟମ୍ ସରଳୀକୃତ ଚିନି ସଂଖ୍ୟାଗୁଡ଼ିକ ସରଳୀକୃତ ଚିନି ଆର୍ଥିକ ସଂଖ୍ୟାଗୁଡ଼ିକ + ସରଳୀକୃତ ଚାଇନିଜ୍ ଆର୍ଥିକ ପାରମ୍ପରିକ ଚିନି ସଂଖ୍ୟାଗୁଡ଼ିକ ପାରମ୍ପରିକ ଚିନି ଆର୍ଥିକ ସଂଖ୍ୟାଗୁଡ଼ିକ + ପାରମ୍ପରିକ ଚାଇନିଜ୍ ଆର୍ଥିକ ହିବୃ ସଂଖ୍ୟାଗୁଡ଼ିକ ଜାଭାନିଜ ଅଙ୍କଗୁଡ଼ିକ ଜାପାନୀ ସଂଖ୍ୟାଗୁଡ଼ିକ ଜାପାନୀ ଆର୍ଥିକ ସଂଖ୍ୟାଗୁଡ଼ିକ + ଜାପାନୀ ଆର୍ଥିକ + ଜାପାନୀ ପ୍ରଥମ-ବର୍ଷ ଗ୍ୟାନେନ୍ ସଂଖ୍ୟା ପଦ୍ଧତି ଖିମର୍‌ ଅଙ୍କଗୁଡ଼ିକ କନ୍ନଡ଼ ଅଙ୍କଗୁଡ଼ିକ + ତାଇ ଥାମ୍ ଥାମ୍ (ଯାଜକୀୟ) ଲାଓ ଅଙ୍କଗୁଡ଼ିକ ପାଶ୍ଚାତ୍ୟ ଅଙ୍କଗୁଡ଼ିକ + ଗାଣିତିକ ବୋଲ୍ଡ୍ + ଗାଣିତିକ ଡବଲ୍-ଷ୍ଟ୍ରକ୍ + ଗାଣିତିକ ମନୋସ୍ପେସ୍ + ଗାଣିତିକ sans-serif ବୋଲ୍ଡ୍ + ଗାଣିତିକ sans-serif ମଲୟାଲମ୍ ଅଙ୍କଗୁଡ଼ିକ ମଙ୍ଗୋଲୀୟ ଡିଜିଟ୍ ମିତେଇ ମାୟେକ ଅଙ୍କଗୁଡ଼ିକ ମିଆଁମାର୍‌ ଅଙ୍କଗୁଡ଼ିକ + ମିଆଁମାର୍ ଇଷ୍ଟର୍ନ୍ ପୋ କାରେନ୍ + ମିଆଁମାର୍ ପାଓ + ମିଆଁମାର୍ ଶାନ୍ + ମିଆଁମାର୍ ତାଇ ଲାଏଙ୍ଗ୍ + ମୂଳ ଅଙ୍କ + ମୂଳ ଅଙ୍କ ଓଲ୍ ଚିକି ଅଙ୍କଗୁଡ଼ିକ ଓଡ଼ିଆ ଅଙ୍କଗୁଡ଼ିକ + ଆଉଟ୍‌ଲାଇନ୍ ଯୁକ୍ତ ରୋମାନ୍‌ ସଂଖ୍ୟାଗୁଡ଼ିକ + ରୋମାନ୍ ଅପର୍‌କେସ୍ ରୋମାନ୍‌ ଛୋଟ ଅକ୍ଷର ସଂଖ୍ୟାଗୁଡ଼ିକ + ରୋମାନ୍ ଲୋଅର୍‌କେସ୍ + ବିଭାଜିତ ପାରମ୍ପରିକ ତାମିଲ୍ ସଂଖ୍ୟାଗୁଡ଼ିକ ତାମିଲ୍ ଅଙ୍କଗୁଡ଼ିକ + ଆଧୁନିକ ତାମିଲ୍ ତେଲୁଗୁ ଅଙ୍କଗୁଡ଼ିକ ଥାଇ ଅଙ୍କଗୁଡ଼ିକ ତିବତୀ ଅଙ୍କଗୁଡ଼ିକ + ପାରମ୍ପରିକ ସଂଖ୍ୟା ଭାଇ ଅଙ୍କଗୁଡ଼ିକ ଅଫ୍‌ ଅନ୍‌ + ଅନିର୍ଦ୍ଧାରିତ ମଶୀନ୍ ଅନୁବାଦ + POSIX ଭାରିଆଣ୍ଟ୍ + + ଅଫ୍ + ଅନ୍ + ମେଟ୍ରିକ୍‌ ୟୁକେ @@ -1198,6 +1300,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + + + + + - + + + @@ -1276,6 +1392,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0}–{1} + {0} – {1} M/y GGGGG – M/y GGGGG @@ -1452,27 +1571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 4ର୍ଥ ତ୍ରୟମାସ - - - Q1 - Q2 - Q3 - Q4 - - - - - - AM - PM - - - AM - PM - - - ଖ୍ରୀଷ୍ଟପୂର୍ବ @@ -1537,6 +1636,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1585,11 +1687,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d, y E, MMM d, y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y Y ର ସପ୍ତାହ w Y ର ସପ୍ତାହ w + + {0} {1} + {0} {1} + {0} – {1} @@ -2622,9 +2730,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଲିବ୍ରେଭିଲ୍ଲେ - - ବ୍ରିଟିଶ୍‌ ଗ୍ରୀଷ୍ମକାଳୀନ ସମୟ - ଲଣ୍ଡନ୍ @@ -2715,9 +2820,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଜୟପୁରା - - ଆଇରିଶ୍‌ ମାନକ ସମୟ - ଡବଲିନ୍ @@ -3452,13 +3554,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଆଲାସ୍କା ଦିବାଲୋକ ସମୟ - - - ଅଲମାଟୀ ସମୟ - ଅଲମାଟୀ ମାନକ ସମୟ - ଅଲମାଟୀ ଗ୍ରୀଷ୍ମ ସମୟ - - ଆମାଜନ୍ ସମୟ @@ -3508,20 +3603,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଆପିଆ ଦିବାଲୋକ ସମୟ - - - ଅକତୌ ସମୟ - ଅକତୌ ମାନକ ସମୟ - ଅକତୌ ଗ୍ରୀଷ୍ମ ସମୟ - - - - - ଅକ୍ତୋବ ସମୟ - ଅକ୍ତୋବ ମାନକ ସମୟ - ଅକ୍ତୋବ ଗ୍ରୀଷ୍ମ ସମୟ - - ଆରବୀୟ ସମୟ @@ -3553,7 +3634,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଆଟଲାଣ୍ଟିକ୍ ସମୟ - ଆଟଲାଣ୍ଟିକ୍ ମାନାଙ୍କ ସମୟ + ଆଟଲାଣ୍ଟିକ୍ ମାନକ ସମୟ ଆଟଲାଣ୍ଟିକ୍ ଦିବାଲୋକ ସମୟ @@ -3623,6 +3704,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ବ୍ରାସିଲିଆ ଗ୍ରୀଷ୍ମକାଳ ସମୟ + + + ବ୍ରିଟିଶ ସମୟ + ବ୍ରିଟିଶ୍‌ ଗ୍ରୀଷ୍ମକାଳୀନ ସମୟ + + ବ୍ରୁନେଇ ଡାରୁସାଲାମ ସମୟ @@ -3688,7 +3775,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ କ୍ୟୁବା ସମୟ - କ୍ୟୁବା ମାନାଙ୍କ ସମୟ + କ୍ୟୁବା ମାନକ ସମୟ କ୍ୟୁବା ଦିବାଲୋକ ସମୟ @@ -3799,6 +3886,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + ଗ୍ରୀନ୍‌ଲ୍ୟାଣ୍ଡ୍ ସମୟ + ଗ୍ରୀନ୍‌ଲ୍ୟାଣ୍ଡ୍ ମାନକ ସମୟ + ଗ୍ରୀନ୍‌ଲ୍ୟାଣ୍ଡ୍ ଗ୍ରୀଷ୍ମ ସମୟ + + ପୂର୍ବ ଗ୍ରୀନଲ୍ୟାଣ୍ଡ୍ ସମୟ @@ -3831,7 +3925,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ହୱାଇ-ଆଲେଉଟିୟ ସମୟ - ହୱାଇ-ଆଲେଉଟିୟ ମାନାଙ୍କ ସମୟ + ହୱାଇ-ଅଲୂଶନ୍ ମାନକ ସମୟ ହୱାଇ-ଆଲେଉଟିୟ ଦିବାଲୋକ ସମୟ @@ -3889,6 +3983,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଇରାନ ଦିବାଲୋକ ସମୟ + + + ଆଇରିସ୍ ସମୟ + ଆଇରିଶ୍‌ ମାନକ ସମୟ + + ଇଅରକୁଟସ୍କ ସମୟ @@ -3956,11 +4056,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ କିର୍ଗିସ୍ତାନ ସମୟ - - - ଲଙ୍କା ସମୟ - - ଲାଇନ୍‌ ଦ୍ୱୀପପୁଞ୍ଜ ସମୟ @@ -3973,13 +4068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଲର୍ଡ ହୋୱେ ଦିବାଲୋକ ସମୟ - - - ମାକାଓ ସମୟ - ମକାଓ ମାନକ ସମୟ - ମକାଓ ଗ୍ରୀଷ୍ମ ସମୟ - - ମାଗାଡାନ୍ ସମୟ @@ -4095,11 +4183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଫର୍ଣ୍ଣାଣ୍ଡୋ ଡି ନୋରୋନ୍ନା ଗ୍ରୀଷ୍ମକାଳ ସମୟ - - - ଉତ୍ତର ମେରିଆନା ଆଇଲ୍ୟାଣ୍ଡ ସମୟ - - ନୋଭୋସିବିରସ୍କ ସମୟ @@ -4179,13 +4262,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ପୋୟଙ୍ଗୟାଙ୍ଗ ସମୟ - - - କାଜିଲୋର୍ଡା ସମୟ - କାଜିଲୋର୍ଡା ମାନକ ସମୟ - କାଜିଲୋର୍ଡା ଗ୍ରୀଷ୍ମ ସମୟ - - ରିୟୁନିଅନ୍‌ ସମୟ @@ -4212,9 +4288,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ସାମୋଆ ସମୟ ସାମୋଆ ମାନକ ସମୟ - ସାମୋଆ ଦିବାଲୋକ ସମୟ @@ -4281,6 +4355,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଚୂକ୍‌ ସମୟ + + + ତୁର୍କୀ ସମୟ + ତୁର୍କୀ ମାନକ ସମୟ + ତୁର୍କୀ ଗ୍ରୀଷ୍ମ ସମୟ + + ତୁର୍କମେନିସ୍ତାନ ସମୟ @@ -4300,6 +4381,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଉରୁଗୁଏ ଗ୍ରୀଷ୍ମକାଳ ସମୟ + + + ଉରୁମ୍‌ଚି ସମୟ + + ଉଜବେକିସ୍ତାନ ସମୟ @@ -4984,8 +5070,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌ - କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌ - କ‍୍ୟାରବିଅନ୍‌ ଗିଲ୍ଡର୍‌ ପଶ୍ଚିମ ଆଫ୍ରିକିୟ CFA ଫ୍ରାଙ୍କ୍ @@ -5011,8 +5095,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌ - ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌ - ଜିମ୍ବାୱିଅନ୍‌ ଗୋଲ୍ଡ୍‌ @@ -5021,6 +5103,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ଦିନ {0} ଦିନଗୁଡ଼ିକ + {0}ମ ଡାହାଣପଟ ରାସ୍ତାରେ ଯାଆନ୍ତୁ। + {0} ଡାହାଣପଟ ରାସ୍ତାରେ ଯାଆନ୍ତୁ। + {0}ୟ ଡାହାଣପଟ ରାସ୍ତାରେ ଯାଆନ୍ତୁ। + {0}ତମ ଡାହାଣପଟ ରାସ୍ତାରେ ଯାଆନ୍ତୁ। ଡାହାଣରେ ଥିବା {0} ନିଅନ୍ତୁ @@ -5209,11 +5295,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ଆଇଟମ୍ {0} ଆଇଟମ୍‌ଗୁଡିକ - - ଅଂଶ - {0} ଅଂଶ - {0} ଅଂଶ - ଅଂଶ ପ୍ରତି ନିୟୁତ {0} ଅଂଶ ପ୍ରତି ନିୟୁତ @@ -6915,7 +6996,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ଆଇଟମ୍ - ଅଂଶ {0} ଅଂଶ {0} ଅଂଶ @@ -6937,9 +7017,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ମୋଲ {0}ମୋଲ - - Glc - ଲି/100କିମି {0}ଲି/100 କିମି @@ -7324,17 +7401,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ଚିମୁଟ {0} ଚିମୁଟ - - {0} sr - {0} sr - - - {0} kat - {0} kat - - - cal-IT - {0}ppb {0}ppb diff --git a/make/data/cldr/common/main/osa.xml b/make/data/cldr/common/main/osa.xml deleted file mode 100644 index 5a9def7c590d..000000000000 --- a/make/data/cldr/common/main/osa.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - 𐓏𐓘𐓻𐓘𐓻𐓟 - - - United States - - - 𐓷𐓘𐓵𐓘𐓷𐓘 𐓨𐓣𐓡𐓣𐓵𐓟 𐓣͘𐓤𐓯𐓟 - - - - [𐓘{𐓘́}{𐓘́͘}{𐓘̋}{𐓘̋͘}{𐓘̄}{𐓘̄͘}{𐓘͘} 𐓙{𐓙́}{𐓙̋}{𐓙̄} 𐓚{𐓚́}{𐓚̋}{𐓚̄} 𐓛{𐓛͘} 𐓜 𐓝 𐓞 𐓟{𐓟́}{𐓟̋}{𐓟̄} 𐓠{𐓠́}{𐓠̋}{𐓠̄} 𐓡 𐓢 𐓣{𐓣́}{𐓣́͘}{𐓣̋}{𐓣̋͘}{𐓣̄}{𐓣̄͘}{𐓣͘} 𐓤 𐓥 𐓦 𐓧 𐓨 𐓩 𐓪{𐓪́}{𐓪́͘}{𐓪̋}{𐓪̋͘}{𐓪̄}{𐓪̄͘}{𐓪͘} 𐓫{𐓫́}{𐓫̋}{𐓫̄} 𐓬 𐓭 𐓮 𐓯 𐓰 𐓱 𐓲 𐓳 𐓴 𐓵 𐓶{𐓶́}{𐓶̋}{𐓶̄} 𐓷 𐓸 𐓹 𐓺 𐓻] - [𐒰{𐒰͘} 𐒱 𐒲 𐒳 𐒴 𐒵 𐒶 𐒷 𐒸 𐒹 𐒺 𐒻{𐒻͘} 𐒼 𐒽 𐒾 𐒿 𐓀 𐓁 𐓂{𐓂͘} 𐓃 𐓄 𐓅 𐓆 𐓇 𐓈 𐓉 𐓊 𐓋 𐓌 𐓍 𐓎 𐓏 𐓐 𐓑 𐓒 𐓓] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - - - - - - - - EEEE, MMMM d, y G - - - - - MMMM d, y G - - - - - MMM d, y G - - - - - M/d/y GGGGG - GGGGGyMd - - - - - - - - - 𐓄𐓘𐓡𐓛͘𐓧𐓟 - 𐓵𐓪͘𐓬𐓘 - 𐓵𐓘𐓜𐓣 - 𐓰𐓪𐓬𐓘 - 𐓮𐓘𐓰𐓘 - 𐓯𐓘𐓬𐓟 - 𐓄𐓟𐓵𐓪͘𐓬𐓘 - 𐒼𐓣𐓟𐓰𐓪𐓬𐓘 - 𐒿𐓟𐓜𐓛𐓲𐓟𐓷𐓣͘𐓤𐓟 - 𐒿𐓟𐓜𐓛 - 𐒰𐓧𐓣 𐓏𐓣͘𐓸𐓲𐓣 - 𐒰𐓧𐓣 𐓍𐓪͘𐓬𐓘 - - - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓄𐓘𐓡𐓛͘𐓧𐓟 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓏𐓟𐓵𐓪͘𐓬𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓏𐓟𐓵𐓘𐓜𐓣 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓏𐓟𐓰𐓪𐓬𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓏𐓟𐓮𐓘𐓰𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓏𐓟𐓯𐓘𐓬𐓟 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐓄𐓟𐓵𐓪͘𐓬𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐒼𐓣𐓟𐓰𐓪𐓬𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐒿𐓟𐓜𐓛𐓲𐓟𐓷𐓣͘𐓤𐓟 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐒿𐓟𐓜𐓛 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐒰𐓧𐓣 𐓏𐓣͘𐓸𐓲𐓣 - 𐓀𐓣͘𐓪͘𐓬𐓘 𐒰𐓧𐓣 𐓍𐓪͘𐓬𐓘 - - - - - - - 𐓏 - 𐓄 - 𐓍 - 𐒴 - 𐓈 - 𐓊 - 𐓸 - - - 𐒹𐓘͘𐓬𐓘 𐓏𐓘𐓤𐓘͘𐓰𐓘𐓤𐓣 - 𐒹𐓘͘𐓬𐓘 𐓄𐓘𐓡𐓛͘𐓧𐓣 - 𐒹𐓘͘𐓬𐓘 𐓏𐓟𐓵𐓪͘𐓬𐓘 - 𐒹𐓘͘𐓬𐓘 𐓏𐓟𐓵𐓘𐓜𐓣 - 𐒹𐓘͘𐓬𐓘 𐓏𐓟𐓰𐓪𐓬𐓘 - 𐒹𐓘͘𐓬𐓘 𐓈𐓘 𐓵𐓘𐓲𐓘 𐓻𐓣͘ - 𐒹𐓘͘𐓬𐓘 𐓂𐓤𐓘𐓸𐓟 𐓣͘𐓤𐓟 - - - - - - - EEEE, MMMM d, y - - - - - MMMM d, y - - - - - MMM d, y - - - - - M/d/yy - yyMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - 𐓂𐓨𐓚𐓤𐓘 - - - 𐓀𐓣͘𐓪͘𐓬𐓘 - - - 𐒹𐓘͘𐓬𐓘 𐓷𐓘𐓤𐓘͘𐓰𐓘𐓤𐓣 - - - 𐒹𐓘͘𐓬𐓘 - - - 𐓨𐓣𐓪𐓵𐓘𐓤𐓟 𐓪𐓰𐓘𐓩𐓘͘ - - - 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 - - - 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 𐓻𐓣͘ - - - - - - - $ - - - - - - - 𐓂𐓨𐓚𐓤𐓘 - 𐓂𐓨𐓚𐓤𐓘 {0} - - - 𐓀𐓣͘𐓪͘𐓬𐓘 - 𐓀𐓣͘𐓪͘𐓬𐓘 {0} - - - 𐒹𐓘͘𐓬𐓘𐓷𐓘𐓤𐓘͘𐓰𐓛𐓤𐓣 - 𐒹𐓘͘𐓬𐓘𐓷𐓘𐓤𐓘͘𐓰𐓛𐓤𐓣 {0} - - - 𐒹𐓘͘𐓬𐓘 - {0} 𐒹𐓘͘𐓬𐓘 - - - 𐓨𐓣𐓪𐓵𐓘𐓤𐓟 𐓪𐓰𐓘𐓩𐓘͘ - {0} 𐓨𐓣𐓪𐓵𐓘𐓤𐓟 𐓪𐓰𐓘𐓩𐓘͘ - - - 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 - {0} 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 - - - 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 𐓻𐓣͘ - {0} 𐓰𐓘𐓲𐓟 𐓤𐓯𐓣𐓵𐓟 𐓻𐓣͘ - - - - diff --git a/make/data/cldr/common/main/osa_US.xml b/make/data/cldr/common/main/osa_US.xml deleted file mode 100644 index bbf9ad2c3d4e..000000000000 --- a/make/data/cldr/common/main/osa_US.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/pa.xml b/make/data/cldr/common/main/pa.xml index f9b30606fb7a..d047a3e79842 100644 --- a/make/data/cldr/common/main/pa.xml +++ b/make/data/cldr/common/main/pa.xml @@ -54,7 +54,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਬੇਂਬਾ ਬੇਨਾ ਬੁਲਗਾਰੀਆਈ - ਹਰਿਆਣਵੀ + ਹਰਿਆਣਵੀ ਪੱਛਮੀ ਬਲੂਚੀ ਭੋਜਪੁਰੀ ਬਿਸਲਾਮਾ @@ -187,7 +187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਇਬਾਨ ਇਬੀਬੀਓ ਇੰਡੋਨੇਸ਼ੀਆਈ - ਇੰਟਰਲਿੰਗੁਈ + ਇੰਟਰਲਿੰਗੁਈ ਇਗਬੋ ਸਿਚੁਆਨ ਯੀ ਪੱਛਮੀ ਕੈਨੇਡੀਅਨ ਇਨੂਕਟੀਟੂਟ @@ -237,13 +237,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਬਫ਼ੀਆ ਕਲੋਨੀਅਨ ਕੁਰਦਿਸ਼ - ਕੁਰਦਿਸ਼ - ਕੁਰਮਾਂਜੀ + ਕੁਰਦਿਸ਼ + ਕੁਰਮਾਂਜੀ ਕੁਮੀਕ ਕੋਮੀ ਕੋਰਨਿਸ਼ ਕਵਾਕ’ਵਾਲਾ - ਕੁਵੀ + ਕੁਵੀ ਕਿਰਗੀਜ਼ ਲਾਤੀਨੀ ਲੈਡੀਨੋ @@ -348,6 +348,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਪਾਲੀ ਪਿਜਿਨ ਪੋਲੈਂਡੀ + ਪੀਡਮੌਂਟੀ ਮਾਲੀਸੇਟ-ਪਾਸਾਮਾਕਵੋਡੀ ਪਰੂਸ਼ੀਆ ਪਸ਼ਤੋ @@ -413,7 +414,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਕਾਂਗੋ ਸਵਾਇਲੀ ਕੋਮੋਰੀਅਨ ਸੀਰੀਆਈ - ਸਿਲੇਸੀਅਨ + ਸਿਲੇਸੀਅਨ ਤਮਿਲ ਦੱਖਣੀ ਟਚੋਨ ਤੇਲਗੂ @@ -454,9 +455,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਉਜ਼ਬੇਕ ਵਾਈ ਵੇਂਡਾ - ਵੇਨੇਸ਼ੀਅਨ + ਵੇਨੇਸ਼ੀਅਨ ਵੀਅਤਨਾਮੀ - ਮਖੂਵਾ + ਮਖੂਵਾ ਵੋਲਾਪੂਕ ਵੂੰਜੋ ਵਲੂਨ @@ -468,7 +469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਚੀਨੀ ਵੂ ਕਾਲਮਿਕ ਖੋਸਾ - ਕਾਂਗੜੀ + ਕਾਂਗੜੀ ਸੋਗਾ ਯਾਂਗਬੇਨ ਯੇਂਬਾ @@ -477,7 +478,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਨਹੀਂਗਾਤੂ ਕੈਂਟੋਨੀਜ਼ ਚੀਨੀ, ਕੈਂਟੋਨੀਜ਼ - ਜ਼ੁਆਂਗ + ਜ਼ੁਆਂਗ ਮਿਆਰੀ ਮੋਰੋਕੇਨ ਟਾਮਾਜ਼ਿਕ ਚੀਨੀ ਚੀਨੀ, ਮੈਂਡਰਿਨ @@ -874,15 +875,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਕੈਲੰਡਰ ਮੁਦਰਾ ਬਣਤਰ + ਚਿੰਨ੍ਹ ਅਣਡਿੱਠ ਕਰਨ ਦੀ ਤਰਤੀਬ + ਉਲਟ-ਲਗਾਂ ਤਰਤੀਬ + ਲੋਅਰਕੇਸ/ਅੱਪਰਕੇਸ ਤਰਤੀਬ + ਕੇਸ ਸੈਂਸਟਿਵ ਤਰਤੀਬ ਲੜੀਬੱਧ ਕ੍ਰਮ + ਸਧਾਰਨੀਕਰਨ ਤਰਤੀਬ + ਅੰਕੀ ਤਰਤੀਬ + ਲਿਪੀ/ਬਲਾਕ ਮੁੜ-ਤਰਤੀਬ + ਤਰਤੀਬ ਦਾ ਪੱਧਰ ਮੁਦਰਾ + ਨਿਰਧਾਰਤ ਰੂਪਬਦਲੀ + ਸ਼ਬਦਕੋਸ਼ ਵੰਡ ਅਪਵਾਦ ਇਮੋਜੀ ਪੇਸ਼ਕਾਰੀ + ਹਫ਼ਤੇ ਦਾ ਪਹਿਲਾ ਦਿਨ + ਮਿਲਾ ਕੇ ਘੰਟੇ ਦਾ ਚੱਕਰ (12 ਬਨਾਮ 24) + ਇਨਪੁੱਟ ਤਰੀਕਾ + ਕੀਬੋਰਡ + ਸਭ ਤੋਂ ਵੱਧ ਅਣਡਿੱਠ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ ਸ਼ਬਦਾਂ ਵਿਚਕਾਰ ਲਾਈਨ ਵਿੱਥ + ਰੂਪਾਂਤਰਨ ਨਿਯਮ ਮਾਪ ਪ੍ਰਣਾਲੀ + ਮਾਪ ਦੀ ਇਕਾਈ ਸੰਖਿਆਵਾਂ + ਪੂਰਕ ਡੇਟਾ ਲਈ ਖੇਤਰ + ਰੂਪਬਦਲੀ ਸਰੋਤ + ਖੇਤਰੀ ਉਪ-ਵਿਭਾਗ ਸੰਖੇਪ ਸ਼ਬਦ ਤੋਂ ਬਾਅਦ ਵਾਕ ਵਿੱਥ + ਰੂਪਬਦਲੀ + ਮਸ਼ੀਨੀ ਅਨੁਵਾਦ + ਸਮਾਂ ਜ਼ੋਨ + ਭਾਸ਼ਾਈ ਰੂਪ + ਨਿੱਜੀ ਵਰਤੋਂ + ਨਿੱਜੀ-ਵਰਤੋਂ ਰੂਪਬਦਲੀ ਬੋਧੀ ਕੈਲੰਡਰ @@ -908,11 +935,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਰਨੀਬੱਧ, ਸਮਾਜਿਕ ਯੁੱਗ) ਇਸਲਾਮੀ (ਸਾਰਨੀਬੱਧ, ਸਮਾਜਿਕ ਯੁੱਗ) ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਊਦੀ ਅਰਬ, ਚੰਨ ਦਿਖਣਾ) + ਹਿਜਰੀ, ਸਾਊਦੀ ਅਰਬ ਦਰਸ਼ਨ ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਸਾਰਨੀਬੱਧ, ਖਗੋਲੀ ਯੁੱਗ) ਇਸਲਾਮੀ (ਸਾਰਨੀਬੱਧ, ਖਗੋਲੀ ਯੁੱਗ) ਇਸਲਾਮੀ ਕੈਲੰਡਰ (ਅਮ ਅਲ-ਕੁਰਾ) ਇਸਲਾਮੀ (ਉਮ ਅਲ-ਕੁਰਾ) (ISO-8601) ਕੈਲੰਡਰ + ਗ੍ਰੈਗੋਰੀਅਨ ਜਪਾਨੀ ਕੈਲੰਡਰ ਜਪਾਨੀ ਫ਼ਾਰਸੀ ਕੈਲੰਡਰ @@ -923,18 +952,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਲੇਖਾ ਮਿਆਰੀ ਮੁਦਰਾ ਬਣਤਰ ਮਿਆਰੀ + ਲੋਅਰਕੇਸ + ਲੋਅਰਕੇਸ + ਅੱਪਰਕੇਸ ਪਿਛਲਾ ਤਰਤੀਬ ਵਾਰ ਕ੍ਰਮ, ਅਨੁਰੂਪਤਾ ਲਈ + ਢੁਕਵਾਂਪਣ ਸ਼ਬਦ-ਕੋਸ਼ ਲੜੀਬੱਧ ਕ੍ਰਮ + ਸ਼ਬਦਕੋਸ਼ ਮੂਲ ਯੂਨੀਕੋਡ ਲੜੀਬੱਧ ਕ੍ਰਮ ਡਿਫ਼ੌਲਟ ਯੂਨੀਕੋਡ + ਇਮੋਜੀ + ਯੂਰਪੀ ਨਿਯਮ + ਫ਼ੋਨਬੁਕ + ਫ਼ੋਨੈਟਿਕ + ਪਿਨਯਿਨ ਆਮ-ਮੰਤਵ ਖੋਜ ਖੋਜੋ + ਕੋਰੀਅਨ ਪਹਿਲਾ ਵਿਅੰਜਨ ਸਧਾਰਨ ਲੜੀਬੱਧ ਕ੍ਰਮ ਮਿਆਰੀ + ਸਟ੍ਰੋਕ ਰਵਾਇਤੀ ਲੜੀਬੱਧ ਕ੍ਰਮ + ਰਿਵਾਇਤੀ + ਰੈਡੀਕਲ-ਸਟ੍ਰੋਕ + ਝੂਇਨ + ਮੁਦਰਾ + ਅੰਕ + ਵਿਰਾਮ ਚਿੰਨ੍ਹ + ਖ਼ਾਲੀ ਸਪੇਸ + ਚਿੰਨ੍ਹ + ਸਭ + ਸਿਰਫ਼ ਬੁਨਿਆਦੀ ਅੱਖਰ + ਬੁਨਿਆਦੀ ਅੱਖਰ, ਸੁਰ ਚਿੰਨ੍ਹ, ਅੱਖਰ ਰੂਪ, ਰੂਪਾਂਤਰ, ਕਾਨਾ + ਬੁਨਿਆਦੀ ਅੱਖਰ, ਸੁਰ ਚਿੰਨ੍ਹ + ਬੁਨਿਆਦੀ ਅੱਖਰ, ਸੁਰ ਚਿੰਨ੍ਹ, ਅੱਖਰ ਰੂਪ, ਰੂਪਾਂਤਰ + ਪੂਰੀ ਚੌੜਾਈ ਤੱਕ + ਅੱਧੀ ਚੌੜਾਈ ਤੱਕ ਡਿਫ਼ੌਲਟ ਇਮੋਜੀ ਟੈਕਸਟ + 12 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ + 12 + 24 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ + 24 12 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (0–11) 12 (0–11) 12 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (1–12) @@ -943,6 +1003,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 ਘੰਟੇ ਦੀ ਪ੍ਰਣਾਲੀ (1–24) 24 (1–24) + ਖਾਲੀ ਥਾਂ, ਵਿਰਾਮ ਚਿੰਨ੍ਹ, ਸਾਰੇ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਘੱਟ ਮਹੱਤਵ ਦਿਓ + ਖਾਲੀ ਥਾਂ, ਵਿਰਾਮ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਘੱਟ ਮਹੱਤਵ ਦਿਓ + ਖਾਲੀ ਥਾਂ, ਵਿਰਾਮ ਚਿੰਨ੍ਹ, ਗੈਰ-ਮੁਦਰਾ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਘੱਟ ਮਹੱਤਵ ਦਿਓ + ਖਾਲੀ ਥਾਂ, ਵਿਰਾਮ ਚਿੰਨ੍ਹ, ਗੈਰ-ਮੁਦਰਾ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਘੱਟ ਮਹੱਤਵ ਦਿਓ ਖੁੱਲ੍ਹੀ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ ਖੁੱਲ੍ਹੀ ਸਧਾਰਨ ਰੇਖਾ ਵਿੱਥ ਸ਼ੈਲੀ @@ -953,6 +1017,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਸਭ ਰੱਖੋ ਸਧਾਰਨ ਵਾਕੰਸ਼ਾਂ ‘ਚ ਰੱਖੋ + US BGN ਲਿਪੀਅੰਤਰਨ + UN GEGN ਲਿਪੀਅੰਤਰਨ ਮੀਟਰਿਕ ਪ੍ਰਣਾਲੀ ਮੀਟਰਿਕ ਇੰਪੀਰੀਅਲ ਮਾਪ ਪ੍ਰਣਾਲੀ @@ -961,49 +1027,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ US ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ ਵਿਸਤਾਰਿਤ ਅਰਬੀ-ਭਾਰਤੀ ਅੰਕ + ਵਿਸਤਾਰਿਤ ਅਰਬੀ-ਭਾਰਤੀ ਆਰਮੀਨੀਅਨ ਸੰਖਿਆਵਾਂ ਆਰਮੀਨੀਅਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ + ਆਰਮੀਨੀਅਨ ਲੋਅਰਕੇਸ ਬੰਗਾਲੀ ਅੰਕ ਬਰਾਹਮੀ ਅੰਕ ਚਕਮਾ ਅੰਕ ਦੇਵਨਾਗਰੀ ਅੰਕ ਐਥਿਓਪਿਕ ਸੰਖਿਆਵਾਂ + ਵਿੱਤੀ ਪੂਰਨ ਵਿਸਤਾਰ ਅੰਕ + ਪੂਰਨ ਵਿਸਤਾਰ ਜਾਰਜੀਅਨ ਸੰਖਿਆਵਾਂ ਯੂਨਾਨੀ ਸੰਖਿਆਵਾਂ ਯੂਨਾਨੀ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ + ਯੂਨਾਨੀ ਲੋਅਰਕੇਸ ਗੁਜਰਾਤੀ ਅੰਕ ਗੁਰਮੁਖੀ ਅੰਕ + ਰਵਾਇਤੀ ਕੈਲੰਡਰਾਂ ਲਈ ਹਾਨ ਅੱਖਰਾਂ ਵਿੱਚ ਮਹੀਨੇ ਦੇ ਦਿਨ ਦਾ ਅੰਕਣ ਚੀਨੀ ਦਸ਼ਮਲਵ ਸੰਖਿਆਵਾਂ + ਚੀਨੀ ਸੰਖਿਆ ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਹਿੰਦਸਿਆਂ ਵਜੋਂ ਵਰਤਦੀ ਸਥਾਨਕ ਦਸ਼ਮਲਵ ਪ੍ਰਣਾਲੀ ਸਰਲ ਚੀਨੀ ਸੰਖਿਆਵਾਂ ਸਰਲ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ + ਸਰਲ ਚੀਨੀ ਵਿੱਤੀ ਰਵਾਇਤੀ ਚੀਨੀ ਸੰਖਿਆਵਾਂ ਰਵਾਇਤੀ ਚੀਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ + ਰਵਾਇਤੀ ਚੀਨੀ ਵਿੱਤੀ ਹਿਬਰੂ ਸੰਖਿਆਵਾਂ ਜਾਵਾਨੀਜ਼ ਅੰਕ ਜਪਾਨੀ ਸੰਖਿਆਵਾਂ ਜਪਾਨੀ ਵਿੱਤੀ ਸੰਖਿਆਵਾਂ + ਜਪਾਨੀ ਵਿੱਤੀ + ਜਾਪਾਨੀ ਗੰਨੇਨ ਪਹਿਲੇ ਸਾਲ ਦਾ ਅੰਕਣ ਖਮੇਰ ਅੰਕ ਕੰਨੜ ਅੰਕ + ਤਾਈ ਥਾਮ ਥਾਮ (ਧਾਰਮਿਕ) ਲਾਓ ਅੰਕ ਪੱਛਮੀ ਅੰਕ + ਗਣਿਤਕ ਗੂੜ੍ਹਾ + ਗਣਿਤਕ ਦੋਹਰੀ-ਲਕੀਰ + ਗਣਿਤਕ ਮੋਨੋਸਪੇਸ + ਗਣਿਤਕ ਸੈਂਸ-ਸੈਰਿਫ਼ ਗੂੜ੍ਹਾ + ਗਣਿਤਕ ਸੈਂਸ-ਸੈਰਿਫ਼ ਮਲਿਆਲਮ ਅੰਕ ਮੰਗੋਲ ਅੰਕ ਮਿਤੇਈ ਮਾਏਕ ਅੰਕ ਮਿਆਂਮਾਰ ਅੰਕ + ਮਿਆਂਮਾਰ ਈਸਟਰਨ ਪਵੋ ਕਾਰੇਨ + ਮਿਆਂਮਾਰ ਪਾਓ + ਮਿਆਂਮਾਰ ਸ਼ਾਨ + ਮਿਆਂਮਾਰ ਤਾਈ ਲਾਇੰਗ + ਖੇਤਰੀ ਅੰਕ + ਖੇਤਰੀ ਅੰਕ ਓਲ ਚੀਕੀ ਅੰਕ ਉੜੀਆ ਅੰਕ + ਰੂਪਰੇਖਾ ਰੋਮਨ ਸੰਖਿਆਵਾਂ + ਰੋਮਨ ਅੱਪਰਕੇਸ ਰੋਮਨ ਲੋਅਰਕੇਸ ਸੰਖਿਆਵਾਂ + ਰੋਮਨ ਲੋਅਰਕੇਸ + ਵਰਗਾਂ ਵਿੱਚ ਰਵਾਇਤੀ ਤਮਿਲ ਸੰਖਿਆਵਾਂ ਤਮਿਲ ਅੰਕ + ਆਧੁਨਿਕ ਤਮਿਲ ਤੇਲਗੂ ਅੰਕ ਥਾਈ ਅੰਕ ਤਿੱਬਤੀ ਅੰਕ + ਰਵਾਇਤੀ ਸੰਖਿਆਵਾਂ ਵਾਈ ਅੰਕ ਬੰਦ ਚਾਲੂ + ਅਣਦੱਸਿਆ ਮਸ਼ੀਨੀ ਅਨੁਵਾਦ + POSIX ਰੂਪ + + ਬੰਦ + ਚਾਲੂ + ਮੀਟਰਿਕ ਯੂ. ਕੇ. @@ -1016,11 +1117,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - [ੱ ੰ ਂ ਼ ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ{ਸ਼} ਹ ਕ ਖ{ਖ਼} ਗ{ਗ਼} ਘ ਙ ਚ ਛ ਜ{ਜ਼} ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ{ਫ਼} ਬ ਭ ਮ ਯ ਰ ਲ{ਲ਼} ਵ ੜ ੍ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ] + [ੱ ੰ ਂ ਼ ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ{ਸ਼} ਹ ਕ ਖ{ਖ਼} ਗ{ਗ਼} ਘ ਙ ਚ ਛ ਜ{ਜ਼} ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ{ਫ਼} ਬ ਭ ਮ ਯ ਰ ਲ{ਲ਼} ਵ ੜ ੍ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ] [\u200C\u200Dਃ] [ੳ ਅ ੲ ਸ{ਸ਼} ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ] [\- ‑ , . % ‰ + 0੦ 1੧ 2੨ 3੩ 4੪ 5੫ 6੬ 7੭ 8੮ 9੯] - [\- ‐‑ – — , ; \: ! ? . '‘’ "“” ( ) \[ \] / \& ′ ″] + [\- ‐‑ – {—@} , ; \: ! ? . '‘’ "“” ( ) \[ \] / # ′ ″] [\: ∶] @@ -1072,6 +1173,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1093,6 +1201,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1197,10 +1312,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0} – {1} d – d + + M – M + d/M – d/M d/M – d/M @@ -1220,6 +1341,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM –d MMMM + y – y G @@ -1338,15 +1463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ਐਤ - ਸੋਮ - ਮੰਗਲ - ਬੁੱਧ - ਵੀਰ - ਸ਼ੁੱਕਰ - ਸ਼ਨੀ - ਐ ਸੋ @@ -1356,24 +1472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਸ਼ੁੱ ਸ਼ - - ਐਤ - ਸੋਮ - ਮੰਗ - ਬੁੱਧ - ਵੀਰ - ਸ਼ੁੱਕ - ਸ਼ਨੀ - - - ਐਤਵਾਰ - ਸੋਮਵਾਰ - ਮੰਗਲਵਾਰ - ਬੁੱਧਵਾਰ - ਵੀਰਵਾਰ - ਸ਼ੁੱਕਰਵਾਰ - ਸ਼ਨੀਵਾਰ - @@ -1401,27 +1499,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਸ਼ਾਮੀਂ ਰਾਤੀਂ - - AM - PM - - - AM - PM - - - AM - PM - - - AM - PM - - AM - PM ਸਵੇਰੇ ਦੁਪਹਿਰੇ ਸ਼ਾਮ @@ -1496,6 +1576,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1535,10 +1618,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM, G y d MMM, G y E d MMM, G y + MMMM G y + d MMMM, G y + E, d MMMM, G y d/M E, dd-MM. d MMM E, d MMM + E, d MMMM MMMM ਦਾ W ਹਫ਼ਤਾ MMMM ਦਾ W ਹਫ਼ਤਾ mm:ss @@ -1549,13 +1636,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y Y ਦਾ w ਹਫ਼ਤਾ Y ਦਾ w ਹਫ਼ਤਾ + + {0} {1} + {0} – {1} + + MMM y G – MMM y G + MMM – MMM y G + MMM y – MMM y G + + + d – d MMM, y G + d MMM, y G –d MMM, y G + d MMM – d MMM, y G + d MMM, y – d MMM, y G + M–M @@ -1578,6 +1681,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2005,19 +2112,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਪਿਛਲੇ ਸ਼ਨੀ ਇਹ ਸ਼ਨੀ ਅਗਲੇ ਸ਼ਨੀ - - {0} ਸ਼ਨੀਵਾਰ ਬਾਅਦ - {0} ਸ਼ਨੀਵਾਰਾਂ ਬਾਅਦ - - - {0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ - {0} ਸ਼ਨੀਵਾਰ ਪਹਿਲਾਂ - - ਪਿਛਲੇ ਸ਼ਨੀ - ਇਹ ਸ਼ਨੀ - ਅਗਲੇ ਸ਼ਨੀ {0} ਸ਼ਨੀ ਬਾਅਦ {0} ਸ਼ਨੀ ਬਾਅਦ @@ -2027,15 +2123,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ਸ਼ਨੀ ਪਹਿਲਾਂ - - AM/PM - AM/PM - - AM/PM - ਘੰਟਾ ਇਸ ਘੰਟੇ @@ -2437,7 +2527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਈਸਟਰ - ਕੋਹੇਕੇ + ਕੋਹੇਕੇ ਪੰਟਾ ਅਰੇਨਸ @@ -2560,9 +2650,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਲਿਬਰਵਿਲੇ - - ਬ੍ਰਿਟਿਸ਼ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ - ਲੰਡਨ @@ -2653,9 +2740,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਜਯਾਪੁਰਾ - - ਆਇਰਿਸ਼ ਮਿਆਰੀ ਵੇਲਾ - ਡਬਲਿਨ @@ -3351,6 +3435,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਹਰਾਰੇ + + + ਏਕਰ ਵੇਲਾ + ਏਕਰ ਮਿਆਰੀ ਵੇਲਾ + ਏਕਰ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + ਅਫ਼ਗਾਨਿਸਤਾਨ ਵੇਲਾ @@ -3383,13 +3474,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਅਲਾਸਕਾ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ - - - ਅਲਮਾਟੀ ਸਮਾਂ - ਅਲਮਾਟੀ ਮਿਆਰੀ ਸਮਾਂ - ਅਲਮਾਟੀ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ - - ਅਮੇਜ਼ਨ ਵੇਲਾ @@ -3432,20 +3516,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਐਪੀਆ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ - - - ਅਕਤਾਉ ਸਮਾਂ - ਅਕਤਾਉ ਮਿਆਰੀ ਸਮਾਂ - ਅਕਤਾਉ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ - - - - - ਅਕਤੋਬ ਸਮਾਂ - ਅਕਤੋਬ ਮਿਆਰੀ ਸਮਾਂ - ਅਕਤੋਬ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ - - ਅਰਬੀ ਵੇਲਾ @@ -3547,6 +3617,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਬ੍ਰਾਜ਼ੀਲੀਆ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + + ਬ੍ਰਿਟਿਸ਼ ਵੇਲਾ + ਬ੍ਰਿਟਿਸ਼ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + ਬਰੂਨੇਈ ਦਾਰੂਸਲਾਮ ਵੇਲਾ @@ -3725,6 +3801,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਗ੍ਰੀਨਵਿਚ ਮੀਨ ਵੇਲਾ + + + ਗ੍ਰੀਨਲੈਂਡ ਵੇਲਾ + ਗ੍ਰੀਨਲੈਂਡ ਮਿਆਰੀ ਵੇਲਾ + ਗ੍ਰੀਨਲੈਂਡ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + ਪੂਰਬੀ ਗ੍ਰੀਨਲੈਂਡ ਵੇਲਾ @@ -3739,11 +3822,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਪੱਛਮੀ ਗ੍ਰੀਨਲੈਂਡ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ - - - ਗੁਆਮ ਸਮਾਂ - - ਖਾੜੀ ਮਿਆਰੀ ਵੇਲਾ @@ -3756,7 +3834,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ਹਵਾਈ-ਅਲੇਯੂਸ਼ਿਅਨ ਮਿਆਰੀ ਵੇਲਾ + ਹਵਾਈ ਵੇਲਾ @@ -3820,6 +3898,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਈਰਾਨ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ + + + ਆਇਰਿਸ਼ ਵੇਲਾ + ਆਇਰਿਸ਼ ਮਿਆਰੀ ਵੇਲਾ + + ਇਰਕੁਤਸਕ ਵੇਲਾ @@ -3841,9 +3925,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਜਪਾਨ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ + + + ਕਮਚਟਕਾ ਵੇਲਾ + ਕਮਚਟਕਾ ਮਿਆਰੀ ਵੇਲਾ + ਕਮਚਟਕਾ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + - ਕਜ਼ਾਖ਼ਸਤਾਨ ਵੇਲਾ + ਕਜ਼ਾਖ਼ਸਤਾਨ ਵੇਲਾ @@ -3880,11 +3971,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਕਿਰਗਿਸਤਾਨ ਵੇਲਾ - - - ਲੰਕਾ ਸਮਾਂ - - ਲਾਈਨ ਆਈਲੈਂਡ ਵੇਲਾ @@ -3897,13 +3983,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਲੌਰਡ ਹੋਵੇ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ - - - ਮਕਾਉ ਸਮਾਂ - ਮਕਾਉ ਮਿਆਰੀ ਸਮਾਂ - ਮਕਾਉ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ - - ਮੈਗੇਡਨ ਵੇਲਾ @@ -4019,11 +4098,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਫਰਨਾਂਡੋ ਡੇ ਨੋਰੋਨਹਾ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ - - - ਉੱਤਰੀ ਮਰਿਆਨਾ ਆਈਲੈਂਡ ਸਮਾਂ - - ਨੌਵੋਸਿਬੀਰਸਕ ਵੇਲਾ @@ -4103,13 +4177,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਪਯੋਂਗਯਾਂਗ ਵੇਲਾ - - - ਕਿਜ਼ਲੋਰਡਾ ਸਮਾਂ - ਕਿਜ਼ਲੋਰਡਾ ਮਿਆਰੀ ਸਮਾਂ - ਕਿਜ਼ਲੋਰਡਾ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ - - ਰਿਯੂਨੀਅਨ ਵੇਲਾ @@ -4127,11 +4194,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਸਖਲੀਨ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + + ਸਮਾਰਾ ਵੇਲਾ + ਸਮਾਰਾ ਮਿਆਰੀ ਵੇਲਾ + ਸਮਾਰਾ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + - ਸਾਮੋਆ ਵੇਲਾ ਸਾਮੋਆ ਮਿਆਰੀ ਵੇਲਾ - ਸਾਮੋਆ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ @@ -4198,6 +4270,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਚੂਕ ਵੇਲਾ + + + ਤੁਰਕੀ ਵੇਲਾ + ਤੁਰਕੀ ਮਿਆਰੀ ਵੇਲਾ + ਤੁਰਕੀ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + ਤੁਰਕਮੇਨਿਸਤਾਨ ਵੇਲਾ @@ -4217,6 +4296,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਉਰੂਗਵੇ ਗਰਮੀਆਂ ਦਾ ਵੇਲਾ + + + ਉਰੂਮਕੀ ਵੇਲਾ + + ਉਜ਼ਬੇਕਿਸਤਾਨ ਵੇਲਾ @@ -4291,13 +4375,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ guru - . - , - % - + - - - E - ‰ + . + , + % + + + - + E + ‰ , @@ -4401,9 +4485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ¤ #,##,##0.00 - ¤ #,##0.00 @@ -4411,9 +4492,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ¤ #,##,##0.00 - ¤ #,##0.00 @@ -5051,9 +5129,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ - ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ - ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ - ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ + ਕੈਰੇਬੀਅਨ ਗਿਲਡਰ ਯੂਰਪੀ ਮੁਦਰਾ ਇਕਾਈ @@ -5083,8 +5159,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ - ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ - ਜ਼ਿੰਬਾਬਵੀ ਗੋਲਡ @@ -5225,11 +5299,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine - ਚੱਕਰ - {0} ਚੱਕਰ - {0} ਚੱਕਰ - {0} ਚੱਕਰ - {0} ਚੱਕਰ masculine @@ -5329,11 +5398,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ feminine ਆਈਟਮਾਂ - - ਹਿੱਸਾ - {0} ਹਿੱਸਾ - {0} ਹਿੱਸੇ - masculine ਹਿੱਸੇ ਪ੍ਰਤਿ ਮਿਲੀਅਨ @@ -5344,7 +5408,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - ਪ੍ਰਤਿਸ਼ਤ {0} ਪ੍ਰਤਿਸ਼ਤ {0} ਪ੍ਰਤਿਸ਼ਤ {0} ਪ੍ਰਤਿਸ਼ਤ @@ -5805,11 +5868,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ਪ੍ਰਤਿ ਇੰਚ - - ਪਾਰਸੈਕ - {0} ਪਾਰਸੈਕ - {0} ਪਾਰਸੈਕ - {0} ਪ੍ਰਕਾਸ਼ ਸਾਲ {0} ਪ੍ਰਕਾਸ਼ ਸਾਲ @@ -5974,11 +6032,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ {0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ - - ਪਾਰਾ - {0} ਪਾਰਾ - {0} ਪਾਰਾ - ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ {0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ @@ -7305,11 +7358,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ਮੀ/ਸ² {0}ਮੀ/ਸ² - - ਚੱਕਰ - {0} ਚੱਕਰ - {0} ਚੱਕਰ - ਡਿ. {0}° @@ -7323,9 +7371,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}″ {0}″ - - {0} ਪ੍ਰਤਿ ਮੀ² - {0}ਸੈਮੀ² {0}ਸੈਮੀ² @@ -7354,20 +7399,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ਆਈਟਮ {0}ਆਈਟਮ - - ਹਿੱਸਾ - {0} ਹਿੱਸਾ - {0} ਹਿੱਸੇ - ppm ‱ - - Glc - {0}ਲਿ./ਕਿ.ਮੀ. {0}ਲਿ./ਕਿ.ਮੀ. @@ -7501,11 +7538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}" {0}" - - ਪਾਰਸੈਕ - {0} ਪਾਰਸੈਕ - {0} ਪਾਰਸੈਕ - R☉ @@ -7529,7 +7561,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} hp - ਪਾਰਾ {0} ਪਾਰਾ {0} ਪਾਰਾ @@ -7627,9 +7658,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ਇ.ਚੁ.ਗੈ. {0} ਇ.ਚੁ.ਗੈ. - - cal-IT - ppb @@ -7971,24 +7999,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {surname}, {given-informal} - ਜ਼ੈਨਡਿਆ + ਅਮਨਦੀਪ - ਆਰੀਨ - ਐਡਲਰ + ਰਣਜੀਤ + ਗਿੱਲ - ਜੌਨ - ਹਾਮਿਸ਼ - ਵਾਟਸਨ + ਨਿਮਰਤ ਕੌਰ + ਸੰਦੀਪ + ਸ਼ਰਮਾ ਸ਼੍ਰੀ - ਬਰਟਰਮ ਵਿਲਬਰਫ਼ੋਰਸ - ਬਰਟੀ - ਹੈਨਰੀ ਰਾਬਰਟ + ਗਗਨਦੀਪ ਸਿੰਘ + ਗਗਨ + ਜੀਵਨਜੋਤ ਸਿੰਘ ∅∅∅ - ਵੂਸਟਰ + ਸੰਧੂ ∅∅∅ ਜੂ. ਐਮ.ਪੀ. diff --git a/make/data/cldr/common/main/pap.xml b/make/data/cldr/common/main/pap.xml deleted file mode 100644 index 895ec10f01d7..000000000000 --- a/make/data/cldr/common/main/pap.xml +++ /dev/null @@ -1,1575 +0,0 @@ - - - - - - - - - - - arabir - arabir (mundu) - alemán - ingles - spañó - spañó di latino amérika - franses - hebreo - hindi - hmong - kreol di Haiti - herero - indones - italiano - hapones - koreano - latin - hulandes - Papiamentu - polaco - portugues - ruso - tailandes - turko - idioma deskonosí - chines - - - - - - - - - - - - mundu - Áfrika - Nort Amérika - Zùit Amérika - Wèst Afrika - Amérika Sentral - Ost Afrika - Nort Afrika - Afrika Sentral - Zùit Afrika - Amérika - Parti Nort di Amérika - Karibe - Ost Asia - Zùit Asia - Zùitost Asia - Zùit Europa - Australasia - Melanesia - Region di Micronesia - Polinesia - Asia - Asia Sentral - Wèst Asia - Europa - Ost Europa - Nort Europa - Wèst Europa - Latino Amérika - Afghanistan - Antigua & Barbuda - Anguilla - Albania - Angola - Argentina - Austria - Australia - Aruba - Bosnia i Herzegowina - Barbados - Bèlgika - Bulgaria - Saint Bathélemy - Bermuda - Bolivia - Antia Hulandes - Brazil - Bahamas - Isla Bouvet - Botswana - Belarus - Belize - Canada - Congo - Kinshasa - Repúblika Sentroafrikano - Congo - Brazzaville - Congo (Repúblika) - Suisa - Côte d’Ivoire - Chile - Camerun - China - Colombia - Costa Rica - Cuba - Kabo Verde - Kòrsou - Cheko - Repúblika di Cheko - Alemania - Dinamarka - Dominica - Repúblika Dominikano - Algeria - Ecuador - Estonia - Egipto - Western Sahara - Eritrea - Spaña - Etiopia - Union Europeo - Finlandia - Fiji - Islanan Falkland - Islanan Falkland (Islas Malvinas) - Micronesia - Fransia - Gran Bretaña - Grenada - Guyana Franses - Ghana - Grunlandia - Gambia - Guinea - Guadeloupe - Guinea Ekuatorial - Gresia - Guatemala - Guam - Guinea-Bissau - Guyana - Hong Kong - Honduras - Kroasia - Haiti - Hungria - Indonesia - Irlanda - Israel - India - Irak - Iran - Islandia - Italia - Jamaica - Hapon - Kenya - Cambodia - Comóros - St. Kitts i Nevis - Nort Korea - Surkorea - Islanan Caiman - Sint Lucia - Liechtenstein - Sri Lanka - Liberia - Luxemburg - Morocco - Monaco - Moldavia - Montenegro - Saint Martin - Madagascar - Mali - Mongolia - Macao - Martinique - Montserrat - Malta - Maldives - Malawi - México - Mozambique - Niger - Nigeria - Nicaragua - Hulanda - Noruega - Nepal - Panamá - Perú - Polinesia Franses - Filipinas - Polonia - St. Pierre & Miquelon - Puerto Rico - Portugal - Paraguay - Qatar - Romania - Servia - Rusia - Rwanda - Seychelles - Sudan - Suesia - Singapore - Sint Helena - Slovenia - Slovakia - Sierra Leone - San Marino - Senegal - Somalia - Surinam - El Salvador - Sint Maarten - Turks i Caicos - Chad - Tailandia - Turkia - Trinidad i Tobago - Taiwan - Ukrania - Uganda - Nashonnan Uní - Merka - Uruguay - Sint Vicent i Grenadines - Venezuela - Virgin Islands (Britániko) - Virgin Islands (Merikano) - Vietnam - Suráfrika - Zambia - Zimbabwe - Region Deskonosí - - - meter - britániko - merikano - - - Idioma: {0} - Manera di skirbi: {0} - Region: {0} - - - - [a b c d eè f g h i j k l m nñ oò p q r s t uùü v w x y z] - [á é í ó ú] - [\- ‑ , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ / \& # % ′ ″] - - - - - - - - EEEE, d MMMM y G - - - - - d MMMM y G - - - - - d MMM y G - - - - - dd-MM-y GGGGG - - - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - - {1}, {0} - - - {1}, {0} - - - {1}, {0} - - - - E, d - y G - dd-MM-y GGGGG - MMM y G - d MMM y G - E, d MMM y G - dd-MM - E, dd-MM - d MMM - E, d MMM - d MMMM - y G - y G - MM-y GGGGG - dd-MM-y GGGGG - E, dd-MM-y GGGGG - MMM y G - d MMM y G - E, d MMM y G - MMMM y G - QQQ y G - QQQQ y G - - - - y G – y G - y–y G - - - MM-y-GGGGG – MM-y-GGGGG - MM-y – MM-y GGGGG - MM-y – MM-y GGGGG - - - dd-MM-y – dd-MM-y GGGGG - dd-MM-y GGGGG – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - - - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y GGGGG – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - - - MMM y G – MMM y G - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM y G - d MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – d MMM y G - E, d MMM y G – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - dd-MM – dd-MM - dd-MM – dd-MM - - - E, dd-MM – E, dd-MM - E, dd-MM – E, dd-MM - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - y–y G - - - MM-y – MM-y GGGGG - MM-y – MM-y GGGGG - - - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - - - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - - - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - MMMM–MMMM y G - MMMM y – MMMM y G - - - - - - - - - Yan - Feb - Mar - Apr - Mei - Yün - Yül - Oug - Sèp - Òkt - Nov - Des - - - Yanüari - Febrüari - Mart - Aprel - Mei - Yüni - Yüli - Ougùstùs - Sèptèmber - Òktober - Novèmber - Desèmber - - - - - yan - feb - mar - apr - mei - yün - yül - oug - sèp - òkt - nov - des - - - - - - - djadumingu - djaluna - djamars - djarason - djaweps - djabièrnè - djasabra - - - - - dd - dl - dm - dr - dw - db - ds - - - - - - - 1 kuartal - 2 kuartal - 3 kuartal - 4 kuartal - - - di promé kuartal - di dos kuartal - di tres kuartal - di kuater kuartal - - - - - di promé kuartal - di dos kuartal - di tres kuartal - di kuater kuartal - - - - - - Promé ku Kristu - Promé ku Era Komun - Despues di Kristu - Era Komun - - - P.K - P.E.K - D.K - E.K - - - - - - EEEE, d MMMM y - - - - - d MMMM y - - - - - d MMM y - - - - - dd-MM-y - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - E, d - y G - dd-MM-y GGGGG - MMM y G - d MMM y G - E, d MMM y G - dd-MM - E, dd-MM - d MMM - E, d MMM - d MMMM - 'siman' W 'di' MMMM - 'siman' W 'di' MMMM - MM-y - dd-MM-y - E, dd-MM-y - MMM y - d MMM y - E, d MMM y - MMMM y - QQQ y - QQQQ y - 'siman' w 'di' Y - 'siman' w 'di' Y - - - - y G – y G - y–y G - - - MM-y GGGGG – MM-y GGGGG - MM-y – MM-y GGGGG - MM-y – MM-y GGGGG - - - dd-MM-y – dd-MM-y GGGGG - dd-MM-y GGGGG – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - - - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y GGGGG – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - - - MMM y G – MMM y G - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM y G - d y MMM y G – d MMM y G - d MMM – d MMM y G - d MMM y – d MMM y G - - - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - E, d MMM – E, d MMM y G - E, d MMM y – E, d MMM y G - - - dd-MM – dd-MM - dd-MM – dd-MM - - - E, dd-MM – E, dd-MM - E, dd-MM – E, dd-MM - - - d–d MMM - d MMM – d MMM - - - E, d MMM – E, d MMM - E, d MMM – E, d MMM - - - MM-y – MM-y - MM-y – MM-y - - - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y - - - E, dd-MM-y – E, dd-MM-y - E, dd-MM-y – E, dd-MM-y - E, dd-MM-y – E, dd-MM-y - - - MMM–MMM y - MMM y – MMM y - - - d–d MMM y - d MMM – d MMM y - d MMM y – d MMM y - - - E, d MMM – E, d MMM y - E, d MMM – E, d MMM y - E, d MMM y – E, d MMM y - - - MMMM–MMMM y - MMMM y – MMMM y - - - - - - - - aña - aña pasá - e aña akí - otro aña - - aki {0} aña - aki {0} aña - - - {0} aña pasá - {0} aña pasá - - - - kuartal - lastu kuartal - e kuartal akí - siguiente kuartal - - aki {0} kuartal - aki {0} kuartal - - - {0} kuartal pasá - {0} kuartal pasá - - - - kuartal - lastu kuartal - e kuartal akí - siguiente kuartal - - aki {0} kuartal - aki {0} kuartal - - - {0} kuartal pasá - {0} kuartal pasá - - - - kuartal - - - luna - luna pasá - e luna akí - otro luna - - aki {0} luna - aki {0} luna - - - {0} luna pasá - {0} luna pasá - - - - - aki {0} luna - aki {0} luna - - - {0} luna pasá - {0} luna pasá - - - - - aki {0} luna - aki {0} luna - - - {0} luna pasá - {0} luna pasá - - - - siman - siman pasá - e siman akí - otro siman - - aki {0} siman - aki {0} siman - - - {0} siman pasá - {0} siman pasá - - e siman di {0} - - - - aki {0} siman - aki {0} siman - - - {0} siman pasá - {0} siman pasá - - - - - aki {0} siman - aki {0} siman - - - {0} siman pasá - {0} siman pasá - - - - siman di luna - - - siman di luna - - - siman di luna - - - dia - ayera - awe - mañan - - aki {0} dia - aki {0} dia - - - {0} dia pasá - {0} dia pasá - - - - - aki {0} dia - aki {0} dia - - - {0} dia pasá - {0} dia pasá - - - - - aki {0} dia - aki {0} dia - - - {0} dia pasá - {0} dia pasá - - - - dia di aña - - - dia di aña - - - dia di aña - - - dia di siman - - - dia den siman di luna - - - dia den siman di luna - - - dia den siman di luna - - - djadumingu pasá - djadumingu akí - siguiente djadumingu - - aki {0} djadumingu - aki {0} djadumingu - - - {0} djadumingu pasá - {0} djadumingu pasá - - - - djaluna pasá - djaluna akí - siguiente djaluna - - aki {0} djaluna - aki {0} djaluna - - - {0} djaluna pasá - {0} djaluna pasá - - - - djamars pasá - djamars akí - siguiente djamars - - aki {0} djamars - aki {0} djamars - - - {0} djamars pasá - {0} djamars pasá - - - - djarason pasá - djarason akí - siguiente djarason - - aki {0} djarason - aki {0} djarason - - - {0} djarason pasá - {0} djarason pasá - - - - djaweps pasá - djaweps akí - siguiente djaweps - - aki {0} djaweps - aki {0} djaweps - - - {0} djaweps pasá - {0} djaweps pasá - - - - djabièrnè pasá - djabièrnè akí - siguiente djabièrnè - - aki {0} djabièrnè - aki {0} djabièrnè - - - {0} djabièrnè pasá - {0} djabièrnè pasá - - - - djasabra pasá - djasabra akí - siguiente djasabra - - aki {0} djasabra - aki {0} djasabra - - - {0} djasabra pasá - {0} djasabra pasá - - - - periodo di dia - - - ora - orario - - aki {0} ora - aki {0} ora - - - {0} ora pasá - {0} ora pasá - - - - ora - - aki {0} ora - aki {0} ora - - - {0} ora pasá - {0} ora pasá - - - - ora - - aki {0} ora - aki {0} ora - - - {0} ora pasá - {0} ora pasá - - - - minüt - minüt - - aki {0} minüt - aki {0} minüt - - - {0} minüt pasá - {0} minüt pasá - - - - - aki {0}min. - aki {0}min. - - - {0}min pasá - {0}min pasá - - - - - aki {0}min. - aki {0}min. - - - {0}min. pasá - {0}min. pasá - - - - sekònde - awoki - - aki {0} sekònde - aki {0} sekònde - - - {0} sekònde pasá - {0} sekònde pasá - - - - awoki - - aki {0}sek. - aki {0}sek. - - - {0}sek. pasá - {0}sek. pasá - - - - - aki {0}s - aki {0}s - - - {0}s pasá - {0}s pasá - - - - zona di ora - - - - ora di {0} - - Deskonosí - - - Sint John’s - - - Kabo Verde - - - Kòrsou - - - Repúblka Dominicana - - - Lònden - - - Aténas - - - Herúsalèm - - - Roma - - - Sint Kitts - - - Sint Lucia - - - Panamá - - - Azóres - - - Sint Vincent - - - Sint Thomas - - - - Ora di Áfrika Sentral - - - - - Ora di Ost Áfrika - - - - - Ora di Azóres - Ora Normal di Azóres - Ora di Azóres Temporada di Zomer - - - - - Ora di Europa Sentral - Ora Normal di Europa Sentral - Ora di Europa Sentral Temporada di Zomer - - - - - Ora di Ost Europa - Ora Normal di Ost Europa - Ora di Ost Europa Temporada di Zomer - - - - - Ora di Wèst Europa - Ora Normal di Wèst Europa - Ora di Wèst Europa Temporada di Zomer - - - - - Greenwich Mean Time - - - - - - - - - 0 mil - 0 mil - 00 mil - 00 mil - 000 mil - 000 mil - 0 mion - 0 mion - 00 mion - 00 mion - 000 mion - 000 mion - 0 bion - 0 bion - 00 bion - 00 bion - 000 bion - 000 bion - 0 trion - 0 trion - 00 trion - 00 trion - 000 trion - 000 trion - - - - - 0mil - 0mil - 00mil - 00mil - 000mil - 000mil - 0mion - 0mion - 00mion - 00mion - 000mion - 000mion - 0bion - 0bion - 00bion - 00bion - 000bion - 000bion - 0trion - 0trion - 00trion - 00trion - 000trion - 000trion - - - - - - - ¤ 0mil - ¤ 0mil - ¤ 00mil - ¤ 00mil - ¤ 000mil - ¤ 000mil - ¤ 0mion - ¤ 0mion - ¤ 00mion - ¤ 00mion - ¤ 000mion - ¤ 000mion - ¤ 0bion - ¤ 0bion - ¤ 00bion - ¤ 00bion - ¤ 000bion - ¤ 000bion - ¤ 0trion - ¤ 0trion - ¤ 00trion - ¤ 00trion - ¤ 000trion - ¤ 000trion - - - - - - Florin Karibense - Florin Karibense - Florin Karibense - XCG - - - Florin di Aruba - - - Dòler di Bermuda - - - Dòler di Belize - - - Dòler kanades - - - Dòler merikano - - - Florin Karibense - - - - {0} dia - {0} dia - di {0} - - - - - - {0} pa {1} - - - {0}-{1} - - - - - direkshon - {0} ost - {0} nort - {0} suit - {0} wèst - - - - - - {0}, i {1} - {0} i {1} - - - {0} òf {1} - {0} òf {1} - - - {0} & {1} - - - - - si - no - - - - {0} — tur - {0} — históriko - {0} — otro - bestia - bestia òf naturalesa - flecha - kurpa - edifisio - bullet òf strea - muhé - bandera - bandera - kuminda òf bebida - kurason - hòmber - símbolo musikal - naturalesa - number - opheto - otro - persona - lugá - planchi - puntuashon - señal òf símbolo - smiley òf persona - deporte - símbolo - biaha - biaha òf lugá - wer - - - und pap - {0}{1} - - {title} {given} {given2} {surname} {surname2} - - - {given} {surname} - - - {title} {given} {surname} - - - {given} {surname} - - - {given-informal-monogram-allCaps}{surname-monogram-allCaps} - - - {given} {surname} - - - {title} {surname} - - - {given-informal} - - - {given-monogram-allCaps}{surname-monogram-allCaps} - - - {given-monogram-allCaps}{surname-monogram-allCaps} - - - {given-initial}{given2-initial} {surname} - - - {given-informal} {surname-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {title} {surname} {surname2} {given} {given2} - - - {surname} {given-informal} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps}{given-informal-monogram-allCaps} - - - {surname} {given} {given2-initial} {generation}, {credentials} - - - {surname} {given-informal} - - - {title} {surname} {given} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname} {given-initial}{given2-initial} - - - {surname} {given-initial} - - - {title} {surname} - - - {given-informal} - - - {surname-monogram-allCaps} - - - {given-informal-monogram-allCaps} - - - {surname-core}, {given} - - - {surname}, {given-informal} - - - {surname-core}, {given} {given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - {surname-core}, {given-initial}{given2-initial} {surname-prefix} - - - {surname}, {given-informal} - - - Jurriey - - - Jurriey - Martina - - - Mari-Sue - Matilda - Martha - - - sr. - Jackson Martina - Sontje - Henry Robert - ∅∅∅ - Martha - Vapor - Jr. - MP - - - Johnny - - - Käthe - Müller - - - Zäzilia - Hamish - Stöber - - - Prof. Dr. - Ada Kornelia - Neele - César Martín - von - Brühl - González Domingo - Jr. - MD DDS - - - diff --git a/make/data/cldr/common/main/pap_AW.xml b/make/data/cldr/common/main/pap_AW.xml deleted file mode 100644 index 93bd9c6e8543..000000000000 --- a/make/data/cldr/common/main/pap_AW.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/pap_CW.xml b/make/data/cldr/common/main/pap_CW.xml deleted file mode 100644 index e5e11da79abf..000000000000 --- a/make/data/cldr/common/main/pap_CW.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/pcm.xml b/make/data/cldr/common/main/pcm.xml index 546c175aca08..bdf3e92881fa 100644 --- a/make/data/cldr/common/main/pcm.xml +++ b/make/data/cldr/common/main/pcm.xml @@ -333,6 +333,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Naijíriá Píjin Píjín Lángwej Pólánd Lángwej + Píedmọ́ntís Lángwej Malisiít Pasamákódí Lángwej Prúshia Páshto @@ -837,15 +838,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kalẹ́nda Haú To Arénj Mọní + Ignọ Simbọls Arénjin + Rivás Áksẹnt Arénjin + Bíg Lẹ́ta-dẹm/Smọ́l Lẹ́ta-dẹm Arénjin + Kés Sénsitív Arénjín Arénj Tins Wẹl + Nọ́mál Wè To Arénj Tins + Nọ́mba-dém Wè To Arénj Tins + Skrípt/Blọk Rearénj + Arénj Páwá Mọní + Tránsfọ́m destinéshọ́n + Díkshọ́narí Brẹk Ẹsklúshọ́n Imọ́ji presentáshọn + Fès dè of wík + Míksd-ín Awá Saíkul (12 vs 24) - Laín Brẹk Staíl + Inpút mẹthọ́d + Kíbọd + Háyest Ignọd + CJK Laín Brẹk Laín Brẹks wídin wọds + Tránsfọ́m rúl dém Sístẹm fọ Mẹ́zhọ́mẹnt + Mẹ́zhọ́mẹnt Unít Nọ́mba-dẹm + Éria fọ́ Sọ́plimentál Dátá + Tránsfóm Sós + Éria Subdivishọ́n Sẹntẹns Brẹk Aftá Abbr + Tránsfóm + Máshín Tránslétéd + Táím zọn + Lọkál Variánt + Praívét-yúz + Praívét-yúz Tránsfóm Búdíst Kalẹ́nda @@ -864,13 +891,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grẹ́górían Híbrú Kalẹ́nda Híbrú + Índián Náshọ́nál Íslám Kalẹ́nda Íslám Íslám Kalẹ́nda (Tébúlá Taip an Sívúl Taip) Íslám (Tébúlá Taip an Sívúl Taip) + Íslám Kalẹ́nda, Saúdí Arébiá sáitin + Íslám Kalẹ́nda (tábulá, ástrọnọmikál ípọk) Íslám Kalẹ́nda (Úmm al-Kúrá) Íslám (Úmm al-Kúrá) - ISO-8601 Kalẹ́nda + Grẹ́górían Kalẹ́nda (ISO 8601 Wík dẹ́m) + Grẹ́górían Japán Kalẹ́nda Japánis Pẹ́shia Kalẹ́nda @@ -881,15 +912,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Akáunting Nọ́mál Wè To Arénj Mọní Nọ́mál + Smọ́l Lẹ́ta-dẹm + Smọ́l Lẹ́ta-dẹm + Bíg Lẹ́ta-dẹm + Kọmpátibílití + Díkshonárí Yúníkód Mén Wè To Arénj Tins Wẹl Yúníkód Mén + Imọ́ji + Yurópián rúl dém + Fọnbúk + Fọnétik + Pínyín Jẹ́nárál Sachin Sach + Koriá Iníshál Kọ́nsónant Nọ́mál Wè To Arénj Tins Wẹl Nọ́mál Wè + Strọk + Trádishọ́nál + Rádikál-Strọk + Zúyín + Mọní + Nọ́mba-dẹm + Pọnkchuéshọn + Waítspes + Símbọ́l + All + Bẹs lẹtás onlí + Bẹs, Aksẹnt dẹm, Kẹs, Váriánt dem, Káná + Bẹs, Aksẹnt dẹm + Bẹs, Aksẹnt dẹm, Kẹs, Váriánt dẹm + To Fúl-Waid + To Háf-Waid Mén Imọ́ji Tẹxt + 12 Áwa Sístẹm + 12 + 24 Áwa Sístẹm + 24 12 Áwa Sístẹm (0–11) 12 (0–11) 12 Áwa Sístẹm (1–12) @@ -898,6 +960,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 Áwa Sístẹm (1–24) 24 (1–24) + Shíft spésís, pọnkchuéshọn, ọl símbọls + Shíft spésís, pọnkchuéshọn + Shíft spésís, pọnkchuéshọn + Shíft spésís, pọnkchuéshọn, nọ-mọní símbọl dém Lúz Laín Brẹk Staíl Lúz Nọ́mál Laín Brẹk Staíl @@ -908,6 +974,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kíp all Nọ́mál Kíp in frẹzis + US BGN Translítráshọ́n + US GEGN Translítráshọ́n Mẹ́trík Sístẹm Mẹ́trík Impẹ́riál Sístẹm fọ Mẹ́zhọ́mẹnt @@ -916,47 +984,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic US Arábík Nọ́mba-dẹm Ẹstrá Arábík Nọ́mba-dẹm + Ẹstrá Arábík-Índík Armẹ́niá Nọ́mba-dẹm Smọ́l Taíp Armẹ́niá Nọ́mba-dẹm + Smọ́l taíp Armẹ́nián lẹ́ta-dẹm Bánglá Nọ́mba-dẹm Chakmá Nọ́mba-dẹm Dẹvanágári Nọ́mba-dẹm Ẹtiópiá Nọ́mba-dẹm + Mọní Fúl-Waid Nọ́mba-dẹm + Fúl-Waid Jọ́jiá Nọ́mba-dẹm Grík Nọ́mba-dẹm Smọ́l Taíp Grík Nọ́mba-dẹm + Smọ́l taíp Grík lẹ́ta-dẹm Gujarátí Nọ́mba-dẹm Gúrmukhi Nọ́mba-dẹm + Hán-charácter dáy-of-mọ́nt nọ́mba fọ́ trádishọ́nál káléndá dém Chainíz Nọ́mba-dẹm + Pọ́zishọ́nál décimál systém yúzin Chainiz nọ́mbá áidiyográfs as nọ́mbá dém Ízí Chainíz Nọ́mba-dẹm Ízí Chainíz Mọní Nọ́mba-dẹm + Ízí Chainíz Mọní Nọ́mál Chainíz Nọ́mba-dẹm Nọ́mál Chainíz Mọní Nọ́mba-dẹm + Nọ́mál Chainíz Mọní Híbru Nọ́mba-dẹm Jává Nọ́mba-dẹm Japán Nọ́mba-dẹm Japán Mọní Nọ́mba-dẹm + Japán Mọní + Japán fẹs yiẹ Gánnẹn nọ́mba-dẹm Kmai Nọ́mba-dẹm Kánnád Nọ́mba-dẹm + Táí Thám Thám (éklésíástíkál) Lao Nọ́mba-dẹm Wẹ́stán Nọ́mba-dẹm + Matimátikal bọ́ld + Matimátikal dọ́bul-strọ́k + Matimátikal mọ́nọ́spés + Matimátikal sáns-seríf bọ́ld + Matimátikal sáns-seríf Maléyálam Nọ́mba-dẹm Miitẹí Mayẹ́k Nọ́mba-dẹm Miánma Nọ́mba-dẹm + Miánma Ístán Pwo Káren + Miánma Páo + Miánma Shán + Miánma Tái Láing + Nẹtiv Nọ́mba-dẹm + Nẹtiv Nọ́mba-dẹm Ol Chiki Nọ́mba-dẹm Ódia Nọ́mba-dẹm + Aúsaíd Mak Rómán Nọ́mba-dẹm + Rómán bíg lẹtá-dẹm Smọ́l Taíp Rómán Nọ́mba-dẹm + Rómán smól lẹtá-dẹm + Ségméntéd Nọ́mál Támíl Nọ́mba-dẹm Támíl Nọ́mba-dẹm + Mọ́dán Támíl Tẹ́lúgu Nọ́mba-dẹm Taí Nọ́mba-dẹm Tíbẹt Nọ́mba-dẹm + Trádishọ́nál nọ́mba dém Vaí Nọ́mba-dẹm Off On + Unspécifáid Máshín Tránsléshọ́n + POSIX Variánt + + Off + On + Mẹ́trik Brítish @@ -1041,6 +1144,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d y G y G + G y/MM/dd @@ -1227,6 +1331,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} @@ -1253,17 +1360,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1}, {0} - - {1}, {0} - {1}, {0} - - {1}, {0} - d E @@ -1274,7 +1375,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm:ss a v h:mm a v d /M - E, d/M + E, M/d d MMM E, d MMM d MMMM @@ -1287,6 +1388,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + EEE, d MMMM y QQQ y QQQQ y 'Wik' w 'fọ' Y @@ -2060,9 +2163,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Líbrẹvil - - Brítísh Họ́t Sízin Taim - Lọ́ndọn @@ -2144,9 +2244,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jayapúra - - Aírísh Fíksd Taim - Dọ́blin @@ -2518,6 +2615,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bárnául + + Tọmsk + Novokuznẹ́sk @@ -2818,6 +2918,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Harárẹ + + + Ẹ́ka + Ẹ́ka Fíksd Taim + Ẹ́ka Họ́t Sízin Taim + + Afgánístan Taim @@ -2887,9 +2994,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ápia Taim - Ápia Fíksd Taim - Ápia Délaít Taim + Wést Samọa Taim + Wést Samọa Fíksd Taim + Wést Samọa Délaít Taim @@ -2993,6 +3100,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasília Họ́t Sízín Taim + + + Brítísh Taim + Brítísh Họ́t Sízin Taim + + Brunẹi Darúsalam Taim @@ -3166,6 +3279,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grínwích Mín Taim + + + Grínlánd Taim + Grínlánd Fíksd Taim + Grínlánd Họ́t Sízin Taim + + Íist Grínlánd Taim @@ -3192,7 +3312,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hawaií-Elúshián Fíksd Taim + Hawaií Taim @@ -3253,6 +3373,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran Délaít Taim + + + Aírísh Taim + Aírísh Fíksd Taim + + Irkútsk Taim @@ -3274,6 +3400,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Japan Délaít Taim + + + Kamchátka Taim + Kamchátka Fíksd Taim + Kamchátka Họ́t Sízin Taim + + Kazékstan Taim @@ -3536,11 +3669,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sákhalin Họ́t Sízin Taim + + + Samára Taim + Samára Fíksd Taim + Samára Họ́t Sízin Taim + + - Sámoá Taim Sámoá Fíksd Taim - Sámoá Délaít Taim @@ -3607,6 +3745,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Chuk Taim + + + Türkiye Taim + Türkiye Fíksd Taim + Türkiye Họ́t Sízin Taim + + Tọkmẹnistan Taim @@ -3626,6 +3771,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Yúrugwue Họ́t Sízín Taim + + + Ürümqi Taim + + Uzbẹkistan Taim @@ -4448,8 +4598,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Karíbíen Gílda - Karíbíen Gílda - Karíbíen Gílda Wẹ́st Afríká Sẹ́fa Frank @@ -4483,8 +4631,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbábwẹn Gọ́ld - Zimbábwẹn Gọ́ld - Zimbábwẹn Gọ́ld @@ -4492,7 +4638,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} dè - {0}? + {0} days Take the {0}th right. @@ -6216,9 +6362,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kárá {0} kárá - - párt - Pfim @@ -6231,9 +6374,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ‱ - - glúcọs - L/km diff --git a/make/data/cldr/common/main/pi.xml b/make/data/cldr/common/main/pi.xml deleted file mode 100644 index 543e14262134..000000000000 --- a/make/data/cldr/common/main/pi.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - [aā b c dḍ e f g h iī j k lḷ mṁṃ nñṅṇ ŋ o p q r sśṣ tṭ uū v w x y z] - - diff --git a/make/data/cldr/common/main/pi_Latn.xml b/make/data/cldr/common/main/pi_Latn.xml deleted file mode 100644 index 38b8366a1b69..000000000000 --- a/make/data/cldr/common/main/pi_Latn.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - Solomon Aelan - - - metrik - - - Langguis: {0} - Raeting kaen: {0} - Rijin: {0} - - - - [a b d e f g h i j k l m n o p r s t u v w y] - [\- ‑ / # % + 0 1 2 3 5 6 7 8 9] - [\- ‑ , ; \: ! ? . '‘’ "“” ( ) + =] - - - - - - - - Januare - Febuare - Mas - Eprel - Mei - Jun - Julae - Ogus - Septemba - Oktoba - Novemba - Disemba - - - - - - - Sande - Mande - Tiusde - Wenesde - Tosde - Fraede - Satade - - - - - - - GMT {0} - {0} Taem - {0} Delaet Taem - {0} Standad Taem - - - Grinis Min Taem - - - - - - - - $ - - - - diff --git a/make/data/cldr/common/main/pis_SB.xml b/make/data/cldr/common/main/pis_SB.xml deleted file mode 100644 index 6f89828ddfcd..000000000000 --- a/make/data/cldr/common/main/pis_SB.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/pl.xml b/make/data/cldr/common/main/pl.xml index 8c3deb86afd5..fb77bc12e207 100644 --- a/make/data/cldr/common/main/pl.xml +++ b/make/data/cldr/common/main/pl.xml @@ -936,7 +936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chiny Kolumbia Wyspa Clippertona - Sark + Sark Kostaryka Kuba Republika Zielonego Przylądka @@ -1211,18 +1211,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kolejność sortowania sortowanie znormalizowane sortowanie numeryczne + zmiana kolejności skryptów/bloków siła sortowania waluta + cel transformacji + wyłączenia podziału słownikowego prezentacja emoji + pierwszy dzień tygodnia + zmieszane cykl (12- lub 24-godzinny) + metoda wprowadzania + klawiatura + najwyższy ignorowany styl podziału wiersza - podział wierszy wewnątrz wyrazów + podział wierszy wewnątrz wyrazów + reguły transformacji system miar + jednostka miary cyfry + region dla danych uzupełniających + źródło transformacji + podział regionalny koniec zdania po skrócie + transformacja + tłumaczenie maszynowe strefa czasowa wariant regionalny do użytku prywatnego + transformacja niestandardowa kalendarz buddyjski @@ -1242,15 +1258,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kalendarz hebrajski hebrajski narodowy kalendarz hinduski + indyjski narodowy kalendarz muzułmański muzułmański kalendarz muzułmański (metoda obliczeniowa) muzułmański (metoda obliczeniowa) kalendarz islamski (Arabia Saudyjska, metoda wzrokowa) + muzułmański (oparty na lokalnej obserwacji) kalendarz islamski (metoda obliczeniowa, epoka astronomiczna) + muzułmański (tabelaryczny, epoka astronomiczna) kalendarz muzułmański (Umm al-Kura) muzułmański (Umm al-Kura) kalendarz ISO-8601 + gregoriański kalendarz japoński japoński kalendarz perski @@ -1266,8 +1286,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zwykłe sortowanie znaków akcentowanych Sortowanie znaków akcentowanych w odwróconej kolejności Sortowanie od małych liter + małe litery Sortowanie z zachowaniem zwykłej kolejności wielkości liter + małe litery Sortowanie od wielkich liter + wielkie litery Sortowanie bez rozróżniania wielkości liter Sortowanie z rozróżnianiem wielkości liter poprzedni porządek sortowania, dla zgodności @@ -1276,7 +1299,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ słownikowe domyślna kolejność sortowania Unicode domyślne Unicode + emotikon europejskie reguły określania kolejności + reguły europejskie porządek sortowania książki telefonicznej książka telefoniczna sortowanie fonetyczne @@ -1286,6 +1311,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ wyszukiwanie ogólnego zastosowania wyszukiwanie Wyszukiwanie według początkowej spółgłoski hangul + koreańskie spółgłoski początkowe standardowa kolejność sortowania standardowe sortowanie wg liczby kresek @@ -1300,17 +1326,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sortowanie z normalizacją unicode Oddzielne sortowanie cyfr Numeryczne sortowanie cyfr + waluta + cyfry + interpunkcja + biały znak + symbol Sortuj wszystko + wszystko Sortowanie tylko liter podstawowych + sortowanie tylko liter podstawowych Sortowanie znaków akcentowanych/wielkości liter/szerokości/kana + podstawa, akcenty, wielkość liter, warianty, kana Sortowanie znaków akcentowanych + podstawa, akcenty Sortowanie znaków akcentowanych/wielkości liter/szerokości + podstawa, akcenty, wielkość liter, warianty pełna szerokość połowa szerokości Liczbowe domyślna emoji tekst + system 12-godzinny + 12 + system 24-godzinny + 24 system 12-godzinny (0–11) 12 (0–11) system 12-godzinny (1–12) @@ -1319,6 +1359,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) system 24-godzinny (1–24) 24 (1–24) + przesunięcie: spacje, interpunkcja, wszystkie symbole + przesunięcie: spacje, interpunkcja + przesunięcie: spacje, interpunkcja + przesunięcie: spacje, interpunkcja, symbole inne niż waluty luźny styl podziału wiersza luźny normalny styl podziału wiersza @@ -1339,51 +1383,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerykański cyfry arabsko-indyjskie rozszerzone cyfry arabsko-indyjskie + rozszerzone arabsko-indyjskie cyfry ormiańskie cyfry ormiańskie (małe litery) + ormiańskie (małe litery) cyfry bengalskie czakma cyfry dewanagari cyfry etiopskie Liczebniki księgowe + księgowy cyfry o pełnej szerokości + pełna szerokość cyfry gruzińskie cyfry greckie cyfry greckie (małe litery) + greckie (małe litery) cyfry gudżarati cyfry gurmukhi + numeracja dni miesiąca znakami Han do kalendarzy tradycyjnych chińskie cyfry dziesiętne + pozycyjny system dziesiętny wykorzystujący ideogramy chińskie jako cyfry uproszczone cyfry chińskie uproszczone chińskie cyfry księgowe + uproszczone chińskie księgowe tradycyjne cyfry chińskie tradycyjne chińskie cyfry księgowe + tradycyjne chińskie księgowe cyfry hebrajskie cyfry jawajskie cyfry japońskie japońskie cyfry księgowe + japońskie księgowe + numeracja pierwszego roku ery jako Gannen cyfry khmerskie cyfry kannada + system liczbowy Tai Tham Tham (religijny) cyfry laotańskie cyfry arabskie + matematyczne pogrubione + matematyczne z podwójną kreską + matematyczne o stałej szerokości + matematyczne bezszeryfowe pogrubione + matematyczne bezszeryfowe cyfry malajalam Cyfry mongolskie cyfry meetei mayek cyfry birmańskie + cyfry pwo wschodnie (Mjanma) + cyfry pao (Mjanma) + cyfry szan (Mjanma) + cyfry tai laing (Mjanma) cyfry macierzyste + cyfry macierzyste cyfry ol ciki cyfry orija + konturowe cyfry rzymskie + rzymskie (wielkie litery) cyfry rzymskie (małe litery) + rzymskie (małe litery) + segmentowe tradycyjne cyfry tamilskie cyfry tamilskie + współczesne tamilskie cyfry telugu cyfry tajskie cyfry tybetańskie Liczebniki tradycyjne + cyfry tradycyjne cyfry vai wył. wł. + nieokreślone tłumaczenie maszynowe + wariant POSIX + + wył. + wł. + metryczny brytyjski @@ -1554,11 +1632,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + E, h B + E, h:mm B + E, h:mm:ss B E, d + E, h a + E, h:mm a + E, HH:mm + E, h:mm:ss a + E, HH:mm:ss y G - M.y G + M.y G dd.MM.y GGGGG - E, M.d.y G + E, M.d.y G LLL y G d MMM y G E, d MMM y G @@ -1582,6 +1668,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + y G – y G y–y G @@ -1654,6 +1743,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + y–y G @@ -1941,6 +2034,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -2013,6 +2109,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Y, 'tydz'. w Y, 'tydz'. w + + {0} {1} + {1}, {0} + y G – y G @@ -2078,8 +2178,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM–d MMM - E, d MMM–E, d MMM - E, d MMM–E, d MMM + E, d MMM – E, d MMM + E, d MMM – E, d MMM d–d MMMM @@ -2113,9 +2213,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y–d MMM y - E, d–E, d MMM y - E, d MMM y–E, d MMM y - E, d MMM y–E, d MMM y + E, d – E, d MMM y + E, d MMM y – E, d MMM y + E, d MMM y – E, d MMM y LLLL–LLLL y @@ -2237,7 +2337,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Przed ROC - ROC przed ROC @@ -2851,9 +2950,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Paryż - - Brytyjski czas letni - Londyn @@ -2898,11 +2994,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dżakarta - - - Irlandia (czas letni) - - Jerozolima @@ -3233,6 +3324,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Majotta + + + czas Acre + Acre (czas standardowy) + Acre (czas letni) + + czas Afganistan @@ -3265,13 +3363,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska (czas letni) - - - czas ałmacki - czas ałmacki standardowy - czas ałmacki letni - - czas amazoński @@ -3321,20 +3412,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia (czas letni) - - - czas auktaucki - czas auktaucki standardowy - czas auktaucki letni - - - - - czas aktiubiński - czas aktiubiński standardowy - czas aktiubiński letni - - czas Półwysep Arabski @@ -3436,6 +3513,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasília (czas letni) + + + czas Wielka Brytania + brytyjski czas letni + + czas Brunei @@ -3624,6 +3707,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ czas uniwersalny + + + czas Grenlandia + Grenlandia (czas standardowy) + Grenlandia (czas letni) + + czas Grenlandia Wschodnia @@ -3650,7 +3740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaje-Aleuty (czas standardowy) + Hawaje (czas standardowy) @@ -3711,6 +3801,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iran (czas letni) + + + czas irlandzki + Irlandia (czas letni) + + czas Irkuck @@ -3734,9 +3830,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - czas Pietropawłowsk Kamczacki - czas standardowy Pietropawłowsk Kamczacki - czas Pietropawłowsk Kamczacki letni + czas Kamczatka + Kamczatka (czas standardowy) + Kamczatka (czas letni) @@ -3984,13 +4080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ czas Pjongjang - - - czas kyzyłordzki - czas kyzyłordzki standardowy - czas kyzyłordzki letni - - czas Reunion @@ -4010,16 +4099,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - czas Samara - czas standardowy Samara - czas Samara letni + czas Samara + Samara (czas standardowy) + Samara (czas letni) - czas Samoa Samoa (czas standardowy) - Samoa (czas letni) @@ -4086,6 +4173,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ czas Chuuk + + + czas Turcja + Turcja (czas standardowy) + Turcja (czas letni) + + czas Turkmenistan @@ -4105,6 +4199,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugwaj (czas letni) + + + czas Urumczi + + czas Uzbekistan @@ -4236,28 +4335,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 tys'.' + 0 tys'.' + 0 tys'.' 0 tys'.' 00 tys'.' + 00 tys'.' + 00 tys'.' 00 tys'.' 000 tys'.' + 000 tys'.' + 000 tys'.' 000 tys'.' 0 mln + 0 mln + 0 mln 0 mln 00 mln + 00 mln + 00 mln 00 mln 000 mln + 000 mln + 000 mln 000 mln 0 mld + 0 mld + 0 mld 0 mld 00 mld + 00 mld + 00 mld 00 mld 000 mld + 000 mld + 000 mld 000 mld 0 bln + 0 bln + 0 bln 0 bln 00 bln + 00 bln + 00 bln 00 bln 000 bln + 000 bln + 000 bln 000 bln @@ -5543,7 +5666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ leone sierraleoński (1964–2022) - leone sierraleoński (1964—2022) + leone sierraleoński (1964–2022) leone sierraleońskie (1964–2022) leone sierraleońskich (1964–2022) leone sierraleońskiego (1964–2022) @@ -10048,7 +10171,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} gr - waty + W KM @@ -10362,16 +10485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} in² {0}/in² - - część - {0} cz. - {0} cz. - {0} cz. - {0} cz. - - - Glc - r. {0} r. @@ -10444,6 +10557,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} u {0} u + + W + km/h {0} km/h @@ -10459,7 +10575,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mph - °C {0}°C {0}°C {0}°C @@ -10499,13 +10614,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bbl - - cal [IT] - {0} cal [IT] - {0} cal [IT] - {0} cal [IT] - {0} cal [IT] - diff --git a/make/data/cldr/common/main/pms.xml b/make/data/cldr/common/main/pms.xml index c84e9fc492f7..348069d2e498 100644 --- a/make/data/cldr/common/main/pms.xml +++ b/make/data/cldr/common/main/pms.xml @@ -21,7 +21,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic + Àustria + Svìssera + Fransa Italia + Slovenia + Repùblica ëd San Marin metrico @@ -35,7 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic [aà b c {cc} {ch} d eéèë {eu} f g {gg} {gh} iì j l m n {n\-} oò p q r s {s\-c} {ss} t uù v z] - [h] + [h w] [\- ‑ — , ; \: ! ? . … '’ "“” « » ( ) \[ \] \{ \} @ /] @@ -49,6 +54,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + g + f + m + a + m + g + l + a + s + u + n + d + gené fërvé @@ -85,14 +104,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm:ss a v dd/MM/y d MMM y + d MMMM y + d MMMM y, E + + + Ann + + + Mèis + + + Di + + + Ora + + + Minuta + + Ora {0} Ora legal: {0} Ora stàndar: {0} + + + Temp Universal Coordinà + + Ora dë Greenwich diff --git a/make/data/cldr/common/main/prg.xml b/make/data/cldr/common/main/prg.xml index 7bc96ffd9c0d..d813f395b3c0 100644 --- a/make/data/cldr/common/main/prg.xml +++ b/make/data/cldr/common/main/prg.xml @@ -59,7 +59,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -463,6 +463,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic y 'm'. QQQQ + + {0}–{1} + {0}–{1} + {0}–{1} + d.–d. diff --git a/make/data/cldr/common/main/ps.xml b/make/data/cldr/common/main/ps.xml index 918669d09622..5ef34d0eef61 100644 --- a/make/data/cldr/common/main/ps.xml +++ b/make/data/cldr/common/main/ps.xml @@ -113,17 +113,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic اکجک یوناني انګليسي - آسټرالياوي انګليسي - کاناډايي انګلیسي - بريتانوی انګلیسي - یو کي انګلیسي - د متحده آيالاتو انګليسي + انګليسي (انګلستان) اسپرانتو هسپانوي لاتيني امريکايي هسپانوي اروپايي هسپانوي ميکسيکي هسپانوي - حبشي + ایسټونیایي باسکي اوونڊو فارسي @@ -142,7 +138,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic فرائیلیین لوېديځ فريشي ائيرلېنډي - Ga + ګا سکاټلېنډي ګېلک ګیز گلبرتي @@ -201,7 +197,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ميکونډي کابوورډیانو کورو - کینګا + ګیانکانګ خاسې کویرا چینی ککوؤو @@ -260,7 +256,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic لېټواني مدراسی مګهي - مایتھلي + مایتیلي مکاسار ماسائي موکشا @@ -330,18 +326,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic پمپانگا پاپيامينتو پالان - نائجیریا پیدجن + نایجریايي پیجن پیجین پولنډي + پیډمونټیز mpq پروشين پښتو پورتګالي - برازیلي پرتګالي - اروپايي پرتګالي کېچوا کچی - راجستھانی + راجستاني رپانوئي راروټانګان روهینګیا @@ -361,8 +356,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic سنتالي نګبای سانګوو - سارڊيني - سیلیسي + ساردیني + سیسیلین سکاټس سندهي شمالي سامي @@ -452,7 +447,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic وو چینایی کالمک خوسا - کانګرو + ګانګري سوګا ینګبین یمبا @@ -465,12 +460,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic معياري مراکشي تمازيټ چیني چيني، ماندرين - چيني ماندرين چيني + ساده شوې چیني + ساده شوي ماندرین چیني دوديزه چيني دوديزه ماندرين چيني زولو زوني - نه ژبني منځپانګه + ژبني منځپانګه نشته زازا @@ -514,15 +510,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + - + @@ -674,7 +670,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ګوام ګینه بیسو ګیانا - هانګ کانګ SAR چین + د چین د هانګ کانګ د ځانګړې اداري سیمه هانګ کانګ هارډ او ميکډانلډ ټاپوګان هانډوراس @@ -729,7 +725,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic مالي ميانمار (برما) منګوليا - مکاو SAR چین + د چین د مکاو ځانګړې اداري سیمه مکاو شمالي ماريانا ټاپوګان مارټینیک @@ -850,43 +846,72 @@ CLDR data files are interpreted according to the LDML specification (http://unic جنتري - اسعارو بڼه + د اسعارو بڼه + د سمبولونو تنظیمول صرف نظر کړئ + د اکسنټ سرچپه ترتیب + د غټو /وړو حروفو له مخي ترتیبول + د غټو او وړو تورو حساس ترتیب ترتيب - اسعارو + نورمال شوی ترتیب + عددي ترتیب + متن/بلاک بیاترتیبونه + د ترتیبولو شدت + اسعار + منزل بدل کړئ + د ډیکشنري د بېلولو استثناګانې ایموجي پریزنټیشن - د ساعت چکر (۱۲ پرتله ۲۴) + د اوونۍ لومړۍ ورځ + ګډ شوي + د ساعت دوران (۱۲ د ۲۴ په پرتله) + د داخلولو طریقه + کیبورډ + ترټولو زیات صرف نظر شوی د ماتې کرښې ډول د کلمو دننه د کرښې وقفې + د بدلولو قاعدې د ناپ نظام + د اندازه کولو واحد شمېرې + د تکمیلي معلوماتو برخه + سرچینه بدله کړئ + د برخي فرعي وېش جملې وقفه د ابر څخه وروسته + بدلول + ماشیني ژباړه + د وخت مطابق سیمه + محلي ډول + شخصي-کارول + شخصي-کارولو بدلونه بودايي جنتري بودايي د چين جنتري چینایی - کاپټیک کیلنډر + قبطي جنتري قبطي ډانګي جنتري - دانګي - ایتوپيک جنتري + ډانګي + ایتوپیايي جنتري ایتوپیایي - د ایتوپیک امیټ ایلم تقویم - د ایتوپیا امیټ عالم + ایتوپیايي امیټ ایلم جنتري + ایتوپیايي امیټ ایلم ګريګورين جنتري ګریګورین جورجویان جنتري ګریګوریان + هندئ ملي اسلامي جنتري هجري اسلامي جنتري (جدولي، مدني عصر) هجري (جدول، مدني دوره) + هجري، د سعودي عربستان لید اسلامي جنتري (جدولي، ستورپوهنيز عصر) هجري (جدول، ستورپوهنه) اسلامي کلیزه (ام القری) هجري (ام القراء) ISO-8601 جنتري + میلادي جاپاني جنتري جاپاني فارسي جنتري @@ -897,16 +922,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic محاسبه معياري اسعارو بڼه معیاري + واړه حروف + واړه حروف + غټ حروف + وړتیا + ډیکشنري ډيفالټ يونيکوډ ترتيب ډیفالټ یونیکوډ + ایموجي + اروپايي قواعد + تلیفونی کتاب (Phonebook) + فونیټیکي + پینین د عمومي موخي لټون لټون + کوریايي لومړني کانسونانټ د معیاري لټي ترتیب معیاري + سټروک + کلتوري + راډیکلي سټروک + زوین + اسعار + عددونه + علامه ګذاري + سپینه فاصله + سمبول + ټول + یواځی اساسي حروف + اساس، لهجې، کیس، بیل ډولونه، کانا + اساس، لهجه + اساس، لهجه، کیس، بل ډول + بشپړ پلنوالی + نیم پلنوالی ډیفالټ ایموجي متن - د ۱۲ ساعتو نظام (۰ـ۱۱) + د ۱۲ ساعتو نظام + ۱۲ + د ۲۴ ساعتو نظام + ۲۴ + د ۱۲ ساعتونو سیسټم ۱۱–۰ ۱۲ (۰–۱۱) د ۱۲ ساعتو نظام (۱ ـ ۱۲) ۱۲ (۱–۱۲) @@ -914,8 +970,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ۲۴ (۰–۲۳) د ساعتو نظام (۱ـ۲۴) ۲۴ (۱–۲۴) + شیفټ فاصلې (سپیسز)، علامه ګذاري، ټولو سمبولونه + شیفټ فاصلې (سپیسز)، علامه ګذاري + شیفټ فاصلې (سپیسز)، علامه ګذاري + شیفټ فاصلې (سپیسز)، علامه ګذاري، غیر اسعاري سمبولونه د غړندې ماتې کرښې ډول - خلاص + ازاد د عادي کرښې ماتولو طرز عادي د سختې کرښې ماتولو طرز @@ -924,6 +984,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ټول وساتئ عادي په جملو کې وساتئ + د امریکا د BGN ټرانسلیټریشن + د ملګري ملتونو GEGN ټرانسلیټریشن ميټرک نظام میټریک امپيريل د ناپ نظام @@ -931,48 +993,83 @@ CLDR data files are interpreted according to the LDML specification (http://unic د متحده آيالاتو د ناپ نظام امریکا عربي - انډیک عددونه - غځېدلې عربي ۔ اينډيک عدد + غځېدلې عربي اينډيک عددونه + پراخ شوي عربي-هندي آرمينيايي اعداد آرمينيايي کوچني اعداد + ارمینیايي کوچني حروف د بنګلا اعداد د چکما عددونه ديوانګري اعداد ايتهوپيايي اعداد + مالي د بشپړه پراختيا اعداد + پوره عرض ګريګورين اعداد يوناني اعداد يوناني کوچني اعداد + یوناني کوچني حروف ګوجراتي اعداد ګرمخې اعداد + د دودیزو کلیزو لپاره د هان تورو په واسطه د میاشتې د ورځو شمېرنه چايني اعشاري اعداد + د ارقامو په توګه د چینایي شمېرو انځوریزو تورو په کارولو سره موقعیتي اعشاري سیستم ساده چيني اعداد ساده چيني مالي اعداد + ساده شوی چینايي مالي دوديز چيني اعداد دوديز چيني مالي اعداد + کلتوري چینايي مالي عبراني اعداد جاوانی ډیجیټل جاپاني اعداد جاپاني مالي اعداد + چاپاني مالي + د جاپاني لومړي کال (ګانن) شمېرنه خمري اعداد کاناډا يي اعداد + تاي تام تام (مذهبي) لاوي اعداد لويديځ عددونه + ریاضیاتي بولډ + ریاضیاتي دوه-کرښیز + ریاضیاتي مونو سپیس + ریاضیاتي سانس سېریف بولډ + ریاضیاتي سانس سېریف ملاي لام اعداد میټې مایک اعداد د ميانمار اعداد + د میانمار ختیځ پوه کارین + د میانمار پاو + د میانمار شان + د میانمار تاي لاینګ + اصلي عددونه + اصلي عددونه ال چکي اعداد د اوډيا اعداد + طرحه شوی رومن اعداد + رومن غټ حروف رومن کوچني اعداد + رومن کوچني حروف + وېشل شوی دوديز تامل اعداد تامل اعداد + عصري تامل تيلوګو اعداد تايي اعداد تبتي اعداد + کلتوري شمیرې وای اعداد بند چالان + غیر مشخصه شوي ماشینی ژباړه + پوزیکس ډول + + غیر فعال + فعال + مېټرک برتانوې @@ -1004,6 +1101,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + @@ -1050,16 +1161,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic - H - H:mm - H:mm:ss - H v + G y/MM + G y/MM/dd + G y/MM/dd, E M/d + MM/dd, E d MMMM G y/M د G y د MMMM + G y/MM + G y/MM/dd + G y/MM/dd, E + + {1}–{0} + {1}–{0} + {0} – {1} d – d @@ -1102,6 +1220,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d – E, MMM d, y G E, MMM d, y – E, MMM d, y G + + MM/dd – MM/dd + MM/dd – MM/dd + + + MM/dd, E – MM/dd, E + MM/dd, E – MM/dd, E + + + G y/MM – y/MM + G y/MM – y/MM + + + G y/MM/dd – y/MM/dd + G y/MM/dd – y/MM/dd + G y/MM/dd – y/MM/dd + + + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + @@ -1155,16 +1295,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ج ف - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 + م + ا + م + ج6 + ج7 + ا8 + س9 + ا10 + ن11 + د12 جنوري @@ -1184,16 +1324,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + یکشنبه + دوشنبه + سه شنبه + چهارشنبه + پنج شنبه + جمعه + شنبه + + + ی + د + س + چ + پ + ج + ش + + + ی + د + س + چ + پ + ج + ش + - يونۍ - دونۍ - درېنۍ - څلرنۍ - پينځنۍ + یکشنبه + دوشنبه + سه شنبه + چهارشنبه + پنج شنبه جمعه اونۍ + + + یکشنبه + دوشنبه + سه شنبه + چهارشنبه + پنج شنبه + جمعه + شنبه + + + ی + د + س + چ + پ + ج + ش + + + ی + د + س + چ + پ + ج + ش + + + یکشنبه + دوشنبه + سه شنبه + چهارشنبه + پنج شنبه + جمعه + شنبه + + @@ -1208,21 +1413,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - غ.م. - غ.و. - - - غ.م. + غ.م غ.و. - غ.م. - غ.و. - - - - - غ.م. + ع.م غ.و. @@ -1230,9 +1425,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic له میلاد څخه وړاندې - له عام پېر دمخه + له عام دور مخکي له میلاد څخه وروسته - عام پېر + عامه دوره له میلاد وړاندې @@ -1243,17 +1438,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic - EEEE د y د MMMM d + EEEE d, MMMM, y - y MMMM d + d MMMM y - y MMM d + d MMM y @@ -1290,6 +1485,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1323,15 +1521,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic - M/d/y GGGGG + h B E + y/MM G + y/M/d G + G y/M/d, E + E, d MMMM y G + MM/dd + MM/dd, E E, MMM d + E, d MMMM اونۍ W د MMMM اونۍ W د MMMM + y/MM + y/MM/dd + y/MM/dd, E + d MMMM y + E, d MMMM y + QQQ y + QQQQ y اونۍ w د Y اونۍ w د Y + + {1}, {0} + + + {1}–{0} + {1}–{0} + {0} – {1} + + G y/MM – G y/MM + G y/MM – y/MM + G y/MM – y/MM + + + G y/MM/dd – y/MM/dd + G y/MM/dd – G y/MM/dd + G y/MM/dd – y/MM/dd + G y/MM/dd – y/MM/dd + + + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – G y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + G y/MM/dd, E – y/MM/dd, E + + + MM/dd – MM/dd + MM/dd – MM/dd + + + MM/dd, E – MM/dd, E + MM/dd, E – MM/dd, E + + + d–d MMMM + d MMMM–d MMMM + + + y/MM – y/MM + y/MM – y/MM + + + y/MM/dd – y/MM/dd + y/MM/dd – y/MM/dd + y/MM/dd – y/MM/dd + + + y/MM/dd, E – y/MM/dd, E + y/MM/dd, E – y/MM/dd, E + y/MM/dd, E – y/MM/dd, E + MMM y – MMM y @@ -1372,39 +1634,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic محرم صفر - ربيع - ربيع II - جماد I - جماد ۲ - رجب - شعبان - رمضان - شوال - دالقاعده - ذي الحج - - - محرم - صفر - ربیع اول - ربيع II - جمادي اول - جماعه II - رجب - شعبان - رمضان - شوال - ذي القعده - ذي الحج - - - - - محرم - صفر - ربيع - ربيع II - جماد I + ربیع I + ربيع ۲ + جماد ۱ جماد ۲ رجب شعبان @@ -1429,28 +1661,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - - G y MMMM d, EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - GGGGG y/M/d - - - + + + ه + + M/y G @@ -1555,16 +1770,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} مياشتې مخکې - - - په {0} مياشت کې - په {0} مياشت کې - - - {0} مياشت مخکې - {0} مياشت مخکې - - اونۍ تيره اونۍ @@ -1584,10 +1789,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic تېره اونۍ دا اونۍ راتلونکې اونۍ - - په {0} اونۍ کې - په {0} اونۍ کې - د مياشتې اونۍ @@ -1651,16 +1852,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} دوشنبې مخکې - - - په {0} دوشنبه کې - په {0} دوشنبه کې - - - {0} دوشنبه مخکې - {0} دوشنبه مخکې - - تيره سه شنبه دا سه شنبه @@ -1678,14 +1869,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic تېره سه شنبه دا سه شنبه راتلونکې سه شنبه - - په {0} سه شنبه کې - په {0} سه شنبه کې - - - {0} سه شنبه مخکې - {0} سه شنبه مخکې - تيره سه شنبه @@ -1705,14 +1888,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} چارشنبې مخکې - + په {0} چارشنبه کې - په {0} چارشنبه کې + په {0} چارشنبو کې {0} چارشنبه مخکې - {0} چارشنبه مخکې + {0} چارشنبې مخکې @@ -1728,14 +1911,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} پنجشنبې مخکې - + په {0} پنجشنبه کې - په {0} پنجشنبه کې + په {0} پنجشنبو کې {0} پنجشنبه مخکې - {0} پنجشنبه مخکې + {0} پنجشنبې مخکې @@ -1751,14 +1934,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} جمعې مخکې - + په {0} جمعه کې - په {0} جمعه کې + په {0} جمعو کې {0} جمعه مخکې - {0} جمعه مخکې + {0} جمعې مخکې @@ -1774,14 +1957,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} شنبې مخکې - + په {0} شنبه کې - په {0} شنبه کې + په {0} شنبو کې {0} شنبه مخکې - {0} شنبه مخکې + {0} شنبې مخکې @@ -1822,10 +2005,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - په {0} دقيقه کې - په {0} دقيقه کې - {0} دقيقه مخکې {0} دقيقه مخکې @@ -1843,16 +2022,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ثانيې مخکې - - - په {0} ثانيه کې - په {0} ثانيه کې - - - {0} ثانيه مخکې - {0} ثانيه مخکې - - {0} ثانيه کې @@ -1864,6 +2033,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + +UTC؟ {0} وخت {0} رڼا ورځ وخت {0} معیاری وخت @@ -1876,7 +2046,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - نامعلوم ښار + نامعلوم موقعیت اندورا @@ -2344,9 +2514,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic لیبریل - - بريتانوي د اوړي وخت - لندن @@ -2437,9 +2604,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic جاياپورا - - آيرش معياري وخت - ډبلن @@ -2751,9 +2915,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic وارسا - - ميکويلان - پيټيکيرن @@ -3135,6 +3296,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic هرارې + + + د اکر وخت + د اکر معیاري وخت + د اکر د اوړي وخت + + افغانستان وخت @@ -3204,9 +3372,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - اپیا وخت - اپیا معياري وخت - اپيا د ورځې روښانه وخت + د لوېدیځ ساموا وخت + د لوېدیځ ساموا معیاري وخت + د لوېدیځ ساموا د ورځې رڼا وخت @@ -3246,7 +3414,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - مرکزي آستراليا وخت + مرکزي استرالیايي وخت آسترالوي مرکزي معياري وخت آسترالوي مرکزي د ورځې روښانه وخت @@ -3260,15 +3428,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ختيځ آستراليا وخت + ختیځ استرالیايي وخت آسترالوي ختيځ معياري وخت آسترالوي ختيځ د ورځې روښانه وخت - لوېديځ آستراليا وخت - آسترالوي لوېديځ معياري وخت + لویدیځ استرالیايي وخت + آسترالیايي لوېديځ معياري وخت آسترالوي لوېديځ د ورځې روښانه وخت @@ -3310,6 +3478,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic برسلیا اوړي وخت + + + د بریتانیا وخت + بريتانوي د اوړي وخت + + برونايي دارالسلام وخت @@ -3369,7 +3543,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic کوک ټاپوګانو وخت کوک ټاپوګانو معياري وخت - کوک ټاپوګانو نيم اوړي وخت + کوک ټاپوګانو د اوړي وخت @@ -3386,12 +3560,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ډومونټ ډي ارول + ډومونټ ډي ارول وخت - ختيځ تيمور وخت + د تیمور-لېسته وخت @@ -3453,7 +3627,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - د فرانسې سویل او انټارټيک وخت + د فرانسوي جنوبي سیمو وخت @@ -3483,6 +3657,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ګرينويچ معياري وخت + + + د ګرین لینډ وخت + د ګرین لینډ معیاري وخت + د ګرین لینډ د اوړي وخت + + د ختیځ ګرینلینډ وخت @@ -3509,13 +3690,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic - هوایی الیوتین معیاری وخت + هوایی وخت هوایی الیوتین وخت - هوایی الیوتین معیاری وخت + هوایی الیوتین-معیاری وخت هوایی الیوتین رڼا ورځې وخت @@ -3570,6 +3751,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ايران د ورځې روښانه وخت + + + د ایرلیڼد وخت + د ایرلیڼد معیار وخت + + ارکوټسک وخت @@ -3591,6 +3778,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic جاپان د ورځې روښانه وخت + + + کمچټکا وخت + د کمچټکا معیاري وخت + د کمچټکا د اوړي وخت + + قزاقستان وخت @@ -3752,9 +3946,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - فرنانڈو دي نورونها وخت - فرنانڈو دي نورونها معیاری وخت - فرنانڈو دي نورونھا اوړي وخت + فرنانډو دي نورونها وخت + فرنانډو دي نورونها معیاری وخت + فرنانډو دي نورونھا اوړي وخت @@ -3828,7 +4022,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - پونيپ وخت + پونپي وخت @@ -3853,11 +4047,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic سخلين اوړي وخت + + + د سمارا وخت + د سمارا معیاري وخت + د سمارا د اوړي وخت + + - سموا وخت - سموا معياري وخت - سموا د ورځې روښانه وخت + امریکايي سموا وخت @@ -3924,6 +4123,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic چوک وخت + + + د ترکیې وخت + د ترکیې معیاري وخت + د ترکیې د اوړي وخت + + ترکمانستان وخت @@ -3943,6 +4149,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic یوروګوای اوړي وخت + + + د اورمچي وخت + + ازبکستان وخت @@ -4032,16 +4243,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 0G - 0G - 00G - 00G - 000G - 000G + 0 زره + 0 زره + 00 زره + 00 زره + 000 زره + 000 زره + 0 میلیونه + 0 میلیونه + 00 میلیونه + 00 میلیونه + 000 میلیونه + 000 میلیونه + 0 بیلیونه + 0 بیلیونه + 00 بیلیونه + 00 بیلیونه + 000 بیلیونه + 000 بیلیونه + 0 ټریلیونه + 0 ټریلیونه + 00 ټریلیونه + 00 ټریلیونه + 000 ټریلیونه + 000 ټریلیونه + 0 زره + 0 زره + 00 زره + 00 زره + 000 زره + 000 زره + 0 میلیونه + 0 میلیونه + 00 میلیونه + 00 میلیونه + 000 میلیونه + 000M 0B 0B 00B @@ -4069,30 +4310,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ¤ 0K - ¤ 0K - ¤ 00K - ¤ 00K - ¤ 000K - ¤ 000K - ¤ 0M - ¤ 0M - ¤ 00M - ¤ 00M - ¤ 000M - ¤ 000M ¤ 0B ¤ 0B ¤ 00B ¤ 00B ¤ 000G ¤ 000B - ¤ 0T - ¤ 0T - ¤ 00T - ¤ 00T - ¤ 000T - ¤ 000T {0} ¤¤ @@ -4664,7 +4887,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic سولومن ټاپوګانو ډالر سولومن ټاپوګانو ډالر - سولومن ټاپوګانو ډالرې + سولومن ټاپوګانو ډالر سيچيليسي روپۍ @@ -4828,9 +5051,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic CFP فرانکس - نامعلومه مروجه پېسې - (د نامعلومه مروجه پېسو واحد) - (نامعلومه مروجه پېسې) + نامعلوم اسعار + (د نامعلومه اسعارو واحد) + (نامعلومه اسعار) يمني ريال @@ -4847,8 +5070,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic د زمبابوې سره زر - د زمبابوې سره زر - د زمبابوې سره زر @@ -4863,7 +5084,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - پرېکړه{0} + ډیسی میتره{0} سانتي {0} @@ -4896,7 +5117,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic رونټو{0} - کویټو{0} + کویکټو{0} ډیکا {0} @@ -4935,28 +5156,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic کوټه{0} - kibi{0} + کیبي{0} - mebi{0} + میبي{0} - gibi{0} + ګیبي{0} - tebi{0} + ټیبي{0} - pebi{0} + پیبي{0} - exbi{0} + ایګزبی{0} - zebi{0} + زیبی{0} - yobi{0} + یوبي{0} {0}في {1} @@ -5027,7 +5248,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} في مربع سنتي متر - مربع ميل {0} مربع ميل {0} مربع ميل {0} في مربع ميل @@ -5041,13 +5261,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} مربع ګز {0} مربع ګز - - مربع فټ - {0} مربع فټ - {0} مربع فټ - - مربع انچ {0} مربع انچ {0} مربع انچ {0} في مربع انچ @@ -5116,7 +5330,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ليټرز في ۱۰۰ کيلو مترز - ميلز في ګيلن {0} ميل في ګيلن {0} ميلز في ګيلن @@ -5170,16 +5383,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} کيلو بټ {0} کيلو بټس - - بايټس - {0} بايټ - {0} بايټس - - - بټس - {0} بټ - {0} بټس - پېړۍ {0} پېړۍ @@ -5235,6 +5438,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic نينو ثانيې + {0} نینو ثانیه + {0} نینو ثانیې ايمپيرز @@ -5242,7 +5447,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ايمپيرز - ملي ايمپيرز {0} ملي ايمپير {0} ملي ايمپيرز @@ -5256,9 +5460,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} وولټس - کيلو کيلريز - {0} کيلو کيلري - {0} کيلو کيلريز + کيلو کالوري + {0} کيلو کالوري + {0} کيلو کالوري کيلريز @@ -5267,7 +5471,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic کيلريز - {0} کيلري + {0} kcal {0} کيلريز @@ -5296,7 +5500,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic متحده ایالاتو ترمامونه - {0} US تهرم + {0} د متحده ایالاتو تهرم {0} US تهرم @@ -5444,7 +5648,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} بحري ميلونه - سکېنډنيوين ميل + سکینډینویايي مایلز {0} سکېنډنيوين ميل {0} سکېنډنيوين ميلونه @@ -5461,12 +5665,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic لکس - کینډیلا {0} کینډیلا {0} کینډیلا - لومن {0} لومن {0} لومن @@ -5538,7 +5740,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} لمريز حجم - دانې {0} دانې {0} دانې @@ -5648,15 +5849,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic بیوفورټ {0} بیوفورټ {0} - - درجې سيلسيس - {0} درجې سيلسيس - {0} درجې سيلسيس - درجې فارنهايټ - {0} درجې فارنهايټ - {0} درجې فارنهايټ کيلونز @@ -5769,9 +5963,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ګيلنز {0} في ګيلن - - امپراطوري ګیلن - څلورمه {0} څلورمه @@ -5804,19 +5995,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} بېرلز - مچ چمچ - {0} مچ چمچ - {0} مچ چمچ + د ډیزرټ کاچوغي + {0} د ډیزرټ کاچوغي + {0} د ډیزرټ کاچوغي Imp. dessert spoons {0} Imp. dessert spoon {0} Imp. dessert spoons + + څاڅکی + {0} څاڅکی + {0} څاڅکي + - ډرام - {0} ډرام - {0} ډرام + ډرامونه + {0} ډرامونه + {0} ډرامونه + + + {0} جګرونه + {0} جګرونه Imp. quarts @@ -5854,7 +6054,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic کالوري [IT] {0} کالوري [IT] - {0} cal-IT + {0} کالوري-IT بیکریلز @@ -5885,11 +6085,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ویبر {0} ویبرز - - رڼا - {0} رڼا - {0} رڼا - برخې په ملیارد {0} برخې په ملیارد @@ -5920,9 +6115,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic arcmins - - آرکسیکس - هيکترې @@ -6065,6 +6257,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic μsecs + + نینو ثانیې + amps @@ -6077,15 +6272,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic volts + + کیلو کالوري + کيلو جول جولز - - kW-hour - اليکټران وولټ @@ -6094,8 +6289,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic US تهرم - {0} US تهرم - {0} US therm + {0} د متحده ایالاتو تهرم + {0} د متحده ایالاتو تهرم پاونډ قوه @@ -6215,12 +6410,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} mph {0} mph - - deg. C - - - deg. F - yards³ @@ -6268,20 +6457,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic بېرل + + د ډیزرټ کاچوغي + {0} ډيزرټ کاچوغي + {0} ډيزرټ کاچوغي + - څاڅک - {0} څاڅک - {0} څاڅک + څاڅکي + {0} څاڅکی + {0} څاڅکي - ډرام مایع - {0} ډرام - {0} ډرام + ډرامونه + {0} ډرامونه + {0} ډرامونه - جګر - {0} جګر - {0} جګر + جیګرونه + {0} جګرونه + {0} جګرونه چنه @@ -6319,6 +6513,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + arcsec + مربع ميل @@ -6327,17 +6524,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ft² {0}ft² - - مربع انچ - - - برخه - {0} برخه - {0} برخه - - - Glc - mpg {0}mpg @@ -6409,12 +6595,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic μsec - - ملي ايمپيرز + + کیلو کالوري + + + kWh - {0}US تهرم - {0}US تهرم + {0} د متحده ایالاتو تهرم + {0} د متحده ایالاتو تهرم lbf @@ -6447,12 +6636,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}″ {0}″ - - نوري کاله - - - لومن - L☉ {0} L☉ @@ -6468,17 +6651,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}g - دانې {0}gr {0}gr - - د Hg - {0} د Hg - {0} د Hg - - بار {0}بار {0} بار @@ -6520,28 +6696,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}fl oz Im - {0}dsp - {0}dsp + د ډیزرټ کاچوغي + {0}ډيزرټ کاچوغي + {0}ډيزرټ کاچوغي dsp Imp {0}dsp-Imp {0}dsp-Imp - - {0}fl.dr. - {0}fl.dr. + + څاڅکی + {0} څاڅکی + {0} څاڅکی - - کات - {0} کات - {0} کات + + مایع ډرام + {0}مایع ډرام + {0}مایع ډرام - - cal-IT + + جیګرونه + {0} جګرونه + {0} جګرونه - رڼا {0}رڼا {0}رڼا @@ -6671,16 +6850,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic پکٹوګراف ځای نبات - تنقيط + علامه ګذاري ښۍ اړخ ته غشی نښه یا سمبول کوچنۍ بله بڼه - مسکېدلې - مسکېدلي يا شخص - د سويلي آسيا سکريپټ - د سويلي ختيځ آسيا سکريپټ - واټن ورکول - لوبه + سمایلي + سمایلي یا شخص + د سويلي آسيا لیک + د سويلي ختيځ آسيا لیک + واټن + سپورټ سمبول تخنیکي سمبول ټون نښه @@ -6689,8 +6868,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic پورته غشي بله بڼه وکيليک جامو - موسم - لويديځ آسيايي سکريپټ + هوا + لويديځ آسيايي لیک سپين ځای @@ -6703,7 +6882,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic کيپشن ټيکسټ ټيټلنګ - څرګندونه پوسټر شا ته کوږ سيدها @@ -6735,12 +6913,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic سپک ميانه سپک کتاب - رسمي ميانه - نيم زغرد - ډمي زغرد - زغرد - اضافي زغرد تور دروند اضافي تور @@ -6755,12 +6928,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic پرله پسى شمير مطابقتي شمېرې کوچني لوي توري - جدولي لوى تورى - سليشډ صفر + جدولي شمیرې und ps ko vi yue zh + informal {given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram-allCaps} diff --git a/make/data/cldr/common/main/ps_PK.xml b/make/data/cldr/common/main/ps_PK.xml index 2650c30d766f..1699c1b91825 100644 --- a/make/data/cldr/common/main/ps_PK.xml +++ b/make/data/cldr/common/main/ps_PK.xml @@ -227,11 +227,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic سینټ پییرا و ميکلين رڼا ورځے وخت - - - د سموا د ورځے روښانه کول - - @@ -243,7 +238,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic نامعلومه مروجه پېسے - (د نامعلومه مروجه پېسو واحد) + (د نامعلومه اسعارو واحد) (نامعلومه مروجه پېسے) diff --git a/make/data/cldr/common/main/pt.xml b/make/data/cldr/common/main/pt.xml index 2ad2f90159f9..c2d77c49aac7 100644 --- a/make/data/cldr/common/main/pt.xml +++ b/make/data/cldr/common/main/pt.xml @@ -206,7 +206,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ haida do sul hebraico hindi - hindi (latim) hinglish hiligaynon hitita @@ -418,6 +417,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ páli pijin polonês + piemontês pohnpeiano malecite–passamaquoddy prussiano @@ -1103,18 +1103,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenação Classificação normalizada Classificação numérica + Reordenação de scripts/blocos Prioridade da classificação Moeda + Alvo da transformação + Exclusões de quebra de dicionário Tipo de emoji + Primeiro dia da semana + Misturado Ciclo de horário (12 vs. 24) + Método de entrada + Teclado + Mais altos ignorados Estilo de quebra de linha Quebras de linha em palavras + Regras de transformação Sistema de medição + Unidade de medida Números + Região para dados complementares + Origem da transformação + Subdivisão da região Espaço após abreviação + Transformação + Tradução automática Fuso horário Variante de localidade Uso privado + Transformação de uso privado Calendário Budista @@ -1134,13 +1150,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Calendário Hebraico Hebraico Calendário Nacional Indiano + Nacional Indiano Calendário Hegírico Hegírico Calendário Hegírico (tabular, época civil) Hegírico (tabular, época civil) + Hegírico, avistamento na Arábia Saudita + Hegírico (tabular, época astronômica) Calendário Hegírico (Umm al‑Qura) Hegírico (Umm al‑Qura) Calendário ISO-8601 + Gregoriano Calendário Japonês Japonês Calendário Persa @@ -1156,8 +1176,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Classificar acentos normalmente Classificação reversa de acentos Classificar por minúsculas + Minúsculas Classificação normal de maiúsculas e minúsculas + Minúsculas Classificar por maiúsculas + Maiúsculas Classificação sem diferenciação de maiúsculas e minúsculas Classificação com diferenciação de maiúsculas e minúsculas Ordem anterior, para compatibilidade @@ -1166,7 +1189,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dicionário Ordem padrão do Unicode Padrão do Unicode + Emoji Regras europeias de ordenação + Regras europeias Ordem de lista telefônica Lista telefônica Ordem de classificação fonética @@ -1176,6 +1201,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pesquisa de uso geral Pesquisa Pesquisar por consonante inicial hangul + Consoante inicial coreana Ordem padrão Padrão Ordem dos traços @@ -1190,17 +1216,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Classificar Unicode normalizado Classificar dígitos individualmente Classificar dígitos numericamente + Moeda + Dígitos + Pontuação + Espaço em branco + Símbolo Classificar tudo + Tudo Classificar somente letras básicas + Apenas alfabeto básico Classificar acentos/maiúsculas e minúsculas/largura/kana + Alfabeto básico, acentos, maiúscula e minúscula, variantes, kana Classificar acentos + Alfabeto básico, acentos Classificar acentos/maiúsculas e minúsculas/largura + Alfabeto básico, acentos, maiúscula e minúscula, variantes Largura inteira Meia largura Numérico Padrão Emoji Texto + Sistema de 12 horas + 12 + Sistema de 24 horas + 24 Sistema de 12 horas (0–11) 12 (0–11) Sistema de 12 horas (1–12) @@ -1209,6 +1249,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) Sistema de 24 horas (1–24) 24 (1–24) + Deslocar espaços, pontuação, todos os símbolos + Deslocar espaços, pontuação + Deslocar espaços, pontuação + Deslocar espaços, pontuação, símbolos não monetários Quebra de linha com estilo solto Solto Quebra de linha com estilo normal @@ -1229,51 +1273,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ EUA Algarismos indo-arábicos Algarismos indo-arábicos estendidos + Indo-arábicos estendidos Algarismos armênios - Algarismos armênios minúsculos + Algarismos armênios em minúsculas + Armênios em minúsculas Algarismos bengali Algarismos chakma Algarismos devanágari Algarismos etiopianos Numerais financeiros + Financeiros Algarismos em extensão total + Extensão total Algarismos georgianos Algarismos gregos Algarismos gregos minúsculos + Gregos em minúsculas Algarismos guzerate Algarismos gurmuqui + Numeração de dias do mês em caracteres Han para calendários tradicionais Algarismos decimais chineses + Sistema decimal posicional que usa ideogramas numéricos chineses como dígitos Algarismos chineses simplificados Algarismos financeiros chineses simplificados + Chinês simplificado financeiro Algarismos chineses tradicionais Algarismos financeiros chineses tradicionais + Chinês tradicional financeiro Algarismos hebraicos Algarismos javaneses Algarismos japoneses Algarismos financeiros japoneses + Japonês financeiro + Numeração japonesa com Gannen para o primeiro ano Algarismos khmer Algarismos canareses + Tai Tham Tham (eclesiástico) Algarismos laosianos Algarismos ocidentais + Matemático em negrito + Matemático contornado + Matemático monoespaçado + Matemático sem serifa em negrito + Matemático sem serifa Algarismos malaialos Algarismos mongóis Algarismos meetei mayek Algarismos mianmarenses + Mianmarense karen pwo oriental + Mianmarense pao + Mianmarense shan + Mianmarense tai laing Algarismos nativos + Algarismos nativos Algarismos ol chiki Algarismos oriá + Contornado Algarismos romanos + Romanos em maiúsculas Algarismos romanos minúsculos + Romanos em minúsculas + Segmentados Algarismos tâmil tradicionais Algarismos tâmil + Tâmil moderno Algarismos telugos Algarismos tailandeses Algarismos tibetanos Numerais tradicionais + Algarismos tradicionais Algarismos vai Desativado Ativado + Tradução automática não especificada + Variante POSIX + + Desativado + Ativado + métrico Reino Unido @@ -1308,8 +1386,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - [aáàâã b cç d eéê f g h ií j k l m n oóòôõ p q r s t uú v w x y z] - [ªăåäā æ èĕëē ìĭîïī ñ ºŏöøō œ ùŭûüū ÿ] + [aáàâã b cç d eéê f g h ií j k l m n oóôõ p q r s t uú v w x y z] + [ªăåäā æ èĕëē ìĭîïī ñ ºòŏöøō œ ùŭûüū ÿ] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] {0}… {1} @@ -1496,7 +1574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h:mm a h:mm:ss a h a, v - HH v + HH'h', v d/M E, dd/MM d 'de' MMM @@ -1516,6 +1594,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMMM 'de' y G + + {0}–{1} + {0}–{1} + h:mm – h:mm B @@ -1565,6 +1647,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM – E, d 'de' MMM E, d 'de' MMM – E, d 'de' MMM + + d–d 'de' MMMM + d 'de' MMMM – d 'de' MMMM + y – y G @@ -1780,6 +1866,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1839,12 +1928,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM 'de' y G d 'de' MMM 'de' y G E, d 'de' MMM 'de' y G + MMMM 'de' Y G + d 'de' MMMM 'de' y G + E, d 'de' MMMM 'de' y G h:mm a h:mm:ss a h:mm:ss a v h:mm a v h a, v - HH v + HH'h', v dd/MM E, dd/MM dd/MM @@ -1869,6 +1961,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w'ª' 'semana' 'de' Y w'ª' 'semana' 'de' Y + + {1}, {0} + {0} {1} + {1}, {0} + h – h B @@ -1970,6 +2067,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d 'de' MMM – E, d 'de' MMM E, d 'de' MMM – E, d 'de' MMM + + d–d 'de' MMMM + d 'de' MMMM – d 'de' MMMM + y – y @@ -2428,6 +2529,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + {0} GMT + {0} UTC Horário {0} Horário de Verão: {0} Horário Padrão: {0} @@ -2533,9 +2636,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ilhas Faroé - - Horário de Verão Britânico - Londres @@ -2571,11 +2671,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jacarta - - - Horário Padrão Irlandês - - Jerusalém @@ -2778,7 +2873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Beulah, Dakota do Norte - New Salen, Dakota do Norte + New Salem, Dakota do Norte Center, Dakota do Norte @@ -2810,6 +2905,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Éfaté + + Wallis e Futuna + Áden @@ -2845,7 +2943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Horário da África do Sul + Horário Padrão da África do Sul @@ -2860,13 +2958,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão do Alasca - - - Horário do Almaty - Horário Padrão do Almaty - Horário de Verão do Almaty - - Horário do Amazonas @@ -2921,20 +3012,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão de Apia - - - Horário do Aqtau - Horário Padrão do Aqtau - Horário de Verão do Aqtau - - - - - Horário do Aqtobe - Horário Padrão do Aqtobe - Horário de Verão do Aqtobe - - Horário da Arábia @@ -3000,9 +3077,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Horário do Arzeibaijão - Horário Padrão do Arzeibaijão - Horário de Verão do Arzeibaijão + Horário do Azerbaijão + Horário Padrão do Azerbaijão + Horário de Verão do Azerbaijão @@ -3041,6 +3118,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ BRST + + + Horário Britânico + Horário de Verão Britânico + + Horário de Brunei Darussalam @@ -3100,7 +3183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário das Ilhas Cook Horário Padrão das Ilhas Cook - Meio Horário de Verão das Ilhas Cook + Horário de Verão das Ilhas Cook @@ -3214,11 +3297,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário do Meridiano de Greenwich + + + Horário da Groenlândia + Horário Padrão da Groenlândia + Horário de Verão da Groenlândia + + - Horário da Groelândia Oriental - Horário Padrão da Groelândia Oriental - Horário de Verão da Groelândia Oriental + Horário da Groenlândia Oriental + Horário Padrão da Groenlândia Oriental + Horário de Verão da Groenlândia Oriental @@ -3228,11 +3318,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão da Groenlândia Ocidental - - - Horário Padrão de Guam - - Horário do Golfo @@ -3245,7 +3330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Horário Padrão do Havaí e Ilhas Aleutas + Horário do Havaí @@ -3306,6 +3391,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão do Irã + + + Horário Irlandês + Horário Padrão Irlandês + + Horário de Irkutsk @@ -3329,9 +3420,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Horário de Petropavlovsk-Kamchatski - Horário Padrão de Petropavlovsk-Kamchatski - Horário de Verão de Petropavlovsk-Kamchatski + Horário de Kamchatka + Horário Padrão de Kamchatka + Horário de Verão de Kamchatka @@ -3373,11 +3464,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário do Quirguistão - - - Horário de Lanka - - Horário das Ilhas da Linha @@ -3390,13 +3476,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão de Lord Howe - - - Horário de Macau - Horário Padrão de Macau - Horário de Verão de Macau - - Horário de Magadan @@ -3512,11 +3591,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão de Fernando de Noronha - - - Horário das Ilhas Mariana do Norte - - Horário de Novosibirsk @@ -3596,13 +3670,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Pyongyang - - - Horário de Qyzylorda - Horário Padrão de Qyzylorda - Horário de Verão de Qyzylorda - - Horário de Reunião @@ -3629,9 +3696,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Horário de Samoa Horário Padrão de Samoa - Horário de Verão de Samoa @@ -3724,6 +3789,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Horário de Verão do Uruguai + + + Horário de Ürümqi + + Horário do Uzbequistão @@ -4219,11 +4289,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yuan chinês (offshore) Yuans chineses (offshore) - - Dólar do Banco Popular da China - Dólar do Banco Popular da China - Dólares do Banco Popular da China - Yuan chinês Yuan chinês @@ -6656,7 +6721,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ força g - metros/seg² + metros/s² radianos @@ -7251,11 +7316,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol/l - - parte - {0} parte - {0} parte - ppm @@ -7268,9 +7328,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - l/km @@ -7443,19 +7500,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ watt - - de Hg - {0} de Hg - {0} de Hg - {0} mb {0} mb - - {0}km/h - {0}km/h - m/s @@ -7479,8 +7527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ litro - {0}l - {0}l bushel @@ -7499,9 +7545,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl. oz. {0} fl. oz. - - cal-IT - ppb diff --git a/make/data/cldr/common/main/pt_CV.xml b/make/data/cldr/common/main/pt_CV.xml index 7c00e34c6ded..d7e2e1fb0f5c 100644 --- a/make/data/cldr/common/main/pt_CV.xml +++ b/make/data/cldr/common/main/pt_CV.xml @@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - AZOT + ∅∅∅ ∅∅∅ ∅∅∅ diff --git a/make/data/cldr/common/main/pt_GQ.xml b/make/data/cldr/common/main/pt_GQ.xml index f735e844e08e..8d8c2afeac15 100644 --- a/make/data/cldr/common/main/pt_GQ.xml +++ b/make/data/cldr/common/main/pt_GQ.xml @@ -11,4 +11,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + diff --git a/make/data/cldr/common/main/pt_PT.xml b/make/data/cldr/common/main/pt_PT.xml index 6dfc090ad09d..97baf8fef757 100644 --- a/make/data/cldr/common/main/pt_PT.xml +++ b/make/data/cldr/common/main/pt_PT.xml @@ -250,8 +250,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenação normalizada Ordenação numérica Força da ordenação + Exclusões de separação de palavras do dicionário Ciclo horário (12 vs. 24) Sistema de medida + Região para dados suplementares + Fonte da transformação + Subdivisão de região + Regra de transformação + Traduzido automaticamente Variante de região @@ -265,9 +271,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Calendário gregoriano Calendário hebraico Calendário nacional indiano + Nacional indiano Calendário hegírico Calendário hegírico (civil) Hegírico (civil) + Hegírico (astronómico) Calendário hegírico (Umm al-Qura) Calendário japonês Calendário persa @@ -288,6 +296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordem da lista telefónica Lista telefónica Ordem de pinyin + Consoante inicial do coreano Ordenação padrão Ordem por traços Ordem por radical e traços @@ -297,12 +306,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordenar Unicode normalizado Ordenar dígitos individualmente Ordenar dígitos numericamente + Algarismos Ordenar tudo Ordenar apenas letras básicas Ordenar acentos/tipo de letra/largura/kana + Alfabeto básico, acentos, maiúsculas e minúsculas, variantes, kana Ordenar acentos Ordenar acentos/tipo de letra/largura + Alfabeto básico, acentos, maiúsculas e minúsculas, variantes Largura completa + Espaços shift, pontuação, todos os símbolos + Espaços shift, pontuação + Espaços shift, pontuação + Espaços shift, pontuação, símbolos não relacionados com moedas Estilo flexível de quebra de linha Flexível Estilo padrão de quebra de linha @@ -317,37 +333,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ RU Sistema de medida americano Algarismos indo-arábicos expandidos + Indo-arábicos expandidos Numeração arménia Numeração arménia minúscula + Arménia minúscula Algarismos bengalis Algarismos devanágaris Numeração etíope Algarismos financeiros + Numeração financeira Algarismos de largura completa + Largura completa Numeração georgiana Numeração grega Numeração grega minúscula + Grega minúscula Algarismos de guzerate Algarismos de gurmukhi + Numeração dos dias do mês em caracteres Han para calendários tradicionais Numeração decimal chinesa + Sistema decimal posicional com ideogramas numéricos chineses como dígitos Numeração em chinês simplificado Numeração financeira em chinês simplificado + Financeira em chinês simplificado Numeração em chinês tradicional Numeração financeira em chinês tradicional + Financeira em chinês tradicional Numeração hebraica Numeração japonesa Numeração financeira japonesa + Financeira japonesa + Numeração Gannen para o primeiro ano do calendário japonês Algarismos de khmer Algarismos de canarim + Numeração Tai Tham Tham (eclesiástica) + Algarismos matemáticos a negrito + Algarismos matemáticos de traço duplo + Algarismos matemáticos monoespaçados + Algarismos matemáticos sem serifa a negrito + Algarismos matemáticos sem serifa Algarismos de malaiala Algarismos de meetei mayek Algarismos birmaneses + Algarismos pwo karen orientais de Myanmar + Algarismos pa’o de Myanmar + Algarismos shan de Myanmar + Algarismos tai laing de Myanmar Algarismos de ol chiki Algarismos de odia + Algarismos contornados Numeração romana + Algarismos romanos maiúsculos Numeração romana minúscula + Algarismos romanos minúsculos + Algarismos segmentados Numeração tâmil Algarismos de tâmil + Algarismos de tâmil modernos Algarismos de telugu Algarismos tradicionais @@ -479,6 +521,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + MM/y G E, d/M/y G MM/y G d/MM/y G @@ -488,6 +531,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ 'de' y G + + {0} – {1} + y G – y G y – y G @@ -699,21 +745,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd/MM/y G E, dd/MM/y G - d/MM + MMMM 'de' y G + ccc, d 'de' MMMM 'de' y G + MM E, d/MM - ccc, d 'de' MMMM W.'ª' 'semana' 'de' MMMM W.'ª' 'semana' 'de' MMMM - MM/y d/MM/y E, d/MM/y EEEE, d/MM/y - ccc, d 'de' MMMM 'de' y QQQQ 'de' y w.'ª' 'semana' 'de' Y w.'ª' 'semana' 'de' Y + + {0} – {1} + d–d @@ -746,15 +794,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM y G E, d MMM y – E, d MMM y G - - h–h a - HH–HH - - h–h a v - M–M @@ -1319,22 +1361,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Faroé - - - Hora de verão Britânica - - Port-au-Prince Macassar - - - Hora de verão da Irlanda - - Arquipélago de Chagos @@ -1526,13 +1558,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão do Alasca - - - Hora de Almaty - Hora padrão de Almaty - Hora de verão de Almaty - - Hora do Amazonas @@ -1587,20 +1612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão de Samoa - - - Hora de Aqtau - Hora padrão de Aqtau - Hora de verão de Aqtau - - - - - Hora de Aqtobe - Hora padrão de Aqtobe - Hora de verão de Aqtobe - - Hora da Arábia @@ -1712,6 +1723,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ∅∅∅ + + + Hora britânica + Hora de verão britânica + + Hora do Brunei @@ -1900,6 +1917,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de Greenwich + + + Hora da Gronelândia + Hora padrão da Gronelândia + Hora de verão da Gronelândia + + Hora da Gronelândia Oriental @@ -1914,11 +1938,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão da Gronelândia Ocidental - - - Hora padrão de Guam - - Hora padrão do Golfo @@ -1931,7 +1950,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora padrão do Havai e Aleutas + Hora do Havai @@ -1992,6 +2011,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão do Irão + + + Hora da Irlanda + Hora de verão da Irlanda + + Hora de Irkutsk @@ -2059,11 +2084,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora do Quirguistão - - - Hora do Sri Lanka - - Hora das Ilhas Line @@ -2076,13 +2096,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão de Lord Howe - - - Hora de Macau - Hora padrão de Macau - Hora de verão de Macau - - Hora de Magadan @@ -2198,11 +2211,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão de Fernando de Noronha - - - Hora das Ilhas Mariana do Norte - - Hora de Novosibirsk @@ -2282,13 +2290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora da Coreia do Norte - - - Hora de Qyzylorda - Hora padrão de Qyzylorda - Hora de verão de Qyzylorda - - Hora de Reunião @@ -2315,9 +2316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora de Samoa Americana Hora padrão de Samoa Americana - Hora de verão de Samoa Americana @@ -2386,9 +2385,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hora da Turquia - Hora Padrão da Turquia - Hora de Verão da Turquia + Hora da Turquia + Hora padrão da Turquia + Hora de verão da Turquia @@ -2410,6 +2409,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hora de verão do Uruguai + + + Hora de Ürümqi + + Hora do Uzbequistão @@ -3830,10 +3834,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ metros - - {0} mi - {0} mi - polegadas @@ -3999,10 +3999,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ metro - - {0} mi - {0} mi - pés {0}/pé diff --git a/make/data/cldr/common/main/qu.xml b/make/data/cldr/common/main/qu.xml index 53a167f04822..247abd071bc4 100644 --- a/make/data/cldr/common/main/qu.xml +++ b/make/data/cldr/common/main/qu.xml @@ -323,6 +323,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pidgin Nigeriano Simi Pijin Simi Polaco Simi + Piedmontese Maliseet-Passamaquoddy Simi Prusiano Simi Pashto Simi @@ -826,15 +827,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Intiwatana Imayna Qullqi kaynin + Mana qhawariy Simbolokuna t’aqay + Acento Inverso nisqa t’aqay + Hatun/Uchuy qillqakuna Ordenación + Caso Sensitivo nisqamanta t’aqay Ñiqinchana + Ordenación Normalizada nisqa + Yupaykunawan t’aqay + Guion/Bloque kaqmanta ordenamiento + T’aqay Kallpa qullqi + Destino nisqaman tikray + Diccionario Break Exclusiones nisqakuna Emoji nisqamanta rikuchiy + First day of week + Mixed-in Ciclo de Horas (12 vs 24) + Yaykuy ñan + Teclado + Aswan Alto Ignorado Siqi paway kaynin Simikuna ukhupi Chiru Pakikuna + Kamachiykunata tikray Tupuy Kamay + Unidad de Medición nisqa Yupaykuna + Región Datos Suplementarios nisqapaq + Pukyuta tikray + Región Subdivisión nisqa Oración Pakikuy Abbr. + Tikray + Maquinawan tikrasqa + Tiempo nisqa + Variante Local nisqa + Sapaq-Uso + Sapaq-Uso Transformado nisqa Budista Intiwatana @@ -853,13 +880,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gregorian Hebreo Intiwatana Hebreo + Indio Nacional Hijri Intiwatana Hijri Hijri Intiwatana (tabular, epoca civil) Hijri (tabular, epoca civil) + Hijri, Arabia Saudita rikusqa + Hijri (Tabular, Enfoque Astronómico) Hijri Intiwatana (Umm al-Qura) Hijri (Umm al-Qura) ISO-8601 Intiwatana + Gregorian Japones Intiwatana Japones Persa Intiwatana @@ -870,15 +901,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Accounting Estandar nisqa qullqi imayna kaynin Standard + Huch’uy qillqa + Huch’uy qillqa + Hatun qillqakuna + Compatibilidad nisqa + Simi taqi Ñawpaqchasqa Unicode Nisqa Ñiqinchana Ñawpaqchasqa Unicode + Emoji nisqa + Iwrupapi kamachiykuna + Teléfono nisqa libro + Fonético nisqa + Pinyin Llapanpaq maskana maskana + Corea simipi qallariy kunka Estandar nisqa Ñiqinchana Estandar + Siqi + Costumbre + Radical-AVC nisqa + Z-Tigre Causa + Kunan + Dígitos nisqakuna + Puntuacion + Yuraq pampa + Unancha + Llapan + Base Letrakunalla + Base, Acentos, Caso, Variantes, Kana + Base, Acentos nisqa + Base, Acentos, Caso, Variantes + To Todo Ancho nisqaman + Kuska Anchokama Default Emoji Text + 12 hora kaynin + 12 + 24 hora kaynin + 24 12 hora kaynin (0–11) 12 (0–11) 12 hora kaynin (1–12) @@ -887,6 +949,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 hora kaynin (1–24) 24 (1–24) + Mayukuna Espaciokuna, puntuacion, llapan siñalkuna + Espaciokuna cambiay, puntuacion + Espaciokuna cambiay, puntuacion + Mayuman tikranapaq espaciokuna, puntuacion, mana qullqiyuq siñalkuna Siqi paway chinkachiy kaynin Loose Siqi paway Normal kaynin @@ -897,6 +963,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tukuy imata waqaychay Normal Frases nisqapi waqaychay + EE.UU. BGN Transliteración nisqa + Transliteración nisqa Metrico Kamay Metrico Metrico Ingles Kamay @@ -905,47 +973,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic US Arabe Sananpakuna Arabe Mirachisqa Sananpakuna + Mastarisqa árabe-indico Armenio Sananpakuna Armenio Uchuy Sananpakuna + Armenia simipi huch’uy qillqa Bangla Sananpakuna Chakma Sananpakuna Devanagari Sananpakuna Etiope Sananpakuna + Finanzas Llapan kinray Sananpakuna + Tukuy anchoyuq Gregoriano Yupaykuna Griego Yupaykuna Griego Uchuy Yupaykuna + Griego simipi huch’uy qillqa Gujarati Sananpakuna Gurmukhi Sananpakuna + Han-character pʼunchaw-killa yupay ñawpaq calendariokunapaq Chunkachasqa Chino Yupaykuna + Chunkayuq posición nisqa sistema chino yupay ideografía nisqakunata digito hina llamkʼachispa Uchuyachusqa Chino Yupaypakuna Uchuyachisqa Qullqi Chino Yupaypakuna + China qullqimanta pisiyachisqa Kikin Chino Yupaypakuna Kikin Qullqi Chino Yupaypakuna + Tradicional chino qullqimanta Hebreo Yupaykuna Javaneses Yupaykuna Japones Yupaykuna Japones Qullqi Yupaykuna + Japón qullqimanta + Japonmanta ñawpaq wata Gannen yupay Khmer Sananpakuna Kannada Sananpakuna + Tai Tham Tham (iglesiastika) Lao Sananpakuna Occidental Sananpakuna + Mathematical bold + Mathematical double-struck + Mathematical monospace + Mathematical sans-serif bold + Mathematical sans-serif Malayalam Sananpakuna Meetei Mayek Yupaykuna Myanmar Sananpakuna + Myanmar Eastern Pwo Karen + Myanmar Pao + Myanmar Shan + Myanmar Tai Laing + Native Digits + Native digits Ol Chiki Yupaykuna Odia Sananpakuna + Outlined Romano Sananpakuna + Romanu hatun qillqa Roman Uchuy Yupaykuna + Romanu uchuy qillqa + Segmentado nisqa Kikin Tamil Yupaykuna Tamil Sananpakuna + Kunan pacha tamil simi Telegu Sananpakuna Thai Sananpakuna Tibetano Sananpakuna + Ñawpa pacha yupaykuna Vai Yupaykuna Off On + Mana nisqa Maquinawan tikray + POSIX variant + + Off + On + Simi: {0} Qillqa: {0} @@ -985,6 +1088,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1016,23 +1122,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y G - M/d/y GGGGG + M/y G + d/M/y GGGGG + E, d/M/y G MMM y G d MMM y G E, d MMMM y G h a h:mm a h:mm:ss a - dd-MM - E, dd-MM + dd/MM + E, dd/MM d MMM E, d MMMM d MMMM y G y G - MM-y GGGGG - dd-MM-y GGGGG - E, dd-MM-y GGGGG + MM/y GGGGG + dd/MM/y GGGGG + E, dd/MM/y GGGGG MMM y G d MMM y G E, d MMM y G @@ -1080,12 +1188,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d MMM y – E, d MMM y G - dd-MM – dd-MM - dd-MM – dd-MM + dd/MM – dd/MM + dd/MM – dd/MM - E, dd-MM – E, dd-MM - E, dd-MM – E, dd-MM + E, dd/MM – E, dd/MM + E, dd/MM – E, dd/MM d–d MMM @@ -1099,18 +1207,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic y–y G - MM-y – MM-y GGGGG - MM-y – MM-y GGGGG + MM/y – MM/y GGGGG + MM/y – MM/y GGGGG - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG - dd-MM-y – dd-MM-y GGGGG + dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG - E, dd-MM-y – E, dd-MM-y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG MMM–MMM y G @@ -1305,32 +1413,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a - G d/M/y - G MMM y - G d MMM, y + y G + M/y G + d/M/y G + E, d/M/y G + MMM y G + d MMM, y G E, d MMM, y G + MMMM y G + d MMMM y G + E, d MMMM y G h a h:mm a h:mm:ss a h:mm:ss a v h:mm a v + d/M + E, d/M d MMM E, d MMM d MMMM + E, d MMMM W 'semana' MMMM 'killapa' - dd-MM-y - E, dd-MM-y + d/M/y + E, d/M/y MMM y d MMM y E, d MMM, y MMMM y + d MMMM y + E, d MMMM, y w 'semana' Y 'watapa' + + {0} – {1} + {0} – {1} + + + y G – y G + y – y G + MM-y GGGGG – MM-y GGGGG + M/y – M/y G + M/y – M/y G + + + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G + + + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G + MMM y G – MMM y G + MMM – MMM y G MMM y – MMM y G @@ -1379,6 +1522,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -1973,9 +2120,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Adís Abeba - - Hora de Verano Británico - Londres @@ -2002,11 +2146,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Macasar - - - Hora Estandar de Irlanda - - Isla de Man @@ -2166,6 +2305,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Johannesburgo + + + Acre Tiempo + Acre Tiempo Estándar nisqa + Acre Inti raymi pacha + + Hora de Afganistán @@ -2341,6 +2487,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Verano de Brasilia + + + British Tiempo + Hora de Verano Británico + + Hora de Brunei Darussalam @@ -2514,6 +2666,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora del Meridiano de Greenwich + + + Groenlandia pacha + Groenlandia Tiempo Estándar + Groenlandia Inti raymi pacha + + Hora de Groenlandia @@ -2540,7 +2699,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Hora Estandar de Hawai-Aleutiano + Hora de Hawai @@ -2601,6 +2760,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Verano de Irán + + + Hora Irlanda + Hora Estandar de Irlanda + + Hora de Irkutsk @@ -2622,6 +2787,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Verano de Japón + + + Kamchatka Tiempo + Kamchatka Hora Estándar + Kamchatka Verano Tiempo + + Hora de Kazajistán @@ -2889,11 +3061,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Verano de Sakhalin + + + Samara Tiempo + Samara Standard Time + Samara Summer Time + + - Hora de Samoa Hora Estandar de Samoa - Hora de Verano de Samoa @@ -2960,6 +3137,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Chuuk + + + Türkiye Tiempo + Türkiye Hora Estándar + Türkiye Inti raymi pacha + + Hora de Turkmenistán @@ -2979,6 +3163,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hora de Verano de Uruguay + + + Urumqi Tiempo + + Hora de Uzbekistán @@ -3661,7 +3850,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Caribe guilderkuna - Caribe guilderkuna Franco CFA de África Occidental @@ -3688,10 +3876,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbabuemanta quri - Zimbabuemanta quri + {0} punchaw {0}qi yupayta hapiy. diff --git a/make/data/cldr/common/main/quc.xml b/make/data/cldr/common/main/quc.xml index 270f4a970a86..ce01fc5c17b7 100644 --- a/make/data/cldr/common/main/quc.xml +++ b/make/data/cldr/common/main/quc.xml @@ -12,18 +12,236 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Kʼicheʼ + inglés + kʼicheʼ + + + + Guatemala Macedonia del Norte + + Chʼabʼal: {0} + Tzʼibʼ: {0} + Rulewal: {0} + - [aä {aʼ} {bʼ} {ch} {chʼ} e {eʼ} i {iʼ} j k {kʼ} l m n o p q {qʼ} r s t {tz} {tzʼ} {tʼ} u {uʼ} v w x y] + [a {aa} {bʼ} {ch} {chʼ} e {ee} i {ii} j k {kʼ} l m n o {oo} p q {qʼ} r s t {tz} {tzʼ} {tʼ} u {uu} w x y ʼ] [c d f g h ñ z] [AÄ {Bʼ} {CH} {CHʼ} E I J K {Kʼ} L M N O P Q {Qʼ} R S T {TZ} {TZʼ} {Tʼ} U V W X Y] + [{‐‑} – — , ; ! ? . … {'‘’} {"“”} ( ) § @ * / {\\\-} {\\\:} {\\\[} {\\\]} {\\\&} # † ‡ ′ ″] + + + + + + dd/MM/y G + + + + + + + + Nabʼe ikʼ + Ukabʼ ikʼ + Urox ikʼ + Ukaj ikʼ + Uroʼ ikʼ + Uwaq ikʼ + Uwuq ikʼ + Uwajxaq ikʼ + Ubʼelej ikʼ + Ulajuj ikʼ + Rujulaʼj ikʼ + Rukabʼlaʼj ikʼ + + + + + Nabʼe ikʼ + Ukabʼ ikʼ + Urox ikʼ + Ukaj ikʼ + Uroʼ ikʼ + Uwaq ikʼ + Uwuq ikʼ + Uwajxaq ikʼ + Ubʼelej ikʼ + Ulajuj ikʼ + Rujulaʼj ikʼ + Rukabʼlaʼj ikʼ + + + + + + + Nabʼe qʼij + Ukabʼ qʼij + Urox qʼij + Ukaj qʼij + Roʼ qʼij + Uwaq qʼij + Wuq qʼij + + + + + Nabʼe qʼij + Ukabʼ qʼij + Urox qʼij + Ukaj qʼij + Roʼ qʼij + Uwaq qʼij + Wuq qʼij + + + + + + + R1 + R2 + R3 + R4 + + + RCH1 + RCH2 + RCH3 + RCH4 + + + + + R1 + 12 + R3 + R4 + + + RCH1 + RCH2 + RCH3 + RCH4 + + + + + + + Aqʼabʼil + Kbʼeqʼij + + + + + + Maji Kiyoʼla Qawaʼ Jesus + Najter Qʼe Kutan + Qa Kutan + Qa Kutanil + + + MYQJ + NQʼK + QK + QKL + + + + + + d/M/yy + + + + + + / + + + M/d/y + d-MMM-y + MMMM d, y + E, MMMM d, y + + + + y G – y G + + + + + + + Uqʼijil {0} + Upauqʼijil {0} + Junuwach uqʼijil {0} + + + tiempo universal coordinado + + + + + Greenwich Unikʼijal Uqʼijil + + + + + + + + 0 mil + 00 mil + 000 mil + 0 millón + 00 millones + 000 millón + 0 mil de millones + 00 mil de millones + 000 mil de millones + 0 trillón + 00 trillones + 000 trillones + + + + + 0M + 00M + 000M + 0MM + 00MM + 000MM + + + + + + + ¤0M + ¤00M + ¤000M + ¤0MM + ¤00MM + ¤000MM + ¤0M'.'M'.' + ¤00M'.'M'.' + ¤000M'.'M'.' + ¤0T + ¤00T + ¤000T + + + Q diff --git a/make/data/cldr/common/main/raj.xml b/make/data/cldr/common/main/raj.xml index 514848aa8ad2..8bfc8d215d35 100644 --- a/make/data/cldr/common/main/raj.xml +++ b/make/data/cldr/common/main/raj.xml @@ -102,6 +102,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + - + : + + + d MMMM y + E, d MMMM y + + @@ -132,6 +142,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic + यूटीसी {0} + + + Coordinated Universal Time + + ग्रीन विच मीन टाइम diff --git a/make/data/cldr/common/main/rhg.xml b/make/data/cldr/common/main/rhg.xml deleted file mode 100644 index 7fd22d48ddf6..000000000000 --- a/make/data/cldr/common/main/rhg.xml +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - 𐴌𐴗𐴥𐴝𐴙𐴚𐴒𐴙𐴝 - - - - - right-to-left - - - - [𐴤 𐴥 𐴦 𐴧 𐴀 𐴝 𐴞 𐴟 𐴠 𐴡 𐴁 𐴂 𐴃 𐴄 𐴅 𐴆 𐴇 𐴈 𐴉 𐴊 𐴋 𐴌 𐴍 𐴎 𐴏 𐴐 𐴑 𐴒 𐴓 𐴔 𐴕 𐴖 𐴗 𐴘 𐴙 𐴚 𐴛 𐴢 𐴣] - [ـ] - [\- ‑ , . % + 0𐴰 1𐴱 2𐴲 3𐴳 4𐴴 5𐴵 6𐴶 7𐴷 8𐴸 9𐴹] - [\- ‐‑ – — ، ؛ \: ! ؟ . … ' " ( ) \[ \]] - - - - - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - H:mm - Hmm - - - - - - - - 𐴎𐴡𐴁𐴝𐴕𐴝 - - - 𐴁𐴡𐴏𐴥𐴡𐴌 - 𐴒𐴠𐴓𐴊𐴠 𐴁𐴡𐴏𐴥𐴡𐴌 - 𐴀𐴠 𐴁𐴡𐴏𐴥𐴡𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴁𐴡𐴏𐴥𐴡𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴁𐴡𐴏𐴥𐴡𐴌 - - - {0} 𐴁𐴡𐴏𐴥𐴡𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴉𐴝𐴁𐴝 - 𐴀𐴝𐴈𐴥𐴠𐴌𐴞 𐴉𐴝𐴁𐴝 - 𐴀𐴠 𐴉𐴝𐴁𐴝 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴉𐴝𐴁𐴝 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴉𐴝𐴁𐴝 - - - {0} 𐴉𐴝𐴁𐴝 𐴀𐴝𐴒𐴠 - - - - 𐴔𐴝𐴐𐴢 - 𐴒𐴠𐴓𐴊𐴠 𐴔𐴥𐴝𐴐𐴢 - 𐴀𐴠 𐴔𐴥𐴝𐴐𐴢 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴔𐴥𐴝𐴐𐴢 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴔𐴥𐴝𐴐𐴢 - - - {0} 𐴔𐴝𐴐𐴢 𐴀𐴝𐴒𐴠 - - - - 𐴇𐴥𐴝𐴉𐴃𐴝 - 𐴒𐴠𐴓𐴊𐴠 𐴇𐴥𐴝𐴉𐴃𐴝 - 𐴀𐴠 𐴇𐴥𐴝𐴉𐴃𐴝 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴇𐴥𐴝𐴉𐴃𐴝 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴇𐴥𐴝𐴉𐴃𐴝 - - - {0} 𐴇𐴥𐴝𐴉𐴃𐴝 𐴀𐴝𐴒𐴠 - - 𐴇𐴥𐴉𐴃𐴤𐴝𐴌 {0} - - - 𐴔𐴝𐴐𐴤𐴡𐴌 𐴇𐴥𐴝𐴉𐴃𐴝 - - - 𐴊𐴞𐴕 - 𐴒𐴠𐴓𐴊𐴠 𐴈𐴝𐴙𐴓𐴧𐴝 - 𐴀𐴝𐴙𐴅𐴧𐴙𐴝 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴈𐴝𐴙𐴓𐴧𐴝 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴊𐴞𐴕 - - - {0} 𐴊𐴞𐴕 𐴀𐴝𐴒𐴠 - - - - 𐴁𐴡𐴏𐴥𐴡𐴌𐴡𐴌 𐴊𐴞𐴕 - - - 𐴇𐴥𐴝𐴉𐴃𐴝𐴌 𐴊𐴞𐴕 - - - 𐴔𐴝𐴐𐴤𐴡𐴌 𐴇𐴥𐴝𐴉𐴃𐴝𐴌 𐴊𐴞𐴕 - - - 𐴒𐴠𐴓𐴊𐴠 𐴌𐴦𐴡𐴘 𐴁𐴝𐴌 - 𐴀𐴠 𐴌𐴦𐴡𐴘 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴌𐴦𐴡𐴘 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴌𐴦𐴡𐴘 𐴁𐴝𐴌 - - - {0} 𐴌𐴦𐴡𐴘 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴐𐴤𐴡𐴔 𐴁𐴝𐴌 - 𐴀𐴠 𐴐𐴤𐴡𐴔 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴐𐴤𐴡𐴔 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴐𐴤𐴡𐴔 𐴁𐴝𐴌 - - - {0} 𐴐𐴤𐴡𐴔 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴔𐴡𐴚𐴒𐴡𐴓 𐴁𐴝𐴌 - 𐴀𐴠 𐴔𐴡𐴚𐴒𐴡𐴓 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴝 𐴔𐴡𐴚𐴒𐴡𐴓 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴔𐴡𐴚𐴒𐴡𐴓 𐴁𐴝𐴌 - - - {0} 𐴔𐴡𐴚𐴒𐴡𐴓 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴁𐴟𐴙𐴃 𐴁𐴝𐴌 - 𐴀𐴠 𐴁𐴟𐴙𐴃 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴁𐴟𐴙𐴃 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴁𐴟𐴙𐴃 𐴁𐴝𐴌 - - - {0} 𐴁𐴟𐴙𐴃 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴁𐴞𐴐𐴤𐴞𐴃 𐴁𐴝𐴌 - 𐴀𐴠 𐴁𐴞𐴐𐴤𐴞𐴃 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴁𐴞𐴐𐴤𐴞𐴃 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴁𐴞𐴐𐴤𐴞𐴃 𐴁𐴝𐴌 - - - {0} 𐴁𐴞𐴐𐴤𐴞𐴃 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴐𐴤𐴟𐴑𐴧𐴟𐴌 𐴁𐴝𐴌 - 𐴀𐴠 𐴐𐴤𐴟𐴑𐴧𐴟𐴌 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴠 𐴐𐴤𐴟𐴑𐴧𐴟𐴌 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴐𐴤𐴟𐴑𐴧𐴟𐴌 𐴁𐴝𐴌 - - - {0} 𐴐𐴤𐴟𐴑𐴧𐴟𐴌 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴒𐴠𐴓𐴊𐴠 𐴐𐴤𐴡𐴕𐴞 𐴁𐴝𐴌 - 𐴀𐴠 𐴐𐴤𐴡𐴕𐴞 𐴁𐴝𐴌 - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 𐴐𐴤𐴡𐴕𐴞 𐴁𐴝𐴌 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴐𐴤𐴡𐴕𐴞 𐴁𐴝𐴌 - - - {0} 𐴐𐴤𐴡𐴕𐴞 𐴁𐴝𐴌 𐴀𐴝𐴒𐴠 - - - - 𐴊𐴞𐴕 / 𐴌𐴝𐴙𐴃𐴢 - - - 𐴒𐴤𐴡𐴕𐴄𐴤𐴝 - 𐴀𐴠 𐴒𐴤𐴡𐴕𐴄𐴤𐴝 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴒𐴤𐴡𐴕𐴄𐴤𐴝 - - - {0} 𐴒𐴤𐴡𐴕𐴄𐴤𐴝 𐴀𐴝𐴒𐴠 - - - - 𐴔𐴞𐴕𐴥𐴡𐴄𐴢 - 𐴀𐴠 𐴔𐴞𐴕𐴥𐴡𐴄 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴔𐴞𐴕𐴥𐴡𐴄 - - - {0} 𐴔𐴞𐴕𐴥𐴡𐴄 𐴀𐴝𐴒𐴠 - - - - 𐴏𐴠𐴑𐴤𐴠𐴕 - 𐴀𐴠𐴈𐴥𐴡𐴕 - - 𐴀𐴝𐴘𐴧𐴥𐴠𐴌𐴊𐴧𐴠 {0} 𐴏𐴠𐴑𐴤𐴠𐴕 - - - {0} 𐴏𐴠𐴑𐴤𐴠𐴕 𐴀𐴝𐴒𐴠 - - - - 𐴀𐴠𐴓𐴝𐴑𐴝𐴀𐴞 𐴄𐴝𐴙𐴔 - - - - - {0} — 𐴁𐴠𐴒𐴧𐴟𐴓𐴟𐴕 - {0} — 𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 - {0} — 𐴁𐴡𐴕 𐴒𐴡𐴙𐴅𐴧𐴤𐴙𐴝 - {0} — 𐴁𐴝𐴌𐴥𐴝𐴘𐴧𐴝 - {0} — 𐴁𐴝𐴕 𐴔𐴟𐴑𐴤𐴝 - {0} — 𐴋𐴠𐴕 𐴔𐴟𐴑𐴤𐴝 - {0} — 𐴃𐴝𐴌𐴞𐴑𐴞 - {0} — 𐴁𐴞𐴁𐴤𐴞𐴕𐴧𐴡 - {0} — 𐴀𐴡𐴙𐴕𐴧𐴡 - {0} — 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - {0} — 𐴏𐴥𐴝𐴁𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - {0} — 𐴏𐴟𐴂𐴥𐴡𐴌 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴇𐴥𐴡𐴌𐴑𐴡𐴃𐴢 - 𐴀𐴝𐴉𐴌𐴞𐴑𐴞 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴀𐴝𐴔𐴌𐴞𐴑𐴞 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴎𐴝𐴕𐴖𐴝𐴌 - 𐴎𐴝𐴕𐴖𐴝𐴌 𐴘𐴝𐴃𐴡 𐴑𐴟𐴊𐴌𐴟𐴃𐴞 - 𐴃𐴞𐴌 - 𐴒𐴝𐴀𐴝 - 𐴁𐴝𐴑𐴐𐴤𐴟 𐴀𐴝𐴣𐴑𐴝 - 𐴁𐴠𐴌𐴠𐴓 - 𐴁𐴞𐴓𐴋𐴤𐴞𐴚 - 𐴒𐴟𐴓𐴞 / 𐴃𐴝𐴌𐴝 - 𐴏𐴦𐴝𐴑𐴞𐴕 𐴇𐴥𐴡𐴌𐴡𐴉𐴢 - 𐴄𐴞𐴛𐴝𐴌 𐴏𐴞𐴕𐴧𐴡 - 𐴎𐴟𐴌𐴝 / 𐴏𐴥𐴞𐴌𐴝 - 𐴓𐴡𐴔𐴁𐴤𐴡𐴌 - 𐴇𐴥𐴝𐴣𐴎𐴡𐴀𐴡𐴕 - 𐴒𐴝𐴙𐴁𐴢 𐴎𐴝𐴕𐴝 𐴏𐴞𐴕𐴧𐴡 - 𐴕𐴞𐴏𐴡𐴌 𐴔𐴞𐴑𐴧𐴤𐴙𐴝 𐴃𐴞𐴌 - 𐴕𐴞𐴏𐴡𐴌 / 𐴀𐴟𐴖𐴡𐴌 𐴔𐴞𐴑𐴧𐴤𐴙𐴝 𐴃𐴞𐴌 - 𐴉𐴟𐴑 𐴀𐴞𐴐𐴤𐴞𐴘𐴝 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴀𐴞𐴔𐴟𐴅𐴞 - 𐴘𐴟𐴌𐴟𐴂𐴞 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴔𐴝𐴘𐴧𐴝 - 𐴁𐴡𐴖𐴄𐴝 - 𐴁𐴡𐴖𐴄𐴝 𐴀𐴥𐴡𐴑𐴧𐴡𐴓 - 𐴈𐴥𐴝𐴕𐴝 𐴀𐴝𐴌 𐴉𐴞𐴕𐴝 - 𐴃𐴡𐴌𐴃𐴞𐴁𐴢 / 𐴐𐴡𐴑𐴤𐴡𐴓 - 𐴃𐴡𐴌𐴃𐴞𐴁𐴢 𐴀𐴝𐴌 𐴈𐴥𐴝𐴓𐴞 𐴎𐴝𐴒𐴝 - 𐴐𐴠𐴄𐴧𐴤𐴝𐴌 𐴁𐴞𐴁𐴤𐴞𐴕𐴧𐴡 𐴐𐴡𐴑𐴤𐴡𐴓 - 𐴅𐴞𐴀𐴡𐴔𐴠𐴄𐴞𐴌𐴥𐴞𐴑 𐴐𐴡𐴑𐴤𐴡𐴓 - 𐴀𐴝𐴊𐴤𐴝 𐴐𐴠𐴄𐴧𐴤𐴝𐴌 𐴁𐴞𐴁𐴤𐴞𐴕𐴧𐴡 𐴐𐴡𐴑𐴤𐴡𐴓 - 𐴇𐴝𐴕 𐴓𐴠𐴑𐴤𐴝 - 𐴇𐴝𐴕 𐴁𐴟𐴕𐴞𐴘𐴝𐴊 - 𐴇𐴝𐴕𐴅𐴝 - 𐴇𐴝𐴕𐴅𐴞 ( 𐴐𐴤𐴝𐴊𐴡𐴌𐴡𐴕 ) - 𐴇𐴝𐴕𐴅𐴞 ( 𐴌𐴡𐴖𐴝𐴘𐴡𐴃𐴞) - 𐴑𐴡𐴓𐴥𐴡𐴁𐴢 - 𐴃𐴝𐴌𐴞𐴑𐴞 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴓𐴠𐴑𐴤𐴝𐴌 𐴕𐴞𐴐𐴤𐴝𐴕𐴡𐴌 𐴉𐴡𐴌𐴞𐴏𐴡 - 𐴅𐴝𐴂𐴝𐴕𐴞 𐴑𐴝𐴕𐴝 - 𐴑𐴝𐴕𐴁𐴟𐴕 - 𐴑𐴝𐴕𐴅𐴞 - 𐴑𐴞𐴑𐴤𐴠𐴂𐴢 - 𐴁𐴝𐴕𐴋𐴤𐴝𐴙𐴑𐴧𐴙𐴝 𐴃𐴞𐴌 - 𐴁𐴝𐴕𐴋𐴤𐴝𐴙𐴑𐴧𐴙𐴝 𐴋𐴠𐴕𐴋𐴤𐴝𐴙𐴑𐴧𐴙𐴝 𐴃𐴞𐴌 - 𐴇𐴥𐴡𐴌𐴡𐴉𐴡𐴌 𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 𐴏𐴞𐴕𐴧𐴡 - 𐴐𐴤𐴞𐴔𐴝 𐴊𐴞𐴘𐴝 𐴀𐴠𐴏𐴃𐴠𐴔𐴝𐴓 - 𐴔𐴡𐴌𐴡𐴃𐴢 - 𐴇𐴥𐴞𐴏𐴝𐴁𐴡𐴌 𐴏𐴞𐴕𐴧𐴡 - 𐴔𐴝𐴎 𐴉𐴟𐴑𐴝 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴈𐴡𐴀𐴠𐴑 𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 - 𐴕𐴟𐴖𐴝 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴁𐴡𐴊𐴡𐴓𐴡𐴙𐴕𐴧𐴝 - 𐴔𐴙𐴟𐴎𐴞𐴑𐴤𐴡𐴓 𐴏𐴞𐴕𐴧𐴡 - 𐴑𐴟𐴊𐴌𐴟𐴃𐴞 - 𐴈𐴥𐴝𐴓𐴞 𐴏𐴥𐴝𐴌𐴝 - 𐴓𐴡𐴔𐴁𐴤𐴡𐴌 𐴀𐴥𐴡𐴑𐴧𐴡𐴓 - 𐴏𐴞𐴏𐴢 - 𐴀𐴡𐴙𐴕𐴧𐴡 - 𐴎𐴟𐴌𐴝 𐴊𐴞𐴘𐴝 - 𐴎𐴡𐴕 - 𐴀𐴝𐴁𐴝𐴏𐴢 𐴀𐴡𐴓𐴝 𐴇𐴥𐴡𐴌𐴡𐴉𐴢 - 𐴏𐴥𐴝𐴁𐴝 𐴓𐴠𐴑𐴤𐴝 - 𐴎𐴝𐴒𐴝 - 𐴏𐴝𐴌𐴝 - 𐴏𐴥𐴞𐴌𐴝 𐴒𐴡𐴌𐴥𐴝𐴌 𐴏𐴞𐴕𐴧𐴡 - 𐴋𐴠𐴕𐴋𐴤𐴝𐴙𐴑𐴧𐴙𐴝 𐴃𐴞𐴌 - 𐴕𐴞𐴐𐴤𐴝𐴕 𐴘𐴝 𐴏𐴞𐴕𐴧𐴡 - 𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 𐴁𐴡𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 𐴐𐴤𐴡𐴣𐴍𐴡 - 𐴐𐴡𐴑𐴤𐴡𐴓𐴞 - 𐴐𐴡𐴑𐴤𐴡𐴓 𐴘𐴝 𐴎𐴡𐴕 - 𐴊𐴡𐴀𐴡𐴙𐴕 𐴀𐴠𐴐𐴤𐴞𐴘𐴝𐴌 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴊𐴡𐴀𐴡𐴙𐴕 𐴉𐴟𐴑 𐴀𐴠𐴐𐴤𐴞𐴘𐴝𐴌 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴉𐴥𐴝𐴌𐴡𐴑 𐴒𐴡𐴌𐴥𐴡𐴕 - 𐴑𐴤𐴠𐴓𐴝 - 𐴏𐴞𐴕𐴧𐴡 - 𐴄𐴠𐴑𐴕𐴞𐴑𐴤𐴡𐴓 𐴏𐴞𐴕𐴧𐴡 - 𐴀𐴝𐴁𐴝𐴏𐴞 𐴕𐴞𐴐𐴤𐴝𐴕𐴝 - 𐴏𐴡𐴉𐴥𐴡𐴌 - 𐴏𐴡𐴉𐴥𐴡𐴌 𐴘𐴝 𐴎𐴝𐴒𐴝 - 𐴀𐴟𐴖𐴡𐴌 𐴔𐴞𐴑𐴧𐴝 𐴄𐴞𐴌 - 𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 𐴁𐴡𐴋𐴡𐴀𐴡𐴙𐴓𐴧𐴝 - 𐴀𐴝𐴁𐴝𐴏𐴞 𐴅𐴝𐴔𐴟 - 𐴔𐴟𐴀𐴟𐴏𐴡𐴔 - 𐴉𐴡𐴏𐴥𐴞𐴔𐴞 𐴀𐴠𐴐𐴤𐴞𐴘𐴝𐴌 𐴀𐴠𐴏𐴑𐴞𐴌𐴞𐴂𐴢 - 𐴐𐴤𐴝𐴊𐴝 𐴎𐴝𐴒𐴝 - - - und rhg - - diff --git a/make/data/cldr/common/main/rhg_Rohg.xml b/make/data/cldr/common/main/rhg_Rohg.xml deleted file mode 100644 index 675df302d335..000000000000 --- a/make/data/cldr/common/main/rhg_Rohg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - amaḍal - tafriqt - amarikan n sennej - amarikan n wadday - usyanya - lɣerb n tefriqt - amarikan n lwest - ccerq n tefriqt - tqiccet n tfriqt - lwest n tefriqt - wadday n tefriqt - timirikatin - sennej n umarikan - karibyan - ccerq n asya - wadday n asya - wadday ccerq n asya - wadday n wuruppa - ustralazya - milanizya - jjiḥt n mikrunizya - pulinizya - asya - lwest n asya - lɣerb n asya - uruppa - ccerq n wuruppa - sennej n wuruppa - lɣerb n wuruppa - tafriqt n wadday i sseḥra - amarikan talatinit - tigzirin n asincyun - andura - limarat - afɣanistan - antigwa d barbuda - angwilla - albanya - arminya - angula - antarktika - arxantina - sawma tamirikanit - nnemsa - ustralya - aruba - tagzirt n aland - azrabijan - busna d hirsek - barbaḍus - bangladic - biljik - burkinafasu - belɣarya - lbeḥrin - burundi - benin - sanbartilimi - birmuda - brunay - bulivya - hulanda takaribiyt - brazil - bahamas - buṭan - tigzirin n buvi - buteswana - bilarus - biliz - kanada - tigzirin n kukus - rripublik tadimuqratit n kungu - rripublik n terfriqt n lwesṭ - kungu - sswis - kudibwar - tigzirin n kuk - tcili - kamirun - tcina - kulumbya - tigzirin n klipirṭun - sark - kustarika - kuba - qabu yazegza - kurasaw - tagzirt n kristmas - qubrus - ttcik - rripublik n ttcik - aliman - dyigugarsya - djibuti - ddanmark - duminika - arripublik n dduminikan - ddzayer - sebta d mlillt - ikwadur - istunya - maser - sseḥra n lɣerb - iritirya - seppanya - ityupya - tamunt tawruppawit - jjiht n wuru - fillanda - fiji - tigzirin n falkland - mikrunizya - tigzirin n faru - fransa - gabun - aglinzi - UK - grinada - jurejya - ɣuyana tafransist - girnizi - ɣana - jibralṭar - grinlanda - gambya - ɣinya - gwadlup - ɣinya tayikwaṭurit - legrig - tigzirin n jyurejya n wadday d sandwitc n wadday - gwatimala - gwam - ɣinyabisaw - ɣuyana - hungkung - tigzirin n hird d makdunald - hunduras - kerwatya - hayti - hungarya - kanarya - andunisya - irlanda - israyil - tagzirt n man - lhend - timmura n uglanzi di lebḥer ahindawi - lɛiraq - iran - yeslanda - atayal - jirsi - jamayka - lurdun - jjapun - kinya - kirgistan - kambudya - kribati - qumrus - sankits d nivis - kurya n sennej - kurya n wadday - lkuwayt - tigzirin n kayman - kazaxistan - lawes - lubnan - sanlusya - lictenctayn - srilanka - libirya - lisutu - litwanya - lluksemburg - latevya - libya - Lmuɣrib - munaku - mulduva - muntinigru - sanmartin - madaɣacqar - tigzirin n marcal - maqdunya n sennej - mali - myanmar - mangulya - makkaw - tigzirin n maryana n sennej - martinik - muritanya - munsirat - malṭa - muricyus - lmaldib - malawi - miksiku - malizya - muzembiq - nambya - kalidunya tamaynut - nnijir - tagzirt n nurfulk - nijirya - nikaragwa - hulanda - nnarwij - nippal - nawru - nyiwi - nyuziland - ɛumman - panama - piru - pulinizya tafransist - papwa ɣinya tamaynut - filippin - pakistan - pulanda - sanpyir d miklun - tigzirin n pitkirn - purturiku - falasṭin - filasṭin - ppurtugal - palaw - paragway - qaṭar - usyanya i yegʷjen - rinyun - rumanya - sirebya - rrusya - rwanda - ssaɛud - tigzirin n suliman - sicel - ssudan - sswid - sanɣafura - santḥilina - slubinya - sbalbard d janmayen - sluvakya - siraliyyun - sanmarinu - ssinigal - sumalya - surinam - ssudan n wadday - sawṭumi d prinsip - ssalvadur - santmartin - surya - iswatini - tristan dakuna - tigzirin n ṭurks d kaykus - tcad - timmura tifransisin nwadday - ṭṭugu - ṭṭayland - tajikistan - ṭukilu - ṭimur licti - ṭimur n ccerq - ṭurkmanistan - tunes - ṭunga - ṭurekya - ṭṭurk - trinidad d ṭubagu - ṭubalu - ṭṭaywan - ṭanzanya - ukranya - uɣanda - tigzirin timirikanin i yegʷjen - tamunt n tmura - amarikan - US - urugway - uzbakistan - lbatikan - sanvinsit d grinadin - banzwilla - tigzirin tiɛezriyyin tiglanziyyin - tigzirin tiɛezriyyin timarikanin - bitnam - banwatu - walis d futuna - samwa - awal amsaqar - bidi tamsaqart - kusubu - lyaman - mayuṭ - tafriqt n wadday - zambya - zimbabwi - jjiht wer yettemwassnen - - - taklindart tagrikant - agrikan - taklindart tameslemt - ameslem - taklindart tameslemt (leḥsab) - ameslem (leḥsab) - taklindart tameslemt (ayur) - ameslem (ayur) - kalandar n ISO-8601 - asettef sṭandar - sṭandar - nnumrawat irumiyyen - - - amitrik - aglinziy - amirikaniy - - - tutlayt: {0} - tira: {0} - jjihet: {0} - - - - [a b c dḍ e ɛ f g ɣ hḥ i j k l m n p q r sṣ tṭ u w x y zẓ] - [áàâä ç éèêë îï ñ oóôö œ ß úùûü v ʷ ÿ] - [A B C DḌ E Ɛ F G Ɣ HḤ I J K L M N P Q R SṢ TṬ U W X Y ZẒ] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” « » ( ) \[ \] \{ \} § @ * / \& # `] - - - - - - - - EEEE dd MMMM y G - - - - - d MMMM y G - - - - - d MMM y G - - - - - dd/MM/y GGGGG - - - - - - - {1}, {0} - - - {1} 'ɣer' {0} - - - {1} 'ɣer' {0} - - - - - {1}, {0} - - - {1} 'ɣer' {0} - - - {1} 'ɣer' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - dd - E dd - y G - MM/y G - dd/MM/y GGGGG - E dd/MM/y G - MMM y G - dd MMM y G - E dd MMM y G - LL - dd/MM - E dd/MM - dd MMM - E dd MMM - y G - y G - MM/y GGGGG - dd/MM/y GGGGG - E dd/MM/y GGGGG - MMM y G - dd MMM y G - E dd MMM y G - MMMM y G - QQQ y G - QQQQ y G - - - - dd – dd - - - y G – y G - y – y G - - - MM/y GGGGG – MM/y GGGGG - MM/y – MM/y GGGGG - MM/y – MM/y GGGGG - - - dd/MM/y – dd/MM/y GGGGG - dd/MM/y GGGGG – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG - - - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y GGGGG – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - - - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G - - - dd – dd MMM y G - dd MMM y G – dd MMM y G - dd MMM – dd MMM y G - dd MMM y – dd MMM y G - - - E dd MMM – E dd MMM y G - E dd MMM y G – E dd MMM y G - E dd MMM – E dd MMM y G - E dd MMM y – E dd MMM y G - - - MM – MM - - - dd/MM – dd/MM - dd/MM – dd/MM - - - E dd/MM – E dd/MM - E dd/MM – E dd/MM - - - MMM – MMM - - - dd – dd MMM - dd MMM – dd MMM - - - E dd MMM – E dd MMM - E dd MMM – E dd MMM - - - y – y G - - - MM/y – MM/y GGGGG - MM/y – MM/y GGGGG - - - dd/MM/y – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG - dd/MM/y – dd/MM/y GGGGG - - - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - E dd/MM/y – E dd/MM/y GGGGG - - - MMM – MMM y G - MMM y – MMM y G - - - dd – dd MMM y G - dd MMM – dd MMM y G - dd MMM y – dd MMM y G - - - E dd MMM – E dd MMM y G - E dd MMM – E dd MMM y G - E dd MMM y – E dd MMM y G - - - MMMM – MMMM y G - MMMM y – MMMM y G - - - - - - - - - yen - feb - mar - yeb - may - yun - yul - ɣuc - cut - kṭu - nuw - duj - - - yennayer - febrayer - mars - yebril - mayyu - yunyu - yulyu - ɣuccet - cutembir - kṭuber - nuwembir - dujembir - - - - - y - f - m - y - m - y - y - ɣ - c - k - n - d - - - yennayer - febrayer - mars - yebril - mayyu - yunyu - yulyu - ɣuccet - cutembir - kṭuber - nuwembir - dujembir - - - - - - - lḥe - let - ttl - lar - lex - jje - sse - - - lḥ - le - tt - la - lx - jj - ss - - - lḥed - letnayen - ttlat - larbeɛ - lexmis - jjemɛa - ssebt - - - - - l - l - t - l - l - j - s - - - - - - - r1 - r2 - r3 - r4 - - - rrbeɛ wis 1 - rrbeɛ wis 2 - rrbeɛ wis 3 - rrbeɛ wis 4 - - - - - - - a - p - - - - - - zzat i yeccu - akud zzat i yeccu - awarni yeccu - akud n yiḍa - - - BC - BCE - AD - CE - - - - - - EEEE dd MMMM y - - - - - dd MMMM y - - - - - dd MMM y - - - - - dd/MM/y - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1}, {0} - - - {1} 'ɣer' {0} - - - {1} 'ɣer' {0} - - - - - {1}, {0} - - - {1} 'ɣer' {0} - - - {1} 'ɣer' {0} - - - - - {1}, {0} - - - - - {1}, {0} - - - - dd - E dd - y G - MM/y G - dd/MM/y G - E dd/MM/y G - MMM y G - dd MMM y G - E dd MMM y G - h:mm a - dd/MM - E dd/MM - dd MMM - E dd MMM - dd MMMM - 'simana' 'wis' W 'zeg' MMMM - MM/y - dd/MM/y - E dd/MM/y - MMM y - dd MMM y - E dd MMM y - MMMM y - 'simana' 'wis' w 'zeg' Y - - - - dd – dd - - - y G – y G - y – y G - - - MM/y G – MM/y G - MM/y – MM/y G - MM/y – MM/y G - - - dd/MM/y – dd/MM/y G - dd/MM/y G – dd/MM/y G - dd/MM/y – dd/MM/y G - dd/MM/y – dd/MM/y G - - - E dd/MM/y – E dd/MM/y G - E dd/MM/y G – E dd/MM/y G - E dd/MM/y – E dd/MM/y G - E dd/MM/y – E dd/MM/y G - - - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G - - - dd – dd MMM y G - dd MMM y G – dd MMM y G - dd MMM – dd MMM y G - dd MMM y – dd MMM y G - - - E dd MMM – E dd MMM y G - E dd MMM y G – E dd MMM y G - E dd MMM – E dd MMM y G - E dd MMM y – E dd MMM y G - - - h – h a - - - HH – HH - - - h:mm a – h:mm a - h:mm – h:mm a - h:mm – h:mm a - - - HH:mm – HH:mm - HH:mm – HH:mm - - - h:mm a – h:mm a v - h:mm – h:mm a v - h:mm – h:mm a v - - - HH:mm – HH:mm v - HH:mm – HH:mm v - - - h – h a v - - - HH – HH v - - - MM – MM - - - dd/MM – dd/MM - dd/MM – dd/MM - - - E dd/MM – E dd/MM - E dd/MM – E dd/MM - - - MMM – MMM - - - dd – dd MMM - dd MMM – dd MMM - - - E dd MMM – E dd MMM - E dd MMM – E dd MMM - - - y – y - - - MM/y – MM/y - MM/y – MM/y - - - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - dd/MM/y – dd/MM/y - - - E dd/MM/y – E dd/MM/y - E dd/MM/y – E dd/MM/y - E dd/MM/y – E dd/MM/y - - - MMM – MMM y - MMM y – MMM y - - - dd – dd MMM y - dd MMM – dd MMM y - dd MMM y – dd MMM y - - - E dd MMM – E dd MMM y - E dd MMM – E dd MMM y - E dd MMM y – E dd MMM y - - - MMMM – MMMM y - MMMM y – MMMM y - - - - - - - - - tɛa. - clɛ. - lmu. - clm. - ja. - jum. - raj. - ceɛ. - are. - cuw. - jer. - lɛi. - - - tɛacurt - cciɛ lɛacur - lmulud - cciɛ lmulud - jad - jummad - rajeb - ceɛban - aremḍan - cuwwal - jer leɛyud - lɛid ameqran - - - - - - - EEEE dd MMMM y G - - - - - dd MMMM y G - - - - - dd MMM y G - - - - - dd/MM/y GGGGG - - - - - - - - akud - - - aseggʷas - aẓẓɣat - aseggʷas-a - imal - - - sg. - - - sg - - - rbeɛ - - - rbɛ. - - - rbɛ - - - ayur - ayur yeɛdan - ayur-a - ayur dd-yusin - - - yr. - - - yr - - - simana - simana yeɛdan - simana-ya - simana dd-yusin - simana n {0} - - - sm. - - - sm - - - ass - iḍennaḍ - ass-a - tiwecca - - - us. - - - us - - - ass n simana - - - lḥed i yeɛdan - lḥed-a - lḥed i dd-yusin - - - AM/PM - - - tiseɛɛet - - - ts. - - - ts - - - tminut - - - min. - - - min - - - tsigunt - - - sec. - - - sec - - - akud adigan - - - - akud n {0} - akud unebdu n {0} - akud anaway n {0} - - - akud agraɣlan amezday - - - - wer yettemwassen - - - andura - - - dubay - - - kabul - - - antigwa - - - angwiya - - - tiran - - - yiriban - - - lwanda - - - stasyun n rutira - - - palmer - - - stasyun n ṭrul - - - stasyun n suwa - - - stasyun n mawsun - - - deybis - - - stasyun n bustuk - - - stasyun n kasi - - - dimun durbil - - - stasyun n makmurdu - - - riyugayyigus - - - minduza - - - sanxwan - - - ucwaya - - - lariyuxa - - - sanluwis - - - katamarka - - - salṭa - - - jujuy - - - tutcuman - - - qurṭuba - - - bwinusayris - - - pagupagu - - - byinna - - - pert - - - yukla - - - darwin - - - adelayd - - - brukenhil - - - milben - - - hubart - - - lindman - - - sidni - - - brizban - - - tayzirt n makkari - - - lurdhaw - - - aruba - - - maryaham - - - batci - - - sarayubu - - - barbadus - - - dhaka - - - bruksil - - - wagadugu - - - sufya - - - baḥrin - - - bujumbura - - - purtunubu - - - sanbartilimi - - - birmuda - - - brunay - - - lappaz - - - kralendik - - - irunippi - - - riyubranku - - - purtubilhu - - - buwabista - - - manaws - - - kiyaba - - - santarim - - - campugrandi - - - bilim - - - aragwayna - - - sawpawlu - - - bahiya - - - furṭaliza - - - masiyu - - - risifi - - - nurunha - - - nassaw - - - timpfu - - - gaburun - - - minsk - - - biliz - - - dawsun - - - waythurs - - - inubik - - - fankufer - - - furt nilsun - - - dawsun krik - - - kristun - - - idmunṭun - - - swiftkurrent - - - kambridj bay - - - rigina - - - winippig - - - rizulṭ - - - rankinilit - - - atikukan - - - ṭurunṭu - - - ikaluwit - - - muktun - - - halifax - - - guzbay - - - glasbay - - - blank-sablun - - - sanjuns - - - tiyzirin n kukus - - - kincasa - - - lubumbaci - - - bangi - - - brazabil - - - zyurix - - - abidjan - - - raruṭunga - - - ister - - - kuyhayki - - - puntarinas - - - santyagu - - - diwala - - - urumutci - - - canhay - - - buguṭa - - - kustarika - - - habana - - - qabubirdi - - - kuracaw - - - tayzirt n kristmas - - - nikuzya - - - famagusṭa - - - pprag - - - buzingen - - - birlin - - - djibuti - - - kuppenhagen - - - duminika - - - santudumingu - - - ddzayer - - - galapagus - - - gwayakil - - - talin - - - lqahira - - - leɛyun - - - asmara - - - kanari - - - sebta - - - madri - - - adisababa - - - hilsinki - - - fiji - - - sṭanli - - - tcuk - - - punpi - - - kursay - - - faraw - - - pari - - - liberbil - - - - akud n uzil n uglinzi - - lundun - - - grinada - - - tbilisi - - - kayen - - - girensiy - - - akra - - - jabalṭariq - - - tula - - - nuk - - - iṭukurturmit - - - danmarkshaven - - - banjul - - - kunakri - - - gwadlup - - - malabu - - - atina - - - sawtgyurgya - - - gwatimala - - - gwam - - - bisaw - - - guyana - - - hungkung - - - tigicigalpa - - - zagreb - - - ppurtuprins - - - budabist - - - jakarṭa - - - puntyanak - - - makasar - - - jayapura - - - - akud anaway ayirlandi - - dablin - - - lquds - - - tagzirt n man - - - kulkaṭa - - - ttcagus - - - baɣdad - - - ṭahran - - - reykjabik - - - ruma - - - jirsiy - - - jamayka - - - ɛamman - - - ṭukyu - - - nayrubi - - - bickik - - - knumpayn - - - tagzirt n kanṭun - - - kiritimati - - - ṭarawa - - - kumuru - - - sankits - - - pyungyang - - - syul - - - kuwit - - - sayman - - - aqṭaw - - - ural - - - aṭraw - - - aqtubi - - - qusṭanay - - - qazalurda - - - almaṭi - - - bintyan - - - bayrut - - - sanlucya - - - faduts - - - kulumbu - - - munrubya - - - maziru - - - filinyus - - - lluksemburg - - - riga - - - ṭarablus - - - ddarbida - - - munaku - - - cisinaw - - - pudgurisa - - - mariguṭ - - - antananaribu - - - kwajilen - - - majuru - - - skupya - - - bamaku - - - yangun - - - xubd - - - ulanbaṭar - - - makkaw - - - saypan - - - martinik - - - nwakcuṭ - - - muntsirat - - - malṭa - - - muriṭanya - - - lmaldib - - - blanṭayr - - - tiywana - - - hirmusiyyu - - - tidad xwaris - - - mazatlan - - - ciwawa - - - bayya di bandiras - - - ujinaga - - - muntiri - - - miksiku siti - - - matamurus - - - mirida - - - kankun - - - kwalalampur - - - kutcin - - - maputu - - - binhuwk - - - numya - - - nyamiy - - - tayzirt n nurfuk - - - lagus - - - mangwa - - - amesterdem - - - uslu - - - katmandu - - - nawru - - - nyu - - - tcatem - - - ukland - - - masqaṭ - - - panama - - - lima - - - tahiti - - - markwisas - - - gambyi - - - mursbay - - - bugenbil - - - manila - - - kratci - - - warsaw - - - mikilon - - - pitkirn - - - ppurturiku - - - ɣezza - - - lxalil - - - azures - - - madiyra - - - licbuna - - - palaw - - - asuntyun - - - qaṭar - - - riyunyun - - - buxarist - - - bilgrad - - - kaliningrad - - - musku - - - bulgugrad - - - saratub - - - astraxan - - - ulyanubesk - - - kirub - - - samara - - - yekaterinburg - - - umsek - - - nubusibiresk - - - barnul - - - tumsek - - - nubukuznitesk - - - krasnuyarsk - - - irkutsek - - - cita - - - yatutsek - - - bladibustuk - - - xandiga - - - saxalin - - - ustnira - - - magadan - - - sridnikulimsek - - - kamcatka - - - anadic - - - kigali - - - riyad - - - gwadelkanal - - - mahi - - - xarṭum - - - sṭukhulm - - - singappur - - - santhilina - - - lyubliyana - - - lunyabyan - - - bratislaba - - - fritawn - - - sanmarinu - - - dakar - - - mugadicu - - - paramaribu - - - juba - - - sawtumi - - - ssalbadur - - - bariyyu n luwerprans - - - dimacq - - - mbaban - - - grandṭurk - - - njamina - - - kergilan - - - lumi - - - bangkuk - - - ducanba - - - fakawfu - - - dili - - - ɛicqabad - - - tunes - - - ṭungaṭapu - - - sṭanbul - - - ppurtufspin - - - funafuti - - - ṭaypay - - - daressalam - - - kyib - - - simfarupul - - - kampala - - - midway - - - tagzirt n wayk - - - adak - - - num - - - ancuraj - - - yakutat - - - sitka - - - junaw - - - mitlakatla - - - lusanjlus - - - boysi - - - finiks - - - dinbir - - - bulah, nurtdakuṭa - - - nyusalem, nurtdakuṭa - - - santer, nurtdakuṭa - - - cikagu - - - minumini - - - binsanz, indyana - - - pitersburg, indyana - - - tilsiti, indyana - - - nux, indyana - - - winamak, indyana - - - maringu, indyana - - - indyanapulis - - - lwisbil - - - bibi, indyana - - - muntitcilu, kinṭaki - - - ditruyd - - - nyuyurk - - - muntibidyu - - - samarqand - - - tacqand - - - lbatikan - - - sanbinsint - - - karakas - - - ṭurṭula - - - sanṭumas - - - hutcimin - - - ifaṭi - - - wilis d futuna - - - apya - - - ɛadan - - - mayuṭ - - - djuhanasburg - - - lusaka - - - harari - - - - akud n afɣanistan - - - - - akud n tefriqt n lwesṭ - - - - - akud n tefriqt n ccerq - - - - - akud n tefriqt n wadday - - - - - akud n tefriqt n lɣerb - - - - - akud n alaska - akud anaway n alaska - akud n uzil n alaska - - - - - akud n amazun - akud anaway n amazun - akud n uzil n amazun - - - - - akud n lwesṭ - akud anaway n lwesṭ - akud n uzil n lwesṭ - - - - - akud n lɣerb - akud anaway n lɣerb - akud n uzil n lɣerb - - - - - akud n idurar - akud anaway n idurar - akud n uzil n idurar - - - - - akud n pasifik - akud anaway n pasifik - akud n uzil n pasifik - - - - - akud n samwa - akud anaway n samwa - akud n uzil n samwa - - - - - akud n waɛrab - akud anaway n waɛrab - akud n uzil n waɛrab - - - - - akud n arjentina - akud anaway n arjentina - akud n uzil n arjentina - - - - - akud n lɣerb n arjentina - akud anaway n lɣerb n arjentina - akud n uzil n lɣerb n arjentina - - - - - akud n arminya - akud anaway n arminya - akud n uzil n arminya - - - - - akud n atlantik - akud anaway n atlantik - akud n uzil n atlantik - - - - - akud suntral n wustralya - akud suntral anaway n wustralya - akud suntral n uzil n wustralya - - - - - akud suntral n lɣerb n wustralya - akud suntral anaway n lɣerb n wustralya - akud suntral n uzil n lɣerb n wustralya - - - - - akud n ccerq n wustralya - akud anaway n ccerq n wustralya - akud n uzil n ccerq n wustralya - - - - - akud n lɣerb n wustralya - akud anaway n lɣerb n wustralya - akud n uzil n lɣerb n wustralya - - - - - akud n azrabidjan - akud anaway n azrabidjan - akud n uzil n azrabidjan - - - - - akud n azures - akud anaway n azuresn azures - akud n uzil n azures - - - - - akud n bangladic - akud anaway n bangladic - akud n uzil n bangladic - - - - - akud n butan - - - - - akud n bulibya - - - - - akud n brazilya - akud anaway n brazilya - akud n uzil n brazilya - - - - - akud n brunay - - - - - akud n qabubirdi - akud anaway n qabubirdi - akud n uzil n qabubirdi - - - - - akud anaway n tcamuru - - - - - akud n tcatem - akud anaway n tcatem - akud n uzil n tcatem - - - - - akud n cili - akud anaway n cili - akud n uzil n cili - - - - - akud n tcina - akud anaway n tcina - akud n uzil n tcina - - - - - akud n tayzirt n kristmas - - - - - akud n tiyzirin n kukus - - - - - akud n kulumbya - akud anaway n kulumbya - akud n uzil n kulumbya - - - - - akud n tigzirin n kuk - akud anaway n tigzirin n kuk - akud n uzil n tigzirin n kuk - - - - - akud n kuba - akud anaway n kuba - akud n uzil n kuba - - - - - akud n deybis - - - - - akud n dimun durbil - - - - - akud n ṭimur licti - - - - - akud n isterayland - akud anaway n isterayland - akud n uzil n isterayland - - - - - akud n ikwadur - - - - - akud n wuruppa n lwesṭ - akud anaway n wuruppa n lwesṭ - akud n uzil n wuruppa n lwesṭ - - - - - akud n wuruppa n ccerq - akud anaway n wuruppa n ccerq - akud n uzil n wuruppa n ccerq - - - - - akud n wuruppa tacerqect qaɛ - - - - - akud n wuruppa n lɣerb - akud anaway n wuruppa n lɣerb - akud n uzil n wuruppa n lɣerb - - - - - akud n falkland - akud anaway n falkland - akud n uzil n falkland - - - - - akud n fiji - akud anaway n fiji - akud n uzil n fiji - - - - - akud n ɣana tafransist - - - - - akud n tiwaddayin tifransisin - - - - - akud n galappagus - - - - - akud n gambyi - - - - - akud n jyurjya - akud anaway n jyurjya - akud n uzil n jyurjya - - - - - akud n tigzirin n gilbert - - - - - GMT - - - - - akud n ccerq n grinland - akud anaway n ccerq n grinland - akud n uzil n ccerq n grinland - - - - - akud n lwesṭ n grinland - akud anaway n lwesṭ n grinland - akud n uzil n lwesṭ n grinland - - - - - akud n lxalij - - - - - akud n guyana - - - - - akud anaway n haway-alucyan - - - - - akud n haway-alucyan - akud anaway n haway-alucyan - akud n uzil n haway-alucyan - - - - - akud n hungkung - akud anaway n hungkung - akud n uzil n hungkung - - - - - akud n xubd - akud anaway n xubd - akud n uzil n xubd - - - - - akud anawy n lhend - - - - - akud n lebḥer ahindi - - - - - akud n indutcina - - - - - akud n yindunisya n lwesṭ - - - - - akud n ccerq n yindunisya - - - - - akud n lɣerb n yindunisya - - - - - akud n iran - akud anaway n iran - akud n uzil n iran - - - - - akud n irkutsek - akud anaway n irkutsek - akud n uzil n irkutsek - - - - - akud n yisrayil - akud anaway n yisrayil - akud n uzil n yisrayil - - - - - akud n jjapun - akud anaway n jjapun - akud n uzil n jjapun - - - - - akud n kazaxistan - - - - - akud n ccerq n kazaxistan - - - - - akud n lɣerb n kazaxistan - - - - - akud n kurya - akud anaway n kurya - akud n uzil n kurya - - - - - akud n kursay - - - - - akud n krasnuyarsek - akud anaway n krasnuyarsek - akud n uzil n krasnuyarsek - - - - - akud n krigistan - - - - - akud n tigzirin n layn - - - - - akud n lurdhaw - akud anaway n lurdhaw - akud n uzil n lurdhaw - - - - - akud n magadan - akud anaway n magadan - akud n uzil n magadan - - - - - akud n malizya - - - - - akud n lmaldib - - - - - akud n markwisas - - - - - akud n tigzirin n marcal - - - - - akud n mawritus - akud anaway n mawritus - akud n uzil n mawritus - - - - - akud n mawson - - - - - akud n pasifik amiksikan - akud anaway n pasifik amiksikan - akud n uzil n pasifik amiksikan - - - - - akud n ulanbaṭar - akud anaway n ulanbaṭar - akud n uzil n ulanbaṭar - - - - - akud n musku - akud anaway n musku - akud n uzil n musku - - - - - akud n myanmar - - - - - akud n nawru - - - - - akud n nnipal - - - - - akud n nyewkalidunya - akud anaway n nyewkalidunya - akud n uzil n nyewkalidunya - - - - - akud n nyuziland - akud anaway n nyuziland - akud n uzil n nyuziland - - - - - akud n nyuw fawemd land - akud anaway n nyuw fawemd land - akud n uzil n nyuw fawemd land - - - - - akud n nyu - - - - - akud n tayzirt n nurfuk - akud anaway n tayzirt n nurfuk - akud n uzil n tayzirt n nurfuk - - - - - akud n firnardu dinurunha - akud anaway n firnardu dinurunha - akud n uzil n firnardu dinurunha - - - - - akud n nubusibirsek - akud anaway n nubusibirsek - akud n uzil n nubusibirsek - - - - - akud n umsek - akud anaway n umsek - akud n uzil n umsek - - - - - akud n pakistan - akud anaway n pakistan - akud n uzil n pakistan - - - - - akud n palaw - - - - - akud n papwa ɣinya tamaynut - - - - - akud n pparagway - akud anaway n pparagway - akud n uzil n pparagway - - - - - akud n ppiru - akud anaway n ppiru - akud n uzil n ppiru - - - - - akud n filippin - akud anaway n filippin - akud n uzil n filippin - - - - - akud n tigzirin n finiks - - - - - akud n sant-pyiɣ d mikilun - akud anaway n sant-pyiɣ d mikilun - akud n uzil n sant-pyiɣ d mikilun - - - - - akud n pitkirn - - - - - akud n punpi - - - - - akud n kurya n sennej - - - - - akud n riyunyun - - - - - akud n rutira - - - - - akud n saxalin - akud anaway n saxalin - akud n uzil n saxalin - - - - - akud n samwa tamarikant - akud anaway n samwa tamarikant - akud n uzil n samwa tamarikant - - - - - akud n saycal - - - - - akud anaway n singappur - - - - - akud n tigzirin n sulumun - - - - - akud n jyurjya n wadday - - - - - akud n surinam - - - - - akud n syuwa - - - - - akud n tahiti - - - - - akud n ṭṭaywan - akud anaway n ṭṭaywan - akud n uzil n ṭṭaywan - - - - - akud n tajikistan - - - - - akud n tuwkulaw - - - - - akud n ṭunga - akud anaway n ṭunga - akud n uzil n ṭunga - - - - - akud n tcuk - - - - - akud n ṭurkmanistan - akud anaway n ṭurkmanistan - akud n uzil n ṭurkmanistan - - - - - akud n ṭubalu - - - - - akud n urugway - akud anaway n urugway - akud n uzil n urugway - - - - - akud n uẓbakistan - akud n anaway n uẓbakistan - akud n uzil n uẓbakistan - - - - - akud n banwatu - akud anaway n banwatu - akud n uzil n banwatu - - - - - akud n vinzwila - - - - - akud n bladibustuk - akud anaway n bladibustuk - akud n uzil n bladibustuk - - - - - akud n bulgugrad - akud anaway n bulgugrad - akud n uzil n bulgugrad - - - - - akud n bustuk - - - - - akud n tagzirt n wayk - - - - - akud n walis d futuna - - - - - akud n yakutsek - akud anaway n yakutsek - akud n uzil n yakutsek - - - - - akud n yakatirinburg - akud anaway n yakatirinburg - akud n uzil n yakatirinburg - - - - - akud n yukun - - - - - - - , -   - - - - - 0 alaf - 00 alaf - 000 alaf - 0 melyun - 00 melyun - 000 melyun - 0 melyar - 00 melyar - 000 melyar - 0 trilyun - 00 trilyun - 000 trilyun - - - - - - - 0% - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤ - - - - - 0K ¤ - 00K ¤ - 000K ¤ - 0M ¤ - 00M ¤ - 000M ¤ - 0G ¤ - 00G ¤ - 000G ¤ - 0T ¤ - 00T ¤ - 000T ¤ - - - - - - dderhem n limarat - dderhem n limarat - - - afɣani - afɣani - - - lik n walbanya - lik n walbanya - - - ddram n arminya - ddram n arminya - - - xulden n wantil - xulden n wantil - - - kwanza n angula - kwanza n angula - - - pisus n arxantina - pisus n arxantina - - - ddular n wustralya - ddular n wustralya - - - flurin n aruba - flurin n aruba - - - manat n azrabijan - manat n azrabijan - - - mark n busniya - mark n busniya - - - ddular n barbadyan - ddular n barbadyan - - - ṭaka n bangladic - ṭaka n bangladic - - - liva n belgarya - liva n belgarya - - - ddinar n lbeḥrin - ddinar n lbeḥrin - - - frank n burundi - frank n burundi - - - Bermudan Dollar - ddular n birmudan - - - ddular n brunay - ddular n brunay - - - bulibyanu - bulibyanu - - - riyal n brazil - riyal n brazil - - - ddular n bahamas - ddular n bahamas - - - ngultrum n buṭan - ngultrum n buṭan - - - pula n buteswana - pula n buteswana - - - rrubel n bilarus - rrubel n bilarus - - - Belize Dollar - ddular n biliz - - - Canadian Dollar - ddular n kanada - - - frank n kungu - frank n kungu - - - frank - frank - - - pisus n tcili - pisus n tcili - - - ywan n cina - ywan n cina - - - ywan n tcina - ywan n tcina - - - pisus n kulumbya - pisus n kulumbya - - - Costa Rican Colón - kulun n kustarika - - - pisus n kuba - pisus n kuba - - - pisus n kuba - pisus n kuba - - - iskudu n qabu yazegza - iskudu n qabu yazegza - - - kruna n ttcik - kruna n ttcik - - - frank n djibuti - frank n djibuti - - - Danish Krone - kruna n ddanmark - - - pisus n dduminik - pisus n dduminik - - - Algerian Dinar - ddinar n ddzayer - - - ljunih n masr - ljunih n masr - - - nafka n iritirya - nafka n iritirya - - - bir n yityupya - bir n yityupya - - - Euro - uru - - - ddular n fiji - ddular n fiji - - - ljunih n falkland - ljunih n falkland - - - British Pound - jinuh - - - lari n gyurgya - lari n gyurgya - - - sidiy n ɣana - sidiy n ɣana - - - ljunih n jabalṭariq - ljunih n jabalṭariq - - - dalasi n ɣambya - dalasi n ɣambya - - - frank n ɣinya - frank n ɣinya - - - Guatemalan Quetzal - kwitzal n gwatimala - - - ddular n guyana - ddular n guyana - - - ddular n hungkung - ddular n hungkung - - - Honduran Lempira - lempiras n hondura - - - kuna n kerwatya - kuna n kerwatya - - - ɣurda n hayṭi - ɣurda n hayṭi - - - furint n hungatya - furint n hungatya - - - rrupya n yindunisya - rrupya n yindunisya - - - cikel - cikel - - - rrupya n lhend - Indian rupees - - - ddinar n lɛiraq - ddinar n lɛiraq - - - rryal n iran - Iranian rials - - - kruna n yeslanda - kruna n yeslanda - - - ddular n jamayka - ddular n jamayka - - - ddinar n lurdun - ddinar n lurdun - - - lyan n jjapun - lyan n jjapun - - - cilin n kinya - cilin n kinya - - - sum n kirgistan - sum n kirgistan - - - rryal n kambudya - rryal n kambudya - - - frank n qumrus - frank n qumrus - - - wun n kurya n sennej - wun n kurya n sennej - - - wun n kurya n wadday - wun n kurya n wadday - - - ddinar n lkuwit - ddinar n lkuwit - - - ddular n sayman - ddular n sayman - - - tinga n kazaxistan - tinga n kazaxistan - - - kip n lawes - kip n lawes - - - ljunih n lubnan - ljunih n lubnan - - - rrupya n Sri Lanka - Sri Lankan rupees - - - ddular n libirya - ddular n libirya - - - lluti n lisutu - lluti n lisutu - - - Libyan Dinar - ddinar n libya - - - dderhem ameɣrabi - dderhem - - - liyu n muldub - liyu n muldub - - - aryari n madaɣacqar - aryari n madaɣacqar - - - ddinar n maqdunya - ddinar n maqdunya - - - kyat n myanmar - kyat n myanmar - - - tugrug n mangulya - tugrug n mangulya - - - patakaw n makkaw - patakaw n makkaw - - - uqiya n muritanya - uqiya n muritanya - - - rrupya n muriṭanya - rrupya n muriṭanya - - - rrufiya n maldib - Maldivian rufiyaas - - - kwaca n malawi - kwaca n malawi - - - Mexican Peso - pisus n miksiku - - - ringit n malizya - ringit n malizya - - - metqal n muzembiq - metqal n muzembiq - - - ddular n nambya - ddular n nambya - - - nira n nijirya - nira n nijirya - - - kurduba n nikaragwa - kurduba n nikaragwa - - - Norwegian Krone - kruna n nnarwij - - - rrupya n nnipal - rrupya n nnipal - - - ddular nyuziland - ddular n yuziland - - - rriyal n ɛumman - rriyal n ɛumman - - - balbaw n panama - balbaw n panama - - - ssul n piru - ssul n piru - - - kina n papwa - kina n papwa - - - pisus n filippin - pisus n filippin - - - rrupya n pakistan - rrupya n pakistan - - - zluṭi n pulanda - zluṭi n pulanda - - - gwarani n paragway - gwarani n paragway - - - rriyal n qatar - rriyal n qatar - - - liyu n rumanya - liyu n rumanya - - - ddinar n sirbya - ddinar n sirbya - - - rrubel - rrubel - - - frank n ruwanda - frank n ruwanda - - - rriyal n ssaɛud - rriyal n ssaɛud - - - ddular n sulumun - ddular n sulumun - - - rrupya n sicel - rrupya n sicel - - - ljunih n ssudan - ljunih n ssudan - - - Swedish Krona - kruna n sswid - - - ddular n sanɣafura - ddular n sanɣafura - - - ljunih n hilina - ljunih n hilina - - - lyun n siraliyyun - lyun n siraliyyun - - - lyun n siraliyyun - lyun n siraliyyun - - - cilin n ssumal - cilin n ssumal - - - ddular n surinam - ddular n surinam - - - ljunih n ssudan n wadday - ljunih n ssudan n wadday - - - dubra n sawtumi - dubra n sawtumi - - - ljunih n surya - ljunih n surya - - - lilangini - lilangini - - - baṭ n ṭṭayland - baṭ n ṭṭayland - - - sumuni n tajikistan - sumuni n tajikistan - - - manat n ṭurkmanistan - manat n ṭurkmanistan - - - Tunisian Dinar - ddinar n tunes - - - panga n ṭunga - panga - - - llira - llira - - - ddular n trinindad - ddular n trinindad - - - ddular n ttaywan - ddular n ttaywan - - - cilin n tanzanya - cilin n tanzanya - - - hribnya n wekranya - hribnya n wekranya - - - cilin n uɣanda - cilin n uɣanda - - - US Dollar - ddular - - - pisus n urugway - pisus n urugway - - - sum n uzbakistan - sum n uzbakistan - - - bulibyar - bulibyar - - - ddung n bitnam - ddung n bitnam - - - batu n banwatu - batu n banwatu - - - tala n samwa - tala n samwa - - - frank n wafriqa - frank n wafriqa - - - ddular n karibyan - ddular n karibyan - - - xulden n karibyan - xulden n karibyan - - - frank n wafriqa - frank n wafriqa - - - frank n kalidunya - frank n kalidunya - - - ttmenyat - ttmneyat - - - rriyal n lyaman - rriyal n lyaman - - - rrand n tafriqt n wadday - rrand n tafriqt n wadday - - - kwaca n zambya - kwaca n zambya - - - uru n zimbabwi - uru n zimbabwi - - - - {0} n wussan - ṭṭef wis {0} xef yeffus - - - - - - {0} di {1} - - - amnad akardinal - {0} ccerq - {0} ẓelmeḍ - {0} wadday - {0} lɣerb - - - - - amnad - {0} C - {0} Ẓ - {0} W - {0} L - - - - - {0}C - {0}Ẓ - {0}W - {0}L - - - - - - {0} d {1} - {0} d {1} - - - {0} niɣ {1} - {0}, {1} - {0} niɣ {1} - - - {0} {1} - {0} {1} - {0} {1} - {0} {1} - - - {0}, {1} - {0}, {1} - - - - - Yamina - - - Faḍma - Awraɣ - - - Ɛellal - - - Muḥemmed Amin - - - Sinbad - - - Käthe - - - Zäzilia - - - Ada Cornelia - - - diff --git a/make/data/cldr/common/main/rif_MA.xml b/make/data/cldr/common/main/rif_MA.xml deleted file mode 100644 index 73b148b704f8..000000000000 --- a/make/data/cldr/common/main/rif_MA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/rm.xml b/make/data/cldr/common/main/rm.xml index e3075af6d7cd..598381a320b0 100644 --- a/make/data/cldr/common/main/rm.xml +++ b/make/data/cldr/common/main/rm.xml @@ -45,7 +45,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic aymara lingua aserbaidschana azeri - baschkir + baschkir belutschi balinais basaa @@ -380,6 +380,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic fenizian pali polac + piemuntais ponapean prussian provenzal vegl @@ -410,7 +411,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic santali sangu sard - sicilian + sicilian scot sindhi sami dal nord @@ -421,7 +422,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic irlandais vegl serbo-croat tachelit - shan + shan singalais sidamo slovac @@ -481,7 +482,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic twi tasawaq tahitian - tuvinian + tuvinian tamazight udmurt uiguric @@ -714,7 +715,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Africa Centrala Africa Meridiunala America - America dal nord + America Settentriunala Caribica Asia da l’Ost Asia dal Sid @@ -1044,15 +1045,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic chalender format da valuta + zavrar cun ignorar ils simbols + zavrar cun invertir l’urden dals accents + zavrar tenor maiusclas / minusclas + zavrar cun resguardar maiusclas / minusclas zavrada + zavrada normalisada + zavrada tenor cifras + rearranschar scrittiras / blocs + intensitad da zavrada valuta + destinaziun transfurmaziun + exclusiuns da separaziuns tenor il dicziunari visualisaziun dals emojis + emprim di da l’emna + entretschà ciclus da las uras (12 u 24h) + metoda d’endataziun + tastatura + maximal ignorà stil da sigl da lingia sigls da lingia entaifer pleds + reglas da transfurmaziun sistem da mesira + unitad da mesira dumbers + regiun per datas supplementaras + partenza transfurmaziun + subdivisiun da la regiun Interrupziun da la frasa suenter ina abreviaziun + transfurmaziun + translatà automaticamain + zona d’urari + varianta locala + diever privat + transfurmaziun utilisaziun privata chalender budistic @@ -1072,14 +1099,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic chalender ebraic ebraic chalender naziunal indic + naziunal indic chalender hijri hijri chalender hijri (tabellar, epoca civila) hijri (tabellar, epoca civila) chalender islamic (Arabia Saudita) + hijri, vista da l’Arabia Saudita + hijri (tabellar, epoca astronomica) chalender hijri (Umm al-Qura) hijri (Umm al-Qura) chalender gregorian (cun l’onn al cumenzament) + gregorian chalender giapunais giapunais chalender persian @@ -1090,19 +1121,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic contabilitad format da valuta da standard standard + minusclas + minusclas + maiusclas + cumpatibilitad + dicziunari zavrada unicode standard standard unicode + emoji + reglas europeicas cudesch da telefon + cudesch da telefon + fonetic Pinyin + pinyin tschertga generala tschertga + consonant inizial corean zavrada da standard standard urden dals stritgs + stritgs reglas tradiziunalas + tradiziunal + radicals e stritgs + zhuyin + valuta + cifras + interpuncziun + spazi + simbol + tut + mo bustabs da basa + basa, accents, grond / pitschen, variantas, kana + basa, accents + basa, accents, grond / pitschen, variantas + a l’entira largezza + a mesa largezza predefinì emoji text + sistem da 12 uras + 12 + sistem da 24 uras + 24 sistem da 12 uras (0–11) 12 (0–11) sistem da 12 uras (1–12) @@ -1111,6 +1173,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) sistem da 24 uras (1–24) 24 (1–24) + spustar spazis, interpuncziun, tut ils simbols + spustar spazis, interpuncziun + spustar spazis, interpuncziun + spustar spazis, interpuncziun, simbols (exclus valutas) stil da sigl da lingia liber liber stil da sigl da lingia normal @@ -1121,6 +1187,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic preservar tut normal preservar en frasas + translitteraziun US BGN + translitteraziun UN GEGN sistem metric metric sistem imperial britannic @@ -1129,47 +1197,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic USA cifras indic-arabas cifras indic-arabas extendidas + indic-arab extendì dumbers armens dumbers armens en minusclas + armen en minusclas cifras bengalas cifras chakma cifras devanagari cifras etiopicas + finanziar cifras da ladezza cumplaina + entira largezza dumbers georgians dumbers grecs dumbers grecs en minusclas + grec en minusclas cifras gujarati cifras gurmukhi + numeraziun dals dis dal mais en caracters han per chalenders tradiziunals dumbers chinais decimals + sistem decimal posiziunal che utilisescha ideografs numerals chinais sco cifras dumbers en chinais simplifitgà dumbers finanziars en chinais simplifitgà + finanziar en chinais simplifitgà dumbers en chinais tradiziunal dumbers finanziars en chinais tradiziunal + finanziar en chinais tradiziunal dumbers ebraics cifras javanaisas dumbers giapunais dumbers finanziars giapunais + giapunais finanziar + numeraziun giapunaisa da l’emprim onn Gannen cifras khmer cifras kannada + tai tham tham (ecclesiastic) cifras laotas cifras occidentalas + matematic grass + matematic cun stritg dubel + matematic monospazi + matematic grass senza serifas + matematic senza serifas cifras malayalam cifras meetei mayek cifras dal Myanmar + pwo karen oriental dal Myanmar + pao dal Myanmar + shan dal Myanmar + tai laing dal Myanmar + cifras nativas + cifras nativas cifras ol chiki cifras oriya + conturà dumbers romans + roman en maiusclas dumbers romans en minusclas + roman en minusclas + segmentà dumbers tamil tradiziunal cifras tamilas + tamil modern cifras telugu cifras en thai cifras tibetanas + numerals tradiziunals cifras vai Deactivà Activà + translaziun automatica betg specifitgada + varianta POSIX + + Deactivà + Activà + metric britannic @@ -1300,6 +1403,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0}–{1} + d – d @@ -1644,23 +1750,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1}, {0} - - {1}, {0} - - - {1}, {0} - {1}, {0} - - {1}, {0} - - - {1}, {0} - E d @@ -1673,6 +1767,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLL y G dd-MM-y G E, d MMM y G + MMM y G d MMMM y G E, d MMMM y G h:mm a @@ -1701,7 +1796,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'emna' w 'dal' Y 'emna' w 'dal' Y + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + y G – y G y–y G @@ -1827,12 +1930,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic èra - - èra - - - èra - onn l’onn passà @@ -1847,16 +1944,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0} onns - - - en {0} onn - en {0} onns - - - avant {0} onn - avant {0} onns - - o. l’onn passà @@ -1897,7 +1984,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Q + q en {0}q en {0}q @@ -1925,20 +2012,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ultim mais quest mais proxim mais - - en {0} mais - en {0} mais - - - avant {0} mais - avant {0} mais - m. - ultim mais - quest mais - proxim mais en {0}mais en {0}mais @@ -1967,21 +2043,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ultim’emna quest’emna proxim’emna - - en {0} emna - en {0} emnas - - - avant {0} emna - avant {0} emnas - - l’emna dals {0} e. - ultim’emna - quest’emna - proxim’emna en {0}e en {0}e @@ -1990,14 +2054,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0}e avant {0}e - l’emna dals {0} emna dal mais - - emna dal mais - emna mais @@ -2017,16 +2077,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0} dis - - - en {0} di - en {0} dis - - - avant {0} di - avant {0} dis - - d @@ -2041,24 +2091,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic di da l’onn - - di da l’onn - - - di da l’onn - di da l’emna di dal mais - - di dal mais - - - di dal mais - l’ultima dumengia questa dumengia @@ -2091,7 +2129,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic prox. du en {0} du - en {0} dum. + en {0} du avant {0} du @@ -2154,14 +2192,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ultim mardi quest mardi proxim mar - - en {0} mardi - en {0} mardis - - - avant {0} mardi - avant {0} mardis - ultim ma @@ -2310,14 +2340,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ultima sonda questa sonda proxima sonda - - en {0} sonda - en {0} sondas - - - avant {0} sonda - avant {0} sondas - ultima so @@ -2332,15 +2354,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0} so - - AM/PM - AM/PM - - AM/PM - ura quest’ura @@ -2365,7 +2381,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - h en {0}h en {0}h @@ -2398,16 +2413,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0} min - - - en {0} min - en {0} min - - - avant {0} min - avant {0} min - - secunda ussa @@ -2431,16 +2436,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic avant {0} s - - - en {0} s - en {0} s - - - avant {0} s - avant {0} s - - zona d’urari @@ -2515,9 +2510,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Inslas Feroe - - temp da stad da la Gronda Britannia - Londra @@ -2535,11 +2527,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hongkong - - - temp da stad da l’Irlanda - - Insla da Man @@ -2708,6 +2695,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Citad da Ho Chi Minh + + + temp dad Acre + temp normal dad Acre + temp da stad dad Acre + + temp da l’Afganistan @@ -2883,6 +2877,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da stad da la Brasilia + + + temp da la Gronda Britannia + temp da stad da la Gronda Britannia + + temp dal Brunei @@ -3056,6 +3056,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp dal meridian da Greenwich + + + temp da la Grönlanda + temp normal da la Grönlanda + temp da stad da la Grönlanda + + temp da la Grönlanda orientala @@ -3082,7 +3089,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - temp normal dal Hawai e las Aleutinas + temp normal da Hawai-Aleutinas @@ -3143,6 +3150,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da stad da l’Iran + + + temp da l’Irlanda + temp normal da l’Irlanda + + temp dad Irkutsk @@ -3164,6 +3177,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da stad dal Giapun + + + temp da Kamtschatka + temp normal da Kamtschatka + temp da stad da Kamtschatka + + temp dal Kasachstan @@ -3426,11 +3446,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da stad da Sachalin + + + temp da Samara + temp normal da Samara + temp da stad da Samara + + - temp da la Samoa Americana temp normal da la Samoa Americana - temp da stad da la Samoa Americana @@ -3497,6 +3522,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da Chuuk + + + temp da la Tirchia + temp normal da la Tirchia + temp da stad da la Tirchia + + temp dal Turkmenistan @@ -3516,6 +3548,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic temp da stad da l’Uruguai + + + temp dad Ürümqi + + temp da l’Usbekistan @@ -3595,12 +3632,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 0 - 0 - 0 - 0 - 0 - 0 0 milliun 0 milliuns 00 milliuns @@ -4009,11 +4040,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic yuan chinais (offshore) yuans chinais (offshore) - - dollar da la banca populara chinaisa - dollar da la banca populara chinaisa - dollars da la banca populara chinaisa - yuan chinais yuan chinais @@ -5132,8 +5158,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic aur dal Simbabwe - aur dal Simbabwe - aur dal Simbabwe dollar dal Simbabwe (2009) @@ -5265,7 +5289,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}-{1} - forzas g {0} forza g {0} forzas g @@ -5280,12 +5303,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} rotaziuns - radians {0} radian {0} radians - grads {0} grad {0} grads @@ -5329,7 +5350,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} per miglia quadrat - acras {0} acra {0} acras @@ -5350,12 +5370,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} per polesch quadrat - dunams {0} dunam {0} dunams - carats {0} carat {0} carats @@ -5385,17 +5403,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} parts per milliun - pertschient {0} pertschient {0} pertschient - promil {0} promil {0} promil - per diesch milli {0} per diesch milli {0} per diesch milli @@ -5556,7 +5571,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ohms - volts {0} volt {0} volts @@ -5576,7 +5590,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kilojoules - joules {0} joule {0} joules @@ -5590,11 +5603,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} electronvolt {0} electronvolts - - therm US - {0} therm US - {0} therm US - glivra-forza {0} glivra-forza @@ -5638,7 +5646,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} pixels - megapixels {0} megapixel {0} megapixels @@ -5648,7 +5655,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} pixels per centimeter - pixels per polesch {0} pixel per polesch {0} pixels per polesch @@ -5664,6 +5670,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} per kilometer + meters {0} meter {0} meters {0} per meter @@ -5700,34 +5707,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} picometers - miglia {0} miglia {0} miglias - yards {0} yard {0} yards - pes {0} pe {0} pes {0} per pe - poleschs {0} polesch {0} poleschs {0} per polesch - parsecs {0} parsec {0} parsecs - onns da glisch {0} onn da glisch {0} onns da glisch @@ -5757,22 +5758,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} radius solars - lux {0} lux {0} lux - candela {0} candela {0} candela - lumen {0} lumen {0} lumen - luminusitads solaras {0} luminusitad solara {0} luminusitads solaras @@ -5828,7 +5825,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} carats - daltons {0} dalton {0} daltons @@ -5838,12 +5834,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} massas da terra - massas solaras {0} massa solara {0} massas solaras - grauns {0} graun {0} grauns @@ -6025,6 +6019,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} hectoliters + liters {0} liter {0} liters {0} per liter @@ -6082,7 +6077,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} pintas - cups {0} cup {0} cups @@ -6122,22 +6116,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} tschaduns da dessert imperials - guts {0} gut {0} guts - - drams - {0} dram - {0} drams - - jiggers - {0} jiggers + {0} jigger {0} jiggers - presas {0} presa {0} presas @@ -6206,20 +6192,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Weber {0} Webers - - glisch - {0} glisch - {0} glisch - parts per milliarda {0} part per milliarda {0} parts per milliarda - notgs - {0} notg - {0} notgs {0} per notg @@ -6285,7 +6263,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic promil - per diesch milli + per 10milli Glc @@ -6355,14 +6333,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic uras - {0} h - {0} h {0}/ura minutas - {0} min - {0} min secundas @@ -6463,10 +6437,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} da Hg {0} da Hg - - {0}°C - {0}°C - Ml {0} Ml @@ -6550,7 +6520,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic jiggers - {0} jiggers + {0} jigger {0} jiggers @@ -6645,23 +6615,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}m/s² - rot {0}rot {0}rot + rad {0}rad {0}rad ° + + arcmin + + + arcsec + {0}km² {0}km² - ha {0}ha {0}ha @@ -6695,10 +6670,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}in² + dunam {0}dunam {0}dunam + carat {0}kt {0}kt @@ -6711,30 +6688,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mmol/L - elem. {0}elem. {0}elem. + + {0} part + {0} part + - parts/milliun {0}ppm {0}ppm - - pertschient - - - promil + + ‱ {0}mol {0}mol - Glc + {0} Glc + {0} Glc - l/km {0}l/km {0}l/km @@ -6754,52 +6730,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}m/gUK - PB {0}PB {0}PB - TB {0}TB {0}TB - Tb {0}Tb {0}Tb - GB {0}GB {0}GB - Gb {0}Gb {0}Gb - MB {0}MB {0}MB - Mb {0}Mb {0}Mb - kB {0}kB {0}kB - kb {0}kb {0}kb - B {0}B {0}B @@ -6808,12 +6774,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}bit - tsch. {0}tsch. {0}tsch. - dec. {0}dec. {0}dec. @@ -6821,7 +6785,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic o. {0}o. {0}o. - {0}/o. Q @@ -6886,6 +6849,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}Ω + volt {0}V {0}V @@ -6911,11 +6875,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kWh + eV {0}eV {0}eV - therm US {0}therm US {0}therm US @@ -6924,6 +6888,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}lbf + N {0}N {0}N @@ -6957,6 +6922,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}px + MP {0}MP {0}MP @@ -6965,7 +6931,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ppcm - pixels per polesch {0}ppi {0}ppi @@ -6978,7 +6943,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}km - m {0}m {0}m @@ -7003,18 +6967,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}pm + mi {0}mi {0}mi + yd {0}yd {0}yd + ft {0}ft {0}ft + in {0}in {0}in @@ -7023,6 +6991,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}pc + ly {0}ly {0}ly @@ -7039,6 +7008,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}smi + pt {0}pt {0}pt @@ -7047,20 +7017,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}R☉ - lux {0}lx {0}lx + cd {0}cd {0}cd - lumen {0}lm {0}lm + L☉ {0}L☉ {0}L☉ @@ -7102,6 +7072,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}CD + Da {0}Da {0}Da @@ -7131,7 +7102,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kW - W {0}W {0}W @@ -7140,20 +7110,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mW - PS {0}PS {0}PS - mmHg {0}mmHg {0}mmHg - - da Hg - {0} da Hg - {0} da Hg - {0}psi {0}psi @@ -7188,7 +7151,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}MPa - km/h {0}km/h {0}km/h @@ -7209,10 +7171,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic B{0} B{0} - - {0}°C - {0}°C - {0}K {0}K @@ -7250,32 +7208,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}in³ - Ml {0}Ml {0}Ml - hl {0}hl {0}hl - l {0}l {0}l - dl {0}dl {0}dl - cl {0}cl {0}cl - ml {0}ml {0}ml @@ -7288,21 +7240,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mc - acre ft {0}ac ft {0}ac ft - gal {0}gal {0}gal - {0}/gal - gal imp {0}gal imp {0}gal imp - {0}/gal imp {0}qt @@ -7313,11 +7260,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}pt + cup {0}c {0}c - fl oz {0}fl oz {0}fl oz @@ -7327,12 +7274,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}fl oz Im - tg {0}tg {0}tg - tp {0}tp {0}tp @@ -7341,7 +7286,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}bbl - td {0}td {0}td @@ -7361,6 +7305,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}fl.dr. + jigger {0}jigger {0}jigger @@ -7370,28 +7315,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}pr - qt imp {0}qt imp {0}qt imp - - cal-IT + + {0} sr + {0} sr + + + {0} kat + {0} kat + + + {0} C + {0} C + + + {0} F + {0} F + + + {0} H + {0} H + + + {0} S + {0} S + + + {0} T + {0} T + + + {0} Wb + {0} Wb - glisch {0}glisch {0}glisch - parts/milliarda {0}ppb {0}ppb - notgs {0}notg {0}notgs - {0}/notg {0}O diff --git a/make/data/cldr/common/main/ro.xml b/make/data/cldr/common/main/ro.xml index b65850cd3fa7..b8e919d8b7c6 100644 --- a/make/data/cldr/common/main/ro.xml +++ b/make/data/cldr/common/main/ro.xml @@ -418,6 +418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pali pijin poloneză + piemonteză pohnpeiană maliseet-passamaquoddy prusacă @@ -1220,18 +1221,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordine de sortare sortare normalizată sortare numerică + reordonare scriere/blocuri puterea sortării monedă + destinație transformare + excluderi întreruperi dicționar Prezentare emojiuri + prima zi a săptămânii + amestecate ciclu orar (12 sau 24) + metodă de introducere + tastatură + cel mai înalt nivel ignorat stil de întrerupere a rândului (chineză, japoneză, coreeană) întrerupere a rândului în interiorul cuvântului + reguli de transformare sistem de unități de măsură + unitate de măsură numere + regiune pentru date suplimentare + sursă transformare + subdiviziune regiune întrerupere propoziție după abr. + Transformare + traducere automată fus orar variantă locală utilizare privată + transformare de uz privat calendar budist @@ -1251,15 +1268,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ calendar ebraic ebraic calendar național indian + național indian calendarul hegirei al hegirei calendarul hegirei (tabular, civil) al hegirei (tabular, civil) calendar islamic (Arabia Saudită, lunar) + al hegirei, observare Arabia Saudită calendar islamic (tabular, epocă astronomică) + al hegirei (tabular, astronomic) calendarul hegirei (Umm al-Qura) al hegirei (Umm al-Qura) calendar ISO-8601 + gregorian calendar japonez japonez calendar persan @@ -1275,8 +1296,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordonați accentele în mod normal Ordonați după accente în ordine inversă Ordonați întâi minusculele + minuscule Ordonați după dimensiunea normală a literei + minuscule Ordonați mai întâi majusculele + majuscule Ordonați neținând seama de diferența dintre majuscule/minuscule Ordonați ținând seama de diferența dintre majuscule/minuscule ordine de sortare anterioară, pentru compatibilitate @@ -1286,7 +1310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ordine de sortare Unicode implicită Unicode implicită ordine de sortare a emojiurilor + emoji regulile europene de sortare + reguli europene ordine de sortare după cartea de telefon carte de telefon ordine de sortare fonetică @@ -1296,6 +1322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ căutare cu scop general căutare Căutați în funcție de consoana inițială hangul + consoană inițială coreeană ordine de sortare standard standard ordine de sortare după trasare @@ -1310,17 +1337,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ordonați caracterele unicode normalizat Ordonați cifrele individual Ordonați cifrele în ordine numerică + monedă + cifre + punctuație + spațiu + simbol Ordonați-le pe toate + toate Ordonați numai literele de bază + doar literele de bază Ordonați după accente/dimensiunea literei/lățime/kana + bază, accente, majuscule/minuscule, variante, kana Ordonați după accent + bază, accente Ordonați după accente/dimensiunea literei/lățime + bază, accente, majuscule/minuscule, variante Cu lățime întreagă Cu jumătate de lățime Numeric implicită emojiuri text + sistem cu 12 ore + 12 + sistem cu 24 de ore + 24 sistem cu 12 ore (0–11) 12 (0–11) sistem cu 12 ore (1–12) @@ -1329,6 +1370,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) sistem cu 24 de ore (1–24) 24 (1–24) + omite spații, punctuație, toate simbolurile + omite spații, punctuație + omite spații, punctuație + omite spații, punctuație, simboluri nemonetare stil liber de întrerupere a liniei liber stil de normal întrerupere a rândului @@ -1350,8 +1395,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cifre ahom cifre indo-arabe cifre indo-arabe extinse + indo-arabe extinse numerale armenești numerale armenești cu minuscule + armenești cu minuscule cifre balineze cifre bengaleze cifre brahmi @@ -1362,58 +1409,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cifre dives akuru numerale etiopiene Sistemul numeric financiar + financiare cifre cu lățimea întreagă + lățime întreagă numerale georgiene cifre gunjala gondi cifre masaram gondi numerale grecești numerale grecești cu minuscule + grecești cu minuscule cifre gujarati cifre gurmukhi + numerotare a zilelor lunii cu caractere han pentru calendarele tradiționale numerale zecimale chinezești + sistem zecimal pozițional utilizând ideograme numerice chinezești drept cifre numerale chinezești simplificate numerale financiare chinezești simplificate + financiare chinezești simplificate numerale chinezești tradiționale numerale financiare chinezești tradiționale + financiare chinezești tradiționale numerale ebraice cifre pahawh hmong cifre nyiakeng puachue hmong cifre javaneze numerale japoneze numerale financiare japoneze + financiare japoneze + numerotare japoneză gannen după primul an cifre kayah li cifre kawi cifre khmere cifre kannada cifre tai tham hora cifre tai tham tham + tai tham tham (ecleziastică) cifre laoțiene cifre occidentale cifre lepcha cifre limbu cifre matematice aldine + matematice aldine cifre matematice cu două linii + matematice cu linii duble cifre matematice cu un singur spațiu + matematice monospațiate cifre matematice aldine sans serif + matematice fără serife aldine cifre matematice sans serif + matematice fără serife cifre malayalam cifre modi Cifre mongole cifre mro cifre meetei mayek cifre birmaneze + karen pwo de Est birmaneze + pao birmaneze cifre birmaneze shan + shan birmaneze cifre birmaneze tai laing + tai laing birmaneze cifre nag mundari cifre native + cifre native cifre n’ko cifre ol chiki cifre oriya cifre osmanya + conturate cifre hanifi rohingya numerale romane + romane cu majuscule numerale romane cu minuscule + romane cu minuscule cifre saurashtra + segmentate cifre sharada cifre khudawadi cifre sinhala lith @@ -1423,18 +1494,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cifre tai lue noi numerale tradiționale tamile cifre tamile + tamile moderne cifre telugu cifre thailandeze cifre tibetane cifre tirhuta cifre tangsa Numere tradiționale + numerale tradiționale cifre vai cifre warang citi cifre wancho dezactivată activată + traducere automată nespecificată + variantă POSIX + + dezactivată + activată + metric britanic @@ -1751,6 +1830,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y–y G @@ -1991,6 +2074,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -2037,11 +2123,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v dd.MM E, dd.MM dd.MM @@ -2060,12 +2148,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y 'săptămâna' w 'din' Y 'săptămâna' w 'din' Y 'săptămâna' w 'din' Y + + {1}, {0} + {0} {1} + {1}, {0} + y G – y G @@ -2137,6 +2232,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + MM.y – MM.y MM.y – MM.y @@ -2780,15 +2879,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sâ. -{0} săpt. - - a.m./p.m. - a.m./p.m. - - a.m./p.m. - oră ora aceasta @@ -2976,9 +3069,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Feroe - - Ora de vară britanică - Londra @@ -2993,11 +3083,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Budapesta - - - Ora de vară a Irlandei - - Ierusalim @@ -3186,9 +3271,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora Acre - Ora standard Acre - Ora de vară Acre + Ora din Acre + Ora standard din Acre + Ora de vară din Acre @@ -3223,13 +3308,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora de vară din Alaska - - - Ora Almaty - Ora standard Almaty - Ora de vară Almaty - - Ora Amazonului @@ -3274,23 +3352,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora din Samoa - Ora standard din Samoa - Ora de vară din Samoa - - - - - Ora Aqtau - Ora standard Aqtau - Ora de vară a zonei Aqtau - - - - - Ora Aqtobe - Ora standard Aqtobe - Ora de vară a zonei Aqtobe + Ora din Samoa de Vest + Ora standard din Samoa de Vest + Ora de vară din Samoa de Vest @@ -3394,6 +3458,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora de vară a Brasiliei + + + Ora Marii Britanii + Ora de vară a Marii Britanii + + Ora din Brunei Darussalam @@ -3585,6 +3655,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Ora Groenlandei + Ora standard a Groenlandei + Ora de vară a Groenlandei + + Ora Groenlandei orientale @@ -3611,7 +3688,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora standard din Hawaii-Aleutine + Ora din Hawaii @@ -3672,6 +3749,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora de vară a Iranului + + + Ora Irlandei + Ora de vară a Irlandei + + Ora din Irkuțk @@ -3695,9 +3778,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora din Petropavlovsk-Kamciațki - Ora standard din Petropavlovsk-Kamciațki - Ora de vară din Petropavlovsk-Kamciațki + Ora din Kamceatka + Ora standard din Kamceatka + Ora de vară din Kamceatka @@ -3971,9 +4054,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora din Samoa - Ora standard din Samoa - Ora de vară din Samoa + Ora din Samoa Americană @@ -4040,6 +4121,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora din Chuuk + + + Ora Turciei + Ora standard a Turciei + Ora de vară a Turciei + + Ora din Turkmenistan @@ -4059,6 +4147,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora de vară a Uruguayului + + + Ora din Ürümqi + + Ora din Uzbekistan @@ -4177,28 +4270,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 K + 0 K 0 K 00 K + 00 K 00 K 000 K + 000 K 000 K 0 mil'.' + 0 mil'.' 0 mil'.' 00 mil'.' + 00 mil'.' 00 mil'.' 000 mil'.' + 000 mil'.' 000 mil'.' 0 mld'.' + 0 mld'.' 0 mld'.' 00 mld'.' + 00 mld'.' 00 mld'.' 000 mld'.' + 000 mld'.' 000 mld'.' 0 tril'.' + 0 tril'.' 0 tril'.' 00 tril'.' + 00 tril'.' 00 tril'.' 000 tril'.' + 000 tril'.' 000 tril'.' @@ -5675,9 +5780,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabwe Gold - Zimbabwe Gold - Zimbabwe Gold - Zimbabwe Gold dolar Zimbabwe (2009) @@ -6034,9 +6136,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ părți - {0} parte - {0} părți - {0} de părți feminine @@ -6505,7 +6604,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} kilowați-oră per 100 kilometri {0} kilowați-oră per 100 kilometri {0} kilowați-oră per 100 kilometri - {0} kilowați-oră per 100 kilometri + {0} de kilowați-oră per 100 kilometri masculine @@ -8016,7 +8115,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} itemi - parte {0} parte {0} părți {0} părți @@ -8031,9 +8129,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ‱ {0} ‱ - - Glc - mi/gal {0} mi/gal @@ -8099,12 +8194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ g - - de Hg - {0} de Hg - {0} de Hg - {0} de Hg - {0}″ Hg {0}″ Hg @@ -8166,9 +8255,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt im {0} qt im - - cal-IT - diff --git a/make/data/cldr/common/main/root.xml b/make/data/cldr/common/main/root.xml index 2814592af51c..56389f59e12b 100644 --- a/make/data/cldr/common/main/root.xml +++ b/make/data/cldr/common/main/root.xml @@ -82,6 +82,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ [,,﹐︐ ⹁ ٫] [..․﹒ 。] + “ @@ -95,6 +96,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -201,6 +205,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -393,6 +400,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + {1} {0} @@ -489,19 +499,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ r(U) QQQQ - {0} ({2}: {1}) - {0} {1} - {1} {0} - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} {1} - {0} ({2}: {1}) - {1} {0} + + + + {0} – {1} h B – h B @@ -656,6 +659,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -764,6 +770,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -796,38 +805,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - - - - - - - - - - - - - - - - AA - - - - - - - - - - - - - - + @@ -876,6 +854,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -927,6 +908,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + {1} {0} @@ -1022,19 +1006,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y QQQQ - {0} ({2}: {1}) - {0} {1} - {1} {0} - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} {1} - {0} ({2}: {1}) - {1} {0} + + + + {0} – {1} h B – h B @@ -1140,6 +1117,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d, E – MMM d, E MMM d, E – MMM d, E + + MMMM d–d + MMMM d – MMMM d + G y–y @@ -1387,6 +1368,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + : + {1} {0} @@ -1453,6 +1438,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y MMM G y MMM d G y MMM d, E + G y MMMM + G y MMMM d + G y MMMM d, E h a HH h:mm a @@ -1472,6 +1460,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d MMM d, E MMMM d + MMMM d, E 'week' W 'of' MMMM mm:ss y @@ -1487,19 +1476,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 'week' w 'of' Y + {0} {1} {0} ({2}: {1}) - {0} {1} + {1} {0} {1} {0} {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) {0} ({2}: {1}) + {1} {0} {0} {1} {0} ({2}: {1}) {1} {0} + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} h B – h B @@ -1605,6 +1601,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d, E – MMM d, E MMM d, E – MMM d, E + + MMMM d–d + MMMM d – MMMM d + y–y @@ -1694,6 +1694,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -1771,6 +1774,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -1859,6 +1865,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -1891,113 +1900,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -2063,6 +1983,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + : + {1} {0} @@ -2145,19 +2069,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Y 'week' w - {0} ({2}: {1}) - {0} {1} - {1} {0} - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} ({2}: {1}) - {0} {1} - {0} ({2}: {1}) - {1} {0} + + + + {0} – {1} h B – h B @@ -2305,6 +2222,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -2319,238 +2239,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Taika (645–650) - Hakuchi (650–671) - Hakuhō (672–686) - Shuchō (686–701) - Taihō (701–704) - Keiun (704–708) - Wadō (708–715) - Reiki (715–717) - Yōrō (717–724) - Jinki (724–729) - Tenpyō (729–749) - Tenpyō-kampō (749–749) - Tenpyō-shōhō (749–757) - Tenpyō-hōji (757–765) - Tenpyō-jingo (765–767) - Jingo-keiun (767–770) - Hōki (770–780) - Ten-ō (781–782) - Enryaku (782–806) - Daidō (806–810) - Kōnin (810–824) - Tenchō (824–834) - Jōwa (834–848) - Kajō (848–851) - Ninju (851–854) - Saikō (854–857) - Ten-an (857–859) - Jōgan (859–877) - Gangyō (877–885) - Ninna (885–889) - Kanpyō (889–898) - Shōtai (898–901) - Engi (901–923) - Enchō (923–931) - Jōhei (931–938) - Tengyō (938–947) - Tenryaku (947–957) - Tentoku (957–961) - Ōwa (961–964) - Kōhō (964–968) - Anna (968–970) - Tenroku (970–973) - Ten’en (973–976) - Jōgen (976–978) - Tengen (978–983) - Eikan (983–985) - Kanna (985–987) - Eien (987–989) - Eiso (989–990) - Shōryaku (990–995) - Chōtoku (995–999) - Chōhō (999–1004) - Kankō (1004–1012) - Chōwa (1012–1017) - Kannin (1017–1021) - Jian (1021–1024) - Manju (1024–1028) - Chōgen (1028–1037) - Chōryaku (1037–1040) - Chōkyū (1040–1044) - Kantoku (1044–1046) - Eishō (1046–1053) - Tengi (1053–1058) - Kōhei (1058–1065) - Jiryaku (1065–1069) - Enkyū (1069–1074) - Shōho (1074–1077) - Shōryaku (1077–1081) - Eihō (1081–1084) - Ōtoku (1084–1087) - Kanji (1087–1094) - Kahō (1094–1096) - Eichō (1096–1097) - Jōtoku (1097–1099) - Kōwa (1099–1104) - Chōji (1104–1106) - Kashō (1106–1108) - Tennin (1108–1110) - Ten-ei (1110–1113) - Eikyū (1113–1118) - Gen’ei (1118–1120) - Hōan (1120–1124) - Tenji (1124–1126) - Daiji (1126–1131) - Tenshō (1131–1132) - Chōshō (1132–1135) - Hōen (1135–1141) - Eiji (1141–1142) - Kōji (1142–1144) - Ten’yō (1144–1145) - Kyūan (1145–1151) - Ninpei (1151–1154) - Kyūju (1154–1156) - Hōgen (1156–1159) - Heiji (1159–1160) - Eiryaku (1160–1161) - Ōho (1161–1163) - Chōkan (1163–1165) - Eiman (1165–1166) - Nin’an (1166–1169) - Kaō (1169–1171) - Shōan (1171–1175) - Angen (1175–1177) - Jishō (1177–1181) - Yōwa (1181–1182) - Juei (1182–1184) - Genryaku (1184–1185) - Bunji (1185–1190) - Kenkyū (1190–1199) - Shōji (1199–1201) - Kennin (1201–1204) - Genkyū (1204–1206) - Ken’ei (1206–1207) - Jōgen (1207–1211) - Kenryaku (1211–1213) - Kenpō (1213–1219) - Jōkyū (1219–1222) - Jōō (1222–1224) - Gennin (1224–1225) - Karoku (1225–1227) - Antei (1227–1229) - Kanki (1229–1232) - Jōei (1232–1233) - Tenpuku (1233–1234) - Bunryaku (1234–1235) - Katei (1235–1238) - Ryakunin (1238–1239) - En’ō (1239–1240) - Ninji (1240–1243) - Kangen (1243–1247) - Hōji (1247–1249) - Kenchō (1249–1256) - Kōgen (1256–1257) - Shōka (1257–1259) - Shōgen (1259–1260) - Bun’ō (1260–1261) - Kōchō (1261–1264) - Bun’ei (1264–1275) - Kenji (1275–1278) - Kōan (1278–1288) - Shōō (1288–1293) - Einin (1293–1299) - Shōan (1299–1302) - Kengen (1302–1303) - Kagen (1303–1306) - Tokuji (1306–1308) - Enkyō (1308–1311) - Ōchō (1311–1312) - Shōwa (1312–1317) - Bunpō (1317–1319) - Genō (1319–1321) - Genkō (1321–1324) - Shōchū (1324–1326) - Karyaku (1326–1329) - Gentoku (1329–1331) - Genkō (1331–1334) - Kenmu (1334–1336) - Engen (1336–1340) - Kōkoku (1340–1346) - Shōhei (1346–1370) - Kentoku (1370–1372) - Bunchū (1372–1375) - Tenju (1375–1379) - Kōryaku (1379–1381) - Kōwa (1381–1384) - Genchū (1384–1392) - Meitoku (1384–1387) - Kakei (1387–1389) - Kōō (1389–1390) - Meitoku (1390–1394) - Ōei (1394–1428) - Shōchō (1428–1429) - Eikyō (1429–1441) - Kakitsu (1441–1444) - Bun’an (1444–1449) - Hōtoku (1449–1452) - Kyōtoku (1452–1455) - Kōshō (1455–1457) - Chōroku (1457–1460) - Kanshō (1460–1466) - Bunshō (1466–1467) - Ōnin (1467–1469) - Bunmei (1469–1487) - Chōkyō (1487–1489) - Entoku (1489–1492) - Meiō (1492–1501) - Bunki (1501–1504) - Eishō (1504–1521) - Taiei (1521–1528) - Kyōroku (1528–1532) - Tenbun (1532–1555) - Kōji (1555–1558) - Eiroku (1558–1570) - Genki (1570–1573) - Tenshō (1573–1592) - Bunroku (1592–1596) - Keichō (1596–1615) - Genna (1615–1624) - Kan’ei (1624–1644) - Shōho (1644–1648) - Keian (1648–1652) - Jōō (1652–1655) - Meireki (1655–1658) - Manji (1658–1661) - Kanbun (1661–1673) - Enpō (1673–1681) - Tenna (1681–1684) - Jōkyō (1684–1688) - Genroku (1688–1704) - Hōei (1704–1711) - Shōtoku (1711–1716) - Kyōhō (1716–1736) - Genbun (1736–1741) - Kanpō (1741–1744) - Enkyō (1744–1748) - Kan’en (1748–1751) - Hōreki (1751–1764) - Meiwa (1764–1772) - An’ei (1772–1781) - Tenmei (1781–1789) - Kansei (1789–1801) - Kyōwa (1801–1804) - Bunka (1804–1818) - Bunsei (1818–1830) - Tenpō (1830–1844) - Kōka (1844–1848) - Kaei (1848–1854) - Ansei (1854–1860) - Man’en (1860–1861) - Bunkyū (1861–1864) - Genji (1864–1865) - Keiō (1865–1868) Meiji Taishō Shōwa @@ -2558,238 +2246,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Reiwa - Taika (645–650) - Hakuchi (650–671) - Hakuhō (672–686) - Shuchō (686–701) - Taihō (701–704) - Keiun (704–708) - Wadō (708–715) - Reiki (715–717) - Yōrō (717–724) - Jinki (724–729) - Tenpyō (729–749) - Tenpyō-kampō (749–749) - Tenpyō-shōhō (749–757) - Tenpyō-hōji (757–765) - Tenpyō-jingo (765–767) - Jingo-keiun (767–770) - Hōki (770–780) - Ten-ō (781–782) - Enryaku (782–806) - Daidō (806–810) - Kōnin (810–824) - Tenchō (824–834) - Jōwa (834–848) - Kajō (848–851) - Ninju (851–854) - Saikō (854–857) - Ten-an (857–859) - Jōgan (859–877) - Gangyō (877–885) - Ninna (885–889) - Kanpyō (889–898) - Shōtai (898–901) - Engi (901–923) - Enchō (923–931) - Jōhei (931–938) - Tengyō (938–947) - Tenryaku (947–957) - Tentoku (957–961) - Ōwa (961–964) - Kōhō (964–968) - Anna (968–970) - Tenroku (970–973) - Ten’en (973–976) - Jōgen (976–978) - Tengen (978–983) - Eikan (983–985) - Kanna (985–987) - Eien (987–989) - Eiso (989–990) - Shōryaku (990–995) - Chōtoku (995–999) - Chōhō (999–1004) - Kankō (1004–1012) - Chōwa (1012–1017) - Kannin (1017–1021) - Jian (1021–1024) - Manju (1024–1028) - Chōgen (1028–1037) - Chōryaku (1037–1040) - Chōkyū (1040–1044) - Kantoku (1044–1046) - Eishō (1046–1053) - Tengi (1053–1058) - Kōhei (1058–1065) - Jiryaku (1065–1069) - Enkyū (1069–1074) - Shōho (1074–1077) - Shōryaku (1077–1081) - Eihō (1081–1084) - Ōtoku (1084–1087) - Kanji (1087–1094) - Kahō (1094–1096) - Eichō (1096–1097) - Jōtoku (1097–1099) - Kōwa (1099–1104) - Chōji (1104–1106) - Kashō (1106–1108) - Tennin (1108–1110) - Ten-ei (1110–1113) - Eikyū (1113–1118) - Gen’ei (1118–1120) - Hōan (1120–1124) - Tenji (1124–1126) - Daiji (1126–1131) - Tenshō (1131–1132) - Chōshō (1132–1135) - Hōen (1135–1141) - Eiji (1141–1142) - Kōji (1142–1144) - Ten’yō (1144–1145) - Kyūan (1145–1151) - Ninpei (1151–1154) - Kyūju (1154–1156) - Hōgen (1156–1159) - Heiji (1159–1160) - Eiryaku (1160–1161) - Ōho (1161–1163) - Chōkan (1163–1165) - Eiman (1165–1166) - Nin’an (1166–1169) - Kaō (1169–1171) - Shōan (1171–1175) - Angen (1175–1177) - Jishō (1177–1181) - Yōwa (1181–1182) - Juei (1182–1184) - Genryaku (1184–1185) - Bunji (1185–1190) - Kenkyū (1190–1199) - Shōji (1199–1201) - Kennin (1201–1204) - Genkyū (1204–1206) - Ken’ei (1206–1207) - Jōgen (1207–1211) - Kenryaku (1211–1213) - Kenpō (1213–1219) - Jōkyū (1219–1222) - Jōō (1222–1224) - Gennin (1224–1225) - Karoku (1225–1227) - Antei (1227–1229) - Kanki (1229–1232) - Jōei (1232–1233) - Tenpuku (1233–1234) - Bunryaku (1234–1235) - Katei (1235–1238) - Ryakunin (1238–1239) - En’ō (1239–1240) - Ninji (1240–1243) - Kangen (1243–1247) - Hōji (1247–1249) - Kenchō (1249–1256) - Kōgen (1256–1257) - Shōka (1257–1259) - Shōgen (1259–1260) - Bun’ō (1260–1261) - Kōchō (1261–1264) - Bun’ei (1264–1275) - Kenji (1275–1278) - Kōan (1278–1288) - Shōō (1288–1293) - Einin (1293–1299) - Shōan (1299–1302) - Kengen (1302–1303) - Kagen (1303–1306) - Tokuji (1306–1308) - Enkyō (1308–1311) - Ōchō (1311–1312) - Shōwa (1312–1317) - Bunpō (1317–1319) - Genō (1319–1321) - Genkō (1321–1324) - Shōchū (1324–1326) - Karyaku (1326–1329) - Gentoku (1329–1331) - Genkō (1331–1334) - Kenmu (1334–1336) - Engen (1336–1340) - Kōkoku (1340–1346) - Shōhei (1346–1370) - Kentoku (1370–1372) - Bunchū (1372–1375) - Tenju (1375–1379) - Kōryaku (1379–1381) - Kōwa (1381–1384) - Genchū (1384–1392) - Meitoku (1384–1387) - Kakei (1387–1389) - Kōō (1389–1390) - Meitoku (1390–1394) - Ōei (1394–1428) - Shōchō (1428–1429) - Eikyō (1429–1441) - Kakitsu (1441–1444) - Bun’an (1444–1449) - Hōtoku (1449–1452) - Kyōtoku (1452–1455) - Kōshō (1455–1457) - Chōroku (1457–1460) - Kanshō (1460–1466) - Bunshō (1466–1467) - Ōnin (1467–1469) - Bunmei (1469–1487) - Chōkyō (1487–1489) - Entoku (1489–1492) - Meiō (1492–1501) - Bunki (1501–1504) - Eishō (1504–1521) - Taiei (1521–1528) - Kyōroku (1528–1532) - Tenbun (1532–1555) - Kōji (1555–1558) - Eiroku (1558–1570) - Genki (1570–1573) - Tenshō (1573–1592) - Bunroku (1592–1596) - Keichō (1596–1615) - Genna (1615–1624) - Kan’ei (1624–1644) - Shōho (1644–1648) - Keian (1648–1652) - Jōō (1652–1655) - Meireki (1655–1658) - Manji (1658–1661) - Kanbun (1661–1673) - Enpō (1673–1681) - Tenna (1681–1684) - Jōkyō (1684–1688) - Genroku (1688–1704) - Hōei (1704–1711) - Shōtoku (1711–1716) - Kyōhō (1716–1736) - Genbun (1736–1741) - Kanpō (1741–1744) - Enkyō (1744–1748) - Kan’en (1748–1751) - Hōreki (1751–1764) - Meiwa (1764–1772) - An’ei (1772–1781) - Tenmei (1781–1789) - Kansei (1789–1801) - Kyōwa (1801–1804) - Bunka (1804–1818) - Bunsei (1818–1830) - Tenpō (1830–1844) - Kōka (1844–1848) - Kaei (1848–1854) - Ansei (1854–1860) - Man’en (1860–1861) - Bunkyū (1861–1864) - Genji (1864–1865) - Keiō (1865–1868) M T S @@ -2854,6 +2310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -2888,6 +2347,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + @@ -3246,8 +2708,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +HH:mm;-HH:mm GMT{0} - GMT + UTC{0} GMT+? + UTC+? + {0}/{1} {0} {0} (+1) {0} (+0) @@ -3473,6 +2937,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Wallis & Futuna + + + + + + + + + + @@ -5007,6 +4481,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + ⃃ + ؋ @@ -5061,6 +4538,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ CA$ $ + + CHF + Fr. + $ @@ -5213,6 +4694,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rs + + ⃂ + MX$ $ @@ -5239,6 +4723,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ NZ$ $ + + ⃄ + ₱ ₱ @@ -5585,10 +5072,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - {0}? - {0}? - @@ -6009,10 +5492,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lbf {0} lbf + + pdl + {0} pdl + N {0} N + + dyn + {0} dyn + kWh/100km {0} kWh/100km @@ -6119,6 +5610,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} in {0}/in + + milli-inch + {0} milli-inch + pc {0} pc diff --git a/make/data/cldr/common/main/ru.xml b/make/data/cldr/common/main/ru.xml index b0122b735fd1..7cf3dd03a80e 100644 --- a/make/data/cldr/common/main/ru.xml +++ b/make/data/cldr/common/main/ru.xml @@ -428,6 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пали соломонский пиджин польский + пьемонтский понапе малесит-пассамакводди прусский @@ -1132,18 +1133,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ порядок сортировки нормализованная сортировка числовая сортировка + переупорядочение (письмо/блоки) эффективность сортировки валюта + место назначения преобразования + исключения из словарных правил переноса представление эмодзи + первый день недели + смешанный формат времени (12- или 24-часовой) + метод ввода + клавиатура + наивысший уровень игнорирования стиль перевода строки стиль переноса слов + правила преобразования система мер + единица измерения цифры + регион для дополнительных данных + источник преобразований + подразделение региона разрыв предложения после сокращения + преобразование + машинный перевод часовой пояс вариант региональных настроек частное + частное преобразование буддийский календарь @@ -1163,23 +1180,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ еврейский календарь еврейский Национальный календарь Индии + индийский национальный календарь хиджры хиджра гражданский календарь хиджры (табличный) хиджра (табличный, гражданский) исламский календарь (Саудовская Аравия) + хиджра (Саудовская Аравия, на основе наблюдения полумесяца) исламский календарь (табличный, астрономическая эпоха) + хиджра (табличный, астрономический) календарь хиджры (Умм аль-Кура) хиджра (Умм аль-Кура) григорианский (сначала год) + григорианский японский календарь японский персидский календарь персидский календарь Миньго Миньго - финансовый формат - финансовый + бухгалтерский формат валюты + бухгалтерский стандартный формат стандартный Сортировка символов @@ -1187,8 +1208,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сортировка по акцентам в обычном порядке Сортировка по акцентам в обратном порядке Приоритетная сортировка слов в нижнем регистре + по нижнему регистру Сортировка по стандартным правилам + по нижнему регистру Приоритетная сортировка слов в верхнем регистре + по верхнему регистру Сортировка вне зависимости от регистра Сортировка с учетом регистра совместимый порядок сортировки @@ -1198,7 +1222,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ cтандартная сортировка Unicode стандартный (Unicode) эмодзи + эмодзи европейские правила сортировки + европейские правила порядок телефонной книги телефонная книга фонетический порядок сортировки @@ -1208,6 +1234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ поиск поиск Поиск по первой согласной хангыль + корейские начальные согласные стандартная сортировка стандартный по чертам @@ -1222,17 +1249,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сортировка нормализованных символов Unicode Отдельная сортировка числовых значений Сортировка численных значений + валюта + цифры + пунктуация + пробел + символ Полная сортировка + все Сортировка только по символам, обозначающим разрядность + только основные буквы Сортировка по акцентам/регистрам/длине строки/кане + основные, акценты, регистр, варианты, кана Сортировка по акцентам + основные, акценты Сортировка по акцентам/регистру/длине строки + основные, акценты, регистр, варианты полноширинные символы полуширинные символы Числовая по умолчанию эмодзи текстовые символы + 12-часовой формат времени + 12-часовой + 24-часовой формат времени + 24-часовой 12-часовой формат времени (0–11) 12-часовой (0–11) 12-часовой формат времени (1–12) @@ -1241,6 +1282,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24-часовой (0–23) 24-часовой формат времени (1–24) 24-часовой (1–24) + пробелы, пунктуация, все символы + пробелы, пунктуация + пробелы, пунктуация + пробелы, пунктуация, невалютные символы мягкий перевод строки мягкий обычный перевод строки @@ -1261,8 +1306,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ американская арабско-индийские цифры расширенная система арабско-индийских цифр + расширенные арабско-индийские армянские цифры армянские цифры в нижнем регистре + армянские в нижнем регистре балийские цифры бенгальские цифры цифры брахми @@ -1271,43 +1318,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ цифры деванагари эфиопские цифры Символы обозначения финансовых показателей + финансовый формат полноширинные цифры + полноширинные грузинские цифры греческие цифры греческие цифры в нижнем регистре + греческие в нижнем регистре цифры гуджарати цифры гурмукхи + запись дней месяца ханьскими иероглифами для традиционных календарей китайские десятичные цифры + позиционная десятичная система счисления, в которой в качестве цифр используются китайские числовые иероглифы китайские упрощенные цифры китайские упрощенные цифры (финансы) + китайские упрощенные (финансы) китайские традиционные цифры китайские традиционные цифры (финансы) + китайские традиционные (финансы) цифры на иврите яванские цифры японские цифры японские цифры (финансы) + японские (финансы) + обозначение первого года японской эры словом "ганнэн" цифры кайя ли кхмерские цифры цифры каннада цифры тай там хора цифры тай там там + тай тхам тхам (религиозный) лаосские цифры современные арабские цифры цифры лепча цифры лимбу + математические жирные + математические с двойной линией + математические моноширинные + математические жирные без засечек + математические без засечек цифры малаялам Монгольские цифры цифры манипури бирманские цифры + бирманские каренские восточного пво + бирманские пао бирманские шанские цифры + бирманские шанские + бирманские тай-лай цифры коренных народов + цифры коренных народов цифры нко цифры ол-чики цифры ория цифры османья + контурные римские цифры + римские в верхнем регистре римские цифры в нижнем регистре + римские в нижнем регистре цифры саураштра + сегментированные цифры шарада цифры сора-сомпенг суданские цифры @@ -1315,14 +1386,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ цифры новой тай-лю тамильские традиционные цифры тамильские цифры + современные тамильские цифры телугу тайские цифры тибетские цифры Традиционная система нумерации + традиционные цифры цифры ваи выключено включено + машинный перевод неуточненный + вариант POSIX + + выключено + включено + Метрическая Английская @@ -1638,11 +1717,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLL y 'г'. G d MMM y 'г'. G E, d MMM y 'г'. G - H h:mm a h:mm:ss a h a, v - HH v dd.MM E, dd.MM d MMM @@ -1661,6 +1738,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y 'г'. G + + {0} — {1} + {0} — {1} + {0}—{1} + {0} — {1} h B — h B @@ -1765,6 +1847,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL — LLLL + + d—d MMMM + d MMMM — d MMMM + y–y 'гг'. G @@ -2035,6 +2121,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -2082,19 +2171,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLL y 'г'. G d MMM y 'г'. G E, d MMM y 'г'. G + LLLL y 'г'. G + d MMMM y 'г'. G + E, d MMMM y 'г'. G H h:mm a h:mm:ss a h:mm:ss a v h:mm a v h a, v - HH v dd.MM E, dd.MM dd.MM d MMM ccc, d MMM d MMMM + E, d MMMM W-'я' 'неделя' MMMM W-'я' 'неделя' MMMM W-'я' 'неделя' MMMM @@ -2107,6 +2199,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y 'г'. E, d MMM y 'г'. LLLL y 'г'. + d MMMM y 'г'. + E, d MMMM y 'г'. QQQ y 'г'. QQQQ y 'г'. w-'я' 'неделя' Y 'г'. @@ -2114,124 +2208,163 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w-'я' 'неделя' Y 'г'. w-'я' 'неделя' Y 'г'. + + {1}, {0} + {0} {1} + {1}, {0} + - {0} – {1} + + {0} — {1} + {0} — {1} + {0}—{1} + + {0} — {1} + + h B — h B + h—h B + + + h:mm B — h:mm B + h:mm—h:mm B + h:mm—h:mm B + + + d—d + - y 'г'. G – y 'г'. G - y–y 'гг'. G + y 'г'. G — y 'г'. G + y—y 'гг'. G - MM.y G – MM.y G - MM.y–MM.y G - MM.y–MM.y G + MM.y G — MM.y G + MM.y—MM.y G + MM.y—MM.y G - dd.MM.y–dd.MM.y G - dd.MM.y G – dd.MM.y G - dd.MM.y–dd.MM.y G - dd.MM.y–dd.MM.y G + dd.MM.y—dd.MM.y G + dd.MM.y G — dd.MM.y G + dd.MM.y—dd.MM.y G + dd.MM.y—dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y G – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G + ccc, dd.MM.y G — ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G - LLL y 'г'. G – LLL y 'г'. G - LLL – LLL y 'г'. G - LLL y – LLL y 'гг'. G + LLL y 'г'. G — LLL y 'г'. G + LLL — LLL y 'г'. G + LLL y 'г'. — LLL y 'г'. G - d–d MMM y 'г'. G - d MMM y 'г'. G – d MMM y 'г'. G - d MMM – d MMM y 'г'. G - d MMM y – d MMM y 'гг'. G + d—d MMM y 'г'. G + d MMM y 'г'. G — d MMM y 'г'. G + d MMM — d MMM y 'г'. G + d MMM y 'г'. — d MMM y 'г'. G - ccc, d MMM – ccc, d MMM y 'г'. G - ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G - ccc, d MMM – ccc, d MMM y 'г'. G - ccc, d MMM y – ccc, d MMM y 'гг'. G + ccc, d MMM — ccc, d MMM y 'г'. G + ccc, d MMM y 'г'. G — ccc, d MMM y 'г'. G + ccc, d MMM — ccc, d MMM y 'г'. G + ccc, d MMM y 'г'. — ccc, d MMM y 'г'. G - h a – h a + h a — h a + h—h a - HH–HH 'ч' + HH—HH - h:mm a – h:mm a - h:mm–h:mm a - h:mm–h:mm a + hh:mm — hh:mm + h:mm—h:mm a + h:mm—h:mm a + + + HH:mm—HH:mm + HH:mm—HH:mm - h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v + h:mm a — h:mm a v + h:mm—h:mm a v + h:mm—h:mm a v + + + HH:mm—HH:mm v + HH:mm—HH:mm v - h a – h a v + h a — h a v + h—h a v - HH–HH v + HH—HH v - M–M + M—M - dd.MM–dd.MM - dd.MM–dd.MM + dd.MM—dd.MM + dd.MM—dd.MM - E, dd.MM – E, dd.MM - E, dd.MM – E, dd.MM + E, dd.MM — E, dd.MM + E, dd.MM — E, dd.MM - LLL – LLL + LLL — LLL - d–d MMM - d MMM – d MMM + d—d MMM + d MMM — d MMM - E, d MMM – E, d MMM - E, d MMM – E, d MMM + E, d MMM — E, d MMM + E, d MMM — E, d MMM - LLLL – LLLL + LLLL — LLLL + + + d—d MMMM + d MMMM — d MMMM + + + y—y - MM.y–MM.y - MM.y–MM.y + MM.y—MM.y + MM.y—MM.y - dd.MM.y–dd.MM.y - dd.MM.y–dd.MM.y - dd.MM.y–dd.MM.y + dd.MM.y—dd.MM.y + dd.MM.y—dd.MM.y + dd.MM.y—dd.MM.y - ccc, dd.MM.y – ccc, dd.MM.y - ccc, dd.MM.y – ccc, dd.MM.y - ccc, dd.MM.y – ccc, dd.MM.y + ccc, dd.MM.y — ccc, dd.MM.y + ccc, dd.MM.y — ccc, dd.MM.y + ccc, dd.MM.y — ccc, dd.MM.y - LLL – LLL y 'г'. - LLL y 'г'. – LLL y 'г'. + LLL — LLL y 'г'. + LLL y 'г'. — LLL y 'г'. - d–d MMM y 'г'. - d MMM – d MMM y 'г'. - d MMM y 'г'. – d MMM y 'г'. + d—d MMM y 'г'. + d MMM — d MMM y 'г'. + d MMM y 'г'. — d MMM y 'г'. - ccc, d – ccc, d MMM y 'г'. - ccc, d MMM – ccc, d MMM y 'г'. - ccc, d MMM y 'г'. – ccc, d MMM y 'г'. + ccc, d MMM — ccc, d MMM y 'г'. + ccc, d MMM — ccc, d MMM y 'г'. + ccc, d MMM y 'г'. — ccc, d MMM y 'г'. - LLLL – LLLL y 'г'. - LLLL y 'г'. – LLLL y 'г'. + LLLL — LLLL y 'г'. + LLLL y 'г'. — LLLL y 'г'. @@ -2330,238 +2463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Эпоха Тайка (645–650) - Эпоха Хакути (650–671) - Эпоха Хакухо (672–686) - Эпоха Сючё (686–701) - Эпоха Тайхо (701–704) - Эпоха Кёюн (704–708) - Эпоха Вадо (708–715) - Эпоха Рэйки (715–717) - Эпоха Ёро (717–724) - Эпоха Дзинки (724–729) - Эпоха Темпьё (729–749) - Эпоха Темпьё (749–749) - Эпоха Темпьё-Сьохо (749-757) - Эпоха Темпьё-Ходзи (757-765) - Эпоха Темпьё-Ходзи (765-767) - Эпоха Джинго-Кёюн (767-770) - Эпоха Хоки (770–780) - Эпоха Теньё (781–782) - Эпоха Енряку (782–806) - Эпоха Дайдо (806–810) - Эпоха Конин (810–824) - Эпоха Тентьо (824–834) - Эпоха Шова (834–848) - Эпоха Кайо (848–851) - Эпоха Ниндзю (851–854) - Эпоха Сайко (854–857) - Эпоха Теннан (857–859) - Эпоха Йоган (859–877) - Эпоха Генкей (877–885) - Эпоха Нинна (885–889) - Эпоха Кампьё (889–898) - Эпоха Сьотай (898–901) - Эпоха Энги (901–923) - Эпоха Ентьо (923–931) - Эпоха Сьёхэй (931–938) - Эпоха Тенгьо (938–947) - Эпоха Тенрияку (947–957) - Эпоха Тентоку (957–961) - Эпоха Ова (961–964) - Эпоха Кохо (964–968) - Эпоха Анна (968–970) - Эпоха Тенроку (970–973) - Эпоха Теньен (973–976) - Эпоха Дзьоген (976–978) - Эпоха Тенген (978–983) - Эпоха Ейкан (983–985) - Эпоха Канна (985–987) - Эпоха Ейен (987–989) - Эпоха Ейсо (989–990) - Эпоха Сёряку (990–995) - Эпоха Тётоку (995–999) - Эпоха Тёхо (999–1004) - Эпоха Канко (1004–1012) - Эпоха Тёва (1012–1017) - Эпоха Каннин (1017–1021) - Эпоха Дзиан (1021–1024) - Эпоха Мандзю (1024–1028) - Эпоха Тёгэн (1028–1037) - Эпоха Тёряку (1037–1040) - Эпоха Тёкю (1040–1044) - Эпоха Катоку (1044–1046) - Эпоха Эйсо (1046–1053) - Эпоха Тэнги (1053–1058) - Эпоха Кохэй (1058–1065) - Эпоха Дзиряку (1065–1069) - Эпоха Энкю (1069–1074) - Эпоха Сёхо (1074–1077) - Эпоха Сёряку (1077–1081) - Эпоха Эйхо (1081–1084) - Эпоха Отоку (1084–1087) - Эпоха Кандзи (1087–1094) - Эпоха Кахо (1094–1096) - Эпоха Эйтё (1096–1097) - Эпоха Сётоку (1097–1099) - Эпоха Кова (1099–1104) - Эпоха Тёдзи (1104–1106) - Эпоха Касё (1106–1108) - Эпоха Тэннин (1108–1110) - Эпоха Тэнъэй (1110–1113) - Эпоха Эйкю (1113–1118) - Эпоха Гэнъэй (1118–1120) - Эпоха Хоан (1120–1124) - Эпоха Тэндзи (1124–1126) - Эпоха Дайдзи (1126–1131) - Эпоха Тэнсё (1131–1132) - Эпоха Тёсё (1132–1135) - Эпоха Хоэн (1135–1141) - Эпоха Эйдзи (1141–1142) - Эпоха Кодзи (1142–1144) - Эпоха Тэнё (1144–1145) - Эпоха Кюан (1145–1151) - Эпоха Нимпэй (1151–1154) - Эпоха Кюдзю (1154–1156) - Эпоха Хогэн (1156–1159) - Эпоха Хэйдзи (1159–1160) - Эпоха Эйряку (1160–1161) - Эпоха Охо (1161–1163) - Эпоха Тёкан (1163–1165) - Эпоха Эйман (1165–1166) - Эпоха Нинъан (1166–1169) - Эпоха Као (1169–1171) - Эпоха Сёан (1171–1175) - Эпоха Ангэн (1175–1177) - Эпоха Дзисё (1177–1181) - Эпоха Ёва (1181–1182) - Эпоха Дзюэй (1182–1184) - Эпоха Гэнрюку (1184–1185) - Эпоха Бундзи (1185–1190) - Эпоха Кэнкю (1190–1199) - Эпоха Сёдзи (1199–1201) - Эпоха Кэннин (1201–1204) - Эпоха Гэнкю (1204–1206) - Эпоха Кэнъэй (1206–1207) - Эпоха Сёгэн (1207–1211) - Эпоха Кэнряку (1211–1213) - Эпоха Кэмпо (1213–1219) - Эпоха Сёкю (1219–1222) - Эпоха Дзёо (1222–1224) - Эпоха Гэннин (1224–1225) - Эпоха Кароку (1225–1227) - Эпоха Антэй (1227–1229) - Эпоха Канки (1229–1232) - Эпоха Дзёэй (1232–1233) - Эпоха Тэмпуку (1233–1234) - Эпоха Бунряку (1234–1235) - Эпоха Катэй (1235–1238) - Эпоха Рякунин (1238–1239) - Эпоха Энъо (1239–1240) - Эпоха Ниндзи (1240–1243) - Эпоха Кангэн (1243–1247) - Эпоха Ходзи (1247–1249) - Эпоха Кэнтё (1249–1256) - Эпоха Когэн (1256–1257) - Эпоха Сёка (1257–1259) - Эпоха Сёгэн (1259–1260) - Эпоха Бунъо (1260–1261) - Эпоха Котё (1261–1264) - Эпоха Бунъэй (1264–1275) - Эпоха Кэндзи (1275–1278) - Эпоха Коан (1278–1288) - Эпоха Сёо (1288–1293) - Эпоха Эйнин (1293–1299) - Эпоха Сёан (1299–1302) - Эпоха Кэнгэн (1302–1303) - Эпоха Кагэн (1303–1306) - Эпоха Токудзи (1306–1308) - Эпоха Энкэй (1308–1311) - Эпоха Отё (1311–1312) - Эпоха Сёва (1312–1317) - Эпоха Бумпо (1317–1319) - Эпоха Гэно (1319–1321) - Эпоха Гэнкё (1321–1324) - Эпоха Сётю (1324–1326) - Эпоха Карэки (1326–1329) - Эпоха Гэнтоку (1329–1331) - Эпоха Гэнко (1331–1334) - Эпоха Кэмму (1334–1336) - Эпоха Энгэн (1336–1340) - Эпоха Кококу (1340–1346) - Эпоха Сёхэй (1346–1370) - Эпоха Кэнтоку (1370–1372) - Эпоха Бунтю (1372–1375) - Эпоха Иэндзю (1375–1379) - Эпоха Коряку (1379–1381) - Эпоха Кова (1381–1384) - Эпоха Гэнтю (1384–1392) - Эпоха Мэйтоку (1384–1387) - Эпоха Какэй (1387–1389) - Эпоха Коо (1389–1390) - Эпоха Мэйтоку (1390–1394) - Эпоха Оэй (1394–1428) - Эпоха Сётё (1428–1429) - Эпоха Эйкё (1429–1441) - Эпоха Какицу (1441–1444) - Эпоха Банъан (1444–1449) - Эпоха Хотоку (1449–1452) - Эпоха Кётоку (1452–1455) - Эпоха Косё (1455–1457) - Эпоха Тёроку (1457–1460) - Эпоха Кансё (1460–1466) - Эпоха Бунсё (1466–1467) - Эпоха Онин (1467–1469) - Эпоха Буммэй (1469–1487) - Эпоха Тёкё (1487–1489) - Эпоха Энтоку (1489–1492) - Эпоха Мэйо (1492–1501) - Эпоха Бунки (1501–1504) - Эпоха Эйсё (1504–1521) - Эпоха Тайэй (1521–1528) - Эпоха Кёроку (1528–1532) - Эпоха Тэммон (1532–1555) - Эпоха Кодзи (1555–1558) - Эпоха Эйроку (1558–1570) - Эпоха Гэнки (1570–1573) - Эпоха Тэнсё (1573–1592) - Эпоха Бунроку (1592–1596) - Эпоха Кэйтё (1596–1615) - Эпоха Гэнва (1615–1624) - Эпоха Канъэй (1624–1644) - Эпоха Сёхо (1644–1648) - Эпоха Кэйан (1648–1652) - Эпоха Сё (1652–1655) - Эпоха Мэйряку (1655–1658) - Эпоха Мандзи (1658–1661) - Эпоха Камбун (1661–1673) - Эпоха Эмпо (1673–1681) - Эпоха Тэнва (1681–1684) - Эпоха Дзёкё (1684–1688) - Эпоха Гэнроку (1688–1704) - Эпоха Хоэй (1704–1711) - Эпоха Сётоку (1711–1716) - Эпоха Кёхо (1716–1736) - Эпоха Гэмбун (1736–1741) - Эпоха Кампо (1741–1744) - Эпоха Энкё (1744–1748) - Эпоха Канъэн (1748–1751) - Эпоха Хоряку (1751–1764) - Эпоха Мэйва (1764–1772) - Эпоха Анъэй (1772–1781) - Эпоха Тэммэй (1781–1789) - Эпоха Кансэй (1789–1801) - Эпоха Кёва (1801–1804) - Эпоха Бунка (1804–1818) - Эпоха Бунсэй (1818–1830) - Эпоха Тэмпо (1830–1844) - Эпоха Кока (1844–1848) - Эпоха Каэй (1848–1854) - Эпоха Ансэй (1854–1860) - Эпоха Манъэн (1860–1861) - Эпоха Бункю (1861–1864) - Эпоха Гендзи (1864–1865) - Эпоха Кейо (1865–1868) Эпоха Мэйдзи Эпоха Тайсьо Сьова @@ -2608,7 +2509,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Minguo - до респ. Миньго @@ -3754,7 +3654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ о-в Пасхи - Койайке + Койайке Пунта-Аренас @@ -3877,9 +3777,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либревиль - - Великобритания, летнее время - Лондон @@ -3970,9 +3867,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Джаяпура - - Ирландия, стандартное время - Дублин @@ -4670,9 +4564,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Акри время - Акри стандартное время - Акри летнее время + Акри + Акри, стандартное время + Акри, летнее время @@ -4707,13 +4601,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Аляска, летнее время - - - Алма-Ата время - Алма-Ата стандартное время - Алма-Ата летнее время - - Амазонка @@ -4763,20 +4650,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Апиа, летнее время - - - Актау время - Актау, стандартное время - Актау летнее время - - - - - Актобе время - Актобе стандартное время - Актобе летнее время - - Саудовская Аравия @@ -4878,6 +4751,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бразилия, летнее время + + + Британское время + Великобритания, летнее время + + Бруней-Даруссалам @@ -5056,6 +4935,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Среднее время по Гринвичу + + + Гренландия + Гренландия, стандартное время + Гренландия, летнее время + + Восточная Гренландия @@ -5070,11 +4956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Западная Гренландия, летнее время - - - Гуам - - Персидский залив @@ -5087,7 +4968,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Гавайско-алеутское стандартное время + Гавайское стандартное время @@ -5148,6 +5029,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Иран, летнее время + + + Ирландское время + Ирландия, стандартное время + + Иркутск @@ -5215,11 +5102,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Киргизия - - - Шри-Ланка - - о-ва Лайн @@ -5232,13 +5114,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Лорд-Хау, летнее время - - - Макао - Макао, стандартное время - Макао, летнее время - - Магадан @@ -5354,11 +5229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Фернанду-ди-Норонья, летнее время - - - Северные Марианские о-ва - - Новосибирск @@ -5438,13 +5308,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Пхеньян - - - Кызылорда* - Кызылорда, стандартное время* - Кызылорда, летнее время* - - Реюньон @@ -5464,16 +5327,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Время в Самаре - Самарское стандартное время - Самарское летнее время + Самара + Самара, стандартное время + Самара, летнее время - Самоа Самоа, стандартное время - Самоа, летнее время @@ -5542,9 +5403,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Турецкое время - Турецкое стандартное время - Турецкое летнее время + Турция + Турция, стандартное время + Турция, летнее время @@ -5566,6 +5427,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Уругвай, летнее время + + + Урумчи + + Узбекистан @@ -5698,28 +5564,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 тыс'.' + 0 тыс'.' + 0 тыс'.' 0 тыс'.' 00 тыс'.' + 00 тыс'.' + 00 тыс'.' 00 тыс'.' 000 тыс'.' + 000 тыс'.' + 000 тыс'.' 000 тыс'.' 0 млн + 0 млн + 0 млн 0 млн 00 млн + 00 млн + 00 млн 00 млн 000 млн + 000 млн + 000 млн 000 млн 0 млрд + 0 млрд + 0 млрд 0 млрд 00 млрд + 00 млрд + 00 млрд 00 млрд 000 млрд + 000 млрд + 000 млрд 000 млрд 0 трлн + 0 трлн + 0 трлн 0 трлн 00 трлн + 00 трлн + 00 трлн 00 трлн 000 трлн + 000 трлн + 000 трлн 000 трлн @@ -5740,9 +5630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -7204,12 +7091,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ восточно-карибского доллара - карибский гульден + карибский гульден карибский гульден карибских гульдена карибских гульденов карибского гульдена - Cg + Cg СДР (специальные права заимствования) @@ -8275,13 +8162,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} моля {0} моля - - глюкозы - {0} глюкозы - {0} глюкозы - {0} глюкозы - {0} глюкозы - masculine литры на километр @@ -9267,7 +9147,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} килокалории {0} килокалории {0} килокалории - {0} килокалории + {0} килокалории feminine @@ -11789,11 +11669,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} метрической чашки - метрические жидкие унции - {0} метрическая жидкая унция - {0} метрические жидкие унции - {0} метрических жидких унций - {0} метрической жидкой унции + метрические жидкие унции + {0} метрическая жидкая унция + {0} метрические жидкие унции + {0} метрических жидких унций + {0} метрической жидкой унции акрофуты @@ -12347,25 +12227,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} международной калории - беккерели - {0} беккерель - {0} беккереля - {0} беккерелей - {0} беккереля + беккерели + {0} беккерель + {0} беккереля + {0} беккерелей + {0} беккереля - зиверты - {0} зиверт - {0} зиверта - {0} зиверт - {0} зиверта + зиверты + {0} зиверт + {0} зиверта + {0} зиверт + {0} зиверта - греи - {0} грей - {0} грея - {0} греев - {0} грея + греи + {0} грей + {0} грея + {0} греев + {0} грея килограмм-силы @@ -12390,10 +12270,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ скорости света - {0} скорость света - {0} скорости света - {0} скоростей света - {0} скорости света + {0} скорость света + {0} скорости света + {0} скоростей света + {0} скорости света feminine @@ -13678,7 +13558,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} м. чаш. - м. жидк. унц. + м. жидк. унц. {0} м. жидк. унц. {0} м. жидк. унц. {0} м. жидк. унц. @@ -13869,25 +13749,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} калм - Бк - {0} Бк - {0} Бк - {0} Бк - {0} Бк + Бк + {0} Бк + {0} Бк + {0} Бк + {0} Бк - Зв - {0} Зв - {0} Зв - {0} Зв - {0} Зв + Зв + {0} Зв + {0} Зв + {0} Зв + {0} Зв - Гр - {0} Гр - {0} Гр - {0} Гр - {0} Гр + Гр + {0} Гр + {0} Гр + {0} Гр + {0} Гр кгс @@ -13911,11 +13791,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Вб - ск. света - {0} ск. света - {0} ск. света - {0} ск. света - {0} ск. света + ск. света + {0} ск. света + {0} ск. света + {0} ск. света + {0} ск. света ноч. @@ -13934,26 +13814,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ч. - {0} ч. - {0} ч. - {0} ч. - {0} ч. - {0}% {0}% {0}% {0}% - - глюкозы - {0} глюкозы - {0} глюкозы - {0} глюкозы - {0} глюкозы - ми/имп. гал {0} ми/имп. гал @@ -14032,123 +13898,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} стн {0} стн - - рт. ст. - {0} рт. ст. - {0} рт. ст. - {0} рт. ст. - {0} рт. ст. - {0}°F {0} °F {0}°F {0}°F - - м. жидк. унц. - {0} м. жидк. унц. - {0} м. жидк. унц. - {0} м. жидк. унц. - {0} м. жидк. унц. - - - ср - {0} ср - {0} ср - {0} ср - {0} ср - - - кат - {0} кат - {0} кат - {0} кат - {0} кат - - - Кл - {0} Кл - {0} Кл - {0} Кл - {0} Кл - - - Ф - {0} Ф - {0} Ф - {0} Ф - {0} Ф - - - Гн - {0} Гн - {0} Гн - {0} Гн - {0} Гн - - - См - {0} См - {0} См - {0} См - {0} См - - - калм - {0} калм - {0} калм - {0} калм - {0} калм - - - Бк - {0} Бк - {0} Бк - {0} Бк - {0} Бк - - - Зв - {0} Зв - {0} Зв - {0} Зв - {0} Зв - - - Гр - {0} Гр - {0} Гр - {0} Гр - {0} Гр - - - кгс - {0} кгс - {0} кгс - {0} кгс - {0} кгс - - - Тл - {0} Тл - {0} Тл - {0} Тл - {0} Тл - - - Вб - {0} Вб - {0} Вб - {0} Вб - {0} Вб - - c - {0} c - {0} c - {0} c - {0} c + c + {0} c + {0} c + {0} c + {0} c напр. diff --git a/make/data/cldr/common/main/ru_UA.xml b/make/data/cldr/common/main/ru_UA.xml index a0d7857e0f6b..258a293cc669 100644 --- a/make/data/cldr/common/main/ru_UA.xml +++ b/make/data/cldr/common/main/ru_UA.xml @@ -78,6 +78,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ccc, d.MM.y + {0} – {1} LLL y – LLL y diff --git a/make/data/cldr/common/main/rw.xml b/make/data/cldr/common/main/rw.xml index df8883a29e27..ca90aecd6077 100644 --- a/make/data/cldr/common/main/rw.xml +++ b/make/data/cldr/common/main/rw.xml @@ -141,24 +141,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic - EEEE, G y MMMM dd - GyMMMMEEEEdd + EEEE, d MMMM y G - G y MMMM d + d MMMM y G - G y MMM d + d MMM y G - GGGGG yy/MM/dd - GGGGGyyMMdd + dd/MM/y GGGGG @@ -235,104 +233,126 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + E, d E h:mm a E h:mm:ss a y G - MM-y G - dd-MM-y G - E, dd-MM-y G + MM/y G + dd/MM/y G + E, dd/MM/y G MMM y G d MMM y G E, d MMM y G h a - h:mm a - h:mm:ss a - h:mm:ss a v h:mm a v - dd-MM - E, dd-MM + dd/MM + E, dd/MM d MMM E, d MMM d MMMM - MM-y - dd-MM-y - E, dd-MM-y + MM/y + E, dd/MM/y MMM y - d MMMM y E, d MMM y MMMM y + y MMMM d + EEE, d MMMM y QQQ y QQQQ y + + {0} – {1} + {0} – {1} + {0} – {1} + - y G–y G - y–y G + y G – y G + y – y G - MM-y G– MM-y G - MM-y– MM-y G - MM-y– MM-y G + MM/y G – MM/y G + MM/y – MM/y G + MM/y – MM/y G - dd-MM-y– dd-MM-y G - dd-MM-y G – dd-MM-y G - dd-MM-y – dd-MM-y G - dd-MM-y – dd-MM-y G + dd/MM/y – dd/MM/y G + dd/MM/y G – dd/MM/y G + dd/MM/y – dd/MM/y G + dd/MM/y – dd/MM/y G - E, dd-MM-y – E, dd-MM-y G - E, dd-MM-y G–E, dd-MM-y G - E, dd-MM-y – E, dd-MM-y G - E, dd-MM-y – E, dd-MM-y G + E, dd/MM/y – E, dd/MM/y G + E, dd/MM/y G – E, dd/MM/y G + E, dd/MM/y – E, dd/MM/y G + E, dd/MM/y – E, dd/MM/y G MMM y G – MMM y G - MMM–MMM y G + MMM – MMM y G MMM y – MMM y G - d–d MMM y G - d-MMM-y G–d-MMM-y G - d MMM–d MMM y G - d-MMM-y–d-MMM-y G + d – d MMM y G + d/MMM/y G – d/MMM/y G + d MMM – d MMM y G + d/MMM/y – d/MMM/y G - E, d MMM–d MMM y G - E, d MMM y G–E, d MMM y G - E, d MMM y–E, d MMM G - E, d MMM y –E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y G – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G h a – h a - h–h a + h – h a + + + HH – HH h:mm a – h:mm a - h:mm–h:mm a - h:mm–h:mm a + h:mm – h:mm a + h:mm – h:mm a + + + HH:mm – HH:mm + HH:mm – HH:mm h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v + h:mm – h:mm a v + h:mm – h:mm a v + + + HH:mm – HH:mm v + HH:mm – HH:mm v - h a – h a v - h–h a v + h – h a v + + + HH – HH v + + + M – M - dd-MM – dd-MM - dd-MM – dd-MM + dd/MM – dd/MM + dd/MM – dd/MM - E, dd-MM – E, dd-MM - E, dd-MM – E, dd-MM + E, dd/MM – E, dd/MM + E, dd/MM – E, dd/MM - d–d MMM + d – d MMM d MMM – d MMM @@ -340,26 +360,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d MMM – E, d MMM - MM-y –MM-y - MM-y – MM-y + M/y – M/y + M/y – M/y - dd-MM-y – dd-MM-y  - dd-MM-y – dd-MM-y - dd-MM-y – dd-MM-y + d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y - E, dd–dd-MM–y – E, dd-dd-MM–y  - E, dd-MM-y –E, dd-MM-y - E, dd-MM-y –E, dd-MM-y + E, d/M/y – E, d/M/y + E, d/M/y – E, d/M/y + E, d/M/y – E, d/M/y - MMM–MMM y + MMM – MMM y MMM y – MMM y - d–d MMM y - d MMM – d MMM y + d – d MMM y + d – d MMM y d MMM y – d MMM y @@ -403,9 +423,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + Coordinated Universal Time + + - Greenwich Mean Time + Greenwich Mean Time Plus Two diff --git a/make/data/cldr/common/main/sa.xml b/make/data/cldr/common/main/sa.xml index e94e8701934b..4373727f1ff9 100644 --- a/make/data/cldr/common/main/sa.xml +++ b/make/data/cldr/common/main/sa.xml @@ -131,6 +131,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + @@ -373,6 +387,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1}, {0} @@ -423,11 +441,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + d MMMM y E QQQ y QQQQ y - {0} – {1} + + {0} – {1} + {0}–{1} + {0}–{1} + @@ -495,7 +519,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जी.एम.टी. {0} - जी.एम.टी. {0} समय: {0} अयामसमयः {0} प्रमाणसमयः @@ -503,6 +526,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic समन्वितः वैश्विक समय: + + यूटीसी + अज्ञात नगरी diff --git a/make/data/cldr/common/main/sah.xml b/make/data/cldr/common/main/sah.xml index 8da892d918ce..e5dde510d9fd 100644 --- a/make/data/cldr/common/main/sah.xml +++ b/make/data/cldr/common/main/sah.xml @@ -120,6 +120,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Дьэбириэй халандаара Ислаам халандаара Дьоппуон халандаара + 12 чаастаах тиһик + 24 чаастаах тиһик 12 чаастаах тиһик (0–11) 12 чаастаах тиһик (0–12) 24 чаастаах тиһик (0–23) @@ -412,6 +414,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y 'сыл' w 'нэдиэлэтэ' + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} h a – h a diff --git a/make/data/cldr/common/main/sat.xml b/make/data/cldr/common/main/sat.xml index ce9a4759056b..f500af8fb6ee 100644 --- a/make/data/cldr/common/main/sat.xml +++ b/make/data/cldr/common/main/sat.xml @@ -968,7 +968,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᱵᱚᱣᱫᱷ ᱢᱟᱦᱮᱛᱟ ᱪᱟᱭᱱᱤᱡᱽ ᱢᱟᱦᱮᱛᱟ + ᱪᱟᱭᱱᱤᱡᱽ ᱠᱚᱯᱴᱤᱠ ᱢᱟᱦᱮᱛᱟ + ᱠᱚᱯᱴᱤᱠ ᱰᱟᱱᱜᱤ ᱢᱟᱦᱮᱛᱟ ᱤᱛᱷᱤᱭᱚᱯᱤᱠ ᱢᱟᱦᱮᱛᱟ ᱤᱛᱷᱤᱭᱚᱯᱤᱠ ᱟᱢᱮᱴᱮ ᱟᱞᱮᱢ ᱢᱟᱦᱮᱛᱟ @@ -1001,6 +1003,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᱫᱤᱥᱤ ᱛᱷᱟᱨ ᱟᱸᱫᱮ ᱨᱮᱰᱤᱠᱟᱼᱥᱴᱨᱚᱠ ᱛᱷᱟᱨ ᱟᱸᱫᱮ ᱡᱷᱩᱣᱤᱱ ᱛᱷᱟᱨ ᱟᱸᱫᱮ + 12 ᱴᱟᱰᱟᱝ ᱰᱟᱦᱮᱨᱟ + 24 ᱴᱟᱰᱟᱝ ᱰᱟᱦᱮᱨᱟ 12 ᱴᱟᱰᱟᱝ ᱰᱟᱦᱮᱨᱟ (0–11) 12 ᱴᱟᱰᱟᱝ ᱰᱟᱦᱮᱨᱟ (1–12) 24 ᱴᱟᱰᱟᱝ ᱰᱟᱦᱮᱨᱟ (0–23) @@ -1086,6 +1090,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᱨᱟᱝ ᱪᱤᱛᱤ ᱮᱞᱠᱷᱟ ᱣᱟᱱᱪᱩ ᱮᱞᱠᱷᱟ + + ᱵᱚᱸᱫ + ᱪᱟᱹᱞᱩ + ᱢᱮᱴᱨᱤᱠ ᱭᱩᱠᱮ @@ -1280,6 +1288,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + {1} {0} @@ -1300,6 +1312,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} {0} + + y MMMM d + y MMMM d, EEE + @@ -1420,7 +1436,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ᱡᱤᱮᱢᱴᱤ{0} - ᱡᱤᱮᱢᱴᱤ {0} ᱚᱠᱛᱚ {0} ᱫᱤᱱᱵᱮᱲᱟ ᱚᱠᱛᱚ {0} ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ @@ -1856,14 +1871,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ + ᱦᱟᱣᱟᱭᱤ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ - ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱚᱠᱛᱚ - ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ - ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ + ᱦᱟᱣᱟᱭᱤ ᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱚᱠᱛᱚ + ᱦᱟᱣᱟᱭᱤ ᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ + ᱦᱟᱣᱟᱭᱤ ᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ diff --git a/make/data/cldr/common/main/sat_Deva.xml b/make/data/cldr/common/main/sat_Deva.xml deleted file mode 100644 index 765b5576c7aa..000000000000 --- a/make/data/cldr/common/main/sat_Deva.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - [़ ं अ आ ई उ ए ओ क ग च ज ञ ट ड ण त द न प ब म य र ल व स ह ा ी ु े ो] - [\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९] - [\- ‑ , ; \: ! ? . ‘’ “” ( ) \[ \] \{ \} ॰] - - - - - - - - EEEE, d MMMM y - - - - - d MMMM y - - - - - d MMM y - - - - - d/M/yy - yyMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - deva - - diff --git a/make/data/cldr/common/main/sat_Deva_IN.xml b/make/data/cldr/common/main/sat_Deva_IN.xml deleted file mode 100644 index 8541b78f68a0..000000000000 --- a/make/data/cldr/common/main/sat_Deva_IN.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - + @@ -501,6 +503,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -515,6 +518,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -686,7 +690,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၾီႇၵျီႇ မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ မူႇၵုၼ် ၾွၵ်ႉလႅၼ်ႇ (ဢၢႆးသလတ်ႉသ် မႄႇလ်ဝီးၼတ်ႉသ်) - ၼႃႈလိၼ် မၢႆႇၶရူဝ်ႇၼေးသျၼ်း + မၢႆႇၶရူဝ်ႇၼေးသျႃး မူႇၵုၼ် ၾႄးရူဝ်း ၾရၢင်ႇသဵတ်ႈ ၵႄးပုၼ်ႇ @@ -939,13 +943,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic ပၵ်းယဵမ်ႈဝၼ်း ပိူင်ၽၢင်ငိုၼ်းတွင်း + ၶၢမ်ႈပႅတ်ႈၵၢၼ်ၶပ်ႉတူဝ်မၢႆ + ပိၼ်ႈၽူၼ်ၵၢၼ်ၶပ်ႉတူၼ်းသဵင် + ၵၢၼ်ၶပ်ႉ တူဝ်လိၵ်ႈသုင်/တူဝ်လိၵ်ႈတႅမ်ႇ + ၵၢၼ်ၶပ်ႉၸွမ်း တူဝ်လိၵ်ႈသုင်တႅမ်ႇ ၸႅၵ်ႇၶပ်ႉ + ၵၢၼ်ၶပ်ႉၸွမ်းပိူင် + ၵၢၼ်ၶပ်ႉတူဝ်ၼပ်ႉ + ၶပ်ႉၶိုၼ်း သၶရိပ်ႉ/လွၵ်း + ႁႅင်းၵၢၼ်ၶပ်ႉ ငိုၼ်းတွင်း လွင်ႈၼႄဢီႇမူဝ်းၵျိ + ဝၼ်းႁူဝ်တေးဝူင်ႈ + ၶူၼ်းလေႃး တူင်ႇဝူင်းယၢမ်းမူင်း (12 လႄႈ 24) + ပႅၼ်ႈၽိမ်း လွင်ႈၶဵင်ႈၶႅင် ၼႂ်းၵၢၼ်တတ်းထႅဝ်လိၵ်ႈ လွင်ႈတတ်းထႅဝ်ၼႂ်းၶေႃႈၵႂၢမ်း ပိူင်ၵၢၼ်တႅၵ်ႈ + ယူႇၼိတ်ႉၵၢၼ်တႅၵ်ႈ တူဝ်ၼပ်ႉ တတ်းတူၼ်ႈထႅဝ်လိၵ်ႈဝၢႆးၵႂၢမ်းယေႃႈ @@ -973,11 +989,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ပပ်ႉယဵမ်ႈဝၼ်းႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ၵူၼ်းမိူင်း) ႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ၵူၼ်းမိူင်း) ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (သေႃႇတီႇဢႃႇရေးပီးယႃး၊ လွင်ႈႁၼ်) + ႁိၸရိ၊ လွင်ႈႁၼ်လိူၼ် သေႃႇတီႇဢႃႇရေးပီးယႃး ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ပၢႆးလႅင်လၢဝ်) ႁိၸရိ (လွၵ်းသဵၼ်ႈ၊ ပၢၼ်ပၢႆးလႅင်လၢဝ်) ပၵ်းယဵမ်ႈဝၼ်းႁိၸရိ (ဢုမ်ဢႄလ်ၵူးရႃႇ) ႁိၸရိ (ဢုမ်ဢႄလ်ၵူးရႃႇ) ပၵ်းယဵမ်ႈဝၼ်း ၵရႅၵ်ႉၵူဝ်ႇရီႇယၼ်ႇ (ပီဢွၼ်တၢင်းသုတ်း) + ၵရီႇၵေႃးရီးယၼ်ႇ ပၵ်းယဵမ်ႈဝၼ်းၵျႃႇပၢၼ်ႇ ၸၢဝ်းၵျႃႇပၢၼ်ႇ ပၵ်းယဵမ်ႈဝၼ်းပႃႇသျႃး @@ -988,6 +1006,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၵၢၼ်ၼပ်ႉသွၼ်ႇ လၵ်းၸဵင် ပိူင်ၽၢင်ငိုၼ်းတွင်း လၵ်းၸဵင် + ၶပ်ႉတူဝ်မၢႆ + ၶပ်ႉတူဝ်မၢႆ ၸိူဝ်းၶၢမ်ႈပႅတ်ႈ + ၶပ်ႉတူၼ်းသဵင် ၸွမ်းပိူင်ၽဵၼ်ႈ + ၶပ်ႉတူၼ်းသဵင် ၸိူဝ်းပိၼ်ႈၽူၼ်ဝႆႉ + ၶပ််ႉတူဝ်လိၵ်ႈတႅမ်ႈ ဢွၼ်တၢင်းသုတ်း + တူဝ်လိၵ်ႈတႅမ်ႇ + ၶပ်ႉၸွမ်းၶပ်ႉမၢႆတူဝ်ပိူင်ၽဵၼ်ႈ + တူဝ်လိၵ်ႈတႅမ်ႇ + ၶပ်ႉတူဝ်လိၵ်ႈသုင် ဢွၼ်တၢင်းသုတ်း + တူဝ်လိၵ်ႈသုင် + ၶပ်ႉၸွမ်း ဢမ်ႇတူၺ်းတူဝ်လိၵ်ႈသုင်တႅမ် + ၶပ်ႉၸွမ်း တူဝ်လိၵ်ႈသုင်တႅမ်ႇ ၸႅၵ်ႇၶပ်ႉ ဢၼ်ပူၼ်ႉမႃး တႃႇႁႂ်ႈမၼ်း ၵိုင်ႇငၢမ်ႇၵၼ် လွင်ႈငမ်ႇမႅၼ်ႈ ၸႅၵ်ႇၶပ်ႉ ပပ်ႉပိုတ်ႇတႅတ်ႈ @@ -995,15 +1025,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic လၵ်းၸဵင် ၸႅၵ်ႇၶပ်ႉ ယူႇၼီႇၶူတ်ႉ လၵ်းၸဵင် ယူႇၼီႇၶူတ်ႉ ၸႅၵ်ႇၶပ်ႉ ဢီႇမူဝ်းၵျိ + ဢီႇမူဝ်းၵျိ ပိူင်ၶပ်ႉၸႅၼ်ႇမိူင်းယူးရူပ်ႉ + လၵ်းပိူင်ယူးရူပ်ႉ ၸႅၵ်ႇၶပ်ႉပပ်ႉၽူၼ်း ပပ်ႉၽူၼ်း + ၸႅၵ်ႇၶပ်ႉပၢႆးသဵင် ပၢႆးသဵင် ၸႅၵ်ႇၶပ်ႉ ပိၼ်းယိၼ်း ပိၼ်းယိၼ်း ၵၢၼ်ၶူၼ်ႉႁႃ ဢၼ်ၸႂ်ႉတိုဝ်း ၵူႈလွင်ႈလွင်ႈ ၶူၼ်ႉႁႃ ၶူၼ်ႉႁႃၸွမ်း တူဝ်မႄႈလိၵ်ႈတႄႇ ႁင်းၵူးလ် + တူဝ်မႄႈလိၵ်ႈငဝ်ႈ ၵၢဝ်းလီ ၸႅၵ်ႇၶပ်ႉလၵ်းၸဵင် လၵ်းၸဵင် ၸႅၵ်ႇၶပ်ႉ ႁွႆးမိုဝ်းၸၼ် @@ -1014,9 +1048,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic ႁွႆးမိုဝ်း-ငဝ်ႈပိုၼ်ႉ ၸႅၵ်ႇၶပ်ႉ ၸူးယိၼ်း ၸူးယိၼ်း + ဢမ်ႇၸွမ်းပိူင်ၽဵၼ်ႈသေၶပ်ႉ + ၶပ်ႉၸွမ်း ပိူင်ၽဵၼ်ႈယူႇၼီႇၶူတ်ႉ + ၶပ်ႉတူဝ်ၼပ်ႉ ဢၼ်လႂ်ဢၼ်ၼၼ်ႉ + ၶပ်ႉတူဝ်ၼပ်ႉ ၸွမ်းၼင်ႇတူဝ်ၼပ်ႉ + ငိုၼ်းတွင်း + ငိုၼ်းတွင်း + တူဝ်ၼပ်ႉ + တူဝ်ၼပ်ႉ + မၢႆတတ်း + မၢႆတတ်း + လွၵ်းပဝ်ႇၶၢဝ် + လွၵ်းပဝ်ႇၶၢဝ် + တူဝ်မၢႆ + တူဝ်မၢႆ + ၶပ်ႉမူတ်း + တင်းမူတ်း + ၶပ်ႉတူဝ်မႄႈလိၵ်ႈငဝ်ႈၵူၺ်း + တူဝ်မႄႈလိၵ်ႈငဝ်ႈၵူၺ်း + ၶပ်ႉတူၼ်းသဵင်/သုင်တႅမ်ႇ/တၢင်းၵႂၢင်ႈ/ၵႃႉၼႃႉ + တူဝ်ငဝ်ႈ၊ တူၼ်းသဵင်၊ သုင်တႅမ်ႇ၊ ၸၢဝ်း၊ ၵႃႉၼႃႉ + ၶပ်ႉတူၼ်းသဵင် + တူဝ်ငဝ်ႈ၊ တူၼ်းသဵင် + ၶပ်ႉတူၼ်းသဵင်/သုင်တႅမ်ႇ/တၢင်းၵႂၢင်ႈ + တူဝ်ငဝ်ႈ၊ တူၼ်းသဵင်၊ သုင်တႅမ်ႇ၊ ၸၢဝ်း + ဢမ်ႇမီးလွင်ႈလႅၵ်ႈလၢႆႈ ငဝ်ႈပိုင်း ဢီႇမူဝ်းၵျိ လိၵ်ႈ + ႁၢႆးပရိတ်ႉ + ပိူင်ယၢမ်းမူင်း 12 + 12 + ပိူင်ယၢမ်းမူင်း 24 + 24 ပိူင်ယၢမ်းမူင်း 12 (0–11) 12 (0–11) ပိူင်ယၢမ်းမူင်း 12 (1–12) @@ -1025,6 +1089,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) ပိူင်ယၢမ်းမူင်း 24 (1–24) 24 (1–24) + ပႅၼ်ႈၽိမ်း 101 ၼဵၼ် + ပႅၼ်ႈၽိမ်း 102 ၼဵၼ် လၢႆးတတ်းထႅဝ်လိၵ်ႈ ဝႆႉလူမ် ဝႆႉလူမ် လၢႆးတတ်းထႅဝ်လိၵ်ႈ ပၵတိ @@ -1076,6 +1142,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic တူဝ်ၼပ်ႉ ၵျႃႇဝႃး တူဝ်ၼပ်ႉ ၵျႃႇပၢၼ်ႇ တူဝ်ၼပ်ႉ ၵၢၼ်ငိုၼ်းတွင်း ၵျႃႇပၢၼ်ႇ + ၵၢၼ်ငိုၼ်းတွင်း ၵျႃႇပၢၼ်ႇ တူဝ်ၼပ်ႉ ၵယႃးလီ တူဝ်ၼပ်ႉ ၶႃးဝီ တူဝ်ၼပ်ႉ ၶမဵၼ် @@ -1099,9 +1166,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic တူဝ်ၼပ်ႉ မီး​တီးမယဵၵ်ႇၶ် တူဝ်ၼပ်ႉမၢၼ်ႈ တူဝ်ၼပ်ႉ ယၢင်းပူဝ်း မျၢၼ်ႇမႃႇ ပွတ်းဢွၵ်ႇ + ယၢင်းပူဝ်း မျၢၼ်ႇမႃႇ ပွတ်းဢွၵ်ႇ တူဝ်ၼပ်ႉ ပဢူဝ်း + ပဢူဝ်း တူဝ်ၼပ်ႉတႆး + တႆး တူဝ်ၼပ်ႉ တႆးလႅင် + တႆးလႅင် တူဝ်ၼပ်ႉ ၼၢၵ်ႉမုၼ်ႇတရီႇ တူဝ်ၼပ်ႉ ဢိၼ်းၶူဝ်း တူဝ်ၼပ်ႉ ဢူဝ်းၶျိၶီ @@ -1135,6 +1206,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ဢိုတ်း ပိုတ်ႇ + + ဢိုတ်း + ပိုတ်ႇ + မႅတ်ႉထရိတ်ႉ ယူႇၶေႇ @@ -1163,9 +1238,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ပ.သ. - - ပ.သ. - @@ -1194,17 +1266,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} {0} - - {1} ၶၢဝ်းယၢမ်း {0} - {1} {0} - - {1} ၶၢဝ်းယၢမ်း {0} - @@ -1217,16 +1283,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - d - E GGGGG y-MM-dd - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E GGGGG y-MM GGGGG y-MM-dd - GGGGG y-MM-dd - E - G y MMM d - E @@ -1240,26 +1299,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic GGGGG y-MM-dd – y-MM-dd GGGGG y-MM-dd – y-MM-dd - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - GGGGG y-MM – y-MM GGGGG y-MM – y-MM @@ -1269,66 +1308,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic GGGGG y-MM-dd – y-MM-dd GGGGG y-MM-dd – y-MM-dd - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - လိူၼ်ထူၼ်ႈၼိုင်ႈ လိူၼ်ထူၼ်ႈသွင် @@ -1423,21 +1408,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - ထွၵ်ႉ - ပႃႇပႃႇ - ႁတ်ႉထေႃး - ၵိၶ် - တူဝ်ႇပႃႇ - ဢႅမ်းသႄးရ် - ပရမ်ႇႁတ်ႉ - ပႃႇရႃႇမူဝ်ႇတႃႇ - ပႃႇသၢၼ်ႇ - ပဝ်းၼႃး - ဢႅပ်ႉပႅပ်ႉ - မႅတ်ႉသရႃႇ - ၼႃႇသီႇ - ထွၵ်ႉ ပႃႇပႃႇ @@ -1454,39 +1424,104 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၼႃႇသီႇ - - - ထွၵ်ႉ - ပႃႇပႃႇ - ႁတ်ႉထေႃး - ၵိၶ် - တူဝ်ႇပႃႇ - ဢႅမ်းသႄးရ် - ပရမ်ႇႁတ်ႉ - ပႃႇရႃႇမူဝ်ႇတႃႇ - ပႃႇသၢၼ်ႇ - ပဝ်းၼႃး - ဢႅပ်ႉပႅပ်ႉ - မႅတ်ႉသရႃႇ - ၼႃႇသီႇ - + + + + + G y MMMM d - EEEE + + + + + G y MMMM d + + + + + G y MMM d + + + + + GGGGG y-MM-dd + + + + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + + + {1} {0} + + + + GGGGG y-MM-dd + GGGGG y-MM + GGGGG y-MM-dd + + + + GGGGG y-MM – GGGGG y-MM + GGGGG y-MM – y-MM + GGGGG y-MM – y-MM + + + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – GGGGG y-MM-dd + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + + + HH–HHမ v + + + GGGGG y-MM – y-MM + GGGGG y-MM – y-MM + + + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + GGGGG y-MM-dd – y-MM-dd + + + + + + + - ထွၵ်ႉ - ပႃႇပႃႇ - ႁတ်ႉထေႃး - ၵိၶ် - တူဝ်ႇပႃႇ - ဢႅမ်းသႄးရ် - ပရမ်ႇႁတ်ႉ - ပႃႇရႃႇမူဝ်ႇတႃႇ - ပႃႇသၢၼ်ႇ - ပဝ်းၼႃး - ဢႅပ်ႉပႅပ်ႉ - မႅတ်ႉသရႃႇ - ၼႃႇသီႇ + မႅတ်ႉသ်ရႅမ်ႇ + တႅၵ်ႉၵမ်ႇ + ႁႄႇတႃႇ + တႃးသတ်ႉသ် + တႄးလ် + ယေႇၵတိတ်ႉ + မႅၵ်ႇၵႃႇပိတ်ႉ + မိယႃႇၸီႇယႃႇ + ၵႅၼ်ႇပၢတ်ႉ + သိၼ်း + ႁႅမ်းလႄး + ၼႁၢတ်ႉသ် + ပႃႇၵူႇမႅၼ်ႇ + + @@ -1505,7 +1540,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - GGGGG y-MM-dd + G y-MM-dd @@ -1538,28 +1573,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic d - E - GGGGG y-MM-dd G y-MM-dd - E G y MMM d - E MM-dd - E MMM d - E - GGGGG y-MM - GGGGG y-MM-dd GGGGG y-MM-dd - E G y MMM d - E - - GGGGG y-MM – GGGGG y-MM - GGGGG y-MM – y-MM - GGGGG y-MM – y-MM - - - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd – GGGGG y-MM-dd - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd - E – y-MM-dd - E GGGGG y-MM-dd - E – GGGGG y-MM-dd - E @@ -1572,12 +1593,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic G y MMM d - E – MMM d - E G y MMM d - E – y MMM d - E - - HH–HH - - - HH–HHမ v - MM-dd - E – MM-dd - E MM-dd - E – MM-dd - E @@ -1586,15 +1601,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d - E – MMM d - E MMM d - E – MMM d - E - - GGGGG y-MM – y-MM - GGGGG y-MM – y-MM - - - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd – y-MM-dd - GGGGG y-MM-dd - E – y-MM-dd - E GGGGG y-MM-dd - E – y-MM-dd - E @@ -1608,2290 +1614,205 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - လိူၼ်ထူၼ်ႈၼိုင်ႈ - လိူၼ်ထူၼ်ႈသွင် - လိူၼ်ထူၼ်ႈသၢမ် - လိူၼ်ထူၼ်ႈသီႇ - လိူၼ်ထူၼ်ႈႁႃႈ - လိူၼ်ထူၼ်ႈႁူၵ်း - လိူၼ်ထူၼ်ႈၸဵတ်း - လိူၼ်ထူၼ်ႈပႅတ်ႇ - လိူၼ်ထူၼ်ႈၵဝ်ႈ - လိူၼ်ထူၼ်ႈသိပ်း - လိူၼ်ထူၼ်ႈသိပ်းဢဵတ်း - လိူၼ်ထူၼ်ႈသိပ်းသွင် - - - - - - - r(U) MMMM d - EEEE - - - - - r(U) MMMM d - - - - - r MMM d - - - - - r-MM-dd - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - r MMM d - E - r(U) MMMM d - E - MM-dd - E - MMM d - E - r-MM-dd - E - r MMM d - E - r(U) MMMM d - E - - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - y-MM-dd - E – y-MM-dd - E - y-MM-dd - E – y-MM-dd - E - y-MM-dd - E – y-MM-dd - E - - - U MMM d၊ E – MMM d - E - U MMM d၊ E – MMM d - E - U MMM d၊ E – U MMM d - E - - - - - - - - - မႅတ်ႉသ်ရႅမ်ႇ - တႅၵ်ႉၵမ်ႇ - ႁႄႇတႃႇ - တႃးသတ်ႉသ် - တႄးလ် - ယေႇၵတိတ်ႉ - မႅၵ်ႇၵႃႇပိတ်ႉ - မိယႃႇၸီႇယႃႇ - ၵႅၼ်ႇပၢတ်ႉ - သိၼ်း - ႁႅမ်းလႄး - ၼႁၢတ်ႉသ် - ပႃႇၵူႇမႅၼ်ႇ - - - မႅတ်ႉသ်ရႅမ်ႇ - တႅၵ်ႉၵမ်ႇ - ႁႄႇတႃႇ - တႃးသတ်ႉသ် - တႄးလ် - ယေႇၵတိတ်ႉ - မႅၵ်ႇၵႃႇပိတ်ႉ - မိယႃႇၸီႇယႃႇ - ၵႅၼ်ႇပၢတ်ႉ - သိၼ်း - ႁႅမ်းလႄး - ၼႁၢတ်ႉသ် - ပႃႇၵူႇမႅၼ်ႇ - - - - - မႅတ်ႉသ်ရႅမ်ႇ - တႅၵ်ႉၵမ်ႇ - ႁႄႇတႃႇ - တႃးသတ်ႉသ် - တႄးလ် - ယေႇၵတိတ်ႉ - မႅၵ်ႇၵႃႇပိတ်ႉ - မိယႃႇၸီႇယႃႇ - ၵႅၼ်ႇပၢတ်ႉ - သိၼ်း - ႁႅမ်းလႄး - ၼႁၢတ်ႉသ် - ပႃႇၵူႇမႅၼ်ႇ - - - မႅတ်ႉသ်ရႅမ်ႇ - တႅၵ်ႉၵမ်ႇ - ႁႄႇတႃႇ - တႃးသတ်ႉသ် - တႄးလ် - ယေႇၵတိတ်ႉ - မႅၵ်ႇၵႃႇပိတ်ႉ - မိယႃႇၸီႇယႃႇ - ၵႅၼ်ႇပၢတ်ႉ - သိၼ်း - ႁႅမ်းလႄး - ၼႁၢတ်ႉသ် - ပႃႇၵူႇမႅၼ်ႇ - - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - - ၸၼ်ႇ - ၾႅပ်ႇ - မၢတ်ႉၶ်ျ - ဢေႇ - မေႇ - ၸုၼ်ႇ - ၸူႇ - ဢေႃး - သႅပ်ႇ - ဢွၵ်ႇ - ၼူဝ်ႇ - တီႇ - - - ၸ. - ၾ. - မ. - ဢ. - မ. - ၸ. - ၸ. - ဢ. - သ. - ဢ. - ၼ. - တ. - - - ၸၼ်ႇဝႃႇရီႇ - ၾႅပ်ႇဝႃႇရီႇ - မၢတ်ႉၶ်ျ - ဢေႇပရႄႇ - မေႇ - ၸုၼ်ႇ - ၸူႇလၢႆႇ - ဢေႃးၵၢတ်ႉ - သႅပ်ႇထႅမ်ႇပႃႇ - ဢွၵ်ႇထူဝ်ႇပႃႇ - ၼူဝ်ႇဝႅမ်ႇပႃႇ - တီႇသႅမ်ႇပႃႇ - - - - - ၸၼ်ႇ - ၾႅပ်ႇ - မၢတ်ႉၶ်ျ - ဢေႇ - မေႇ - ၸုၼ်ႇ - ၸူႇ - ဢေႃး - သႅပ်ႇ - ဢွၵ်ႇ - ၼူဝ်ႇ - တီႇ - - - ၸ. - ၾ. - မ. - ဢ. - မ. - ၸ. - ၸ. - ဢ. - သ. - ဢ. - ၼ. - တ. - - - ၸၼ်ႇဝႃႇရီႇ - ၾႅပ်ႇဝႃႇရီႇ - မၢတ်ႉၶ်ျ - ဢေႇပရႄႇ - မေႇ - ၸုၼ်ႇ - ၸူႇလၢႆႇ - ဢေႃးၵၢတ်ႉ - သႅပ်ႇထႅမ်ႇပႃႇ - ဢွၵ်ႇထူဝ်ႇပႃႇ - ၼူဝ်ႇဝႅမ်ႇပႃႇ - တီႇသႅမ်ႇပႃႇ - - - - - - - တိတ်ႉ - ၸၼ် - ၵၢၼ်း - ပုတ်ႉ - ၽတ်း - သုၵ်း - သဝ် - - - တိ. - ၸ. - ၵ. - ပု. - ၽ. - သု. - သ. - - - တိတ်ႉ - ၸၼ် - ၵၢၼ်း - ပုတ်ႉ - ၽတ်း - သုၵ်း - သဝ် - - - ဝၼ်းဢႃးတိတ်ႉ - ဝၼ်းၸၼ် - ဝၼ်းဢင်းၵၢၼ်း - ဝၼ်းပုတ်ႉ - ဝၼ်းၽတ်း - ဝၼ်းသုၵ်း - ဝၼ်းသဝ် - - - - - တိတ်ႉ - ၸၼ် - ၵၢၼ်း - ပုတ်ႉ - ၽတ်း - သုၵ်း - သဝ် - - - တိ. - ၸ. - ၵ. - ပု. - ၽ. - သု. - သ. - - - တိတ်ႉ - ၸၼ် - ၵၢၼ်း - ပုတ်ႉ - ၽတ်း - သုၵ်း - သဝ် - - - တိတ်ႉ - ၸၼ် - ၵၢၼ်း - ပုတ်ႉ - ၽတ်း - သုၵ်း - သဝ် - - - - - - - သၢမ်လိူၼ်ႁွပ်ႈ 1 - သၢမ်လိူၼ်ႁွပ်ႈ 2 - သၢမ်လိူၼ်ႁွပ်ႈ 3 - သၢမ်လိူၼ်ႁွပ်ႈ 4 - - - သၢမ်လိူၼ်ႁွပ်ႈ 1 - သၢမ်လိူၼ်ႁွပ်ႈ 2 - သၢမ်လိူၼ်ႁွပ်ႈ 3 - သၢမ်လိူၼ်ႁွပ်ႈ 4 - - - - - ႁွပ်ႈ1 - ႁွပ်ႈ2 - ႁွပ်ႈ3 - ႁွပ်ႈ4 - - - သၢမ်လိူၼ်ႁွပ်ႈ 1 - သၢမ်လိူၼ်ႁွပ်ႈ 2 - သၢမ်လိူၼ်ႁွပ်ႈ 3 - သၢမ်လိူၼ်ႁွပ်ႈ 4 - - - - - - - တၸ. - တလ. - - - ၸ. - လ. - - - တွၼ်ႈၸဝ်ႉ - တွၼ်ႈလႃႈ - - - - - တၸ. - တလ. - - - တၸ. - တလ. - - - တွၼ်ႈၸဝ်ႉ - တွၼ်ႈလႃႈ - - - - - - ဢွၼ်ၼႃႈၸဝ်ႈၶရိတ်ႉ - ဢွၼ်ၼႃႈပၢၼ်ၵၢင်လၢႆ - ပီၶရိတ်ႉ - ပၢၼ်ၵၢင်လၢႆ - - - ပီႇၸီႇ - ပီႇၸီႇဢီး - ဢေႇတီႇ - ၸီႇဢီး - - - ပီႇၸီႇ - ပီႇၸီႇဢီး - ဢေႇတီႇ - ၸီႇဢီး - - - - - - y MMMM d - EEEE - - - - - y MMMM d - - - - - y MMM d - - - - - y-MM-dd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - ဝူင်ႈထူၼ်ႈ W ၶွင်လိူၼ် MMMM - y-MM-dd - E - y MMM d - E - ဝူင်ႈထူၼ်ႈ w ၶွင်ပီ Y - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - y-MM-dd - E – y-MM-dd - E - y-MM-dd - E – y-MM-dd - E - y-MM-dd - E – y-MM-dd - E - - - y MMM d - E – MMM d - E - y MMM d - E – MMM d - E - y MMM d - E – y MMM d - E - - - - - - - - - တိသျရိ - ႁေႇသျဝၼ်ႇ - ၶိတ်ႉသလႅပ်ႉ - တႄႇဝႅတ်ႉ - သျေႇဝတ်ႉ - ဢႃႇတႃႇ I - ဢႃႇတႃႇ - ဢႃႇတႃႇ II - ၼီႇသၢၼ်း - ဢီႇယႃႇ - သီႇဝၼ်ႇ - တမ်ႇမုတ်ႉၸ် - ဢၢပ်ႉၾ် - ဢႄႇလူးလ် - - - တိသျရိ - ႁေႇသျဝၼ်ႇ - ၶိတ်ႉသလႅပ်ႉ - တႄႇဝႅတ်ႉ - သျေႇဝတ်ႉ - ဢႃႇတႃႇ I - ဢႃႇတႃႇ - ဢႃႇတႃႇ II - ၼီႇသၢၼ်း - ဢီႇယႃႇ - သီႇဝၼ်ႇ - တမ်ႇမုတ်ႉၸ် - ဢၢပ်ႉၾ် - ဢႄႇလူးလ် - - - - - တိသျရိ - ႁေႇသျဝၼ်ႇ - ၶိတ်ႉသလႅပ်ႉ - တႄႇဝႅတ်ႉ - သျေႇဝတ်ႉ - ဢႃႇတႃႇ I - ဢႃႇတႃႇ - ဢႃႇတႃႇ II - ၼီႇသၢၼ်း - ဢီႇယႃႇ - သီႇဝၼ်ႇ - တမ်ႇမုတ်ႉၸ် - ဢၢပ်ႉၾ် - ဢႄႇလူးလ် - - - တိသျရိ - ႁေႇသျဝၼ်ႇ - ၶိတ်ႉသလႅပ်ႉ - တႄႇဝႅတ်ႉ - သျေႇဝတ်ႉ - ဢႃႇတႃႇ I - ဢႃႇတႃႇ - ဢႃႇတႃႇ II - ၼီႇသၢၼ်း - ဢီႇယႃႇ - သီႇဝၼ်ႇ - တမ်ႇမုတ်ႉၸ် - ဢၢပ်ႉၾ် - ဢႄႇလူးလ် - - - - - - တ.ၸ. - - - တ.ၸ. - - - တ.ၸ. - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - - ၵျၢႆးတရႃႇ - ဝၢႆးသႃၶႃႇ - ၵျႅတ်ႉသ်ထႃႇ - ဢသႃထႃ - သရဝၼ - ၽႃႇတရႃႇ - ဢသဝိၼႃႇ - ၵႃတိၵႃႇ - ဢၵရႃႇႁႃယႃၼႃႇ - ​ပေႃးသႃႇ - မႃႇၵႃႇ - ၽႃလ်ၵူၼႃႇ - - - ၵျၢႆးတရႃႇ - ဝၢႆးသႃၶႃႇ - ၵျႅတ်ႉသ်ထႃႇ - ဢသႃထႃ - သရဝၼ - ၽႃႇတရႃႇ - ဢသဝိၼႃႇ - ၵႃတိၵႃႇ - ဢၵရႃႇႁႃယႃၼႃႇ - ​ပေႃးသႃႇ - မႃႇၵႃႇ - ၽႃလ်ၵူၼႃႇ - - - - - ၵျၢႆးတရႃႇ - ဝၢႆးသႃၶႃႇ - ၵျႅတ်ႉသ်ထႃႇ - ဢသႃထႃ - သရဝၼ - ၽႃႇတရႃႇ - ဢသဝိၼႃႇ - ၵႃတိၵႃႇ - ဢၵရႃႇႁႃယႃၼႃႇ - ​ပေႃးသႃႇ - မႃႇၵႃႇ - ၽႃလ်ၵူၼႃႇ - - - ၵျၢႆးတရႃႇ - ဝၢႆးသႃၶႃႇ - ၵျႅတ်ႉသ်ထႃႇ - ဢသႃထႃ - သရဝၼ - ၽႃႇတရႃႇ - ဢသဝိၼႃႇ - ၵႃတိၵႃႇ - ဢၵရႃႇႁႃယႃၼႃႇ - ​ပေႃးသႃႇ - မႃႇၵႃႇ - ၽႃလ်ၵူၼႃႇ - - - - - - သၵ်ႉၵႃႇ - - - သၵ်ႉၵႃႇ - - - သၵ်ႉၵႃႇ - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - - မူႇ. - သႃႇ. - ရႃႇ. I - ရႃႇ. II - ၵျူႇ. I - ၵျူႇ. II - ရႃႇၸ်. - သျႃး. - ရႃ. - သျေႃး. - ၻူဝ်ႇလ်.ၵ. - ၻူဝ်ႇလ်.ႁ. - - - မူႇႁႃႇရမ်ႇ - သႃႇၾႃႇ - ရႃႇပီႇ I - ရႃႇပီႇ II - ၵျူႇမႃႇတႃႇ I - ၵျူႇမႃႇတႃႇ II - ရႃႇၸၢပ်ႉ - သျႃးပၢၼ်ႇ - ရႃႇမႃႇတၢၼ်ႇ - သျေႃးဝႃႇလ် - ၻူဝ်ႇလ်-ၵိတ - ၻူဝ်ႇလ်ႁိတ်ႉၸႃႇ - - - - - မူႇ. - သႃႇ. - ရႃႇ. I - ရႃႇ. II - ၵျူႇ. I - ၵျူႇ. II - ရႃႇၸ်. - သျႃး. - ရႃ. - သျေႃး. - ၻူဝ်ႇလ်.ၵ. - ၻူဝ်ႇလ်.ႁ. - - - မူႇႁႃႇရမ်ႇ - သႃႇၾႃႇ - ရႃႇပီႇ I - ရႃႇပီႇ II - ၵျူႇမႃႇတႃႇ I - ၵျူႇမႃႇတႃႇ II - ရႃႇၸၢပ်ႉ - သျႃးပၢၼ်ႇ - ရႃႇမႃႇတၢၼ်ႇ - သျေႃးဝႃႇလ် - ၻူဝ်ႇလ်-ၵိတ - ၻူဝ်ႇလ်ႁိတ်ႉၸႃႇ - - - - - - ပီႁေးၵျိရႃႇ - ဢွၼ်ၼႃႈ ႁေးၵျိရႃႇ - - - ပ.ႁ. - ဢ.ႁ. - - - ပ.ႁ. - ဢ.ႁ. - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - တႆးၵႃႇ (645–650) - ႁၵုၶျိ (650–671) - ႁၵုႁူဝ်ႇ (672–686) - သူးၶျူဝ်ႇ (686–701) - တႆးႁူဝ်ႇ (701–704) - ၵေးယိုင်ႇ (704–708) - ဝႃးတူဝ်ႇ (708–715) - ရေးၵီႇ (715–717) - ယူဝ်းရူဝ်ႇ (717–724) - ၸိၼ်ႈၵီႇ (724–729) - တႅၼ်းပျူဝ်ႇ (729–749) - တႅၼ်းပျူဝ်ႇ-ၵၼ်းပူဝ်ႇ (749–749) - တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ (749–757) - တႅၼ်းပျူဝ်ႇ-ႁူဝ်ႇၸီႇ (757–765) - တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ (765–767) - ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ (767–770) - ႁူဝ်ၵီႇ (770–780) - တႅၼ်းဢူဝ်ႇ (781–782) - ဢႅၼ်ရိယႃၵု (782–806) - တႆးတူဝ်ႇ (806–810) - ၶူဝ်းၼိၼ်ႇ (810–824) - တႅၼ်းၶျူဝ်ႇ (824–834) - ၸူဝ်းဝႃႇ (834–848) - ၵႃးသျူဝ်ႇ (848–851) - ၼိၼ်းၸူႇ (851–854) - သၢႆးၵူဝ်ႇ (854–857) - တႅၼ်းဢၼ်ႇ (857–859) - ၸူဝ်းၵၼ်ႇ (859–877) - ၵၼ်းၵျူဝ်ႇ (877–885) - ၼိၼ်းၼႃႇ (885–889) - ၵၼ်းပျူဝ်ႇ (889–898) - သျူဝ်းတႆႇ (898–901) - ဢႅၼ်းၵီႇ (901–923) - ဢႅၼ်းၶျူဝ်ႇ (923–931) - ၸူဝ်းႁေႇ (931–938) - တႅၼ်းၵျူဝ်ႇ (938–947) - တႅၼ်းရိယႃၵု (947–957) - တႅၼ်းတူဝ်ၵု (957–961) - ဢူဝ်းဝႃႇ (961–964) - ၵူဝ်းႁူဝ်ႇ (964–968) - ဢၼ်းၼႃႇ (968–970) - တႅၼ်းရိယႃၵု (970–973) - တႅၼ်းဢႅၼ်ႇ (973–976) - ၸူဝ်းၵႅၼ်ႇ (976–978) - တႅၼ်းၵႅၼ်ႇ (978–983) - ဢီးၵၼ်ႇ (983–985) - ၶၢၼ်းၼႃႉ (985–987) - ဢီးဢႅၼ်ႇ (987–989) - ဢီးသူဝ်ႇ (989–990) - သျူဝ်းရိယႃၵု (990–995) - ၶျူဝ်းတူဝ်ၵု (995–999) - ၶျူဝ်းႁူဝ်ႇ (999–1004) - ၶၢၼ်းၵူဝ်ႇ (1004–1012) - ၶျူဝ်းဝႃႇ (1012–1017) - ၶၢၼ်းၼိၼ်ႇ (1017–1021) - ၸီးဢၼ်ႇ (1021–1024) - မၼ်းၸူႇ (1024–1028) - ၶျူဝ်းၵႅၼ်ႇ (1028–1037) - ၶျူဝ်းရိယႃၵု (1037–1040) - ၶျူဝ်းၵျူႇ (1040–1044) - ၶၢၼ်းတူဝ်ၵု (1044–1046) - ဢီးသျူဝ်ႇ (1046–1053) - တႅၼ်းၵီႇ (1053–1058) - ၶူဝ်းႁေႇ (1058–1065) - ၸီးရိယႃၵု (1065–1069) - ဢႅၼ်းၵျူႇ (1069–1074) - ၸူဝ်းႁူဝ်ႇ (1074–1077) - သျူဝ်းရိယႃၵု (1077–1081) - ဢီးႁူဝ်ႇ (1081–1084) - ဢူဝ်းတူဝ်ၵု (1084–1087) - ၶၢၼ်းၸီႇ (1087–1094) - ၵႃးႁူဝ်ႇ (1094–1096) - ဢီးၶျူဝ်ႇ (1096–1097) - ၸူဝ်းတူဝ်ၵု (1097–1099) - ၵူဝ်းဝႃႇ (1099–1104) - ၶျူဝ်းၸီႇ (1104–1106) - ၵႃးသျူဝ်ႇ (1106–1108) - တႅၼ်းၼိၼ်ႇ (1108–1110) - တႅၼ်းဢီႇ (1110–1113) - ဢီးၵျူႇ (1113–1118) - ၵႅၼ်းဢီႇ (1118–1120) - ႁူဝ်းဢၼ်ႇ (1120–1124) - တႅၼ်းၸီႇ (1124–1126) - တႆးၸီႇ (1126–1131) - တႅၼ်းသျူဝ်ႇ (1131–1132) - ၶျူဝ်းသျူဝ်ႇ (1132–1135) - ႁူဝ်းဢႅၼ်ႇ (1135–1141) - ဢီးၸီႇ (1141–1142) - ၵူဝ်းၸီႇ (1142–1144) - တႅၼ်းယူဝ်ႇ (1144–1145) - ၵျူးဢၼ်ႇ (1145–1151) - ၼိၼ်းပေႇ (1151–1154) - ၵျူးၸူႇ (1154–1156) - ႁူဝ်းၵႅၼ်ႇ (1156–1159) - ႁေးၸီႇ (1159–1160) - ဢီးရိယႃၵု (1160–1161) - ဢူဝ်းႁူဝ်ႇ (1161–1163) - ၶျူဝ်းၵၼ်ႇ (1163–1165) - ဢီးမၼ်ႇ (1165–1166) - ၼိၼ်းဢၼ်ႇ (1166–1169) - ၵႃးဢူဝ်ႇ (1169–1171) - သျူဝ်းဢၼ်ႇ (1171–1175) - ဢၼ်းၵႅၼ်ႇ (1175–1177) - ၸီးသျူဝ်ႇ (1177–1181) - ယူဝ်းဝႃႇ (1181–1182) - ၸူးဢီႇ (1182–1184) - ၵႅၼ်းရိယႃၵု (1184–1185) - ပုၼ်းၸီႇ (1185–1190) - ၵႅၼ်းၵျူႇ (1190–1199) - သျူဝ်းၸီႇ (1199–1201) - ၵႅၼ်းၼိၼ်ႇ (1201–1204) - ၵႅၼ်းၵျူႇ (1204–1206) - ၵႅၼ်းဢီႇ (1206–1207) - ၸူဝ်းၵႅၼ်ႇ (1207–1211) - ၵႅၼ်းရိယႃၵု (1211–1213) - ၵႅၼ်းပူဝ်ႇ (1213–1219) - ၸူဝ်းၵျူႇ (1219–1222) - ၸူဝ်းဢူဝ်ႇ (1222–1224) - ၵႅၼ်းၼိၼ်ႇ (1224–1225) - ၵႃးရူဝ်ၵု (1225–1227) - ဢၼ်းတေႇ (1227–1229) - ၶၢၼ်းၵီႇ (1229–1232) - ၸူဝ်းဢီႇ (1232–1233) - တႅၼ်းပုၵု (1233–1234) - ပုၼ်းရိယႃၵု (1234–1235) - ၵႃးတေႇ (1235–1238) - ယႃးၵုၼိၼ်း (1238–1239) - ဢၼ်းဢူဝ်ႇ (1239–1240) - ၼိၼ်းၸီႇ (1240–1243) - ၵၼ်းၵႅၼ်ႇ (1243–1247) - ႁူဝ်းၸီႇ (1247–1249) - ၵႅၼ်းၶျူဝ်ႇ (1249–1256) - ၵူဝ်းၵႅၼ်ႇ (1256–1257) - သျူဝ်းၵႃႇ (1257–1259) - သျူဝ်းၵႅၼ်ႇ (1259–1260) - ပုၼ်းဢူဝ်ႇ (1260–1261) - ၵူဝ်းၶျူဝ်ႇ (1261–1264) - ပုၼ်းဢီႇ (1264–1275) - ၶၢၼ်းၸီႇ (1275–1278) - ၶူဝ်းဢၼ်ႇ (1278–1288) - သျူဝ်းဢူဝ်ႇ (1288–1293) - ဢီးၼိၼ်ႇ (1293–1299) - သျူဝ်းဢၼ်ႇ (1299–1302) - ၵႅၼ်းၵႅၼ်ႇ (1302–1303) - ၵႃးၵႅၼ်ႇ (1303–1306) - တူဝ်းၵုၸိ (1306–1308) - ဢၼ်းၵျူဝ်ႇ (1308–1311) - ဢူဝ်းၶျူဝ်ႇ (1311–1312) - သျူဝ်းဝႃႇ (1312–1317) - ပုၼ်းပူဝ်ႇ (1317–1319) - ၵႅၼ်းဢူဝ်ႇ (1319–1321) - ၵႅၼ်းၵူဝ်ႇ (1321–1324) - သျူဝ်းၶျူႇ (1324–1326) - ၵႃးရိယႃၵု (1326–1329) - ၵႅၼ်းတူဝ်ၵု (1329–1331) - ၵႅၼ်းၵူဝ်ႇ (1331–1334) - ၵႅၼ်းမူႇ (1334–1336) - ဢၼ်းၵႅၼ်ႇ (1336–1340) - ၵူဝ်းၵူဝ်ၵု (1340–1346) - သျူဝ်းႁေႇ (1346–1370) - ၵႅၼ်းတူဝ်ၵု (1370–1372) - ပုၼ်းၶျူႇ (1372–1375) - တႅၼ်းၸူႇ (1375–1379) - ၵူဝ်းရိယႃၵု (1379–1381) - ၵူဝ်းဝႃႇ (1381–1384) - ၵႅၼ်းၶျူႇ (1384–1392) - သျီးတူဝ်ၵု (1384–1387) - ၵႃးၵေႇ (1387–1389) - ၵူဝ်းဢူဝ်ႇ (1389–1390) - မေးတူဝ်ၵု (1390–1394) - ဢူဝ်းဢီႇ (1394–1428) - သျူဝ်းၶျူဝ်ႇ (1428–1429) - ဢီးၶျူဝ်ႇ (1429–1441) - ၵႃးၵိသု (1441–1444) - ပုၼ်းဢၼ်ႇ (1444–1449) - ႁူဝ်းတူဝ်ႇၵု (1449–1452) - ၵျူဝ်းတူဝ်ၵု (1452–1455) - ၵူဝ်းသျူဝ်ႇ (1455–1457) - ၶျူဝ်းရူဝ်ၵု (1457–1460) - ၵၼ်းသျူဝ်ႇ (1460–1466) - ပုၼ်းသျူဝ်ႇ (1466–1467) - ဢူဝ်းၼိၼ်ႇ (1467–1469) - ပုၼ်းမေႇ (1469–1487) - ၶျူဝ်းၵျူဝ်ႇ (1487–1489) - ဢၼ်းတူဝ်ၵု (1489–1492) - မေးဢူဝ်ႇ (1492–1501) - ပုၼ်းၵီႇ (1501–1504) - ဢီးသျူဝ်ႇ (1504–1521) - တႆးဢီႇ (1521–1528) - ၵျူဝ်းရူဝ်ၵု (1528–1532) - တႅၼ်းပုၼ်ႇ (1532–1555) - ၵူဝ်းၸီႇ (1555–1558) - ဢီးရူဝ်ၵု (1558–1570) - ၵႅၼ်းၵီႇ (1570–1573) - တႅၼ်းသျူဝ်ႇ (1573–1592) - ပုၼ်းရူဝ်ၵု (1592–1596) - ၵေးၶျူဝ်ႇ (1596–1615) - ၵႅၼ်းၼႃႇ (1615–1624) - ၶၢၼ်းဢီႇ (1624–1644) - သျူဝ်းႁူဝ်ႇ (1644–1648) - ၵေးဢၼ်ႇ (1648–1652) - ၸူဝ်းဢူဝ်ႇ (1652–1655) - မေးရေၵိ (1655–1658) - မၼ်းၸီႇ (1658–1661) - ၶၢၼ်းပုၼ်ႇ (1661–1673) - ဢၼ်းပူဝ်ႇ (1673–1681) - တႅၼ်းၼႃႇ (1681–1684) - ၸူဝ်းၵျူဝ်ႇ (1684–1688) - ၵႅၼ်းရူဝ်ၵု (1688–1704) - ႁူဝ်းဢီႇ (1704–1711) - သျူဝ်းတူဝ်ၵု (1711–1716) - ၵျူဝ်းႁူဝ်ႇ (1716–1736) - ၵႅၼ်းပုၼ်ႇ (1736–1741) - ၶၢၼ်းပူဝ်ႇ (1741–1744) - ဢၼ်းၵျူဝ်ႇ (1744–1748) - ၶၢၼ်းဢႅၼ်ႇ (1748–1751) - ႁူဝ်းရေၵိ (1751–1764) - မေးဝႃႇ (1764–1772) - ဢၼ်းဢီႇ (1772–1781) - တႅၼ်းမေႇ (1781–1789) - ၶၢၼ်းသေႇ (1789–1801) - ၵျူဝ်းဝႃႇ (1801–1804) - ပုၼ်းၵႃႇ (1804–1818) - ပုၼ်းသေႇ (1818–1830) - တၼ်းပူဝ်ႇ (1830–1844) - ၵူဝ်းၵႃႇ (1844–1848) - ၵႃးဢီႇ (1848–1854) - ဢၼ်းသေႇ (1854–1860) - မၼ်းဢႅၼ်ႇ (1860–1861) - ပုၼ်းၵျူႇ (1861–1864) - ၵႅၼ်းၸီႇ (1864–1865) - ၵေးဢူဝ်ႇ (1865–1868) - မေးၸီႇ - တႆးသျူဝ်ႇ - သျူဝ်းဝႃႇ - ႁေးသႄႇ - ရေးဝႃႇ - - - တႆးၵႃႇ (645–650) - ႁၵုၶျိ (650–671) - ႁၵုႁူဝ်ႇ (672–686) - သူးၶျူဝ်ႇ (686–701) - တႆးႁူဝ်ႇ (701–704) - ၵေးယိုင်ႇ (704–708) - ဝႃးတူဝ်ႇ (708–715) - ရေးၵီႇ (715–717) - ယူဝ်းရူဝ်ႇ (717–724) - ၸိၼ်ႈၵီႇ (724–729) - တႅၼ်းပျူဝ်ႇ (729–749) - တႅၼ်းပျူဝ်ႇ-ၵၼ်းပူဝ်ႇ (749–749) - တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ (749–757) - တႅၼ်းပျူဝ်ႇ-ႁူဝ်ႇၸီႇ (757–765) - တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ (765–767) - ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ (767–770) - ႁူဝ်ၵီႇ (770–780) - တႅၼ်းဢူဝ်ႇ (781–782) - ဢႅၼ်ရိယႃၵု (782–806) - တႆးတူဝ်ႇ (806–810) - ၶူဝ်းၼိၼ်ႇ (810–824) - တႅၼ်းၶျူဝ်ႇ (824–834) - ၸူဝ်းဝႃႇ (834–848) - ၵႃးသျူဝ်ႇ (848–851) - ၼိၼ်းၸူႇ (851–854) - သၢႆးၵူဝ်ႇ (854–857) - တႅၼ်းဢၼ်ႇ (857–859) - ၸူဝ်းၵၼ်ႇ (859–877) - ၵၼ်းၵျူဝ်ႇ (877–885) - ၼိၼ်းၼႃႇ (885–889) - ၵၼ်းပျူဝ်ႇ (889–898) - သျူဝ်းတႆႇ (898–901) - ဢႅၼ်းၵီႇ (901–923) - ဢႅၼ်းၶျူဝ်ႇ (923–931) - ၸူဝ်းႁေႇ (931–938) - တႅၼ်းၵျူဝ်ႇ (938–947) - တႅၼ်းရိယႃၵု (947–957) - တႅၼ်းတူဝ်ၵု (957–961) - ဢူဝ်းဝႃႇ (961–964) - ၵူဝ်းႁူဝ်ႇ (964–968) - ဢၼ်းၼႃႇ (968–970) - တႅၼ်းရိယႃၵု (970–973) - တႅၼ်းဢႅၼ်ႇ (973–976) - ၸူဝ်းၵႅၼ်ႇ (976–978) - တႅၼ်းၵႅၼ်ႇ (978–983) - ဢီးၵၼ်ႇ (983–985) - ၶၢၼ်းၼႃႉ (985–987) - ဢီးဢႅၼ်ႇ (987–989) - ဢီးသူဝ်ႇ (989–990) - သျူဝ်းရိယႃၵု (990–995) - ၶျူဝ်းတူဝ်ၵု (995–999) - ၶျူဝ်းႁူဝ်ႇ (999–1004) - ၶၢၼ်းၵူဝ်ႇ (1004–1012) - ၶျူဝ်းဝႃႇ (1012–1017) - ၶၢၼ်းၼိၼ်ႇ (1017–1021) - ၸီးဢၼ်ႇ (1021–1024) - မၼ်းၸူႇ (1024–1028) - ၶျူဝ်းၵႅၼ်ႇ (1028–1037) - ၶျူဝ်းရိယႃၵု (1037–1040) - ၶျူဝ်းၵျူႇ (1040–1044) - ၶၢၼ်းတူဝ်ၵု (1044–1046) - ဢီးသျူဝ်ႇ (1046–1053) - တႅၼ်းၵီႇ (1053–1058) - ၶူဝ်းႁေႇ (1058–1065) - ၸီးရိယႃၵု (1065–1069) - ဢႅၼ်းၵျူႇ (1069–1074) - ၸူဝ်းႁူဝ်ႇ (1074–1077) - သျူဝ်းရိယႃၵု (1077–1081) - ဢီးႁူဝ်ႇ (1081–1084) - ဢူဝ်းတူဝ်ၵု (1084–1087) - ၶၢၼ်းၸီႇ (1087–1094) - ၵႃးႁူဝ်ႇ (1094–1096) - ဢီးၶျူဝ်ႇ (1096–1097) - ၸူဝ်းတူဝ်ၵု (1097–1099) - ၵူဝ်းဝႃႇ (1099–1104) - ၶျူဝ်းၸီႇ (1104–1106) - ၵႃးသျူဝ်ႇ (1106–1108) - တႅၼ်းၼိၼ်ႇ (1108–1110) - တႅၼ်းဢီႇ (1110–1113) - ဢီးၵျူႇ (1113–1118) - ၵႅၼ်းဢီႇ (1118–1120) - ႁူဝ်းဢၼ်ႇ (1120–1124) - တႅၼ်းၸီႇ (1124–1126) - တႆးၸီႇ (1126–1131) - တႅၼ်းသျူဝ်ႇ (1131–1132) - ၶျူဝ်းသျူဝ်ႇ (1132–1135) - ႁူဝ်းဢႅၼ်ႇ (1135–1141) - ဢီးၸီႇ (1141–1142) - ၵူဝ်းၸီႇ (1142–1144) - တႅၼ်းယူဝ်ႇ (1144–1145) - ၵျူးဢၼ်ႇ (1145–1151) - ၼိၼ်းပေႇ (1151–1154) - ၵျူးၸူႇ (1154–1156) - ႁူဝ်းၵႅၼ်ႇ (1156–1159) - ႁေးၸီႇ (1159–1160) - ဢီးရိယႃၵု (1160–1161) - ဢူဝ်းႁူဝ်ႇ (1161–1163) - ၶျူဝ်းၵၼ်ႇ (1163–1165) - ဢီးမၼ်ႇ (1165–1166) - ၼိၼ်းဢၼ်ႇ (1166–1169) - ၵႃးဢူဝ်ႇ (1169–1171) - သျူဝ်းဢၼ်ႇ (1171–1175) - ဢၼ်းၵႅၼ်ႇ (1175–1177) - ၸီးသျူဝ်ႇ (1177–1181) - ယူဝ်းဝႃႇ (1181–1182) - ၸူးဢီႇ (1182–1184) - ၵႅၼ်းရိယႃၵု (1184–1185) - ပုၼ်းၸီႇ (1185–1190) - ၵႅၼ်းၵျူႇ (1190–1199) - သျူဝ်းၸီႇ (1199–1201) - ၵႅၼ်းၼိၼ်ႇ (1201–1204) - ၵႅၼ်းၵျူႇ (1204–1206) - ၵႅၼ်းဢီႇ (1206–1207) - ၸူဝ်းၵႅၼ်ႇ (1207–1211) - ၵႅၼ်းရိယႃၵု (1211–1213) - ၵႅၼ်းပူဝ်ႇ (1213–1219) - ၸူဝ်းၵျူႇ (1219–1222) - ၸူဝ်းဢူဝ်ႇ (1222–1224) - ၵႅၼ်းၼိၼ်ႇ (1224–1225) - ၵႃးရူဝ်ၵု (1225–1227) - ဢၼ်းတေႇ (1227–1229) - ၶၢၼ်းၵီႇ (1229–1232) - ၸူဝ်းဢီႇ (1232–1233) - တႅၼ်းပုၵု (1233–1234) - ပုၼ်းရိယႃၵု (1234–1235) - ၵႃးတေႇ (1235–1238) - ယႃးၵုၼိၼ်း (1238–1239) - ဢၼ်းဢူဝ်ႇ (1239–1240) - ၼိၼ်းၸီႇ (1240–1243) - ၵၼ်းၵႅၼ်ႇ (1243–1247) - ႁူဝ်းၸီႇ (1247–1249) - ၵႅၼ်းၶျူဝ်ႇ (1249–1256) - ၵူဝ်းၵႅၼ်ႇ (1256–1257) - သျူဝ်းၵႃႇ (1257–1259) - သျူဝ်းၵႅၼ်ႇ (1259–1260) - ပုၼ်းဢူဝ်ႇ (1260–1261) - ၵူဝ်းၶျူဝ်ႇ (1261–1264) - ပုၼ်းဢီႇ (1264–1275) - ၶၢၼ်းၸီႇ (1275–1278) - ၶူဝ်းဢၼ်ႇ (1278–1288) - သျူဝ်းဢူဝ်ႇ (1288–1293) - ဢီးၼိၼ်ႇ (1293–1299) - သျူဝ်းဢၼ်ႇ (1299–1302) - ၵႅၼ်းၵႅၼ်ႇ (1302–1303) - ၵႃးၵႅၼ်ႇ (1303–1306) - တူဝ်းၵုၸိ (1306–1308) - ဢၼ်းၵျူဝ်ႇ (1308–1311) - ဢူဝ်းၶျူဝ်ႇ (1311–1312) - သျူဝ်းဝႃႇ (1312–1317) - ပုၼ်းပူဝ်ႇ (1317–1319) - ၵႅၼ်းဢူဝ်ႇ (1319–1321) - ၵႅၼ်းၵူဝ်ႇ (1321–1324) - သျူဝ်းၶျူႇ (1324–1326) - ၵႃးရိယႃၵု (1326–1329) - ၵႅၼ်းတူဝ်ၵု (1329–1331) - ၵႅၼ်းၵူဝ်ႇ (1331–1334) - ၵႅၼ်းမူႇ (1334–1336) - ဢၼ်းၵႅၼ်ႇ (1336–1340) - ၵူဝ်းၵူဝ်ၵု (1340–1346) - သျူဝ်းႁေႇ (1346–1370) - ၵႅၼ်းတူဝ်ၵု (1370–1372) - ပုၼ်းၶျူႇ (1372–1375) - တႅၼ်းၸူႇ (1375–1379) - ၵူဝ်းရိယႃၵု (1379–1381) - ၵူဝ်းဝႃႇ (1381–1384) - ၵႅၼ်းၶျူႇ (1384–1392) - သျီးတူဝ်ၵု (1384–1387) - ၵႃးၵေႇ (1387–1389) - ၵူဝ်းဢူဝ်ႇ (1389–1390) - မေးတူဝ်ၵု (1390–1394) - ဢူဝ်းဢီႇ (1394–1428) - သျူဝ်းၶျူဝ်ႇ (1428–1429) - ဢီးၶျူဝ်ႇ (1429–1441) - ၵႃးၵိသု (1441–1444) - ပုၼ်းဢၼ်ႇ (1444–1449) - ႁူဝ်းတူဝ်ႇၵု (1449–1452) - ၵျူဝ်းတူဝ်ၵု (1452–1455) - ၵူဝ်းသျူဝ်ႇ (1455–1457) - ၶျူဝ်းရူဝ်ၵု (1457–1460) - ၵၼ်းသျူဝ်ႇ (1460–1466) - ပုၼ်းသျူဝ်ႇ (1466–1467) - ဢူဝ်းၼိၼ်ႇ (1467–1469) - ပုၼ်းမေႇ (1469–1487) - ၶျူဝ်းၵျူဝ်ႇ (1487–1489) - ဢၼ်းတူဝ်ၵု (1489–1492) - မေးဢူဝ်ႇ (1492–1501) - ပုၼ်းၵီႇ (1501–1504) - ဢီးသျူဝ်ႇ (1504–1521) - တႆးဢီႇ (1521–1528) - ၵျူဝ်းရူဝ်ၵု (1528–1532) - တႅၼ်းပုၼ်ႇ (1532–1555) - ၵူဝ်းၸီႇ (1555–1558) - ဢီးရူဝ်ၵု (1558–1570) - ၵႅၼ်းၵီႇ (1570–1573) - တႅၼ်းသျူဝ်ႇ (1573–1592) - ပုၼ်းရူဝ်ၵု (1592–1596) - ၵေးၶျူဝ်ႇ (1596–1615) - ၵႅၼ်းၼႃႇ (1615–1624) - ၶၢၼ်းဢီႇ (1624–1644) - သျူဝ်းႁူဝ်ႇ (1644–1648) - ၵေးဢၼ်ႇ (1648–1652) - ၸူဝ်းဢူဝ်ႇ (1652–1655) - မေးရေၵိ (1655–1658) - မၼ်းၸီႇ (1658–1661) - ၶၢၼ်းပုၼ်ႇ (1661–1673) - ဢၼ်းပူဝ်ႇ (1673–1681) - တႅၼ်းၼႃႇ (1681–1684) - ၸူဝ်းၵျူဝ်ႇ (1684–1688) - ၵႅၼ်းရူဝ်ၵု (1688–1704) - ႁူဝ်းဢီႇ (1704–1711) - သျူဝ်းတူဝ်ၵု (1711–1716) - ၵျူဝ်းႁူဝ်ႇ (1716–1736) - ၵႅၼ်းပုၼ်ႇ (1736–1741) - ၶၢၼ်းပူဝ်ႇ (1741–1744) - ဢၼ်းၵျူဝ်ႇ (1744–1748) - ၶၢၼ်းဢႅၼ်ႇ (1748–1751) - ႁူဝ်းရေၵိ (1751–1764) - မေးဝႃႇ (1764–1772) - ဢၼ်းဢီႇ (1772–1781) - တႅၼ်းမေႇ (1781–1789) - ၶၢၼ်းသေႇ (1789–1801) - ၵျူဝ်းဝႃႇ (1801–1804) - ပုၼ်းၵႃႇ (1804–1818) - ပုၼ်းသေႇ (1818–1830) - တၼ်းပူဝ်ႇ (1830–1844) - ၵူဝ်းၵႃႇ (1844–1848) - ၵႃးဢီႇ (1848–1854) - ဢၼ်းသေႇ (1854–1860) - မၼ်းဢႅၼ်ႇ (1860–1861) - ပုၼ်းၵျူႇ (1861–1864) - ၵႅၼ်းၸီႇ (1864–1865) - ၵေးဢူဝ်ႇ (1865–1868) - မေးၸီႇ - တႆးသျူဝ်ႇ - သျူဝ်းဝႃႇ - ႁေးသီႇ - ရေးဝႃႇ - - - တႆးၵႃႇ - ႁၵုၶျိ - ႁႃးၵုႁူဝ် - သူးၶျူဝ်ႇ - တႆးႁူဝ်ႇ - ၵေးယိုင်ႇ - ဝႃးတူဝ်ႇ - ရေးၵီႇ - ယူဝ်းရူဝ်ႇ - ၸိၼ်းၵီႇ - တႅၼ်းပျူဝ်ႇ - တႅၼ်းပျူဝ်ႇ-ၵမ်းပူဝ်ႇ - တႅၼ်းပျူဝ်ႇ-သျူဝ်းႁူဝ်ႇ - တႅၼ်းပျူဝ်ႇ-ႁူဝ်းၸီႇ - တႅၼ်းပျူဝ်ႇ-ၸိၼ်းၵူဝ်ႇ - ၸိၼ်းၵူဝ်ႇ-ၵေးယိုင်ႇ - ႁူဝ်ၵီႇ - တႅၼ်းဢူဝ်ႇ - ဢႅၼ်ရိယႃၵု - တၢႆတူဝ်ႇ - ၶူဝ်းၼိၼ်ႇ - တႅၼ်းၶျူဝ်ႇ - ၸူဝ်းဝႃႇ - ၵႃသျူဝ်ႇ - ၼိၼ်းၸူႇ - သၢႆၵူဝ်ႇ - တႅၼ်းဢၼ်ႇ - ၸူဝ်းၵၼ် - ၵၼ်းၵျူဝ်ႇ - ၼိၼ်းၼႃႇ - ၵၼ်းပျူဝ်ႇ - သျူဝ်းတႆႇ - ဢႅၼ်းၵီႇ - ဢႅၼ်းၶျူဝ်ႇ - ၸူဝ်းႁေႇ - တႅၼ်းၵျူဝ်ႇ - တႅၼ်ရိယႃၵု - တႅၼ်းတူဝ်ၵု - ဢူဝ်းဝႃႇ - ၵူဝ်းႁူဝ်ႇ - ဢၼ်းၼႃႇ - တႅၼ်းရူဝ်ၵု - တႅၼ်းဢႅၼ်ႇ - ၸူဝ်းၵႅၼ်ႇ - တႅၼ်းၵႅၼ်ႇ - ဢီးၵၼ်ႇ - ၵၼ်းၼႃႉ - ဢီးဢႅၼ်ႇ - ဢီးသူဝ်ႇ - သျူဝ်ရိယႃၵု - ၶျူဝ်းတူဝ်ၵု - ၶျူဝ်းႁူဝ်ႇ - ၵၼ်းၵူဝ်ႇ - ၶျူဝ်းဝႃႇ - ၵၼ်းၼိၼ်ႇ - ၸီးဢၼ်ႇ - မၼ်းၸူႇ - ၶျူဝ်းၵႅၼ်ႇ - ၶျူဝ်ရိယႃၵု - ၶျူဝ်းၵျူႇ - ၵၼ်းတူဝ်ၵု - ဢီးသျူဝ်ႇ (1046–1053) - တႅၼ်းၵီႇ - ၵူဝ်းႁေႇ - ၸီရိယႃၵု - ဢႅၼ်းၵျူႇ - ၸူဝ်းႁူဝ်ႇ - ၸူဝ်ရိယႃၵု - ဢီးႁူဝ်ႇ - ဢူဝ်းတူဝ်ၵု - ၵၼ်းၸီႇ - ၵႃႁူဝ်ႇ - ဢီးၶျူဝ်ႇ - ၸူဝ်းတူဝ်ၵု - ၵူဝ်းဝႃႇ - ၶျူဝ်းၸီႇ - ၵႃၸူဝ်ႇ - တႅၼ်းၼိၼ်ႇ - တႅၼ်းဢီႇ - ဢီးၵျူႇ - ၵႅၼ်းဢီႇ - ႁူဝ်းဢၼ်ႇ - တႅၼ်းၸီႇ - တႆးၸီႇ - တႅၼ်းသျူဝ်ႇ - ၶျူဝ်းသျူဝ်ႇ - ႁူဝ်းဢႅၼ်ႇ - ဢီးၸီႇ - ၵူဝ်းၸီႇ - တႅၼ်းယူဝ်ႇ - ၵျူးဢၼ်ႇ - ၼိၼ်းပေႇ - ၵျူးၸူႇ - ႁူင်းၵႅၼ်ႇ - ႁေးၸီႇ - ဢိရယႃၵု - ဢူဝ်းႁူဝ်ႇ - ၶျူဝ်းၵၼ်ႇ - ဢီးမၼ်ႇ - ၼိၼ်းဢၼ်ႇ - ၵႃဢူဝ်ႇ - ၸူဝ်းဢၼ်ႇ - ဢၼ်းၵႅၼ်ႇ - ၸီးသျူဝ်ႇ - ယူဝ်းဝႃႇ - ၵျူးဢီႇ - ၵႅၼ်ရိယႃၵု - ပုၼ်းၸီႇ - ၵႅၼ်းၵျူႇ - သျူဝ်းၸီႇ - ၵႅၼ်းၼိၼ်ႇ - ၵႅၼ်းၵျူႇ - ၵႅၼ်းဢီႇ - ၸူဝ်းၵႅၼ်ႇ - ၵႅၼ်ရိယႃၵု - ၵႅမ်းပူဝ်ႇ - ၸူဝ်းၵျူႇ - ၸူဝ်းဢူဝ်ႇ - ၵႅၼ်းၼိၼ်ႇ - ၵႃးရူဝ်ၵု - ဢၼ်းတေႇ - ၵၢၼ်းၵီႇ - ၸူဝ်းဢီႇ - တႅၼ်းပုၵု - ပုၼ်ရိယႃၵု - ၵႃးတေႇ - ယႃႉၵုၼိၼ်း - ဢႅၼ်းဢူဝ်ႇ - ၼိၼ်းၸီႇ - ၵၼ်းၵႅၼ်ႇ - ႁူဝ်းၸီႇ - ၵႅၼ်းၶျူဝ်ႇ - ၵူဝ်းၵႅၼ်ႇ - သျူဝ်းၵႃႇ - သျူဝ်းၵႅၼ်ႇ - ပုၼ်းဢူဝ်ႇ - ၵူဝ်းၶျူဝ်ႇ - ပုၼ်းဢီႇ - ၵႅၼ်းၸီႇ - ၵူဝ်းဢၼ်ႇ - သျူဝ်းဢူဝ်ႇ - ဢီးၼိၼ်ႇ - သျူဝ်းဢၼ်ႇ - ၵႅၼ်းၵႅၼ်ႇ - ၵႃးၵႅၼ်ႇ - တူဝ်ၵုၸိ - ဢႅၼ်းၵျူဝ်ႇ - ဢူဝ်းၶျူဝ်ႇ - သျူဝ်းဝႃႇ - ပုၼ်းပူဝ်ႇ - ၵႅၼ်းဢူဝ်ႇ - ၵႅၼ်းၵူဝ်ႇ - သျူဝ်းၶျူႇ - ၵႃရိယႃၵု - ၵႅၼ်တူဝ်ၵု - ၵႅၼ်းၵူဝ်ႇ - ၵႅၼ်းမူႇ - ဢႅၼ်းၵႅၼ်ႇ - ၵူဝ်းၵူဝ်ၵု - သျူဝ်းႁေႇ - ၵႅၼ်တူဝ်ၵု - ပုၼ်းၶျူႇ - တႅၼ်းၸူႇ - ၵူဝ်ရိယႃၵု - ၵူဝ်းဝႃႇ - ၵႅၼ်းၶျူႇ - သျိတူဝ်ၵု - ၵႃးၵေႇ - ၵူဝ်းဢူဝ်ႇ - မေတူဝ်ၵု - ဢူဝ်းဢီႇ - သျူဝ်းၶျူဝ်ႇ - ဢီးၵျူဝ်ႇ - ၵႃးၵိသု - ပုၼ်းဢၼ်ႇ - ႁူဝ်တူဝ်ၵု - ၵျူဝ်တူဝ်ၵု - ၵူဝ်းသျူဝ်ႇ - ၶျူဝ်းရူဝ်ၵု - ၵၼ်းသျူဝ်ႇ - ပုၼ်းသျူဝ်ႇ - ဢူဝ်းၼိၼ်ႇ - ပုၼ်းမေႇ - ၶျူဝ်းၵျူဝ်ႇ - ဢၼ်းတူဝ်ၵု - မေးဢူဝ်ႇ - ပုၼ်းၵီႇ - ဢီးၶျူဝ်ႇ - တႆးဢီႇ - ၵျူဝ်းရူဝ်ၵု - တႅၼ်းပုၼ်ႇ - ၵူဝ်းၸီႇ - ဢီးရူဝ်ၵု - ၵႅၼ်းၵီႇ - တႅၼ်းသျူဝ်ႇ - ပုၼ်းရူဝ်ၵု - ၵေးၶျူဝ်ႇ - ၵႅၼ်းၼႃႉ - ၵၼ်းဢီႇ - သျူဝ်းႁူဝ်ႇ - ၵေးဢၼ်ႇ - ၸူဝ်းဢူဝ်ႇ - မေးရႄၵိ - မၼ်းၸီႇ - ၵၼ်းပုၼ်ႇ - ဢႅၼ်းပူဝ်ႇ - တႅၼ်းၼႃႉ - ၸူဝ်းၵျူဝ်ႇ - ၵႅၼ်းရူဝ်ၵု - ႁူဝ်းဢီႇ - သျူဝ်းတူဝ်ၵု - ၵျူဝ်းႁူဝ်ႇ - ၵႅၼ်းပုၼ်ႇ - ၵၼ်းပူဝ်ႇ - ဢႅၼ်းၵျူဝ်ႇ - ၵၼ်းဢႅၼ်ႇ - ႁူဝ်းရႄၵိ - မေးဝႃႇ - ဢၼ်းဢီႇ - တႅၼ်းမေႇ - ၵၼ်းသေႇ - ၵျူဝ်းဝႃႇ - ပုၼ်းၵႃႇ - ပုၼ်းသေႇ - တႅၼ်းပူဝ်ႇ - ၵူဝ်းၵႃႇ - ၵႃးဢီႇ - ဢၼ်းသေႇ - မၼ်းဢႅၼ်ႇ - ပုၼ်းၵျူႇ - ၵႅၼ်းၸီႇ - ၵေးဢူဝ်ႇ - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - - ၾႃႇဝႃႇတိၼ်ႇ - ဢေႃးတီႇပႄႇႁႅတ်ႉ - ၶူဝ်ႇရၢတ်ႉ - တီးရ် - မေႃႇတတ်ႉ - သျႃးရိဝႃႇ - မႄးႁႃႇ - ဢပၢၼ်ႇ - ဢႃႇၸႃႇ - တေႇ - ပႃႇမၢၼ်ႇ - ဢႅတ်ႉၾႅၼ်ႇ + ၸၼ်ႇ + ၾႅပ်ႇ + မၢတ်ႉၶျ် + ဢေႇ + မေႇ + ၸုၼ်ႇ + ၸူႇ + ဢေႃး + သႅပ်ႇ + ဢွၵ်ႇ + ၼူဝ်ႇ + တီႇ - ၾႃႇဝႃႇတိၼ်ႇ - ဢေႃးတီႇပႄႇႁႅတ်ႉ - ၶူဝ်ႇရၢတ်ႉ - တီးရ် - မေႃႇတတ်ႉ - သျႃးရိဝႃႇ - မႄးႁႃႇ - ဢပၢၼ်ႇ - ဢႃႇၸႃႇ - တေႇ - ပႃႇမၢၼ်ႇ - ဢႅတ်ႉၾႅၼ်ႇ + ၸၼ်ႇဝႃႇရီႇ + ၾႅပ်ႇဝႃႇရီႇ + မၢတ်ႉၶျ် + ဢေႇပရႄႇ + မေႇ + ၸုၼ်ႇ + ၸူႇလၢႆႇ + ဢေႃးၵၢတ်ႉ + သႅပ်ႇထႅမ်ႇပႃႇ + ဢွၵ်ႇထူဝ်ႇပႃႇ + ၼူဝ်ႇဝႅမ်ႇပႃႇ + တီႇသႅမ်ႇပႃႇ - - ၾႃႇဝႃႇတိၼ်ႇ - ဢေႃးတီႇပႄႇႁႅတ်ႉ - ၶူဝ်ႇရၢတ်ႉ - တီးရ် - မေႃႇတတ်ႉ - သျႃးရိဝႃႇ - မႄးႁႃႇ - ဢပၢၼ်ႇ - ဢႃႇၸႃႇ - တေႇ - ပႃႇမၢၼ်ႇ - ဢႅတ်ႉၾႅၼ်ႇ - - - ၾႃႇဝႃႇတိၼ်ႇ - ဢေႃးတီႇပႄႇႁႅတ်ႉ - ၶူဝ်ႇရၢတ်ႉ - တီးရ် - မေႃႇတတ်ႉ - သျႃးရိဝႃႇ - မႄးႁႃႇ - ဢပၢၼ်ႇ - ဢႃႇၸႃႇ - တေႇ - ပႃႇမၢၼ်ႇ - ဢႅတ်ႉၾႅၼ်ႇ + + ၸ. + ၾ. + မ. + ဢ. + မ. + ၸ. + ၸ. + ဢ. + သ. + ဢ. + ၼ. + တ. + + + + တိတ်ႉ + ၸၼ် + ၵၢၼ်း + ပုတ်ႉ + ၽတ်း + သုၵ်း + သဝ် + + + ဝၼ်းဢႃးတိတ်ႉ + ဝၼ်းၸၼ် + ဝၼ်းဢင်းၵၢၼ်း + ဝၼ်းပုတ်ႉ + ဝၼ်းၽတ်း + ဝၼ်းသုၵ်း + ဝၼ်းသဝ် + + + + + တိ. + ၸ. + ၵ. + ပု. + ၽ. + သု. + သ. + + + တိတ်ႉ + ၸၼ် + ၵၢၼ်း + ပုတ်ႉ + ၽတ်း + သုၵ်း + သဝ် + + + + + + + သၢမ်လိူၼ်ႁွပ်ႈ 1 + သၢမ်လိူၼ်ႁွပ်ႈ 2 + သၢမ်လိူၼ်ႁွပ်ႈ 3 + သၢမ်လိူၼ်ႁွပ်ႈ 4 + + + + + ႁွပ်ႈ1 + ႁွပ်ႈ2 + ႁွပ်ႈ3 + ႁွပ်ႈ4 + + + + + + + တၸ. + တလ. + + + ၸ. + လ. + + + တွၼ်ႈၸဝ်ႉ + တွၼ်ႈလႃႈ + + + + + တွၼ်ႈၸဝ်ႉ + တွၼ်ႈလႃႈ + + + - ပီပႃႇသျႃး - - - ပီပႃႇသျႃး - - - ပီပႃႇသျႃး - - - - - - G y MMMM d - EEEE - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - {1} ၶၢဝ်းယၢမ်း {0} - - - - - {1} {0} - - - - - {1} {0} - - - - d - E - G y-MM-dd - E - G y MMM d - E - MM-dd - E - MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E - - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – GGGGG y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – G y MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - MM-dd - E – MM-dd - E - MM-dd - E – MM-dd - E - - - MMM d - E – MMM d - E - MMM d - E – MMM d - E - - - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - - - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E - - - - - - - - ပီဢွၼ်တၢင်းထၢႆႇဝၢၼ်း - ထၢႆႇဝၢၼ်း + ဢွၼ်ၼႃႈၸဝ်ႈၶရိတ်ႉ + ဢွၼ်ၼႃႈပၢၼ်ၵၢင်လၢႆ + ပီၶရိတ်ႉ + ပၢၼ်ၵၢင်လၢႆ - ပဢတ. ထၢႆႇဝၢၼ်း - ထၢႆႇဝၢၼ်း + ပီႇၸီႇ + ပီႇၸီႇဢီး + ဢေႇတီႇ + ၸီႇဢီး - - ပဢတ. ထၢႆႇဝၢၼ်း - ထၢႆႇဝၢၼ်း - - G y MMMM d - EEEE + y MMMM d - EEEE - G y MMMM d + y MMMM d - G y MMM d + y MMM d - G y-MM-dd + y-MM-dd + + + + HH:mm:ss zzzz + + + + + HH:mm:ss z + + + + + HH:mm:ss + + + + + HH:mm + + + {1} {0} - - {1} ၶၢဝ်းယၢမ်း {0} - {1} {0} - - {1} ၶၢဝ်းယၢမ်း {0} - @@ -3909,8 +1830,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic G y MMM d - E MM-dd - E MMM d - E - GGGGG y-MM-dd - E - G y MMM d - E + ဝူင်ႈထူၼ်ႈ W ၶွင်လိူၼ် MMMM + y-MM-dd - E + y MMM d - E + ဝူင်ႈထူၼ်ႈ w ၶွင်ပီ Y @@ -3934,54 +1857,178 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d - E – MMM d - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E - GGGGG y-MM-dd - E – y-MM-dd - E + y-MM-dd - E – y-MM-dd - E + y-MM-dd - E – y-MM-dd - E + y-MM-dd - E – y-MM-dd - E - G y MMM d - E – MMM d - E - G y MMM d - E – MMM d - E - G y MMM d - E – y MMM d - E + y MMM d - E – MMM d - E + y MMM d - E – MMM d - E + y MMM d - E – y MMM d - E - - - - ပၢၼ် - - - ပၢၼ် - - - ပၢၼ် - - - ပီ - ပီၵၢႆ - ပီၼႆႉ - ပီၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ပီ - - - {0} ပီ ပူၼ်ႉမႃး - - - - ပီ - ပီၵၢႆ - ပီၼႆႉ - ပီၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ပီ - - - {0} ပီ ပူၼ်ႉမႃး - + + + + + တိသျရိ + ႁေႇသျဝၼ်ႇ + ၶိတ်ႉသလႅပ်ႉ + တႄႇဝႅတ်ႉ + သျေႇဝတ်ႉ + ဢႃႇတႃႇ I + ဢႃႇတႃႇ + ဢႃႇတႃႇ II + ၼီႇသၢၼ်း + ဢီႇယႃႇ + သီႇဝၼ်ႇ + တမ်ႇမုတ်ႉၸ် + ဢၢပ်ႉၾ် + ဢႄႇလူးလ် + + + + + + တ.ၸ. + + + + + + + + ၵျၢႆးတရႃႇ + ဝၢႆးသႃၶႃႇ + ၵျႅတ်ႉသ်ထႃႇ + ဢသႃထႃ + သရဝၼ + ၽႃႇတရႃႇ + ဢသဝိၼႃႇ + ၵႃတိၵႃႇ + ဢၵရႃႇႁႃယႃၼႃႇ + ​ပေႃးသႃႇ + မႃႇၵႃႇ + ၽႃလ်ၵူၼႃႇ + + + + + + သၵ်ႉၵႃႇ + + + + + + + + မူႇ. + သႃႇ. + ရႃႇ. I + ရႃႇ. II + ၵျူႇ. I + ၵျူႇ. II + ရႃႇၸ်. + သျႃး. + ရႃ. + သျေႃး. + ၻူဝ်ႇလ်.ၵ. + ၻူဝ်ႇလ်.ႁ. + + + မူႇႁႃႇရမ်ႇ + သႃႇၾႃႇ + ရႃႇပီႇ I + ရႃႇပီႇ II + ၵျူႇမႃႇတႃႇ I + ၵျူႇမႃႇတႃႇ II + ရႃႇၸၢပ်ႉ + သျႃးပၢၼ်ႇ + ရႃႇမႃႇတၢၼ်ႇ + သျေႃးဝႃႇလ် + ၻူဝ်ႇလ်-ၵိတ + ၻူဝ်ႇလ်ႁိတ်ႉၸႃႇ + + + + + + ပီႁေးၵျိရႃႇ + ဢွၼ်ၼႃႈ ႁေးၵျိရႃႇ + + + ပ.ႁ. + ဢ.ႁ. + + + + + + + MMMM ဝူင်ႈ W + Y ဝူင်ႈ w + + + + + + + ႁေးသႄႇ + + + မေးၸီႇ + တႆးသျူဝ်ႇ + သျူဝ်းဝႃႇ + ႁေးသီႇ + ရေးဝႃႇ + + + + + + + + ၾႃႇဝႃႇတိၼ်ႇ + ဢေႃးတီႇပႄႇႁႅတ်ႉ + ၶူဝ်ႇရၢတ်ႉ + တီးရ် + မေႃႇတတ်ႉ + သျႃးရိဝႃႇ + မႄးႁႃႇ + ဢပၢၼ်ႇ + ဢႃႇၸႃႇ + တေႇ + ပႃႇမၢၼ်ႇ + ဢႅတ်ႉၾႅၼ်ႇ + + + + + + ပီပႃႇသျႃး + + + + + + + ပီဢွၼ်တၢင်းထၢႆႇဝၢၼ်း + + + ပဢတ. ထၢႆႇဝၢၼ်း + ထၢႆႇဝၢၼ်း + + + + + + + ပၢၼ် - + ပီ ပီၵၢႆ ပီၼႆႉ @@ -4006,7 +2053,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - သၢမ်လိူၼ်ႁွပ်ႈ သလႁ. လိုၼ်းသုတ်း သလႁ. ၼႆႉ သလႁ. ၼႃႈ @@ -4018,16 +2064,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - သၢမ်လိူၼ်ႁွပ်ႈ သလႁ. လိုၼ်းသုတ်း သၢမ်လိူၼ်ႁွပ်ႈၼႆႉ သလႁ. ၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} သလႁ. - - - {0} သလႁ. ပူၼ်ႉမႃး - လိူၼ် @@ -4041,30 +2080,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} လိူၼ်ပူၼ်ႉမႃး - - လိူၼ် - လိူၼ်ပူၼ်ႉမႃး - လိူၼ်ၼႆႉ - လိူၼ်ၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} လိူၼ် - - - {0} လိူၼ်ပူၼ်ႉမႃး - - - - လိူၼ် - လိူၼ်ပူၼ်ႉမႃး - လိူၼ်ၼႆႉ - လိူၼ်ၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} လိူၼ် - - - {0} လိူၼ်ပူၼ်ႉမႃး - - ဝူင်ႈ ဝူင်ႈပူၼ်ႉမႃး @@ -4079,40 +2094,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ဝူင်ႈ {0} - ဝူင်ႈ - ဝူင်ႈပူၼ်ႉမႃး - ဝူင်ႈၼႆႉ - ဝူင်ႈၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝူင်ႈ - - - {0} ဝူင်ႈပူၼ်မႃး - - ဝူင်ႈ {0} - - - ဝူင်ႈ - ဝူင်ႈပူၼ်ႉမႃး - ဝူင်ႈၼႆႉ - ဝူင်ႈၼႃႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝူင်ႈ - {0} ဝူင်ႈပူၼ်မႃး - ဝူင်ႈ {0} ဝူင်ႈၶွင်လိူၼ် - - ဝူင်ႈၶွင်လိူၼ် - - - ဝူင်ႈၶွင်လိူၼ် - ဝၼ်း မိူဝ်ႈဝႃး @@ -4125,57 +2113,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းပူၼ်ႉမႃး - - ဝၼ်း - မိူဝ်ႈဝႃး - မိူဝ်ႈၼႆႉ - မိူဝ်ႈၽုၵ်ႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်း - - - {0} ဝၼ်းပူၼ်ႉမႃး - - - - ဝၼ်း - မိူဝ်ႈဝႃး - မိူဝ်ႈၼႆႉ - မိူဝ်ႈၽုၵ်ႈ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်း - - - {0} ဝၼ်းပူၼ်ႉမႃး - - ဝၼ်းၶွင်ပီ - - ဝၼ်းၶွင်ပီ - - - ဝၼ်းၶွင်ပီ - ဝၼ်းၶွင်ဝူင်ႈ - - ဝၼ်းၶွင်ဝူင်ႈ - - - ဝၼ်းၶွင်ဝူင်ႈ - ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ် - - ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ် - - - ဝၼ်းၼႂ်းဝူင်ႈၶွင်လိူၼ် - ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး ဝၼ်းဢႃးတိတ်ႉၼႆႉ @@ -4187,28 +2133,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး - - ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး - ဝၼ်းဢႃးတိတ်ႉၼႆႉ - ဝၼ်းဢႃးတိတ်ႉတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢႃးတိတ်ႉ - - - {0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး - - - - ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး - ဝၼ်းဢႃးတိတ်ႉၼႆႉ - ဝၼ်းဢႃးတိတ်ႉတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢႃးတိတ်ႉ - - - {0} ဝၼ်းဢႃးတိတ်ႉပူၼ်ႉမႃး - - ဝၼ်းၸၼ်ပူၼ်ႉမႃး ဝၼ်းၸၼ်ၼႆႉ @@ -4220,28 +2144,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး - - ဝၼ်းၸၼ်ပူၼ်ႉမႃး - ဝၼ်းၸၼ်ၼႆႉ - ဝၼ်းၸၼ်တေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၸၼ် - - - {0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး - - - - ဝၼ်းၸၼ်ပူၼ်ႉမႃး - ဝၼ်းၸၼ်ၼႆႉ - ဝၼ်းၸၼ်တေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၸၼ် - - - {0} ဝၼ်းၸၼ်ပူၼ်ႉမႃး - - ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး ဝၼ်းဢင်းၵၢၼ်းၼႆႉ @@ -4253,28 +2155,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး - - ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး - ဝၼ်းဢင်းၵၢၼ်းၼႆႉ - ဝၼ်းဢင်းၵၢၼ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢင်းၵၢၼ်း - - - {0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး - - - - ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး - ဝၼ်းဢင်းၵၢၼ်းၼႆႉ - ဝၼ်းဢင်းၵၢၼ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းဢင်းၵၢၼ်း - - - {0} ဝၼ်းဢင်းၵၢၼ်းပူၼ်ႉမႃး - - ဝၼ်းပုတ်ႉပူၼ်ႉမႃး ဝၼ်းပုတ်ႉၼႆႉ @@ -4286,28 +2166,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး - - ဝၼ်းပုတ်ႉပူၼ်ႉမႃး - ဝၼ်းပုတ်ႉၼႆႉ - ဝၼ်းပုတ်ႉတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းပုတ်ႉ - - - {0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး - - - - ဝၼ်းပုတ်ႉပူၼ်ႉမႃး - ဝၼ်းပုတ်ႉၼႆႉ - ဝၼ်းပုတ်ႉတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းပုတ်ႉ - - - {0} ဝၼ်းပုတ်ႉပူၼ်ႉမႃး - - ဝၼ်းၽတ်းပူၼ်ႉမႃး ဝၼ်းၽတ်းၼႆႉ @@ -4317,86 +2175,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းၽတ်းပူၼ်ႉမႃး - - - - ဝၼ်းၽတ်းပူၼ်ႉမႃး - ဝၼ်းၽတ်းၼႆႉ - ဝၼ်းၽတ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၽတ်း - - - {0} ဝၼ်းၽတ်းပူၼ်ႉမႃး - - - - ဝၼ်းၽတ်းပူၼ်ႉမႃး - ဝၼ်းၽတ်းၼႆႉ - ဝၼ်းၽတ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းၽတ်း - - - {0} ဝၼ်းၽတ်းပူၼ်ႉမႃး - - - - ဝၼ်းသုၵ်းပူၼ်ႉမႃး - ဝၼ်းသုၵ်းၼႆႉ - ဝၼ်းသုၵ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း - - - {0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး - - - - ဝၼ်းသုၵ်းပူၼ်ႉမႃး - ဝၼ်းသုၵ်းၼႆႉ - ဝၼ်းသုၵ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း - - - {0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး - - - - ဝၼ်းသုၵ်းပူၼ်ႉမႃး - ဝၼ်းသုၵ်းၼႆႉ - ဝၼ်းသုၵ်းတေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း - - - {0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး - - - - ဝၼ်းသဝ်ပူၼ်ႉမႃး - ဝၼ်းသဝ်ၼႆႉ - ဝၼ်းသဝ်တေမႃး - - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသဝ် - - - {0} ဝၼ်းသဝ်ပူၼ်ႉမႃး - - - - ဝၼ်းသဝ်ပူၼ်ႉမႃး - ဝၼ်းသဝ်ၼႆႉ - ဝၼ်းသဝ်တေမႃး + + + + ဝၼ်းသုၵ်းပူၼ်ႉမႃး + ဝၼ်းသုၵ်းၼႆႉ + ဝၼ်းသုၵ်းတေမႃး - ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသဝ် + ၼႂ်းၶၢဝ်းတၢင်း {0} ဝၼ်းသုၵ်း - {0} ဝၼ်းသဝ်ပူၼ်ႉမႃး + {0} ဝၼ်းသုၵ်းပူၼ်ႉမႃး - + ဝၼ်းသဝ်ပူၼ်ႉမႃး ဝၼ်းသဝ်ၼႆႉ ဝၼ်းသဝ်တေမႃး @@ -4407,15 +2199,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ဝၼ်းသဝ်ပူၼ်ႉမႃး - - ၶၢဝ်းယၢမ်းဝၼ်း - ၶၢဝ်းယၢမ်းဝၼ်း - - ၶၢဝ်းယၢမ်းဝၼ်း - မူင်း ၸူဝ်ႈမူင်းၼႆႉ @@ -4426,26 +2212,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး - - မူင်း - ၸူဝ်ႈမူင်းၼႆႉ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ၸူဝ်ႈမူင်း - - - {0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး - - - - မူင်း - ၸူဝ်ႈမူင်းၼႆႉ - - ၼႂ်းၶၢဝ်းတၢင်း {0} ၸူဝ်ႈမူင်း - - - {0} ၸူဝ်ႈမူင်းပူၼ်ႉမႃး - - မိၼိတ်ႉ မိၼိတ်ႉ @@ -4456,26 +2222,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} မိၼိတ်ႉပူၼ်ႉမႃး - - မိၼိတ်ႉ - မိၼိတ်ႉ - - ၼႂ်းၶၢဝ်းတၢင်း {0} မိၼိတ်ႉ - - - {0} မိၼိတ်ႉပူၼ်ႉမႃး - - - - မိၼိတ်ႉ - မိၼိတ်ႉ - - ၼႂ်းၶၢဝ်းတၢင်း {0} မိၼိတ်ႉ - - - {0} မိၼိတ်ႉပူၼ်ႉမႃး - - သႅၵ်ႉၵၢၼ်ႉ ယၢမ်းလဵဝ် @@ -4486,35 +2232,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး - - သႅၵ်ႉၵၢၼ်ႉ - ယၢမ်းလဵဝ် - - ၼႂ်းၶၢဝ်းတၢင်း {0} ၸႅၵ်ႉၵၢၼ်ႉ - - - {0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး - - - - သႅၵ်ႉၵၢၼ်ႉ - ယၢမ်းလဵဝ် - - ၼႂ်းၶၢဝ်းတၢင်း {0} ၸႅၵ်ႉၵၢၼ်ႉ - - - {0} ၸႅၵ်ၵၢၼ်ႉပူၼ်ႉမႃး - - ၸူၼ်ႇၶၢဝ်းယၢမ်း ၸူၼ်ႇ - - ၸူၼ်ႇ - ၶၢဝ်းယၢမ်း {0} @@ -4994,9 +2717,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic လီပရႄႇဝီးလ် - - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢိင်းၵလဵတ်ႈ - လၼ်ႇတၼ်ႇ @@ -5087,9 +2807,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၵျႃႉယပူႇရ - - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢၢႆးရိတ်ႉ - တၢပ်ႇလိၼ်ႇ @@ -5824,13 +3541,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်းၵၢင်ဝၼ်း ဢလႅတ်ႉသၵႃႇ - - - ၶၢဝ်းယၢမ်း ဢႄးလ်မႃႇတီႇ - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႄးလ်မႃႇတီႇ - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႄးလ်မႃႇတီႇ - - ၶၢဝ်းယၢမ်း ဢမၸွၼ်ႇ @@ -5880,20 +3590,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သႃႇမူဝ်းဝႃႇ - - - ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတၢဝ်ႉ - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတၢဝ်ႉ - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႅၵ်ႉတၢဝ်ႉ - - - - - ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတူဝ်ႇပီႇ - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢႅၵ်ႉတူဝ်ႇပီႇ - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢႅၵ်ႉတူဝ်ႇပီႇ - - ၶၢဝ်းယၢမ်း ဢႃႇရၢပ်ႈ @@ -5995,6 +3691,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ပရႃႇၸီးလီးယႃး + + + ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ဢိင်းၵလဵတ်ႈ + + ၶၢဝ်းယၢမ်း ပရူႇၼၢႆး @@ -6194,11 +3895,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၵရိၼ်းလႅၼ်း ပွတ်းတူၵ်း - - - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၵႂၢမ်ႇ - - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢၢဝ်ႇ @@ -6211,7 +3907,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ႁႃႇဝၢႆးဢီး-ဢလူးသျၼ်ႇ + လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ႁႃႇဝၢႆးဢီး @@ -6272,6 +3968,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ဢီႇရၢၼ်း + + + လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ဢၢႆးရိတ်ႉ + + ၶၢဝ်းယၢမ်း ဢိရၶုတ်ႉသ်ၶ် @@ -6339,11 +4040,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵႃႇၵိတ်ႈသတၼ်ႇ - - - ၶၢဝ်းယၢမ်း လင်းၵႃ - - ၶၢဝ်းယၢမ်း မူႇၵုၼ်လၢႆး @@ -6356,13 +4052,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း လွတ်ႉႁၢဝ်း - - - ၶၢဝ်းယၢမ်း မႃႇၵၢဝ်ႈ - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း မႃႇၵၢဝ်ႈ - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ မႃႇၵၢဝ်ႈ - - ၶၢဝ်းယၢမ်း မႃႇၵႃႇတၢၼ်ႇ @@ -6481,11 +4170,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း ၾႃႇၼႅၼ်ႇတူဝ်ႇ တႄႇ တီႇၼူဝ်ႇရွၼ်ႇႁႃႇ - - - ၶၢဝ်းယၢမ်း မူႇၵုၼ်မႃႇရီႇယႃႇၼႃႇ ပွတ်းႁွင်ႇ - - ၶၢဝ်းယၢမ်း ၼူဝ်ႇဝူဝ်ႇသီႇပၢတ်ႉသ်ၶ် @@ -6565,13 +4249,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶၢဝ်းယၢမ်း ၵၢဝ်းလီႁွင်ႇ - - - ၶၢဝ်းယၢမ်း ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ - လၵ်းၸဵင် ၶၢဝ်းယၢမ်း ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ - ၶၢဝ်းယၢမ်း ၶၢဝ်းမႆႈ ၶုၺ်ႇၸီးလူဝ်ႇတႃႇ - - ၶၢဝ်းယၢမ်း ရေႇၼီႇယၼ်ႇ @@ -6598,9 +4275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ လၵ်းၸဵင် ၶၢဝ်းယၢမ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ - ၶၢဝ်းယၢမ်း ၵၢင်ဝၼ်း သႃႇမူဝ်းဝႃႇ ၶွ​င် ဢမႄႇရိၵၢၼ်ႇ @@ -6777,1336 +4452,930 @@ CLDR data files are interpreted according to the LDML specification (http://unic ပေႇသႄႇတႃႇဢႅၼ်ႇတူဝ်ႇရႃႇ - ပေႇသႄႇတႃႇဢႅၼ်ႇတူဝ်ႇရႃႇ တီႇရမ်ႇမိူင်းႁူမ်ႈတုမ် ၸဝ်ႈၾႃႉ ဢႃႇရၢပ်ႈ - တီႇရမ်ႇမိူင်းႁူမ်ႈတုမ် ၸဝ်ႈၾႃႉ ဢႃႇရၢပ်ႈ ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ (1927–2002) - ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ (1927–2002) ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ - ဢႃႇၾၵၢၼ်ႇၼီႇဢႃႇၾၵၢၼ်ႇ လႅၵ်ႈဢႃႇပႃးၼီးယႃး (1946–1965) - လႅၵ်ႈဢႃႇပႃးၼီးယႃး (1946–1965) လႅၵ်ႈဢႃႇပႃးၼီးယႃး - လႅၵ်ႈဢႃႇပႃးၼီးယႃး တရၢမ်ႇဢႃႇမေးၼီးယႃး - တရၢမ်ႇဢႃႇမေးၼီးယႃး ၵဵဝ်းတႃႇၼႄႇတႃႇလႅၼ်ႇ ဢၼ်ထေးလ်လိသ် - ၵဵဝ်းတႃႇၼႄႇတႃႇလႅၼ်ႇ ဢၼ်ထေးလ်လိသ် ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ - ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1977–1991) - ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1977–1991) ၶႂၼ်ႇၸႃႇမႂ်ႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1990–2000) - ၶႂၼ်ႇၸႃႇမႂ်ႇဢႅၼ်ႇၵူဝ်ႇလႃႇ (1990–2000) ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ ဢၼ်ၶိုၼ်းမူၼ်ႉမႄးဝႆႉ (1995–1999) - ၶႂၼ်ႇၸႃႇဢႅၼ်ႇၵူဝ်ႇလႃႇ ဢၼ်ၶိုၼ်းမူၼ်ႉမႄးဝႆႉ (1995–1999) ဢေႃႉသထရႄႇလ်ဢႃႇၵျႅၼ်ႇတီးၼႃး - ဢေႃႉသထရႄႇလ်ဢႃႇၵျႅၼ်ႇတီးၼႃး ပေႇသူဝ်ႇလေးဢႃႇၵျႅၼ်ႇတီးၼႃး (1970–1983) - ပေႇသူဝ်ႇလေးဢႃႇၵျႅၼ်ႇတီးၼႃး (1970–1983) ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1881–1970) - ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1881–1970) ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1983–1985) - ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး (1983–1985) ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး - ပေႇသူဝ်ႇဢႃႇၵျႅၼ်ႇတီးၼႃး သျီႇလင်ႇဢေႃးသထရီးယႃး - သျီႇလင်ႇဢေႃးသထရီးယႃး တေႃႇလႃႇဢေႃႉသထရေးလီးယႃး - တေႃႇလႃႇဢေႃႉသထရေးလီးယႃး ၽလေႃးရိၼ်ႇဢႃႇရူးပႃး - ၽလေႃးရိၼ်ႇဢႃႇရူးပႃး မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ (1993–2006) - မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ (1993–2006) မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ - မၼတ်ႉဢႃႇၸႃႇပၢႆႇၸၼ်ႇ တီႇၼႃႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1992–1994) - တီႇၼႃႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1992–1994) မၢၵ်ႉၶ်ပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး ဢၼ်လႅၵ်ႈလႆႈ - မၢၵ်ႉၶ်ပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး ဢၼ်လႅၵ်ႈလႆႈ တီႇၼႃႇမႂ်ႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1994–1997) - တီႇၼႃႇမႂ်ႇပေႃးသၼီးယႃး လႄႈ ႁႃႇၸီႇၵူဝ်းဝီးၼႃး (1994–1997) တေႃႇလႃႇပႃးပေႇတူတ်ႈ - တေႃႇလႃႇပႃးပေႇတူတ်ႈ တႃႇၵႃႇပင်းၵလႃးတဵတ်ႈ - တႃႇၵႃႇပင်းၵလႃးတဵတ်ႈ ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ဢၼ်လႅၵ်ႈလႆႈ) - ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ဢၼ်လႅၵ်ႈလႆႈ) ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ - ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ၵၢၼ်ငိုၼ်းတွင်း) - ၾရၼ်ႉပႄႇၵျီႇယမ်ႇ (ၵၢၼ်ငိုၼ်းတွင်း) လႅပ်ႉၾ်ၶႅင်ပူႇၵႃႇရီႇယႃႇ - လႅပ်ႉၾ်ၶႅင်ပူႇၵႃႇရီႇယႃႇ လႅပ်ႉၾ်သူဝ်ႇသျႄႇလိတ်ႉပူႇၵႃႇရီႇယႃႇ - လႅပ်ႉၾ်သူဝ်ႇသျႄႇလိတ်ႉပူႇၵႃႇရီႇယႃႇ လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ - လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ (1879–1952) - လႅပ်ႉၾ်ပူႇၵႃႇရီႇယႃႇ (1879–1952) တီႇၼႃႇပႃႇရဵၼ်း - တီႇၼႃႇပႃႇရဵၼ်း ၾရၼ်ႉပူႇရုၼ်းတီႇ - ၾရၼ်ႉပူႇရုၼ်းတီႇ တေႃႇလႃႇပႃႇမိဝ်းတႃး - တေႃႇလႃႇပႃႇမိဝ်းတႃး တေႃႇလႃႇပရူႇၼၢႆး - တေႃႇလႃႇပရူႇၼၢႆး ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး - ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး (1863–1963) - ပူဝ်ႇလီႇဝီႇယႃႇၼူဝ်ႇပူဝ်ႇလီးပီးယႃး (1863–1963) ပေႇသူဝ်ႇပူဝ်ႇလီးပီးယႃး - ပေႇသူဝ်ႇပူဝ်ႇလီးပီးယႃး ဢႅမ်ႇဝီႇတေႃးပူဝ်ႇလီးပီးယႃး - ဢႅမ်ႇဝီႇတေႃးပူဝ်ႇလီးပီးယႃး ၶရူႇၸႄရူဝ်ႇမႂ်ႇပရႃႇၸီး (1967–1986) - ၶရူႇၸႄရူဝ်ႇမႂ်ႇပရႃႇၸီး (1967–1986) ၶရူႇၸႃတူဝ်ႇပရႃႇၸီး (1986–1989) - ၶရူႇၸႃတူဝ်ႇပရႃႇၸီး (1986–1989) ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1990–1993) - ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1990–1993) ရီးဢႄႇလ်ပရႃႇၸီး - ရီးဢႄႇလ်ပရႃႇၸီး ၶရူႇၸႃတူဝ်ႇမႂ်ႇပရႃႇၸီး (1989–1990) - ၶရူႇၸႃတူဝ်ႇမႂ်ႇပရႃႇၸီး (1989–1990) ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1993–1994) - ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1993–1994) ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1942–1967) - ၶရူႇၸႄရူဝ်ႇပရႃႇၸီး (1942–1967) တေႃႇလႃႇပႃႇႁႃးမႃး - တေႃႇလႃႇပႃႇႁႃးမႃး ဢိၼ်ၵူးလ်ထရမ်ႇၽူႇတၢၼ်ႇ - ဢိၼ်ၵူးလ်ထရမ်ႇၽူႇတၢၼ်ႇ ၵျၢပ်ႈမၢၼ်ႈ - ၵျၢပ်ႈမၢၼ်ႈ ပူႇလႃႇပွတ်ႉသဝႃႇၼႃႇ - ပူႇလႃႇပွတ်ႉသဝႃႇၼႃႇ ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (1994–1999) - ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (1994–1999) ရူႇပႄႇပႄႇလႃႇရုတ်ႈ - ရူႇပႄႇပႄႇလႃႇရုတ်ႈ ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (2000–2016) - ရူႇပႄႇပႄႇလႃႇရုတ်ႈ (2000–2016) တေႃႇလႃႇပႄႇလိတ်ႈ - တေႃႇလႃႇပႄႇလိတ်ႈ တေႃႇလႃႇၶႅၼ်ႇၼေႇတႃႇ - တေႃႇလႃႇၶႅၼ်ႇၼေႇတႃႇ ၾရၼ်ႉၶွင်ႇၵူဝ်ႇ - ၾရၼ်ႉၶွင်ႇၵူဝ်ႇ ယူႇရူဝ်ႇ WIR - ယူႇရူဝ်ႇ WIR ၾရၼ်ႉသဝိတ်ႈၸႃႇလႅၼ်ႇ - ၾရၼ်ႉသဝိတ်ႈၸႃႇလႅၼ်ႇ ၾရၼ်ႉ WIR - ၾရၼ်ႉ WIR ဢႅတ်ႉသၵူႇတူဝ်ႇၶျီႇလီႇ - ဢႅတ်ႉသၵူႇတူဝ်ႇၶျီႇလီႇ ယူႇၼီႉၶွင်ဢၶွင်ႉၶျီႇလီႇ - ယူႇၼီႉၶွင်ဢၶွင်ႉၶျီႇလီႇ ပေႇသူဝ်ႇၶျီႇလီႇ - ပေႇသူဝ်ႇၶျီႇလီႇ ယွၼ်ႇၶႄႇ (ၼွၵ်ႈၽၢင်ႇပၢင်ႇလၢႆႇ) - ယွၼ်ႇၶႄႇ (ၼွၵ်ႈၽၢင်ႇပၢင်ႇလၢႆႇ) - - - တေႃႇလႃႇယေးငိုၼ်းၵူၼ်းမိူင်းၶႄႇ - တေႃႇလႃႇယေးငိုၼ်းၵူၼ်းမိူင်းၶႄႇ ယွၼ်ႇၶႄႇ - ယွၼ်ႇၶႄႇ ပေႇသူဝ်ႇၵူဝ်ႇလမ်ႇပီႇယႃႇ - ပေႇသူဝ်ႇၵူဝ်ႇလမ်ႇပီႇယႃႇ ယူႇၼိတ်ႉၵႃႈၶၼ်တႄႉတႄႉၵူဝ်ႇလမ်ႇပီႇယႃႇ - ယူႇၼိတ်ႉၵႃႈၶၼ်တႄႉတႄႉၵူဝ်ႇလမ်ႇပီႇယႃႇ ၵူဝ်ႇလူၼ်ႇၵေႃးသတႃႇရိၵႃႇ - ၵူဝ်ႇလူၼ်ႇၵေႃးသတႃႇရိၵႃႇ တီႇၼႃႇသႃးပီးယႃး (2002–2006) - တီႇၼႃႇသႃးပီးယႃး (2002–2006) ၵူဝ်ႇရူႇၼႃႇၶႅင်ၶျႅၵ်ႈ - ၵူဝ်ႇရူႇၼႃႇၶႅင်ၶျႅၵ်ႈ ပေႇသူဝ်ႇၵူးပႃး ဢၼ်လႅၵ်ႈလႆႈ - ပေႇသူဝ်ႇၵူးပႃး ဢၼ်လႅၵ်ႈလႆႈ ပေႇသူဝ်ႇၵူးပႃး - ပေႇသူဝ်ႇၵူးပႃး ဢိသ်ၵူႇတူဝ်ႇၶဵပ်ႉဝႄႇတီႇ - ဢိသ်ၵူႇတူဝ်ႇၶဵပ်ႉဝႄႇတီႇ ပွၼ်းသၢႆႉပရႅတ်ႈ - ပွၼ်းသၢႆႉပရႅတ်ႈ ၵူဝ်ႇရူႇၼႃႇၶျႅၵ်ႈ - ၵူဝ်ႇရူႇၼႃႇၶျႅၵ်ႈ မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇပွတ်းဢွၵ်ႇ - မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇပွတ်းဢွၵ်ႇ မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇ - မၢၵ်ႉၶ်ၵျႃႇမၼ်ႇ ၾရၼ်ႉၵျီႇပူးတီႇ - ၾရၼ်ႉၵျီႇပူးတီႇ ၶရူၼ်းတႅၼ်းမၢၵ်ႈ - ၶရူၼ်းတႅၼ်းမၢၵ်ႈ ပေႇသူဝ်ႇတူဝ်ႇမီႇၼီႇၵၼ်ႇ - ပေႇသူဝ်ႇတူဝ်ႇမီႇၼီႇၵၼ်ႇ တီႇၼႃႇဢႄးၵျီးရီးယႃး - တီႇၼႃႇဢႄးၵျီးရီးယႃး သုၶရေႇဢေႇၵႂႃႇတေႃႇ - သုၶရေႇဢေႇၵႂႃႇတေႃႇ ယူးၼိတ်ႉၵႃႈၶၼ်ဢေႇၵႂႃႇတေႃႇ ဢၼ်ဢမ်ႇလႅၵ်ႈလၢႆႈ - ယူးၼိတ်ႉၵႃႈၶၼ်ဢေႇၵႂႃႇတေႃႇ ဢၼ်ဢမ်ႇလႅၵ်ႈလၢႆႈ ၶရူၼ်းဢႄႇသတူဝ်းၼီးယႃး - ၶရူၼ်းဢႄႇသတူဝ်းၼီးယႃး ပွၼ်းဢီးၵျိပ်ႈ - ပွၼ်းဢီးၵျိပ်ႈ ၼၢၵ်ႉၾႃႉဢႄႇရီႇထရီးယႃး - ၼၢၵ်ႉၾႃႉဢႄႇရီႇထရီးယႃး ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉ) - ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉ) ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉဢၼ်လႅၵ်ႈလႆႈ) - ပေႇသႄႇတႃႇသပဵၼ်ႇ (ဢၶွင်ႉဢၼ်လႅၵ်ႈလႆႈ) ပေႇသႄႇတႃႇသပဵၼ်ႇ - ပေႇသႄႇတႃႇသပဵၼ်ႇ ပႄးရ်ဢီႇတီႇယူဝ်းပီးယႃး - ပႄးရ်ဢီႇတီႇယူဝ်းပီးယႃး ယူႇရူဝ်ႇ - ယူႇရူဝ်ႇ မႃႇၶႃႇၾိၼ်ႇလႅၼ်ႇ - မႃႇၶႃႇၾိၼ်ႇလႅၼ်ႇ တေႃႇလႃႇၾီႇၵျီႇ - တေႃႇလႃႇၾီႇၵျီႇ ပွၼ်းမူႇၵုၼ်ၾွၵ်ႉလႅၼ်ႇ - ပွၼ်းမူႇၵုၼ်ၾွၵ်ႉလႅၼ်ႇ ၾရၼ်ႉၾရၢင်ႇသဵတ်ႈ - ၾရၼ်ႉၾရၢင်ႇသဵတ်ႈ ပွၼ်းဢိင်းၵလဵတ်ႈ - ပွၼ်းဢိင်းၵလဵတ်ႈ ၵူႇပုၼ်ႇလႃႇရိတ်ႉၵျေႃႇၵျႃႇ - ၵူႇပုၼ်ႇလႃႇရိတ်ႉၵျေႃႇၵျႃႇ လႃႇရီႇၵျေႃႇၵျႃႇ - လႃႇရီႇၵျေႃႇၵျႃႇ သေႇတီႇၵႃႇၼႃႇ (1979–2007) - သေႇတီႇၵႃႇၼႃႇ (1979–2007) သေႇတီႇၵႃႇၼႃႇ - သေႇတီႇၵႃႇၼႃႇ ပွၼ်း ၵျီႇပရေႃးတႃး - ပွၼ်း ၵျီႇပရေႃးတႃး တႃႇလႃႇသီႇၵမ်ႇပီးယႃး - တႃႇလႃႇသီႇၵမ်ႇပီးယႃး ၾရၼ်ႉၵီးၼီး - ၾရၼ်ႉၵီးၼီး သီႇလီႇၵီးၼီး - သီႇလီႇၵီးၼီး ဢႅၵ်ႉဝႄႇလႄႇဢီႇၵူၺ်ႇတေႃႇရီႇယႃႇၵီးၼီး - ဢႅၵ်ႉဝႄႇလႄႇဢီႇၵူၺ်ႇတေႃႇရီႇယႃႇၵီးၼီး တရၢၵ်ႉမႃႇၵရိတ်ႈ - တရၢၵ်ႉမႃႇၵရိတ်ႈ ၶႅတ်ႉၸႄးလ်ၵႂႃႇတမႃႇလႃႇ - ၶႅတ်ႉၸႄးလ်ၵႂႃႇတမႃႇလႃႇ ဢႅတ်ႉၵူႇတူဝ်ႇၵီးၼီးပေႃးတူႉၵၢဝ်ႇ - ဢႅတ်ႉၵူႇတူဝ်ႇၵီးၼီးပေႃးတူႉၵၢဝ်ႇ ပေႇသူဝ်ႇၵီးၼီး-ပိတ်ႈသၢဝ်ႇ - ပေႇသူဝ်ႇၵီးၼီး-ပိတ်ႈသၢဝ်ႇ တေႃႇလႃႇၵၢႆႇယႃးၼႃႇ - တေႃႇလႃႇၵၢႆႇယႃးၼႃႇ တေႃႇလႃႇႁွင်းၵွင်း - တေႃႇလႃႇႁွင်းၵွင်း လႅမ်းပီႇရႃႇႁွၼ်ႇတူးရႅတ်ႈ - လႅမ်းပီႇရႃႇႁွၼ်ႇတူးရႅတ်ႈ တီႇၼႃႇၶရူဝ်ႇဢေးသျႃး - တီႇၼႃႇၶရူဝ်ႇဢေးသျႃး ၵူႇၼႃႇၶရူဝ်ႇဢေးသျႃး - ၵူႇၼႃႇၶရူဝ်ႇဢေးသျႃး ၵုတ်ႉထ်ႁေးတီႇ - ၵုတ်ႉထ်ႁေးတီႇ ၾူဝ်ႇရိၼ်ႇႁၢင်ႇၵေႇရီႇ - ၾူဝ်ႇရိၼ်ႇႁၢင်ႇၵေႇရီႇ ရူႇပီးယႃးဢိၼ်ႇတူဝ်ႇၼီးသျႃး - ရူႇပီးယႃးဢိၼ်ႇတူဝ်ႇၼီးသျႃး ပွၼ်းဢၢႆႇယႃႇလႅၼ်ႇ - ပွၼ်းဢၢႆႇယႃႇလႅၼ်ႇ ပွၼ်းဢိတ်ႇသရေး - ပွၼ်းဢိတ်ႇသရေး သျႅၵ်ႈၵႄႇလ်ဢိတ်ႇသရေး (1980–1985) - သျႅၵ်ႈၵႄႇလ်ဢိတ်ႇသရေး (1980–1985) သျႅၵ်ႈၵႄႇလ်မႂ်ႇဢိတ်ႇသရေး - သျႅၵ်ႈၵႄႇလ်မႂ်ႇဢိတ်ႇသရေး ရူႇပီးဢိၼ်းတီးယႃး - ရူႇပီးဢိၼ်းတီးယႃး တီႇၼႃႇဢီႇရၢၵ်ႈ - တီႇၼႃႇဢီႇရၢၵ်ႈ ရီဢႄလ်ဢီႇရၢၼ်း - ရီဢႄလ်ဢီႇရၢၼ်း ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ (1918–1981) - ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ (1918–1981) ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ - ၶရူဝ်ႇၼႃႇဢၢႆးသလႅၼ်ႇ လီႇရႃႇဢီႇတႃႇလီႇ - လီႇရႃႇဢီႇတႃႇလီႇ တေႃႇလႃႇၵျႃႇမေႇၵႃႇ - တေႃႇလႃႇၵျႃႇမေႇၵႃႇ တီႇၼႃႇၵျေႃႇတၼ်ႇ - တီႇၼႃႇၵျေႃႇတၼ်ႇ ယႅၼ်းၵျႃႇပၢၼ်ႇ - ယႅၼ်းၵျႃႇပၢၼ်ႇ သျီႇလိင်ႇၶႅၼ်ႇၺႃႇ - သျီႇလိင်ႇၶႅၼ်ႇၺႃႇ သွမ်ႇၵႃႇၵိတ်ႈသတၼ်ႇ - သွမ်ႇၵႃႇၵိတ်ႈသတၼ်ႇ ရိဢႄလ်ၵမ်ႇပေႃးတီးယႃး - ရိဢႄလ်ၵမ်ႇပေႃးတီးယႃး ၽရၼ်ႉၶူဝ်ႇမူဝ်ႇရူတ်ႈ - ၽရၼ်ႉၶူဝ်ႇမူဝ်ႇရူတ်ႈ ဝွၼ်ႇၵၢဝ်းလီႁွင်ႇ - ဝွၼ်ႇၵၢဝ်းလီႁွင်ႇ ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1953–1962) - ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1953–1962) ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1945–1953) - ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း (1945–1953) ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း - ဝွၼ်ႇၵၢဝ်းလီၸၢၼ်း တီႇၼႃႇၶူႇဝဵတ်ႈ - တီႇၼႃႇၶူႇဝဵတ်ႈ တေႃႇလႃႇမူႇၵုၼ်ၶေးမႅၼ်း - တေႃႇလႃႇမူႇၵုၼ်ၶေးမႅၼ်း ထႅင်ၵႄႇၵႃႇၸၢၵ်ႈသတၼ်ႇ - ထႅင်ၵႄႇၵႃႇၸၢၵ်ႈသတၼ်ႇ ၵိပ်ႇလၢဝ်း - ၵိပ်ႇလၢဝ်း ပွၼ်းလႄႇပႃႇၼွၼ်ႇ - ပွၼ်းလႄႇပႃႇၼွၼ်ႇ ရူႇပီးသီႇရိလင်းၵႃ - ရူႇပီးသီႇရိလင်းၵႃ တေႃႇလႃႇလၢႆႇပေးရီးယႃး - တေႃႇလႃႇလၢႆႇပေးရီးယႃး လူဝ်ႇတီႇလႄႇသူဝ်းတူဝ်ႇ - လူဝ်ႇတီႇလႄႇသူဝ်းတူဝ်ႇ လိတတ်ႉသ်လီႉတူႇဝေးၼီးယႃး - လိတတ်ႉသ်လီႉတူႇဝေးၼီးယႃး တႄႇလူဝ်ႇၼတ်ႉလီႉတူႇဝေးၼီးယႃး - တႄႇလူဝ်ႇၼတ်ႉလီႉတူႇဝေးၼီးယႃး ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ ဢၼ်လႅၵ်ႈလႆႈ - ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ ဢၼ်လႅၵ်ႈလႆႈ ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ - ၾရၼ်ႉလၢၵ်ႈၸိမ်ႇပၢၵ်ႈ ၾရၼ်ႉၵၢၼ်ငိုၼ်းတွင်း လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ - ၾရၼ်ႉၵၢၼ်ငိုၼ်းတွင်း လၢၵ်ႈၸိမ်ႇပၢၵ်ႈ လတ်ႉသ်လၢတ်ႈဝီႇယႃႇ - လတ်ႉသ်လၢတ်ႈဝီႇယႃႇ ရူႇပႄႇလၢတ်ႉဝီႇယႃႇ - ရူႇပႄႇလၢတ်ႉဝီႇယႃႇ တီႇၼႃႇလိပ်ႉပျႃး - တီႇၼႃႇလိပ်ႉပျႃး တီႇရမ်ႇမေႃႇရူဝ်ႇၵူဝ်ႇ - တီႇရမ်ႇမေႃႇရူဝ်ႇၵူဝ်ႇ ၾရၼ်ႉမေႃႇရူဝ်ႇၵူဝ်ႇ - ၾရၼ်ႉမေႃႇရူဝ်ႇၵူဝ်ႇ ၾရၼ်ႉမူဝ်ႇၼႃႉၶူဝ်ႇ - ၾရၼ်ႉမူဝ်ႇၼႃႉၶူဝ်ႇ ၶူႇပွၼ်ႇမေႃႇတူဝ်းဝႃး - ၶူႇပွၼ်ႇမေႃႇတူဝ်းဝႃး လဵဝ်းမေႃႇတူဝ်းဝႃး - လဵဝ်းမေႃႇတူဝ်းဝႃး ဢႃႇရီႇယႃႇရီႇမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ - ဢႃႇရီႇယႃႇရီႇမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ ၾရၼ်ႉမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ - ၾရၼ်ႉမၢတ်ႈတႃႇၵၢတ်ႈသၵႃႇ တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ - တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ (1992–1993) - တႅၼ်ႇၼႃႇမႄႇၶေႇတူဝ်းၼီးယႃးႁွင်ႇ (1992–1993) ၾရၼ်ႉမႃႇလီႇ - ၾရၼ်ႉမႃႇလီႇ ၵျၢပ်ႈမျၢၼ်ႇမႃႇ - ၵျၢပ်ႈမျၢၼ်ႇမႃႇ တူႉၵရိၵ်ႉမူင်ႇၵူဝ်းလီးယႃး - တူႉၵရိၵ်ႉမူင်ႇၵူဝ်းလီးယႃး ပႃႇတႃႇၵႃႇမႃႇၵၢဝ်ႈ - ပႃႇတႃႇၵႃႇမႃႇၵၢဝ်ႈ ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး (1973–2017) - ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး (1973–2017) ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး - ဢူးၵီႇယႃႇမေႃႇရီႇတေးၼီးယႃး လီႇရႃႇမေႃးတႃႇ - လီႇရႃႇမေႃးတႃႇ ပွၼ်းမေႃးတႃႇ - ပွၼ်းမေႃးတႃႇ ရူႇပီးမေႃးရီႇသႃႇ - ရူႇပီးမေႃးရီႇသႃႇ ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ (1947–1981) - ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ (1947–1981) ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ - ရူႇၾီႇယႃႇမေႃႇတိပ်ႈ ၶႂႃႇၶျႃႇမႃႇလႃႇဝီႇ - ၶႂႃႇၶျႃႇမႃႇလႃႇဝီႇ ပေႇသူဝ်ႇမႅၵ်ႇသီႇၵူဝ်ႇ - ပေႇသူဝ်ႇမႅၵ်ႇသီႇၵူဝ်ႇ ပေႇသူဝ်ႇငိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ (1861–1992) - ပေႇသူဝ်ႇငိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ (1861–1992) ယူႇၼိတ်ႉလူင်းတိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ - ယူႇၼိတ်ႉလူင်းတိုၼ်းမႅၵ်ႇသီႇၵူဝ်ႇ ရိင်းၵိတ်ႉမလေးသျႃး - ရိင်းၵိတ်ႉမလေးသျႃး ဢႅတ်ႉသၵူတူဝ်ႇမူဝ်ႇၸမ်းပိၵ်ႈ - ဢႅတ်ႉသၵူတူဝ်ႇမူဝ်ႇၸမ်းပိၵ်ႈ မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ (1980–2006) - မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ (1980–2006) မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ - မႅတ်ႉတိၵ်ႉၵႄႇလ်မူဝ်ႇၸမ်းပိၵ်ႈ တေႃႇလႃႇၼႃႇမီးပီးယႃး - တေႃႇလႃႇၼႃႇမီးပီးယႃး ၼေးရႃႇၼၢႆႇၵျီးရီးယႃး - ၼေးရႃႇၼၢႆႇၵျီးရီးယႃး ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ (1988–1991) - ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ (1988–1991) ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ - ၵေႃႇတူဝ်ႇပႃႇၼီႇၵႃႇရႃႇၵႂႃႇ ၵိလ်တႃႇတၢတ်ႉၶျ် - ၵိလ်တႃႇတၢတ်ႉၶျ် ၶရူၼ်းၼေႃႇဝူၺ်း - ၶရူၼ်းၼေႃႇဝူၺ်း ရူႇပီးၼေႇပေႃး - ရူႇပီးၼေႇပေႃး တေႃႇလႃႇၼိဝ်းၸီႇလႅၼ်ႇ - တေႃႇလႃႇၼိဝ်းၸီႇလႅၼ်ႇ ရီဢႄလ်ဢူဝ်ႇမၢၼ်ႇ - ရီဢႄလ်ဢူဝ်ႇမၢၼ်ႇ ပႄးလ်ပူဝ်ႇဢႃႇပႃႈၼႃးမႃး - ပႄးလ်ပူဝ်ႇဢႃႇပႃႈၼႃးမႃး ဢိၼ်ႇတီႇပေႇရူႉ - ဢိၼ်ႇတီႇပေႇရူႉ သူဝ်းလ်ပေႇရူႉ - သူဝ်းလ်ပေႇရူႉ သူဝ်းလ်ပေႇရူႉ (1863–1965) - သူဝ်းလ်ပေႇရူႉ (1863–1965) ၶိၼႃႇပႃးပႂႃႇၼိဝ်းၵီးၼီး - ၶိၼႃႇပႃးပႂႃႇၼိဝ်းၵီးၼီး ပေႇသူဝ်ႇၾီလိပ်ႈပိၼ်း - ပေႇသူဝ်ႇၾီလိပ်ႈပိၼ်း ရူႇပီးပႃႇၵိတ်ႈသတၼ်ႇ - ရူႇပီးပႃႇၵိတ်ႈသတၼ်ႇ ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ - ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ (1950–1995) - ၸလူဝ်ႇတီႇပူဝ်ႇလႅၼ်ႇ (1950–1995) ဢိသ်ၵူႇတူဝ်ႇ တိူဝ်ႇၵီႇ - ဢိသ်ၵူႇတူဝ်ႇ တိူဝ်ႇၵီႇ ၵႂႃႇရႃႇၼီပႃႇရႃႇၵူၺ်း - ၵႂႃႇရႃႇၼီပႃႇရႃႇၵူၺ်း ရီယႄႇလ်ၶႃႇတႃႇ - ရီယႄႇလ်ၶႃႇတႃႇ တေႃႇလႃႇရူဝ်ႇတႄႇသီႇယႅၼ်ႇ - တေႃႇလႃႇရူဝ်ႇတႄႇသီႇယႅၼ်ႇ လဵဝ်းရူဝ်ႇမေးၼီးယႃး (1952–2006) - လဵဝ်းရူဝ်ႇမေးၼီးယႃး (1952–2006) လဵဝ်းရူဝ်ႇမေးၼီးယႃး - လဵဝ်းရူဝ်ႇမေးၼီးယႃး တီႇၼႃႇ သႃးပီးယႃး - တီႇၼႃႇ သႃးပီးယႃး ရူႇပႄႇရတ်ႈသျႃး - ရူႇပႄႇရတ်ႈသျႃး ရူႇပႄႇရတ်ႈသျႃး (1991–1998) - ရူႇပႄႇရတ်ႈသျႃး (1991–1998) ၾရၼ်ႉရဝၢၼ်းတႃႇ - ၾရၼ်ႉရဝၢၼ်းတႃႇ ရီယႄႇလ်သေႃႇတီႇ - ရီယႄႇလ်သေႃႇတီႇ တေႃႇလႃႇမူႇၵုၼ်သေႃႇလေႃႇမၼ်ႇ - တေႃႇလႃႇမူႇၵုၼ်သေႃႇလေႃႇမၼ်ႇ ရူႇပီးသေးသျႄႇ - ရူႇပီးသေးသျႄႇ တီႇၼႃႇသူႇတၼ်ႇ (1992–2007) - တီႇၼႃႇသူႇတၼ်ႇ (1992–2007) ပွၼ်းသူႇတၼ်ႇ - ပွၼ်းသူႇတၼ်ႇ ပွၼ်းသူႇတၼ်ႇ (1957–1998) - ပွၼ်းသူႇတၼ်ႇ (1957–1998) ၶရူဝ်ႇၼႃႇသုၺ်ႇတိၼ်ႇ - ၶရူဝ်ႇၼႃႇသုၺ်ႇတိၼ်ႇ တေႃႇလႃႇသိင်ႇၵႃႇပူဝ်ႇ - တေႃႇလႃႇသိင်ႇၵႃႇပူဝ်ႇ ပွၼ်းသဵင်ႉႁႄးလႄးၼႃႇ - ပွၼ်းသဵင်ႉႁႄးလႄးၼႃႇ တူဝ်ႇလႃႇ သလူဝ်ႇဝေးၼီးယႃး - တူဝ်ႇလႃႇ သလူဝ်ႇဝေးၼီးယႃး ၶူဝ်ႇရူႇၼႃႇသလူဝ်ႇဝႃးၵီးယႃး - ၶူဝ်ႇရူႇၼႃႇသလူဝ်ႇဝႃးၵီးယႃး လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ - လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ (1964–2022) - လီႇယူၼ်ႇသီႇဢႄႇရႃႇလီႇယူၼ်ႇ (1964–2022) သျီႇလိင်ႇသူဝ်ႇမႃးလီးယႃး - သျီႇလိင်ႇသူဝ်ႇမႃးလီးယႃး တေႃႇလႃသျူးရီးၼႃႇမႄႇ - တေႃႇလႃသျူးရီးၼႃႇမႄႇ ၵိလ်တႃႇသျူးရီးၼႃႇမႄႇ - ၵိလ်တႃႇသျူးရီးၼႃႇမႄႇ ပွၼ်းသူႇတၼ်ႇၸၢၼ်း - ပွၼ်းသူႇတၼ်ႇၸၢၼ်း တူဝ်ပရႃႇ သူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ (1997–2017) - တူဝ်ပရႃႇ သူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ (1997–2017) တူဝ်ႇပရႃႇသူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ - တူဝ်ႇပရႃႇသူၼ်ႇတူဝ်ႇမေး လႄႈ ပရိၼ်ႇသီႇပေႇ ရူႇပႄႇသူဝ်ႇဝီႇယႅတ်ႉ - ရူႇပႄႇသူဝ်ႇဝီႇယႅတ်ႉ ၵူဝ်ႇလူၼ်ႇဢႄႇသႃႇဝႃႇတေႃႇ - ၵူဝ်ႇလူၼ်ႇဢႄႇသႃႇဝႃႇတေႃႇ ပွၼ်းသီးရီးယႃး - ပွၼ်းသီးရီးယႃး လီႇလႅၼ်ႇၵျႅၼ်ႇၼီႇဢႅတ်ႇသ်ဝႃႇတီးၼီႇ - လီႇလႅၼ်ႇၵျႅၼ်ႇၼီႇဢႅတ်ႇသ်ဝႃႇတီးၼီႇ ဝၢတ်ႇထႆး - ဝၢတ်ႇထႆး ရူႇပႄႇတႃႇၵျီႇၵီႇသတၼ်ႇ - ရူႇပႄႇတႃႇၵျီႇၵီႇသတၼ်ႇ သူဝ်ႇမူဝ်ႇၼီႇတႃႇၵျီႇၵီႇသတၼ်ႇ - သူဝ်ႇမူဝ်ႇၼီႇတႃႇၵျီႇၵီႇသတၼ်ႇ မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ (1993–2009) - မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ (1993–2009) မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ - မၼတ်ႉတၢၵ်ႈမႅၼ်ႇၼီႇသတၼ်ႇ တီႇၼႃႇတူႇၼီးသျႃး - တီႇၼႃႇတူႇၼီးသျႃး ပႃဢင်ၵႃႉထွင်းၵႃႇ - ပႃဢင်ၵႃႉထွင်းၵႃႇ ဢႅတ်ႉၵူႇတူဝ်ႇတီႇမေႃး - ဢႅတ်ႉၵူႇတူဝ်ႇတီႇမေႃး လီႇရႃႇတိူဝ်ႇၵီႇ (1922–2005) - လီႇရႃႇတိူဝ်ႇၵီႇ (1922–2005) လီႇရႃႇတိူဝ်ႇၵီႇ - လီႇရႃႇတိူဝ်ႇၵီႇ တေႃႇလႃႇထရီႇၼီႇတၢတ်ႈ လႄႈ ထူဝ်ႇပေးၵူဝ်ႇ - တေႃႇလႃႇထရီႇၼီႇတၢတ်ႈ လႄႈ ထူဝ်ႇပေးၵူဝ်ႇ တေႃႇလႃႇထၢႆႇဝၢၼ်းမႂ်ႇ - တေႃႇလႃႇထၢႆႇဝၢၼ်းမႂ်ႇ သျီႇလိင်ႇထၼ်ႇၸၼ်းၼီးယႃး - သျီႇလိင်ႇထၼ်ႇၸၼ်းၼီးယႃး ႁရီႇဝၼီႇယႃႇယူႇၶရဵၼ်း - ႁရီႇဝၼီႇယႃႇယူႇၶရဵၼ်း ၶႃႇပူဝ်ႇဝႅၼ်ႇၼႅတ်ႉယူႇၶရဵၼ်း - ၶႃႇပူဝ်ႇဝႅၼ်ႇၼႅတ်ႉယူႇၶရဵၼ်း သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ (2966–1987) - သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ (2966–1987) သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ - သျီႇလိင်ႇယူႇၵၼ်ႇတႃႇ တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ - တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ထႅင်ႈဝၼ်းၼိုင်ႈ) - တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ထႅင်ႈဝၼ်းၼိုင်ႈ) တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ဝၼ်းလဵဝ်ၵၼ်) - တေႃႇလႃႇဢမႄႇရိၵၢၼ်ႇ (ဝၼ်းလဵဝ်ၵၼ်) ပေႇသူဝ်ဢုရုၵူၺ်း(ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ) - ပေႇသူဝ်ဢုရုၵူၺ်း(ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ) ပေႇသူဝ်ႇဢုရုၵူၺ်း (1975–1993) - ပေႇသူဝ်ႇဢုရုၵူၺ်း (1975–1993) ပေႇသူဝ်ဢုရုၵူၺ်း - ပေႇသူဝ်ဢုရုၵူၺ်း ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ ငိုၼ်းလိူၼ်ဢုရုၵူၺ်း - ယူႇၼိတ်ႉဢၼ်ၼႄဝႆႉ ငိုၼ်းလိူၼ်ဢုရုၵူၺ်း သွမ်ႇဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ - သွမ်ႇဢူႇၸပႄႉၵိတ်ႇသတၼ်ႇ ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး (1871–2008) - ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး (1871–2008) ပူဝ်ႇလီႇဝႃႇသူဝ်ႇပႃႇရႃႇၼူဝ်ႇ - ပူဝ်ႇလီႇဝႃႇသူဝ်ႇပႃႇရႃႇၼူဝ်ႇ Venezuelan Bolívar (2008–2018) - Venezuelan Bolívar (2008–2018) ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး - ပူဝ်ႇလီႇဝႃႇဝႄႇၼေႇၸွႆးလႃး တွင်ႇဝႅတ်ႉၼမ်း - တွင်ႇဝႅတ်ႉၼမ်း တွင်ႇဝႅတ်ႉၼမ်း (1978–1985) - တွင်ႇဝႅတ်ႉၼမ်း (1978–1985) ဝႃႇထူႇဝႅၼ်ႇၼူးဝႃႇထူႇ - ဝႃႇထူႇဝႅၼ်ႇၼူးဝႃႇထူႇ တႃလႃႉသႃႇမူဝ်းဝႃႇ - တႃလႃႉသႃႇမူဝ်းဝႃႇ ၾရၼ်ႉၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းၵၢင် - ၾရၼ်ႉၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းၵၢင် ငိုၼ်း - ငိုၼ်း ၶမ်း - ၶမ်း ယူႇၼိတ်ႉၶွမ်းပူဝ်းသိတ်ႉယူးရူပ်ႉ - ယူႇၼိတ်ႉၶွမ်းပူဝ်းသိတ်ႉယူးရူပ်ႉ - ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ - ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ + ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းယူးရူပ်ႉ ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBC) - ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBC) ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBD) - ယူႇၼိတ်ႉဢၶွင်ႉယူးရူပ်ႉ (XBD) တေႃႇလႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇပွတ်းဢွၵ်ႇ - တေႃႇလႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇပွတ်းဢွၵ်ႇ ၵဵဝ်းတႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇ - ၵဵဝ်းတႃႇၶႃႇရိပ်ႈပီႇယၼ်ႇ သုၼ်ႇထွၼ်ငိုၼ်းၶိုၵ်ႉတွၼ်း - သုၼ်ႇထွၼ်ငိုၼ်းၶိုၵ်ႉတွၼ်း ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ - ယူႇၼိတ်ႉၵၢၼ်ငိုၼ်းတွင်းယူးရူပ်ႉ ၾရၼ်ႉၶမ်းၾရၢင်ႇသဵတ်ႈ - ၾရၼ်ႉၶမ်းၾရၢင်ႇသဵတ်ႈ ၾရၼ်ႉ-UIC ၾရၢင်ႇသဵတ်ႈ - ၾရၼ်ႉ-UIC ၾရၢင်ႇသဵတ်ႈ ၾရၼ်ႉ ၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းတူၵ်း - ၾရၼ်ႉ ၸီႇဢႅပ်ႉဢေႇ ဢႃႇၾရိၵ ပွတ်းတူၵ်း ပႄႇလတ်ႇတီႇယမ်ႇ - ပႄႇလတ်ႇတီႇယမ်ႇ ၾရၼ်ႉၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး - ၾရၼ်ႉၼိဝ်းၶႄႇလီႇတူဝ်းၼီးယႃး ပလတ်ႇတီႇၼမ်ႇ - ပလတ်ႇတီႇၼမ်ႇ ငိုၼ်းၵွင်ၵၢင် RINET - ငိုၼ်းၵွင်ၵၢင် RINET သုၶရေႇ - သုၶရေႇ မၢႆငိုၼ်းတွင်းဢၼ်တိုၵ်ႉၸၢမ်းယူႇ - မၢႆငိုၼ်းတွင်းဢၼ်တိုၵ်ႉၸၢမ်းယူႇ ယူႇၼိတ်ႉဢၶွင်ႉ ADB - ယူႇၼိတ်ႉဢၶွင်ႉ ADB ငိုၼ်းဢၼ်ဢမ်ႇႁူႉၸိုဝ်ႈ - ငိုၼ်းဢၼ်ဢမ်ႇႁူႉၸိုဝ်ႈ တီႇၼႃႇယႄႇမႅၼ်ႇ - တီႇၼႃႇယႄႇမႅၼ်ႇ ရီဢႄလ်ယႄႇမႅၼ်ႇ - ရီဢႄလ်ယႄႇမႅၼ်ႇ တီႇၼႃႇၶႅင် ယူႇၵူဝ်ႇသလႃးဝီးယႃး(1966–1990) - တီႇၼႃႇၶႅင် ယူႇၵူဝ်ႇသလႃးဝီးယႃး(1966–1990) - - - တီႇၼႃႇမႂ်ႇ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1994–2002) - တီႇၼႃႇမႂ်ႇ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1994–2002) - - - တီႇၼႃႇဢၼ်လႅၵ်ႈလႆႈ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1990–1992) - တီႇၼႃႇဢၼ်လႅၵ်ႈလႆႈ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1990–1992) - - - တီႇၼႃႇဢၼ်ၶိုၼ်းမႄးဝႆႉ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1992–1993) - တီႇၼႃႇဢၼ်ၶိုၼ်းမႄးဝႆႉ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1992–1993) - - - ရၼ်းဢႃႇၾရိၵၸၢၼ်း (ၵၢၼ်ငိုၼ်းတွင်း) - ရၼ်းဢႃႇၾရိၵၸၢၼ်း (ၵၢၼ်ငိုၼ်းတွင်း) - - - ရၼ်းဢႃႇၾရိၵၸၢၼ်း - ရၼ်းဢႃႇၾရိၵၸၢၼ်း - - - ၶႂႃႇၶျႃႇၸမ်းပီးယႃး (1968–2012) - ၶႂႃႇၶျႃႇၸမ်းပီးယႃး (1968–2012) - - - ၶႂႃႇၶျႃႇၸမ်းပီးယႃး - ၶႂႃႇၶျႃႇၸမ်းပီးယႃး - - - ၸၢႆႇရႄႇမႂ်ႇၸၢႆႇရႄႇယႅၼ်ႇ (1993–1998) - ၸၢႆႇရႄႇမႂ်ႇၸၢႆႇရႄႇယႅၼ်ႇ (1993–1998) - - - ၸၢႆႇရႄႇၸၢႆႇရႄႇယႅၼ်ႇ (1971–1993) - ၸၢႆႇရႄႇၸၢႆႇရႄႇယႅၼ်ႇ (1971–1993) - - - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (1980–2008) - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (1980–2008) - - - ၶမ်းၸိမ်ႇပႃႇပူၺ်ႇ - ၶမ်းၸိမ်ႇပႃႇပူၺ်ႇ - - - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2009–2024) - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2009–2024) - - - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2008) - တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2008) - - - - {0} ဝၼ်း - ငွၵ်းၶႂႃ တီႈငွၵ်း ထိ {0} - - - - - - တႅတ်ႇသီႇ{0} - - - သႅၼ်ႇတီႇ{0} - - - မီႇလီႇ{0} - - - မၢႆႇၶရူဝ်ႇ{0} - - - ၼႃႇၼူဝ်ႇ{0} - - - ပီႇၵူဝ်ႇ{0} - - - ၾႅမ်ႇတူဝ်ႇ{0} - - - ဢႅတ်ႇတူဝ်ႇ{0} - - - ၸႅပ်ႇတူဝ်ႇ{0} - - - ယွၵ်ႇတူဝ်ႇ{0} - - - ရွၼ်ႇတူဝ်ႇ{0} - - - ၶွတ်ႉတူဝ်ႇ{0} - - - တႅၵ်ႇၵႃႇ{0} - - - ႁႅၵ်ႇတူဝ်ႇ{0} - - - ၵီႇလူဝ်ႇ{0} - - - မႅၵ်ႇၵႃႇ{0} - - - ၵိၵ်ႇၵႃႇ{0} - - - ထႄႇရႃႇ{0} - - - ပီႇတႃႇ{0} - - - ဢႅၵ်ႇၸႃႇ{0} - - - ၸႅတ်ႇတႃႇ{0} - - - ယူတ်ႇတႃႇ{0} - - - ရွၼ်ႇၼႃႇ{0} - - - ၶွတ်ႉတႃႇ{0} - - - ၵီႇပီႇ{0} - - - မႄႇပီႇ{0} - - - ၵိပ်ႉပီႇ{0} - - - ထႄႇပီ{0} - - - ပႄႇပီႇ{0} - - - ဢႅၵ်ႉသ်ပီႇ{0} - - - ၸႅပ်ႉပီႇ{0} - - - ယွပ်ႉပီႇ{0} - + + + တီႇၼႃႇမႂ်ႇ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1994–2002) + + + တီႇၼႃႇဢၼ်လႅၵ်ႈလႆႈ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1990–1992) + + + တီႇၼႃႇဢၼ်ၶိုၼ်းမႄးဝႆႉ ယူႇၵူဝ်ႇသလႃးဝီးယႃး (1992–1993) + + + ရၼ်းဢႃႇၾရိၵၸၢၼ်း (ၵၢၼ်ငိုၼ်းတွင်း) + + + ရၼ်းဢႃႇၾရိၵၸၢၼ်း + + + ၶႂႃႇၶျႃႇၸမ်းပီးယႃး (1968–2012) + + + ၶႂႃႇၶျႃႇၸမ်းပီးယႃး + + + ၸၢႆႇရႄႇမႂ်ႇၸၢႆႇရႄႇယႅၼ်ႇ (1993–1998) + + + ၸၢႆႇရႄႇၸၢႆႇရႄႇယႅၼ်ႇ (1971–1993) + + + တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (1980–2008) + + + ၶမ်းၸိမ်ႇပႃႇပူၺ်ႇ + + + တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2009–2024) + + + တေႃႇလႃႇၸိမ်ႇပႃႇပူၺ်ႇ (2008) + + + + {0} ဝၼ်း + ငွၵ်းၶႂႃ တီႈငွၵ်း ထိ {0} + + + + {0} တေႃႇ {1} @@ -8116,32 +5385,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၶိဝ်းပိၵ်ႉ{0} - - ႁႅင်း G - {0} ႁႅင်း G - မီႇတႃႇတေႃႇသႅၵ်ႉၵၢၼ်ႉသွင်ပုၼ်ႈ {0} မီႇတႃႇတေႃႇသႅၵ်ႉၵၢၼ်ႉသွင်ပုၼ်ႈ - - ႁွပ်ႈ - {0} ႁွပ်ႈ - - ရေႇတီႇယၼ်ႇ {0} ရေႇတီႇယၼ်ႇ - တီႇၵရီႇ {0} တီႇၵရီႇ - ဢၢၵ်ႉမိၼိတ်ႉ {0} ဢၢၵ်ႉမိၼိတ်ႉ - ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ {0} ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ @@ -8149,10 +5406,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} သီႇၸဵင်ႇၽဵင်ႇၵီႇလူဝ်ႇမီႇတႃႇ {0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇၵီႇလူဝ်ႇမီႇတႃႇ - - ႁႅၵ်ႇတႃႇ - {0} ႁႅၵ်ႇတႃႇ - သီႇၸဵင်ႇၽဵင်ႇမီႇတႃႇ {0} သီႇၸဵင်ႇၽဵင်ႇမီႇတႃႇ @@ -8168,10 +5421,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} သီႇၸဵင်ႇၽဵင်ႇလၵ်း {0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇလၵ်း - - ဢေႇၵ - {0} ဢေႇၵ - သီႇၸဵင်ႇၽဵင်ႇဝၢႆႈ {0} သီႇၸဵင်ႇၽဵင်ႇဝၢႆႈ @@ -8185,14 +5434,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} သီႇၸဵင်ႇၽဵင်ႇၼိဝ်ႉ {0} တေႃႇ သီႇၸဵင်ႇၽဵင်ႇၼိဝ်ႉ - - တူးၼမ်ႇ - {0} တူးၼမ်ႇ - - - ၵရၢတ်ႉ - {0} ၵရၢတ်ႉ - မီႇလီႇၵရမ်ႇ တေႃႇ တႅတ်ႇသီႇလီႇတႃႇ {0} မီႇလီႇၵရမ်ႇ တေႃႇ တႅတ်ႇသီႇလီႇတႃႇ @@ -8201,38 +5442,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic မီႇလီႇမူဝ်း တေႃႇ လီႇတႃႇ {0} မီႇလီႇမူဝ်း တေႃႇ လီႇတႃႇ - - ဢၼ် - {0} ဢၼ် - - - တွၼ်ႈ - {0} တွၼ်ႈ - တွၼ်ႈတေႃႇလၢၼ်ႉတွၼ်ႈ {0} တွၼ်ႈတေႃႇလၢၼ်ႉတွၼ်ႈ - ဝၢၵ်ႈ {0} ဝၢၵ်ႈ - ပႃႇမီးလ် {0} ပႃႇမီးလ် - ပႃႇမီးရိယႅတ်ႉ {0} ပႃႇမီးရိယႅတ်ႉ - - မူဝ်း - {0} မူဝ်း - - - ၵလူးၵူတ်ႉ - {0} ၵလူးၵူတ်ႉ - လီႇတႃႇ တေႃႇ ၵီႇလူဝ်ႇမီႇတႃႇ {0} လီႇတႃႇ တေႃႇ ၵီႇလူဝ်ႇမီႇတႃႇ @@ -8247,7 +5469,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ - {0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ ပီႇတႃႇပၢႆႉ @@ -8285,128 +5506,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၵီႇလူဝ်ႇပိတ်ႉ {0} ၵီႇလူဝ်ႇပိတ်ႉ - - ပၢႆႉ - {0} ပၢႆႉ - - - ပိတ်ႉ - {0} ပိတ်ႉ - - - ႁူဝ်ပၢၵ်ႇပီ - {0} ႁူဝ်ပၢၵ်ႇပီ - - - ႁူဝ်သိပ်းပီ - {0} ႁူဝ်သိပ်းပီ - - ပီ - {0} ပီ {0} တေႃႇပီ - - သၢမ်လိူၼ်ႁွပ်ႈ - {0} သၢမ်လိူၼ်ႁွပ်ႈ - {0}/သၢမ်လိူၼ်ႁွပ်ႈ - - လိူၼ် - {0} လိူၼ် {0} တေႃႇလိူၼ် - ဝူင်ႈ - {0} ဝူင်ႈ {0} တေႃႇဝူင်ႈ - ဝၼ်း - {0} ဝၼ်း {0} တေႃႇဝၼ်း - မူင်း - {0} မူင်း {0} တေႃႇမူင်း - မိၼိတ်ႉ - {0} မိၼိတ်ႉ {0} တေႃႇမိၼိတ်ႉ - ၸႅၵ်ႉၵၢၼ်ႉ {0} ၸႅၵ်ႉၵၢၼ်ႉ - {0}/ၸႅၵ်ႉ - မီႇလီႇၸႅၵ်ႉၵၢၼ်ႉ {0} မီႇလီႇၸႅၵ်ႉၵၢၼ်ႉ - မၢႆႇၶရူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ {0} မၢႆႇၶရူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ - ၼႃႇၼူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ {0} ၼႃႇၼူဝ်ႇၸႅၵ်ႉၵၢၼ်ႉ - ဢႅမ်ႇပီႇယႃႇ {0} ဢႅမ်ႇပီႇယႃႇ - မီႇလီႇဢႅမ်ႇပီႇယႃႇ {0} မီႇလီႇဢႅမ်ႇပီႇယႃႇ - ဢူမ်း {0} ဢူမ်း - ဝူဝ်ႉ {0} ဝူဝ်ႉ - - ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ - {0} ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ - - - ၵႄႇလူဝ်ႇရီႇ - {0} ၵႄႇလူဝ်ႇရီႇ - - - ၵီႇလူဝ်ႇၵျူဝ်း - {0} ၵီႇလူဝ်ႇၵျူဝ်း - - - ၵျူဝ်း - {0} ၵျူဝ်း - ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း {0} ၵီႇလူဝ်ႇဝတ်ႉ-ၸူဝ်ႈမူင်း - ဢီႇလႅတ်ႇထရွၼ်ႇဝူဝ်ႉ {0} ဢီႇလႅတ်ႇထရွၼ်ႇဝူဝ်ႉ ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ {0} ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ - - ႁႅင်းမႆးယူႇဢႅတ်ႉသ် - {0} ႁႅင်းမႆးယူႇဢႅတ်ႉသ် - - ႁႅင်းပွၼ်း {0} ႁႅင်းပွၼ်း - ၼိဝ်ႇတၼ်ႇ {0} ၼိဝ်ႇတၼ်ႇ @@ -8458,7 +5614,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} တေႃႇၵီႇလူဝ်ႇမီႇတႃႇ - မီႇတႃႇ {0} မီႇတႃႇ {0} တေႃႇမီႇတႃႇ @@ -8476,7 +5631,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} မီႇလီႇမီႇတႃႇ - မၢႆႇၶရူဝ်ႇမီႇတႃႇ {0} မၢႆႇၶရူဝ်ႇမီႇတႃႇ @@ -8487,74 +5641,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic ပီႇၵူဝ်ႇမီႇတႃႇ {0} ပီႇၵူဝ်ႇမီႇတႃႇ - - လၵ်း - {0} လၵ်း - - - ဝၢႆႈ - {0} ဝၢႆႈ - - ထတ်း - {0} ထတ်း {0} တေႃႇထတ်း - ၼိဝ်ႉ - {0} ၼိဝ်ႉ {0} တေႃႇၼိဝ်ႉ - - ပႃႇသႅၵ်ႉ - {0} ပႃႇသႅၵ်ႉ - - - ပီလႅင်း - {0} ပီလႅင်း - - - ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ် - {0} ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ် - - - ၾႃႇလူင်ႇ - {0} ၾႃႇလူင်ႇ - - - ၾႃႇထွမ်ႇ - {0} ၾႃႇထွမ်ႇ - - - လၵ်းၼမ်ႉ - {0} လၵ်းၼမ်ႉ - - လၵ်းသၵႅၼ်ႇတီႇၼေႇဝီႇယႅၼ်ႇ {0} လၵ်းသၵႅၼ်ႇတီႇၼေႇဝီႇယႅၼ်ႇ - - ၸုတ်း - {0} ၸုတ်း - - ထႅဝ်ၽိတ်ႇလႅတ်ႇ {0} ထႅဝ်ၽိတ်ႇလႅတ်ႇ - လၵ်ႉသ် {0} လၵ်ႉသ် - ၶႅၼ်ႇတႄႇလႃႇ {0} ၶႅၼ်ႇတႄႇလႃႇ - လူႇမႅၼ်ႇ {0} လူႇမႅၼ်ႇ - လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ {0} လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ @@ -8567,7 +5675,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} တေႃႇၵီႇလူဝ်ႇၵရမ်ႇ - ၵရမ်ႇ {0} ၵရမ်ႇ {0} တေႃႇၵရမ်ႇ @@ -8577,103 +5684,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic မၢႆႇၶရူဝ်ႇၵရမ်ႇ - {0} မၢႆႇၶရူဝ်ႇၵရမ်ႇ - - - တၢၼ်ႇ - {0} တၢၼ်ႇ - - - သတူၼ်း - {0} သတူၼ်း - - - ပွၼ်း - {0} ပွၼ်း - {0} တေႃႇပွၼ်း - - - ဢွၼ်း - {0} ဢွၼ်း - {0} တေႃႇဢွၼ်း - - - ထရွႆႉဢွၼ်း - {0} ထရွႆႉဢွၼ်း - - - ၵရၢတ်ႈ - {0} ၵရၢတ်ႈ - - - တႄႇလ်တၢၼ်ႇ - {0} တႄႇလ်တၢၼ်ႇ - - - ၼႅၼ်ႈၼႃလုမ်ႈၾႃႉ - - - ၼႅၼ်ႈၼႃလႅတ်ႇ - {0} ၼႅၼ်ႈၼႃလႅတ်ႇ - - - မဵတ်ႉၽၼ်း - {0} မဵတ်ႉၽၼ်း - - - ၵိၵ်ႇၵႃႇဝတ်ႉ - {0} ၵိၵ်ႇၵႃႇဝတ်ႉ + {0} မၢႆႇၶရူဝ်ႇၵရမ်ႇ - - မႅၵ်ႇၵႃႇဝတ်ႉ - {0} မႅၵ်ႇၵႃႇဝတ်ႉ + + {0} သတူၼ်း - - ၵီႇလူဝ်ႇဝတ်ႉ - {0} ၵီႇလူဝ်ႇဝတ်ႉ + + {0} တေႃႇပွၼ်း - - ဝတ်ႉ - {0} ဝတ်ႉ + + {0} ထရွႆႉဢွၼ်း - - မီႇလီႇဝတ်ႉ - {0} မီႇလီႇဝတ်ႉ + + {0} တႄႇလ်တၢၼ်ႇ - - ႁႅင်းမႃႉ - {0} ႁႅင်းမႃႉ + + {0} ၼႅၼ်ႈၼႃလႅတ်ႇ မီႇလီႇမီႇတႃႇမႃႇၵျူႇရီႇ {0} မီႇလီႇမီႇတႃႇမႃႇၵျူႇရီႇ - - မႃႇၵျူႇရီႇ - {0} မႃႇၵျူႇရီႇ - ပွၼ်းတေႃႇၼိဝ်ႉသွင်ပုၼ်ႈ {0} ပွၼ်းတေႃႇၼိဝ်ႉသွင်ပုၼ်ႈ - - ၼိဝ်ႉမႃႇၵျူႇရီႇ - {0} ၼိဝ်ႉမႃႇၵျူႇရီႇ - - - ပႃးရ် - {0} ပႃးရ် - - - မီႇလီႇပႃးရ် - {0} မီႇလီႇပႃးရ် - - - ႁႅင်းၼႅၼ်ႈလူမ်း - {0} ႁႅင်းၼႅၼ်ႈလူမ်း - - ပၢတ်ႉသၵႄးလ် {0} ပၢတ်ႉသၵႄးလ် @@ -8700,20 +5736,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic လၵ်းတေႃႇၸူဝ်ႈမူင်း {0} လၵ်းတေႃႇၸူဝ်ႈမူင်း - - ၼွတ်ႉ - {0} ၼွတ်ႉ - - - ပူဝ်ၾူတ်ႉ - ပူဝ်ၾူတ်ႉ {0} - - တီႇၵရီႇသႄးသီးယႅတ်ႉ {0} တီႇၵရီႇသႄးသီးယႅတ်ႉ - တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ {0} တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ @@ -8758,16 +5784,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၼိဝ်ႉၶိဝ်းပိၵ်ႉ {0} ၼိဝ်ႉၶိဝ်းပိၵ်ႉ - - မႅၵ်ႇၵႃႇလီႇတႃႇ - {0} မႅၵ်ႇၵႃႇလီႇတႃႇ - ႁႅၵ်ႇတူဝ်ႇလီႇတႃႇ {0} ႁႅၵ်ႇတတူဝ်လီႇတႃႇ - လီႇတႃႇ {0} လီႇတႃႇ {0} တေႃႇလီႇတႃႇ @@ -8783,269 +5804,65 @@ CLDR data files are interpreted according to the LDML specification (http://unic မီႇလီႇလီႇတႃႇ {0} မီႇလီႇလီႇတႃႇ - - ပၢႆးမႅတ်ႉထရိတ်ႉ - {0} ပၢႆးမႅတ်ႉထရိတ်ႉ - - - ၵွၵ်းမႅတ်ႉထရိတ်ႉ - {0} ၵွၵ်းမႅတ်ႉထရိတ်ႉ - - - ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ - {0} ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ - - - ထတ်းဢေႇၵ - {0} ထတ်းဢေႇၵ - - - ၶႂၢႆး - {0} ၶႂၢႆး - - ၵႃႇလၢၼ်ႇ - {0} ၵႃႇလၢၼ်ႇ {0} တေႃႇၵႃႇလၢၼ်ႇ - ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ - {0} ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ {0} တေႃႇ ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ - - ၶွတ်ႉ - {0} ၶွတ်ႉ - - - ပၢႆး - {0} ပၢႆး - - ပၢႆး ဢိင်းၵလဵတ်ႈ {0}ပၢႆး ဢိင်းၵလဵတ်ႈ - - ၵွၵ်း - {0} ၵွၵ်း - - - ၵွၵ်း ဢိင်းၵလဵတ်ႈ - {0} ၵွၵ်း ဢိင်းၵလဵတ်ႈ - - - ဢွၼ်းၼမ်ႉယၢင်ႇ - {0} ဢွၼ်းၼမ်ႉယၢင်ႇ - ဢွၼ်းၼမ်ႉယၢင်ႇ ဢိင်းၵလဵတ်ႈ {0} ဢွၼ်းၼမ်ႉယၢင်ႇ ဢိင်းၵလဵတ်ႈ - - ၸေႃႉၵိၼ်ၶဝ်ႈ - {0} ၸေႃႉၵိၼ်ၶဝ်ႈ - - - ၸေႃႉၼမ်ႉၼဵင်ႈ - {0} ၸေႃႉၼမ်ႉၼဵင်ႈ - - - ပႃႇရႄႇလ် - {0} ပႃႇရႄႇလ် - - - ၸေႃႉႁၢတ်ႈ - {0} ၸေႃႉႁၢတ်ႈ - - - ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ - {0} ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ - - - ယွတ်ႇ - {0} ယွတ်ႇ - - - တရမ်ႇ - {0} တရမ်ႇ - - - ၸိၵ်ႇၵႃႇ - {0} ၸိၵ်ႇၵႃႇ - - - ယွပ်း - {0} ယွပ်း - - - ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ - {0} ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ - သတီးရေႇတီႇယၼ်ႇ {0} သတီးရေႇတီႇယၼ်ႇ - ၶႃႇတႄႇလ် {0} ၶႃႇတႄႇလ် - ၶူဝ်ႇလွမ်ႇ {0} ၶူဝ်ႇလွမ်ႇ - ၾႃႇရတ်ႉ {0} ၾႃႇရတ်ႉ - ႁႅၼ်ႇရီႇ - {0} ႁႅၼ်ႇရီႇ - - - သီႇမႅၼ်း - {0} သီႇမႅၼ်း - - - ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ] - {0} ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ] - - - ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ] - {0} ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ] - - - ပႅၵ်ႉၶႄႇရႄႇလ် - {0} ပႅၵ်ႉၶႄႇရႄႇလ် - - - သီႇဝႅတ်ႉ - {0} သီႇဝႅတ်ႉ - - - ၵရေး - {0} ၵရေး - - - ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း - {0} ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း - - - ရွတ်ႉ - {0} ရွတ်ႉ - - - ၶျဵၼ်း - {0} ၶျဵၼ်း - - - တႅတ်ႉသလႃႇ - {0} တႅတ်ႉသလႃႇ - - - ဝႅပ်ႉပႃႇ - {0} ဝႅပ်ႉပႃႇ - - - ရႅၼ်ႇၵိၼ်ႇ - {0} ရႅၼ်ႇၵိၼ်ႇ - - - ၽၢၵ်ႇလိူၼ် - {0} ၽၢၵ်ႇလိူၼ် - - - သလၢၵ်ႉ - {0} သလၢၵ်ႉ - - - ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ် - {0} ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ် - - - ရိၼ်း [ၵပ.] - {0} ရိၼ်း [ၵပ.] - - - သုၼ်း [ၵပ.] - {0} သုၼ်း [ၵပ.] - - - သျၵ်ၵု [ၵပ.] - {0} သျၵ်ၵု [ၵပ.] - - - သျၵ်ၵု [ၶူဝ်း၊ ၵပ.] - {0} သျၵ်ၵု [ၶူဝ်း၊ ၵပ.] - - - ၵႅၼ်း [ၵပ.] - {0} ၵႅၼ်း [ၵပ.] - - - ၸူဝ်း [ၵပ.] - {0} ၸူဝ်း [ၵပ.] - - - ရီ [ၵပ.] - {0} ရီ [ၵပ.] - - - ပု [ၵပ.] - {0} ပု [ၵပ.] - - - သႄ [ၵပ.] - {0} သႄ [ၵပ.] - - - ၶျူဝ် [ၵပ.] - {0} ၶျူဝ် [ၵပ.] - - - ၵူဝ်ၸႃးၵျိ [ၵပ.] - {0} ၵူဝ်ၸႃးၵျိ [ၵပ.] + {0} ႁႅၼ်ႇရီႇ - - ဢူဝ်ၸႃးၵျိ [ၵပ.] - {0} ဢူဝ်ၸႃးၵျိ [ၵပ.] + + {0} သီႇမႅၼ်း - - ၵွပ်း [ၵပ.] - {0} ၵွပ်း [ၵပ.] + + ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ] + {0} ယူႇၼိတ်ႉတၢင်းမႆးဢိင်းၵလဵတ်ႈ [ဢၢႆႇထီႇ] - - သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.] - {0} သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.] + + {0} ပႅၵ်ႉၶႄႇရႄႇလ် - - သၢႆႉ [ၵပ.] - {0} သၢႆႉ [ၵပ.] + + {0} သီႇဝႅတ်ႉ - - တူဝ်ႇ [ၵပ.] - {0} တူဝ်ႇ [ၵပ.] + + {0} တႅတ်ႉသလႃႇ - - ၵွၵ်ၵု [ၵပ.] - {0} ၵွၵ်ၵု [ၵပ.] + + {0} ဝႅပ်ႉပႃႇ - - လႅင်း - {0} လႅင်း + + ရႅၼ်ႇၵိၼ်ႇ + {0} ရႅၼ်ႇၵိၼ်ႇ - - ၾုၼ်ႉ [ၵပ.] - {0} ၾုၼ်ႉ [ၵပ.] + + {0} ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ် တွၼ်ႈတေႃႇႁဵင်လၢၼ်ႉ {0} တွၼ်ႈတေႃႇႁဵင်လၢၼ်ႉ - - ၶိုၼ်း - {0} ၶိုၼ်း - {0}/ၶိုၼ်း - သီႇမုင်ႈၼႃႈ {0} တၢင်းဢွၵ်ႇ @@ -9938,209 +6755,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - တႅတ်ႇသီႇ{0} - - - သႅၼ်ႇတီႇ{0} - - - မီႇလီႇ{0} - - - မၢႆႇၶရူဝ်ႇ{0} - - - ၼႃႇၼူဝ်ႇ{0} - - - ပီႇၵူဝ်ႇ{0} - - - ၾႅမ်ႇတူဝ်ႇ{0} - - - ဢႅတ်ႇတူဝ်ႇ{0} - - - ၸႅပ်ႇတူဝ်ႇ{0} - - - ယွၵ်ႇတူဝ်ႇ{0} - - - ရွၼ်ႇတူဝ်ႇ{0} - - - ၶွတ်ႉတူဝ်ႇ{0} - - - တႅၵ်ႇၵႃႇ{0} - - - ႁႅၵ်ႇတူဝ်ႇ{0} - - - ၵီႇလူဝ်ႇ{0} - - - မႅၵ်ႇၵႃႇ{0} - - - ၵိၵ်ႇၵႃႇ{0} - - - ထႄႇရႃႇ{0} - - - ပီႇတႃႇ{0} - - - ဢႅၵ်ႇၸႃႇ{0} - - - ၸႅတ်ႇတႃႇ{0} - - - ယူတ်ႇတႃႇ{0} - - - ရွၼ်ႇၼႃႇ{0} - - - ၶွတ်ႉတႃႇ{0} - - - ၵီႇပီႇ{0} - - - မႄႇပီႇ{0} - - - ၵိပ်ႉပီႇ{0} - - - ထႄႇပီ{0} - - - ပႄႇပီႇ{0} - - - ဢႅၵ်ႉသ်ပီႇ{0} - - - ၸႅပ်ႉပီႇ{0} - - - ယွပ်ႉပီႇ{0} - - - ႁႅင်း G - {0} ႁႅင်း G - မ./သႅၵ်ႉ.² - {0} မ./သႅၵ်ႉ.² - ႁွပ်ႈ {0}ႁွပ်ႈ - ရေႇတီႇယၼ်ႇ {0}ရေႇ - - တီႇၵရီႇ - - - ဢၢၵ်ႉမိၼိတ်ႉ - - - ဢၢၵ်ႉသႅၵ်ႉၵၢၼ်ႉ - - ၵမ.² {0}ၵမ.² - {0}/ၵမ.² - ႁႅၵ်ႇတႃႇ {0}ႁႅၵ်ႇတႃႇ - မ.² {0}မ.² - {0}/မ.² - သမ.² {0}သမ.² - {0}/သမ.² - လ.² {0}လ.² - {0}/လ.² - ဢေႇၵ {0}ဢေႇၵ - ဝ.² {0}ဝ.² - ထ.² {0}ထ.² - ၼ.² {0}ၼ.² - {0}/ၼ.² - တူးၼမ်ႇ {0}တူးၼမ်ႇ - ၵရၢတ်ႉ {0}ၵရၢတ်ႉ - မၵ./တလ. {0}မၵ./တလ. - မလမ./လ {0}မလမ./လ - ဢၼ် {0}ဢၼ် - တွၼ်ႈ {0}တွၼ်ႈ - - ဝၢၵ်ႈ - - - ပႃႇမီးလ် - - - ပႃႇမီးရိယႅတ်ႉ - - မူဝ်း {0}မူဝ်း - - ၵလူးၵူတ်ႉ - {0} ၵလူးၵူတ်ႉ - လ./ၵမ. {0}လ./ၵမ. @@ -10153,10 +6824,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic mpg {0}mpg - - လၵ်း/ၵႃႇလၢၼ်ႇဢိင်ႈၵလဵတ်ႈ - {0} လၵ်းတေႃႇၵႃႇလၢၼ်ႇဢိင်းၵလဵတ်ႈ - {0}TB @@ -10179,55 +6846,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kb - ပၢႆႉ {0}ပၢႆႉ - ပိတ်ႉ {0}ပိတ်ႉ - - ႁူဝ်ပၢၵ်ႇပီ - {0} ႁူဝ်ပၢၵ်ႇပီ - - - ႁူဝ်သိပ်းပီ - {0} ႁူဝ်သိပ်းပီ - - ပီ {0}ပီ - {0}/ပီ - သၢမ်လိူၼ်ႁွပ်ႈ {0}သၢမ်လိူၼ်ႁွပ်ႈ - {0}/သၢမ်လိူၼ်ႁွပ်ႈ - လိူၼ် {0}လိူၼ် - {0}/လိူၼ် - ဝူင်ႈ {0}ဝူင်ႈ - {0}/ဝူင်ႈ - ဝၼ်း {0}ဝၼ်း - {0}/ဝၼ်း - မူင်း {0}မူင်း - {0}/မူင်း - မိၼိတ်ႉ {0}မိၼိတ်ႉ - {0}/မိၼိတ်ႉ ၸႅၵ်ႉ @@ -10247,59 +6890,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ၼႃႇၸႅၵ်ႉ - ဢႅမ်ႇပီႇယႃႇ {0}A - မီႇလီႇဢႅမ်ႇပီႇယႃႇ {0}mA - ဢူမ်း {0}Ω - ဝူဝ်ႉ {0}V - ၵီႇလူဝ်ႇၵႄႇလူဝ်ႇရီႇ {0}kcal - ၵႄႇလူဝ်ႇရီႇ {0}ၵႄႇလူဝ်ႇရီႇ - ၵီႇလူဝ်ႇၵျူဝ်း {0}ၵီႇလူဝ်ႇၵျူဝ်း - ၵျူဝ်း {0}ၵျူဝ်း - ၵဝ.မူင်း {0}ၵဝ.မူင်း {0}eV - - ပီႇထီႇယူႇ - {0} ပီႇထီႇယူႇ - - ႁႅင်းမႆးယူႇဢႅတ်ႉသ် {0}ႁႅင်းမႆးယူႇဢႅတ်ႉသ် - - ၼိဝ်ႇတၼ်ႇ - - - ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ. - {0} ၵီႇလူဝ်ႇဝတ်ႉမူင်း/100ၵမ. - {0}GHz @@ -10312,138 +6934,74 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}Hz - - ၵမ. - {0} ၵမ. - {0}/ၵမ. - - မီႇတႃႇ {0}မ. {0}/မ - တမ. {0}တမ. - သမ. {0}သမ. - {0}/သမ. - မမ. {0}မမ. - - မၢႆႇၶရူဝ်ႇမီႇတႃႇ - - ၼမ. {0}ၼမ. - ပမ. {0}ပမ. - လၵ်း {0}လၵ်း - ဝၢႆႈ {0}ဝၢႆႈ - ထတ်း {0}′ - {0}/ထတ်း - ၼိဝ်ႉ {0}″ - {0}/ၼိဝ်ႉ - ပႃႇသႅၵ်ႉ {0}ပႃႇသႅၵ်ႉ - ပီလႅင်း {0}ပီလႅင်း - ယူႇၼိတ်ႉ ပၢႆးလႅင်လၢဝ် {0}au - ၾႃႇလူင်ႇ {0}ၾႃႇလူင်ႇ - ၾႃႇထွမ်ႇ {0}ၾႃႇထွမ်ႇ - လၵ်းၼမ်ႉ {0}လၵ်းၼမ်ႉ - ၸုတ်း {0}ၸုတ်း - - ထႅဝ်ၽိတ်ႇလႅတ်ႇ - - - လၵ်ႉသ် - - - ၶႅၼ်ႇတႄႇလႃႇ - - - လူႇမႅၼ်ႇ - - - လွင်ႈႁိူဝ်ႈလႅင်းလႅတ်ႇ - - - တ. - {0} တ. - - - ၵၵ. - {0} ၵၵ. - {0}/ၵၵ. - - ၵရမ်ႇ {0}ၵ. - {0}/ၵ. - မၵ. {0}မၵ. - μၵ. {0}μၵ. - - တၢၼ်ႇ - {0} တၢၼ်ႇ - - သတူၼ်း {0}သတ. - ပွၼ်း {0}ပွၼ်း - {0}/ပွၼ်း - ဢွၼ်း {0}ဢွၼ်း {0}/ဢွၼ်း @@ -10452,66 +7010,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ဢထရ. - ၵရၢတ်ႈ {0}ၵရၢတ်ႈ {0}Da - မဵတ်ႉၽၼ်း {0}မဵတ်ႉၽၼ်း - ၵိၵ်ႇၵႃႇဝတ်ႉ {0}GW - မႅၵ်ႇၵႃႇဝတ်ႉ {0}MW - ၵီႇလူဝ်ႇဝတ်ႉ {0}kW - ဝတ်ႉ {0}ဝတ်ႉ - မီႇလီႇဝတ်ႉ {0}mW - ႁႅင်းမႃႉ {0}ႁႅင်းမႃႉ - မမ. မႃႇၵျူႇရီႇ {0}မမ. မႃႇၵျူႇရီႇ - - မႃႇၵျူႇရီႇ - {0} မႃႇၵျူႇရီႇ - - ၼိဝ်ႉမႃႇၵျူႇရီႇ {0}ၼိဝ်ႉမႃႇၵျူႇရီႇ - ပႃးရ် {0}ပႃးရ် - မီႇလီႇပႃးရ် {0}မီႇလီႇပႃးရ် - ႁႅင်းၼႅၼ်ႈလူမ်း {0}ႁႅင်းၼႅၼ်ႈလူမ်း - ပၢတ်ႉသၵႄးလ် {0}Pa @@ -10525,334 +7065,183 @@ CLDR data files are interpreted according to the LDML specification (http://unic ၵမ./မူင်း - {0} ၵမ./မူင်း မ./ၸႅၵ်ႉ - {0} မ./ၸႅၵ်ႉ လ./မူင်း - {0} လ./မူင်း - - - ၼွတ်ႉ - {0} ၼွတ်ႉ - - - ပူဝ်ၾူတ်ႉ - ပူဝ်ၾူတ်ႉ {0} - တီႇၵရီႇသႄးသီးယႅတ်ႉ + °C - တီႇၵရီႇၾႃႇရႅၼ်ႇႁၢႆႉ {0}° {0}K - ၵမ.³ {0}ၵမ.³ - မ.³ {0}မ.³ - {0}/မ.³ - သမ.³ {0}သမ.³ - {0}/သမ.³ - လ.³ {0}လ.³ - ဝ.³ {0}ဝ.³ - ထ.³ {0}ထ.³ - ၼ.³ {0}ၼ.³ - မႅၵ်ႇၵႃႇလီႇတႃႇ {0}မႅၵ်ႇၵႃႇလီႇတႃႇ - - ႁလ. - {0} ႁလ. - - လီႇတႃႇ {0}လ. - {0}/လ. - တလ. {0}တလ. - သလ. {0}သလ. - မလ. {0}မလ. - ပၢႆးမႅတ်ႉထရိတ်ႉ {0}ပၢႆးမႅတ်ႉထရိတ်ႉ - ၵွၵ်းမႅတ်ႉထရိတ်ႉ {0}ၵွၵ်းမႅတ်ႉထရိတ်ႉ - - ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ - {0} ဢွၼ်းၼမ်ႉယၢင်ႇမႅတ်ႉထရိတ်ႉ - - ထတ်းဢေႇၵ {0}ထတ်းဢေႇၵ - ၶႂၢႆး {0}ၶႂၢႆး - ၵႃႇလၢၼ်ႇ {0}ၵႃႇလၢၼ်ႇ - {0}/ၵႃႇလၢၼ်ႇ - ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ {0}ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ - {0}/ၵႃႇလၢၼ်ႇ ဢိင်းၵလဵတ်ႈ - ၶွတ်ႉ {0}ၶွတ်ႉ - ပၢႆး {0}ပၢႆး - ပၢႆး ဢိင်းၵလဵတ်ႈ {0}ပၢႆး ဢိင်းၵလဵတ်ႈ - ၵွၵ်း {0}ၵွၵ်း - ၵွၵ်း ဢိင်းၵလဵတ်ႈ {0}ၵွၵ်း ဢိင်းၵလဵတ်ႈ - ဢွၼ်းၼမ်ႉယၢင်ႇ {0}ဢွၼ်းၼမ်ႉယၢင်ႇ - ၸေႃႉၵိၼ်ၶဝ်ႈ {0}ၸေႃႉၵိၼ်ၶဝ်ႈ - ၸေႃႉၼမ်ႉၼဵင်ႈ {0}ၸေႃႉၼမ်ႉၼဵင်ႈ - ပႃႇရႄႇလ် {0}ပႃႇရႄႇလ် - ၸေႃႉႁၢတ်ႈ {0}ၸေႃႉႁၢတ်ႈ - - ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ - {0} ၸေႃႉႁၢတ်ႈ ဢိင်းၵလဵတ်ႈ - - ယွတ်ႇ {0}ယွတ်ႇ - တရမ်ႇ {0}တရမ်ႇ - ၸိၵ်ႇၵႃႇ {0}ၸိၵ်ႇၵႃႇ - ယွပ်း {0}ယွပ်း - ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ {0}ၶွတ်ႉ ဢိင်းၵလဵတ်ႈ - - ၶႃႇတႄႇလ် - - - ၶူဝ်ႇလွမ်ႇ - - - ၾႃႇရတ်ႉ - - - ႁႅၼ်ႇရီႇ - - - သီႇမႅၼ်း - - ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ] {0}ၵႄႇလူဝ်ႇရီႇ [ဢၢႆႇထီႇ] - ပီႇထီႇယူႇ-ဢၢႆႇထီႇ {0}ပီႇထီႇယူႇ-ဢၢႆႇထီႇ - - ပႅၵ်ႉၶႄႇရႄႇလ် - {0} Bq - - - သီႇဝႅတ်ႉ - - - ၵရေး - {0} ၵရေး - - ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း {0}ၵီႇလူဝ်ႇၵရမ်ႇႁႅင်း - ရွတ်ႉ {0}ရွတ်ႉ - ၶျဵၼ်း {0}ၶျဵၼ်း - - တႅတ်ႉသလႃႇ - - - ဝႅပ်ႉပႃႇ - - - ၽၢၵ်ႇလိူၼ် - {0} ၽၢၵ်ႇလိူၼ် - - သလၢၵ်ႉ {0}သလၢၵ်ႉ - ဢၼ်မိူၼ်ၵၼ်တင်း ၵႅတ်ႉသ် {0}gas-equiv - ရိၼ်း [ၵပ.] {0}ရိၼ်း [ၵပ.] - သုၼ်း [ၵပ.] {0}သုၼ်း [ၵပ.] - သျၵ်ၵု [ၵပ.] {0}သျၵ်ၵု [ၵပ.] - သျၵ်ၵု [ၶူဝ်း၊ ၵပ.] {0}သျၵ်ၵု [ၶူဝ်း၊ ၵပ.] - ၵႅၼ်း [ၵပ.] {0}ၵႅၼ်း [ၵပ.] - ၸူဝ်း [ၵပ.] {0}ၸူဝ်း [ၵပ.] - ရီ [ၵပ.] {0}ရီ [ၵပ.] - ပု [ၵပ.] {0}ပု [ၵပ.] - သႄ [ၵပ.] {0}သႄ [ၵပ.] - ၶျူဝ် [ၵပ.] {0}ၶျူဝ် [ၵပ.] - ၵူဝ်ၸႃးၵျိ [ၵပ.] {0}ၵူဝ်ၸႃးၵျိ [ၵပ.] - - ဢူဝ်ၸႃးၵျိ [ၵပ.] - {0} ဢူဝ်ၸႃးၵျိ [ၵပ.] - - - ၵွပ်း [ၵပ.] - {0} ၵွပ်း [ၵပ.] - - - သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.] - {0} သျၵ်ၵု [ၼႅၼ်ႈၼႃ၊ ၵပ.] - - - သၢႆႉ [ၵပ.] - {0} သၢႆႉ [ၵပ.] - - - တူဝ်ႇ [ၵပ.] - {0} တူဝ်ႇ [ၵပ.] - - - ၵွၵ်ၵု [ၵပ.] - {0} ၵွၵ်ၵု [ၵပ.] - - - လႅင်း - {0} လႅင်း - - ၾုၼ်ႉ [ၵပ.] {0}ၾုၼ်ႉ [ၵပ.] တတႁလ. {0}တတႁလ. - - ၶိုၼ်း - {0} ၶိုၼ်း - {0}/ၶိုၼ်း - - မုင်ႈၼႃႈ {0}ဢ {0}ႁ {0}ၸ @@ -10873,48 +7262,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}၊ ႁိုဝ် {1} {0} ႁိုဝ် {1} - - {0}၊ {1} - {0}၊ {1} - {0}၊ ႁိုဝ် {1} - {0} ႁိုဝ် {1} - - - {0}၊ {1} - {0}၊ {1} - {0}၊ ႁိုဝ် {1} - {0} ႁိုဝ် {1} - - - {0}၊ {1} - {0}၊ {1} - {0} လႄႈ {1} - {0} လႄႈ {1} - - - {0}၊ {1} - {0}၊ {1} - {0} လႄႈ {1} - {0} လႄႈ {1} - - - {0}၊ {1} - {0}၊ {1} - {0} လႄႈ {1} - {0} လႄႈ {1} - - - {0}၊ {1} - {0}၊ {1} - {0} လႄႈ {1} - {0} လႄႈ {1} - - - {0}၊ {1} - {0}၊ {1} - {0} လႄႈ {1} - {0} လႄႈ {1} - {0} - တင်းမူတ်း diff --git a/make/data/cldr/common/main/si.xml b/make/data/cldr/common/main/si.xml index bb7df0ef6db5..300be3bb22c4 100644 --- a/make/data/cldr/common/main/si.xml +++ b/make/data/cldr/common/main/si.xml @@ -346,6 +346,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ නෛජීරියන් පෙන්ගින් පිජින් පෝලන්ත + පීඩ්මොන්ටේස් මලිසීට්-පස්සමකුඩි පෘශියන් පෂ්ටො @@ -867,15 +868,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ දින දසුන මුදල් ආකෘති + සංකේත නොසලකා පෙළගැස්වීම + ප්‍රතිලෝම ස්වර ලකුණු අනුව පෙළගැස්වීම + ලොකු අකුරු/කුඩා අකුරු අනුපිළිවෙල + අකුරු වර්ගය සලකා පෙළගැස්වීම පෙළගැස්ම + ප්‍රමිතිගත පෙළගැස්වීම + සංඛ්‍යාත්මක පෙළගැස්වීම + ස්ක්‍රිප්ට්/බ්ලොක් නැවත අනුපිළිවෙලට සැකසීම + පෙළගැස්වීමේ ප්‍රබලතාවය විනිමය + පරිවර්තන ගමනාන්තය + ශබ්දකෝෂ පාදක පද බෙදීම් බැහැර කිරීම් ඉමොජි ඉදිරිපත් කිරීම + සතියේ පළමු දිනය + කලවම් කරන ලද පැය චක්‍රය (12 එදිරිව 24) + ආදාන ක්‍රමය + යතුරුපුවරුව + වැඩිම නොසලකා හරින ලද පේළි කඩන විලාසය වචන තුළ රේඛා බිඳීම් + පරිවර්තන රීති මිනුම් ක්‍රමය + මිනුම් ඒකකය ඉලක්කම් + අතිරේක දත්ත සඳහා කලාපය + පරිවර්තන ප්‍රභවය + කලාපීය අනුබෙදීම කෙටි යෙදු. පසු වාක්‍ය බිඳීම + පරිවර්තනය කරන්න + යන්ත්‍ර මඟින් පරිවර්තනය කළ + වේලා කලාපය + පෙදෙසි ප්‍රභේදය + පෞද්ගලික භාවිතය + පෞද්ගලික-භාවිත පරිවර්තනය බෞද්ධ දින දසුන @@ -894,13 +921,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ග්‍රෙගරියානු හීබෲ දින දසුන හීබෲ + ඉන්දීය ජාතික හිජ්රි දින දසුන හිජ්රි හිජ්රි දින දසුන (වගුව, සිවිල් වීර කාව්‍යය) හිජ්රි දින දසුන (වගුව, සිවිල් වීර කාව්‍යය) + හිජ්රි, සෞදි අරාබි චන්ද්‍ර දර්ශනය + හිජ්රි (වගුගත, තාරකා විද්‍යාත්මක යුගය) හිජ්රි දින දසුන (උම් අල් කුරා) හිජ්රි (උම් අල් කුරා) අයිඑස්ඕ-8601 දින දසුන + ග්‍රෙගෝරියානු ජපන් දින දසුන ජපන් පර්සියානු දින දසුන @@ -911,17 +942,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ගිණුම්කරණය සම්මත මුදල් ආකෘති සම්මත + කුඩා අකුරු + කුඩා අකුරු + ලොකු අකුරු + ගැළපීම අකාරාදිය පෙළගැස්ම අකාරාදිය පෙරනිමි යුනිකේත පෙළගැස්ම පෙරනිමි යුනිකේත + ඉමෝජි + යුරෝපීය රීති + දුරකථන නාමාවලිය + ශබ්ද අනුව + පින්යින් සාමාන්‍ය සෙවීම සෙවීම + කොරියානු ආරම්භක ව්‍යාංජනාක්ෂර සම්මත පෙළගැස්ම සම්මත + රේඛාව + සම්ප්‍රදායික + මූලිකාංග සහ රේඛා ක්‍රමය + ජුයින් + මුදල් වර්ගය + ඉලක්කම් + විරාම ලකුණු + හිස්තැන් + සංකේතය + සියල්ල + මූලික අකුරු පමණි + මූලික, ස්වර ලකුණු, අකුරු වර්ගය, ප්‍රභේද, කානා අකුරු + මූලික, ස්වර ලකුණු + මූලික, ස්වර ලකුණු, අකුරු වර්ගය, ප්‍රභේද + සම්පූර්ණ පළලට + අර්ධ පළලට පෙරනිමිය ඉමොජි පෙළ + පැය 12 ක්‍රමය + 12 + පැය 24 ක්‍රමය + 24 පැය 12 ක්‍රමය (0–11) 12 (0–11) පැය 12 ක්‍රමය (1–12) @@ -930,6 +991,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) පැය 24 ක්‍රමය (1–24) 24 (1–24) + හිස් ඉඩ, විරාම ලකුණු, සියලුම සංකේත මාරු කරන්න + හිස් ඉඩ, විරාම ලකුණු මාරු කරන්න + හිස් ඉඩ, විරාම ලකුණු මාරු කරන්න + හිස් ඉඩ, විරාම ලකුණු, මුදල් නොවන සංකේත මාරු කරන්න ලිහිල් කඩන විලාසය ලිහිල් සාමාන්‍ය පේළි කඩන විලාසය @@ -940,6 +1005,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ සියල්ල තබා ගන්න සාමාන්‍ය වාක්‍ය ඛණ්ඩ තුළ තබා ගන්න + US BGN අක්ෂර පරිවර්තනය + UN GEGN අක්ෂර පරිවර්තනය මෙට්‍රික් ක්‍රමය මෙට්‍රික් රාජකීය මිනුම් ක්‍රමය @@ -948,47 +1015,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ එජ ඉන්දු අරාබි ඉලක්කම් වැඩි කළ ඉන්දු අරාබි ඉලක්කම් + විස්තීරණ අරාබි-ඉන්දු ඇමරිකානු සංඛ්‍යාංකන ඇමරිකානු කුඩා සංඛ්‍යාංකන + ආර්මේනියානු කුඩා අකුරු බෙංගාලි ඉලක්කම් චක්මා ඉලක්කම් දේවනාගරී ඉලක්කම් ඉතියෝපියානු සංඛ්‍යාංකන + මූල්‍ය සම්පූර්ණ පළල ඉලක්කම් + සම්පූර්ණ පළල ජෝජියානු සංඛ්‍යාංකන ග්‍රීක සංඛ්‍යාංකන ග්‍රීක කුඩා සංඛ්‍යාංකන + ග්‍රීක කුඩා අකුරු ගුජරාටි ඉලක්කම් ගුර්මුකී ඉලක්කම් + සම්ප්‍රදායික දින දර්ශන සඳහා හන්-අක්ෂර මඟින් මාසයේ දින අංකනය චීන දශමය සංඛ්‍යාංකන + චීන සංඛ්‍යා අක්ෂර භාවිතයෙන් ස්ථානීය දශම පද්ධතිය සුළුකළ චීන සංඛ්‍යාංකන සුළුකළ චීන මුල්‍යමය සංඛ්‍යාංකන + සුළුකළ චීන මූල්‍ය සාම්ප්‍රදායික චීන සංඛ්‍යාංකන සාම්ප්‍රදායික චීන මුල්‍යමය සංඛ්‍යාංකන + සම්ප්‍රදායික චීන මූල්‍ය හීබෲ සංඛ්‍යාංකන ජාවානු ඉලක්කම් ජපාන සංඛ්‍යාංකන ජපාන මුල්‍යමය සංඛ්‍යාංකන + ජපන් මූල්‍ය + ජපන් පළමු වසර ගන්නෙන් අංකනය කමර් ඉලක්කම් කන්නඩ ඉලක්කම් + තායි තාම් තාම් (ආගමික) ලාඕ ඉලක්කම් බටහිර ඉලක්කම් + ගණිතමය තද අකුරු + ගණිතමය ද්විත්ව-රේඛීය + ගණිතමය ඒක-අවකාශ + ගණිතමය සංස් සෙරිෆ් තද අකුරු + ගණිතමය සංස් සෙරිෆ් මලයාලම් ඉලක්කම් මීටේයි මයෙක් ඉලක්කම් බුරුම ඉලක්කම් + මියන්මාර නැගෙනහිර ප්වෝ කරෙන් + මියන්මාර පාඕ + මියන්මාර ශාන් + මියන්මාර තායි ලේං + දේශීය ඉලක්කම් + දේශීය ඉලක්කම් ඔල් චිකි ඉලක්කම් ඔරියා ඉලක්කම් + වටසන් කළ රෝමානු සංඛ්‍යාංකන + රෝමානු ලොකු අකුරු රෝමානු කුඩා සංඛ්‍යාංකන + රෝමානු කුඩා අකුරු + ඛණ්ඩනය කළ සාම්ප්‍රදායික දෙමළ සංඛ්‍යාංකන දෙමළ ඉලක්කම් + නූතන දෙමළ තෙළිඟු ඉලක්කම් තායි ඉලක්කම් ටිබෙට ඉලක්කම් + සම්ප්‍රදායික සංඛ්‍යාංකන වායි ඉලක්කම් ක්‍රියාවිරහිතයි ක්‍රියාත්මකයි + සඳහන් නොකළ යන්ත්‍ර මඟින් පරිවර්තනය කළ + POSIX ප්‍රභේදය + + ක්‍රියාවිරහිතයි + ක්‍රියාත්මකයි + මෙට්රික් එංගලන්ත @@ -1033,11 +1135,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G y-MM-dd + G y/MM/dd + + / + : + {1} {0} @@ -1079,20 +1185,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E B h:mm:ss d E E a h + E a h:mm + E a h:mm:ss + G y/M + G y/MM/dd + G y/MM/dd, E a h - a h.mm - a h.mm.ss + a h:mm + a h:mm:ss v a h - M-d - M-d, E + M/d + M/d, E MMM d E - mm.ss - G y-M - G y-M-d - G y-M-d, E + G y/M + G y/M/d + G y/M/d, E {0} – {1} + + B h – B h + B h–h + + + B h:mm – B h:mm + B h:mm–h:mm + B h:mm–h:mm + + + G y/M – G y/M + y/M – y/M G + y/M – y/M G + + + G d/M/y – d/M/y + G d/M/y – G d/M/y + d/M/y – G d/M/y + a h – a h a h–h @@ -1123,7 +1252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M–M - M-d – M-d + M/d – M/d M-d – M-d @@ -1134,19 +1263,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM-d, E – MMM-d, E MMM-dd, E – MMM-dd, E + + MMMM d – d + - G y-M – y-M - G y-M – y-M + G y/M – y/M + G y/M – y/M - G y-M-d – y-M-d - G y-M-d – y-M-d - G y-M-d – y-M-d + G y/M/d – y/M/d + G y/M/d – y/M/d + G y/M/d – y/M/d - G y-M-d, E – y-M-d, E - G y-M-d, E – y-M-d, E - G y-M-d, E – y-M-d, E + G y/M/d, E – y/M/d, E + G y/M/d, E – y/M/d, E + G y/M/d, E – y/M/d, E G y MMM d – d @@ -1164,34 +1296,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - දුරුතු - නවම් - මැදින් - බක් - වෙසක් - පොසොන් - ඇසළ - නිකිණි - බිනර - වප් - ඉල් - උඳුවප් - - - දු - න - මැ - බ - වෙ - පො - ඇ - නි - බි - ව - ඉ - උ - දුරුතු නවම් @@ -1208,20 +1312,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - දුරුතු - නවම් - මැදින් - බක් - වෙසක් - පොසොන් - ඇසළ - නිකිණි - බිනර - වප් - ඉල් - උඳුවප් - දු න @@ -1236,20 +1326,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ඉ උ - - දුරුතු - නවම් - මැදින් - බක් - වෙසක් - පොසොන් - ඇසළ - නිකිණි - බිනර - වප් - ඉල් - උඳුවප් - @@ -1377,22 +1453,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - HH.mm.ss zzzz + HH:mm:ss zzzz - HH.mm.ss z + HH:mm:ss z - HH.mm.ss + HH:mm:ss - HH.mm + HH:mm @@ -1450,19 +1526,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E B h:mm:ss d E E a h - E a h.mm - E HH.mm - E a h.mm.ss - E HH.mm.ss + E a h:mm + E a h:mm:ss a h - a h.mm - HH.mm - a h.mm.ss - HH.mm.ss + a h:mm + a h:mm:ss v a h:mm:ss - v HH.mm.ss - v a h.mm - v HH.mm + v HH:mm:ss + v a h:mm + v HH:mm v a h v HH M-d @@ -1470,13 +1542,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM d E MMMM සතිය W MMMM සතිය W - mm.ss y-M y-M-d y-M-d, E + y MMMM d + y MMMM d, EEE Y සතිය w Y සතිය w + + {0}, {1} + {0} – {1} @@ -1501,22 +1577,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ a h–h - a h.mm – a h.mm - a h.mm – h.mm - a h.mm – h.mm - - - HH.mm–HH.mm - HH.mm–HH.mm + a h:mm – a h:mm + a h:mm – h:mm + a h:mm – h:mm - a h.mm – a h.mm v - a h.mm – h.mm v - a h.mm – h.mm v - - - HH.mm–HH.mm v - HH.mm–HH.mm v + a h:mm – a h:mm v + a h:mm – h:mm v + a h:mm – h:mm v a h – a h v @@ -1537,6 +1605,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM-d, E – MMM-d, E MMM-dd, E – MMM-dd, E + + MMMM d – d + y-M-d – y-M-d y-M-d – y-M-d @@ -1870,9 +1941,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ විනා. - - විනා. - තත්පරය දැන් @@ -1898,8 +1966,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +HH.mm;-HH.mm ග්‍රිමවේ{0} - ග්‍රිමවේ + සවිවේ{0} ග්‍රිමවේ+? + සවිවේ+? {0} වේලාව {0} දිවාආලෝක වේලාව {0} සම්මත වේලාව @@ -1910,6 +1979,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ සමකක්ෂ සාර්ව වේලාව + + සවිවේ + හඳුනා නොගත් නගරය @@ -2380,9 +2452,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ලිබ්රවිල් - - බ්‍රිතාන්‍ය ගිම්හාන වේලාව - ලන්ඩන් @@ -2473,9 +2542,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ජයපුර - - අයර්ලන්ත සම්මත වේලාව - ඩබ්ලින් @@ -3171,6 +3237,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ හරාරේ + + + ඒකර් වේලාව + ඒකර් සම්මත වේලාව + ඒකර් ගිම්හාන වේලාව + + ඇෆ්ගනිස්ථාන වේලාව @@ -3346,6 +3419,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ බ්‍රසීල ග්‍රීෂ්ම කාලය + + + බ්‍රිතාන්‍ය වේලාව + බ්‍රිතාන්‍ය ගිම්හාන වේලාව + + බෘනායි දරුස්සලාම් වේලාව @@ -3519,6 +3598,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ග්‍රිනිච් මධ්‍යම වේලාව + + + ග්‍රීන්ලන්ත වේලාව + ග්‍රීන්ලන්ත සම්මත වේලාව + ග්‍රීන්ලන්ත ගිම්හාන වේලාව + + නැගෙනහිර ග්‍රීන්ලන්ත වේලාව @@ -3545,7 +3631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - හවායි-අලෙයුතියාන් සම්මත වේලාව + හවායි වේලාව @@ -3606,6 +3692,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ඉරාන දිවා කාලය + + + අයර්ලන්ත වේලාව + අයර්ලන්ත සම්මත වේලාව + + ඉර්කුට්ස්ක් වේලාව @@ -3627,6 +3719,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ජපාන දහවල් වේලාව + + + කම්චැට්කා වේලාව + කම්චැට්කා සම්මත වේලාව + කම්චැට්කා ගිම්හාන වේලාව + + කසකස්තාන වේලාව @@ -3666,11 +3765,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ කිර්ගිස්තාන වේලාව - - - ශ්‍රී ලංකා වේලාව - - ලයින් දුපත් වේලාව @@ -3894,11 +3988,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ සඛලින් ග්‍රීෂ්ම වේලාව + + + සමාරා වේලාව + සමාරා සම්මත වේලාව + සමාරා ගිම්හාන වේලාව + + - සැමෝවා වේලාව සැමෝවා සම්මත වේලාව - සැමෝවා ග්‍රීෂ්ම වේලාව @@ -3965,6 +4064,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ චුක් වේලාව + + + තුර්කියේ වේලාව + තුර්කියේ සම්මත වේලාව + තුර්කියේ ගිම්හාන වේලාව + + ටර්ක්මෙනිස්තාන වේලාව @@ -3984,6 +4090,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ උරුගුවේ ග්‍රීෂ්ම කාලය + + + උරුම්කි වේලාව + + උස්බෙකිස්තාන වේලාව @@ -4054,9 +4165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - . - @@ -4279,6 +4387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ස්විස් ෆ්‍රෑන්ක් + ෆ්‍රෑ. චිලි පැසෝ @@ -4708,8 +4817,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ සිම්බාබ්වේ රත්තරන් - සිම්බාබ්වේ රත්තරන් - සිම්බාබ්වේ රත්තරන් @@ -4888,11 +4995,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ අයිතම - - කොටස - කොටස {0} - කොටස {0} - මිලියනයට කොටස් මිලියනයට කොටස් {0} @@ -5659,11 +5761,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ සීවර්ට් {0} සීවර්ට් {0} - - අළු - අළු {0} - අළු {0} - කිලෝග්‍රෑම්-බලය කිලෝග්‍රෑම්-බලය {0} @@ -6889,11 +6986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}වඅඟ² {0}/වඅඟ² - - කොටස - කොටස {0} - කොටස {0} - මිලිකො @@ -7035,11 +7127,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ඇ {0} ඇ {0} - - ර - ර {0} - ර {0} - " ර ර {0}" @@ -7062,6 +7149,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ බි{0} + °C {0}° {0}° @@ -7085,71 +7173,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ඉම්පී. අතුරුපස හැඳි - - ස්ට - ස්ට {0} - ස්ට {0} - - - කැට - කැට {0} - කැට {0} - - - කූ - කූ {0} - කූ {0} - - - ෆැ - ෆැ {0} - ෆැ {0} - - - හෙ - හෙ {0} - හෙ {0} - - - සී - සී {0} - සී {0} - කැ [IT] කැ [IT] {0} කැ [IT] {0} - - බෙක - බෙක {0} - බෙක {0} - - - සීව - සීව {0} - සීව {0} - - - අළු - අළු {0} - අළු {0} - - - කිග්‍රෑබ - කිග්‍රෑබ {0} - කිග්‍රෑබ {0} - - - ටෙ - ටෙ {0} - ටෙ {0} - - - වේබ - වේබ {0} - වේබ {0} - බිකො diff --git a/make/data/cldr/common/main/sid.xml b/make/data/cldr/common/main/sid.xml deleted file mode 100644 index 62e6873bef5f..000000000000 --- a/make/data/cldr/common/main/sid.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - Sidaamu Afo - - - - - - Itiyoophiya - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - - - - - - EEEE, MMMM dd, y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - h:mm:ss a zzzz - - - - - h:mm:ss a z - - - - - h:mm:ss a - - - - - h:mm a - - - - - - - - - Sam - San - Mak - Row - Ham - Arb - Qid - - - Sambata - Sanyo - Maakisanyo - Roowe - Hamuse - Arbe - Qidaame - - - - - S - S - M - R - H - A - Q - - - - - - - soodo - hawwaro - - - - - - YIA - YIG - - - - - - EEEE, MMMM dd, y - yMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - - ¤#,##0.00 - - - - - - Br - - - - diff --git a/make/data/cldr/common/main/sid_ET.xml b/make/data/cldr/common/main/sid_ET.xml deleted file mode 100644 index f36ee83eaa5e..000000000000 --- a/make/data/cldr/common/main/sid_ET.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/sk.xml b/make/data/cldr/common/main/sk.xml index 20ad998012af..f2e15c05b99d 100644 --- a/make/data/cldr/common/main/sk.xml +++ b/make/data/cldr/common/main/sk.xml @@ -421,6 +421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pálí pidžin poľština + piedmončina pohnpeiština maliseet-passamaquoddy pruština @@ -996,18 +997,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zoradenie normálne radenie číselné radenie + skriptová/bloková zmena poradia sila radenia mena + transformačný cieľ + slovník výnimiek pri delení slov prezentácia emodži + prvý deň v týždni + zmiešané hodinový cyklus (12 vs 24) + metóda vstupu + klávesnica + ignorovanie najvyššieho štýl koncov riadka zlom riadka v slovách + transformačné pravidlá merná sústava + merná jednotka čísla + pole na doplňujúce údaje + transformačný zdroj + rozdelenie oblasti veta po skrat. + transformácia + strojovo preložené časové pásmo variant miestneho nastavenia súkromné použitie + súkromná transformácia budhistický kalendár @@ -1027,13 +1044,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ židovský kalendár židovský Indický národný kalendár + indický národný kalendár podľa hidžry podľa hidžry kalendár podľa hidžry (občiansky) podľa hidžry (občiansky) + podľa hidžry, Saudská Arábia + podľa hidžry (tabuľkový, astronomická epocha) kalendár podľa hidžry (Umm al-Qura) podľa hidžry (Umm al-Qura) kalendár ISO 8601 + gregoriánsky japonský kalendár japonský perzský kalendár @@ -1049,8 +1070,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Normálne radenie akcentov Radiť akcenty opačne Najprv radiť malé písmená + malé písmená Normálne radenie veľkých a malých písmen + malé písmená Najprv radiť veľké písmená + veľké písmená Pri radení nerozlišovať veľké a malé písmená Pri radení rozlišovať veľké a malé písmená predchádzajúce zoradenie, kompatibilita @@ -1059,7 +1083,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ slovníkové predvolené zoradenie unicode predvolené, unicode + emodži európske zoradenie + európske pravidlá lexikografické zoradenie lexikografické fonetické zoradenie @@ -1069,6 +1095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ všeobecné vyhľadávanie vyhľadávanie Hľadať podľa počiatočnej spoluhlásky písma Hangul + kórejská úvodná spoluhláska štandardné zoradenie štandardné zoradenie podľa ťahov @@ -1083,17 +1110,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Radenie podľa normalizovaného kódovania Unicode Radiť číslice jednotlivo Numerické radenie číslic + mena + čísla + interpunkcia + medzera + symbol Radiť všetko + všetky Radiť iba základné písmená + iba základné písmená Radiť akcenty/veľké a malé písmená/šírku/kana + základné, s prízvukmi, veľkosti, varianty, kana Radiť akcenty + základné, s prízvukmi Radiť akcenty/veľké a malé písmená/šírku + základné, s prízvukmi, veľkosti, varianty celá šírka polovičná šírka Číslice predvolené emodži text + 12-hodinový cyklus + 12 + 24-hodinový cyklus + 24 12-hodinový cyklus (0 – 11) 12 (0 – 11) 12-hodinový cyklus (1 – 12) @@ -1102,6 +1143,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0 – 23) 24-hodinový cyklus (1 – 24) 24 (1 – 24) + posuny, interpunkcia, všetky symboly + posuny, interpunkcia + posuny, interpunkcia + posuny, interpunkcia, iné symboly než meny voľný štýl koncov riadka voľný bežný štýl koncov riadka @@ -1122,51 +1167,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ americká arabsko-indické číslice rozšírené arabsko-indické číslice + rozšírené arabsko-indické arménske číslice malé arménske číslice + malé arménske bengálske číslice číslice chakma číslice dévanágarí etiópske číslice Finančnícky zápis čísiel + finančné znaky číslice s celou šírkou + celá šírka gruzínske číslice grécke číslice malé grécke číslice + malé grécke gudžarátske číslice číslice gurumukhí + číslovanie dňa v mesiaci znakom han v tradičnom kalendári čínske desiatkové číslice + pozičný desiatkový systém používajúci čínske číselné ideogramy ako číslice číslice zjednodušenej čínštiny finančné číslice zjednodušenej čínštiny + finančné znaky zjednodušenej čínštiny číslice tradičnej čínštiny finančné číslice tradičnej čínštiny + finančné znaky tradičnej čínštiny hebrejské číslice jávske číslice japonské číslice japonské finančné číslice + japonské finančné znaky + japonské číslovanie Gannen (najprv rok) khmérske číslice kannadské číslice + cirkevné tai tham tham laoské číslice arabské číslice + matematické znaky tučné + matematické znaky dvojité + matematické znaky jednomiestne + matematické znaky bezpätkové, tučné + matematické znaky bezpätkové malajálamske číslice Mongolské číslice číslice meetei mayek barmské číslice + mjanmarské východné pwo karen + mjanmarské pao + mjanmarské shan + mjanmarské tai laing natívne číslice + natívne číslice číslice ol chiki uríjske číslice + obrysové rímske číslice + rímske veľké malé rímske číslice + rímske malé + segmentované číslice tradičnej tamilčiny tamilské číslice + moderné tamilské telugské číslice thajské číslice tibetské číslice Tradičné číslovky + tradičné číslice vaiské číslice vypnuté zapnuté + nešpecifikovaný strojový preklad + variant POSIX + + vypnuté + zapnuté + metrický britský @@ -1358,6 +1437,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0} – {1} + h – h B @@ -1463,6 +1546,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL – LLLL + + d. – d. MM. + d. MM. – d. MM. + y – y G @@ -1736,6 +1823,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1772,7 +1862,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL y G d. M. y G E d. M. y G + MMM y G d. M. y G + E, d. MMMM y G H h:mm a H:mm @@ -1803,6 +1895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d. M. y LLLL y d. MMMM y + E, d. MMMM y QQQ y QQQQ y w. 'týždeň' 'roka' Y @@ -1810,7 +1903,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w. 'týždeň' 'roka' Y w. 'týždeň' 'roka' Y + + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + {0} – {1} + h – h B @@ -1914,6 +2016,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL – LLLL + + d. – d. MMMM + d. MMMM – d. MMMM + y – y @@ -2057,7 +2163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pred ROC - ROC @@ -2796,9 +2901,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Paríž - - britský letný čas - Londýn @@ -2825,11 +2927,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Budapešť - - - írsky štandardný čas - - Jeruzalem @@ -3093,9 +3190,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - acrejský čas - acrejský štandardný čas - acrejský letný čas + acrejský čas + acrejský štandardný čas + acrejský letný čas @@ -3130,13 +3227,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ aljašský letný čas - - - almaatský čas - almaatský štandardný čas - almaatský letný čas - - amazonský čas @@ -3186,20 +3276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ apijský letný čas - - - aktauský čas - aktauský štandardný čas - aktauský letný čas - - - - - aktobský čas - aktobský štandardný čas - aktobský letný čas - - arabský čas @@ -3301,6 +3377,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ brazílsky letný čas + + + britský čas + britský letný čas + + brunejský čas @@ -3484,6 +3566,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ greenwichský čas + + + grónsky čas + grónsky štandardný čas + grónsky letný čas + + východogrónsky čas @@ -3498,11 +3587,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ západogrónsky letný čas - - - guamský čas - - štandardný čas Perzského zálivu @@ -3515,7 +3599,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - havajsko-aleutský štandardný čas + havajský čas @@ -3576,6 +3660,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ iránsky letný čas + + + írsky čas + írsky štandardný čas + + irkutský čas @@ -3599,9 +3689,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovsk-Kamčatský čas - Petropavlovsk-Kamčatský štandardný čas - Petropavlovsk-Kamčatskijský letný čas + kamčatský čas + kamčatský štandardný čas + kamčatský letný čas @@ -3643,11 +3733,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kirgizský čas - - - srílanský čas - - čas Rovníkových ostrovov @@ -3660,13 +3745,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ letný čas ostrova lorda Howa - - - macajský čas - macajský štandardný čas - macajský letný čas - - magadanský čas @@ -3782,11 +3860,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ letný čas súostrovia Fernando de Noronha - - - severomariánsky čas - - novosibirský čas @@ -3866,13 +3939,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pchjongjanský čas - - - kyzylordský čas - kyzylordský štandardný čas - kyzylordský letný čas - - réunionský čas @@ -3892,16 +3958,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samarský čas - Samarský štandardný čas - Samarský letný čas + samarský čas + samarský štandardný čas + samarský letný čas - samojský čas samojský štandardný čas - samojský letný čas @@ -3968,6 +4032,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chuukský čas + + + turecký čas + turecký štandardný čas + turecký letný čas + + turkménsky čas @@ -3987,6 +4058,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguajský letný čas + + + čas Urumči + + uzbecký čas @@ -4118,28 +4194,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 tis'.' + 0 tis'.' + 0 tis'.' 0 tis'.' 00 tis'.' + 00 tis'.' + 00 tis'.' 00 tis'.' 000 tis'.' + 000 tis'.' + 000 tis'.' 000 tis'.' 0 mil'.' + 0 mil'.' + 0 mil'.' 0 mil'.' 00 mil'.' + 00 mil'.' + 00 mil'.' 00 mil'.' 000 mil'.' + 000 mil'.' + 000 mil'.' 000 mil'.' 0 mld'.' + 0 mld'.' + 0 mld'.' 0 mld'.' 00 mld'.' + 00 mld'.' + 00 mld'.' 00 mld'.' 000 mld'.' + 000 mld'.' + 000 mld'.' 000 mld'.' 0 bil'.' + 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' + 000 bil'.' 000 bil'.' @@ -4683,13 +4783,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ čínskeho jüana (pobrežného) čínskych jüanov (pobrežných) - - čínsky dolár ČĽB - čínsky dolár ČĽB - čínske doláre ČĽB - čínskeho dolára ČĽB - čínskych dolárov ČĽB - čínsky jüan čínsky jüan @@ -10922,9 +11015,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ac - - Glc - l/100 km @@ -10976,23 +11066,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mb {0} mb - - fl oz m - {0} fl oz m - {0} fl oz m - {0} fl oz m - {0} fl oz m - - - cal-IT - - - kp - {0} kp - {0} kp - {0} kp - {0} kp - diff --git a/make/data/cldr/common/main/skr.xml b/make/data/cldr/common/main/skr.xml deleted file mode 100644 index d766ea93dfc6..000000000000 --- a/make/data/cldr/common/main/skr.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - سرائیکی ► skr - سرائیکی - - - پاکستان - - - مِیٹرک - یو کے - یو ایس - - - - - right-to-left - - - - [ء آ ؤ ئ ا ب ٻ پ ت ث ٹ ج ڄ چ ح خ د ذ ڈ ڊ ݙ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ڳ ل م ن ں ݨ ھ ہ ۃ و ی ے] - [\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩] - [\- ‐‑ – — ، ؛ \: ! ؟ . … ' " « » ( ) \[ \] / ؎ ؏] - - - - - - - - جنوری - فروری - مارچ - اپریل - مئی - جون - جولائی - اگست - ستمبر - اکتوبر - نومبر - دسمبر - - - - - - - اتوار - سوموار - منگل - ٻدھ - خمیس - جمعہ - چھݨ چھݨ - - - - - - - اے ایم - پی ایم - - - - - - - جی ایم ٹی {0} - جی ایم ٹی - {0} وقت - {0} ݙین٘ہ موسمی وقت - - - جی ایم ٹی - - - - - diff --git a/make/data/cldr/common/main/skr_PK.xml b/make/data/cldr/common/main/skr_PK.xml deleted file mode 100644 index 8ec02569a899..000000000000 --- a/make/data/cldr/common/main/skr_PK.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/sl.xml b/make/data/cldr/common/main/sl.xml index 08d55e1d9b20..29eb2deb11bb 100644 --- a/make/data/cldr/common/main/sl.xml +++ b/make/data/cldr/common/main/sl.xml @@ -412,6 +412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ palijščina pidžin poljščina + piemontščina ponpejščina maliseet-passamaquoddščina stara pruščina @@ -582,25 +583,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zazajščina - - - + + + - + - + - + - + @@ -611,13 +612,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - + - - + + @@ -627,7 +628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -636,15 +637,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - - - + + + - + @@ -658,16 +659,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + - - - + + + - + - + @@ -683,29 +684,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - + + - + - + - + - - - + + + - + @@ -1068,27 +1069,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ romanizacija Wade-Giles - koledar - oblika zapisa valute + Koledar + Oblika zapisa valute Razvrščanje s prezrtimi znaki Razvrščanje z obratnimi naglasi Razvrščanje velike črke/male črke Razvrščanje, občutljivo na velike/male črke - razvrščanje + Razvrščanje Normalizirano razvrščanje Številsko razvrščanje + Preurejanje skript/blokov Moč razvrščanja - valuta + Valuta + Ciljna oblika + Izjeme pri deljenju besed Prikaz emodžija - urni prikaz (12 ali 24) + Prvi dan v tednu + Vmešano + Urni prikaz (12 ali 24) + Način vosa + Tipkovnica + Najvišja prezrta vrednost Slog preloma vrstic Prelomi vrstic znotraj besed - merski sistem - številke + Pravila pretvorbe + Merski sistem + Merska enota + Številke + Regija za dodatne podatke + Izvorna oblika + Podenota regije Konec stavka po okrajšavi + Pretvorba + Strojno prevedeno Časovni pas Različica območnih nastavitev - Zasebna-uporaba + Zasebna uporaba + Pretvorba za zasebno uporabo budistični koledar @@ -1108,15 +1125,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hebrejski koledar hebrejski indijanski koledar + indijski državni islamski koledar islamski islamski civilni koledar islamski civilni islamski koledar ( Saudova Arabija, opazovalni) + islamski (glede na opazovanje v Savdski Arabiji) islamski koledar (tabelarni, astronomska epoha) + islamski (tabelski, astronomsko začetno obdobje) islamski koledar Umm al-Qura islamski (Umm al-Qura) koledar ISO-8601 + gregorijanski japonski koledar japonski perzijski koledar @@ -1132,8 +1153,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Navadno razvrščanje naglasov Obratno razvrščanje naglasov Razvrščanje malih črk najprej + male črke Razvrščanje v običajnem zaporedju velikih/malih črk + male črke Razvrščanje velikih črk najprej + velike črke Razvrščanje ne glede na velike/male črke Razvrščanje ob upoštevanju velikih/malih črk prej uporabljeno razvrščanje za združljivost @@ -1143,16 +1167,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ privzeto razvrščanje Unicode privzeto Unicode razvrščanje čustvenčkov + emodži evropska pravila razvrščanja + evropska pravila razvrščanje po sistemu telefonskega imenika po sistemu telefonskega imenika fonetično razvrščanje fonetično razvrščanje po sistemu pinjin po sistemu pinjin - Splošno iskanje + splošno iskanje splošno Iskanje po začetnem soglasniku hangul + korejski začetni soglasnik standardno razvrščanje standardno razvrščanje po zaporedju pisanja pismenk @@ -1166,18 +1193,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Razvrščanje brez normaliziranja Normalizirano razvrščanje Unicode Ločeno razvrščanje številk - Številsko razvrščanje števk + številsko razvrščanje števk + valuta + števke + ločila + presledek + simbol Razvrščanje vsega + vse Razvrščanje samo osnovnih črk + samo osnovne črke Razvrščanje po naglasih/velikih črkah/malih črkah/širini/kana + osnovne črke, naglasi, velikost črk, različice, kana Razvrščanje naglasov + osnovne črke, naglasi Razvrščanje po naglasih/velikih črkah/malih črkah/širini - Polna širina - Polovična širina + osnovne črke, naglasi, velikost črk, različice + polna širina + polovična širina Številsko privzeto emodži besedilo + 12-urni sistem + 12 + 24-urni sistem + 24 12-urni sistem (0–11) 12 (0–11) 12-urni sistem (1–12) @@ -1186,12 +1227,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-urni sistem (1–24) 24 (1–24) - Prosti slog preloma vrstic - Prosti slog - Običajni slog preloma vrstic - Običajni slog - Strogi slog preloma vrstic - Strogi slog + premaknjeni presledki, ločila, vsi simboli + premaknjeni presledki, ločila + premaknjeni presledki, ločila + premaknjeni presledki, ločila in nedenarni simboli + prosti slog preloma vrstic + prosti slog + običajni slog preloma vrstic + običajni slog + strogi slog preloma vrstic + strogi slog prelomi vse obdrži vse običajno @@ -1207,8 +1252,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ števke ahom arabskoindijske števke razširjene arabskoindijske števke + razširjene arabskoindijske armenske številke armenske majhne številke + armenske majhne balinezijske števke bengalske števke brahmi števke @@ -1218,53 +1265,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ devangarske števke etiopijske številke Finančne številke + finančne števke polne širine + polne širine gruzijske številke Masaram gondi števke grške številke grške male številke + grške male gudžaratske števke gurmuške števke + številčenje dni v mesecu s pismenkami Han za tradicionalne koledarje kitajske decimalne številke + pozicijski desetiški sistem s kitajskimi pismenkami kot števkami poenostavljene kitajske številke poenostavljene kitajske finančne številke + poenostavljene kitajske finančne tradicionalne kitajske številke tradicionalne kitajske finančne številke + tradicionalne kitajske finančne hebrejske številke Pahawh Hmong števke javanske števke japonske številke japonske finančne številke + japonske finančne + številčenje prvega leta (Gannen) v japonskem koledarju Kayah Li števke kmerske števke kanaredske števke Tai Tham Hora števke Tai Tham Tham števke + Tai Tham Tham (cerkveno) laoške števke zahodne števke Lepcha števke Limbu števke Krepke matematične števke + matematične krepke dvojno prečrtane matematične števke + matematične dvojne črte matematične števke z enim prostorom + matematične monospace matematične krepke Sans-Serif števke + matematične sans-serif bold matematične Sans-Serif števke + matematične sans-serif malajalamske števke Modi števke Mongolske števke Mro števke meiteiske števke mjanmarske števke + mjanmarska vzhodna pvo kurenščina + mjanmarska paoščina mjanmarske shan števke + mjanmarska šanščina mjanmarske števke Tai Laing + mjanmarska tai-laingščina izvorne števke + izvorne števke N’Ko števke santalske števke orijske števke osmanijske števke + obrobljene rimske številke + rimske velike rimske male številke + rimske male Saurashtra števke + razdeljene Sharada števke Khudawadi števke Sinhala Lith števke @@ -1274,16 +1345,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Nove Tai Lue števke tradicionalne tamilske številke tamilske števke + sodobne tamilske teluške števke tajske števke tibetanske števke Tirhuta števke Tradicionalne številke + tradicionalne številke števke vai Warang Citi števke Izklopljeno Vklopljeno + neopredeljen strojni prevod + različica POSIX + + izklopljeno + vklopljeno + metrični angleški @@ -1338,6 +1417,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + + + + + - + + + @@ -1534,6 +1627,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.–E, d. MMM E, d. MMM–E, d. MMM + + d.–d. MMMM + d. MMMM–d. MMMM + y–y @@ -1808,6 +1905,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1850,12 +1950,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, h:mm:ss a E, HH:mm:ss y G - MMM y G + M/y G d. M. y GGGGG E, d. M. y G MMM y G d. MMM y G E, d. MMM y G + MMMM y G + d. MMMM y G + E, d. MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -1865,6 +1968,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM E, d. MMM d. MMMM + E, d. MMMM MMMM: W. 'teden' MMMM: W. 'teden' MMMM: W. 'teden' @@ -1876,6 +1980,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y E, d. MMM y MMMM y + d. MMMM y + E, d. MMMM y QQQ y QQQQ y w. 'teden' 'leta' Y @@ -1883,7 +1989,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w. 'teden' 'leta' Y w. 'teden' 'leta' Y + + {0} ({1}) + {1}, {0} + {0} {1} + {1} ob {0} + {0} ({1}) + + + {0}–{1} + {0}–{1} h B–h B @@ -1981,6 +2097,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d.–E, d. MMM E, d. MMM–E, d. MMM + + d.–d. MMMM + d. MMMM–d. MMMM + M.–M. y M. y–M. y @@ -2047,6 +2167,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pred {0} leti + + lani + letos + nasl. leto + + pred {0} l. + pred {0} l. + pred {0} leti + pred {0} leti + + + + lani + letos + nasl. l. + + čez {0} l. + čez {0} l. + čez {0} l. + čez {0} l. + + + pred {0} l. + pred {0} l. + pred {0} l. + pred {0} l. + + četrtletje zadnje četrtletje @@ -2613,7 +2761,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ +HH.mm;-HH.mm GMT {0} + UTC {0} GMT +? + UTC +? {0} (lokalni čas) {0} (poletni čas) {0} (standardni čas) @@ -2739,11 +2889,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pariz - - - Britanski poletni čas - - Akra @@ -2771,11 +2916,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Makasar - - - Irski standardni čas - - Jeruzalem @@ -3013,6 +3153,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hošiminh + + + Acrejski čas + Acrejski standardni čas + Acrejski poletni čas + + Afganistanski čas @@ -3089,9 +3236,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Čas: Apia - Standardni čas: Apia - Poletni čas: Apia + Zahodnosamojski čas + Zahodnosamojski standardni čas + Zahodnosamojski poletni čas @@ -3195,6 +3342,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasilski poletni čas + + + Britanski čas + Britanski poletni čas + + Brunejski čas @@ -3368,6 +3521,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Greenwiški srednji čas + + + Grenlandski čas + Grenlandski standardni čas + Grenlandski poletni čas + + Vzhodnogrenlandski čas @@ -3394,7 +3554,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Havajski aleutski standardni čas + Havajski standardni čas @@ -3455,6 +3615,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Iranski poletni čas + + + Irski čas + Irski standardni čas + + Irkutski čas @@ -3478,9 +3644,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Petropavlovsk-Kamčatski čas - Petropavlovsk-Kamčatski standardni čas - Petropavlovsk-Kamčatski poletni čas + Kamčatski čas + Kamčatski standardni čas + Kamčatski poletni čas @@ -3563,9 +3729,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Mauricijski čas - Mauricijski standardni čas - Mauricijski poletni čas + Mavricijski čas + Mavricijski standardni čas + Mavricijski poletni čas @@ -3754,9 +3920,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoanski čas Samoanski standardni čas - Samoanski poletni čas @@ -3849,6 +4013,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugvajski poletni čas + + + Urumški čas + + Uzbekistanski čas @@ -3982,28 +4151,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 tis'.' + 0 tis'.' + 0 tis'.' 0 tis'.' 00 tis'.' + 00 tis'.' + 00 tis'.' 00 tis'.' 000 tis'.' + 000 tis'.' + 000 tis'.' 000 tis'.' 0 mio'.' + 0 mio'.' + 0 mio'.' 0 mio'.' 00 mio'.' + 00 mio'.' + 00 mio'.' 00 mio'.' 000 mio'.' + 000 mio'.' + 000 mio'.' 000 mio'.' 0 mrd'.' + 0 mrd'.' + 0 mrd'.' 0 mrd'.' 00 mrd'.' + 00 mrd'.' + 00 mrd'.' 00 mrd'.' 000 mrd'.' + 000 mrd'.' + 000 mrd'.' 000 mrd'.' 0 bil'.' + 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' + 000 bil'.' 000 bil'.' @@ -4019,11 +4212,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ - #,##0.00 ¤ + #,##0.00 ¤ #,##0.00 ¤;(#,##0.00 ¤) - #,##0.00 ¤;(#,##0.00 ¤) + #,##0.00 ¤;(#,##0.00 ¤) #,##0.00;(#,##0.00) @@ -5628,9 +5821,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ s/z {0} po {0} {0} je - Ona {0} - On {0} - Ono {0} + Izmerjena je bila 1 {0}. + Izmerjen je bil 1 {0}. + Izmerjeno je bilo 1 {0}. @@ -6339,10 +6532,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ deli - {0} del - {0} dela - {0} deli - {0} delov masculine @@ -8665,10 +8854,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ živega srebra - {0} živega srebra - {0} živega srebra - {0} živega srebra - {0} živega srebra + {0} živega srebra + {0} živega srebra + {0} živega srebra + {0} živega srebra funti na kvadratni palec @@ -9619,31 +9808,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} vebrov - feminine - {0} svetloba - {0} svetlobo - {0} svetlobi - {0} svetlobe - {0} svetlobo - {0} svetlobi - {0} svetlobi - {0} svetlobi - {0} svetlobama - {0} svetlob - {0} svetlobama - {0} svetlobah - {0} svetlobe - {0} svetlobe - {0} svetlobam - {0} svetlob - {0} svetlobami - {0} svetlobah - {0} svetlob - {0} svetlob - {0} svetlobam - {0} svetlob - {0} svetlobami - {0} svetlobah + masculine + svetloben + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. masculine @@ -10173,11 +10363,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} kp - svetloba - {0} svetloba - {0} svetlobi - {0} svetlobe - {0} svetlob + sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. noči @@ -10199,19 +10389,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dunum - - del - {0} del - {0} dela - {0} deli - {0} delov - % - - Glc - {0} bajt {0} bajta @@ -10253,12 +10433,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} s {0} s - - {0} em - {0} ema - {0} emi - {0} emov - pika @@ -10283,13 +10457,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} m. sk. {0} m. sk. - - m. fl. oz. - {0} m. fl. oz. - {0} m. fl. oz. - {0} m. fl. oz. - {0} m. fl. oz. - des. žl. {0} des. žl. @@ -10304,15 +10471,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} imp. des. žl. {0} imp. des. žl. - - cal-IT - - - kp - {0} kp - {0} kp - {0} kp - {0} kp + + sv. + {0} sv. + {0} sv. + {0} sv. + {0} sv. {0} n @@ -10343,8 +10507,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} – združljivost {0} – vključeno {0} – razširjeno - {0}, obrnjen v levo - {0}, obrnjen v desno + {0}, obrnjeno v levo + {0}, obrnjeno v desno {0} – zgodovinsko {0} – razno {0} – drugo @@ -10402,7 +10566,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ moški matematični simboli pisave Bližnjega vzhoda - Razno + razno moderne pisave modifikator glasbeni simboli diff --git a/make/data/cldr/common/main/sma.xml b/make/data/cldr/common/main/sma.xml deleted file mode 100644 index 5336b8ae83ea..000000000000 --- a/make/data/cldr/common/main/sma.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - Åarjelsaemien gïele - - - - [aåä b d e f g h i j k l m n oö p r s t u v y] - [c ï q w x z] - [AÅÄ B D E F G H I J K L M N OÖ P R S T U V Y] - - diff --git a/make/data/cldr/common/main/sma_NO.xml b/make/data/cldr/common/main/sma_NO.xml deleted file mode 100644 index d81ffe009daf..000000000000 --- a/make/data/cldr/common/main/sma_NO.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - [aå æ b d e f g h i j k l m n oø p r s t u v y] - [AÅ Æ B D E F G H I J K L M N OØ P R S T U V Y] - - diff --git a/make/data/cldr/common/main/sma_SE.xml b/make/data/cldr/common/main/sma_SE.xml deleted file mode 100644 index 02ced2e5e579..000000000000 --- a/make/data/cldr/common/main/sma_SE.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/smj.xml b/make/data/cldr/common/main/smj.xml deleted file mode 100644 index 0c527586aef1..000000000000 --- a/make/data/cldr/common/main/smj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - julevsámegiella - - - - [aáåä b d e f g h i j k l m nń o p r s t u v] - [c ñ ö q w x y z] - [AÁÅÄ B D E F G H I J K L M NŃ O P R S T U V] - - diff --git a/make/data/cldr/common/main/smj_NO.xml b/make/data/cldr/common/main/smj_NO.xml deleted file mode 100644 index 2036f0ff30bd..000000000000 --- a/make/data/cldr/common/main/smj_NO.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/smj_SE.xml b/make/data/cldr/common/main/smj_SE.xml deleted file mode 100644 index 3f7508b4df9a..000000000000 --- a/make/data/cldr/common/main/smj_SE.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/smn.xml b/make/data/cldr/common/main/smn.xml index f5fc555bd2fc..4710bf6427e7 100644 --- a/make/data/cldr/common/main/smn.xml +++ b/make/data/cldr/common/main/smn.xml @@ -691,7 +691,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic cccc MMMM d. y G - GyMMMMccccd + GyMMMMEEEEd @@ -971,7 +971,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic cccc, MMMM d. y - yMMMMccccd + yMMMMEEEEd @@ -1090,6 +1090,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 'okko' w, Y + + {0} – {1} + {0}–{1} + {0}–{1} + {0}–{1} d.–d. diff --git a/make/data/cldr/common/main/sms.xml b/make/data/cldr/common/main/sms.xml deleted file mode 100644 index 415c4de4adfd..000000000000 --- a/make/data/cldr/common/main/sms.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - arabia - bengal - čekk-ǩiõll - danskk-ǩiõll - sakslaǩiõl - eŋgglõsǩiõll - australiaeŋgglõsǩiõll - kanadaeŋgglõsǩiõll - britanneŋgglõsǩiõll - aʹmmriikkeŋgglõsǩiõll - espaanǩiõll - eeʹstt - lääʹddǩiõll - franskk-kiõll - kanadafranskk-ǩiõll - sveiccfranskk-ǩiõll - hindiǩiõll - uŋŋar - indonesia - italia - jaappanǩiõll - koreaǩiõll - latviaǩiõll - hollanttǩiõll - flaamǩiõll - puolaǩiõll - portugalkiõll - ruõšš - sääʹmǩiõll - ruõccǩiõll - thaiǩiõll - ǩiinaǩiõll - pråstjum ǩiinaǩiõll - äʹrbbvuõđlaž ǩiinǩiõll - - - Skääđsuâl - Afrikk - Taʹvv-Amerikk - Saujj-Amerikk - Oseania - Viõstâr-Afrikk - Kõskk-Amerikk - Nuõrti-Afrikk - Tâʹvv-Afrikk - Kõskk-Afrikk - Amerikk - Karibia - Nuõrti-Aasia - Saujj-Aasia - Ooʹbbdneǩ-Aasia - Saujj-Europp - Melanesia - Polynesia - Aasia - Kõskk-Aasia - Viõstâr-Aasia - Europp - Nuõrti-Europp - Tâʹvv-Europp - Viõstâr-Europp - Andorra - Antigua da Bardudasuõllu - Aŋguillasuõllu - Albania - Nuõrtiväʹldd - Aruba - Ålandd - Bosnia da Hertsegovinajânnam - Barbados - Belgia - Burkina Fasojânnam - Bulgaria - Beninjânnam - Saint-Barthélemysuâl - Bermuda - Bolivia - Karibia Vueʹlljânnam - Brasilla - Bahammasuõllu - Belarus - Belizejânnam - Kanada - Šveiccjânnam - Kolumbia - Kuubajânnam - Kap Verdesuõllu - Curacaosuâl - Tšekk - Tšekk täʹssväʹldd - Saksslajânnam - Danskk - Dominica - Dominikaallaž tääʹssväʹldd - Algeria - Ceuta da Melill - Ecuador - Viro - Egyptt - Viõstâr-Sahara - Espanja - Euroopp Union - Lääʹddjânnam - Färsuõllu - Franskkjânnam - Grenada - Guernseysuâl - Ghana - Gibraltar - Ruânnjânnam - Gambia - Guineajânnam - Guadeloupesuõllu - Greikk - Guatemala - Guinea-Bissaujânnam - Honduras - Kroatia - Haitisuâl - Uŋŋar - Kanariasuõllu - Irlantt - Mansuâl - Islantt - Italia - Jerseysuâl - Jamaikka - Saint Kitts da Nevissuõllu - Caymansuõllu - Saint Luciasuâl - Liechtensteinjânnam - Liberia - Liettua - Luxemburg - Latviajânnam - Libya - Marokkojânnam - Monacojânnam - Moldova - Saint-Martiin - Madagaskaar - Malijânnam - Martiniikk - Mauritania - Montserratsuâl - Mauritiussuâl - Malaw - Meksikk - Mosambikk - Nigeeʹr - Nigeria - Nicaragua - Vueʹlljânnam - Taarr - Panama - Perujânnam - Puola - Puerto Rico suâl - Réunionsuâl - Romania - Ruõššjânnam - Ruanda - Sudaan - Ruõcc - Saint Helena suâl - Svalbaard da Jan Mayen suõllu - Slovakia - Sierra Leoon - Senegal - Somalia - Surinaam - El Salvador - Sint Maarten - Togojânnam - Tunisia - Trinidad da Tobagosuâl - Ukraina - Õhttõõvvâm meerkååʹdd - Õhttõsvaldia - Uruguayjânnam - Venezuela - Sambia - - - - [aâåä b cč dđ e f gǧ ǥ h i j kǩ l m n ŋ oõ p r sš t u v zž ʒǯ] - [ö q w x y] - [AÂÅÄ B CČ DĐ E F GǦ Ǥ H I J KǨ L M N Ŋ OÕ P R SŠ T U V ZŽ ƷǮ] - [  , % ‰ + − 0 1 2 3 4 5 6 7 8 9] - [\- ‐‑ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \\ \& #] - - diff --git a/make/data/cldr/common/main/sms_FI.xml b/make/data/cldr/common/main/sms_FI.xml deleted file mode 100644 index 8f7adef499fc..000000000000 --- a/make/data/cldr/common/main/sms_FI.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/sn.xml b/make/data/cldr/common/main/sn.xml index af2abe7063c9..d8ee2d8bd1e2 100644 --- a/make/data/cldr/common/main/sn.xml +++ b/make/data/cldr/common/main/sn.xml @@ -494,6 +494,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMMM d + + {0} – {1} + {0}–{1} + {0}–{1} + h a – h a h–h a diff --git a/make/data/cldr/common/main/so.xml b/make/data/cldr/common/main/so.xml index 4d1726aef91f..787e968869c8 100644 --- a/make/data/cldr/common/main/so.xml +++ b/make/data/cldr/common/main/so.xml @@ -332,6 +332,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bidjinka Nayjeeriya Pijin Boolish + Piedmontiis Maliseet-Passamaquoddy Brashiyaan Bashtuu @@ -707,7 +708,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Baraasiil Bahaamas Buutan - Buufet Island + Jasiiradda Bouvet Botuswaana Belarus Beliis @@ -755,7 +756,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Finland Fiji Jaziiradaha Fooklaan - Jasiiradaha Fookland + Jasiiradaha Fookland (Islas Malvinas) Mikroneesiya Jasiiradda Faroo Faransiis @@ -1005,15 +1006,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Habeentiris Habka Lacagta + Iska-indhatir Kala Soocidda Calaamaddaha + Kala-soocid Leh Lahjado Rogan + Kala-horeysiinta Xarfaha Waaweyn/Yaryar + Kala-soocidda Tixgelisa Xarfaha Waaweyn iyo Kuwa Yaryar Kala Soocidda Dalabka + Kala-soocid Caadiyeeysan + Kala-soocid Tirooyin + Dib-u-habeynta Far-qoraalka/Qaybta + Xoogga Kala-soocidda Lacagta + Goobta Wax Loo Beddelaayo + Waxyaabaha Laga Reebayo Kala-qeybinta Qaamuuska Soo bandhiga Imoji + Maalinta koowaad ee toddobaadka + Lagu-qasay Wareegga Saacadda (12 ilaa 24) + Habka Gelinta + Kiiboodh + Inta ugu Sarreysa La Iska Indha-tiray Habka Jebinta Xariiqda Bar Dhamaadyada Khadadka ee gudaha Erayada + Beddel Xeerarka Nidaamka Cabbiraadda + Unugga Cabbirka Tirooyinka + Gobolka Xogta Dheeraadka ah + Beddel Isha + Qeyb-hoosaadka Gobolka Bar Dhamaadka Jumlada Kadib Xarfo Soo Gaabinta + Beddel + Waxaa Turjumay Mashiin + Wakhtiga Aagga + Nooca Degaanka + Isticmaal-Gaar ah + Beddelka Isticmaalka-Gaarka ah Habeentiriska Buudhist @@ -1033,16 +1060,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Habeentiriska yuhuudda Hebrew Habeentiris Qarameedka Hindiya + Muwaadin Hindi ah Habeentiriska islaamka Taariikhda Islaamiga Taariikhda Islaamiga (shax ahaan, waayo madaniyeed) Taariikhda Islaamiga (shax ahaan, taariikh madaniyeed jaan go’an) Habeentiriska Islaamka (Sacuudiga, aragtida) + Hijriga, aragtida dayaxa ee Sacuudi Carabiya Taariikhda Islaamiga (shax ahaan, waayo xiddigeed) Taariikh Islaamiyeed (shax ahaan, waayo xiddigeed) Taariikhda Islaamiga(Umm al-Qura) Taariikhda Islaamiga (Umm al-Qura) Habeentiriska ISO-8601 + Taariikhda Miilaadiga Habeentiriska jabbaanka Jabaniis Habeentiriska Baarshiyaanka @@ -1053,26 +1083,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic Xisaabaadka Habka Heerka Lacagta Heerka + Xarfaha Yaryar + Xarfaha Yaryar + Xarfaha Waaweyn Iswaafajinta Isku hajintii hore + Iswaafajinta Isku hagaajinta Qaamuuska + Qaamuus Lambar Sireedka Caalamiga ee Kala Soocidda Dalabka Lambar Sireedka Caalamiga ee Asaliga ah Isku hagaajinta Emojiga + Imoji Xeerarka Dalabka Yurub + Xeerarka Yurub Isku hagaajinta foonbuuga + Buugga-taleefanka + Cod-higgaadin Isku hagaajinta Pinyin + Pinyin Raadinta Guud Raadi Raadinta Shibanaha Hangul + Shibbanaha bilowga ee Af-Kuuriyaanka Amarka Kala Soocidda Caadiga ah Caadiga Isku hagaajinta Farta + Xariiq Isku hagaajin Fareedkii Hore + Qadiimi Isku hagaajinta Farta Radical-Stroke + Qaybta Asalka ah iyo Xarriiqyada Isku hagaajinta Farta Zhuyin + Zhuyin + Lacagta + Tirooyinka + Calaamadaha xarakeynta + Goobaha banaan ee gudaha qoraalka + Calaamad + Dhamaan + Xarfaha Aasaasiga ah oo Keliya + Aasaasiga, Lahjadaha, Xarfaha Waaweyn/Yaryar, Noocyada, Kana + Aasaasiga, Lahjadaha + Aasaasiga, Lahjadaha, Xarfaha Waaweyn/Yaryar, Noocyada + Loogu Beddelo Ballac Buuxa + Loogu Beddelo Ballac Nus ah Asaliga Imoji Qoraal + 12 Saac ee Nidaamka Saacadda + 12 + 24 Saac ee Nidaamka Saacadda + 24 12 Saac ee Nidaamka Saacadda (0–12) 12 (0–11) 12 Saac ee Nidaamka Saacadda (1–12) @@ -1081,6 +1142,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 Saac ee Nidaamka Saacadda (1–24) 24 (1–24) + Wareejinta Boosaska, calaamadaha xarakeynta, iyo dhammaan astaamaha + Wareejinta boosaska, calaamadaha xarakeynta + Wareejinta boosaska, calaamadaha xarakeynta + Wareejinta boosaska, calaamadaha xarakeynta, astaamaha aan ahayn kuwa lacagta Habka Jabinta Xariiqda Dabacsan Dabacsan Habka Jabinta Xariiqda Caadiga ah @@ -1091,6 +1156,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Heyso dhamaan Caadi ah Weedho ahaan ku heyso + Qoraal-u-rogidda La Adeegsanayo Xarfaha Luuqad Kale ee US BGN + Qoraal-u-rogidda La Adeegsanayo Xarfaha Luuqad Kale ee UN GEGN Nidaamka Metric Cabbir Nidaamka Cabbirka Imperial-ka @@ -1100,8 +1167,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Godadka Ahom Gdadka Carabi-Hindiya Tirooyinka Dheeraadka ah ee Godadka Carabi-Hindiya + Carabi-Hindiga ee La Dheereeyay Nidaam Tireedka Armeeniya Nidaam Tireedka Yaryar ee Armeeniya + Xarfaha yaryar ee Armeniyaanka Godadka Balinese Godadka Banglaa Godadka Brahmi @@ -1111,55 +1180,80 @@ CLDR data files are interpreted according to the LDML specification (http://unic Godadka Defangaari Godadka Dives Akuru Nidaam Tireedka Itoobiya + Maaliyadeed Ballac Godadka Buuxa + Ballaca-buuxa Nidaam Tireedka Giyoorgiyaanka Godadka Gunjala Gondi Lambarada Masaram Gondi Nidaam Tireedka Giriiga Nidaam Tireedka Yaryar ee Giriiga + Xarfaha hoose Giriigga Godadka Gujaraati Godadka Gurmukhi + Habka xarfaha Han loogu qoro maalmaha bisha ee taariikh-jadwaleedyada dhaqameed Nidaamka Tireedka Tobanle ee Shiinaha + Nidaamka tirooyinka tobanlaha ee ku salaysan meelaynta, kaas oo u adeegsada astaamaha tirooyinka Af-shiinees lambar ahaan Nidaam Tireedka Hore La Fududeeyay ee Shiinaha Nidaam Tireedka Hore La Fududeeyay ee Dhaqaalaha Shiinaha + Maaliyadda Shiinaha Oo La Fududeeyay Nidaam Tireedka Hore ee Shiinaha Nidaam Tireedkii Hore ee Dhaqaalaha Shiinaha + Maaliyadda Shiinaha ee Dhaqameedka ah Nidaam Tireedka Cibraanka Nidaam Tireedka Hebrew Godadka Nyiakeng Puachue Hmong - Godadka Javanese + Tirooyinka Javanese Nidaam Tireedka Jabbaanka Nidaam Tireedka Dhaqaalaha Jabbaanka + Maaliyadda Jabaniiska + Nidaamka tireeynta ee Gannen ee sannadka koowaad ee Af-Jabaaniiska Godadka Kayah Li - Godadka Khamer - Godadka Kanada + Tirooyinka Khmer + Tirooyinka Kannada Godadka Tai Tham Hora Godadka Tai Tham - Godadka Laao - Godadka Ree Galbeedka + Tai Tham Tham (diineed) + Tirooyinka Lao + Tirooyinka Reer Galbeedka Godadka Lepcha Godadka Limbu Godad Xisaabeedka Waaweeyn + Xuruuf xisaabeed dhumuc leh Godad Xisaabeedka Labalaabma + Xaruuf xisaabeed laba xariiq leh Godad Xisaabeedka Monospace + Xuruuf xisaabeedka balac siman leh Godad xisaabeedka waaweeyn ee Sans-Serif + Xuruuf xisaabeed sans-serif oo dhumuc leh Godad xisaabeedka Sans-Serif - Godadka Malayalam + Xuruuf xisaabeed sans-serif leh + Tirooyinka Malayalam Godadka Modi Godadka Mongooliyaanka Godadka Mro - Godadka Meetei Mayek - Godadka Mayanmaar + Tirooyinka Meetei Mayek + Tirooyinka Myanmar + Myanmar Eastern Pwo Karen + Myanmar Pao Godadka Myanmar Shan + Myanmar Shan Godadka Myanmar Tai Laing + Myanmar Tai Laing + Tirooyinka Asaliga ah + Tirooyinka asaliga ah Godadka N’Ko - Godadka Ol Chiki - Godadka Oodhiya + Tirooyinka Ol Chiki + Tirooyinka Odia Godadka Osmanya + La qeexay Godadka Hanifi Rohingya Nidaam Tireedka Roomaanka + Xarfaha waaweyn ee Roomaanka Nidaam Tireedka yaryar ee Roomaanka + Xarfaha yaryar ee Roomaanka Godadka Saurashtra + La kala qeybiyay Godadka Sharada Godadka Khudawadi Godadka Sinhala Lith @@ -1168,17 +1262,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic Godadka Takri Godadka cusub ee Tai Lue Nidaam Tireedki Hore ee Taaamiil - Godka Tirada Taamiil - Godka Tirada Telugu - Godka Tirada Thai - Godka Tirada Tibetan + Tirooyinka Tamil + Taamiilka Casriga ah + Tirooyinka Telugu + Tirooyinka Thai + Tirooyinka Tibetan Godadka Tirhuta - Godadka Vai + Tirooyinka qadiimeed + Tirooyinka Vai Godadka Warang Citi Godadka Wancho Dami Daar + Turjumaad Mashiin Oo Aan La Qeexin + Nooca POSIX + + Dami + Daar + Metrik Boqortooyada Midawday @@ -1464,7 +1566,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - {1} {0} + {1}, {0} {1} 'ee' {0} @@ -1472,7 +1574,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - {1} {0} + {1}, {0} {1} 'ee' {0} @@ -1480,7 +1582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - {1} {0} + {1}, {0} {1}, {0} @@ -1495,9 +1597,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + d E y G M/y G - M/d/y GGGGG + M/d/y G E, M/d/y G MMM y G MMM d, y G @@ -1506,7 +1609,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, M/d E, MMM d E, MMMM d - y + y G M/y E, M/d/y MMM y @@ -1515,9 +1618,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQ y QQQQ y y G - M/y GGGGG - M/d/y GGGGG - E, M/d/y GGGGG + M/y G + M/d/y G + E, M/d/y G MMM y G MMM d, y G E, MMM d, y G @@ -1531,21 +1634,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic y – y G - M/y GGGGG – M/y GGGGG + M/y G – M/y G M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y G – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y G – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G MMM y G – MMM y G @@ -1612,7 +1715,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d – d - MMM d – MMM d E, MMM d – E, MMM d @@ -1622,18 +1724,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic y – y G - M/y – M/y GGGGG - M/y – M/y GGGGG + M/y – M/y G + M/y – M/y G - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG + M/d/y – M/d/y G + M/d/y – M/d/y G + M/d/y – M/d/y G - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G + E, M/d/y – E, M/d/y G MMM – MMM y G @@ -1851,6 +1953,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1903,6 +2008,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y G MMM d, y G E, MMM d, y G + MMMM y G + MMMM d, y G + E, MMMM d, y G h:mm:ss a v M/d E, M/d @@ -1917,11 +2025,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y E, MMM d, y MMMM y + MMMM d, y + E, MMMM d, y QQQ y QQQQ y 'toddobaadka' w 'ee' Y 'toddobaadka' w 'ee' Y + + {1}, {0} + {1}, {0} + y G – y G @@ -1983,6 +2097,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d – E, MMM d E, dd MMM – E, dd MMM + + MMMM d – d + MM/y – MM/y MM/y – MM/y @@ -2202,10 +2319,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - M/y G - E, M/d/y G - h B – h B @@ -2432,18 +2545,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic maalinta sndka - - maalinta sndka - maalinta toddobaadka maalinta tdbdka - - maalinta tdbdka - maalinta-toddobaadka bisha @@ -2731,12 +2838,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kaabuul - - Antiguwa - - - Anguwila - Tiraane @@ -2803,9 +2904,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Buwenos Ayris - - Bago Bago - Fiyeena @@ -2863,21 +2961,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Boorto-Noofo - - St. Baartelemi - - - Barmuuda - Buruney Laa Baas - - Kiraalendik - Iiruneeb @@ -2917,102 +3006,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Receyf - - Nasaaw - Timbu - - Gabroon - Minisk - - Beliise - - - Doosan - - - Waythoras - - - Inuufik - - - Fankuufar - - - Foot Nelson - - - Doosan Kireek - - - Karestoon - - - Iswift Karent - - - Kambiriij Baay - - - Rejiina - - - Winibeg - - - Resoluut - - - Raankin Inleet - - - Atikokaan - - - Iqaaluut - - - Moonktoon - - - Halifakas - - - Guus Baay - - - Galeys Baay - - - Balank-Sablon - - - St. Joon - Kokos Lubumbaashi - - Baagi - - - Barasafil - Suurikh - - Abidjaan - Iistar @@ -3022,21 +3030,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Santiyaago - - Douaala - - - Kosta Riika - - - Hafaana - - - Keyb Faarde - - - Kurakoow - Kiristmas @@ -3052,21 +3045,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Barliin - - Jibuuti - Kobenhaagan - - Dominiika - - - Saanto Domingo - - - Aljeeris - Galabagos @@ -3079,9 +3060,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Qaahira - - El Ceyuun - Kanari @@ -3097,15 +3075,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Istaanley - - Juuk - - - Bonbey - - - Kosrii - Farow @@ -3116,14 +3085,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Librefil - - Waqtiga Xagaaga ee Biritishka - Landan - - Garenaada - Tibilisi @@ -3133,51 +3096,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Geernisi - - Akra - - - Tuul - - - Itoqortoomiit - - - Daanmaakshaan - - - Conakri - - - Guwadeluub - Atens Sowt Joorjiya - - Guwatemaala - - - Guwam - - - Bisaaw - Guyaana - - Tegusigalba - Saqrib - - Boort-aw-Biriins - Budabest @@ -3194,9 +3124,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jayabura - - Waqtiga Caadiga Ah ee Ayrishka - Dhaablin @@ -3208,9 +3135,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kolkaata - - Jagos - Baqdaad @@ -3226,9 +3150,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jaarsey - - Jamayka - Ammaan @@ -3238,24 +3159,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Benom Ben - - Kantoon - - - Kiritimaati - - - Komoro - - - St. Kitis - Kuweyt - - Keymaan - Aktaw @@ -3277,9 +3183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Beyruud - - St. Lusiya - Faduus @@ -3316,78 +3219,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bodgorika - - Maarigot - - - Antananarifo - Kuwajaleyn - - Majro - Iskoobje - - Bamaako - - - Seyban - - - Maartiniikuyuu - Nookjot - - Moontseraat - Morishiyaas Maldifis - - Balantire - - - Tijuwaana - - - Harmosilo - - - Magaalada Juarez - - - Mazaatlan - - - Jiwaahuu - - - Bahiya Banderas - - - Ojinaaga - - - Moonteerey - Meksiko Siti - - Meriida - - - Kaankuun - Kuala Lambuur @@ -3400,9 +3249,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Windhook - - Noomiya - Nijame @@ -3412,21 +3258,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Laagoos - - Manaaguwa - Amsterdaam Katmandu - - Nawroo - - - Niyuu - Jatam @@ -3436,39 +3273,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Muskat - - Banaama - Liima Marquwesas - - Gambiyr - - - Boort Moresbi - - - Boogaynfil - Maniila Karaaji - - Miiquulon - Bitkayrn - - Boorta Riiko - Qasa @@ -3478,9 +3297,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Madira - - Balaw - Asunkiyon @@ -3559,12 +3375,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Riyaad - - Cuadalkanal - - - Khartuum - Istokhoom @@ -3580,9 +3390,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Baratislafa - - Firiitawn - San Mariino @@ -3592,48 +3399,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saw Toom - - El Salfadoor - - - Loowa Birinses Kuwaata - Dimishiq Mababaane - - Garaan Turk - Injamina - - Kergalen - Loom Bangkook - - fakofo - Tuunis - - Tongatabu - Istanbuul - - Boort of Isbayn - Daresalaam @@ -3643,90 +3429,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Simferobol - - Kambaala - - - Noom - - - Anjorage - - - Yakutaat - - - Siitka - - - Juniyuu - - - Metlaakatla - - - Loos Anjalis - - - Boyse - - - Foonikis - - - Denfar - - - Biyuulah, Waqooyiga Dakoota - - - Niyuu Saalem, Waqooyiga Dakoota - - - Bartamaha, Waqooyiga Dakoota - - - Jikaago - - - Menoominee - - - Finseenes, Indiyaana - - - Betesbaag, Indiyaana - - - Tel Siti, Indiyaana - - - Nokis, Indiyaana - - - Winaamak, Indiyaana - - - Mareengo, Indiyaana - - - Indiyaanabolis - - - Luusfile - - - Feefaay, Indiyaana - - - Montiseelo, Kentaki - - - Detoroyt - - - Niyuu Yook - Moontafiidiyo @@ -3739,42 +3441,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fatikaan - - St. Finsent - Karakaas - - Tortoola - - - St. Toomas - Hoo Ji Mih Siti - - Walis - - - Abiya - Cadan Mayoote - - Johansbaag - Lusaaka - - Haraare - Wakhtiga Acre @@ -3814,13 +3495,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Dharaarta ee Alaska - - - Waqtiga Almaty - Waqtiga Caadiga ah ee Almaty - Saacada Waqtiga Kulaylaha ee Almaty - - Waqtiga Amason @@ -3865,25 +3539,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wakhtiga Samoa + Waqtiga Galbeedka Samoa Waqtiga Caadiga Ah ee Samoa Waqtiga Dharaarta ee Samoa - - - Waqtiga Aqtau - Waqtiga Caadiga ah ee Aqtau - Saacada Waqtiga Kulaylaha Aqtau - - - - - Waqtiga Aqtobe - Waqtiga Caadiga ah ee Aqtobe - Saacada Waqtiga kulaylaha Aqtobe - - Waqtiga Carabta @@ -3985,6 +3645,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Xagaaga ee Baraasiliya + + + Waqtiga Ingiriiska + Waqtiga Xagaaga ee Ingiriiska + + Wakhtiga Brunei @@ -4043,7 +3709,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wakhtiga Jasiiradaha Cook - Waqtiga Caadiga Ah ee Jasiiradaha Cook + Waqtiga Caadiga ah ee Jasiiraddaha Cook Waqtiga Caadiga Ah ee Jasiiradaha Cook @@ -4158,6 +3824,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Wakhtiga Giriinwij + + + Wakhtiga Greenland + Wakhtiga Caadiga ah ee Greenland + Wakhtiga Xagaaga ee Greenland + + Waqtiga Bariga ee Giriinlaan @@ -4186,21 +3859,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Caadiga Ah ee Hawaay-Alutiyaan - - HAST - Waqtiga Hawaay-Alutiyaan - Waqtiga Caadiga Ah ee Hawaay-Alutiyaan + Waqtiga Caadiga ah ee Hawaii-Aleutian Waqtiga Dharaarta ee Hawaay-Alutiyaan - - HAT - HAST - HADT - @@ -4253,6 +3918,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Dharaarta ee Iiraan + + + Waqtiga Ayrishka + Waqtiga Caadiga Ah ee Ayrishka + + Waqtiga Irkutsik @@ -4506,9 +4177,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Waqtiga St. Beere & Mikiwelon - Waqtiga Caadiga Ah St. Beere & Mikiwelon - Waqtiga Dharaarta ee St. Beere & Mikiwelon + Waqtiga St. Pierre & Miquelon + Waqtiga Caadiga Ah ee St. Pierre & Miquelon + Waqtiga Dharaarta ee St. Pierre & Miquelon @@ -4526,13 +4197,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Boyongyang - - - Waqtiga Qyzylorda - Waqtiga Caadiga ah ee Qyzylorda - Saacada Waqtiga Kulaylaha Qyzylorda - - Waqtiga Riyuuniyon @@ -4559,9 +4223,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Wakhtiga American Samoa Waqtiga Caadiga Ah ee American Samoa - Waqtiga Dharaarta ee American Samoa @@ -4628,6 +4290,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Juuk + + + Wakhtiga Turkiga + Wakhtiga Caadiga ah ee Turkiga + Wakhtiga Xagaaga ee Turkiga + + Waqtiga Turkmenistaan @@ -4647,6 +4316,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waqtiga Xagaaga ee Urugwaay + + + Wakhtiga Ürümqi + + Waqtiga Usbekistan @@ -5873,8 +5547,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dahabka Zimbabwe - Dahabka Zimbabwe - Dahabka Zimbabwe @@ -7325,13 +6997,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ha - hBa - {0} hBa - {0} hBa + {0} hPa + {0} hPa - kBa - {0} kBa + {0} kPa {0} kBa @@ -7522,7 +7192,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}shay - qeyb {0} qeyb {0} qeyb @@ -7534,9 +7203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic % - - Glc - L/100km {0}L/100km @@ -7668,7 +7334,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mmHg - ee Hg {0} ee Hg {0} ee Hg @@ -7681,6 +7346,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}″ Hg {0}″ Hg + + {0}mb + {0}mb + + + hPa + {0}hPa + {0}hPa + + + kPa + km/s @@ -7691,6 +7368,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic °C + + °F + {0}° + {0}° + {0}lbf⋅ft {0}lbf⋅ft @@ -7738,25 +7420,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}qt-Imp. {0}qt-Imp. - - {0} sr - {0} sr - - - {0} kat - {0} kat - - - cal-IT - - - {0} Bq - {0} Bq - - - {0} Wb - {0} Wb - {0}nal {0}nal @@ -7911,7 +7574,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jiifa - cabbirka maskaxda + Cabbirka muuqaalka yara jiifa balac miisaan diff --git a/make/data/cldr/common/main/sq.xml b/make/data/cldr/common/main/sq.xml index dcb019307879..8c8cfb25ff92 100644 --- a/make/data/cldr/common/main/sq.xml +++ b/make/data/cldr/common/main/sq.xml @@ -340,6 +340,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pixhinishte nigeriane pixhinisht polonisht + piedmontezisht malisit-pasamakuadisht prusisht pashtoisht @@ -983,15 +984,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kalendari Formati valutor - Radhitja + Renditje me shpërfillje të simboleve + Renditje me anasjellë të theksit + Renditja sipas shkronjave të mëdha/të vogla + Renditje sipas ndjeshmërisë ndaj shkronjave të mëdha/të vogla + Mënyra e renditjes + Renditje me normalizim + Renditje numerike + Rirenditja e skripteve/blloqeve + Shkalla e renditjes Valuta + Destinacioni i transformimit + Përjashtime nga ndarja sipas fjalorit Prezantimi i emoji-ve + Dita e parë e javës + E përzier Cikli orar (12 - 24) + Metoda e hyrjes + Tastiera + më e larta e shpërfillur Stili i gjerësisë së rreshtave Ndarja e rreshtit brenda fjalëve + Rregullat e transformimit Sistemi i njësive matëse + Njësia e matjes Numrat/shifrat + Rajoni për të dhëna suplementare + Burimi i transformimit + Nënndarja e rajonit Ndërprerja e fjalisë pas shkurtimit + Transformimi + përkthyer mekanikisht + Brezi orar + varianti lokal + për përdorim privat + transformim për përdorim privat kalendar budist @@ -1011,16 +1038,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kalendar hebraik hebraik Kalendari Kombëtar Indian + kombëtar indian kalendar islam islam kalendar islam (tabelor, epoka civile) islam (tabelor, epoka civile) kalendar islamik (Arabi Saudite, shikim) + hixhri, sipas hënës në Arabinë Saudite kalendar islam (tabelor, epoka astronomike) islam (tabelor, epoka astronomike) kalendar islam (um al-qura) islam (um al-qura) kalendar ISO-8601 + gregorian kalendar japonez japonez kalendar persian @@ -1031,26 +1061,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ llogaritës format valutor standard standard + të vogla + të vogla + të mëdha Radhitja e mëparshme, për pajtueshmëri + përputhshmëria Radhitje fjalori + fjalori radhitje unikode e parazgjedhur unikode e parazgjedhur Radhitje Emoji + emoji Rregulla evropiane radhitjeje + rregullat evropiane Radhitje libri telefonik + numëratori telefonik + fonetike Radhitje pinini + sistemi Pinyin kërkim i përgjithshëm kërkim kërkim sipas bashkëtingëllores fillestare hangul + bashkëtingëllorja fillestare koreane radhitje standarde standarde radhitje me vijëzim + vija radhitje tradicionale + tradicionale radhitje me vijëzim radikal + radikale e vija radhitje zhujin + sistemi Zhuyin + monedha + shifrat + pikësimi + hapësira + simboli + të gjitha + vetëm germat bazë + bazë, thekset, shkronjat e mëdha/të vogla, variantet, Kana + bazë, thekset + bazë, thekset, shkronjat e mëdha/të vogla, variantet + në gjerësi të plotë + në gjysmëgjerësi e parazgjedhur emoji mesazh me tekst + sistem 12-orësh + 12-orësh + sistem 24-orësh + 24-orësh sistem 12-orësh (0 - 11) 12-orësh (0 - 11) sistem 12-orësh (1 - 12) @@ -1059,6 +1120,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24-orësh (0 - 23) sistem 24-orësh (1 - 24) 24-orësh (0 - 24) + zhvendosje e hapësirave, shenjave të pikësimit dhe të gjitha simboleve + zhvendosje e hapësirave dhe shenjave të pikësimit + zhvendosje e hapësirave dhe shenjave të pikësimit + zhvendosje e hapësirave, shenjave të pikësimit dhe simboleve jo të monedhave stil i gjerësisë së rreshtave - i larguar i larguar stil i gjerësisë së rreshtave - normal @@ -1069,6 +1134,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jo ndarje ndarje normale jo ndarje e frazave + transliterimi BGN i SHBA-së + transliterimi UNGEGN i OKB-së sistem metrik metrik sistem imperial (britanik) i njësive matëse @@ -1077,9 +1144,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ amerikan shifra ahom shifra indo-arabe - shifra indo-arabe të zgjatura + shifra indo-arabe të zgjeruara + indo-arabe të zgjeruara numra armenë - numra armenë të vegjël + numra armenë me shkronja të vogla + armenë me shkronja të vogla shifra bali shifra bengali shifra brahmi @@ -1089,57 +1158,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ shifra devanagari shifra dives akuru numra etiopianë - shifra me largësi të brendshme + financiarë + shifra me gjerësi të plotë + gjerësi e plotë numra gjeorgjianë shifra gunxhala gondi shifra masaram gondi numra grekë - numra grekë të vegjël + numra grekë me shkronja të vogla + grekë me shkronja të vogla shifra guxharati shifra gurmuki + numërimi i ditëve të muajit me karaktere Han për kalendarët tradicionalë numra dhjetorë kinezë + sistem dhjetor pozicional që përdor ideografet e numrave kinezë si shifra numra të kinezishtes së thjeshtuar numra financiarë të kinezishtes së thjeshtuar + financiarë të kinezishtes së thjeshtuar numra të kinezishtes tradicionale numra financiarë të kinezishtes tradicionale + financiarë të kinezishtes tradicionale numra hebraikë shifra pahau hmong shifra niakeng puaçue hmong shifra java numra japonezë numra financiarë japonezë + financiarë japonezë + numërimi japonez i vitit të parë Gannen shifra kaja li shifra kavi shifra kmere shifra kanade shifra tai tam hora shifra tai tam tam + Tai Tham Tham (kishtarë) shifra lao - shifra latino-perëndimore + shifra perëndimore shifra lepça shifra limbu shifra të trasha matematike + i trashësuar matematikor shifra matematike me dy kalime + me goditje të dyfishtë matematikor shifra matematike monohapësire + me hapësirë fikse matematikor shifra të trasha matematike sans-serif + sans-serif i trashësuar matematikor shifra matematike sans-serif + sans-serif matematikor shifra malajalame shifra modi shifra mongole shifra mro shifra mitei-majeke shifra mianmari + Pwo Karen lindor i Mianmarit + Pao i Mianmarit shifra mianmar-shan + Shan i Mianmarit shifra mianmar tai lang + Tai Laing i Mianmarit shifra nag mundan + shifra vendase + shifra vendase shifra nko shifra ol-çikike shifra orije shifra osmania + me kontur shifra hanifi rohingia numra romakë - numra romakë të vegjël + shkronja të mëdha romake + numra romakë me shkronja të vogla + romakë me shkronja të vogla shifra saurashtra + të segmentuar shifra sharada shifra kudavadi shifra sinala lit @@ -1149,17 +1243,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ shifra të reja tai lue numra tamilë tradicionalë shifra tamile + tamile moderne shifra teluguje shifra tajlandeze shifra tibetiane shifra tirhuta shifra tangsa + numra tradicionalë shifra vai shifra varang citi shifra vanço joaktive aktive + përkthim mekanik i paspecifikuar + varianti i POSIX + + çaktivizuar + aktivizuar + metrik britanik (imperial) @@ -1181,6 +1283,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + d.M.r + + + + + + + d.M.r + + + @@ -1212,9 +1328,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - {1} 'në' {0} - {1}, 'ora' {0} @@ -1223,9 +1336,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1}, {0} - - {1} 'në' {0} - {1}, 'ora' {0} @@ -1367,6 +1477,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y G @@ -1615,21 +1729,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} - - {1} 'në' {0} - {1}, {0} - - {1} 'në' {0} - @@ -1643,6 +1754,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, h B + E, h:mm B + E, h:mm:ss B E, d E, h a E, h:mm a @@ -1656,6 +1769,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G h:mm a h:mm:ss a h:mm:ss a, v @@ -1680,15 +1796,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ, y QQQQ, y 'java' w 'e' Y 'java' w 'e' Y + {0}, {1} + {1}, {0} + {0} {1} + {1}, {0} {0}, {1} + + {0} – {1} + {0} – {1} + h – h B @@ -1790,6 +1916,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y – y @@ -1920,8 +2050,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - M.y G - E, d.M.y G M.y G d.M.y G E, d.M.y G @@ -2448,6 +2576,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Punta-Arenas + + Urumqi + Shangai @@ -2536,9 +2667,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevilë - - Ora verore britanike - Londër @@ -2613,11 +2741,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Xhajapurë - - - Ora strandarde e Irlandës - - Ishulli i Manit @@ -2741,6 +2864,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rangun + + Kovd + Ulanbatar @@ -3101,13 +3227,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Alaskës - - - Ora e Almatit - Ora standarde e Almatit - Ora verore e Almatit - - Ora e Amazonës @@ -3152,23 +3271,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora e Apias - Ora standarde e Apias - Ora verore e Apias - - - - - Ora e Aktaut - Ora standarde e Aktaut - Ora verore e Aktaut - - - - - Ora e Aktobit - Ora standarde e Aktobit - Ora verore e Aktobit + Ora e Samoas Perëndimore + Ora standarde e Samoas Perëndimore + Ora verore e Samoas Perëndimore @@ -3272,6 +3377,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Brazilisë + + + Ora e Britanisë + Ora verore e Britanisë + + Ora e Brunei-Durasalamit @@ -3450,23 +3561,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora e Grinuiçit - + - Ora e Grenlandës Lindore - Ora standarde e Grenlandës Lindore - Ora verore e Grenlandës Lindore + Ora e Groenlandës + Ora standarde e Groenlandës + Ora verore e Groenlandës - + - Ora e Grënlandës Perëndimore - Ora standarde e Grënlandës Perëndimore - Ora verore e Grënlandës Perëndimore + Ora e Groenlandës Lindore + Ora standarde e Groenlandës Lindore + Ora verore e Groenlandës Lindore - + - Ora e Guamit + Ora e Groenlandës Perëndimore + Ora standarde e Groenlandës Perëndimore + Ora verore e Groenlandës Perëndimore @@ -3487,7 +3600,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora e Ishujve Hauai-Aleutian - Ora standarde e Ishujve Hauai-Aleutian + Ora standarde e Hauai-Aleutian Ora verore e Ishujve Hauai-Aleutian @@ -3542,6 +3655,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Iranit + + + Ora e Irlandës + Ora strandarde e Irlandës + + Ora e Irkutskut @@ -3609,11 +3728,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora e Kirgizisë - - - Ora e Lankasë - - Ora e Ishujve Sporadikë Ekuatorialë @@ -3626,13 +3740,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Lord-Houit - - - Ora e Makaos - Ora standarde e Makaos - Ora verore e Makaos - - Ora e Magadanit @@ -3748,11 +3855,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Fernando-de-Noronjës - - - Ora e Ishujve të Marianës së Veriut - - Ora e Novosibirskut @@ -3832,13 +3934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora e Penianit - - - Ora e Kizilordit - Ora standarde e Kizilordit - Ora verore e Kizilordit - - Ora e Reunionit @@ -3865,9 +3960,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Ora e Samoas Ora standarde e Samoas - Ora verore e Samoas @@ -3934,6 +4027,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora e Çukut + + + Ora e Turqisë + Ora standarde e Turqisë + Ora verore e Turqisë + + Ora e Turkmenistanit @@ -3953,6 +4053,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ora verore e Uruguait + + + Ora e Urumqisë + + Ora e Uzbekistanit @@ -5068,8 +5173,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} libër {0} libra - Merrni kthesën e {0}-t në të djathtë. Merrni kthesën e {0}-rë në të djathtë. + Merrni kthesën e {0}-t në të djathtë. Merrni kthesën e {0}-të në të djathtë. @@ -5287,11 +5392,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} milimol për litër {0} milimolë për litër - - pjesë - {0} pjesë - {0} pjesë - pjesë për milion {0} pjesë për milion @@ -6134,11 +6234,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} veber {0} veberë - - dritë - {0} dritë - {0} dritë - pjesë për miliard {0} pjesë për miliard @@ -6406,15 +6501,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl.dr. - {0} dram fl + {0} dram fl {0} teke - {0} jigger + {0} jigger {0} pisk - {0} pinch + {0} pinch cal-IT @@ -6457,21 +6552,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ akër - - pjesë - {0} pjesë - {0} pjesë - - - pjesë/milion - {0} mol {0} molë - - Glc - mpg {0} mpg @@ -6594,17 +6678,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} pisk {0} piska - - cal-IT - - - dritë - {0} dritë - {0} dritë - - - pjesë/miliard - diff --git a/make/data/cldr/common/main/sr.xml b/make/data/cldr/common/main/sr.xml index 9f6af7a7b955..343485024a45 100644 --- a/make/data/cldr/common/main/sr.xml +++ b/make/data/cldr/common/main/sr.xml @@ -123,8 +123,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ даргински таита немачки - аустријски немачки - швајцарски високи немачки + стандардни немачки (Швајцарска) делаверски слејви догрипски @@ -171,8 +170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ фарски фон француски - канадски француски - швајцарски француски кајунски француски средњефранцуски старофранцуски @@ -416,6 +413,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ пали пиџин пољски + пијемонтски понпејски малисепасамакводи пруски @@ -1087,18 +1085,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ редослед сортирања нормализовано сортирање нумеричко сортирање - сортирање према јачини + промена редоследа према писму или групи карактера + критеријум сортирања валута + одредиште претварања + изузеци од прелома речника презентација емоџија + први дан у недељи + помешано приказивање времена (12- или 24-часовно) + начин уноса + тастатура + Најигнорисаније стил прелома реда преломи редова унутар речи + правила претварања систем мерних јединица + мерна јединица бројеви + регион за додатне податке + извор трансформације + подела региона Прелом реченице после скраћенице + трансформација + машински превод Временска зона Варијанта локалитета Приватна употреба + трансформација за приватну употребу будистички календар @@ -1118,15 +1132,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ хебрејски календар хебрејски Индијски национални календар + индијски национални исламски календар исламски исламски цивилни календар исламски цивилни + исламски Саудијске Арабије исламски астрономски календар исламски астрономски исламски календар (Umm al-Qura) исламски (Umm al-Qura) ISO-8601 календар + грегоријански јапански календар јапански персијски календар @@ -1142,8 +1159,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сортирај акценте нормално Сортирај акценте обрнуто Сортирај прво мала слова + мало слово Сортирај нормалан редослед великих и малих слова + мало слово Сортирај прво велика слова + мало слово Сортирај без обзира на велика и мала слова Сортирај мала и велика слова претходни редослед сортирања, због компатибилности @@ -1152,7 +1172,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ речник подразумевани Unicode редослед сортирања подразумевани Unicode + емоџи европска правила редоследа + европска правила сортирање као телефонски именик телефонски именик фонетски редослед сортирања @@ -1162,6 +1184,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ претрага опште намене претрага Претрага према хангул почетном сугласнику + корејски почетни консонант стандардни редослед сортирања стандардни сортирање по броју потеза @@ -1176,17 +1199,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Сортирај Unicode нормализовано Сортирај цифре појединачно Сортирај цифре нумерички + валута + цифре + интерпункција + бео простор + симбол Сортирај све + све Сортирај само основна слова + само основна слова Сортирај акценте/мала и велика слова/ширину/кана симболе + основна, акценти, велико/мало слово, варијанте, кана Сортирај акценте + основна, акценти Сортирај акценте/мала и велика слова/ширину + основна, акценти, велико/мало слово, варијанте пуна ширина пола ширине Нумеричка подразумевано емоџи текст + 12-часовни систем + 12 + 24-часовни систем + 24 12-часовни систем (0-11) 12 (0–11) 12-часовни систем (1-12) @@ -1195,6 +1232,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-часовни систем (1-24) 24 (1–24) + Shift размаци, интерпункција, сви симболи + Shift размаци, интерпункција + Shift размаци, интерпункција + Shift размаци, интерпункција, симболи који не представљају валуту размакнути стил прелома реда размакнути нормални стил прелома реда @@ -1215,51 +1256,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ САД арапско-индијске цифре продужене арапско-индијске цифре + продужени арапско-индијски јерменски бројеви мали јерменски бројеви + мали јерменски бенгалске цифре чакма цифре девангари цифре етиопски бројеви Финансијски бројеви + финансијски цифре пуне ширине + пуне ширине грузијски бројеви грчки бројеви мали грчки бројеви + мали грчки гуџаратске цифре гурмуки цифре + нумерисање дана у месецу хан знаковима за традиционалне календаре кинески децимални бројеви + позициони децимални систем који користи кинеске идеограме за бројеве као цифре поједностављени кинески бројеви поједностављени кинески финансијски бројеви + поједностављени кинески финансијски традиционални кинески бројеви традиционални кинески финансијски бројеви + традиционални кинески финансијски хебрејски бројеви јаванске цифре јапански бројеви јапански финансијски бројеви + јапански финансијски + јапанско ганен нумерисање прве године кмерске цифре канада цифре + тајски (црквени) лаошке цифре западне цифре + математички подебљани + математички двоструко повучени + математички једноразмачни + математички безсерифни подебљани + математички безсерифни малајалам цифре монголске цифре митеи мајек цифре мијанмарске цифре + мијанмарски источни пво карен + мијанмарски пао + мијанмарски шан + мијанмарски таи лаинг локалне цифре + локалне цифре ол чики цифре орија цифре + контурно римски бројеви + велики римски мали римски бројеви + мали римски + сегментирани тамилски бројеви тамилске цифре + модерни тамилски телугу цифре тајске цифре тибетанске цифре Традиционални бројеви + традиционални бројеви ваи цифре Укључено Искључено + неспецификован машински превод + POSIX варијанта + + искључено + укључено + метрички британски @@ -1401,15 +1476,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d. MMM y. G hh:mm a hh:mm:ss a - HH v d.M. E, d.M. MM-dd d. MMM - dd.MMM - E, d. MMM + d.MMM + E d. MMM d. MMMM - E, d. MMMM + E d. MMMM y. G y. G M.y. GGGGG @@ -1425,6 +1499,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y. G + + {0}–{1}. + {0} – {1} h a – h a @@ -1465,6 +1542,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd. – E, dd. MMM E, dd. MMM – E, dd. MMM + + d–d. MMMM + d. MMMM – d. MMMM + y – y. G @@ -1703,6 +1784,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1732,23 +1816,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y. G - d.MM.y. GGGGG + M. y. G + d.M.y. GGGGG + E d.M.y. G MMM y. G d. MMM y. G - E, d. MMM y. G + E d. MMM y. G + MMMM y. G + d. MMMM y. G + E d. MMMM y. G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v + L. d. M. - E, d. M. - dd.MM. + E d. M. + d.M. d. MMM - dd.MMM + d.MMM E d. MMM d. MMMM - E, d. MMMM + E d. MMMM MMMM: W. 'недеља' MMMM: W. 'недеља' MMMM: W. 'недеља' @@ -1762,6 +1851,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d. MMM y. E, d. MMM y. MMMM y. + d. MMM y. + E d. MMMM y. QQQ y. QQQQ y. w. 'недеља' 'у' Y. @@ -1769,6 +1860,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w. 'недеља' 'у' Y. + + {0} – {1} + {0} – {1} h a – h a @@ -1801,13 +1895,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM–MMM - dd.–dd. MMM + d–d. MMM dd. MMM – dd. MMM E, dd. – E, dd. MMM E, dd. MMM – E, dd. MMM + + d–d. MMMM + d. MMMM – d. MMMM + + + y–y. + M – M. y. M.y. – M.y. @@ -1946,246 +2047,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - M. y. G - G dd. MM. y, E + d. MMM + E d. MMM - Таика (645–650) - Хакучи (650–671) - Хакухо (672–686) - Шучо (686–701) - Таихо (701–704) - Кеиун (704–708) - Вадо (708–715) - Реики (715–717) - Јоро (717–724) - Јинки (724–729) - Темпио (729–749) - Темпио-кампо (749-749) - Темпио-шохо (749-757) - Темпио-хођи (757-765) - Темпо-ђинго (765-767) - Ђинго-кеиун (767-770) - Хоки (770–780) - Тен-о (781-782) - Енрјаку (782–806) - Даидо (806–810) - Конин (810–824) - Тенчо (824–834) - Шова (834–848) - Кајо (848–851) - Нињу (851–854) - Саико (854–857) - Тенан (857–859) - Јоган (859–877) - Генкеи (877–885) - Ниња (885–889) - Кампјо (889–898) - Шотаи (898–901) - Енђи (901–923) - Енчо (923–931) - Шохеи (931–938) - Тенгјо (938–947) - Тенриаку (947–957) - Тентоку (957–961) - Ова (961–964) - Кохо (964–968) - Ана (968–970) - Тенроку (970–973) - Тен-ен (973-976) - Јоген (976–978) - Тенген (978–983) - Еикан (983–985) - Кана (985–987) - Еи-ен (987-989) - Еисо (989–990) - Шорјаку (990–995) - Чотоку (995–999) - Чохо (999–1004) - Канко (1004–1012) - Чова (1012–1017) - Канин (1017–1021) - Ђиан (1021–1024) - Мању (1024–1028) - Чоген (1028–1037) - Чорјаку (1037–1040) - Чокју (1040–1044) - Кантоку (1044–1046) - Еишо (1046–1053) - Тенђи (1053–1058) - Кохеи (1058–1065) - Ђирјаку (1065–1069) - Енкју (1069–1074) - Шохо (1074–1077) - Шорјаку (1077–1081) - Еишо (1081–1084) - Отоку (1084–1087) - Канђи (1087–1094) - Кахо (1094–1096) - Еичо (1096–1097) - Шотоку (1097–1099) - Кова (1099–1104) - Чођи (1104–1106) - Кашо (1106–1108) - Тенин (1108–1110) - Тен-еи (1110-1113) - Еикју (1113–1118) - Ђен-еи (1118-1120) - Хоан (1120–1124) - Тенђи (1124–1126) - Даиђи (1126–1131) - Теншо (1131–1132) - Чошао (1132–1135) - Хоен (1135–1141) - Еиђи (1141–1142) - Кођи (1142–1144) - Тењо (1144–1145) - Кјуан (1145–1151) - Нинпеи (1151–1154) - Кјују (1154–1156) - Хоген (1156–1159) - Хеиђи (1159–1160) - Еирјаку (1160–1161) - Охо (1161–1163) - Чокан (1163–1165) - Еиман (1165–1166) - Нин-ан (1166-1169) - Као (1169–1171) - Шоан (1171–1175) - Анген (1175–1177) - Ђишо (1177–1181) - Јова (1181–1182) - Ђуеи (1182–1184) - Генрјуку (1184–1185) - Бунђи (1185–1190) - Кенкју (1190–1199) - Шођи (1199–1201) - Кенин (1201–1204) - Генкју (1204–1206) - Кен-еи (1206-1207) - Шоген (1207–1211) - Кенрјаку (1211–1213) - Кенпо (1213–1219) - Шокју (1219–1222) - Ђу (1222–1224) - Ђенин (1224–1225) - Кароку (1225–1227) - Антеи (1227–1229) - Канки (1229–1232) - Ђоеи (1232–1233) - Темпуку (1233–1234) - Бунрјаку (1234–1235) - Катеи (1235–1238) - Рјакунин (1238–1239) - Ен-о (1239-1240) - Нињи (1240–1243) - Канген (1243–1247) - Хођи (1247–1249) - Кенчо (1249–1256) - Коген (1256–1257) - Шока (1257–1259) - Шоген (1259–1260) - Бун-о (1260-1261) - Кочо (1261–1264) - Бун-еи (1264-1275) - Кенђи (1275–1278) - Коан (1278–1288) - Шу (1288–1293) - Еинин (1293–1299) - Шоан (1299–1302) - Кенген (1302–1303) - Каген (1303–1306) - Токуђи (1306–1308) - Енкеи (1308–1311) - Очо (1311–1312) - Шова (1312–1317) - Бунпо (1317–1319) - Ђено (1319–1321) - Ђенкјо (1321–1324) - Шочу (1324–1326) - Кареки (1326–1329) - Гентоку (1329–1331) - Генко (1331–1334) - Кему (1334–1336) - Енген (1336–1340) - Кококу (1340–1346) - Шохеи (1346–1370) - Кентоку (1370–1372) - Бучу (1372–1375) - Тењу (1375–1379) - Корјаку (1379–1381) - Кова (1381–1384) - Генчу (1384–1392) - Меитоку (1384–1387) - Какеи (1387–1389) - Ку (1389–1390) - Меитоку (1390–1394) - Оеи (1394–1428) - Шочо (1428–1429) - Еикјо (1429–1441) - Какитсу (1441–1444) - Бун-ан (1444-1449) - Хотоку (1449–1452) - Кјотоку (1452–1455) - Кошо (1455–1457) - Чороку (1457–1460) - Каншо (1460–1466) - Буншо (1466–1467) - Онин (1467–1469) - Бунмеи (1469–1487) - Чокјо (1487–1489) - Ентоку (1489–1492) - Меио (1492–1501) - Бунки (1501–1504) - Еишо (1504–1521) - Таиеи (1521–1528) - Кјороку (1528–1532) - Тенмон (1532–1555) - Кођи (1555–1558) - Еироку (1558–1570) - Генки (1570–1573) - Теншо (1573–1592) - Бунроку (1592–1596) - Кеичо (1596–1615) - Генва (1615–1624) - Кан-еи (1624-1644) - Шохо (1644–1648) - Кеиан (1648–1652) - Шу (1652–1655) - Меирјаку (1655–1658) - Мањи (1658–1661) - Канбун (1661–1673) - Енпо (1673–1681) - Тенва (1681–1684) - Јокјо (1684–1688) - Генроку (1688–1704) - Хоеи (1704–1711) - Шотоку (1711–1716) - Кјохо (1716–1736) - Генбун (1736–1741) - Канпо (1741–1744) - Енкјо (1744–1748) - Кан-ен (1748-1751) - Хорјаку (1751–1764) - Меива (1764–1772) - Ан-еи (1772-1781) - Тенмеи (1781–1789) - Кансеи (1789–1801) - Кјова (1801–1804) - Бунка (1804–1818) - Бунсеи (1818–1830) - Тенпо (1830–1844) - Кока (1844–1848) - Каеи (1848–1854) - Ансеи (1854–1860) - Ман-ен (1860-1861) - Бункју (1861–1864) - Генђи (1864–1865) - Кеико (1865–1868) Меиђи Таишо Шова @@ -3205,9 +3074,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Либревил - - Британија, летње време - Лондон @@ -3298,9 +3164,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Џајапура - - Ирска, стандардно време - Даблин @@ -4035,13 +3898,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Аљаска, летње време - - - Алмати време - Алмати стандардно време - Алмати летње рачунање времена - - Амазон време @@ -4091,20 +3947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Апија, летње време - - - Акватау време - Акватау стандардно време - Акватау летње рачунање времена - - - - - Акутобе време - Акутобе стандардно време - Акутобе летње рачунање времена - - Арабијско време @@ -4206,6 +4048,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Бразилија, летње време + + + Британија време + Британија, летње време + + Брунеј Дарусалум време @@ -4397,6 +4245,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + Гренланд + Гренланд, стандардно време + Гренланд, летње време + + Источни Гренланд @@ -4411,11 +4266,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Западни Гренланд, летње време - - - Гуам стандардно време - - Заливско време @@ -4428,14 +4278,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Хавајско-алеутско стандардно време + Хаваји, стандардно време - Хавајско-алеутско време - Хавајско-алеутско стандардно време - Хавајско-алеутско летње време + Хаваји и Алеутска острва, време + Хаваји и Алеутска острва, стандардно време + Хаваји и Алеутска острва, летње време @@ -4489,6 +4339,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Иран, летње време + + + Ирска време + Ирска, стандардно време + + Иркуцк време @@ -4512,9 +4368,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Петропавловско-камчатско време - Петропавловско-камчатско стандардно време - Петропавловско-камчатско летње рачунање времена + Камчатка, време + Камчатка, стандардно време + Камчатка, летње време @@ -4556,11 +4412,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Киргистан време - - - Шри Ланка време - - Острва Лајн време @@ -4573,13 +4424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Лорд Хов, летње време - - - Макао време - Макао стандардно време - Макао летње рачунање времена - - Магадан време @@ -4695,11 +4539,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Фернандо де Нороња, летње време - - - Северна Маријанска Острва време - - Новосибирск време @@ -4779,13 +4618,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Пјонгјаншко време - - - Кизилорда време - Кизилорда стандардно време - Кизилорда летње рачунање времена - - Реинион време @@ -4812,9 +4644,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Самоа време Самоа, стандардно време - Самоа, летње време @@ -4907,6 +4737,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Уругвај, летње време + + + Урумчи време + + Узбекистан време @@ -5025,28 +4860,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 хиљ'.' + 0 хиљ'.' 0 хиљ'.' 00 хиљ'.' + 00 хиљ'.' 00 хиљ'.' 000 хиљ'.' + 000 хиљ'.' 000 хиљ'.' 0 мил'.' + 0 мил'.' 0 мил'.' 00 мил'.' + 00 мил'.' 00 мил'.' 000 мил'.' + 000 мил'.' 000 мил'.' 0 млрд'.' + 0 млрд'.' 0 млрд'.' 00 млрд'.' + 00 млрд'.' 00 млрд'.' 000 млрд'.' + 000 млрд'.' 000 млрд'.' 0 бил'.' + 0 бил'.' 0 бил'.' 00 бил'.' + 00 бил'.' 00 бил'.' 000 бил'.' + 000 бил'.' 000 бил'.' @@ -5503,12 +5350,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ кинеска јуана (острвска) кинеских јуана (острвских) - - Долар кинеске народне банке - долар кинеске народне банке - долара кинеске народне банке - долара кинеске народне банке - кинески јуан кинески јуан @@ -6760,9 +6601,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ карипски гулден - карипски гулден - карипски гулден - карипски гулден Посебна цртаћа права @@ -6910,9 +6748,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ зимбабвеанско злато - зимбабвеанско злато - зимбабвеанско злато - зимбабвеанско злато Зимбабвеански долар (2009) @@ -7387,9 +7222,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ делови - {0} део - {0} дела - {0} делова feminine @@ -9678,9 +9510,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Bf - B {0} - B {0} - B {0} степени Фаренхајта @@ -9780,18 +9609,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - део - {0} део - {0} дела - {0} делова - % - - Glc - L/100km {0} L/100km @@ -9891,11 +9711,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} кс {0} кс - - B {0} - B {0} - B {0} - l @@ -9927,9 +9742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} qt Imp {0} qt Imp - - cal [IT] - {0}E {0}N diff --git a/make/data/cldr/common/main/sr_Cyrl_BA.xml b/make/data/cldr/common/main/sr_Cyrl_BA.xml index fdd2480965dd..91282b53c128 100644 --- a/make/data/cldr/common/main/sr_Cyrl_BA.xml +++ b/make/data/cldr/common/main/sr_Cyrl_BA.xml @@ -147,6 +147,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic нове ере + + + + {0}–{1} + {0}–{1} + + + @@ -528,22 +536,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Сент Џонс - - - Британија, љетње вријеме - - Итокортормит Порт-о-Пренс - - - Ирска, стандардно вријеме - - Нијуе @@ -755,6 +753,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Бразилија, љетње вријеме + + + Британија, љетње вријеме + + Брунеј Дарусалум вријеме @@ -1010,6 +1013,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Иран, љетње вријеме + + + Ирска, стандардно вријеме + + Иркуцк вријеме @@ -1295,9 +1303,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Самоа вријеме Самоа, стандардно вријеме - Самоа, љетње вријеме @@ -1630,6 +1636,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} грана {0} гранова + + B {0} + B {0} + B {0} + свјетло {0} свјетло @@ -1668,6 +1679,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bft + B {0} + B {0} + B {0} {0}/gal Imp diff --git a/make/data/cldr/common/main/sr_Latn.xml b/make/data/cldr/common/main/sr_Latn.xml index 18f536b5a34c..6d22017d1df1 100644 --- a/make/data/cldr/common/main/sr_Latn.xml +++ b/make/data/cldr/common/main/sr_Latn.xml @@ -122,8 +122,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic darginski taita nemački - austrijski nemački - švajcarski visoki nemački + standardni nemački (Švajcarska) delaverski slejvi dogripski @@ -170,8 +169,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic farski fon francuski - kanadski francuski - švajcarski francuski kajunski francuski srednjefrancuski starofrancuski @@ -415,6 +412,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic pali pidžin poljski + pijemontski ponpejski malisepasamakvodi pruski @@ -1086,18 +1084,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic redosled sortiranja normalizovano sortiranje numeričko sortiranje - sortiranje prema jačini + promena redosleda prema pismu ili grupi karaktera + kriterijum sortiranja valuta + odredište pretvaranja + izuzeci od preloma rečnika prezentacija emodžija + prvi dan u nedelji + pomešano prikazivanje vremena (12- ili 24-časovno) + način unosa + tastatura + Najignorisanije stil preloma reda prelomi redova unutar reči + pravila pretvaranja sistem mernih jedinica + merna jedinica brojevi + region za dodatne podatke + izvor transformacije + podela regiona Prelom rečenice posle skraćenice + transformacija + mašinski prevod Vremenska zona Varijanta lokaliteta Privatna upotreba + transformacija za privatnu upotrebu budistički kalendar @@ -1117,15 +1131,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic hebrejski kalendar hebrejski Indijski nacionalni kalendar + indijski nacionalni islamski kalendar islamski islamski civilni kalendar islamski civilni + islamski Saudijske Arabije islamski astronomski kalendar islamski astronomski islamski kalendar (Umm al-Qura) islamski (Umm al-Qura) ISO-8601 kalendar + gregorijanski japanski kalendar japanski persijski kalendar @@ -1141,8 +1158,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sortiraj akcente normalno Sortiraj akcente obrnuto Sortiraj prvo mala slova + malo slovo Sortiraj normalan redosled velikih i malih slova + malo slovo Sortiraj prvo velika slova + malo slovo Sortiraj bez obzira na velika i mala slova Sortiraj mala i velika slova prethodni redosled sortiranja, zbog kompatibilnosti @@ -1151,7 +1171,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic rečnik podrazumevani Unicode redosled sortiranja podrazumevani Unicode + emodži evropska pravila redosleda + evropska pravila sortiranje kao telefonski imenik telefonski imenik fonetski redosled sortiranja @@ -1161,6 +1183,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic pretraga opšte namene pretraga Pretraga prema hangul početnom suglasniku + korejski početni konsonant standardni redosled sortiranja standardni sortiranje po broju poteza @@ -1175,17 +1198,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sortiraj Unicode normalizovano Sortiraj cifre pojedinačno Sortiraj cifre numerički + valuta + cifre + interpunkcija + beo prostor + simbol Sortiraj sve + sve Sortiraj samo osnovna slova + samo osnovna slova Sortiraj akcente/mala i velika slova/širinu/kana simbole + osnovna, akcenti, veliko/malo slovo, varijante, kana Sortiraj akcente + osnovna, akcenti Sortiraj akcente/mala i velika slova/širinu + osnovna, akcenti, veliko/malo slovo, varijante puna širina pola širine Numerička podrazumevano emodži tekst + 12-časovni sistem + 12 + 24-časovni sistem + 24 12-časovni sistem (0-11) 12 (0–11) 12-časovni sistem (1-12) @@ -1194,6 +1231,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24-časovni sistem (1-24) 24 (1–24) + Shift razmaci, interpunkcija, svi simboli + Shift razmaci, interpunkcija + Shift razmaci, interpunkcija + Shift razmaci, interpunkcija, simboli koji ne predstavljaju valutu razmaknuti stil preloma reda razmaknuti normalni stil preloma reda @@ -1214,51 +1255,85 @@ CLDR data files are interpreted according to the LDML specification (http://unic SAD arapsko-indijske cifre produžene arapsko-indijske cifre + produženi arapsko-indijski jermenski brojevi mali jermenski brojevi + mali jermenski bengalske cifre čakma cifre devangari cifre etiopski brojevi Finansijski brojevi + finansijski cifre pune širine + pune širine gruzijski brojevi grčki brojevi mali grčki brojevi + mali grčki gudžaratske cifre gurmuki cifre + numerisanje dana u mesecu han znakovima za tradicionalne kalendare kineski decimalni brojevi + pozicioni decimalni sistem koji koristi kineske ideograme za brojeve kao cifre pojednostavljeni kineski brojevi pojednostavljeni kineski finansijski brojevi + pojednostavljeni kineski finansijski tradicionalni kineski brojevi tradicionalni kineski finansijski brojevi + tradicionalni kineski finansijski hebrejski brojevi javanske cifre japanski brojevi japanski finansijski brojevi + japanski finansijski + japansko ganen numerisanje prve godine kmerske cifre kanada cifre + tajski (crkveni) laoške cifre zapadne cifre + matematički podebljani + matematički dvostruko povučeni + matematički jednorazmačni + matematički bezserifni podebljani + matematički bezserifni malajalam cifre mongolske cifre mitei majek cifre mijanmarske cifre + mijanmarski istočni pvo karen + mijanmarski pao + mijanmarski šan + mijanmarski tai laing lokalne cifre + lokalne cifre ol čiki cifre orija cifre + konturno rimski brojevi + veliki rimski mali rimski brojevi + mali rimski + segmentirani tamilski brojevi tamilske cifre + moderni tamilski telugu cifre tajske cifre tibetanske cifre Tradicionalni brojevi + tradicionalni brojevi vai cifre Uključeno Isključeno + nespecifikovan mašinski prevod + POSIX varijanta + + isključeno + uključeno + metrički britanski @@ -1401,15 +1476,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d. MMM y. G hh:mm a hh:mm:ss a - HH v d.M. E, d.M. MM-dd d. MMM - dd.MMM - E, d. MMM + d.MMM + E d. MMM d. MMMM - E, d. MMMM + E d. MMMM y. G y. G M.y. GGGGG @@ -1425,6 +1499,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y. G + + {0}–{1}. + {0} – {1} h a – h a @@ -1465,6 +1542,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, dd. – E, dd. MMM E, dd. MMM – E, dd. MMM + + d–d. MMMM + d. MMMM – d. MMMM + y – y. G @@ -1703,6 +1784,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -1732,23 +1816,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y. G - d.MM.y. GGGGG + M. y. G + d.M.y. GGGGG + E d.M.y. G MMM y. G d. MMM y. G - E, d. MMM y. G + E d. MMM y. G + MMMM y. G + d. MMMM y. G + E d. MMMM y. G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v + L. d. M. - E, d. M. - dd.MM. + E d. M. + d.M. d. MMM - dd.MMM + d.MMM E d. MMM d. MMMM - E, d. MMMM + E d. MMMM MMMM: W. 'nedelja' MMMM: W. 'nedelja' MMMM: W. 'nedelja' @@ -1762,6 +1851,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d. MMM y. E, d. MMM y. MMMM y. + d. MMM y. + E d. MMMM y. QQQ y. QQQQ y. w. 'nedelja' 'u' Y. @@ -1769,6 +1860,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic w. 'nedelja' 'u' Y. + + {0} – {1} + {0} – {1} h a – h a @@ -1801,13 +1895,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM–MMM - dd.–dd. MMM + d–d. MMM dd. MMM – dd. MMM E, dd. – E, dd. MMM E, dd. MMM – E, dd. MMM + + d–d. MMMM + d. MMMM – d. MMMM + + + y–y. + M – M. y. M.y. – M.y. @@ -1946,246 +2047,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - M. y. G - G dd. MM. y, E + d. MMM + E d. MMM - Taika (645–650) - Hakuči (650–671) - Hakuho (672–686) - Šučo (686–701) - Taiho (701–704) - Keiun (704–708) - Vado (708–715) - Reiki (715–717) - Joro (717–724) - Jinki (724–729) - Tempio (729–749) - Tempio-kampo (749-749) - Tempio-šoho (749-757) - Tempio-hođi (757-765) - Tempo-đingo (765-767) - Đingo-keiun (767-770) - Hoki (770–780) - Ten-o (781-782) - Enrjaku (782–806) - Daido (806–810) - Konin (810–824) - Tenčo (824–834) - Šova (834–848) - Kajo (848–851) - Ninju (851–854) - Saiko (854–857) - Tenan (857–859) - Jogan (859–877) - Genkei (877–885) - Ninja (885–889) - Kampjo (889–898) - Šotai (898–901) - Enđi (901–923) - Enčo (923–931) - Šohei (931–938) - Tengjo (938–947) - Tenriaku (947–957) - Tentoku (957–961) - Ova (961–964) - Koho (964–968) - Ana (968–970) - Tenroku (970–973) - Ten-en (973-976) - Jogen (976–978) - Tengen (978–983) - Eikan (983–985) - Kana (985–987) - Ei-en (987-989) - Eiso (989–990) - Šorjaku (990–995) - Čotoku (995–999) - Čoho (999–1004) - Kanko (1004–1012) - Čova (1012–1017) - Kanin (1017–1021) - Đian (1021–1024) - Manju (1024–1028) - Čogen (1028–1037) - Čorjaku (1037–1040) - Čokju (1040–1044) - Kantoku (1044–1046) - Eišo (1046–1053) - Tenđi (1053–1058) - Kohei (1058–1065) - Đirjaku (1065–1069) - Enkju (1069–1074) - Šoho (1074–1077) - Šorjaku (1077–1081) - Eišo (1081–1084) - Otoku (1084–1087) - Kanđi (1087–1094) - Kaho (1094–1096) - Eičo (1096–1097) - Šotoku (1097–1099) - Kova (1099–1104) - Čođi (1104–1106) - Kašo (1106–1108) - Tenin (1108–1110) - Ten-ei (1110-1113) - Eikju (1113–1118) - Đen-ei (1118-1120) - Hoan (1120–1124) - Tenđi (1124–1126) - Daiđi (1126–1131) - Tenšo (1131–1132) - Čošao (1132–1135) - Hoen (1135–1141) - Eiđi (1141–1142) - Kođi (1142–1144) - Tenjo (1144–1145) - Kjuan (1145–1151) - Ninpei (1151–1154) - Kjuju (1154–1156) - Hogen (1156–1159) - Heiđi (1159–1160) - Eirjaku (1160–1161) - Oho (1161–1163) - Čokan (1163–1165) - Eiman (1165–1166) - Nin-an (1166-1169) - Kao (1169–1171) - Šoan (1171–1175) - Angen (1175–1177) - Đišo (1177–1181) - Jova (1181–1182) - Đuei (1182–1184) - Genrjuku (1184–1185) - Bunđi (1185–1190) - Kenkju (1190–1199) - Šođi (1199–1201) - Kenin (1201–1204) - Genkju (1204–1206) - Ken-ei (1206-1207) - Šogen (1207–1211) - Kenrjaku (1211–1213) - Kenpo (1213–1219) - Šokju (1219–1222) - Đu (1222–1224) - Đenin (1224–1225) - Karoku (1225–1227) - Antei (1227–1229) - Kanki (1229–1232) - Đoei (1232–1233) - Tempuku (1233–1234) - Bunrjaku (1234–1235) - Katei (1235–1238) - Rjakunin (1238–1239) - En-o (1239-1240) - Ninji (1240–1243) - Kangen (1243–1247) - Hođi (1247–1249) - Kenčo (1249–1256) - Kogen (1256–1257) - Šoka (1257–1259) - Šogen (1259–1260) - Bun-o (1260-1261) - Kočo (1261–1264) - Bun-ei (1264-1275) - Kenđi (1275–1278) - Koan (1278–1288) - Šu (1288–1293) - Einin (1293–1299) - Šoan (1299–1302) - Kengen (1302–1303) - Kagen (1303–1306) - Tokuđi (1306–1308) - Enkei (1308–1311) - Očo (1311–1312) - Šova (1312–1317) - Bunpo (1317–1319) - Đeno (1319–1321) - Đenkjo (1321–1324) - Šoču (1324–1326) - Kareki (1326–1329) - Gentoku (1329–1331) - Genko (1331–1334) - Kemu (1334–1336) - Engen (1336–1340) - Kokoku (1340–1346) - Šohei (1346–1370) - Kentoku (1370–1372) - Buču (1372–1375) - Tenju (1375–1379) - Korjaku (1379–1381) - Kova (1381–1384) - Genču (1384–1392) - Meitoku (1384–1387) - Kakei (1387–1389) - Ku (1389–1390) - Meitoku (1390–1394) - Oei (1394–1428) - Šočo (1428–1429) - Eikjo (1429–1441) - Kakitsu (1441–1444) - Bun-an (1444-1449) - Hotoku (1449–1452) - Kjotoku (1452–1455) - Košo (1455–1457) - Čoroku (1457–1460) - Kanšo (1460–1466) - Bunšo (1466–1467) - Onin (1467–1469) - Bunmei (1469–1487) - Čokjo (1487–1489) - Entoku (1489–1492) - Meio (1492–1501) - Bunki (1501–1504) - Eišo (1504–1521) - Taiei (1521–1528) - Kjoroku (1528–1532) - Tenmon (1532–1555) - Kođi (1555–1558) - Eiroku (1558–1570) - Genki (1570–1573) - Tenšo (1573–1592) - Bunroku (1592–1596) - Keičo (1596–1615) - Genva (1615–1624) - Kan-ei (1624-1644) - Šoho (1644–1648) - Keian (1648–1652) - Šu (1652–1655) - Meirjaku (1655–1658) - Manji (1658–1661) - Kanbun (1661–1673) - Enpo (1673–1681) - Tenva (1681–1684) - Jokjo (1684–1688) - Genroku (1688–1704) - Hoei (1704–1711) - Šotoku (1711–1716) - Kjoho (1716–1736) - Genbun (1736–1741) - Kanpo (1741–1744) - Enkjo (1744–1748) - Kan-en (1748-1751) - Horjaku (1751–1764) - Meiva (1764–1772) - An-ei (1772-1781) - Tenmei (1781–1789) - Kansei (1789–1801) - Kjova (1801–1804) - Bunka (1804–1818) - Bunsei (1818–1830) - Tenpo (1830–1844) - Koka (1844–1848) - Kaei (1848–1854) - Ansei (1854–1860) - Man-en (1860-1861) - Bunkju (1861–1864) - Genđi (1864–1865) - Keiko (1865–1868) Meiđi Taišo Šova @@ -3205,9 +3074,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Librevil - - Britanija, letnje vreme - London @@ -3298,9 +3164,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Džajapura - - Irska, standardno vreme - Dablin @@ -4035,13 +3898,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Aljaska, letnje vreme - - - Almati vreme - Almati standardno vreme - Almati letnje računanje vremena - - Amazon vreme @@ -4091,20 +3947,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Apija, letnje vreme - - - Akvatau vreme - Akvatau standardno vreme - Akvatau letnje računanje vremena - - - - - Akutobe vreme - Akutobe standardno vreme - Akutobe letnje računanje vremena - - Arabijsko vreme @@ -4206,6 +4048,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brazilija, letnje vreme + + + Britanija vreme + Britanija, letnje vreme + + Brunej Darusalum vreme @@ -4397,6 +4245,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic GMT + + + Grenland + Grenland, standardno vreme + Grenland, letnje vreme + + Istočni Grenland @@ -4411,11 +4266,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zapadni Grenland, letnje vreme - - - Guam standardno vreme - - Zalivsko vreme @@ -4428,14 +4278,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Havajsko-aleutsko standardno vreme + Havaji, standardno vreme - Havajsko-aleutsko vreme - Havajsko-aleutsko standardno vreme - Havajsko-aleutsko letnje vreme + Havaji i Aleutska ostrva, vreme + Havaji i Aleutska ostrva, standardno vreme + Havaji i Aleutska ostrva, letnje vreme @@ -4489,6 +4339,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran, letnje vreme + + + Irska vreme + Irska, standardno vreme + + Irkuck vreme @@ -4512,9 +4368,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Petropavlovsko-kamčatsko vreme - Petropavlovsko-kamčatsko standardno vreme - Petropavlovsko-kamčatsko letnje računanje vremena + Kamčatka, vreme + Kamčatka, standardno vreme + Kamčatka, letnje vreme @@ -4556,11 +4412,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kirgistan vreme - - - Šri Lanka vreme - - Ostrva Lajn vreme @@ -4573,13 +4424,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lord Hov, letnje vreme - - - Makao vreme - Makao standardno vreme - Makao letnje računanje vremena - - Magadan vreme @@ -4695,11 +4539,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Fernando de Noronja, letnje vreme - - - Severna Marijanska Ostrva vreme - - Novosibirsk vreme @@ -4779,13 +4618,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pjongjanško vreme - - - Kizilorda vreme - Kizilorda standardno vreme - Kizilorda letnje računanje vremena - - Reinion vreme @@ -4812,9 +4644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoa vreme Samoa, standardno vreme - Samoa, letnje vreme @@ -4907,6 +4737,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Urugvaj, letnje vreme + + + Urumči vreme + + Uzbekistan vreme @@ -5025,28 +4860,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic 0 hilj'.' + 0 hilj'.' 0 hilj'.' 00 hilj'.' + 00 hilj'.' 00 hilj'.' 000 hilj'.' + 000 hilj'.' 000 hilj'.' 0 mil'.' + 0 mil'.' 0 mil'.' 00 mil'.' + 00 mil'.' 00 mil'.' 000 mil'.' + 000 mil'.' 000 mil'.' 0 mlrd'.' + 0 mlrd'.' 0 mlrd'.' 00 mlrd'.' + 00 mlrd'.' 00 mlrd'.' 000 mlrd'.' + 000 mlrd'.' 000 mlrd'.' 0 bil'.' + 0 bil'.' 0 bil'.' 00 bil'.' + 00 bil'.' 00 bil'.' 000 bil'.' + 000 bil'.' 000 bil'.' @@ -5503,12 +5350,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic kineska juana (ostrvska) kineskih juana (ostrvskih) - - Dolar kineske narodne banke - dolar kineske narodne banke - dolara kineske narodne banke - dolara kineske narodne banke - kineski juan kineski juan @@ -6760,9 +6601,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic karipski gulden - karipski gulden - karipski gulden - karipski gulden Posebna crtaća prava @@ -6910,9 +6748,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic zimbabveansko zlato - zimbabveansko zlato - zimbabveansko zlato - zimbabveansko zlato Zimbabveanski dolar (2009) @@ -7285,9 +7120,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic delovi - {0} deo - {0} dela - {0} delova feminine @@ -9324,9 +9156,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bf - B {0} - B {0} - B {0} stepeni Farenhajta @@ -9426,18 +9255,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - deo - {0} deo - {0} dela - {0} delova - % - - Glc - L/100km {0} L/100km @@ -9537,11 +9357,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ks {0} ks - - B {0} - B {0} - B {0} - l @@ -9573,9 +9388,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} qt Imp {0} qt Imp - - cal [IT] - {0}E {0}N diff --git a/make/data/cldr/common/main/sr_Latn_BA.xml b/make/data/cldr/common/main/sr_Latn_BA.xml index e9a2ac3230cf..f1aa711a306f 100644 --- a/make/data/cldr/common/main/sr_Latn_BA.xml +++ b/make/data/cldr/common/main/sr_Latn_BA.xml @@ -147,6 +147,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic nove ere + + + + {0}–{1} + {0}–{1} + + + @@ -528,22 +536,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sent Džons - - - Britanija, ljetnje vrijeme - - Itokortormit Port-o-Prens - - - Irska, standardno vrijeme - - Nijue @@ -755,6 +753,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brazilija, ljetnje vrijeme + + + Britanija, ljetnje vrijeme + + Brunej Darusalum vrijeme @@ -1010,6 +1013,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran, ljetnje vrijeme + + + Irska, standardno vrijeme + + Irkuck vrijeme @@ -1295,9 +1303,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Samoa vrijeme Samoa, standardno vrijeme - Samoa, ljetnje vrijeme @@ -1630,6 +1636,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} grana {0} granova + + B {0} + B {0} + B {0} + svjetlo {0} svjetlo @@ -1668,6 +1679,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Bft + B {0} + B {0} + B {0} {0}/gal Imp diff --git a/make/data/cldr/common/main/ss.xml b/make/data/cldr/common/main/ss.xml deleted file mode 100644 index 6653352f1134..000000000000 --- a/make/data/cldr/common/main/ss.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - siSwati - - - eSwatini - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - ‘ - ’ - “ - ” - - - - - - - - Bhi - Van - Vol - Mab - Nkh - Nhl - Kho - Ngc - Nyo - Mph - Lwe - Ngo - - - Bhimbidvwane - iNdlovana - iNdlovu-lenkhulu - Mabasa - iNkhwekhweti - iNhlaba - Kholwane - iNgci - iNyoni - iMphala - Lweti - iNgongoni - - - - - - - Son - Mso - Bil - Tsa - Ne - Hla - Mgc - - - Lisontfo - uMsombuluko - Lesibili - Lesitsatfu - Lesine - Lesihlanu - uMgcibelo - - - - - - - - - , -   - - - - - ¤#,##0.00 - - - - - - E - - - R - - - - diff --git a/make/data/cldr/common/main/ss_SZ.xml b/make/data/cldr/common/main/ss_SZ.xml deleted file mode 100644 index d355f26f5325..000000000000 --- a/make/data/cldr/common/main/ss_SZ.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - diff --git a/make/data/cldr/common/main/ss_ZA.xml b/make/data/cldr/common/main/ss_ZA.xml deleted file mode 100644 index 4188f6e4db23..000000000000 --- a/make/data/cldr/common/main/ss_ZA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ssy.xml b/make/data/cldr/common/main/ssy.xml deleted file mode 100644 index 7af3aa1c5947..000000000000 --- a/make/data/cldr/common/main/ssy.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - Qafar - Saho - - - - - - Yabuuti - Eretria - Otobbia - - - - [a b t s e c k x i d q r f g o l m n u w h y] - [j p v z] - [A B T S E C K X I D Q R F G O L M N U W H Y] - - - - - - - - EEEE, MMMM dd, y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - - - Qun - Nah - Cig - Agd - Cax - Qas - Qad - Leq - Way - Dit - Xim - Kax - - - Qunxa Garablu - Kudo - Ciggilta Kudo - Agda Baxis - Caxah Alsa - Qasa Dirri - Qado Dirri - Liiqen - Waysu - Diteli - Ximoli - Kaxxa Garablu - - - - - Q - N - C - A - C - Q - Q - L - W - D - X - K - - - - - - - Nab - San - Sal - Rab - Cam - Jum - Qun - - - Naba Sambat - Sani - Salus - Rabuq - Camus - Jumqata - Qunxa Sambat - - - - - N - S - S - R - C - J - Q - - - - - - - saaku - carra - - - - - - Yaasuusuk Duma - Yaasuusuk Wadir - - - YD - YW - - - - - - EEEE, MMMM dd, y - yMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - - - ¤#,##0.00 - - - - - - Nfk - - - - diff --git a/make/data/cldr/common/main/ssy_ER.xml b/make/data/cldr/common/main/ssy_ER.xml deleted file mode 100644 index 8ceaa3338f5a..000000000000 --- a/make/data/cldr/common/main/ssy_ER.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/st.xml b/make/data/cldr/common/main/st.xml index 55304d178c4c..5f6ad433f926 100644 --- a/make/data/cldr/common/main/st.xml +++ b/make/data/cldr/common/main/st.xml @@ -195,6 +195,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + E h:mm a E h:mm:ss a @@ -205,8 +209,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm a v 'week' W 'of' MMM 'week' W 'of' MMM + y MMMM d + y MMMM d, EEE + + {0} – {1} + {0}–{1} + {0}–{1} + h a – h a h–h a @@ -277,6 +288,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Nako {0} Nako ya Motshehare {0} Nako ya Tlwaelo + + + Coordinated Universal Time + + Greenwich Mean Time diff --git a/make/data/cldr/common/main/su.xml b/make/data/cldr/common/main/su.xml index b92308da2f71..0270606a56f3 100644 --- a/make/data/cldr/common/main/su.xml +++ b/make/data/cldr/common/main/su.xml @@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jérman Jérman Austria Jérman Swiss Luhur - Inggris + Basa Inggris Inggris Australia Inggris Kanada Inggris UK @@ -49,7 +49,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -59,7 +59,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jérman Prancis Britania Raya - Indonesia + Basa Indonesia India Italia Jepang @@ -306,6 +306,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + . + {1}, {0} @@ -367,6 +371,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM, y E, d MMM y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y @@ -592,15 +598,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}m/gUK + + {0} kWh/100 km + {0}galIm {0}fl oz Im - - {0}dsp-Imp - h.mm diff --git a/make/data/cldr/common/main/suz.xml b/make/data/cldr/common/main/suz.xml deleted file mode 100644 index 3c5401cc99ce..000000000000 --- a/make/data/cldr/common/main/suz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - [अ आ इ उ ए ओ {क्} {ख्} {ग्} {च्} {छ्} {ज्} {ट्} {ठ्} {ड्} {त्} {थ्} {द्} {न्} {प्} {फ्} ब {ब्} {म्} {य्} {र्} {ल्} {व्} {श्} {स्} {ह्} ्] - [] - [० १ २ ३ ४ ५ ६ ७ ८ ९] - [, \: ! ? । “”] - - diff --git a/make/data/cldr/common/main/suz_Deva.xml b/make/data/cldr/common/main/suz_Deva.xml deleted file mode 100644 index bc10d6c7b24d..000000000000 --- a/make/data/cldr/common/main/suz_Deva.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - + + + + 𑯍𑯂𑯉𑯖𑯂 + + [𑯀 𑯁 𑯂 𑯃 𑯄 𑯅 𑯆 𑯇 𑯈 𑯉 𑯊 𑯋 𑯌 𑯍 𑯎 𑯏 𑯐 𑯑 𑯒 𑯓 𑯔 𑯕 𑯖 𑯗 𑯘 𑯙 𑯚 𑯛 𑯜 𑯝 𑯞 𑯟 𑯠] - [] [𑯰 𑯱 𑯲 𑯳 𑯴 𑯵 𑯶 𑯷 𑯸 𑯹] [, \: ! ? . “” 𑯡] + + + + + + + 𑯏𑯈𑯍𑯈𑯅𑯄𑯃 + 𑯙𑯂𑯎𑯅𑯄𑯈𑯄𑯃 + 𑯇𑯖𑯄𑯌 + 𑯈𑯉𑯄𑯃𑯐 + 𑯇𑯂 + 𑯏𑯅𑯍 + 𑯏𑯅𑯐𑯖𑯃 + 𑯈𑯊𑯈𑯒𑯞 + 𑯒𑯂𑯉𑯞𑯃𑯇𑯎𑯈𑯄 + 𑯈𑯆𑯞𑯅𑯎𑯈𑯄 + 𑯍𑯑𑯎𑯂𑯇𑯎𑯈𑯄 + 𑯀𑯃𑯒𑯂𑯇𑯎𑯈𑯄 + + + + + + + 𑯌𑯂𑯄𑯂𑯍𑯖̍𑯠𑯁𑯃 + 𑯁𑯖̍𑯒𑯍𑯖̍𑯠𑯁𑯃 + 𑯄𑯃𑯇𑯒𑯃𑯍𑯖̍𑯠𑯁𑯃 + 𑯀𑯅𑯇𑯒𑯃𑯍𑯖̍𑯠𑯁𑯃 + 𑯋𑯑𑯐𑯙𑯖𑯍𑯖̍𑯠𑯁𑯃 + 𑯊𑯃𑯐𑯙𑯖𑯍𑯖̍𑯠𑯁𑯃 + 𑯄𑯂𑯐𑯙𑯖𑯍𑯖̍𑯠𑯁𑯃 + + + + + + + + + Coordinated Universal Time + + + + + Greenwich Mean Time + + + + diff --git a/make/data/cldr/common/main/sv.xml b/make/data/cldr/common/main/sv.xml index dff2593e06f8..b976636da4c7 100644 --- a/make/data/cldr/common/main/sv.xml +++ b/make/data/cldr/common/main/sv.xml @@ -1305,18 +1305,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sorteringsordning Normaliserad sortering Numerisk sortering + ändrad ordning för skript/block Sorteringsstyrka valuta + omvandla mål + undantag för brytning enligt ordlista emojipresentation + första veckodag + inblandat 12- eller 24-timmarsklocka + inmatningsmetod + tangentbord + högsta ignorerade radbrytningstyp radbrytningar inom ord + omvandlingsregler enhetssystem + måttenhet siffror + region för tilläggsdata + omvandla källan + region och underdivision meningsgräns efter förkortn. + omvandla + maskinöversatt Tidszon Språkvariant privat + privat omvandla buddistisk kalender @@ -1336,15 +1352,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hebreisk kalender hebreisk indisk kalender + indisk nationell islamisk kalender islamisk islamisk civil kalender islamisk civil islamisk kalender, Saudi-Arabien + islamisk, månobservation i Saudiarabien islamisk kalender, astronomisk + islamisk (beräknad, astronomisk epok) islamisk kalender, Umm al-Qura islamisk, Umm al-Qura ISO 8601-kalender + gregoriansk japansk kalender japansk persisk kalender @@ -1360,8 +1380,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sortera accenter normalt sortera accenter omvänt Sortera gemener först + gemener Ordna normalt efter skiftläge + gemener Sortera versaler först + versaler Sortera oavsett skiftläge Sortera efter skiftläge bakåtkompatibel sorteringsordning @@ -1371,7 +1394,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ grundläggande Unicode-sorteringsordning grundläggande Unicode emojisorteringsordning + emoji sorteringsordning för flerspråkliga europeiska dokument + europeiska regler telefonkatalogssorteringsordning telefonkatalog fonetisk sorteringsordning @@ -1381,6 +1406,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ allmän sökning sökning söksorteringsordning för att söka på inledande Hangul-konsonant + initial konsonant i koreanska normal sorteringsordning normal strecksorteringsordning @@ -1395,17 +1421,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sortera med Unicode-normalisering Sortera siffror för sig Sortera siffror numeriskt + valuta + siffror + skiljetecken + blanksteg + symbol Sortera alla + alla Sortera endast efter grundbokstäver + endast grundbokstäver Sortera efter accent/skiftläge/bredd/kana + grundbokstäver, accenter, skiftläge, varianter, kana Sortera accenter + grundbokstäver, accenter Sortera accenter/skiftläge/bredd + grundbokstäver, accenter, skiftläge, varianter till helbreda till halvbreda Numerisk standard emoji text + 12-timmarsklocka + 12 + 24-timmarsklocka + 24 12-timmarsklocka (0–11) 12 (0–11) 12-timmarsklocka (1–12) @@ -1414,6 +1454,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-timmarsklocka (1–24) 24 (1–24) + flytta blanksteg, skiljetecken, alla symboler + flytta blanksteg, skiljetecken + flytta blanksteg, skiljetecken + flytta blanksteg, skiljetecken, symboler utom valutatecken fri radbrytning fri normal radbrytning @@ -1435,8 +1479,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ahom-siffror indo-arabiska siffror utökade indo-arabiska siffror + utökade indo-arabiska armeniska taltecken gemena armeniska taltecken + gemena armeniska balinesiska siffror bengaliska siffror brahmiska siffror @@ -1447,56 +1493,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dives akuru-siffror etiopiska taltecken finansiella siffror + finansiella fullbreddssiffror + fullbredd georgiska taltecken gunjalagondiska siffror masaramgondiska siffror grekiska taltecken - små grekiska taltecken + grekiska gemena taltecken + grekiska gemena gujaratiska siffror gurmukhiska siffror + hantecken för numrering av dag i månad för traditionella kalendrar kinesiska decimaltal + positionellt decimalsystem med kinesiska nummerideogram som siffror förenklat kinesiskt stavade tal förenklat kinesiskt finansiellt stavade tal + förenklat kinesiskt finansiellt traditionellt kinesiskt stavade tal traditionellt kinesiskt finansiellt stavade tal + traditionellt kinesiskt finansiellt hebreiska taltecken pahawh hmong-siffror nyiakeng puachue hmong-siffror javanesiska siffror japanskt stavade tal japanskt finansiellt stavade tal + japanskt finansiellt + japansk gannen-numrering av första året kayah li-siffror khmeriska siffror kannadiska siffror tai tham hora-siffror tai tham tham-siffror + tai tham tham (ecklesiastiska) laotiska siffror västerländska siffror lepcha-siffror limbu-siffror matematiska siffror i fetstil + matematiskt fetstil matematiska siffror med dubbelstreck + matematiskt double-struck matematiska siffror med fast teckenbredd + matematiskt fastbredd matematiska siffror i sans-serif fetstil + matematiskt sans-serif fetstil matematiska siffror i sans-serif + matematiskt sans-serif malayalamiska siffror modi-siffror mongoliska siffror mro-siffror meetei mayek-siffror - burmesiska siffror + myanmariska siffror + myanmarisk eastern pwo karen + myanmarisk pao burmesiska shan-siffror + myanmarisk shan burmesiska tai laing-siffror + myanmarisk tai laing språkspecifika siffror + språkspecifika siffror n’ko-siffror ol chiki-siffror oriyiska siffror osmanya-siffror + konturer hanifisiffror romerska taltecken - små romerska taltecken + romerska versala + romerska gemena taltecken + romerska gemena saurashtra-siffror + segmenterade sharada-siffror khudawidiska siffror sinhala lith-siffror @@ -1506,17 +1576,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ny tai lü-siffror traditionella tamilska taltecken tamilska siffror + moderna tamilska telugiska siffror thailändska siffror tibetanska siffror tirhuta-siffror Traditionella siffror + traditionella taltecken vai-siffror varang kshiti-siffror wanchosiffror av på + ospecificerad maskinöversättning + POSIX-variant + + av + på + SI-enheter engelska enheter @@ -1544,7 +1622,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ [aà b c d eé f g h i j k l m n o p q r s t u v w x y z å ä ö] - [áâãā ç èë íîïī ñ ó ú ÿü æ ø] + [áâãā ç èêë íîïī ñ ó úû ÿü æ øô] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö] [  , % ‰ + − 0 1 2 3 4 5 6 7 8 9] [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] @@ -2065,6 +2143,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d – E d MMM E d MMM – E d MMM + + d–d MMMM + d MMMM–d MMMM + y–y G @@ -2098,7 +2180,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM–MMMM y G - MMMM y – MMMM y G + MMMM y–MMMM y G @@ -2369,10 +2451,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y G y-MM G y-MM-dd GGGGG - E M-d-y G + E, y-MM-dd GGGGG MMM y G d MMM y G E d MMM y G + MMMM y G + d MMMM y G + E d MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -2393,23 +2478,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'vecka' w, Y 'vecka' w, Y + + {0} {1} + + + {0}–{1} + {0}–{1} h B–h B h:mm B–h:mm B - hh:mm – hh:mm B - hh:mm – hh:mm B - y G – y G + y G–y G y–y G @@ -2484,6 +2575,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E d–E d MMM E d MMM–E d MMM + + d–d MMMM + d MMMM–d MMMM + y-MM–MM y-MM–y-MM @@ -2697,54 +2792,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - Tempyō (729–749) - Tempyō-kampō (749–749) - Tempyō-shōhō (749–757) - Tempyō-hōji (757–765) - Temphō-jingo (765–767) - Saiko (854–857) - Tennan (857–859) - Genkei (877–885) - Kampyō (889–898) - Shōhei (931–938) - Ten-en (973–976) - Ei-en (987–989) - Eiho (1081–1084) - Kaho (1094–1096) - Shōtoku (1097–1099) - Gen-ei (1118–1120) - Hoan (1120–1124) - Hoen (1135–1141) - Tenyō (1144–1145) - Hogen (1156–1159) - Nin-an (1166–1169) - Genryuku (1184–1185) - Ken-ei (1206–1207) - Shōgen (1207–1211) - Shōkyū (1219–1222) - Tempuku (1233–1234) - En-ō (1239–1240) - Bun-ō (1260–1261) - Bun-ei (1264–1275) - Enkei (1308–1311) - Genkyō (1321–1324) - Kareki (1326–1329) - Kemmu (1334–1336) - Bun-an (1444–1449) - Tenmon (1532–1555) - Genwa (1615–1624) - Kan-ei (1624–1644) - Shōō (1652–1655) - Meiryaku (1655–1658) - Tenwa (1681–1684) - Kan-en (1748–1751) - Hōryaku (1751–1764) - An-ei (1772–1781) - Man-en (1860–1861) - - @@ -3266,7 +3313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ om {0} fredagar - {0} fredag sedan + för {0} fredag sedan för {0} fredagar sedan @@ -3526,11 +3573,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Torshamn - - - brittisk sommartid - - Qaanaaq @@ -3543,11 +3585,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Hongkong - - - irländsk sommartid - - Bagdad @@ -3731,13 +3768,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska, sommartid - - - Almatytid - Almatynormaltid - Almatysommartid - - Amazonastid @@ -3787,20 +3817,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia, sommartid - - - Aqtautid - Aqtaunormaltid - Aqtausommartid - - - - - Aqtöbetid - Aqtöbenormaltid - Aqtöbesommartid - - saudiarabisk tid @@ -3902,6 +3918,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasilia, sommartid + + + brittisk tid + brittisk sommartid + + Bruneitid @@ -4098,6 +4120,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + grönländsk tid + grönländsk normaltid + grönländsk sommartid + + östgrönländsk tid @@ -4112,11 +4141,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ västgrönländsk sommartid - - - Guamtid - - Persiska vikentid @@ -4190,6 +4214,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ iransk sommartid + + + irländsk tid + irländsk normaltid + + Irkutsktid @@ -4214,8 +4244,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kamtjatkatid - Kamtjatkanormaltid - Kamtjatkasommartid + Kamtjatka, normaltid + Kamtjatka, sommartid @@ -4257,11 +4287,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kirgizisk tid - - - Sri Lankatid - - Lineöarnas tid @@ -4274,13 +4299,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe, sommartid - - - Macaotid - Macaonormaltid - Macaosommartid - - Magadantid @@ -4396,11 +4414,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha, sommartid - - - Nordmarianernas tid - - Novosibirsktid @@ -4480,13 +4493,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pyongyangtid - - - Qyzylordatid - Qyzylordanormaltid - Qyzylordasommartid - - Réuniontid @@ -4507,15 +4513,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Samaratid - Samaranormaltid - Samarasommartid + Samara, normaltid + Samara, sommartid - samoansk tid samoansk normaltid - samoansk sommartid @@ -4584,9 +4588,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - turkisk tid - turkisk normaltid - turkisk sommartid + turkisk tid + turkisk normaltid + turkisk sommartid @@ -4608,6 +4612,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ uruguayansk sommartid + + + Ürümqitid + + uzbekisk tid @@ -4771,9 +4780,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -5132,11 +5138,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kinesisk yuan (offshore) - - kinesisk dollar - kinesisk dollar - kinesiska dollar - kinesisk yuan kinesisk yuan @@ -5455,7 +5456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ jamaicansk dollar - Jamaica-dollar + jamaicansk dollar jamaicanska dollar JM$ @@ -6186,8 +6187,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ karibisk gulden - karibisk gulden - karibisk gulden XCG @@ -6314,8 +6313,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ zimbabwiskt guld - zimbabwiskt guld - zimbabwiskt guld Zimbabwe-dollar (2009) @@ -6606,8 +6603,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ delar - {0} del - {0} delar common @@ -7047,7 +7042,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pixel per tum {0} pixel per tum - {0} pixel per tum + {0} pixlar per tum punkter per centimeter @@ -7060,8 +7055,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} punkter per tum - {0} punkt - {0} punkter + bildpunkt + {0} bildpunkt + {0} bildpunkter jordradie @@ -8025,9 +8021,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} dpi - punkt - {0} p - {0} p + bildpunkt + {0} bildpunkt + {0} bildpunkter m @@ -8256,10 +8252,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} fl oz {0} fl oz - - {0} fl oz Imp. - {0} fl oz Imp. - msk {0} msk @@ -8447,7 +8439,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmol/l - del {0} del {0} del @@ -8472,7 +8463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mol - glc {0} glc {0} glc @@ -8574,6 +8564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ h {0}h {0}h + {0}/h m @@ -8582,6 +8573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/m + s {0}s {0}s @@ -8679,6 +8671,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}Hz {0}Hz + + {0}px + {0} px + {0}mpx {0}mpx @@ -8687,6 +8683,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}px/cm {0}px/cm + + {0}px/tum + {0}px/tum + {0}dpcm {0}dpcm @@ -8751,7 +8751,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}″ - parsek {0}parsek {0}parsek @@ -8894,10 +8893,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg {0}mmHg - - {0} Hg - {0} Hg - {0}psi {0}psi @@ -9033,10 +9028,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mcup {0}mcup - - {0} fl oz m. - {0} fl oz m. - {0}en.td·fot {0}en.td·fot @@ -9118,14 +9109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}br.qt {0}br.qt - - {0} H - {0} H - - - {0} S - {0} S - calIT {0} calIT diff --git a/make/data/cldr/common/main/sv_FI.xml b/make/data/cldr/common/main/sv_FI.xml index 732010bacac1..9a185b128a5e 100644 --- a/make/data/cldr/common/main/sv_FI.xml +++ b/make/data/cldr/common/main/sv_FI.xml @@ -16,12 +16,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic - tidszon + tidszon - - kinesiska i pinyin-sorteringsordning - kinesiska i strecksorteringsordning - {0}… @@ -31,16 +27,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - - K1 - K2 - K3 - K4 - - - + + + + fm. + em. + + + fm. + em. + + + fm. + em. + + + + + fm. + em. + + + fm. + em. + + + fm. + em. + + + @@ -86,6 +102,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + . + {1} {0} @@ -199,18 +219,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - förra året - i år - nästa år - - - förra året - i år - nästa år - - + + + Uralsk + + + Aktobe + + + Kustanaj + + + Kyzylorda + + + Astrahan + + + Hô Chi Minh-staden + + + + Kokosöarnas tid + + + diff --git a/make/data/cldr/common/main/sw.xml b/make/data/cldr/common/main/sw.xml index f4e8d4bd7350..f920e1ae306f 100644 --- a/make/data/cldr/common/main/sw.xml +++ b/make/data/cldr/common/main/sw.xml @@ -32,14 +32,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiobolo Kiangika Kiarabu - Kiarabu sanifu + Kiarabu Sanifu cha Kisasa Kiaramu Kimapuche Kiarapaho Kiarabu cha Algeria Kiarabu cha Najdi Kiarabu cha Misri - Kiassam + Kiasami Kiasu Kiasturia Kiatikamekw @@ -132,8 +132,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiingereza (Uingereza) Kiesperanto Kihispania - Kihispania (Amerika ya Latini) - Kihispania (Ulaya) + Kihispania cha Amerika ya Latini + Kihispania cha Ulaya + Kihispania cha Meksiko Kiestonia Kibaski Kiewondo @@ -201,7 +202,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiitaliano Kiinuktituti Kijapani - Lojban + Kilojbani Kingomba Kimachame Kijava @@ -359,13 +360,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiajemi cha Kale Kipijini Kipolandi + Kipiedmonti Kimaliseet-Passamaquoddy Kiprussia Kipashto - Kipushto Kireno - Kireno (Brazili) - Kireno (Ulaya) + Kireno cha Brazili + Kireno cha Ulaya Kikechua Kʼicheʼ Kirajasthani @@ -400,7 +401,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kisango Kiserbia-kroeshia Kitachelhit - Kishan + Kishani Kiarabu cha Chad Kisinhala Kislovakia @@ -427,7 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiswidi Kiswahili Shikomor - Lugha ya Syriac + Kisiria Kisilesia Kitamili Kitutchone cha Kusini @@ -455,7 +456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kitutchone cha Kaskazini Kitumbuka Kituvalu - Twi + Kitwi Kitasawak Kitahiti Kituva @@ -498,6 +499,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kichina Kichina sanifu Kichina (Kilichorahisishwa) + Kichina cha Mandarin Kilichorahisishwa Kichina cha Jadi Kichina (cha jadi) Kizulu @@ -532,7 +534,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -568,7 +570,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Dunia + dunia Afrika Amerika Kaskazini Amerika Kusini @@ -589,7 +591,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Australasia Melanesia Eneo la Mikronesia - Polynesia + Polinesia Asia Asia ya Kati Asia ya Magharibi @@ -624,18 +626,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Bulgaria Bahareni Burundi - Benin + Benini St. Barthelemy Bermuda Brunei Bolivia Uholanzi ya Karibiani - Brazil + Brazili Bahama Bhutan Kisiwa cha Bouvet Botswana - Belarus + Belarusi Belize Kanada Visiwa vya Cocos (Keeling) @@ -646,7 +648,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jamhuri ya Kongo Uswisi Cote d’Ivoire - Ivory Coast + Kodivaa Visiwa vya Cook Chile Kameruni @@ -670,7 +672,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jamhuri ya Dominika Aljeria Ceuta na Melilla - Ecuador + Ekwado Estonia Misri Sahara Magharibi @@ -686,7 +688,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mikronesia Visiwa vya Faroe Ufaransa - Gabon + Goboni Ufalme wa Muungano Grenada Jojia @@ -746,11 +748,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Liberia Lesoto Lithuania - Luxembourg + Lasembagi Latvia Libya - Morocco - Monaco + Moroko + Monako Moldova Montenegro St. Martin @@ -786,14 +788,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Niue Nyuzilandi Aotearoa Nyuzilandi - Oman + Omani Panama Peru Polynesia ya Ufaransa Papua New Guinea Ufilipino Pakistani - Poland + Polandi Santapierre na Miquelon Visiwa vya Pitcairn Puerto Rico @@ -801,8 +803,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Palestina Ureno Palau - Paraguay - Qatar + Paragwai + Katari Oceania ya Nje Reunion Romania @@ -812,7 +814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saudia Visiwa vya Solomon Ushelisheli - Sudan + Sudani Uswidi Singapore St. Helena @@ -828,12 +830,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sao Tome na Principe El Salvador Sint Maarten - Syria + Siria Eswatini Uswazi Tristan da Cunha Visiwa vya Turks na Caicos - Chad + Chadi Himaya za Kusini za Kifaranza Togo Tailandi @@ -854,7 +856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Visiwa Vidogo vya Nje vya Marekani Umoja wa Mataifa Marekani - Uruguay + Urugwai Uzibekistani Mji wa Vatican St. Vincent na Grenadines @@ -890,18 +892,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Mpangilio Upangaji wa Kawaida Upangaji kwa Nambari + Hati/Upangaji Upya wa Fungu Nguvu ya Upangaji Sarafu + Hatima ya Kigeuzi + Upuuzaji wa Migawanyo ya Kikamusi Uwasilishaji wa Emoji + Siku ya kwanza ya wiki + Mseto Kipindi cha saa (12 au 24) + Mbinu ya Ingizo + Kibodi + Kilichopuuzwa Zaidi Mtindo wa Kukata Mstari Nafasi kati ya mistari kwa maneno + Kanuni za Ugeuzaji Mfumo wa Vipimo + Kizio cha Kipimo Nambari + Eneo kwa ajili ya Data ya Nyongeza + Badili Umbo Chanzo + Ugawanyaji mdogo wa eneo Nafasi ya Sentensi Baada ya Ufupisho + Badili Umbo + Imetafsiriwa na Mashine Saa za Eneo Lahaja za Lugha Matumizi ya Kibinafsi + Kubadili Umbo kwa Matumizi Binafsi Kalenda ya Kibuddha @@ -921,13 +939,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kalenda ya Kiebrania Kiebrania Kalenda ya Taifa ya India + Kitaifa India Kalenda ya Hijra Hijra Kalenda ya Hijra (inayoanza usiku wa manane) Hijra (inayotegemea hesabu) + Hijra, mwezi kuonekana Saudia + Hijra (inayotegemea falaki) Kalenda ya Hijra (Umm ul-Qura) Hijra (Umm al-Qura) Kalenda ya ISO-8601 + Kigregori Kalenda ya Kijapani Kijapani Kalenda ya Kiajemi @@ -943,39 +965,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Panga Viinitoni kwa Kawaida Panga Viinitoni Kumegeuzwa Panga Herufi ndogo Kwanza + Herufi ndogo Panga Utaratibu wa Herufi ya Kawaida + Herufi ndogo Panga Herufi kubwa Kwanza + Herufi kubwa Panga Isiyoathiriwa na Herufi Panga kwa Inayoathiriwa na Herufi + Upatanifu Mpangilio wa Kamusi + Kamusi Mpangilio Chaguo-Msingi wa Unicode Chaguomsingi ya Unicode + Emoji + Kanuni za Ulaya Mpangilio wa Orodha za Nambari za Simu + Orodha ya anwani Utaratibu wa Kupanga Fonetiki + Fonetiki Mpangilio wa Kipinyin + Pinyin Utafutaji wa Kijumla Utafutaji Tafuta kwa Konsonanti Halisi ya Hangul + Konsonanti ya awali ya Kikorea Mpangilio wa Kawaida Kawaida Mpangilio wa Mikwaju + Chapa Mpangilio wa Kawaida + Kijadi Mpangilio wa Mikwaju ya Shina + Chapa ya Kimapokeo + Zhuyin Panga Bila Ukawaida Upangaji Msimbosare Umekawaidishwa Panga Tarakimu Kivyake Panga Dijiti kwa Namba + Sarafu + Tarakimu + Uakifishaji + Nafasi wazi + Alama Panga Zote + Vyote Panga Herufi Msingi Tu + Herufi za Msingi Pekee Panga Viinitoni/Herufi/Upana/Kana + Msingi, Shadda, Herufi Kubwa au Ndogo, Vibadala, Kana Panga Viinitoni + Msingi, Shadda Panga Viinitoni/Herufi/Upana + Msingi, Shadda, Herufi Kubwa au Ndogo, Vibadala Upana kamili Nusu upana Ya Nambari Chaguomsingi Emoji Maandiko + Kipindi cha saa 12 + 12 + Kipindi cha saa 24 + 24 Kipindi cha saa 12 (0–11) 12 (0–11) Kipindi cha saa 12 (1–12) @@ -984,6 +1035,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) Kipindi cha saa 24 (1–24) 24 (1–24) + Kitufe cha Kubadilisha Nafasi, uakifishaji, alama zote + Kitufe cha Kubadilisha Nafasi, uakifishaji + Kitufe cha Kubadilisha Nafasi, uakifishaji + Kitufe cha Kubadilisha Nafasi, uakifishaji, alama zisizo za kifedha Mtindo Pana wa Kukata Mstari Usio kaza Mtindo wa Kawaida wa Kukata Mstari @@ -1004,54 +1059,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Marekani Nambari za Kiarabu/Kihindi Nambari za Kiarabu/Kihindi Zilizopanuliwa + Tarakimu za Kiarabu Nambari za Kiarmenia Nambari Ndogo za Kiarmenia + Herufi ndogo za Kiarmenia Nambari za Kibengali Nambari za Kichakma - Nambari za Kichami + Nambari za Kichami Nambari za Kidevanagari Nambari za Kiethiopia Tarakimu za Kifedha + Kifedha Nambari za Upana Kamili + Upana kamili Nambari za Kigeorgia Nambari za Kigiriki Nambari Ndogo za Kigiriki + Herufi ndogo ya Kigiriki Nambari za Kigujarati Nambari za Kigurmukhi + Kalenda za jadi zenye tarakimu za Han kwa idadi ya siku za mwezi Nambari za Desimali za Kichina + Mfumo wa nafasi za desimali kwa kutumia ishara za nambari za Kichina kama tarakimu Nambari za Kichina Rahisi Nambari za Kifedha za Kichina Rahisi + Kichina Rahisi cha Kifedha Nambari za Kichina cha Jadi Nambari za Kifedha za Kichina cha Jadi + Kijapani Rahisi cha Kifedha Nambari za Kiebrania Nambari za Kijava Nambari za Kijapani Nambari za Kifedha za Kijapani + Tarakimu za Kijapani za kifedha + Tarakimu za Kijapani za Gannen ya mwaka wa kwanza Nambari za Kikambodia Nambari za Kikannada + Hati ya Tai Tham (kidini) Nambari za Kilao Nambari za Nchi za Magharibi Nambari za Kilimbu + Chapa nene ya kihesabu + Chapa ya kihesabu ya mstari pacha + Chapa ya kihesabu ya upana sawa + Chapa ya kihesabu ya sans-serif iliyokolezwa + Chapa ya kihesabu ya sans-serif Nambari za Malayalam Nambari za Kimongolia Nambari za Meetei Mayek Nambari za Myanmar + Hati ya Pwo Karen ya Myanmar Mashariki + Tarakimu za Pao za Myanmar + Tarakimu za Shan za Myanmar + Tarakimu za Tai Laing za Myanmar Nambari Asili + Tarakimu asilia Nambari za Kiol Chiki Nambari za Kioriya + Chapa yenye mistari ya nje Nambari za Kirumi + Herufi kubwa za Kirumi Nambari Ndogo za Kirumi + Herufi ndogo za Kirumi + Tarakimu za vipande Nambari za Kitakri Nambari za Kitamil cha Jadi Nambari za Kitamil + Tarakimu za Kitamil za Kisasa Nambari za Kitelugu Nambari za Kithai Nambari za Kitibeti Tarakimu za Jadi + Tarakimu za jadi Nambari za Kivai Imezimwa Imewashwa + Tafsiri ya Mashine Isiyo Bayana + Kibadala cha POSIX + + Imezimwa + Imewashwa + Mfumo wa Mita Uingereza @@ -1078,6 +1167,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + M01 + M02 + M03 + M04 + M05 + M07 + M10 + Mw11 + Mw12 + + + 1 + 2 + Mw3 + 4 + 5 + 6 + Mw7 + 8 + 9 + 10 + 11 + 12 + + + + @@ -1175,6 +1295,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0}–{1} + {0}–{1} + d – d @@ -1270,6 +1394,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d MMMM – d MMMM + y – y G @@ -1429,7 +1556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ usiku - saa sita za mchana alfajiri asubuhi mchana @@ -1495,6 +1621,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1538,6 +1667,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM y G E, d MMM y G + MMMM y G + d MMMM y G + E, d MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -1557,12 +1689,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM y E, d MMM y MMMM y + d MMMM y + E d, MMMM y QQQ y QQQQ y 'wiki' w 'ya' Y 'wiki' w 'ya' Y + + {0} – {1} + d – d @@ -1645,6 +1782,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d/M – E, d/M E, d/M – E, d/M + + MMM – MMM + d – d MMM d MMM – d MMM @@ -1653,6 +1793,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -1688,6 +1832,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + Y 'wiki' 'ya' w + Y 'wiki' 'ya' w + + + @@ -1919,10 +2071,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ sek - - sekunde {0} iliyopita - sekunde {0} zilizopita - saa za eneo @@ -1947,25 +2095,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jiji Lisilojulikana - - - Saa za Majira ya Joto za Uingereza - - Georgia Kusini - - - Saa za Majira ya Joto za Ayalandi - - Kostanay - - Rangoon - Macau @@ -1987,6 +2122,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kiev + + + Saa za Acre + Saa Wastani za Acre + Saa za Acre Majira ya Joto + + Saa za Afghanistan @@ -2063,7 +2205,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Saa za Apia + Saa za Samoa Magharibi Saa za Wastani za Apia Saa za Mchana za Apia @@ -2169,6 +2311,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saa za Majira ya joto za Brasilia + + + Saa za Uingereza + Saa za Majira ya Joto za Uingereza + + Saa za Brunei Darussalam @@ -2342,6 +2490,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saa za Greenwich + + + Saa za Greenland + Saa Wastani za Greenland + Saa Wastani za Greenland Majira ya Joto + + Saa za Greenland Mashariki @@ -2368,13 +2523,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Saa za Wastani za Hawaii-Aleutian + Saa za Hawaii Saa za Hawaii-Aleutian - Saa za Wastani za Hawaii-Aleutian + Saa Wastani za Hawaii-Aleutian Saa za Mchana za Hawaii-Aleutian @@ -2424,9 +2579,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Saa za Iran - Saa za Wastani za Iran - Saa za Mchana za Iran + Saa za Irani + Saa za Wastani za Irani + Saa za Mchana za Irani + + + + + Saa za Ayalandi + Saa za Majira ya Joto za Ayalandi @@ -2728,9 +2889,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Saa za Samoa Saa za Wastani za Samoa - Saa za Majira ya joto za Samoa @@ -2797,6 +2956,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saa za Chuuk + + + Saa za Uturuki + Saa Wastani za Uturuki + Saa za Uturuki Majira ya Joto + + Saa za Turkmenistan @@ -2816,6 +2982,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saa za Majira ya joto za Urugwai + + + Saa za Urumqi + + Saa za Uzbekistan @@ -2923,7 +3094,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ elfu 00;elfu -00 elfu 000;elfu -000 elfu 000;elfu -000 - 0M;-0M + 0M 0M 00M;-00M 00M @@ -2974,7 +3145,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} {1} - {1} {0} + {0} {1} @@ -3791,8 +3962,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guilder ya Karibe - Guilder ya Karibe - Guilder ya Karibe Faranga ya Afrika Magharibi CFA @@ -3832,8 +4001,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Dhahabu ya Zimbabwe - Dhahabu ya Zimbabwe - Dhahabu ya Zimbabwe @@ -5281,6 +5448,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ gal Imp. {0} gal Imp. {0} + {0}/galImp kwati @@ -5322,6 +5490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mapipa {0} + vijiko vya kitindamlo dstspn {0} dstspn {0} @@ -5461,19 +5630,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ mmol {0}/L mmol {0}/L - - kipande - kipande {0} - kipande {0} - ppm - - Glc - Glc {0} - Glc {0} - L/100km {0} L/100km {0} @@ -5565,50 +5724,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ °C - - sr {0} - sr {0} - - - kat {0} - kat {0} - - - C {0} - C {0} - - - F {0} - F {0} - - - H {0} - H {0} - - - S {0} - S {0} - - - cal-IT - cal-IT {0} - cal-IT {0} - - - Bq {0} - Bq {0} - - - Sv {0} - Sv {0} - - - Gy {0} - Gy {0} - - - kgf {0} - kgf {0} + + {0}/galIm T{0} @@ -5818,6 +5935,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ und sw ko vi yue zh + informal {given-informal} {surname} diff --git a/make/data/cldr/common/main/sw_CD.xml b/make/data/cldr/common/main/sw_CD.xml index 59366ba12d95..e6c7a6ed9cca 100644 --- a/make/data/cldr/common/main/sw_CD.xml +++ b/make/data/cldr/common/main/sw_CD.xml @@ -41,7 +41,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kiarabu cha Chadi Kitongo cha Sranan Kikomoro - Kisiria Kiudumurti Kiyidi @@ -49,27 +48,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic Asia Mashariki Afuganistani Azabajani - Benini Kodivaa Kisiwa cha Christmas Kroeshia Yordani Lebanoni Lishenteni - Lasembagi Lativia - Moroko Myama Nijeri Nijeria Norwe Nepali - Omani Puetoriko - Katari - Sudani Sao Tome na Prinsipe - Chadi Timori ya Mashariki diff --git a/make/data/cldr/common/main/sw_KE.xml b/make/data/cldr/common/main/sw_KE.xml index 06f2db068562..4979da5e5f16 100644 --- a/make/data/cldr/common/main/sw_KE.xml +++ b/make/data/cldr/common/main/sw_KE.xml @@ -45,8 +45,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kiingereza cha Marekani Kiingereza cha Marekani) Kihispania cha Amerika Kusini - Kihispania cha Ulaya - Kihispania cha Meksiko Kidari Kifula Kifaro @@ -75,7 +73,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kiiloko Kiingushi Kiaisilandi - Kilojbani Kikachini Kikabadi Kikabuvedi @@ -121,15 +118,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kiodia Kipangasini Kipijini cha Naijeria - Kireno cha Brazili - Kireno cha Ulaya Kirumi Kirwa Kingambei Kisadini Kisisilia Kikoyraborosenni - Kishani Kiarabu cha Chadi Kilushootseed cha Kusini Kisranantongo @@ -138,7 +132,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kisundani Kiswahili cha Kongo Kikomoro - Kisiria Kituchone cha Kusini Kitimne Kitagi @@ -147,7 +140,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kitokipona Kisonga Kituchone cha Kaskazini - Kitwi Kitamazight cha Atlas ya Kati Kiudumurti Kiuiguri @@ -178,7 +170,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - @@ -194,7 +185,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - dunia Afrika Magharibi Afrika Mashariki Afrika Kaskazini @@ -203,7 +193,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kusini Mashariki mwa Asia Ulaya Kusini Maikronesia - Polinesia Asia Magharibi Ulaya Mashariki Ulaya Kaskazini @@ -215,15 +204,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Antaktika Azabajani Babados - Benini Bahamas Bhutani - Belarusi Visiwa vya Kokos (Keeling) Kepuvede Kurakao Keuta na Melilla - Ekwado Gaboni Gwadelupe Visiwa vya Jojia Kusini na Sandwich Kusini @@ -235,10 +221,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Lebanoni Lishenteni Lesotho - Lasembagi Lativia - Moroko - Monako Masedonia Myama (Burma) Montserati @@ -246,27 +229,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nijeri Norwe Nepali - Omani Polinesia ya Ufaransa Papua Guinea Mpya - Polandi St. Pierre na Miquelon Pwetoriko Himaya za Palestina - Paragwai - Katari Eneo la Oceania Singapuri Sao Tome na Prinsipe Elsalvado Shamu - Chadi Thailandi Turukimenstani Taiwani Ukreni Marekani - Urugwai Mji wa Vatikani Visiwa vya Virgin vya Uingereza Visiwa vya Virgin vya Marekani @@ -429,6 +406,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic d/M/y G + + + {0} – {1} + {0} – {1} + + @@ -665,13 +648,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saa za Majira ya Joto za Hovd - - - Saa za Irani - Saa za Wastani za Irani - Saa za Mchana za Irani - - Saa za Irkutsk @@ -831,13 +807,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saa za Majira ya Joto za Sakhalin - - - Saa za Samoa - Saa za Wastani za Samoa - Saa za Mchana za Samoa - - Saa za Wastani za Singapoo @@ -986,49 +955,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤ elfu 0 - ¤ elfu 0 ¤ elfu 0 - ¤ elfu 0 ¤ elfu 00 - ¤ elfu 00 ¤ elfu 00 - ¤ elfu 00 ¤ elfu 000 - ¤ elfu 000 ¤ elfu 000 - ¤ elfu 000 ¤ M0 - ¤ M0 ¤ M0 ¤ M00 - ¤ M00 ¤ M00 - ¤ M00 ¤ M000 - ¤ M000 ¤ M000 ¤ B0 - ¤ B0 ¤ B0 - ¤ B0 ¤ B00 - ¤ B00 ¤ B00 - ¤ B00 ¤ B000 - ¤ B000 ¤ B000 - ¤ B000 ¤ T0 - ¤ T0 ¤ T0 ¤ T00 - ¤ T00 ¤ T00 ¤ T000 - ¤ T000 ¤ T000 - ¤ T000 diff --git a/make/data/cldr/common/main/syr.xml b/make/data/cldr/common/main/syr.xml index ebb46352c82b..47dcb8875867 100644 --- a/make/data/cldr/common/main/syr.xml +++ b/make/data/cldr/common/main/syr.xml @@ -42,7 +42,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܓܘܓܐܪܝܬ ܥܒܪܐܝܬ ܗܢܕܝܐ - ܗܢܕܝܐ (ܪܗܘܡܝܐ) ܐܪܡܢܝܬ ܐܢܕܘܢܝܬ ܐܝܛܠܝܬ @@ -116,7 +115,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܡܕܢܚ ܐܦܪܝܩܐ ܓܪܒܐ ܐܦܪܝܩܐ ܡܨܥܬ ܐܦܪܝܩܐ - ܬܝܡܢ ܐܦܪܝܩܐ ܐܡܪ̈ܝܟܐ ܓܪܒܐ ܐܡܪܝܟܐ ܟܐܪܝܒܐ @@ -442,6 +440,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܟܬܒܐ ܕܡܢܝ̈ܢܐ ܕܬܝܠܝܦܘܢ ܛܟ݂ܣܐ ܦܘܪܫܢܝܐ ܫܪܫܝܐ ܛܟ݂ܣܐ ܦܘܪܫܢܝܐ ܥܝܕ݂ܝܐ + ܛܟ݂ܣܐ 12 ܫܥܬ݂ܐ + ܛܟ݂ܣܐ 24 ܫܥܬ݂ܐ ܛܟ݂ܣܐ 12 ܫܥܬ݂ܐ (0–11) ܛܟ݂ܣܐ 12 ܫܥܬ݂ܐ (1–12) ܛܟ݂ܣܐ 24 ܫܥܬ݂ܐ (0–23) @@ -717,20 +717,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܬܫܪܝܢ ܒ ܟܢܘܢ ܐ - - ܟ - ܫ - ܐ - ܢ - ܐ - ܚ - ܬ - ܐ - ܐ - ܬ - ܬ - ܟ - ܟܢܘܢ ܐܚܪܝܐ ܫܒܛ @@ -811,14 +797,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܪܘܒܥܐ ܪܒܝܥܝܐ - - - ܏ܪ ܐ - ܏ܪ ܒ - ܏ܪ ܓ - ܏ܪ ܕ - - @@ -952,6 +930,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܫܒܘܥܐ w ܕܫܢܬܐ Y + + {0} – {1} + {0} – {1} + {0}–{1} + y G – y G y – y G @@ -1065,22 +1048,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܕܘܠܚܓܗ - - - ܡܘܚܪܡ - ܨܦܪ - ܪܒܝܥ ܩܕܡܝܐ - ܪܒܝܥ ܬܪܝܢܐ - ܓܘܡܕܐ ܩܕܡܝܐ - ܓܘܡܕܐ ܬܪܝܢܐ - ܪܓܒ - ܫܥܒܐܢ - ܪܡܨܐܢ - ܫܘܐܠ - ܕܘܠܩܥܕܗ - ܕܘܠܚܓܗ - - @@ -1108,12 +1075,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܗܕ ܏ܫܢ ܏ܫܢ ܕܐܬܝܐ - - ܏ܫܢ - ܏ܫܬܩܕ - ܗܕ ܏ܫܢ - ܏ܫܢ ܕܐܬܝܐ - ܪܘܒܥܐ ܕܫܢܬܐ ܪܘܒܥܐ ܕܥܒܪ @@ -1131,9 +1092,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܪܒܘܥ ܏ܫܢ - - ܪܒܘܥ ܏ܫܢ - ܝܪܚܐ ܝܪܚܐ ܐܚܪܝܐ @@ -1158,12 +1116,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܡ̣ܢ ܩܕܡ {0} ܝܖ̈ܚܐ - - ܏ܝܪܚ - ܏ܝܪܚ ܏ܐܚܪ - ܗܢ ܏ܝܪܚ - ܏ܝܪܚ ܕܐܬܐ - ܫܒܘܥܐ ܫܒܘܥܐ ܐܚܪܝܐ @@ -1187,10 +1139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܏ܫܒܘ ܕ{0} - ܏ܫܒܘ - ܏ܫܒܘ ܏ܐܚܪ - ܗܢ ܏ܫܒܘ - ܏ܫܒܘ ܕܐܬܐ ܏ܫܒܘ {0} @@ -1199,9 +1147,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܫܒܘܥ ܝܪܚܐ - - ܫܒܘܥ ܝܪܚܐ - ܝܘܡܐ ܐܬܡܠܝ @@ -1222,12 +1167,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܐܕܝܘܡ ܏ܩܘܕܡ - - ܏ܝܘܡ - ܏ܬܡܠ - ܐܕܝܘܡ - ܏ܩܘܕܡ - ܝܘܡܐ ܕܫܢܬܐ @@ -1358,9 +1297,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܏ܫܥ - - ܏ܫܥ - ܩܛܝܢܬܐ ܗܢܐ ܩܛܝܢܬܐ @@ -1376,9 +1312,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܏ܩܛܝܢ - - ܏ܩܛܝܢ - ܪܦܦܐ ܗܫܐ @@ -1394,9 +1327,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܏ܪܦ - - ܏ܪܦ - ܦܢܝܬܐ ܕܙܒܢܐ @@ -1410,9 +1340,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܬܒܠܝܬܐ ܡܛܘܟܣܬܐ - - ܐܬܪܐ ܠܐ ܝܕܝܥܐ - + ܐܢܕܘܪܐ @@ -1879,9 +1811,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܠܝܒܪܝܒܝܠ - - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܒܪܝܛܢܝܐ - ܠܘܢܕܘܢ @@ -1972,9 +1901,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܓܐܝܦܘܪܐ - - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܝܪܠܢܕ - ܕܒܠܢ @@ -2709,13 +2635,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܠܐܣܟܐ - - - ܥܕܢܐ ܕܐܠܡܐܬܝ - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܠܡܐܬܝ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܠܡܐܬܝ - - ܥܕܢܐ ܕܐܡܙܢ @@ -2765,20 +2684,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܦܝܐ - - - ܥܕܢܐ ܐܟܬܐܘ - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܟܬܐܘ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܟܬܐܘ - - - - - ܥܕܢܐ ܕܐܟܬܘܒ - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܟܬܘܒ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܟܬܘܒ - - ܥܕܢܐ ܕܐܪܒܝܐ @@ -2880,6 +2785,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܒܪܐܣܝܠܝܐ + + + ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܒܪܝܛܢܝܐ + + ܥܕܢܐ ܕܒܪܘܢܐܝ ܕܐܪܘܣܐܠܡ @@ -3072,11 +2982,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܓܪܝܢܠܢܕ ܕܡܥܪܒܝܬܐ - - - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܓܘܐܡ - - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܡܥܠܢܐ @@ -3150,6 +3055,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܐܝܪܐܢ + + + ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܐܝܪܠܢܕ + + ܥܕܢܐ ܕܐܝܪܟܘܬܣܟ @@ -3217,11 +3127,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܩܝܪܓܝܙܣܬܐܢ - - - ܥܕܢܐ ܕܠܐܢܟܐ - - ܥܕܢܐ ܕܓܙܝܪ̈ܐ ܕܠܐܝܢ @@ -3234,13 +3139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܠܘܪܕ ܗܐܘ - - - ܥܕܢܐ ܕܡܐܟܐܘ - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܡܐܟܐܘ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܡܐܟܐܘ - - ܥܕܢܐ ܕܡܐܓܐܕܐܢ @@ -3356,11 +3254,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܦܪܢܢܕܘ ܕܢܘܪܘܢܗܐ - - - ܥܕܢܐ ܕܓܙܝܖ̈ܐ ܕܡܪܝܐܢܐ ܓܪܒܝܝܬܐ - - ܥܕܢܐ ܕܢܘܒܘܣܝܒܪܣܟ @@ -3440,13 +3333,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ܥܕܢܐ ܕܦܝܘܢܓܝܢܓ - - - ܥܕܢܐ ܕܟܝܙܝܠܘܪܕܐ - ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܟܝܙܝܠܘܪܕܐ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܟܝܙܝܠܘܪܕܐ - - ܥܕܢܐ ܕܪܝܘܢܝܘܢ @@ -3473,9 +3359,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ܥܕܢܐ ܕܣܡܘܐ ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܕܣܡܘܐ - ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܣܡܘܐ @@ -5003,7 +4887,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ☉R - ܦܢܝܬܐ {0} ܏ܡܕܢܚ {0} ܏ܓܪܒܝ {0} ܏ܬܝܡܢ @@ -5067,9 +4950,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname-monogram-allCaps} - - {given-monogram-allCaps}.{given2-monogram-allCaps}.{surname-monogram-allCaps}. - {title} {given-initial} {surname} diff --git a/make/data/cldr/common/main/szl.xml b/make/data/cldr/common/main/szl.xml index ba1507125dc9..7fe534367ce7 100644 --- a/make/data/cldr/common/main/szl.xml +++ b/make/data/cldr/common/main/szl.xml @@ -1172,6 +1172,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y, 'tydz'. w + + {0}–{1} + {0}–{1} + {0}–{1} + {0}–{1} h B – h B @@ -1746,9 +1751,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Paryż - - Brytyjski latowy czas - Lōndyn @@ -1796,11 +1798,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dżakarta - - - Irlandyjo (latowy czas) - - Jerozolima @@ -2202,13 +2199,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic alaskański czas latowy - - - czas ałmacki - czas ałmacki sztandardowy - czas ałmacki latowy - - amazōński czas @@ -2251,20 +2241,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic latowy czas Anadyr - - - czas auktaucki - czas auktaucki sztandardowy - czas auktaucki latowy - - - - - czas aktiubiński - czas aktiubiński sztandardowy - czas aktiubiński latowy - - Pōłwysep Arabski @@ -2361,6 +2337,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasília (latowy czas) + + + Brytyjski latowy czas + + Wyspy Zielōnego Przilōndka @@ -2612,6 +2593,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Indōnezyjo Zachodnio + + + Irlandyjo (latowy czas) + + Irkuck @@ -2810,13 +2796,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pjōngjang - - - czas kyzyłordzki - czas kyzyłordzki sztandardowy - czas kyzyłordzki latowy - - Sachalin diff --git a/make/data/cldr/common/main/ta.xml b/make/data/cldr/common/main/ta.xml index c7527319ccf4..90fb6b728ab7 100644 --- a/make/data/cldr/common/main/ta.xml +++ b/make/data/cldr/common/main/ta.xml @@ -212,6 +212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ தெற்கு ஹைடா ஹீப்ரூ இந்தி + இந்தி (லத்தீன்) ஹிங்கிலிஷ் ஃபிஜி இந்தி ஹிலிகாய்னான் @@ -422,6 +423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பாலி பிஜின் போலிஷ் + பீடுமான்டீஸ் ஃபோன்பெயென் மலிசீட்-பஸ்ஸமகுவாடி பிரஷ்யன் @@ -730,7 +732,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - + @@ -1057,7 +1059,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ வேட்-கைல்ஸ் ரோமனைஷேசன் - நாள்காட்டி + நாட்காட்டி நாணய வடிவம் சின்னங்கள் வரிசைப்படுத்தலைப் புறக்கணி தலைகீழ் உச்சரிப்பு வரிசைப்படுத்தல் @@ -1066,52 +1068,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ வரிசை முறை இயல்பாக்கப்பட்ட வரிசைபடுத்துதல் எண்முறை வரிசைபடுத்துதல் + எழுத்துமுறை/தொகுதி மறுவரிசையாக்கம் வரிசைப்படுத்தல் வலிமை நாணயம் - இமோஜி வெளிப்பாடு + உருமாற்ற இலக்கு + அகராதிப் பிரிப்பு விலக்குகள் + இமோஜி வெளிப்பாடு + வார முதல் நாள் + உடன் இணைந்த மணிநேர சுழற்சி (12, 24) + உள்ளீட்டு முறை + விசைப்பலகை + அதிகபட்சத் தவிர்ப்பு வரி முறிப்பு ஸ்டைல் வவ + உருமாற்ற விதிகள் அளவீட்டு முறை + அளவீட்டு அலகுகள் எண்கள் + பிற்சேர்க்கை தரவிற்கான வட்டாரம் + உருமாற்ற மூலம் + வட்டாரத் துணைப்பிரிவு வமு + உருமாற்றம் + இயந்திரம் மொழிபெயர்த்தது நேர மண்டலம் மொழி மாறிலி தனிப்பட்ட பயன் + தனிப்பட்ட பயன்பாட்டிற்கான உருமாற்றம் - புத்த நாள்காட்டி + புத்த நாட்காட்டி பௌத்தம் - சீன நாள்காட்டி + சீன நாட்காட்டி சீனம் - காப்டிக் நாள்காட்டி - காப்டிக் - டேங்கி நாள்காட்டி - டேங்கி - எத்தியோப்பிய நாள்காட்டி + காப்டிக் நாட்காட்டி + காப்டிக் + டேங்கி நாட்காட்டி + டேங்கி + எத்தியோப்பிய நாட்காட்டி எத்தியோப்பிக் - எத்தியோபிக் அமேதே ஆலெம் நாள்காட்டி + எத்தியோபிக் அமேதே ஆலெம் நாட்காட்டி எத்தியோப்பிய அமீத்தி ஆலெம் - கிரிகோரியன் நாள்காட்டி - கிரிகோரியன் - ஹீப்ரு நாள்காட்டி - எபிரேயம் - இந்திய தேசிய நாள்காட்டி + கிரிகோரியன் நாட்காட்டி + கிரிகோரியன் + ஹீப்ரு நாட்காட்டி + ஹீப்ரு + இந்திய தேசிய நாட்காட்டி இந்திய தேசியம் - இஸ்லாமிய நாள்காட்டி - ஹிஜ்ரி - இஸ்லாமிய சிவில் நாள்காட்டி - ஹிஜ்ரி(அட்டவணை, சிவில் இபோக்) - இஸ்லாமிய வானியல் நாள்காட்டி - ஹிஜ்ரி(அட்டவணை, வானவியல் இபோக்) - இஸ்லாமிய நாள்காட்டி (உம்-அல்-குரா) - ஹிஜ்ரி (உம்முல் குறா) - கிரிகோரிய நாள்காட்டி - ஜப்பானிய நாள்காட்டி + ஹிஜ்ரி நாட்காட்டி + ஹிஜ்ரி + ஹிஜ்ரி நாட்காட்டி (அட்டவணை, சிவில் இபோக்) + ஹிஜ்ரி (அட்டவணை, சிவில் இபோக்) + ஹிஜ்ரி, சவுதி அரேபியாவில் தெரியும் நிலவைப் பொறுத்து + ஹிஜ்ரி நாட்காட்டி (அட்டவணை, வானியல் இபோக்) + ஹிஜ்ரி (அட்டவணை, வானவியல் இபோக்) + ஹிஜ்ரி நாட்காட்டி (உம்-அல்-குரா) + ஹிஜ்ரி (உம்-அல்-குரா) + கிரிகோரிய நாட்காட்டி + கிரிகோரியன் + ஜப்பானிய நாட்காட்டி ஜப்பானியம் - பாரசீக நாள்காட்டி + பாரசீக நாட்காட்டி பாரசீகம் - மின்கோ நாள்காட்டி + மின்குவோ நாட்காட்டி மின்குவோ கணக்கிடல் நாணய வடிவம் கணக்கியல் @@ -1122,49 +1142,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ உச்சரிப்புகளை இயல்பாக வரிசைபடுத்து உச்சரிப்புகளை நேர்மறையாக வரிசைபடுத்து முதலில் சிற்றெழுத்துகளை வரிசைப்படுத்து + சிற்றெழுத்து இயல்பான எழுத்து வடிவில் வரிசைபடுத்து + சிற்றெழுத்து முதலில் பேரெழுத்துகளை வரிசைப்படுத்து + பேரெழுத்து எழுத்து உணர்வின்றி வரிசைபடுத்து எழுத்து உணர்வில் வரிசைபடுத்து முந்தைய வரிசை வடிவம், இணக்கத்தன்மைக்கு + இணக்கத்தன்மை அகராதி வரிசை முறை + அகராதி இயல்புநிலை யுனிகோட் வரிசை முறை - இயல்புநிலை ஒருங்குறி + இயல்புநிலை யுனிகோடு + இமோஜி ஐரோப்பிய வரிசைப்படுத்தல் விதிகள் + ஐரோப்பிய விதிமுறைகள் தொலைபேசி புத்தக வரிசை முறை + தொலைபேசி புத்தகம் ஒலியியல் வரிசைப்படுத்தல் முறை + ஒலியியல் பின்யின் வரிசை முறை + பின்யின் பொதுப்படையான தேடல் தேடல் ஹங்குல் முதன்மை மெய்யெழுத்தின்படி தேடு + கொரிய முதல் மெய்யெழுத்து நிலையான வரிசை முறை வழக்கமானது ஸ்ட்ரோக் வரிசை முறை + எழுத்துக் கீற்று பாரம்பரிய வரிசை முறை + மரபு ரீதியான ரேடியன் ஸ்ட்ரோக் வரிசை முறை + வேரெழுத்து-கோடு + ஜூயின் இயல்பாக்கம் இல்லாமல் வரிசைபடுத்து இயல்பாக்கப்பட்ட யூனிகோடை வரிசைப்படுத்து இலக்கங்களை, தனியாக வரிசைப்படுத்து இலக்கங்களை எண்களாக வரிசைப்படுத்து + நாணயம் + இலக்கங்கள் + நிறுத்தற்குறிகள் + வெற்றிடம் + குறியீடு அனைத்தையும் வரிசைப்படுத்து + அனைத்தும் அடிப்படை எழுத்துகளை மட்டும் வரிசைபடுத்து + அடிப்படை எழுத்துகள் மட்டும் உச்சரிப்புகள்/எழுத்து/அகலம்/கானாவை வரிசைப்படுத்து + அடிப்படை, ஒலியழுத்தங்கள், எழுத்து நிலை, மாற்றுருக்கள், கானா உச்சரிப்புகளை வரிசைபடுத்து + அடிப்படை, ஒலியழுத்தங்கள் உச்சரிப்புகள்/எழுத்து/அகலத்தை வரிசைப்படுத்து + அடிப்படை, ஒலியழுத்தங்கள், எழுத்து நிலை, மாற்றுருக்கள் முழு அகலம் அரை அகலம் எண் இயல்புநிலை இமோஜி - வார்த்தை + உரை + 12 மணிநேர முறைமை + 12 + 24 மணிநேர முறைமை + 24 12 மணிநேர முறைமை (0–11) - 12 (0–11) + 12 (0–11) 12 மணிநேர முறைமை (1–12) - 12 (1–12) + 12 (1–12) 24 மணிநேர முறைமை (0–23) - 24 (0–23) + 24 (0–23) 24 மணிநேர முறைமை (1–24) - 24 (1–24) + 24 (1–24) + ஷிஃப்ட் இடைவெளிகள், நிறுத்தற்குறிகள், அனைத்துக் குறியீடுகளும் + ஷிஃப்ட் இடைவெளிகள், நிறுத்தற்குறிகள் + ஷிஃப்ட் இடைவெளிகள், நிறுத்தற்குறிகள் + ஷிஃப்ட் இடைவெளிகள், நிறுத்தற்குறிகள், நாணயத்தைக் குறிப்பிடாத குறியீடுகள் தளர்வான வரி முறிப்பு ஸ்டைல் தளர்த்தியது சாதாரண வரி முறிப்பு ஸ்டைல் @@ -1185,51 +1238,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ US அரபிய-இந்திய இலக்கங்கள் நீட்டிக்கப்பட்ட அரபிய-இந்திய இலக்கங்கள் + நீட்டிக்கப்பட்ட அரபிய-இந்திய ஆர்மேனியன் எண்கள் ஆர்மேனியன் சிற்றெழுத்து எண்கள் + ஆர்மேனியன் சிற்றெழுத்து பெங்காலி இலக்கங்கள் சக்மா இலக்கங்கள் தேவநாகரி இலக்கங்கள் எத்தியோப்பிய எண்கள் நிதி எண்கள் + நிதிசார் முழு-அகல இலக்கங்கள் + முழு அகல ஜார்ஜியன் எண்கள் கிரேக்க எண்கள் கிரேக்கச் சிற்றெழுத்து எண்கள் + கிரேக்கச் சிற்றெழுத்து குஜராத்தி இலக்கங்கள் குர்முகி இலக்கங்கள் + பாரம்பரிய நாட்காட்டிகளுக்கான ஹான் எழுத்து மாத-நாள் எண்ணிடும் முறை சீன பின்ன எண்கள் + சீன எண் கருத்துருக்களை இலக்கங்களாகப் பயன்படுத்தும் இடமதிப்பு தசம முறை எளிதாக்கப்பட்ட சீன எண்கள் எளிதாக்கப்பட்ட சீன நிதி எண்கள் + எளிமையாக்கப்பட்ட சீன நிதியியல் பாரம்பரிய சீன எண்கள் பாரம்பரிய சீன நிதி எண்கள் + மரபுவழிச் சீன நிதியியல் ஹீப்ரு எண்கள் ஜாவானிய இலக்கங்கள் ஜப்பானிய எண்கள் ஜப்பானிய நிதி எண்கள் + ஜப்பானிய நிதியியல் + ஜப்பானிய முதல் ஆண்டு கானென் எண்ணிடும் முறை கெமெர் இலக்கங்கள் கன்னட இலக்கங்கள் + தாய் தாம் தாம் (சமயச் சார்பான) லாவோ இலக்கங்கள் மேற்கத்திய இலக்கங்கள் + கணிதத் தடிமன் + கணித இரட்டைக் கோடு + கணிதச் சம அகலம் + கணித சான்ஸ்-செரிஃப் தடிமன் + கணித சான்ஸ்-செரிஃப் மலையாள இலக்கங்கள் மங்கோலியன் இலக்கங்கள் மீடீ மயக் இலக்கங்கள் மியான்மர் இலக்கங்கள் - சொந்த இலக்கங்கள் + மியான்மர் கிழக்கு போ கரன் + மியான்மர் பாவோ + மியான்மர் ஷான் + மியான்மர் தாய் லாய்ங் + தாய்மொழி எண்கள் + தாய்மொழி எண்கள் ஒல் சிக்கி இலக்கங்கள் ஒடியா இலக்கங்கள் + வெளிக்கோடு ரோமன் எண்கள் + ரோமன் பேரெழுத்து ரோமன் சிற்றெழுத்து எண்கள் + ரோமன் சிற்றெழுத்து + பகுக்கப்பட்ட பாரம்பரிய தமிழ் எண்கள் தமிழ் இலக்கங்கள் + நவீனத் தமிழ் தெலுங்கு இலக்கங்கள் தாய் இலக்கங்கள் திபெத்திய இலக்கங்கள் பாரம்பரிய எண்கள் + மரபு எண்கள் வை இலக்கங்கள் முடக்கம் இயக்கம் + குறிப்பிடப்படாத இயந்திர மொழிபெயர்ப்பு + POSIX மாற்றுரு + + முடக்கம் + இயக்கம் + மெட்ரிக் யூகே @@ -1238,7 +1325,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ மொழி: {0} எழுத்து: {0} - பிரதேசம்: {0} + வட்டாரம்: {0} @@ -1439,9 +1526,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - - {1} அன்று {0} - @@ -1472,7 +1556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d/M/y GGGGG MMM y G d MMM, y G - E, d MMM, y G d/M E, d/M dd-MM @@ -1493,6 +1576,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} d – d @@ -1537,6 +1625,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + MMMM d – d + y – y G @@ -1724,13 +1815,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிறிஸ்துவுக்கு முன் + பொது யுகத்திற்கு முன் அன்னோ டோமினி + பொது யுகம் கி.மு. - பொ.ச.மு + பொ.யு.மு கி.பி. - பொ.ச + பொ.யு @@ -1831,13 +1924,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM, y E, d MMM, y MMMM y + d MMMM y + E, d MMMM y QQQ y QQQQ y Y ஆம் ஆண்டின் w -ஆம் வாரம் Y ஆம் ஆண்டின் w -ஆம் வாரம் + + {1}, {0} + {0} {1} + {1}, {0} + - {0} – {1} + + {0} – {1} + HH – HH @@ -1881,11 +1983,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + MMMM d – d + - y – y + y – y - M/y – M/y + M/y – M/y M/y – M/y @@ -2129,15 +2234,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - கா. {0} கா. {0} கா. - - {0} கா. முன் - {0} கா. முன் - மாதம் @@ -2470,15 +2570,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} சனி. முன் - - AM/PM - AM/PM - - AM/PM - மணிநேரம் இந்த ஒரு மணிநேரத்தில் @@ -2499,15 +2593,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ம. {0} ம. {0} ம. - - {0} ம. முன் - {0} ம. முன் - நிமிடம் @@ -2562,15 +2651,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - வி. {0} வி. {0} வி. - - {0} வி. முன் - {0} வி. முன் - நேர மண்டலம் @@ -2949,7 +3033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ தவுலா - உரும்கி + உருமுச்சி ஷாங்காய் @@ -3060,9 +3144,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ லிப்ரேவில்லே - - பிரிட்டிஷ் கோடை நேரம் - லண்டன் @@ -3153,9 +3234,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ஜெயபூரா - - ஐரிஷ் நிலையான நேரம் - டப்ளின் @@ -3204,7 +3282,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ஃப்னோம் பென் - கேன்டன் + கேன்டன் தீவு கிரிடிமாட்டி @@ -3468,7 +3546,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ வார்ஸா - மிக்யூலன் + செயின்ட் பியரி பிட்கெய்ர்ன் @@ -3744,7 +3822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ போய்ஸ் - ஃபோனிக்ஸ் + ஃபீனிக்ஸ் டென்வர் @@ -3854,7 +3932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ அக்ரே நேரம் - அக்ரே தர நேரம் + அக்ரே நிலையான நேரம் அக்ரே கோடை நேரம் @@ -3890,13 +3968,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ அலாஸ்கா பகலொளி நேரம் - - - அல்மாடி நேரம் - அல்மாடி தர நேரம் - அல்மாடி கோடை நேரம் - - அமேசான் நேரம் @@ -3946,20 +4017,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ஏபியா பகலொளி நேரம் - - - அட்டௌ நேரம் - அட்டௌ தர நேரம் - அட்டௌ கோடை நேரம் - - - - - அட்டோபே நேரம் - அட்டோபே தர நேரம் - அட்டோபே கோடை நேரம் - - அரேபிய நேரம் @@ -4061,6 +4118,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பிரேசிலியா கோடை நேரம் + + + பிரிட்டிஷ் நேரம் + பிரிட்டிஷ் கோடை நேரம் + + புருனே டருஸ்ஸலாம் நேரம் @@ -4234,6 +4297,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிரீன்விச் சராசரி நேரம் + + + கிரீன்லாந்து நேரம் + கிரீன்லாந்து நிலையான நேரம் + கிரீன்லாந்து கோடைக்கால நேரம் + + கிழக்கு கிரீன்லாந்து நேரம் @@ -4248,11 +4318,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ மேற்கு கிரீன்லாந்து கோடை நேரம் - - - கம் தர நேரம் - - வளைகுடா நிலையான நேரம் @@ -4265,7 +4330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ஹவாய்-அலேஷியன் நிலையான நேரம் + ஹவாய் நேரம் @@ -4329,6 +4394,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ஈரான் பகலொளி நேரம் + + + ஐரிஷ் நேரம் + ஐரிஷ் நிலையான நேரம் + + இர்குட்ஸ்க் நேரம் @@ -4352,9 +4423,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - பெட்ரோபவ்லோவ்ஸ்க் கம்சட்ஸ்கி நேரம் - பெட்ரோபவ்லோவ்ஸ்க் கம்சட்ஸ்கி தர நேரம் - பெட்ரோபவ்லோவ்ஸ்க் கம்சட்ஸ்கி கோடை நேரம் + கம்சத்கா நேரம் + கம்சத்கா நிலையான நேரம் + கம்சத்கா கோடை நேரம் @@ -4396,11 +4467,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிர்கிஸ்தான் நேரம் - - - லங்கா நேரம் - - லைன் தீவுகள் நேரம் @@ -4413,13 +4479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ லார்ட் ஹோவ் பகலொளி நேரம் - - - மக்காவ் நேரம் - மக்காவ் தர நேரம் - மக்காவ் கோடை நேரம் - - மகதன் நேரம் @@ -4535,11 +4594,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பெர்னான்டோ டி நோரோன்ஹா கோடை நேரம் - - - வடக்கு மரினா தீவுகள் நேரம் - - நோவோசிபிரிஸ்க் நேரம் @@ -4619,13 +4673,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பியாங்யாங் நேரம் - - - கைஜைலோர்டா நேரம் - கைஜைலோர்டா தர நேரம் - கைஜைலோர்டா கோடை நேரம் - - ரீயூனியன் நேரம் @@ -4646,15 +4693,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ சமரா நேரம் - சமரா தர நேரம் + சமரா நிலையான நேரம் சமரா கோடை நேரம் - சமோவா நேரம் சமோவா நிலையான நேரம் - சமோவா பகலொளி நேரம் @@ -4723,9 +4768,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - துருக்கி நேரம் - துருக்கி தர நேரம் - துருக்கி கோடை நேரம் + துருக்கியே நேரம் + துருக்கியே நிலையான நேரம் + துருக்கியே கோடை நேரம் @@ -4747,6 +4792,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ உருகுவே கோடை நேரம் + + + உருமுச்சி நேரம் + + உஸ்பெகிஸ்தான் நேரம் @@ -4811,7 +4861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - யூகோன் நேரம் + யூகோன் நேரம் @@ -4857,30 +4907,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 0ஆ - 0ஆ - 00ஆ - 00ஆ - 000ஆ - 000ஆ - 0மி - 0மி - 00மி - 00மி - 000மி - 000மி - 0பி - 0பி - 00பி - 00பி - 000பி - 000பி - 0டி - 0டி - 00டி - 00டி - 000டி - 000டி + 0K + 0K + 00K + 00K + 000K + 000K + 0M + 0M + 00M + 00M + 000M + 000M + 0B + 0B + 00B + 00B + 000B + 000B + 0T + 0T + 00T + 00T + 000T + 000T @@ -4896,11 +4946,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - ¤#,##,##0.00 - ¤ #,##,##0.00 - #,##,##0.00 - ¤#,##0.00;(¤#,##0.00) ¤ #,##0.00;(¤ #,##0.00) @@ -4909,54 +4954,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ¤0ஆ - ¤ 0ஆ - ¤0ஆ - ¤ 0ஆ - ¤00ஆ - ¤ 00ஆ - ¤00ஆ - ¤ 00ஆ - ¤000ஆ - ¤ 000ஆ - ¤000ஆ - ¤ 000ஆ - ¤0மி - ¤ 0மி - ¤0மி - ¤ 0மி - ¤00மி - ¤ 00மி - ¤00மி - ¤ 00மி - ¤000மி - ¤ 000மி - ¤000மி - ¤ 000மி - ¤0பி - ¤ 0பி - ¤0பி - ¤ 0பி - ¤00பி - ¤ 00பி - ¤00பி - ¤ 00பி - ¤000பி - ¤ 000பி - ¤000பி - ¤ 000பி - ¤0டி - ¤ 0டி - ¤0டி - ¤ 0டி - ¤00டி - ¤ 00டி - ¤00டி - ¤ 00டி - ¤000டி - ¤ 000டி - ¤000டி - ¤ 000டி + ¤0K + ¤ 0K + ¤0K + ¤ 0K + ¤00K + ¤ 00K + ¤00K + ¤ 00K + ¤000K + ¤ 000K + ¤000K + ¤ 000K + ¤0M + ¤ 0M + ¤0M + ¤ 0M + ¤00M + ¤ 00M + ¤00M + ¤ 00M + ¤000M + ¤ 000M + ¤000M + ¤ 000M + ¤0B + ¤ 0B + ¤0B + ¤ 0B + ¤00B + ¤ 00B + ¤00B + ¤ 00B + ¤000B + ¤ 000B + ¤000B + ¤ 000B + ¤0T + ¤ 0T + ¤0T + ¤ 0T + ¤00T + ¤ 00T + ¤00T + ¤ 00T + ¤000T + ¤ 000T + ¤000T + ¤ 000T @@ -5739,9 +5784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிழக்கு கரீபியன் டாலர்கள் - கரீபியன் கில்டர் - கரீபியன் கில்டர் - கரீபியன் கில்டர் + கரீபியன் கில்டர் மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க் @@ -5775,9 +5818,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ஸாம்பியன் குவாச்சாக்கள் - ஜிம்பாப்வே தங்கம் - ஜிம்பாப்வே தங்கம் - ஜிம்பாப்வே தங்கம் + ஜிம்பாப்வே தங்கம் @@ -6085,15 +6126,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} பகுதிகள் - பகுதிகள்/மில்லியன் + பார்ட்ஸ்/மில்லியன் {0} பகுதி/மில்லியன் - {0} பகுதி/மில்லியனில் - {0} பகுதி/மில்லியனை - {0} பகுதி/மில்லியனுக்கு - {0} பகுதிகள்/மில்லியன் - {0} பகுதிகள்/மில்லியனில் - {0} பகுதிகள்/மில்லியனை - {0} பகுதிகள்/மில்லியனுக்கு + {0} பார்ட்ஸ்/மில்லியனில் + {0} பார்ட்ஸ்/மில்லியனை + {0} பார்ட்ஸ்/மில்லியனுக்கு + {0} பார்ட்ஸ்/மில்லியன் + {0} பார்ட்ஸ்/மில்லியனில் + {0} பார்ட்ஸ்/மில்லியனை + {0} பார்ட்ஸ்/மில்லியனுக்கு {0} சதவீதம் @@ -6385,12 +6426,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} நாட்களுக்கு - மணிநேரம் - {0} ம. + {0} மணிநேரம் {0} மணிநேரத்தில் {0} மணிநேரத்தை {0} மணிநேரத்திற்கு - {0} ம. + {0} மணிநேரம் {0} மணிநேரத்தில் {0} மணிநேரத்தை {0} மணிநேரத்திற்கு @@ -6398,7 +6438,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ நிமிடங்கள் - {0} நிமி. + {0} நிமிடம் {0} நிமிடத்தில் {0} நிமிடத்தை {0} நிமிடத்திற்கு @@ -6641,7 +6681,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ அச்சுக்கலை எம் - {0} எம் + {0} em {0} எம்மில் {0} எம்மை {0} எம்முக்கு @@ -7011,7 +7051,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிரைன்கள் - {0} கிரைன் + {0} gr {0} கிரைன்கள் @@ -7543,7 +7583,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கலோரி [IT] {0} கலோரி [IT] - {0} கலோரி-IT + {0} கலோரி [IT] பெக்கொரல் @@ -7561,17 +7601,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} கிரே - கிலோகிராம் விசை - {0} கிலோகிராம் விசை - {0} கிலோகிராம் விசை + கிலோகிராம் விசை + {0} கிலோகிராம் விசை + {0} கிலோகிராம் விசை - டெஸ்லா - {0} டெஸ்லா - {0} டெஸ்லா + டெஸ்லா + {0} டெஸ்லா + {0} டெஸ்லா - வெபர் + வெபர் வெபர் {0} வெபர் @@ -7586,8 +7626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ஒளிவேகத்திற்கு - பார்ட்ஸ்/பில்லியன் - {0} பார்ட்ஸ்/பில்லியன் + {0} ppb {0} பார்ட்ஸ்/பில்லியனில் {0} பார்ட்ஸ்/பில்லியனை {0} பார்ட்ஸ்/பில்லியனுக்கு @@ -7607,7 +7646,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} இரவுகளுக்கு - கார்டினல் திசை + முக்கியத் திசை {0}கிழக்கு {0}வடக்கு {0}தெற்கு @@ -7615,108 +7654,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - டெ.{0} - - - செ.{0} - - - மி.{0} - - - நா.{0} - - - பி.{0} - - - பெ.{0} - - - அட்.{0} - - - ஜெப்.{0} - - - யொ.{0} - - - ரோன்.{0} - - - குவெக்.{0} - - - டெக்.{0} - - - ஹெ.{0} - - - கி.{0} - - - மெ.{0} - - - ஜி.{0} - - - டெரா{0} - - - பெட்.{0} - - - எ.{0} - - - ஜெ.{0} - - - யா.{0} - - - ரோ.{0} - - - கு.{0} - - - கிபி{0} - - - மெபி{0} - - - ஜிபி{0} - - - டெபி{0} - - - பெபி{0} - - - ஈ.{0} - - - சி.{0} - - - யி.{0} - ஜி-ஃபோர்ஸ் - {0} ஜி.ஃபோ. - {0} ஜி.ஃபோ. + {0} G + {0} G - மீ/வி² - {0} மீ/வி² - {0} மீ/வி² + {0} m/s² + {0} m/s² சுழற். @@ -7725,13 +7670,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ரேடி. - {0} ரேடி. - {0} ரேடி. + {0} rad + {0} rad டிகிரி - {0} டிகி. - {0} டிகி. + {0} டிகிரி + {0} டிகிரி ஆர்க்நிமி. @@ -7743,26 +7688,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ஆர்க்விநா. {0} ஆர்க்விநா. - - {0} km² - {0} km² - ஹெக்டேர் - {0} ha - {0} ha மீட்டர்கள்² - {0} m² - {0} m² - {0}/மீ² - செ.மீ.² - {0} செ.மீ.² - {0} செ.மீ.² - {0}/செ.மீ.² + {0} cm² + {0} cm² சதுர மைல்கள் @@ -7776,8 +7710,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ யார்டுகள்² - {0} யா² - {0} யா.² + {0} yd² + {0} yd² சதுர அடி @@ -7786,9 +7720,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ அங்குலங்கள்² - {0} அங்.² - {0} அங்.² - {0}/அங்.² + {0} in² + {0} in² ட்யூனம்ஸ் @@ -7797,18 +7730,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கார. - {0} கார. - {0} கார. + {0} kt + {0} kt - மி.கி./டெ.லி. - {0} மி.கி./டெ.லி. - {0} மி.கி./டெ.லி. + {0} mg/dL + {0} mg/dL - மி.மோ./லி. - {0} மி.மோ./லி. - {0} மி.மோ./லி. + {0} mmol/L + {0} mmol/L உருப்படி @@ -7821,9 +7752,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} பகுதி - ப./மி. - {0} ப./மி. - {0} ப./மி. + பார்ட்ஸ்/மில்லியன் + {0} ppm + {0} ppm சதவீதம் @@ -7845,50 +7776,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} Glc - லி./கி.மீ. - {0} லி./கி.மீ. - {0} லி./கி.மீ. + {0} L/km + {0} L/km - லி./100கி.மீ - {0} லி./100கி.மீ - {0} லி./100கி.மீ + {0} L/100 km + {0} L/100km மை./கே. - {0} மை./கே. - {0} மை./கே. + {0} mpg + {0} mpg மை./இம். கே. - {0} மை./இம். கே. - {0} மை./இம். கே. + {0} mpg Imp. + {0} mpg Imp. டெ.பி. - - கி.பைட் - கி.பிட் - - மெ.பை. - - - மெ.பிட். - - - கி.பை. - கிலோ பிட் பைட் - {0} பை. - {0} பை. + {0} பைட் + {0} பைட் பிட் @@ -7939,7 +7856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ மணிநேரம் {0} ம. {0} ம. - {0} /ம.நே + {0} /ம. நிமி. @@ -7955,63 +7872,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ மில்லிவிநாடி - {0} மி.வி. - {0} மி.வி. + {0} ms + {0} ms μsecs நானோசெகண்டுகள் - {0} நா.செ. - {0} நா.செ. + {0} ns + {0} ns - ஆம்ப். - {0} ஆம். - {0} ஆம். + amps + {0} A + {0} A மில்லி ஆம்ப்ஸ் - {0} மி.ஆ. - {0} மி.ஆ. + {0} mA + {0} mA ஓம்ஸ் வோ. - {0} வோ. - {0} வோ. - - - {0} kcal - {0} kcal + {0} V + {0} V - கலோ. - {0} கலோ. - {0} கலோ. + {0} cal + {0} cal - கலோ. - {0} கலோ. - {0} கலோ. + Cal + {0} Cal + {0} Cal கிலோஜூல் - {0} kJ - {0} kJ ஜூல் - {0} J - {0} J - - - கி.வா-ம.நே. - {0} kWh - {0} kWh எலக்ட்ரான்வோல்ட் @@ -8028,62 +7931,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பவுண்ட் விசை - {0} ப.வி - {0} ப.வி + {0} lbf + {0} lbf நியூட்டன் - {0} N - {0} N - கி.வா-ம.நே./100கி.மி. - {0} கி.வா-ம.நே./100கி.மி. - {0} கி.வா-ம.நே./100கி.மி. - - - {0} GHz - {0} GHz - - - {0} MHz - {0} MHz - - - {0} kHz - {0} kHz - - - {0} Hz - {0} Hz + {0} kWh/100km + {0} kWh/100km - எம் - {0} எம் - {0} எம் + {0} em + {0} em பிக் - {0} பிக் - {0} பிக் + {0} px + {0} px மெகாபிக்சல்கள் - {0} MP - {0} MP - - - {0} ppcm - {0} ppcm - - - {0} ppi - {0} ppi - பு / செ.மீ - {0} பு / செ.மீ - {0} பு / செ.மீ + dpcm + {0} dpcm + {0} dpcm dpi @@ -8096,56 +7969,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} புள்ளி - கி.மீ. - {0} கி.மீ. - {0} கி.மீ. - {0}/கி.மீ. + {0} km + {0} km - மீ. - {0} மீ. - {0} மீ. - {0}/மீ. + m + {0} m + {0} m - டெ.மீ - {0} டெ.மீ - {0} டெ.மீ + {0} dm + {0} dm - செ.மீ. - {0} செ.மீ. - {0} செ.மீ. - {0}/செ.மீ. + {0} cm + {0} cm - மி.மீ. - {0} மி.மீ. - {0} மி.மீ. - - - {0} μm - {0} μm + {0} mm + {0} mm - நா.மீ. - {0} நா.மீ. - {0} நா.மீ. + {0} nm + {0} nm - பை.மீ - {0} பை.மீ. - {0} பை.மீ. + {0} pm + {0} pm மைல்கள் - {0} mi - {0} mi கெஜ. - {0} கெஜ. - {0} கெஜ. + {0} yd + {0} yd அடி @@ -8155,21 +8013,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ அங்குலங்கள் - {0}/அங். பு.நொ. - {0} pc - {0} pc ஒளி ஆண்டுகள் - {0} ஒ.ஆ. - {0} ஒ.ஆ. - - - {0} au - {0} au + {0} ly + {0} ly பர் @@ -8181,63 +8032,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ஃபே. {0} ஃபே. - - {0} nmi - {0} nmi - - ஸ்.மை. - {0} ஸ்.மை. - {0} ஸ்.மை. + {0} smi + {0} smi - அ.பு. - {0} அ.பு. - {0} அ.பு. + {0} pt + {0} pt சூரிய ஆரம் லக்ஸ் - {0} லக். - {0} லக். + {0} lx + {0} lx கேண்ட. - {0} கே. - {0} கே. + {0} cd + {0} cd - லூம. - {0} lm - {0} lm + லூமன் சூரிய ஒளிர்வுத்தன்மை - ட. - {0} ட. - {0} ட. - - - {0} kg - {0} kg + {0} t + {0} t கிராம்கள் - {0} கி. - {0} கி. - {0}/கி. - - - {0} mg - {0} mg - - - {0} μg - {0} μg + {0} g + {0} g டன் @@ -8250,30 +8079,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ஸ்டோ. - பவு. + பவுண்டுகள் {0} lb - {0} பவு. - - - அவு. - {0} oz - {0} oz - {0}/அவு. + {0} lb அவு. டி. - {0} அவு. டி. - {0} அவு. டி. + {0} oz t + {0} oz t கேர. - {0} கேர. - {0} கேர. + {0} CD + {0} CD டால்ட்டன்ஸ் - {0} டா. - {0} டா. + {0} Da + {0} Da புவித் திணிவுகள் @@ -8283,190 +8106,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ கிரைன் - {0} கிரைன் - {0} கிரைன் - - - {0} GW - {0} GW - - - {0} MW - {0} MW - - - {0} kW - {0} kW + {0} gr + {0} gr வா. - {0} W - {0} W - - - {0} mW - {0} mW - - - {0} hp - {0} hp mmHg {0} mmHg {0} mmHg - - {0} inHg - {0} inHg - பார் {0} பார் {0} பார் - - மி.பா. - {0} mbar - {0} mbar - - - {0} Pa - {0} Pa - - - {0} hPa - {0} hPa - - - {0} kPa - {0} kPa - - - {0} MPa - {0} MPa - கி.மீ./மணிநேரம் - {0} கி.மீ./ம.நே. - {0} கி.மீ./ம.நே. + {0} km/h + {0} km/h - மீ/வி - {0} மீ/வி - {0} மீ/வி + {0} m/s + {0} m/s - மை/ம.நே. - {0} மை/ம.நே. - {0} மை/ம.நே. + {0} mph + {0} mph - நா. - {0} நா. - {0} நா. - - - B {0} - B {0} - - - {0}°C - {0}°C - - - {0}°F - {0}°F - - - {0} K - {0} K + {0} kn + {0} kn - ப.அடி - {0} ப.அடி - {0} ப.அடி - - - {0} N⋅m - {0} N⋅m + {0} lbf⋅ft + {0} lbf⋅ft - கிமீ³ - {0} கிமீ³ - {0} கிமீ³ + {0} km³ + {0} km³ - மீ³ - {0} மீ³ - {0} மீ³ - {0}/மீ³ + {0} m³ + {0} m³ - செ.மீ.³ - {0} செ.மீ.³ - {0} செ.மீ.³ - {0}/செ.மீ.³ - - - {0} mi³ - {0} mi³ + {0} cm³ + {0} cm³ - யா.³ - {0} யா.³ - {0} யா.³ + {0} yd³ + {0} yd³ அடி³ - {0} அடி³ - {0} அடி³ + {0} ft³ + {0} ft³ - அங்.³ - {0} அங்.³ - {0} அங்.³ + {0} in³ + {0} in³ - மெ.லி. - {0} மெ.லி. - {0} மெ.லி. + {0} ML + {0} ML - ஹெ.லி. - {0} ஹெ.லி. - {0} ஹெ.லி. + {0} hL + {0} hL லிட்டர்கள் - {0} லி. - {0} லி. - {0}/லி. + {0} L + {0} L + {0}/L - டெ.லி. - {0} டெ.லி. - {0} டெ.லி. + {0} dL + {0} dL - செ.லி. - {0} செ.லி. - {0} செ.லி. + {0} cL + {0} cL - மிலி - {0} மிலி - {0} மிலி - - - மெ.பி. - {0} மெ.பி. - {0} மெ.பி. - - - மெ.கோப்பை - {0} mc - {0} mc + {0} mL + {0} mL ஏக். அடி @@ -8491,9 +8217,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/கேல. இம். - குவாட். - {0} குவாட். - {0} குவாட். + {0} qt + {0} qt பின்ட்கள் @@ -8506,7 +8231,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} கோ. - தி. அவு. + fl oz {0} தி. அவு. {0} தி. அவு. @@ -8516,24 +8241,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} தி. அவு. இம்பீ. - மே.க. - {0} மே.க. - {0} மே.க. + Tbsp + {0} Tbsp + {0} Tbsp - தே.க. - {0} தே.க. - {0} தே.க. + {0} tsp + {0} tsp பீப்பாய் - {0} பீப். - {0} பீப். + {0} bbl + {0} bbl இ.க. - {0} இ.க. - {0} இ.க. + {0} dsp + {0} dsp இ.க. இம்பீ. @@ -8566,7 +8290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} குவாட். இம்பீ. - கட் {0} kat {0} kat @@ -8582,14 +8305,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பார்ட்ஸ்/பில்லியன் - {0} பார்ட்ஸ்/பில்லியன் - {0} ppb - இரவுகள் + இரவுகள் {0} இரவு {0} இரவுகள் - {0}/இரவு + {0}/இரவு திசை @@ -8600,23 +8321,117 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - மை.{0} + + d{0} + + + c{0} + + + m{0} + + + n{0} + + + p{0} + + + f{0} + + + a{0} + + z{0} + + + y{0} + + + r{0} + + + q{0} + + + da{0} + + + h{0} + + + k{0} + + + M{0} + + + G{0} + + + T{0} + + + P{0} + + + E{0} + + + Z{0} + + + Y{0} + + + R{0} + + + Q{0} + + + Ki{0} + + + Mi{0} + + + Gi{0} + + + Ti{0} + + + Pi{0} + + + Ei{0} + + + Zi{0} + + + Yi{0} + + + {0}G + {0}Gs + - {0}மீ/வி² - {0}மீ/வி² + m/s² + {0}m/s² + {0}m/s² {0}சுழற். {0}சுழற். - {0}ரேடி. - {0}ரேடி. + {0}rad + {0}rad - டிகி. {0}° {0}° @@ -8628,34 +8443,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}″ {0}″ - - km² - {0} km² - {0} km² - {0}/km² - - - {0} ha - {0} ha - - {0} m² - {0} m² + {0}/m² - {0}செ.மீ.² - {0}செ.மீ.² + cm² + {0}cm² + {0}cm² + {0}/cm² mi² {0} mi² {0} mi² - {0}/mi² - யா² - {0}யா² - {0}யா² + yd² + {0}yd² + {0}yd² ft² @@ -8663,9 +8468,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ft² - அங்.² + in² {0} in² {0} in² + {0}/in² ட்யூனம் @@ -8674,29 +8480,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ காரட் - {0}கார. - {0}கார. + {0}kt + {0}kt - {0}மிகி/டெ - {0}மிகி/டெ + mg/dL + {0}mg/dL + {0}mg/dL - {0}மிமோ/லி - {0}மிமோ/லி + mmol/L + {0}mmol/L + {0}mmol/L {0}உருப்படி {0}உருப்படி - பகுதி {0} பகுதி {0} பகுதி - {0}ப./மி. - {0}ப./மி. + ppm + {0}ppm + {0}ppm % @@ -8712,19 +8520,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}மோல் - Glc + {0} Glc + {0} Glc - {0}லி./கி.மீ. - {0}லி./கி.மீ. + L/km + {0}L/km + {0}L/km - {0}லி./100கி.மீ - {0}லி./100கி.மீ + L/100km + {0}L/100km + {0}L/100km - {0}மை./கே. - {0}மை./கே. + mpg + {0}mpg + {0}mpg mpg UK @@ -8776,8 +8588,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ பை. - {0}பை. - {0}பை. + {0}B + {0}B {0}பிட் @@ -8819,15 +8631,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} நா - மணிநேரம் - {0} ம.நே. - {0} ம.நே. + {0}ம. + {0}ம. + {0} /ம. - நிமி. - {0} நிமி. - {0} நிமி. - {0}/நிமி. + {0}நி. + {0}நி. வி. @@ -8836,25 +8646,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ மி.வி. + {0}ms + {0}ms - மை.விநா. {0}μs {0}μs - நா.செ. - {0}நா.செ. - {0}நா.செ. + ns + {0} ns + {0} ns - {0}ஆம். - {0}ஆம். + amp + {0}A + {0}A mA - {0}மி.ஆ. - {0}மி.ஆ. + {0}mA + {0}mA ஓம் @@ -8863,35 +8675,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ வோல்ட் - {0}வோ. - {0}வோ. - - - kcal - {0} kcal - {0} kcal + {0}V + {0}V - {0}கலோ. - {0}கலோ. + cal + {0}cal + {0}cal - {0}கலோ. - {0}கலோ. + Cal + {0}Cal + {0}Cal kJ - {0} kJ - {0} kJ - - - {0} J - {0} J kWh - {0} kWh - {0} kWh eV @@ -8907,9 +8708,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}யூஎஸ் தெ. - ப.வி - {0}ப.வி - {0}ப.வி + lbf + {0}lbf + {0}lbf N @@ -8917,61 +8718,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}N - கி.வா.ம./100கி.மி. - {0}கி.வா.ம./100கி.மி. - {0}கி.வா.ம./100கி.மி. - - - GHz - {0} GHz - {0} GHz - - - MHz - {0} MHz - {0} MHz - - - kHz - {0} kHz - {0} kHz - - - Hz - {0} Hz - {0} Hz + kWh/100km + {0}kWh/100km + {0}kWh/100km - {0}எம் - {0}எம் + em + {0}em + {0}em - {0}பிக் - {0}பிக் + px + {0}px + {0}px MP - {0} MP - {0} MP - - - ppcm - {0} ppcm - {0} ppcm - - - ppi - {0} ppi - {0} ppi - {0}பு/செ.மீ - {0}பு/செ.மீ - - - dpi - {0} dpi - {0} dpi + dpcm + {0}dpcm + {0}dpcm {0}புள்ளி @@ -8982,51 +8749,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}R⊕ - {0}கி.மீ. - {0}கி.மீ. + km + {0} km + {0}km + {0}/km - {0}மீ. - {0}மீ. + m + {0}m + {0}m + {0}/m + + + dm + {0} dm + {0} dm - {0}செ.மீ. - {0}செ.மீ. + cm + {0}cm + {0}cm + {0}/cm - {0}மி.மீ. - {0}மி.மீ. - - - μm - {0} μm - {0} μm + mm + {0}mm + {0}mm - {0}நா.மீ. - {0}நா.மீ. + nm + {0}nm + {0}nm + + + pm + {0}pm + {0}pm mi - {0} mi - {0} mi + + + yd + {0}yd + {0}yd + + + {0}′ + {0}′ - அங். + in {0}″ {0}″ - - - {0} pc - {0} pc + {0}/in - ஒ.ஆ. - - - au - {0} au - {0} au + ly + {0}ly + {0}ly {0}பர் @@ -9036,14 +8817,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ஃபே. {0}ஃபே. - - nmi - {0} nmi - {0} nmi + + smi + {0}smi + {0}smi - {0}அ.பு. - {0}அ.பு. + pts + {0}pt + {0}pt R☉ @@ -9052,16 +8834,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ லக். - {0}லக். - {0}லக். + {0}lx + {0}lx - கே. + cd + {0}cd + {0}cd lm - {0} lm - {0} lm L☉ @@ -9069,27 +8851,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}L☉ - {0}ட. - {0}ட. + t + {0}t + {0}t - kg - {0}கி.கி. - {0}கி.கி. - {0}/kg + {0}kg + {0}kg கிராம் - - - mg - {0} mg - {0} mg - - - μg - {0} μg - {0} μg + {0}g + {0}g + {0}/g {0}டன் @@ -9097,24 +8871,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ lb - {0}/lb - {0} oz - {0} oz + oz + {0}/oz - {0}அவு. டி. - {0}அவு. டி. + oz t + {0}oz t + {0}oz t - {0}கேர. - {0}கேர. + {0}CD + {0}CD - டா. - {0}டா. - {0}டா. + Da + {0}Da + {0}Da M⊕ @@ -9127,45 +8901,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}M☉ - {0}கிரைன் - {0}கிரைன் - - - GW - {0} GW - {0} GW - - - MW - {0} MW - {0} MW - - - kW - {0} kW - {0} kW - - - {0} W - {0} W - - - mW - {0} mW - {0} mW - - - hp - {0} hp - {0} hp - - - mmHg - {0} mmHg - {0} mmHg + gr + {0}gr + {0}gr - பா. அங். + ″ Hg {0}″ Hg {0}″ Hg @@ -9174,6 +8915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}பார் + mbar {0} mb {0} mb @@ -9181,125 +8923,108 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}atm {0}atm - - Pa - {0} Pa - {0} Pa - - - hPa - {0} hPa - {0} hPa - - - kPa - {0} kPa - {0} kPa - - - MPa - {0} MPa - {0} MPa - - கி.மீ./ம. - {0}கி.மீ./ம. - {0}கி.மீ./ம. + km/hr + {0}km/h + {0}km/h - - {0}நா. - {0}நா. + + m/s + {0}m/s + {0}m/s - - Bft - B {0} - B {0} + + mi/hr + {0}mph + {0}mph - - °C - {0}°C - {0}°C + + kn + {0}kn + {0}kn - °F {0}° {0}° - - K - {0} K - {0} K - - {0}ப.அடி - {0}ப.அடி + lbf⋅ft + {0}lbf⋅ft + {0}lbf⋅ft - N⋅m {0}N⋅m {0}N⋅m - {0} க.கி.மீ. - {0} க.கி.மீ. + km³ + {0}km³ + {0}km³ - {0}மீ³ - {0}மீ³ + m³ + {0}m³ + {0}m³ + {0}/m³ - {0}செ.மீ.³ - {0}செ.மீ.³ - - - mi³ - {0} mi³ - {0} mi³ + cm³ + {0}cm³ + {0}cm³ + {0}/cm³ - {0}யா.³ - {0}யா.³ + yd³ + {0}yd³ + {0}yd³ - {0}அடி³ - {0}அடி³ + ft³ + {0}ft³ + {0}ft³ - {0}அங்.³ - {0}அங்.³ + in³ + {0}in³ + {0}in³ - {0}மெ.லி. - {0}மெ.லி. + ML + {0}ML + {0}ML - {0}ஹெ.லி. - {0}ஹெ.லி. + hL + {0}hL + {0}hL லி. - {0}லி. - {0}லி. + {0}L + {0}L + {0}/L - {0}டெ.லி. - {0}டெ.லி. + dL + {0}dL + {0}dL - {0}செ.லி. - {0}செ.லி. + cL + {0}cL + {0}cL - {0}மிலி - {0}மிலி + mL + {0}mL + {0}mL - {0}மெ.பி. - {0}மெ.பி. + {0}mpt + {0}mpt - {0} mc - {0} mc + mcup {0}ஏக். அடி @@ -9319,8 +9044,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}கே.இம். - {0}குவா. - {0}குவா. + qt + {0}qt + {0}qt பின். @@ -9332,6 +9058,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}கோ. + fl oz {0}தி.அவு. {0}தி.அவு. @@ -9340,21 +9067,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}தி. அ. இ. - {0}மே.க. - {0}மே.க. + Tbsp + {0}Tbsp + {0}Tbsp - {0}தே.க. - {0}தே.க. + tsp + {0}tsp + {0}tsp - பீப். - {0}பீப். - {0}பீப். + bbl + {0}bbl + {0}bbl - {0}இ.க. - {0}இ.க. + dsp + {0}dsp + {0}dsp {0}இ.க. இ. @@ -9382,23 +9112,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}கு. இம். - கட் + kat + {0} kat + {0} kat - கலோரி-IT + {0} cal-IT + {0} cal-IT {0}ஒ.வே {0}ஒ.வே - பா/பி - {0} பா/பி - {0} பா/பி + ppb + {0}ppb + {0}ppb - {0} இ - {0} இ + {0}இரவு + {0}இரவுகள் diff --git a/make/data/cldr/common/main/te.xml b/make/data/cldr/common/main/te.xml index 5e4f3ebc9102..9dbc9e3faf97 100644 --- a/make/data/cldr/common/main/te.xml +++ b/make/data/cldr/common/main/te.xml @@ -68,7 +68,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ బికోల్ బిని సిక్సికా - అని + అనీ బంబారా బంగ్లా టిబెటన్ @@ -308,7 +308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ లేజ్ఘియన్ గాండా లిమ్బర్గిష్ - లిగూరియన్ + లిగ్యూరియన్ లిలూయెట్ లకొటా లొంబార్ద్ @@ -422,6 +422,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ పాలీ పిజిన్ పోలిష్ + పీడ్మాంటీస్ పోహ్న్పెయన్ మలిసీట్-పస్సమాక్వొడ్డీ ప్రష్యన్ @@ -469,7 +470,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ సేర్బో-క్రొయేషియన్ టాచెల్‌హిట్ షాన్ - సింహళం + సింహళ సిడామో స్లోవక్ స్లోవేనియన్ @@ -567,7 +568,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ వు చైనీస్ కల్మిక్ షోసా - కాంగ్‌డీ + కాంగ్రీ సొగా యాయే యాపిస్ @@ -986,7 +987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ సింగపూర్ సెయింట్ హెలెనా స్లోవేనియా - స్వాల్‌బార్డ్ మరియు జాన్ మాయెన్ + స్వాల్‌బార్డ్ & జాన్ మాయెన్ స్లొవేకియా సియెర్రా లియాన్ శాన్ మారినో @@ -1071,31 +1072,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ క్రమబద్ధీకరణ క్రమం సాధారణీకరించిన క్రమబద్ధీకరణ సంఖ్యాత్మక క్రమబద్ధీకరణ + లిపి/బ్లాక్ క్రమపరచడం క్రమబద్ధీకరణ సామర్థ్యం కరెన్సీ - ఎమోజీ ప్రెజెంటేషన్ + మార్పిడి గమ్యం + డిక్షనరీ బ్రేక్ మినహాయింపులు + ఎమోజీ ప్రెజెంటేషన్ + వారంలో మొదటి రోజు + మిళితం గంటల పద్ధతి (12 వర్సెస్ 24) - లైన్ బ్రేక్ శైలి - పదాల మధ్య లైన్ బ్రేక్స్ + ఇన్‌పుట్ పద్ధతి + కీబోర్డ్ + ఎక్కువగా విస్మరించబడేవి + CJK లైన్ బ్రేక్ + పదాల మధ్య లైన్ బ్రేక్స్ + రూపాంతర నియమాలు కొలమాన పద్ధతి + కొలమాన యూనిట్ సంఖ్యలు - సంక్షిప్తీకరణ తర్వాత వాక్య విరామం + అనుబంధ డేటా కోసం ప్రాంతం + రూపాంతర మూలం + ప్రాంత ఉపవిభాగం + సంక్షిప్తీకరణ తర్వాత వాక్య విరామం + రూపాంతరం + యంత్ర అనువాదం సమయ మండలి లొకేల్ రూపాంతరం ప్రైవేట్-ఉపయోగం + ప్రైవేట్ ఉపయోగ రూపాంతరం - బుద్ధుల క్యాలెండర్‌ - బుద్ధులు + బుద్ధుల క్యాలెండర్ + బుద్ధులు చైనీస్ క్యాలెండర్ చైనీస్ కాప్టిక్ క్యాలెండర్ కాప్టిక్ దాంగీ క్యాలెండర్ దాంగీ - ఇథియోపియన్ క్యాలెండర్ + ఇథియోపిక్ క్యాలెండర్ ఇథియోపిక్ - ఇథియోపియన్ అమెటె ఆలెమ్ క్యాలెండర్ + ఇథియోపిక్ అమెటె ఆలెమ్ క్యాలెండర్ ఇథియోపిక్ అమటే ఆలెమ్ గ్రేగోరియన్ క్యాలెండర్ గ్రేగోరియన్ @@ -1104,20 +1121,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ భారతదేశ జాతీయ క్యాలెండర్ భారతదేశ జాతీయం ఇస్లామిక్ క్యాలెండర్ - ఇస్లామిక్ + ఇస్లామిక్ ఇస్లామిక్-సివిల్ క్యాలెండర్ - ఇస్లామిక్ (సివిల్) + ఇస్లామిక్ (సివిల్) ఇస్లామిక్ క్యాలెండర్ (సౌదీ అరేబియా) + ఇస్లామిక్, సౌదీ అరేబియా చంద్ర దర్శనం ప్రకారం ఇస్లామిక్ క్యాలెండర్ + ఇస్లామిక్ (ఖగోళ) ఇస్లామిక్ క్యాలెండర్ (ఉమ్ అల్-ఖురా) - ఇస్లామిక్ (ఉమ్ అల్-ఖురా) + ఇస్లామిక్ (ఉమ్ అల్-ఖురా) ISO-8601 క్యాలెండర్ + గ్రెగోరియన్ జపనీస్ క్యాలెండర్ జపనీస్ పర్షియన్ క్యాలెండర్ పర్షియన్ - మింగ్యూ క్యాలెండర్ - మీన్‌గ్వా + మింగ్వో క్యాలెండర్ + మింగ్వో అకౌంటింగ్ కరెన్సీ ఫార్మాట్ అకౌంటింగ్ ప్రామాణిక కరెన్సీ ఫార్మాట్ @@ -1127,59 +1147,92 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ఉచ్ఛారణలను సాధారణంగా క్రమబద్ధీకరించు ఉచ్ఛారణలను వ్యతిరేక క్రమంలో క్రమబద్ధీకరించు ముందు లోయర్‌కేస్‌ని క్రమబద్ధీకరించు + లోయర్ కేస్ సాధారణ కేస్ క్రమాన్ని క్రమబద్ధీకరించు + లోయర్ కేస్ ముందు అప్పర్‌కేస్‌ని క్రమబద్ధీకరించు + అప్పర్ కేస్ కేస్ ఇన్‌సెన్సిటివ్‌ను క్రమబద్ధీకరించు కేస్ సెన్సిటివ్‌ని క్రమబద్ధీకరించు మునుపటి క్రమబద్ధీకరణ క్రమం, అనుకూలం + అనుకూలత నిఘంటువు క్రమబద్ధీకరణ క్రమం + డిక్షనరీ డిఫాల్ట్ యూనీకోడ్ క్రమబద్ధీకరణ క్రమం - డిఫాల్ట్ యూనికోడ్ + డిఫాల్ట్ యూనికోడ్ + ఎమోజీ యురోపియన్ క్రమబద్ధీకరణ నిబంధనలు + ఐరోపా నియమాలు ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం + ఫోన్‌బుక్ ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం + ఫొనెటిక్ పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం + పిన్యిన్ సాధారణ-ప్రయోజన శోధన శోధన హాంగుల్ ప్రారంభ హల్లు ద్వారా శోధించు + కొరియన్ ప్రారంభ హల్లు ప్రామాణిక క్రమబద్ధీకరణ క్రమం ప్రామాణికం స్ట్రోక్ క్రమబద్ధీకరణ క్రమం + స్ట్రోక్ సాంప్రదాయ క్రమబద్ధీకరణ క్రమం + సాంప్రదాయ రాడికల్-స్ట్రోక్ క్రమబద్ధీకరణ క్రమం + రాడికల్-స్ట్రోక్ + జూయిన్ సాధారణీకరణ చేయకుండా క్రమబద్ధీకరించు సాధారణీకరించిన యూనికోడ్‌ని క్రమబద్ధీకరించు అంకెలను ఒక్కొక్కటిగా క్రమబద్ధీకరించు అంకెలను సంఖ్యాత్మకంగా క్రమబద్ధీకరించు + కరెన్సీ + అంకెలు + విరామ చిహ్నాలు + వైట్ స్పేస్ + చిహ్నం అన్నింటినీ క్రమబద్ధీకరించు + అన్నీ ప్రాథమిక అక్షరాలను మాత్రమే క్రమబద్ధీకరించు + మూల అక్షరాలు మాత్రమే ఉచ్ఛారణలు/కేస్‌/వెడల్పు/కానాను క్రమబద్ధీకరించు + మూలం, ఉచ్చారణ గుర్తులు, కేస్, వేరియంట్‌లు, కనా ఉచ్ఛారణలని క్రమబద్ధీకరించు + మూలం, ఉచ్చారణ గుర్తులు ఉచ్ఛారణలని/కేస్‌ని/వెడల్పుని క్రమబద్ధీకరించు - పూర్తి వెడల్పు - సగం వెడల్పు + మూలం, ఉచ్చారణ గుర్తులు, కేస్, వేరియంట్‌లు + పూర్తి వెడల్పుకు + సగం వెడల్పుకు సంఖ్య - డిఫాల్ట్ + డిఫాల్ట్ ఎమోజీ టెక్స్ట్ + 12 గంటల పద్ధతి + 12 + 24 గంటల పద్ధతి + 24 12 గంటల పద్ధతి (0–11) - 12 (0–11) + 12 (0–11) 12 గంటల పద్ధతి (1–12) - 12 (1–12) + 12 (1–12) 24 గంటల పద్ధతి (0–23) - 24 (0–23) + 24 (0–23) 24 గంటల పద్ధతి (1–24) - 24 (1–24) + 24 (1–24) + షిఫ్ట్ ఖాళీలు, విరామ చిహ్నాలు, అన్ని చిహ్నాలు + షిఫ్ట్ ఖాళీలు, విరామ చిహ్నాలు + షిఫ్ట్ ఖాళీలు, విరామ చిహ్నాలు + షిఫ్ట్ ఖాళీలు, విరామ చిహ్నాలు, కరెన్సీ కాని చిహ్నాలు అపక్రమ లైన్ బ్రేక్ శైలి - అపక్రమం + అపక్రమం సాధారణ లైన్ బ్రేక్ శైలి - సాధారణం + సాధారణం క్రమ లైన్ బ్రేక్ శైలి - క్రమం - మొత్తం విభజించండి - మొత్తం అలాగే ఉంచండి - సాధారణం - పదబంధాలలో అలాగే ఉంచండి + క్రమం + మొత్తం విభజించండి + మొత్తం అలాగే ఉంచండి + సాధారణం + పదబంధాలలో అలాగే ఉంచండి US BGN ట్రాన్స్‌లిటరేషన్ UN GEGN ట్రాన్స్‌లిటరేషన్ మెట్రిక్ పద్ధతి @@ -1190,51 +1243,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ US అరబిక్-ఇండిక్ అంకెలు పొడిగించబడిన అరబిక్-ఇండిక్ అంకెలు + పొడిగించిన అరబిక్-ఇండిక్ ఆర్మేనియన్ సంఖ్యలు ఆర్మేనియన్ చిన్నబడి సంఖ్యలు + ఆర్మీనియన్ లోయర్‌కేస్ బెంగాలీ అంకెలు చాక్మా అంకెలు దేవనాగరి అంకెలు ఎథియోపిక్ సంఖ్యలు ఆర్థిక సంఖ్యలు + ఆర్థికం పూర్తి వెడల్పు అంకెలు + పూర్తి వెడల్పు జార్జియన్ సంఖ్యలు గ్రీక్ సంఖ్యలు గ్రీక్ చిన్నబడి సంఖ్యలు + గ్రీక్ లోయర్‌కేస్ గుజరాతీ అంకెలు గుర్ముఖీ అంకెలు + సాంప్రదాయ క్యాలెండర్‌ల కోసం హాన్-అక్షర తేదీ సంఖ్యీకరణ చైనీయుల దశాంశ సంఖ్యలు + చైనీస్ సంఖ్యా చిహ్నాలను అంకెలుగా ఉపయోగించే స్థాన విలువ దశాంశ విధానం సరళీకృత చైనీయుల సంఖ్యలు సరళీకృత చైనీయుల ఆర్థిక సంఖ్యలు + సరళీకృత చైనీస్ ఆర్థికం సాంప్రదాయ చైనీయుల సంఖ్యలు సాంప్రదాయ చైనీయుల ఆర్థిక సంఖ్యలు + సాంప్రదాయ చైనీస్ ఆర్థికం హిబ్రూ సంఖ్యలు జవానీస్ అంకెలు జపానీయుల సంఖ్యలు జపానీయలు ఆర్థిక సంఖ్యలు + జపనీస్ ఆర్థికం + జపనీస్ మొదటి సంవత్సరం గన్నెన్ సంఖ్యీకరణ ఖ్మేర్ అంకెలు కన్నడ అంకెలు + తై థామ్ థామ్ (మతపరం) లావో అంకెలు పశ్చిమ అంకెలు + గణిత బోల్డ్ + గణిత డబుల్-స్ట్రక్ + గణిత మోనోస్పేస్ + గణిత శాన్స్-సెరిఫ్ బోల్డ్ + గణిత శాన్స్-సెరిఫ్ మలయాళం అంకెలు మంగోలియన్ అంకెలు మేటి మయెక్ అంకెలు మయన్మార్ అంకెలు + మ్యాన్మార్ తూర్పు ప్వో కరెన్ + మ్యాన్మార్ ప్వో + మ్యాన్మార్ షాన్ + మ్యాన్మార్ తై లైంగ్ స్థానిక అంకెలు + స్థానిక అంకెలు ఓల్ చికి అంకెలు ఒరియా అంకెలు + ఔట్‌లైన్డ్ రోమన్ సంఖ్యలు + రోమన్ అప్పర్‌కేస్ రోమన్ చిన్నబడి సంఖ్యలు + రోమన్ లోయర్‌కేస్ + విభజన సాంప్రదాయ తమిళ సంఖ్యలు తమిళ అంకెలు + ఆధునిక తమిళం తెలుగు అంకెలు థాయ్ అంకెలు - టిబిటన్ అంకెలు + టిబెటన్ అంకెలు సాంప్రదాయ సంఖ్యలు + సాంప్రదాయ సంఖ్యలు వాయ్ అంకెలు ఆఫ్ ఆన్ + పేర్కొనబడని యంత్ర అనువాదం + POSIX వేరియంట్ + + ఆఫ్ + ఆన్ + దశాంశం యుకె @@ -1266,6 +1353,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + dd/MM/r + + + + + + dd/MM/r + + + @@ -1287,6 +1388,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + dd/MM/r + + + + + + dd/MM/r + + + @@ -1327,11 +1442,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - dd-MM-y GGGGG + G y/M/d + + / + {1} {0} @@ -1392,6 +1510,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0} – {1} B h – B h @@ -1614,7 +1735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - dd-MM-yy + d/M/yy yyMMdd @@ -1646,6 +1767,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -1701,6 +1825,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d, MMM y d MMM, y, E MMMM y + d, MMMM y + d MMMM, y, EEE QQQ y QQQQ y Yలో wవ వారం @@ -1891,6 +2017,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + + y MMMM d, EEEE + + + + + y MMMM d + + + + + y MMM d + + + + + y/MM/dd + + + + + + y/MM/dd + + + @@ -2041,21 +2196,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} రోజుల క్రితం - - రోజు - - - రోజు - సంవత్సరంలో రోజు - - సంవత్సరంలో రోజు - - - సంవత్సరంలో రోజు - వారంలో రోజు @@ -2848,9 +2991,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ లెబర్విల్లే - - బ్రిటీష్ వేసవి సమయం - లండన్ @@ -2941,9 +3081,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ జయపుర - - ఐరిష్ ప్రామాణిక సమయం - డబ్లిన్ @@ -3235,7 +3372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ తహితి - మార్క్వేసాస్ + మార్క్వేసాస్ దీవులు గాంబియేర్ @@ -3259,7 +3396,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ మికెలాన్ - పిట్‌కైర్న్ + పిట్‌కైర్న్ దీవులు ప్యూర్టో రికో @@ -3678,13 +3815,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ అలాస్కా పగటి వెలుతురు సమయం - - - అల్మాటి సమయం - అల్మాటి ప్రామాణిక సమయం - అల్మాటి వేసవి సమయం - - అమెజాన్ సమయం @@ -3729,23 +3859,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - సమోవా సమయం - సమోవా ప్రామాణిక సమయం - సమోవా పగటి వెలుతురు సమయం - - - - - అక్వాటు సమయం - అక్వాటు ప్రామాణిక సమయం - అక్వాటు వేసవి సమయం - - - - - అక్టోబె సమయం - అక్టోబె ప్రామాణిక సమయం - అక్టోబె వేసవి సమయం + పశ్చిమ సమోవా సమయం + పశ్చిమ సమోవా ప్రామాణిక సమయం + పశ్చిమ సమోవా పగటి వెలుతురు సమయం @@ -3849,6 +3965,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ బ్రెజిలియా వేసవి సమయం + + + బ్రిటిష్ సమయం + బ్రిటీష్ వేసవి సమయం + + బ్రూనై దారుసలామ్ సమయం @@ -3908,7 +4030,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ కుక్ దీవుల సమయం కుక్ దీవుల ప్రామాణిక సమయం - కుక్ దీవుల అర్ధ వేసవి సమయం + కుక్ దీవుల వేసవి సమయం @@ -4022,6 +4144,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ గ్రీన్‌విచ్ సగటు సమయం + + + గ్రీన్‌ల్యాండ్ సమయం + గ్రీన్‌ల్యాండ్ ప్రామాణిక సమయం + గ్రీన్‌ల్యాండ్ వేసవి సమయం + + తూర్పు గ్రీన్‌ల్యాండ్ సమయం @@ -4036,11 +4165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ పశ్చిమ గ్రీన్‌ల్యాండ్ వేసవి సమయం - - - గ్వామ్ ప్రామాణిక సమయం - - గల్ఫ్ ప్రామాణిక సమయం @@ -4053,7 +4177,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - హవాయ్-అల్యూషియన్ ప్రామాణిక సమయం + హవాయి సమయం @@ -4117,6 +4241,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ఇరాన్ పగటి వెలుతురు సమయం + + + ఐరిష్ సమయం + ఐరిష్ ప్రామాణిక సమయం + + ఇర్కుట్స్క్ సమయం @@ -4140,9 +4270,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - పెట్రోపావ్లోవ్స్క్-కామ్ఛాట్స్కి సమయం - పెట్రోపావ్లోవ్స్క్-కామ్ఛాట్స్కి ప్రామాణిక సమయం - పెట్రోపావ్లోవ్స్క్-కామ్ఛాట్స్కి వేసవి సమయం + క్యామ్‌చ్యట్కా సమయం + క్యామ్‌చ్యట్కా ప్రామాణిక సమయం + క్యామ్‌చ్యట్కా వేసవి సమయం @@ -4184,11 +4314,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ కిర్గిస్తాన్ సమయం - - - లంకా సమయం - - లైన్ దీవుల సమయం @@ -4201,13 +4326,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ లార్డ్ హోవ్ పగటి వెలుతురు సమయం - - - మకావ్ సమయం - మకావ్ ప్రామాణిక సమయం - మకావ్ వేసవి సమయం - - మగడాన్ సమయం @@ -4323,11 +4441,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ఫెర్నాండో డి నొరోన్హా వేసవి సమయం - - - ఉత్తర మారియానా దీవుల సమయం - - నోవోసిబిర్స్క్ సమయం @@ -4407,13 +4520,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ఉత్తర కొరియా సమయం - - - కిజిలోర్డా సమయం - కిజిలోర్డా ప్రామాణిక సమయం - కిజిలోర్డా వేసవి సమయం - - రీయూనియన్ సమయం @@ -4440,9 +4546,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - సమోవా సమయం - సమోవా ప్రామాణిక సమయం - సమోవా పగటి వెలుతురు సమయం + అమెరికన్ సమోవా సమయం @@ -4511,9 +4615,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - టర్కీ సమయం - టర్కీ ప్రామాణిక సమయం - టర్కీ వేసవి సమయం + తుర్కియే సమయం + తుర్కియే ప్రామాణిక సమయం + తుర్కియే వేసవి సమయం @@ -4535,6 +4639,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ఉరుగ్వే వేసవి సమయం + + + ఊరూమ్‌చీ సమయం + + ఉజ్బెకిస్తాన్ సమయం @@ -4580,7 +4689,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - వాలీస్ మరియు ఫుటునా సమయం + వాలీస్ & ఫుటునా సమయం @@ -4900,8 +5009,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ చైనీస్ యువాన్ - చైనీస్ యువాన్ - చైనీస్ యువాన్ కొలంబియన్ పెసో @@ -5090,8 +5197,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ జపనీస్ యెన్ - జపనీస్ యెన్ - జపనీస్ యెన్ కెన్యాన్ షిల్లింగ్ @@ -5265,7 +5370,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ నైజీరియన్ నైరాలు - నికరగ్యుయన్ కొర్‌డుబు + నికరాగ్వన్ కోర్డబా నికరాగ్వన్ కోర్డబా నికరగ్యుయన్ కొర్‌డుబులు @@ -5452,8 +5557,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ టర్కిష్ లీరా - టర్కిష్ లీరా - టర్కిష్ లీరా ట్రినిడాడ్ మరియు టొబాగో డాలర్ @@ -5573,8 +5676,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ జింబాబ్వేయన్ గోల్డ్ - జింబాబ్వేయన్ గోల్డ్ - జింబాబ్వేయన్ గోల్డ్ @@ -5699,6 +5800,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ క్యూబిక్ {0} క్యూబిక్ {0} + + {0}-{1} + {0} గు-శక్తి {0} గు-శక్తి @@ -6680,81 +6784,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ మై.{0} - - ఫె{0} - - - అ.{0} - - - జెప్.{0} - - - యోక్.{0} - - - రోం.{0} - - - డెక్.{0} - - - హె.{0} - కి.{0} - - మె.{0} - - - గిగ్.{0} - - - టె{0} - - - పె{0} - - - ఎ{0} - - - జెట్.{0} - - - యొ{0} - - - రో.{0} - - - క్వె.{0} - - - కిబ్.{0} - - - మెబ్.{0} - - - గిబ్.{0} - - - తె{0} - - - పెబ్.{0} - - - ఇ{0} - - - జెబ్.{0} - - - యోబ్.{0} - గు-శక్తి {0} గు @@ -7737,71 +7769,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ మై{0} - - n{0} - - - పి{0} - - ఫెమి{0} + f{0} - అ{0} + a{0} - జె{0} + z{0} - యో{0} + y{0} - రో{0} - - - క్వె{0} + r{0} - డెకా{0} + da{0} - హె{0} + h{0} కి{0} - మె{0} + M{0} - గి{0} + G{0} + + + T{0} + + + P{0} - జె{0} + Z{0} + + + Y{0} - రో{0} + R{0} - క్వె{0} + Q{0} - కి{0} + Ki{0} - మె{0} + Mi{0} - గి{0} + Gi{0} + + + Ti{0} - పె{0} + Pi{0} + + + Ei{0} - జె{0} + Zi{0} - యో{0} + Yi{0} {0}° @@ -7839,7 +7877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ఐటమ్ - పార్ట్ {0} పార్ట్ {0} పార్ట్ @@ -7853,9 +7890,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} మోల్ {0} మోల్ - - Glc - లీ/100కి.మీ. {0}లీ/100కి.మీ. @@ -8075,9 +8109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}చతు.ఇం. {0}చతు.ఇం. - - cal-IT - {0}రాత్రి {0}రాత్రులు diff --git a/make/data/cldr/common/main/tg.xml b/make/data/cldr/common/main/tg.xml index 9207be6956eb..5580ba80afb4 100644 --- a/make/data/cldr/common/main/tg.xml +++ b/make/data/cldr/common/main/tg.xml @@ -733,6 +733,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -1070,6 +1073,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + : + {1} {0} @@ -1130,11 +1137,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM, y MMMM y + d MMMM y + EEE, d MMMM, y QQQ y QQQQ y 'ҳафтаи' w, Y + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} h – h B @@ -2276,9 +2290,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Либревиль - - Вақти тобистонаи Британия - Лондон @@ -2369,9 +2380,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ҷаяпура - - Вақти стандартии Ирландия - Дублин @@ -3242,6 +3250,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Вақти тобистонаи Бразилия + + + Вақти Британия + Вақти тобистонаи Британия + + Вақти Бруней Доруссалом @@ -3441,7 +3455,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Вақти стандартии Ҳавайӣ-Алеутӣ + Вақти Ҳавайӣ @@ -3502,6 +3516,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Вақти рӯзонаи Эрон + + + Вақти Ирландия + Вақти стандартии Ирландия + + Вақти Иркутск @@ -3787,9 +3807,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Вақти Самоа Вақти стандартии Самоа - Вақти рӯзонаи Самоа @@ -4670,7 +4688,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic ⩾{0} - {0} рӯз + {0} бача омад. + {0} бача омаданд. {0}-умро рост кунед. diff --git a/make/data/cldr/common/main/th.xml b/make/data/cldr/common/main/th.xml index 9f78ee4c40e0..b8bcc3a49187 100644 --- a/make/data/cldr/common/main/th.xml +++ b/make/data/cldr/common/main/th.xml @@ -479,7 +479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ บาลี พิดจิน โปแลนด์ - พีดมอนต์ + พีดมอนต์ พอนติก พอห์นเพ มาเลไซท์-ปัสมาโควดี @@ -1246,18 +1246,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ลำดับการจัดเรียง การจัดเรียงแบบที่เป็นปกติ การจัดเรียงตัวเลข + การเรียงลำดับตัวอักษร/บล็อกใหม่ ความแม่นยำในการจัดเรียง สกุลเงิน + ปลายทางการแปลง + ข้อยกเว้นการขึ้นบรรทัดใหม่ของพจนานุกรม การแสดงอีโมจิ + วันแรกของสัปดาห์ + ผสมผสาน วงจรชั่วโมง (เทียบ 12 และ 24) + วิธีการป้อนข้อมูล + แป้นพิมพ์ + สูงสุดที่ละเว้น รูปแบบการขึ้นบรรทัดใหม่ การขึ้นบรรทัดใหม่ภายในคำ + กฎการแปลง ระบบการวัด + หน่วยวัด ตัวเลข + ภูมิภาคสำหรับข้อมูลเสริม + ต้นทางการแปลง + การแบ่งภูมิภาคย่อย การตัดประโยคหลังจากคำย่อ + แปลง + แปลด้วยเครื่อง เขตเวลา ตัวแปรภาษาถิ่น ใช้งานส่วนบุคคล + การแปลงเพื่อการใช้งานส่วนบุคคล ปฏิทินพุทธ @@ -1277,15 +1293,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ปฏิทินฮิบรู ฮิบรู ปฏิทินแห่งชาติอินเดีย + ประจำชาติอินเดีย ปฏิทินอิสลาม อิสลาม ปฏิทินอิสลามซีวิล อิสลามซีวิล ปฏิทินอิสลาม (ซาอุดีอาระเบีย แบบพระจันทร์เสี้ยว) + อิสลาม ซาอุดีอาระเบีย แบบพระจันทร์เสี้ยว ปฏิทินอิสลาม (แบบตาราง สมัยดาราศาสตร์) + อิสลาม (แบบตาราง สมัยดาราศาสตร์) ปฏิทินอิสลาม (อุมม์อัลกุรา) อิสลาม (อุมม์อัลกุรา) - ปฏิทิน ISO-8601 + ปฏิทินเกรกอเรียน (ระบบสัปดาห์ ISO-8601) + เกรกอเรียน ปฏิทินญี่ปุ่น ญี่ปุ่น ปฏิทินเปอร์เชีย @@ -1301,8 +1321,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ จัดเรียงเสียงหนักเบาตามปกติ จัดเรียงเสียงหนักเบาในลำดับถอยหลัง จัดเรียงลำดับตัวพิมพ์เล็กก่อน + ตัวพิมพ์เล็ก จัดเรียงลำดับตามตัวพิมพ์ปกติ + ตัวพิมพ์เล็ก จัดเรียงตัวพิมพ์ใหญ่ก่อน + ตัวพิมพ์ใหญ่ จัดเรียงตามความสำคัญของตัวพิมพ์ จัดเรียงความสำคัญของตัวพิมพ์ ลำดับการจัดเรียงก่อนหน้านี้ ตามความเหมาะสม @@ -1311,7 +1334,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ พจนานุกรม ลำดับการจัดเรียงตาม Unicode เริ่มต้น Unicode เริ่มต้น + อีโมจิ กฎการเรียงลำดับตามแบบยุโรป + กฎตามแบบยุโรป ลำดับการจัดเรียงตามสมุดโทรศัพท์ สมุดโทรศัพท์ ลำดับการจัดเรียงตามการออกเสียง @@ -1321,6 +1346,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ การค้นหาทั่วไป การค้นหา ค้นหาตามพยัญชนะขึ้นต้นที่เป็นฮันกึล + พยัญชนะขึ้นต้นภาษาเกาหลี ลำดับการจัดเรียงแบบมาตรฐาน มาตรฐาน ลำดับการจัดเรียงตามการลากเส้น @@ -1328,24 +1354,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ลำดับการจัดเรียงตามแบบดั้งเดิม ดั้งเดิม ลำดับการจัดเรียงตามจำนวนขีด - จำนวนขีด + หมวดคำและจำนวนขีด ลำดับการจัดเรียงตามการสะกดแบบจู้อิน การสะกดแบบจู้อิน จัดเรียงโดยไม่ต้องทำให้เป็นแบบปกติ จัดเรียงยูนิโค้ดแบบที่เป็นปกติ จัดเรียงตัวเลขแยก จัดเรัยงตัวเลขตามลำดับตัวเลข + สกุลเงิน + ตัวเลข + เครื่องหมายวรรคตอน + ช่องว่าง + สัญลักษณ์ จัดเรียงทั้งหมด + ทั้งหมด จัดเรียงตัวอักษรฐานเท่านั้น + ตัวอักษรฐานเท่านั้น จัดเรียงตามเสียงหนักเบา/ตัวพิมพ์/ความกว้าง/ตัวอักษรคะนะ + ฐาน เสียงหนักเบา ตัวพิมพ์ รูปแบบ ตัวอักษรคะนะ จัดเรียงเสียงหนักเบา + ฐาน เสียงหนักเบา จัดเรียงเสียงหนักเบา/ตัวพิมพ์/ความกว้าง + ฐาน เสียงหนักเบา ตัวพิมพ์ รูปแบบ ตัวเต็ม ตัวย่อ ตัวเลข ค่าเริ่มต้น อีโมจิ ข้อความ + ระบบ 12 ชั่วโมง + 12 + ระบบ 24 ชั่วโมง + 24 ระบบ 12 ชั่วโมง (0–11) 12 (0–11) ระบบ 12 ชั่วโมง (1–12) @@ -1354,6 +1394,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) ระบบ 24 ชั่วโมง (1–24) 24 (1–24) + เลื่อนช่องว่าง เครื่องหมายวรรคตอน สัญลักษณ์ทั้งหมด + เลื่อนช่องว่าง เครื่องหมายวรรคตอน + เลื่อนช่องว่าง เครื่องหมายวรรคตอน + เลื่อนช่องว่าง เครื่องหมายวรรคตอน สัญลักษณ์ที่ไม่ใช่สกุลเงิน รูปแบบที่ยืดหยุ่นของการขึ้นบรรทัดใหม่ ยืดหยุ่น รูปแบบปกติของการขึ้นบรรทัดใหม่ @@ -1374,8 +1418,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ อเมริกัน ตัวเลขอารบิก-อินดิก ตัวเลขอารบิก-อินดิกแบบขยาย + อารบิก-อินดิกแบบขยาย ตัวเลขอาร์เมเนีย ตัวเลขอาร์เมเนียพิมพ์เล็ก + อาร์เมเนียพิมพ์เล็ก ตัวเลขบาหลี ตัวเลขบังกลาเทศ ตัวเลขพราหมี @@ -1384,43 +1430,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ตัวเลขเทวนาครี ตัวเลขเอธิโอเปีย ตัวเลขทางการเงิน + การเงิน ตัวเลขแบบเต็มขนาด + แบบเต็มขนาด ตัวเลขจอร์เจีย ตัวเลขกรีก ตัวเลขกรีกพิมพ์เล็ก + กรีกพิมพ์เล็ก ตัวเลขคุชราต ตัวเลขกูร์มูคี + การใส่ลำดับเลขวันของเดือนอักขระฮั่นสำหรับปฏิทินแบบดั้งเดิม ตัวเลขทศนิยมจีน + ระบบเลขฐานสิบตามตำแหน่งโดยใช้ตัวอักษรเลขจีนเป็นตัวเลข ตัวเลขจีนตัวย่อ ตัวเลขทางการเงินแบบตัวย่อของจีน + การเงินแบบตัวย่อของจีน ตัวเลขจีนตัวเต็ม ตัวเลขทางการเงินแบบตัวเต็มของจีน + การเงินแบบตัวเต็มของจีน ตัวเลขฮิบรู ตัวเลขชวา ตัวเลขญี่ปุ่น ตัวเลขทางการเงินของญี่ปุ่น + การเงินของญี่ปุ่น + การใส่ลำดับเลขปีที่หนึ่งของญี่ปุ่น ตัวเลขคยาห์ ตัวเลขเขมร ตัวเลขกันนาดา ตัวเลขไททัมโฮรา ตัวเลขไททัมทัม + อักษรไทธรรม (ทางศาสนา) ตัวเลขลาว ตัวเลขอารบิก ตัวเลขเลปชา ตัวเลขลิมบู + ตัวเลขทางคณิตศาสตร์แบบตัวหนา + ตัวเลขทางคณิตศาสตร์แบบสองขีด + ตัวเลขทางคณิตศาสตร์แบบความกว้างคงที่ + ตัวเลขทางคณิตศาสตร์แบบตัวหนาที่ไม่มีเชิง + ตัวเลขทางคณิตศาสตร์ที่ไม่มีเชิง ตัวเลขมาลายาลัม ตัวเลขมองโกเลีย ตัวเลขเมไตมาเยก ตัวเลขพม่า + กะเหรี่ยงโปตะวันออกของพม่า + ปะโอของพม่า ตัวเลขชานพม่า + ชานของพม่า + ไตแลงของพม่า ตัวเลขพื้นเมือง + ตัวเลขพื้นเมือง ตัวเลขเอ็นโก ตัวเลขโอลจิกิ ตัวเลขโอริยา ตัวเลขออสมันยา + แบบมีเส้นขอบ ตัวเลขโรมัน + โรมันพิมพ์ใหญ่ ตัวเลขโรมันพิมพ์เล็ก + โรมันพิมพ์เล็ก ตัวเลขเศารัชธรา + แบบเซกเมนต์ ตัวเลขชาราดา ตัวเลขโสราสมเป็ง ตัวเลขซุนดา @@ -1428,14 +1498,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ตัวเลขไทลื้อใหม่ ตัวเลขทมิฬดั้งเดิม ตัวเลขทมิฬ + ทมิฬสมัยใหม่ ตัวเลขเตลูกู ตัวเลขไทย ตัวเลขทิเบต ตัวเลขแบบดั้งเดิม + ตัวเลขดั้งเดิม ตัวเลขไว ปิด เปิด + การแปลด้วยเครื่องแบบไม่ระบุ + ตัวแปร POSIX + + ปิด + เปิด + เมตริก สหราชอาณาจักร @@ -1509,7 +1587,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M/G y d/M/GGGGG y - E ที่ d/M/G y + E d/M/G y E d MMMM EEEEที่ d MMMM M/y @@ -1872,6 +1950,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ G y + + {0} – {1} + {0} - {1} h – h B @@ -1947,6 +2028,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ EEEEที่ d – EEEEที่ d MMM EEEEที่ d MMM – EEEEที่ d MMM + + d – d MMMM + d MMMM – d MMMM + M/y – M/y G M/y – M/y G @@ -2067,15 +2152,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - อาทิตย์ - จันทร์ - อังคาร - พุธ - พฤหัส - ศุกร์ - เสาร์ - อา จ @@ -2085,15 +2161,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ศ ส - - อา. - จ. - อ. - พ. - พฤ. - ศ. - ส. - @@ -2226,11 +2293,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - HH:mm + HH:mm น. + + / + {1} {0} @@ -2272,8 +2342,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM G y E d MMM G y EEEEที่ d MMM G y + MMMM G y + d MMMM G y + E d MMMM G y HH:mm น. - h:mm น. a v d/M E d/M d MMM @@ -2299,6 +2371,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ G y สัปดาห์ที่ w ของปี Y + + {1}ที่ {0} + {0} {1} + {0} – {1} @@ -2376,6 +2452,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ EEEEที่ d – EEEEที่ d MMM EEEEที่ d MMM – EEEEที่ d MMM + + d – d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2533,238 +2613,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ทะอิกะ (645–650) - ฮะกุชิ (650–671) - ฮากุโฮ (672–686) - ชุโช (686–701) - ทะอิโฮ (701–704) - เคอุง (704–708) - วะโด (708–715) - เรกิ (715–717) - โยโร (717–724) - จิงกิ (724–729) - เท็มเพียว (729–749) - เท็มเพียว-คัมโป (749-749) - เท็มเพียว-โชโฮ (749-757) - เท็มเพียว-โฮจิ (757-765) - เท็มเพียว-จิงโงะ (765-767) - จิงโงะ-เคอุง (767-770) - โฮกิ (770–780) - เท็นโอ (781–782) - เอ็นเรียะกุ (782–806) - ดะอิโด (806–810) - โคนิง (810–824) - เท็นโช (824–834) - โชวะ (834–848) - คะโจ (848–851) - นินจุ (851–854) - ซะอิโกะ (854–857) - เท็นนัง (857–859) - โจงัง (859–877) - เก็งเก (877–885) - นินนะ (885–889) - คัมเพียว (889–898) - โชตะอิ (898–901) - เอ็งงิ (901–923) - เอ็นโช (923–931) - โชเฮ (931–938) - เท็งเงียว (938–947) - เท็นเรียะกุ (947–957) - เท็นโตะกุ (957–961) - โอวะ (961–964) - โคโฮ (964–968) - อันนะ (968–970) - เท็นโระกุ (970–973) - เท็นเอ็ง (973–976) - โจเง็ง (976–978) - เท็งเง็ง (978–983) - เอกัง (983–985) - คันนะ (985–987) - เอเอ็ง (987–989) - เอโซ (989–990) - โชเรียะกุ (990–995) - โชโตะกุ (995–999) - โชโฮ (999–1004) - คันโก (1004–1012) - โชวะ (1012–1017) - คันนิง (1017–1021) - จิอัง (1021–1024) - มันจุ (1024–1028) - โชเง็ง (1028–1037) - โชเรียะกุ (1037–1040) - โชคีว (1040–1044) - คันโตะกุ (1044–1046) - เอโช (1046–1053) - เท็งงิ (1053–1058) - โคเฮ (1058–1065) - จิเรียะกุ (1065–1069) - เอ็งคีว (1069–1074) - โชโฮ (1074–1077) - โชเรียะกุ (1077–1081) - เอโฮะ (1081–1084) - โอโตะกุ (1084–1087) - คันจิ (1087–1094) - คะโฮะ (1094–1096) - เอโช (1096–1097) - โชโตะกุ (1097–1099) - โควะ (1099–1104) - โชจิ (1104–1106) - คะโช (1106–1108) - เท็นนิง (1108–1110) - เท็นเอ (1110–1113) - เอกีว (1113–1118) - เก็นเอ (1118–1120) - โฮะอัง (1120–1124) - เท็นจิ (1124–1126) - ดะอิจิ (1126–1131) - เท็นโช (1131–1132) - โชโช (1132–1135) - โฮะเอ็ง (1135–1141) - เอจิ (1141–1142) - โคจิ (1142–1144) - เท็นโย (1144–1145) - คีวอัง (1145–1151) - นิมเป (1151–1154) - คีวจุ (1154–1156) - โฮะเง็ง (1156–1159) - เฮจิ (1159–1160) - เอเรียะกุ (1160–1161) - โอโฮ (1161–1163) - โชกัง (1163–1165) - เอมัง (1165–1166) - นินอัง (1166–1169) - คะโอ (1169–1171) - โชอัง (1171–1175) - อังเง็ง (1175–1177) - จิโช (1177–1181) - โยวะ (1181–1182) - จุเอ (1182–1184) - เก็นเรียะกุ (1184–1185) - บุนจิ (1185–1190) - เค็งกีว (1190–1199) - โชจิ (1199–1201) - เค็นนิง (1201–1204) - เก็งกีว (1204–1206) - เค็นเอ (1206–1207) - โชเก็ง (1207–1211) - เค็นเรียะกุ (1211–1213) - เค็มโป (1213–1219) - โชกีว (1219–1222) - โจโอ (1222–1224) - เก็นนิง (1224–1225) - คะโระกุ (1225–1227) - อันเต (1227–1229) - คังกิ (1229–1232) - โจเอ (1232–1233) - เท็มปุกุ (1233–1234) - บุนเรียะกุ (1234–1235) - คะเต (1235–1238) - เรียะกุนิง (1238–1239) - เอ็นโอ (1239–1240) - นินจิ (1240–1243) - คังเง็ง (1243–1247) - โฮจิ (1247–1249) - เค็นโช (1249–1256) - โคเง็ง (1256–1257) - โชกะ (1257–1259) - โชเง็ง (1259–1260) - บุนโอ (1260–1261) - โคโช (1261–1264) - บุนเอ (1264–1275) - เค็นจิ (1275–1278) - โคอัง (1278–1288) - โชโอ (1288–1293) - เอนิง (1293–1299) - โชอัง (1299–1302) - เค็งเง็ง (1302–1303) - คะเง็ง (1303–1306) - โทะกุจิ (1306–1308) - เอ็งเก (1308–1311) - โอโช (1311–1312) - โชวะ (1312–1317) - บุมโป (1317–1319) - เก็นโอ (1319–1321) - เก็งเกียว (1321–1324) - โชชู (1324–1326) - คะเระกิ (1326–1329) - เก็นโตะกุ (1329–1331) - เก็งโก (1331–1334) - เค็มมุ (1334–1336) - เอ็งเง็ง (1336–1340) - โคโกะกุ (1340–1346) - โชเฮ (1346–1370) - เค็นโตะกุ (1370–1372) - บุนชู (1372–1375) - เท็นจุ (1375–1379) - โคเรียะกุ (1379–1381) - โควะ (1381–1384) - เก็นชู (1384–1392) - เมโตะกุ (1384–1387) - คะเค (1387–1389) - โคโอ (1389–1390) - เมโตะกุ (1390–1394) - โอเอ (1394–1428) - โชโช (1428–1429) - เอเกียว (1429–1441) - คะกิสึ (1441–1444) - บุนอัง (1444–1449) - โฮโตะกุ (1449–1452) - เคียวโตะกุ (1452–1455) - โคโช (1455–1457) - โชโระกุ (1457–1460) - คันโช (1460–1466) - บุนโช (1466–1467) - โอนิง (1467–1469) - บุมเม (1469–1487) - โชเกียว (1487–1489) - เอ็นโตะกุ (1489–1492) - เมโอ (1492–1501) - บุงกิ (1501–1504) - เอโช (1504–1521) - ทะอิเอ (1521–1528) - เคียวโระกุ (1528–1532) - เท็มมน (1532–1555) - โคจิ (1555–1558) - เอโระกุ (1558–1570) - เก็งกิ (1570–1573) - เท็นโช (1573–1592) - บุนโระกุ (1592–1596) - เคโช (1596–1615) - เก็งวะ (1615–1624) - คันเอ (1624–1644) - โชโฮ (1644–1648) - เคอัง (1648–1652) - โชโอ (1652–1655) - เมเรียะกุ (1655–1658) - มันจิ (1658–1661) - คัมบุง (1661–1673) - เอ็มโป (1673–1681) - เท็นวะ (1681–1684) - โจเกียว (1684–1688) - เก็นโระกุ (1688–1704) - โฮเอ (1704–1711) - โชโตะกุ (1711–1716) - เคียวโฮ (1716–1736) - เก็มบุง (1736–1741) - คัมโป (1741–1744) - เอ็งเกียว (1744–1748) - คันเอ็ง (1748–1751) - โฮเรียะกุ (1751–1764) - เมวะ (1764–1772) - อันเอ (1772–1781) - เท็มเม (1781–1789) - คันเซ (1789–1801) - เคียววะ (1801–1804) - บุงกะ (1804–1818) - บุนเซ (1818–1830) - เท็มโป (1830–1844) - โคกะ (1844–1848) - คะเอ (1848–1854) - อันเซ (1854–1860) - มันเอ็ง (1860–1861) - บุงกีว (1861–1864) - เก็นจิ (1864–1865) - เคโอ (1865–1868) เมจิ ทะอิโช โชวะ @@ -3656,9 +3504,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ลีเบรอวิล - - เวลาฤดูร้อนอังกฤษ - ลอนดอน @@ -3749,9 +3594,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ จายาปุระ - - เวลามาตรฐานไอร์แลนด์ - ดับบลิน @@ -3800,7 +3642,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ พนมเปญ - แคนทอน + เกาะแคนทอน คิริทิมาตี @@ -4449,9 +4291,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - เวลาอาเกร - เวลามาตรฐานอาเกร - เวลาฤดูร้อนอาเกร + เวลาอาเกร + เวลามาตรฐานอาเกร + เวลาฤดูร้อนอาเกร @@ -4486,13 +4328,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาออมแสงของอะแลสกา - - - เวลาอัลมาตี - เวลามาตรฐานอัลมาตี - เวลาฤดูร้อนอัลมาตี - - เวลาแอมะซอน @@ -4542,20 +4377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาออมแสงอาปีอา - - - เวลาอัคตาอู - เวลามาตรฐานอัคตาอู - เวลาฤดูร้อนอัคตาอู - - - - - เวลาอัคโทเบ - เวลามาตรฐานอัคโทเบ - เวลาฤดูร้อนอัคโทเบ - - เวลาอาหรับ @@ -4657,6 +4478,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาฤดูร้อนบราซิเลีย + + + เวลาอังกฤษ + เวลาฤดูร้อนอังกฤษ + + เวลาบรูไนดารุสซาลาม @@ -4835,6 +4662,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลามาตรฐานกรีนิช + + + เวลากรีนแลนด์ + เวลามาตรฐานกรีนแลนด์ + เวลาฤดูร้อนกรีนแลนด์ + + เวลากรีนแลนด์ตะวันออก @@ -4849,11 +4683,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาฤดูร้อนกรีนแลนด์ตะวันตก - - - เวลากวม - - เวลากัลฟ์ @@ -4866,7 +4695,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - เวลามาตรฐานฮาวาย-อะลูเชียน + เวลาฮาวาย @@ -4927,6 +4756,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาออมแสงอิหร่าน + + + เวลาไอร์แลนด์ + เวลามาตรฐานไอร์แลนด์ + + เวลาอีร์คุตสค์ @@ -4950,9 +4785,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - เวลาคัมชัตคา - เวลาเปโตรปัฟลอฟสค์-คัมชัตสกี - เวลาฤดูร้อนเปโตรปัฟลอฟสค์-คัมชัตสกี + เวลาคัมชัตคา + เวลามาตรฐานคัมชัตคา + เวลาฤดูร้อนคัมชัตคา @@ -4994,11 +4829,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาคีร์กีซสถาน - - - เวลาลังกา - - เวลาหมู่เกาะไลน์ @@ -5011,13 +4841,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาออมแสงลอร์ดโฮว์ - - - เวลามาเก๊า - เวลามาตรฐานมาเก๊า - เวลาฤดูร้อนมาเก๊า - - เวลามากาดาน @@ -5133,11 +4956,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาฤดูร้อนของหมู่เกาะเฟอร์นันโด - - - เวลาหมู่เกาะมาเรียนาเหนือ - - เวลาโนโวซีบีสค์ @@ -5217,13 +5035,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาเปียงยาง - - - เวลาคืยซิลออร์ดา - เวลามาตรฐานคืยซิลออร์ดา - เวลาฤดูร้อนคืยซิลออร์ดา - - เวลาเรอูนียง @@ -5243,16 +5054,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - เวลาซามารา - เวลามาตรฐานซามารา - เวลาฤดูร้อนซามารา + เวลาซามารา + เวลามาตรฐานซามารา + เวลาฤดูร้อนซามารา - เวลาซามัว เวลามาตรฐานซามัว - เวลาฤดูร้อนซามัว @@ -5321,9 +5130,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - เวลาตุรกี - เวลามาตรฐานตุรกี - เวลาฤดูร้อนตุรกี + เวลาตุรกี + เวลามาตรฐานตุรกี + เวลาฤดูร้อนตุรกี @@ -5345,6 +5154,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ เวลาฤดูร้อนอุรุกวัย + + + เวลาอุรุมชี + + เวลาอุซเบกิสถาน @@ -6281,7 +6095,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ทาลาซามัว - ฟรังก์เซฟาธนาคารรัฐแอฟริกากลาง + ฟรังก์ซีเอฟเอแอฟริกาตะวันตก + ฟรังก์ซีเอฟเอแอฟริกากลาง เงิน @@ -6306,7 +6121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ กิลเดอร์แคริบเบียน - กิลเดอร์แคริบเบียน สิทธิถอนเงินพิเศษ @@ -6390,7 +6204,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ทองซิมบับเว - ทองซิมบับเว ดอลลาร์ซิมบับเว (2009) @@ -6469,10 +6282,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ มิลลิโมลต่อลิตร {0} มิลลิโมลต่อลิตร - - ส่วน - {0} ส่วน - ส่วนต่อล้าน {0} ส่วนต่อล้าน @@ -6486,10 +6295,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} เปอร์มีเรียด - - กลูโคส - {0} กลูโคส - ลิตรต่อกิโลเมตร {0} ลิตรต่อกิโลเมตร @@ -6754,10 +6559,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ มิลลิเมตรปรอท {0} มิลลิเมตรปรอท - - ปรอท - {0} ปรอท - ปอนด์ต่อตารางนิ้ว {0} ปอนด์ต่อตารางนิ้ว @@ -6905,55 +6706,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ควอร์ตอังกฤษ - สเตอเรเดียน {0} สเตอเรเดียน - - คาทัล - {0} คาทัล - - คูลอมบ์ {0} คูลอมบ์ - - ฟารัด - {0} ฟารัด - - - เฮนรี - {0} เฮนรี - - - ซีเมนส์ - {0} ซีเมนส์ - แคลอรี [IT] {0} แคลอรี [IT] - เบ็กเคอเรล {0} เบ็กเคอเรล - - ซีเวิร์ต - {0} ซีเวิร์ต - - - เกรย์ - {0} เกรย์ - - - กิโลกรัมแรง - {0} กิโลกรัมแรง - - - เทสลา - {0} เทสลา - - เวเบอร์ {0} เวเบอร์ @@ -7501,7 +7266,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ มิลลิวัตต์ - {0} มิลลิวัตต์ แรงม้า @@ -7831,7 +7595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}รายการ - ส่วน {0} ส่วน @@ -7848,7 +7611,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}โมล - กลูโคส {0} กลูโคส @@ -8181,7 +7943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}มม. ปรอท - ปรอท {0} ปรอท @@ -8351,54 +8112,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}qt-Imp. - - สเตอเรเดียน - - คาทัล {0} คาทัล - - คูลอมบ์ - - ฟารัด {0} ฟารัด - เฮนรี {0} เฮนรี - ซีเมนส์ {0} ซีเมนส์ - แคลอรี-IT {0} แคลอรี-IT - - เบ็กเคอเรล - - ซีเวิร์ต {0} ซีเวิร์ต - เกรย์ {0} เกรย์ - - กิโลกรัมแรง - {0} กิโลกรัมแรง - - เทสลา {0} เทสลา - - เวเบอร์ - {0}แสง diff --git a/make/data/cldr/common/main/ti.xml b/make/data/cldr/common/main/ti.xml index b2a98b5fcaf7..069766d73cde 100644 --- a/make/data/cldr/common/main/ti.xml +++ b/make/data/cldr/common/main/ti.xml @@ -913,6 +913,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ሂጅሪ ዓውደ ኣዋርሕ (ኡም ኣል-ቁራ) ሂጅሪ (ኡም ኣል-ቁራ) ISO-8601 ዓውደ ኣዋርሕ + ጎርጎርዮሳዊ ናይ ጃፓናዊ ዓውደ ኣዋርሕ ጃፓናዊ ናይ ፋርስ ዓውደ ኣዋርሕ @@ -932,6 +933,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ነባሪ ኢሞጂ ጽሑፍ + ስርዓት 12 ሰዓታት + 12 + ናይ 24 ሰዓታት ስርዓት + 24 ስርዓት 12 ሰዓታት (0–11) 12 (0–11) ስርዓት 12 ሰዓታት (1–12) @@ -999,6 +1004,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic ጠፊኡ በሪሑ + + ጠፊኡ + በሪሑ + ሜትሪክ ብሪጣንያ @@ -1029,53 +1038,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - መስከረም - ጥቅምቲ - ሕዳር - ታሕሳስ - ጥሪ - ለካቲት - መጋቢት - ሚያዚያ - ጉንበት - ሰነ - ሓምለ - ነሓሰ - ጷጉሜ - - - መስከረም - ጥቅምቲ - ሕዳር - ታሕሳስ - ጥሪ - ለካቲት - መጋቢት - ሚያዚያ - ጉንበት - ሰነ - ሓምለ - ነሓሰ - ጷጉሜ - - - - - መስከረም - ጥቅምቲ - ሕዳር - ታሕሳስ - ጥሪ - ለካቲት - መጋቢት - ሚያዚያ - ጉንበት - ሰነ - ሓምለ - ነሓሰ - ጷጉሜ - መስከረም ጥቅምቲ @@ -1247,9 +1209,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM – MMM - - MMM d – MMM d - E, MMM d – E, MMM d E, MMM d – E, MMM d @@ -1339,20 +1298,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ሕ ታ - - ጥሪ - ለካቲት - መጋቢት - ሚያዝያ - ጉንበት - ሰነ - ሓምለ - ነሓሰ - መስከረም - ጥቅምቲ - ሕዳር - ታሕሳስ - @@ -1477,6 +1422,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1538,12 +1486,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, MMM d, y MMMM y + d MMMM y + EEE, MMMM d, y QQQ y QQQQ y ሰሙን w ናይ Y ሰሙን w ናይ Y + + {0} – {1} + {0} – {1} y G – y G @@ -1645,41 +1598,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - - EEEE, MMMM d, y G - - - - - MMMM d, y G - - - - - MMM d, y G - - - - - M/d/y GGGGG - - - - d E - M/d/y GGGGG - G y-MM-dd፣ E - MMM d, y G - M/d MMM d - E, MMM d MMMM d - M/d/y GGGGG - MMM d, y G - E, MMM d, y G @@ -1703,18 +1625,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ዝሓለፈ ዓመት - ሎሚ ዓመት - ዝመጽእ ዓመት ቅድሚ -{0} ዓ ቅድሚ {0} ዓ - ዝሓለፈ ዓመት - ሎሚ ዓመት - ዝመጽእ ዓመት ቅድሚ {0} ዓ ቅድሚ {0} ዓ @@ -1885,12 +1801,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ቅድሚ {0} ዓርቢ - - - ቅድሚ {0} ዓርቢ - ቅድሚ {0} ዓርቢ - - ዝሓለፈ ቀዳም ሎሚ ቀዳም @@ -1904,15 +1814,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ቅድሚ {0} ቀዳም - - ኤ.ኤም/ፒ.ኤም - ኤ.ኤም/ፒ.ኤም - - ኤ.ኤም/ፒ.ኤም - ሰዓት ኣብዚ ሰዓት @@ -1952,12 +1856,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ቅድሚ {0} ካልኢት - - ሴኮንድ - - - ሴኮንድ - ዞባ ግዜ @@ -2446,9 +2344,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ሊብረቪል - - ግዜ ክረምቲ ብሪጣንያ - ሎንደን @@ -2539,9 +2434,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ጃያፑራ - - ናይ መደበኛ አይሪሽ ግዘ - ደብሊን @@ -3419,6 +3311,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ግዜ ክረምቲ ብራዚልያ + + + ብግዜ እንግሊዝ + ግዜ ክረምቲ ብሪጣንያ + + ናይ ብሩኔ ዳሩሳሌም ግዘ @@ -3592,6 +3490,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic GMT + + + ግሪንላንድ ሰዓት + ግሪንላንድ ስታንዳርድ ሰዓት + ግሪንላንድ ናይ ሓጋይ ግዜ + + ናይ ምብራቓዊ ግዘ ግሪንላንድ @@ -3618,7 +3523,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ናይ መደበኛ ሃዋይ-ኣሌውቲያን ግዘ + ናይ ሃዋይ ግዘ @@ -3679,6 +3584,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ መዓልቲ ኢራን ግዘ + + + ናይ ኣየርላንድ ግዜ + ናይ መደበኛ አይሪሽ ግዘ + + ናይ ኢርኩትስክ ግዘ @@ -3700,6 +3611,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ መዓልቲ ጃፓን ግዘ + + + ካምቻትካ ግዜ + ካምቻትካ ስታንዳርድ ሰዓት + ካምቻትካ ናይ ሓጋይ ግዜ + + ናይ ካዛኪስታን ግዘ @@ -3962,11 +3880,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ክረምቲ ሳክሃሊን ግዘ + + + ሰዓት ሳምራ + ሳማራ ስታንዳርድ ሰዓት + ሳማራ ሓጋይ ሰዓት + + - ናይ ሳሞዋ ግዘ ናይ መደበኛ ሳሞዋ ግዘ - ናይ መዓልቲ ሳሞዋ ግዘ @@ -4033,6 +3956,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ቹክ ግዘ + + + ቱርኪየ ሰዓት + ቱርኪየ ስታንዳርድ ሰዓት + ቱርኪየ ናይ ሓጋይ ግዜ + + ናይ ቱርክሜኒስታን ግዘ @@ -4052,6 +3982,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ግዜ ክረምቲ ኡራጓይ + + + ኡሩምቂ ግዜ + + ናይ ኡዝቤኪስታን ግዘ @@ -4187,7 +4122,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤#,##0.00 - ¤ #,##0.00 @@ -4251,8 +4185,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኣፍጋኒስታናዊ ኣፍጋን - ኣፍጋኒስታናዊ ኣፍጋን - ኣፍጋኒስታናዊ ኣፍጋን ኣልባናዊ ሌክ @@ -4261,38 +4193,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኣርመንያዊ ድራም - ኣርመንያዊ ድራም - ኣርመንያዊ ድራም ሆላንድ ኣንቲለያን ጊልደር - ሆላንድ ኣንቲለያን ጊልደር - ሆላንድ ኣንቲለያን ጊልደር ኣንጎላዊ ክዋንዛ - ኣንጎላዊ ክዋንዛ - ኣንጎላዊ ክዋንዛ ኣርጀንቲናዊ ፔሶ - ኣርጀንቲናዊ ፔሶ - ኣርጀንቲናዊ ፔሶ ኣውስትራልያዊ ዶላር - ኣውስትራልያዊ ዶላር - ኣውስትራልያዊ ዶላር ኣሩባን ፍሎሪን - ኣሩባን ፍሎሪን - ኣሩባን ፍሎሪን ኣዘርባጃናዊ ማናት - ኣዘርባጃናዊ ማናት - ኣዘርባጃናዊ ማናት ቦዝንያ-ሄርዘጎቪና ተቐያሪ ምልክት @@ -4301,13 +4219,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ባርባዲያን ዶላር - ባርባዲያን ዶላር - ባርባዲያን ዶላር ባንግላደሻዊ ታካ - ባንግላደሻዊ ታካ - ባንግላደሻዊ ታካ ቡልጋርያዊ ሌቭ @@ -4316,81 +4230,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic ባሕሬናዊ ዲናር - ባሕሬናዊ ዲናር - ባሕሬናዊ ዲናር ብሩንዳዊ ፍራንክ - ብሩንዳዊ ፍራንክ - ብሩንዳዊ ፍራንክ በርሙዳን ዶላር - በርሙዳን ዶላር - በርሙዳን ዶላር ብሩነይ ዶላር - ብሩነይ ዶላር - ብሩነይ ዶላር ቦሊቭያዊ ቦሊቭያኖ - ቦሊቭያዊ ቦሊቭያኖ - ቦሊቭያዊ ቦሊቭያኖ የብራዚል ሪል ባሃማዊ ዶላር - ባሃማዊ ዶላር - ባሃማዊ ዶላር ቡታናዊ ንጉልትሩም - ቡታናዊ ንጉልትሩም - ቡታናዊ ንጉልትሩም ቦትስዋናዊ ፑላ - ቦትስዋናዊ ፑላ - ቦትስዋናዊ ፑላ ናይ ቤላሩስ ሩብል - ናይ ቤላሩስ ሩብል - ናይ ቤላሩስ ሩብል ቤሊዝ ዶላር - ቤሊዝ ዶላር - ቤሊዝ ዶላር ካናዳ ዶላር - ካናዳ ዶላር - ካናዳ ዶላር ኮንጎ ፍራንክ - ኮንጎ ፍራንክ - ኮንጎ ፍራንክ ስዊስ ፍራንክ - ስዊስ ፍራንክ - ስዊስ ፍራንክ ቺለዊ ፔሶ - ቺለዊ ፔሶ - ቺለዊ ፔሶ ቻይናዊ ዩዋን (ካብ ባሕሪ ወጻኢ) - ቻይናዊ ዩዋን (ካብ ባሕሪ ወጻኢ) - ቻይናዊ ዩዋን (ካብ ባሕሪ ወጻኢ) ዩዋን ቻይና @@ -4398,63 +4282,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኮሎምብያዊ ፔሶ - ኮሎምብያዊ ፔሶ - ኮሎምብያዊ ፔሶ ኮስታሪካ ኮሎን - ኮስታሪካ ኮሎን - ኮስታሪካ ኮሎን ኩባውያን ተቐያሪ ፔሶ - ኩባውያን ተቐያሪ ፔሶ - ኩባውያን ተቐያሪ ፔሶ ኩባዊ ፔሶ - ኩባዊ ፔሶ - ኩባዊ ፔሶ ናይ ኬፕ ቨርዲ ኤስኩዶ - ናይ ኬፕ ቨርዲ ኤስኩዶ - ናይ ኬፕ ቨርዲ ኤስኩዶ ናይ ቸክ ኮሩና - ናይ ቸክ ኮሩና - ናይ ቸክ ኮሩና ናይ ጅቡቲ ፍራንክ - ናይ ጅቡቲ ፍራንክ - ናይ ጅቡቲ ፍራንክ ናይ ዴንማርክ ክሮነር - ናይ ዴንማርክ ክሮነር - ናይ ዴንማርክ ክሮነር ዶሚኒካን ፔሶ - ዶሚኒካን ፔሶ - ዶሚኒካን ፔሶ ኣልጀርያዊ ዲናር - ኣልጀርያዊ ዲናር - ኣልጀርያዊ ዲናር ግብጻዊ ፓውንድ - ግብጻዊ ፓውንድ - ግብጻዊ ፓውንድ ኤርትራዊ ናቕፋ - ኤርትራዊ ናቕፋ - ኤርትራዊ ናቕፋ ብር @@ -4467,21 +4327,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic ዶላር ፊጂ - ዶላር ፊጂ - ዶላር ፊጂ ደሴታት ፎክላንድ ፓውንድ - ደሴታት ፎክላንድ ፓውንድ - ደሴታት ፎክላንድ ፓውንድ የእንግሊዝ ፓውንድ ስተርሊንግ ጆርጅያዊ ላሪ - ጆርጅያዊ ላሪ - ጆርጅያዊ ላሪ ጋናዊ ሴዲ @@ -4490,8 +4344,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ጂብራልተር ፓውንድ - ጂብራልተር ፓውንድ - ጂብራልተር ፓውንድ ጋምብያዊ ዳላሲ @@ -4500,58 +4352,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ጊኒ ፍራንክ - ናይ ጊኒ ፍራንክ - ናይ ጊኒ ፍራንክ ጓቲማላ ኲትዛል - ጓቲማላ ኲትዛል - ጓቲማላ ኲትዛል ጓያናኛ ዶላር - ጓያናኛ ዶላር - ጓያናኛ ዶላር ሆንግ ኮንግ ዶላር - ሆንግ ኮንግ ዶላር - ሆንግ ኮንግ ዶላር ሆንዱራስ ለምፒራ - ሆንዱራስ ለምፒራ - ሆንዱራስ ለምፒራ ክሮኤሽያዊ ኩና - ክሮኤሽያዊ ኩና - ክሮኤሽያዊ ኩና ናይ ሃይቲ ጎርደ - ናይ ሃይቲ ጎርደ - ናይ ሃይቲ ጎርደ ሃንጋርያዊ ፎርንት - ሃንጋርያዊ ፎርንት - ሃንጋርያዊ ፎርንት ኢንዶነዥያዊ ሩፒያ - ኢንዶነዥያዊ ሩፒያ - ኢንዶነዥያዊ ሩፒያ እስራኤላዊ ሓድሽ ሸቃል - እስራኤላዊ ሓድሽ ሸቃል - እስራኤላዊ ሓድሽ ሸቃል ናይ ሕንድ ሩፒ - ናይ ሕንድ ሩፒ - ናይ ሕንድ ሩፒ ዒራቂ ዲናር @@ -4560,23 +4390,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ኢራን ርያል - ናይ ኢራን ርያል - ናይ ኢራን ርያል ናይ ኣይስላንድ ክሮና - ናይ ኣይስላንድ ክሮና - ናይ ኣይስላንድ ክሮና ጃማይካ ዶላር - ጃማይካ ዶላር - ጃማይካ ዶላር ዮርዳኖሳዊ ዲናር - ዮርዳኖሳዊ ዲናር - ዮርዳኖሳዊ ዲናር የን ጃፓን @@ -4584,83 +4406,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኬንያዊ ሽልንግ - ኬንያዊ ሽልንግ - ኬንያዊ ሽልንግ ኪርጊስታናዊ ሶም - ኪርጊስታናዊ ሶም - ኪርጊስታናዊ ሶም ካምቦድያዊ ሪኤል - ካምቦድያዊ ሪኤል - ካምቦድያዊ ሪኤል ኮሞርያዊ ፍራንክ - ኮሞርያዊ ፍራንክ - ኮሞርያዊ ፍራንክ ሰሜን ኮርያዊ ዎን - ሰሜን ኮርያዊ ዎን - ሰሜን ኮርያዊ ዎን ደቡብ ኮርያዊ ዎን - ደቡብ ኮርያዊ ዎን - ደቡብ ኮርያዊ ዎን ኩዌቲ ዲናር - ኩዌቲ ዲናር - ኩዌቲ ዲናር ደሴታት ካይመን ዶላር - ደሴታት ካይመን ዶላር - ደሴታት ካይመን ዶላር ካዛኪስታናዊ ተንገ - ካዛኪስታናዊ ተንገ - ካዛኪስታናዊ ተንገ ላኦስያዊ ኪፕ - ላኦስያዊ ኪፕ - ላኦስያዊ ኪፕ ሊባኖሳዊ ፓውንድ - ሊባኖሳዊ ፓውንድ - ሊባኖሳዊ ፓውንድ ስሪላንካ ሩፒ - ስሪላንካ ሩፒ - ስሪላንካ ሩፒ ላይበርያዊ ዶላር - ላይበርያዊ ዶላር - ላይበርያዊ ዶላር ሌሶቶ ሎቲ - ሌሶቶ ሎቲ - ሌሶቶ ሎቲ ናይ ሊብያ ዲናር - ናይ ሊብያ ዲናር - ናይ ሊብያ ዲናር ሞሮካዊ ዲርሃም - ሞሮካዊ ዲርሃም - ሞሮካዊ ዲርሃም ሞልዶቫን ሌው @@ -4669,8 +4459,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ማላጋሲ ኣሪያሪ - ማላጋሲ ኣሪያሪ - ማላጋሲ ኣሪያሪ ናይ መቄዶንያ ዲናር @@ -4679,68 +4467,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic ሚያንማር ክያት - ሚያንማር ክያት - ሚያንማር ክያት ሞንጎላዊ ቱግሪክ - ሞንጎላዊ ቱግሪክ - ሞንጎላዊ ቱግሪክ ማካኒዝ ፓታካ - ማካኒዝ ፓታካ - ማካኒዝ ፓታካ ሞሪታናዊ ኡጉዋያ - ሞሪታናዊ ኡጉዋያ - ሞሪታናዊ ኡጉዋያ ሞሪሸስ ሩፒ - ሞሪሸስ ሩፒ - ሞሪሸስ ሩፒ ማልዲቭያዊ ሩፍያ - ማልዲቭያዊ ሩፍያ - ማልዲቭያዊ ሩፍያ ማላዊያዊ ኳቻ - ማላዊያዊ ኳቻ - ማላዊያዊ ኳቻ ሜክሲካዊ ፔሶ - ሜክሲካዊ ፔሶ - ሜክሲካዊ ፔሶ ሜክሲካዊ ብሩር ፔሶ (1861–1992) - ሜክሲካዊ ብሩር ፔሶ (1861–1992) - ሜክሲካዊ ብሩር ፔሶ (1861–1992) ኣሃዱ ወፍሪ ሜክሲኮ - ኣሃዱ ወፍሪ ሜክሲኮ - ኣሃዱ ወፍሪ ሜክሲኮ ማሌዥያዊ ሪንግጊት - ማሌዥያዊ ሪንግጊት - ማሌዥያዊ ሪንግጊት ሞዛምቢካዊ ሜቲካል - ሞዛምቢካዊ ሜቲካል - ሞዛምቢካዊ ሜቲካል ናሚብያ ዶላር - ናሚብያ ዶላር - ናሚብያ ዶላር ናይጀርያዊ ናይራ @@ -4749,73 +4511,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኒካራጓ ካርዶባ (1988–1991) - ኒካራጓ ካርዶባ (1988–1991) - ኒካራጓ ካርዶባ (1988–1991) ኒካራጓ ኮርዶባ - ኒካራጓ ኮርዶባ - ኒካራጓ ኮርዶባ ናይ ኖርወይ ክሮነር - ናይ ኖርወይ ክሮነር - ናይ ኖርወይ ክሮነር ኔፓላዊ ሩፒ - ኔፓላዊ ሩፒ - ኔፓላዊ ሩፒ ኒውዚላንዳዊ ዶላር - ኒውዚላንዳዊ ዶላር - ኒውዚላንዳዊ ዶላር ኦማን ርያል - ኦማን ርያል - ኦማን ርያል ፓናማያን ባልቦኣ - ፓናማያን ባልቦኣ - ፓናማያን ባልቦኣ ፔሩቪያን ሶል - ፔሩቪያን ሶል - ፔሩቪያን ሶል ፓፑዋ ኒው ጊኒ ኪና - ፓፑዋ ኒው ጊኒ ኪና - ፓፑዋ ኒው ጊኒ ኪና ፊሊፒንስ ፔሶ - ፊሊፒንስ ፔሶ - ፊሊፒንስ ፔሶ ፓኪስታናዊ ሩፒ - ፓኪስታናዊ ሩፒ - ፓኪስታናዊ ሩፒ ፖላንዳዊ ዝሎቲ - ፖላንዳዊ ዝሎቲ - ፖላንዳዊ ዝሎቲ ፓራጓያዊ ጓራኒ - ፓራጓያዊ ጓራኒ - ፓራጓያዊ ጓራኒ ቀጠሪ ሪያል - ቀጠሪ ሪያል - ቀጠሪ ሪያል ሮማንያዊ ሌው @@ -4824,51 +4558,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic ናይ ሰርብያን ዲናር - ናይ ሰርብያን ዲናር - ናይ ሰርብያን ዲናር የራሻ ሩብል ፍራንክ ሩዋንዳ - ፍራንክ ሩዋንዳ - ፍራንክ ሩዋንዳ ስዑዲ ዓረብ ሪያል - ስዑዲ ዓረብ ሪያል - ስዑዲ ዓረብ ሪያል ደሴታት ሰሎሞን ዶላር - ደሴታት ሰሎሞን ዶላር - ደሴታት ሰሎሞን ዶላር ሲሸሎ ሩፒ - ሲሸሎ ሩፒ - ሲሸሎ ሩፒ ሱዳናዊ ፓውንድ - ሱዳናዊ ፓውንድ - ሱዳናዊ ፓውንድ ሽወደናዊ ክሮና - ሽወደናዊ ክሮና - ሽወደናዊ ክሮና ሲንጋፖር ዶላር - ሲንጋፖር ዶላር - ሲንጋፖር ዶላር ቅድስቲ ሄለና ፓውንድ - ቅድስቲ ሄለና ፓውንድ - ቅድስቲ ሄለና ፓውንድ ሴራሊዮን ልዮን @@ -4882,141 +4598,87 @@ CLDR data files are interpreted according to the LDML specification (http://unic ሶማልያዊ ሽልንግ - ሶማልያዊ ሽልንግ - ሶማልያዊ ሽልንግ ሱሪናማዊ ዶላር - ሱሪናማዊ ዶላር - ሱሪናማዊ ዶላር ደቡብ ሱዳን ፓውንድ - ደቡብ ሱዳን ፓውንድ - ደቡብ ሱዳን ፓውንድ ሳኦ ቶሜን ፕሪንሲፐ ዶብራ - ሳኦ ቶሜን ፕሪንሲፐ ዶብራ - ሳኦ ቶሜን ፕሪንሲፐ ዶብራ ሳልቫዶራን ኮሎን - ሳልቫዶራን ኮሎን - ሳልቫዶራን ኮሎን ሶርያዊ ፓውንድ - ሶርያዊ ፓውንድ - ሶርያዊ ፓውንድ ስዋዚ ሊላንገኒ - ስዋዚ ሊላንገኒ - ስዋዚ ሊላንገኒ ታይላንዳዊ ባህ - ታይላንዳዊ ባህ - ታይላንዳዊ ባህ ታጂኪስታናዊ ሶሞኒ - ታጂኪስታናዊ ሶሞኒ - ታጂኪስታናዊ ሶሞኒ ቱርክመኒስታናዊ ማናት - ቱርክመኒስታናዊ ማናት - ቱርክመኒስታናዊ ማናት ቱኒዝያዊ ዲናር - ቱኒዝያዊ ዲናር - ቱኒዝያዊ ዲናር ቶንጋዊ ፓ`ኣንጋ - ቶንጋዊ ፓ`ኣንጋ - ቶንጋዊ ፓ`ኣንጋ ቱርካዊ ሊራ - ቱርካዊ ሊራ - ቱርካዊ ሊራ ትሪኒዳድን ቶባጎ ዶላር - ትሪኒዳድን ቶባጎ ዶላር - ትሪኒዳድን ቶባጎ ዶላር ኒው ታይዋን ዶላር - ኒው ታይዋን ዶላር - ኒው ታይዋን ዶላር ታንዛንያዊ ሽልንግ - ታንዛንያዊ ሽልንግ - ታንዛንያዊ ሽልንግ ዩክሬናዊት ሪቭንያ - ዩክሬናዊት ሪቭንያ - ዩክሬናዊት ሪቭንያ ኡጋንዳዊ ሽልንግ - ኡጋንዳዊ ሽልንግ - ኡጋንዳዊ ሽልንግ ዶላር ኣመሪካ ዶላር ኣመሪካ (ዝቕጽል መዓልቲ) - ዶላር ኣመሪካ (ዝቕጽል መዓልቲ) - ዶላር ኣመሪካ (ዝቕጽል መዓልቲ) ዶላር ኣመሪካ (ተመሳሳሊ መዓልቲ) - ዶላር ኣመሪካ (ተመሳሳሊ መዓልቲ) - ዶላር ኣመሪካ (ተመሳሳሊ መዓልቲ) ኡራጋያዊ ፔሶ - ኡራጋያዊ ፔሶ - ኡራጋያዊ ፔሶ ኡዝቤኪስታናዊ ሶም - ኡዝቤኪስታናዊ ሶም - ኡዝቤኪስታናዊ ሶም ቬንዙዌላዊ ቦሊቫር - ቬንዙዌላዊ ቦሊቫር - ቬንዙዌላዊ ቦሊቫር ቬትናማዊ ዶንግ - ቬትናማዊ ዶንግ - ቬትናማዊ ዶንግ ቫኑኣቱ ቫቱ - ቫኑኣቱ ቫቱ - ቫኑኣቱ ቫቱ ሳሞኣዊ ታላ - ሳሞኣዊ ታላ - ሳሞኣዊ ታላ ማእከላይ ኣፍሪቃ ሲኤፍኤ ፍራንክ - ማእከላይ ኣፍሪቃ ሲኤፍኤ ፍራንክ - ማእከላይ ኣፍሪቃ ሲኤፍኤ ፍራንክ ብሩር @@ -5026,13 +4688,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ምብራቕ ካሪብያን ዶላር - ምብራቕ ካሪብያን ዶላር - ምብራቕ ካሪብያን ዶላር ካሪብያን ጊልደር - ካሪብያን ጊልደር - ካሪብያን ጊልደር ምዕራብ ኣፍሪቃ CFA ፍራንክ @@ -5041,8 +4699,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ሲኤፍፒ ፍራንክ - ሲኤፍፒ ፍራንክ - ሲኤፍፒ ፍራንክ ዘይተፈልጠ ባጤራ @@ -5051,23 +4707,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic የመኒ ርያል - የመኒ ርያል - የመኒ ርያል ናይ ደቡብ ኣፍሪቃ ራንድ - ናይ ደቡብ ኣፍሪቃ ራንድ - ናይ ደቡብ ኣፍሪቃ ራንድ ዛምብያዊ ኳቻ - ዛምብያዊ ኳቻ - ዛምብያዊ ኳቻ ዚምባብወ ወርቂ - ዚምባብወ ወርቂ - ዚምባብወ ወርቂ @@ -5081,102 +4729,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - ዴሲ{0} - - - ሴንቲ{0} - - - ሚሊ{0} - ማይክሮ{0} - - ናኖ{0} - - - ፒኮ{0} - - - ፌምቶ{0} - - - አቶ{0} - - - ዜፕቶ{0} - - - ዮክቶ{0} - - - ሮንቶ{0} - - - ክዌክቶ{0} - - - ዴካ{0} - - - ሄክቶ{0} - ኪሎ{0} - - ሜጋ{0} - - - ጊጋ{0} - - - ቴራ{0} - - - ፔታ{0} - - - ኤግዛ{0} - - - ዜታ{0} - - - ዮታ{0} - - - ሮና{0} - - - ክዌታ{0} - - - ኪቢ{0} - - - ሜቢ{0} - - - ጊቢ{0} - - - ቴቢ{0} - - - ፔቢ{0} - - - ኤግዚቢ{0} - - - ዜቢ{0} - - - ዮቢ{0} - {0} አብ {1} @@ -5192,7 +4750,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}-{1} - ሓይሊ ስሕበት {0} ሓይሊ ስሕበት {0} ሓይሊ ስሕበት @@ -5201,47 +4758,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ሜትሮ ኣብ ሰከንድ ኣብ ካሬ {0} ሜትሮ ኣብ ሰከንድ ኣብ ካሬ - - ሬቮልዩሽን - {0} ሬቮልዩሽን - {0} ሬቮልዩሽን - - - ራድያን - {0} ራድያን - {0} ራድያን + + {0} ሄክታር + {0} ሄክታር - - ዲግሪ - {0} ዲግሪ - {0} ዲግሪ - - - ኣርክ ደቓይቕ - {0} ኣርክ ደቒቓ - {0} ኣርክ ደቓይቕ - - - ኣርክ ሰከንድ - {0} ኣርክ ሰከንድ - {0} ኣርክ ሰከንድ - - - ኪሜ² - {0} ኪሜ² - {0} ኪሜ² - {0}/ኪሜ² - - - ሄክታር - {0} ሄክታር - {0} ሄክታር - - - ሜተር² - {0} ሜተር² - {0} ሜትር² - {0} ብሜተር² + + {0} ሜተር² + {0} ሜትር² + {0} ብሜተር² ካሬ ሴንቲሜትር @@ -5250,7 +4774,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ብካሬ ሴንቲሜትር - ካሬ ማይል {0} ካሬ ማይል {0} ካሬ ማይል {0} ብካሬ ማይል @@ -5260,27 +4783,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ካሬ ያርድ {0} ካሬ ያርድ - - ካሬ ጫማ - {0} ካሬ ጫማ - {0} ካሬ ጫማ - ካሬ ኢንች {0} ካሬ ኢንች {0} ካሬ ኢንች {0} ብካሬ ኢንች - - ዱናም - {0} ዱናም - {0} ዱናም - - - ካራት - {0} ካራት - {0} ካራት - ሚሊግራም ኣብ ሓደ ዲሲሊተርትሮ {0} ሚሊግራም ኣብ ሓደ ዲሲሊተርትሮ @@ -5293,13 +4801,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ኣቕሑ - {0} ኣቕሓ - {0} ኣቕሑ - - - ክፋል - {0} ክፋል - {0} ክፋል ክፍልታት ኣብ ሚልዮን @@ -5307,30 +4808,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ክፍልታት ኣብ ሚልዮን - ሚእታዊ {0} ሚእታዊ {0} ሚእታዊ - አብ ሚሌ {0} አብ ሚሌ {0} አብ ሚሌ - አብ ሚርያድ {0} አብ ሚርያድ {0} አብ ሚርያድ - - ሞል - {0} ሞል - {0} ሞል - - - ግሉኮስ - {0} ግሉኮስ - {0} ግሉኮስ - ሊትሮ ኣብ ኪሎሜትር {0} ሊትሮ አብ ኪሎሜትር @@ -5343,68 +4831,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic ማይል ኣብ ሓደ ጋሎን - {0} ማይልስ ኣብ ሓደ ጋሎን - {0} ማይልስ ኣብ ሓደ ጋሎን ማይል ኣብ ሓደ ኢምፕ. ጋሎን - {0} ማይል ኣብ ሓደ ኢምፕ. ጋሎን - {0} ማይል ኣብ ሓደ ኢምፕ. ጋሎን - - - ፔታባይት - {0} ፔታባይት - {0} ፔታባይት - - - ቴራባይት - {0} ቴራባይት - {0} ቴራባይት - - - ቴራቢት - {0} ቴራቢት - {0} ቴራቢት - - - ጊጋባይት - {0} ጊጋባይት - {0} ጊጋባይት - - - ጊጋቢት - {0} ጊጋቢት - {0} ጊጋቢት - - - ሜጋባይት - {0} ሜጋባይት - {0} ሜጋባይት - - - ሜጋቢት - {0} ሜጋቢት - {0} ሜጋቢት - - - ኪሎባይት - {0} ኪሎባይት - {0} ኪሎባይት - - - ኪሎቢት - {0} ኪሎቢት - {0} ኪሎቢት - - - ባይት - {0} ባይት - {0} ባይት - - - ቢት - {0} ቢት - {0} ቢት ዘመናት @@ -5415,54 +4844,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ዓሰርተታት ዓመታት - {0} ዓመት - {0} ዓመታት {0}/ዓመታት - ርብዒ {0}/ርብዒ {0} ርብዒ - {0}/ርብዒ - ኣዋርሕ {0} ወርሒ {0}/ኣዋርሕ - {0}/ወርሒ - ሰሙናት {0} ሰሙን {0} ሰሙናት - {0}/ሰሙን - መዓልታት - {0} መዓልቲ - {0} መዓልታት {0}/መዓልቲ - ሰዓታት {0} ሰዓት {0} ሰዓታት {0}/ሰዓት - ደቒቓታት {0} ደቒቓ {0} ደቒቓታት - {0}/ደቒቓ - ሴኮንድ - {0} ሴኮንድ - {0} ሴኮንድ {0}/ሴኮንድ - ሚሊሴኮንድ {0} ሚሊሴኮንድ {0} ሚሊሴኮንድ @@ -5471,53 +4882,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ማይክሮ ሰከንድ {0} ማይክሮ ሰከንድ - - አምፒር - {0} አምፒር - {0} አምፒር - - - ሚሊ አምፒር - {0} ሚሊ አምፒር - {0} ሚሊ አምፒር - - ኦህም {0} ኦህም {0} ኦህም - - ቮልት - {0} ቮልት - {0} ቮልት - ኪሎካሎሪ {0} ኪሎካሎሪ {0} ኪሎካሎሪ - - ካሎሪ - {0} ካሎሪ - {0} ካሎሪ - - ኪሎጁል {0} ኪሎጁል {0} ኪሎጁል - - ጁል - {0} ጁል - {0} ጁል - - ኪሎዋት-ሰዓት {0} ኪሎዋት ሰዓት {0} ኪሎዋት-ሰዓት - ኤሌክትሮኖቮልት {0} ኤሌክትሮኖቮልት {0} ኤሌክትሮኖቮልት @@ -5526,18 +4908,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ናይ እንግሊዝ ናይ ሙቐት መለክዒ {0} ናይ እንግሊዝ ናይ ሙቐት መለክዒ - - ናይ አመሪካ ናይ ሙቐት መለክዒ - {0} ናይ አመሪካ ናይ ሙቐት መለክዒ - {0} ናይ አመሪካ ናይ ሙቐት መለክዒ - - - ፓውንድ ሓይሊ - {0} ፓውንድ ሓይሊ - {0} ፓውንድ ሓይሊ - - ኒውተን {0} ኒውተን {0}ኒውተን @@ -5546,38 +4917,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ኪሎዋት-ሰዓት ኣብ 100 ኪሎሜትር {0} ኪሎዋት-ሰዓት ኣብ 100 ኪሎሜትር - - ጊጋኸርትዝ - {0} ጊጋኸርትዝ - {0} ጊጋኸርትዝ - - - ሜጋኸርትዝ - {0} ሜጋኸርትዝ - {0} ሜጋኸርትዝ - - - ኪሎኸርትዝ - {0} ኪሎኸርትዝ - {0} ኪሎኸርትዝ - - - ኸርትዝ - {0} ኸርትዝ - {0} ኸርትዝ - ታይፕግራፊክ ኢኤምኤስ {0} ኢኤም {0} ኢኤምኤስ - ፒክሰላት {0} ፒክስል {0} ፒክሰላት - ሜጋፒክሰላታ {0} ሜጋፒክሰል {0} ሜጋፒክሰላት @@ -5591,23 +4940,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ፒክሰል ኣብ ኢንች {0} ፒክሰል ኣብ ኢንች - - ፒፒሴሜ - {0} ፒፒሴሜ - {0} ፒፒሴሜ - ነጥብታት ኣብ ኢንች {0} ነጥብ ኣብ ኢንች {0} ነጥብታት ኣብ ኢንች - - ነጥብታት - {0} ነጥብ - {0} ነጥብታት - - ራድየስ መሬት {0} ራድየስ መሬት {0} ራድየስ መሬት @@ -5640,7 +4978,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ሚሊሜተር - ማይክሮሜተር {0} ማይክሮሜተር {0} ማይክሮሜተር @@ -5655,20 +4992,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ፒኮሜተር - ማይላት {0} ማይል {0} ማይላት - ያርድስ {0} ያርድ {0} ያርድስ - ፊት {0} ፉት {0} ፊት - {0}/ፊት ኢንች @@ -5687,27 +5020,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ናይ ባሕሪ ማይላት - ናይ ጸሓይ ራዲየስ {0} ናይ ጸሓይ ራዲየስ {0} ናይ ጸሓይ ራዲየስ - - ለክስ - {0} ለክስ - {0} ለክስ - - - ካንዴላ - {0} ካንዴላ - {0} ካንዴላ - - - ሉመን - {0} ሉመን - {0} ሉመን - - ጸሓያዊ ብርሃናት {0} ጸሓያዊ ብርሃን {0} ጸሓያዊ ብርሃናት @@ -5723,7 +5039,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} አብ ኪሎግራም - ግራም {0} ግራም {0} ግራም {0} አብ ግራም @@ -5739,132 +5054,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ማይክሮ ግራም - ፓውንድ - {0} ፓውንድ - {0} ፓውንድ {0} አብ ፓውንድ - ኣውንስ {0} ኣውንስ {0} oኣውንስ {0} አብ ኣውንስ - - ትሮይ ኣውንስ - {0} ትሮይ ኣውንስ - {0} ትሮይ ኣውንስ - - - ካራት - {0} ካራት - {0} ካራት - - - ዳልቶን - {0} ዳልቶን - {0} ዳልቶን - - ናይ መሬት ክብደት {0} ናይ መሬት ክብደት {0} ናይ መሬት ክብደት - ናይ ጸሓይ ክብደት {0} ናይ ጸሓይ ክብደት {0} ናይ ጸሓይ ክብደት - - ግሬን - {0} ግሬን - {0} ግሬን - - - ጊጋዋት - {0} ጊጋዋት - {0} ጊጋዋት - - - ሜጋዋት - {0} ሜጋዋት - {0} ሜጋዋት - - - ኪሎዋት - {0} ኪሎዋት - {0} ኪሎዋት - - - ዋት - {0} ዋት - {0} ዋት - - - ሚሊዋት - {0} ሚሊዋት - {0} ሚሊዋት - - - ሓይሊ ፈረስ - {0} ሓይሊ ፈረስ - {0} ሓይሊ ፈረስ - ሚሊሜተር ሜርኩሪ {0} ሚሊሜተር ሜርኩሪ {0} ሚሊሜተር ሜርኩሪ - - ሜርኩሪ - {0} ሜርኩሪ - {0} ሜርኩሪ - ፓውንድ-ሓይሊ ኣብ ሓደ ካሬ ኢንች {0} ፓውንድ-ሓይሊ ኣብ ሓደ ካሬ ኢንች {0} ፓውንድ-ሓይሊ ኣብ ሓደ ካሬ ኢንች - - ኢንች ሜርኩሪ - {0} ኢንች ሜርኩሪ - {0} ኢንች ሜርኩሪ - - - ባር - {0} ባር - {0} ባር - - - ሚሊባር - {0} ሚሊባር - {0} ሚሊባር - - - አትሞስፌር - {0} አትሞስፌር - {0} አትሞስፌር - - - ፓስካል - {0} ፓስካል - {0} ፓስካል - - - ሄክቶ ፓስካል - {0} ሄክቶ ፓስካል - {0} ሄክቶ ፓስካል - - - ኪሎፓስካል - {0} ኪሎፓስካል - {0} ኪሎፓስካል - - - ሜጋፓስካል - {0} ሜጋፓስካል - {0} ሜጋፓስካል - ኪሎሜተር ኣብ ሰዓት {0} ኪሎሜተር ኣብ ሰዓት @@ -5877,26 +5091,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ማይል ኣብ ሰዓት - {0} ማይል ኣብ ሰዓት - {0} ማይል ኣብ ሰዓት - - - እስር - {0} እስር - {0} እስር - ዲግሪ ሙቐት {0} ዲግሪ ሙቐት {0} ዲግሪ ሙቐት - ዲግሪ ሴንቲግሬድ {0} ዲግሪ ሴንቲግሬድ {0} ዲግሪ ሴንቲግሬድ - ዲግሪ ፋረንሃይት {0} ዲግሪ ፋረንሃይት {0} ዲግሪ ፋረንሃይት @@ -5905,16 +5109,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ኬልቪን {0} ኬልቪን - - ፓውንድ ሓይሊ ጫማ - {0} ፓውንድ ሓይሊ ጫማ - {0} ፓውንድ ሓይሊ ጫማ - - - ኒውተን ሜትር - {0} ኒውተን ሜትር - {0} ኒውተን ሜትር - ኪሎ ሜትር ኪዩብ {0} ኪሎ ሜትር ኪዩብ @@ -5952,173 +5146,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ኢንች ክዩብ {0} ኢንች ክዩብ - - ሜጋ ሊትሮ - {0} ሜጋ ሊትሮ - {0} ሜጋ ሊትሮ - - - ሄክቶ ሊትሮ - {0} ሄክቶ ሊትሮ - {0} ሄክቶ ሊትሮ - - - ሊትሮ - {0} ሊትሮ - {0} ሊትሮ - {0} ብሊትሮ - - - ዴሲ ሊትሮ - {0} ዴሲ ሊትሮ - {0} ዴሲ ሊትሮ - - - ሴንቲ ሊትሮ - {0} ሴንቲ ሊትሮ - {0} ሴንቲ ሊትሮ - - - ሚሊ ሊትሮ - {0} ሚሊ ሊትሮ - {0} ሚሊ ሊትሮ - - - ሜትሪክ ፓይንት - {0} ሜትሪክ ፓይንት - {0} ሜትሪክ ፓይንት - - - ሜትሪክ ፈሳሲ ኦውንስ - {0} ሜትሪክ ፈሳሲ ኦውንስ - {0} ሜትሪክ ፈሳሲ ኦውንስ - - - acre-ጫማ - {0} acre ጫማ - {0} acre ጫማ - - - ዳውላ - {0} ዳውላ - {0} ዳውላ - - - ጋሎን - {0} ጋሎን - {0} ጋሎን - {0} ብጋሎን - - - ኢምፕ. ጋሎን - {0} ኢምፕ. ጋሎን - {0} ኢምፕ. ጋሎን - {0} ብኢምፕ. ጋሎን - - - ርብዒ ጋሎን - {0} ርብዒ ጋሎን - {0} ርብዒ ጋሎን - - - ፒንት - {0} ፒንት - {0} ፒንት - - - ኩባያ - {0} ኩባያ - {0} ኩባያ - - - ፈሳሲ ኦውንስ - {0} ፈሳሲ ኦውንስ - {0} ፈሳሲ ኦውንስ - - - ኢምፕ. ፈሳሲ ኦውንስ - {0} ኢምፕ. ፈሳሲ ኦውንስ - {0} ኢምፕ. ፈሳሲ ኦውንስ - - - ማንካ - {0} ማንካ - {0} ማንካ - - - ናይ ሻሂ ማንካ - {0} ናይ ሻሂ ማንካ - {0} ናይ ሻሂ ማንካ - - - በርሚል - {0} በርሚል - {0} በርሚል - - - ናይ ኬክ ማንካ - {0} ናይ ኬክ ማንካ - {0} ናይ ኬክ ማንካ - - - ኢምፕ. ናይ ኬክ ማንካ - {0} ኢምፕ ናይ ኬክ ማንካ - {0} ኢምፕ. ናይ ኬክ ማንካ - - - ጠብታ - {0} ጠብታ - {0} ጠብታ + + ሜጋ ሊትሮ + {0} ሜጋ ሊትሮ + {0} ሜጋ ሊትሮ - - ድራም - {0} ድራም - {0} ድራም + + ሄክቶ ሊትሮ + {0} ሄክቶ ሊትሮ + {0} ሄክቶ ሊትሮ - - ጂገር - {0} ጂገር - {0} ጂገር + + {0} ሊትሮ + {0} ሊትሮ + {0} ብሊትሮ - - ቁንጣር - {0} ቁንጣር - {0} ቁንጣር + + ዴሲ ሊትሮ + {0} ዴሲ ሊትሮ + {0} ዴሲ ሊትሮ - - ኢምፒ. ርብዒ ጋሎን - {0} ኢምፒ. ርብዒ ጋሎን - {0} ኢምፒ. ርብዒ ጋሎን + + ሴንቲ ሊትሮ + {0} ሴንቲ ሊትሮ + {0} ሴንቲ ሊትሮ - - ስትራዲያን - {0} ስትራዲያን - {0} ስትራዲያን + + ሚሊ ሊትሮ + {0} ሚሊ ሊትሮ + {0} ሚሊ ሊትሮ - - ካታል - {0} ካታል - {0} ካታል + + ሜትሪክ ፓይንት + {0} ሜትሪክ ፓይንት + {0} ሜትሪክ ፓይንት - - ኮለምብ - {0} ኮለምብ - {0} ኮለምብ + + ሜትሪክ ፈሳሲ ኦውንስ + {0} ሜትሪክ ፈሳሲ ኦውንስ + {0} ሜትሪክ ፈሳሲ ኦውንስ - - ፋራድ - {0} ፋራድ - {0} ፋራድ + + acre-ጫማ + {0} acre ጫማ + {0} acre ጫማ - - ሄነሪ - {0} ሄነሪ - {0} ሄነሪ + + {0} ብጋሎን - - ሲመን - {0} ሲመን - {0} ሲመን + + {0} ብኢምፕ. ጋሎን + + + {0} ኢምፕ ናይ ኬክ ማንካ + {0} ኢምፕ. ናይ ኬክ ማንካ ካሎሪ [IT] @@ -6145,38 +5226,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ኪሎግራም-ሓይሊ {0} ኪሎግራም-ሓይሊ - - ቴስላ - {0} ቴስላ - {0} ቴስላ - - - ዌበር - {0} ዌበር - {0} ዌበር - - - ብርሃን - {0} ብርሃን - {0} ብርሃን - ክፍልታት ኣብ ሓደ ቢልዮን {0} ክፍልታት ኣብ ሓደ ቢልዮን {0} ክፍልታት ኣብ ሓደ ቢልዮን - - ለይቲ - {0} ለይቲ - {0} ለይቲ - {0}/ ለይቲ - ካርዲናል ኣንፈት - {0} ምብራቕ - {0} ሰሜን - {0} ደቡብ - {0} ምዕራብ @@ -6661,16 +5717,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ፒፒኢ {0} ፒፒኢ - - ፒፒሴሜ - {0} ፒፒሴሜ - {0} ፒፒሴሜ - - - ፒፒኢ - {0} ፒፒኢ - {0} ፒፒኢ - ነጥብታት {0} ነጥብ @@ -7206,101 +6252,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - ዴሲ{0} - - - ሴንቲ{0} - - - ሚሊ{0} - - - ናኖ{0} - - - ፒኮ{0} - - - ፌምቶ{0} - - - አቶ{0} - - - ዜፕቶ{0} - - - ዮክቶ{0} - - - ሮንቶ{0} - - - ክዌክቶ{0} - - - ዴካ{0} - - - ሄክቶ{0} - - - ኪ{0} - - - ሜጋ{0} - - - ጊጋ{0} - - - ቴራ{0} - - - ፔታ{0} - - - ኤግዛ{0} - - - ዜታ{0} - - - ዮታ{0} - - - ሮና{0} - - - ክዌታ{0} - - - ኪቢ{0} - - - ሜቢ{0} - - - ጊቢ{0} - - - ቴቢ{0} - - - ፔቢ{0} - - - ኤግዚቢ{0} - - - ዜቢ{0} - - - ዮቢ{0} - - ሓይሊ ስሕበት {0}ስሕበት {0}ስሕበት @@ -7310,54 +6262,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ሜ/ሰ² - ሬቮልዩሽን {0}ሬቮልዩሽን {0}ሬቮልዩሽን - ራድያን {0}ራድያን {0}ራድያን - - ዲግሪ - ኣርክ ደቒቓ - {0} ኣርክ ደቒቓ - {0} ኣርክ ደቓይቕ - - - ኣርክ ሰከንድ - ኪሜ² {0}ኪሜ² {0}ኪሜ² - {0}/ኪሜ² - ሄክታር {0}ሄክ {0}ሄክ - ሜተር² {0}ሜ² {0}ሜ² - {0}/ሜ² - ሴሜ² {0}ሴሜ² {0}ሴሜ² - {0}/ሴሜ² ማ² {0}ማ² {0}ማ² - {0}/ማ² ያ² @@ -7370,63 +6304,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ጫማ² - ኢንች² {0}ኢንች² {0}ኢንች² - {0}/ኢንች² - ዱናም {0}ዱናም {0}ዱናም - ካራት {0}ካራት {0}ካራት - ሚግ/ዲሲሊተርትሮ {0}ሚግ/ዲሲሊተርትሮ {0}ሚግ/ዲሲሊተርትሮ - ሚሊሞል/ሊትሮ {0}ሚሊሞል/ሊትሮ {0}ሚሊሞል/ሊትሮ - ኣቕሓ {0}ኣቕሓ {0}ኣቕሑ - - ክፋል - {0} ክፋል - {0} ክፋል - ክፍልታት ኣብ ሚልዮን {0}ክፍልታት ኣብ ሚልዮን {0}ክፍልታት ኣብ ሚልዮን - ሞል {0}ሞል {0}ሞል - - ግሉኮስ - {0} ግሉኮስ - {0} ግሉኮስ - ሊትሮ/ኪሜ {0}ሊትሮ/ኪሜ {0}ሊትሮ/ኪሜ - ሊትሮ/100 ኪሜ {0}ሊትሮ/100 ኪሜ {0}ሊትሮ/100 ኪሜ @@ -7441,57 +6356,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ናይ እንግሊዝ ማይል/ሓደ ጋሎን - ፔታባይት {0}ፔታባይት {0}ፔታባይት - ቴራባይት {0}ቴራባይት {0}ቴራባይት - ቴራቢት {0}ቴራቢት {0}ቴራቢት - ጊጋባይት {0}ጊጋባይት {0}ጊጋባይት - ጊጋቢት {0}ጊጋቢት {0}ጊጋቢት - ሜጋባይት {0}ሜጋባይት {0}ሜጋባይት - ሜጋቢት {0}ሜጋቢት {0}ሜጋቢት - ኪሎባይት {0}ኪሎባይት {0}ኪሎባይት - ኪሎቢት {0}ኪሎቢት {0}ኪሎቢት - ባይት {0}ባይት {0}ባይት - ቢት {0}ቢት {0}ቢት @@ -7500,86 +6404,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} ዓ.ዓ. - ዓመታት {0} ዓመት {0}ዓመት - {0}/ዓመት - - - ርብዒ - {0} ርብዒ - {0} ርብዒ - {0}/ርብዒ ወርሒ {0}/ወ {0}/ወ - {0}/ወርሒ ሰሙ {0} ሰ {0} ሰ - {0}/ሰሙን - መዓልታት {0} መ {0} መ - {0}/መ ሰዓት {0} ሰ {0} ሰ - {0}/ሰ ደቒቓ {0} ደ {0} ደ - {0}/ደቒቓ - ሴኮንድ {0} ሴ {0} ሴ - {0}/ሴ ሚሴኮንድ - {0} ሚሴ - {0} ሚሴ - - - μሰከንድ - አምፒር {0}አምፒር {0}አምፒር - ሚሊ አምፒር {0}ሚሊ አምፒር {0}ሚሊ አምፒር - - ኦህም - - ቮልት {0}ቮልት {0}ቮልት - ኪካሎሪ {0}ኪካሎሪ {0}ኪካሎሪ - ካሎሪ {0}ካሎሪ {0}ካሎሪ @@ -7589,7 +6464,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ኪጁ - ጁል {0}ጁል {0}ጁል @@ -7604,113 +6478,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ኤሌክትሮኖቮልት - ናይ አመሪካ ናይ ሙቐት መለክዒ {0}ናይ አመሪካ ናይ ሙቐት መለክዒ {0}ናይ አመሪካ ናይ ሙቐት መለክዒ - ፓውንድ ሓይሊ {0}ፓውንድ ሓይሊ {0}ፓውንድ ሓይሊ - ኒውተን {0}ኒውተን {0}ኒውተን - ኪሎዋት-ሰዓት/100 ኪሎሜትር {0}ኪሎዋት-ሰዓት/100 ኪሎሜትር {0}ኪሎዋት-ሰዓት/100 ኪሎሜትር - ጊጋኸርትዝ {0}ጊጋኸርትዝ {0}ጊጋኸርትዝ - ሜጋኸርትዝ {0}ሜጋኸርትዝ {0}ሜጋኸርትዝ - ኪሎኸርትዝ {0}ኪሎኸርትዝ {0}ኪሎኸርትዝ - ኸርትዝ {0}ኸርትዝ {0}ኸርትዝ - - ኢኤም - {0} ኢኤም - {0} ኢኤም - ፒክ - {0} ፒክ - {0} ፒክ ሜፕ - {0} ሜጋ - {0} ሜጋ - - - ፒፒሴሜ - {0} ፒፒሴሜ - {0} ፒፒሴሜ - - - ፒፒኢ - {0} ፒፒኢ - {0} ፒፒኢ - - - ፒፒሴሜ - {0} ፒፒሴሜ - {0} ፒፒሴሜ - - - ፒፒኢ - {0} ፒፒኢ - {0} ፒፒኢ ነጥብ {0} ነጥብ {0} ነጥብ - - ራድየስ መሬት - - - ኪሜ - {0} ኪሜ - {0} ኪሜ - {0}/ኪሜ - - ሜ {0}ሜ {0}ሜ - {0}/ሜ - ዴሜ {0}ዴሜ {0}ዴሜ - ሴሜ {0}ሴሜ {0}ሴሜ - {0}/ሴሜ - ሚሜ {0}ሚሜ {0}ሚሜ @@ -7719,13 +6541,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ማሜ {0}ማሜ - - ናሜ - {0} ናሜ - {0} ናሜ - - ፒሜ {0}ፒሜ {0}ፒሜ @@ -7740,16 +6556,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ያ - ፊት {0}′ {0}′ - {0}/ፊት ኢን {0}″ {0}″ - {0}/ኢን {0}nmi @@ -7760,170 +6573,119 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}R☉ - ለክስ {0}ለክስ {0}ለክስ - ካንዴላ {0}ካንዴላ {0}ካንዴላ - ሉመን {0}ሉመን {0}ሉመን - ቶን {0}ቶን {0}ቶን - ኪግ {0}ኪግ {0}ኪግ - {0}/ኪግ - ግራም {0}ግ {0}ግ - {0}/ግራም - ሚግ {0}ሚግ {0}ሚግ - μግ {0}μግ {0}μግ - - ፓውንድ - {0} ፓውንድ - {0} ፓውንድ - {0}/ፓውንድ - - ኣውንስ {0}ኣውንስ {0}ኣውንስ - {0}/ኣውንስ - ትሮይ ኣውንስ {0}ትሮይ ኣውንስ {0}ትሮይ ኣውንስ - ካራት {0}ካራት {0}ካራት - ዳልቶን {0}ዳልቶን {0}ዳልቶን - - ናይ መሬት ክብደት - - - ናይ ጸሓይ ክብደት - - ግሬን {0}ግሬን {0}ግሬን - ጊጋዋት {0}ጊጋዋት {0}ጊጋዋት - ሜጋዋት {0}ሜጋዋት {0}ሜጋዋት - ኪሎዋት {0}ኪሎዋት {0}ኪሎዋት - ዋት {0}ዋት {0}ዋት - ሚሊዋት {0}ሚሊዋት {0}ሚሊዋት - ሓይሊ ፈረስ {0}ሓይሊ ፈረስ {0}ሓይሊ ፈረስ - ሚሜ ሜርኩሪ {0}ሚሜ ሜርኩሪ {0}ሚሜ ሜርኩሪ - - ሜርኩሪ - {0} ሜርኩሪ - {0} ሜርኩሪ - - - ፒ.ኤስ.አይ - ″ ሜርኩሪ {0}″ ሜርኩሪ {0}″ ሜርኩሪ - ባር {0}ባር {0}ባር - ሚሊባር {0}ሚሊባር {0}ሚሊባር - አትሞስፌር {0}አትሞስፌር {0}አትሞስፌር - ፓስካል {0}ፓስካል {0}ፓስካል - ሄክቶ ፓስካል {0}ሄክቶ ፓስካል {0}ሄክቶ ፓስካል - ኪሎፓስካል {0}ኪሎፓስካል {0}ኪሎፓስካል - ሜጋፓስካል {0}ሜጋፓስካል {0}ሜጋፓስካል - ኪሜ/ሰዓት {0}ኪሜ/ሰዓት {0}ኪሜ/ሰዓት @@ -7933,62 +6695,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ሜ/ሰ - ማይል/ሰዓት {0}ማይል ኣብ ሰዓት {0}ማይል ኣብ ሰዓት - እስር {0}እስር {0}እስር - - ዲግሪ ሙቐት - - ዲግሪ ሴንቲግሬድ - {0}°ሴ - {0}°ሴ + °C - ዲግሪ ፋረንሃይት {0}° {0}° - ኬ {0}ኬ {0}ኬ - ፓውንድ ሓይሊ ጫማ {0}ፓውንድ ሓይሊ ጫማ {0}ፓውንድ ሓይሊ ጫማ - ኒውተን ሜትር {0}ኒውተን ሜትር {0}ኒውተን ሜትር - ኪሜ³ {0}ኪሜ³ {0}ኪሜ³ - ሜ³ {0}ሜ³ {0}ሜ³ - {0}/ሜ³ ሴሜ³ {0}ሴሜ³ {0}ሴሜ³ - {0}/ሴሜ³ - ማ³ {0}ማ³ {0}ማ³ @@ -7998,43 +6744,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ያ³ - ጫማ³ {0}ጫማ³ {0}ጫማ³ - ኢንች³ {0}ኢንች³ {0}ኢንች³ - ሜሊ {0}ሜሊ {0}ሜሊ - ሄሊ {0}ሄሊ {0}ሄሊ - ሊትሮ {0}ሊ {0}ሊ - {0}/ሊ - ዴሊ {0}ዴሊ {0}ዴሊ - ሴሊ {0}ሴሊ {0}ሴሊ - ሚሊ {0}ሚሊ {0}ሚሊ @@ -8044,44 +6781,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ሜፓ - acre ጫማ {0}ac ጫማ {0}ac ጫማ - ዳውላ {0}ዳውላ {0}ዳውላ - ጋሎን {0}ጋሎን {0}ጋሎን {0}/ጋሎን - ኢምፕ. ጋሎን {0}ኢምፕጋሎን {0}ኢምፕጋሎን - {0}/ኢምፕጋሎን - ርብዒ ጋሎን {0}ርብዒ ጋሎን {0}ርብዒ ጋሎን - ፒንት {0}ፒንት {0}ፒንት - ኩባያ {0}ኩባያ {0}ኩባያ - ፈሳሲ ኦውንስ {0}ፈሳሲ ኦውንስ {0}ፈሳሲ ኦውንስ @@ -8091,22 +6819,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ኢምፕ ፈሳሲ ኦውንስ - ማንካ {0}ማንካ {0}ማንካ - ናይ ሻሂ ማንካ {0}ናይ ሻሂ ማንካ {0}ናይ ሻሂ ማንካ - በርሚል {0}በርሚል {0}በርሚል - ናይ ኬክ ማንካ {0}ናይ ኬክ ማንካ {0}ናይ ኬክ ማንካ @@ -8116,22 +6840,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ኢምፕ ናይ ኬክ ማንካ - ጠብታ {0}ጠብታ {0}ጠብታ - ድራም {0}ድራም {0}ድራም - ጂገር {0}ጂገር {0}ጂገር - ቁንጣር {0}ቁንጣር {0}ቁንጣር @@ -8140,58 +6860,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ኢምፒ. ርብዒ ጋሎን {0}ኢምፒ. ርብዒ ጋሎን - - ስትራዲያን - {0} ስትራዲያን - {0} ስትራዲያን - - - ካታል - {0} ካታል - {0} ካታል - - - ኮለምብ - {0} ኮለምብ - {0} ኮለምብ - - - ፋራድ - {0} ፋራድ - {0} ፋራድ - - - ሄነሪ - {0} ሄነሪ - {0} ሄነሪ - - - ሲመን - {0} ሲመን - {0} ሲመን - - - ካል-IT - {0} ካል-IT - {0} ካል-IT - - - ኪሎግ-ሓ - {0} ኪሎግ-ሓ - {0} ኪሎግ-ሓ - - - ቴስላ - {0} ቴስላ - {0} ቴስላ - - - ዌበር - {0} ዌበር - {0} ዌበር - - ብርሃን {0}ብርሃን {0}ብርሃን @@ -8200,14 +6869,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ክፍልታት ኣብ ሓደ ቢልዮን {0}ክፍልታት ኣብ ሓደ ቢልዮን - - ለይቲ - {0} ለይቲ - {0} ለይቲ - {0}/ ለይቲ - - ኣንፈት {0}ምብራቕ {0}ሰሜን {0}ደቡብ @@ -8231,9 +6893,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}፣ {1} - - {0}፣ {1} - {0} {1} {0} {1} @@ -8515,12 +7174,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {surname}፣ {given-informal} - - {surname-core}፣ {given} {given2} {surname-prefix} - - - {surname-core}፣ {given} {given2} {surname-prefix} - ዘንዳያ diff --git a/make/data/cldr/common/main/ti_ER.xml b/make/data/cldr/common/main/ti_ER.xml index 7aea00066119..24c4ba679406 100644 --- a/make/data/cldr/common/main/ti_ER.xml +++ b/make/data/cldr/common/main/ti_ER.xml @@ -89,7 +89,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - EEEE, MMMM d, y G + EEEE፡ dd MMMM መዓልቲ y G GyMMMMEEEEdd diff --git a/make/data/cldr/common/main/tig.xml b/make/data/cldr/common/main/tig.xml deleted file mode 100644 index d73a420c089a..000000000000 --- a/make/data/cldr/common/main/tig.xml +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - አፋርኛ - አብሐዚኛ - አፍሪቃንስኛ - አምሐረኛ - ዐርቢኛ - አሳሜዛዊ - አያማርኛ - አዜርባይጃንኛ - ባስኪርኛ - ቤላራሻኛ - ቡልጋሪኛ - ቢስላምኛ - በንጋሊኛ - ትበትንኛ - ብሬቶንኛ - ብሊን - ካታላንኛ - ኮርሲካኛ - ቼክኛ - ወልሽ - ዴኒሽ - ጀርመን - ድዞንግኻኛ - ግሪክኛ - እንግሊዝኛ - ኤስፐራንቶ - ስፓኒሽ - ኤስቶኒአን - ባስክኛ - ፐርሲያኛ - ፊኒሽ - ፊጂኛ - ፋሮኛ - ፈረንሳይኛ - ፍሪስኛ - አይሪሽ - እስኮትስ ጌልክኛ - ግዕዝኛ - ጋለጋኛ - ጓራኒኛ - ጉጃርቲኛ - ሃውሳኛ - ዕብራስጥ - ሐንድኛ - ክሮሽያንኛ - ሀንጋሪኛ - አርመናዊ - ኢንቴርሊንጓ - እንዶኒሲኛ - እንተርሊንግወ - እኑፒያቅኛ - አይስላንድኛ - ጣሊያንኛ - እኑክቲቱትኛ - ጃፓንኛ - ጃቫንኛ - ጊዮርጊያን - ካዛክኛ - ካላሊሱትኛ - ክመርኛ - ካናዳኛ - ኮሪያኛ - ካሽሚርኛ - ኩርድሽኛ - ኪርጊዝኛ - ላቲንኛ - ሊንጋላኛ - ላውስኛ - ሊቱአኒያን - ላትቪያን - ማላጋስኛ - ማዮሪኛ - ማከዶኒኛ - ማላያላምኛ - ሞንጎላዊኛ - ማራዚኛ - ማላይኛ - ማልቲስኛ - ቡርማኛ - ናኡሩ - ኔፓሊኛ - ደች - ኖርዌጂያን - ኦኪታንኛ - ኦሮምኛ - ኦሪያኛ - ፓንጃቢኛ - ፖሊሽ - ፑሽቶኛ - ፖርቱጋሊኛ - ኵቿኛ - ሮማንስ - ሩንዲኛ - ሮማኒያን - ሞልዳቫዊና - ራሽኛ - ኪንያርዋንድኛ - ሳንስክሪትኛ - ሲንድሂኛ - ሳንጎኛ - ስንሃልኛ - ሲዳምኛ - ስሎቫክኛ - ስሎቪኛ - ሳሞአኛ - ሾናኛ - ሱማልኛ - ልቤኒኛ - ሰርቢኛ - ስዋቲኛ - ሶዞኛ - ሱዳንኛ - ስዊድንኛ - ስዋሂሊኛ - ታሚልኛ - ተሉጉኛ - ታጂኪኛ - ታይኛ - ትግርኛ - ትግረ - ቱርክመንኛ - ታጋሎገኛ - ጽዋናዊኛ - ቶንጋ - ቱርክኛ - ጾንጋኛ - ታታርኛ - ትዊኛ - ኡዊግሁርኛ - ዩክረኒኛ - ኡርዱኛ - ኡዝበክኛ - ቪትናምኛ - ቮላፑክኛ - ዎሎፍኛ - ዞሳኛ - ይዲሻዊኛ - ዮሩባዊኛ - ዡዋንግኛ - ቻይንኛ - ዙሉኛ - - - - - - አንዶራ - የተባበሩት አረብ ኤምሬትስ - አልባኒያ - አርሜኒያ - አርጀንቲና - ኦስትሪያ - አውስትሬሊያ - አዘርባጃን - ቦስኒያ እና ሄርዞጎቪኒያ - ባርቤዶስ - ቤልጄም - ቡልጌሪያ - ባህሬን - ቤርሙዳ - ቦሊቪያ - ብራዚል - ቡህታን - ቤላሩስ - ቤሊዘ - ኮንጎ - የመካከለኛው አፍሪካ ሪፐብሊክ - ስዊዘርላንድ - ቺሊ - ካሜሩን - ቻይና - ኮሎምቢያ - ኬፕ ቬርዴ - ሳይፕረስ - ቼክ ሪፑብሊክ - ጀርመን - ዴንማርክ - ዶሚኒካ - ዶሚኒክ ሪፑብሊክ - አልጄሪያ - ኢኳዶር - ኤስቶኒያ - ግብጽ - ምዕራባዊ ሳህራ - ኤርትራ - ስፔን - ኢትዮጵያ - ፊንላንድ - ፊጂ - ሚክሮኔዢያ - ፈረንሳይ - እንግሊዝ - ጆርጂያ - የፈረንሳይ ጉዊአና - ጋምቢያ - ጊኒ - ኢኳቶሪያል ጊኒ - ግሪክ - ቢሳዎ - ጉያና - ሆንግ ኮንግ - ክሮኤሽያ - ሀይቲ - ሀንጋሪ - ኢንዶኔዢያ - አየርላንድ - እስራኤል - ህንድ - ኢራቅ - አይስላንድ - ጣሊያን - ጃማይካ - ጆርዳን - ጃፓን - ካምቦዲያ - ኮሞሮስ - ሰሜን ኮሪያ - ደቡብ ኮሪያ - ክዌት - ሊባኖስ - ሊቱዌኒያ - ላትቪያ - ሊቢያ - ሞሮኮ - ሞልዶቫ - ማከዶኒያ - ሞንጎሊያ - ማካዎ - ሞሪቴኒያ - ማልታ - ማሩሸስ - ሜክሲኮ - ማሌዢያ - ናሚቢያ - ኒው ካሌዶኒያ - ናይጄሪያ - ኔዘርላንድ - ኖርዌ - ኔፓል - ኒው ዚላንድ - ፔሩ - የፈረንሳይ ፖሊኔዢያ - ፓፑዋ ኒው ጊኒ - ፖላንድ - ፖርታ ሪኮ - ሮሜኒያ - ራሺያ - ሳውድአረቢያ - ሱዳን - ስዊድን - ሲንጋፖር - ስሎቬኒያ - ስሎቫኪያ - ሴኔጋል - ሱማሌ - ሲሪያ - ቻድ - የፈረንሳይ ደቡባዊ ግዛቶች - ታይላንድ - ታጃኪስታን - ምስራቅ ቲሞር - ቱኒዚያ - ቱርክ - ትሪኒዳድ እና ቶባጎ - ታንዛኒያ - ዩጋንዳ - አሜሪካ - ዩዝበኪስታን - ቬንዙዌላ - የእንግሊዝ ድንግል ደሴቶች - የአሜሪካ ቨርጂን ደሴቶች - የመን - ደቡብ አፍሪካ - ዛምቢያ - - - - [፟ ፡ ፣ ፤ ፥ ፦ ፧ ። ፠ ፨ ᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻ ፼ ሀ ሁ ሂ ሃ ሄ ህ ሆ ሇ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ⶀ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ᎀ ᎁ ᎂ ᎃ ⶁ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ⶂ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ⶃ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ⶄ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቇ ቈ ቊ ቋ ቌ ቍ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ᎄ ᎅ ᎆ ᎇ ⶅ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ⶆ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ⶇ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኇ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ⶈ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ ⶉ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ⶊ ከ ኩ ኪ ካ ኬ ክ ኮ ኯ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ወ ዉ ዊ ዋ ዌ ው ዎ ዏ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ⶋ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ዯ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ⶎ ገ ጉ ጊ ጋ ጌ ግ ጎ ጏ ጐ ጒ ጓ ጔ ጕ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ⶏ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ⶐ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ⶑ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፇ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ᎈ ᎉ ᎊ ᎋ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ] - [ሀ ለ ⶀ መ ᎀ ᎁ ᎃ ⶁ ረ ⶂ ሰ ሸ ⶄ ቈ ቐ ቘ ᎄ ᎅ ᎇ ⶅ ቨ ⶆ ቸ ኀ ኈ ነ ኘ ⶉ ⶊ ከ ኰ ዀ ወ ዐ ⶋ ዠ ደ ⶌ ዸ ጀ ⶎ ጐ ጘ ⶓ ⶕ ⶖ ⶏ ጨ ⶐ ⶑ ጸ ፈ ᎈ ᎉ ᎋ ፐ ᎍ ᎎ ᎏ ፘ ⶠ ⶢ ⶣ ⶤ ⶦ ⶨ ⶩ ⶫ ⶬ ⶮ ⶰ ⶱ ⶳ ⶴ ⶶ ⶸ ⶹ ⶻ ⶼ ⶾ ⷀ ⷁ ⷃ ⷄ ⷆ ⷈ ⷉ ⷋ ⷌ ⷎ ⷐ ⷑ ⷓ ⷔ ⷖ ⷘ ⷙ ⷛ ⷜ ⷝ] - - - - - - - - EEEE፡ dd MMMM ዮም y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - - - ጃንዩ - ፌብሩ - ማርች - ኤፕረ - ሜይ - ጁን - ጁላይ - ኦገስ - ሴፕቴ - ኦክተ - ኖቬም - ዲሴም - - - ጃንዩወሪ - ፌብሩወሪ - ማርች - ኤፕረል - ሜይ - ጁን - ጁላይ - ኦገስት - ሴፕቴምበር - ኦክተውበር - ኖቬምበር - ዲሴምበር - - - - - ጃ - ፌ - ማ - ኤ - ሜ - ጁ - ጁ - ኦ - ሴ - ኦ - ኖ - ዲ - - - - - - - ሰ/ዓ - ሰኖ - ታላሸ - ኣረር - ከሚሽ - ጅምዓ - ሰ/ን - - - ሰንበት ዓባይ - ሰኖ - ታላሸኖ - ኣረርባዓ - ከሚሽ - ጅምዓት - ሰንበት ንኢሽ - - - - - ሰ - ሰ - ታ - ኣ - ከ - ጅ - ሰ - - - - - - - ቀደም ሰርምዕል - ሓቆ ስርምዕል - - - - - - ዓ/ዓ - ዓ/ም - - - - - - EEEE፡ dd MMMM ዮም y G - GyMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - ethi - - - - - ¤#,##0.00 - - - - - - የብራዚል ሪል - - - የቻይና ዩአን ረንሚንቢ - - - Nfk - - - የኢትዮጵያ ብር - - - አውሮ - - - የእንግሊዝ ፓውንድ ስተርሊንግ - - - የሕንድ ሩፒ - - - የጃፓን የን - - - የራሻ ሩብል - - - የአሜሪካን ዶላር - - - - diff --git a/make/data/cldr/common/main/tig_ER.xml b/make/data/cldr/common/main/tig_ER.xml deleted file mode 100644 index d6a42136cdbb..000000000000 --- a/make/data/cldr/common/main/tig_ER.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/tk.xml b/make/data/cldr/common/main/tk.xml index ba38d660db8d..53770a45c468 100644 --- a/make/data/cldr/common/main/tk.xml +++ b/make/data/cldr/common/main/tk.xml @@ -157,7 +157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic hiligaýnon dili hmong dili horwat dili - ýokarky lužits dili + ýokarky lužisa dili gaiti kreol dili wenger dili hupa @@ -297,7 +297,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic niderland dili flamand dili kwasio dili - norwegiýa nýunorsk dili + norweg nýunorsk dili ngembun dili norweg dili nogaý dili @@ -325,6 +325,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic nigeriýa-pijin dili pijin dili polýak dili + pýemont dili malisit-passamakwodi dili prus dili puştu dili @@ -842,15 +843,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Senenama Pul birliginiň formaty + Simwollar hasaba alynmazdan tertipleme + Nygtalýana görä ters tertipleme + Baş harp/setir harpa görä tertipleme + Harp registrine görä tertipleme Tertip rejesi + Adatylaşdyrylan tertipleme + Sana görä tertipleme + Hat-blok gaýtadan tertipleme + Tertiplemäniň täsiri Pul birligi + Özgertmäniň bolmaly ýeri + Sözlükdäki setirden setire geçiş kadalaryndan çykmalar Emoji aňlatmasy + Hepdäniň birinji güni + garyşyk Sagat aýlawy (12–24 sagat) + Giriziş usuly + Klawiatura + Iň ýokary derejede ähmiýet bermezlik Setirden setire geçiş stili Sözleriň içinde setir bölünmeleri + Özgerdiş kadalary Ölçeg ulgamy + Ölçeg birligi Sanlar + Goşmaça maglumatlar üçin sebit + Özgerdiş çeşmesi + Sebit bölümi Gysgaltmadan soň sözlemi bölmek + Özgerdiş + Maşyn terjimesi + Sagat guşaklygy + Sebit sazlamalarynyň warianty + Hususy ulanylýan + Hususy ulanylýan özgerdiş Buddist senenamasy @@ -869,15 +896,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grigorian Ýewreý senenamasy Ýewreý + Milli hindi senenamasy Hijri-kamary senenamasy Hijri-kamary Hijri-kamary senenamasy (tablisaly, raýat eýýamy) Hijri-kamary (tablisaly, raýat eýýamy) + Hijri-kamary (Saud Arabystany, täze dogan aýa görä) Hijri-kamary senenamasy (tablisaly, astronomik eýýam) - Hijri-kamary (tablisaly, astronomil eýýam) + Hijri-kamary (tablisaly, astronomik eýýam) Hijri-kamary senenamasy (Umm al-Kura) Hijri-kamary (Umm al-Kura) ISO-8601 senenamasy + ISO-8601 Ýapon senenamasy Ýapon Pars senenamasy @@ -888,15 +918,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Buhgalterçilik Pul birliginiň standart formaty Standart + Setir harp + Setir harpa görä + Baş harpa görä + Ylalaşyjy + Sözlük Deslapky Ýunikod tertip rejesi Deslapky ýunikod + Emoji + Ýewropa düzgünleri + Telefon kitaby + Fonetik + Pinýin Umumy maksatly gözleg Gözleg + Koreý başdaky çekimsizler Standart tertip rejesi Standart + Çyzyga görä + Adaty + Açara we çyzyga görä + Çžuin + Pul birligi + Sifrler + Dyngy belgileri + Boşluk + Simwol + Hemmesi + Diňe esasy harplar + Esasylar, nygtalýanlar, registr, wariantlar, Kana + Esasylar, nygtalýanlar + Esasylar, nygtalýanlar, registr, wariantlar + Doly giňlikdäki simwollar + Ýarym giňlikdäki simwollar Deslapky Emoji Tekst + 12 sagat ulgamy + 12 + 24 sagat ulgamy + 24 12 sagat ulgamy (0–11) 12 (0–11) 12 sagat ulgamy (1–12) @@ -905,6 +966,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 sagat ulgamy (1–24) 24 (1–24) + Boşluklar, dyngy belgileri, ähli simwollar + Boşluklar, dyngy belgileri + Boşluklar, dyngy belgileri + Boşluklar, dyngy belgileri, pul birligi bolmadyk simwollar Setirden setire geçişiň gowşak stili Gowşak Setirden setire geçişiň adaty stili @@ -915,6 +980,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hemmesi galsyn Adaty Sözlemler galsyn + ABŞ BGN transliterasiýasy + BMG GEGN transliterasiýasy Metrik ulgam Metrik Imperial ölçeg ulgamy @@ -923,47 +990,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic ABŞ Arap-hindi sanlary Arap-hindi sanlarynyň giňeldilen görnüşi + Giňeldiler arap-hindi Ermeni sanlary Ermeni setir sanlary + Ermeni setir Bengal sanlary Çakma sanlary Dewanagari sanlary Efiop sanlary + Maliýe görnüşi Doly giňlikdäki sanlar + Doly giňlikdäki Gruzin sanlary Grek sanlary Grek setir sanlary + Grek setir Gujarati sanlary Gurmuhi sanlary + Adaty senenamalar üçin aýdaky günleriň Han iýeroglifleri arkaly san ýazgysy Hytaý onluk sanlary + Sifr hökmünde hytaý san iýeroglifleri ulanylýan pozisiýa görä onluk san ulgamy Ýönekeýleşdirilen hytaý sanlary Ýönekeýleşdirilen hytaý maliýe sanlary + Ýönekeýleşdirilen hytaý maliýe Adaty hytaý sanlary Adaty hytaý maliýe sanlary + Adaty hytaý maliýe Ýewreý sanlary Ýawa sanlary Ýapon sanlary Ýapon maliýe sanlary + Ýapon maliýe + Ýapon erasynyň birinji ýyly "Gannen" diýlip görkezilýän san ýazgysy Khmer sanlary Kannada sanlary + Taý Tam Tam (dini) Laos sanlary Latyn sanlary + Matematik goýy + Matematik iki çyzykly + Matematik monogiňlikdäki + Matematik kertiksiz goýy + Matematik kertiksiz Malaýalam sanlary Miteý Maýek sanlary Mýanma sanlary + Gündogar Pwo mýanma karen + Mýanma Pao + Mýanma Şan + Mýanma Taý-laý + Ýerli halklaryň sanlary + Ýerli halklaryň sanlary Ol Çiki sanlary Oriýa sanlary + Daşy çyzylan Rim sanlary + Rim baş registrli Rim setir sanlary + Rim setir registrli + Segmentlere bölünen Adaty tamil sanlary Tamil sanlary + Häzirkizaman tamil Telugu sanlary Taý sanlary Tibet sanlary + Adaty sanlar Waý sanlary öçürilen açyk + Kesgitlenmedik maşyn terjimesi + POSIX warianty + + öçürilen + açyk + Metrik Birleşen Patyşalyk @@ -1004,26 +1106,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + - + + + + + + + - + + + + + + + d.M.y + + + + + + + {0}-njy + {0}-nji + + + - d MMMM y G EEEE + G d MMMM y, EEEE - d MMMM y G + G d MMMM y - d MMM y G + G d MMM y - dd.MM.y GGGGG + GGGGG dd.MM.y @@ -1075,32 +1206,85 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, h B E, h:mm B - d E + E, h:mm:ss B E, h a - E h:mm a - E h:mm:ss a + E, h:mm a + E, HH:mm + E, h:mm:ss a + E, HH:mm:ss G M.y - G dd.MM.y E + G dd.MM.y + G dd.MM.y, E + G MMM y + G d MMM y + G ddd MMM y + G d MMM y, E + G ddd MMM y, E h:mm a h:mm:ss a - HH v dd.MM - dd.MM E + dd.MM, E d MMM - d MMM E + ddd MMM + d MMM, E + ddd MMM, E d MMMM - d MMMM E + ddd MMMM + d MMMM, E mm:ss y MM.y dd.MM.y - dd.MM.y E + dd.MM.y, E MMM y d MMM y - d MMM y E + d MMM y, E MMMM y + G MM.y + G dd.MM.y + G dd.MM.y, E + G MMM y + G d MMM y + G ddd MMM y + G d MMM y, E + G ddd MMM y, E + G MMMM y + + G MM.y – G MM.y + G MM.y – MM.y + G MM.y – MM.y + + + G dd.MM.y – dd.MM.y + G dd.MM.y – G dd.MM.y + G dd.MM.y – dd.MM.y + G dd.MM.y – dd.MM.y + + + G dd.MM.y, E – dd.MM.y, E + G dd.MM.y, E – G dd.MM.y, E + G dd.MM.y, E – dd.MM.y, E + G dd.MM.y, E – dd.MM.y, E + + + G MMM y – G MMM y + G MMM – MMM y + G MMM y – MMM y + + + G d–d MMM y + G d MMM y – G d MMM y + G d MMM – d MMM y + G d MMM y – d MMM y + + + G d MMM, E – MMM d, E y + G d MMM y, E – G d MMM y, E + G d MMM, E – d MMM, E y + G d MMM y, E – d MMM y, E + h a – h a h–h a @@ -1127,8 +1311,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic dd.MM – dd.MM - dd.MM E – dd.MM E - dd.MM E – dd.MM E + dd.MM, E – dd.MM, E + dd.MM, E – dd.MM, E MMM–MMM @@ -1138,8 +1322,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM – d MMM - d MMM E – d MMM E - d MMM E – d MMM E + d MMM, E – d MMM, E + d MMM, E – d MMM, E + + + d–d MMMM + d MMMM – d MMMM y–y @@ -1154,9 +1342,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic dd.MM.y – dd.MM.y - dd.MM.y E – dd.MM.y E - dd.MM.y E – dd.MM.y E - dd.MM.y E – dd.MM.y E + dd.MM.y, E – dd.MM.y, E + dd.MM.y, E – dd.MM.y, E + dd.MM.y, E – dd.MM.y, E MMM–MMM y @@ -1168,9 +1356,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y – d MMM y - d MMM y E – d MMM y E - d MMM y E – d MMM y E - d MMM y E – d MMM y E + d MMM y, E – d MMM y, E + d MMM y, E – d MMM y, E + d MMM y, E – d MMM y, E MMMM–MMMM y @@ -1256,6 +1444,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + {0}-njy + {0}-nji + + + @@ -1388,7 +1584,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - d MMMM y EEEE + d MMMM y, EEEE @@ -1430,6 +1626,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1} {0} @@ -1464,40 +1663,66 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, h B + E, h:mm B + E, h:mm:ss B d E - E h:mm a - E h:mm:ss a + E, h a + E, h:mm a + E, h:mm:ss a G MM.y G dd.MM.y G dd.MM.y, E G MMM y G d MMM y + G ddd MMM y G d MMM y, E + G ddd MMM y, E + G MMMM y + G d MMMM y + G ddd MMMM y + G d MMMM y, E + G ddd MMMM y, E h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v dd.MM - dd.MM E + dd.MM, E d MMM - d MMM E + ddd MMM + d MMM, E + ddd MMM, E d MMMM - d MMMM E + ddd MMMM + d MMMM, E + ddd MMMM, E 'hepde' W, MMMM 'hepde' W, MMMM mm:ss MM.y dd.MM.y - dd.MM.y E + dd.MM.y, E MMM y d MMM y - d MMM y E + ddd MMM y + d MMM y, E + ddd MMM y, E MMMM y + d MMMM y + ddd MMMM y + d MMMM y, E + ddd MMMM y, E 'hepde' w, Y 'hepde' w, Y + + {0}, {1} + {1}, {0} + + + {0} – {1} + h – h B @@ -1505,9 +1730,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm – h:mm B - GGGGG M/y – GGGGG M/y - GGGGG M/y – M/y - GGGGG M/y – M/y + GGGGG M.y – GGGGG M.y + GGGGG M.y – M.y + GGGGG M.y – M.y GGGGG dd.MM.y – dd.MM.y @@ -1540,13 +1765,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm a – h:mm a - h:mm–h:mm a - h:mm–h:mm a + h:mm – h:mm a + h:mm – h:mm a h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v + h:mm – h:mm a v + h:mm – h:mm a v MM – MM @@ -1556,33 +1781,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic dd.MM – dd.MM - dd.MM E – dd.MM E - dd.MM E – dd.MM E + dd.MM, E – dd.MM, E + dd.MM, E – dd.MM, E - MMM–MMM + MMM – MMM d – d MMM d MMM – d MMM - d MMM E – d MMM E - d MMM E – d MMM E + d MMM, E – d MMM, E + d MMM, E – d MMM, E - MM.y – MM.y + MM – MM.y MM.y – MM.y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y + dd – dd.MM.y + dd.MM – dd.MM.y dd.MM.y – dd.MM.y - dd.MM.y E – dd.MM.y E - dd.MM.y E – dd.MM.y E - dd.MM.y E – dd.MM.y E + dd.MM.y, E – dd.MM.y, E + dd.MM.y, E – dd.MM.y, E + dd.MM.y, E – dd.MM.y, E MMM–MMM y @@ -1594,9 +1819,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y – d MMM y - d MMM y E – d MMM y E - d MMM y E – d MMM y E - d MMM y E – d MMM y E + d MMM y, E – d MMM y, E + d MMM y, E – d MMM y, E + d MMM y, E – d MMM y, E MMMM–MMMM y @@ -1605,6 +1830,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + d.M.y + + + + + + + d.M.y + + + @@ -1674,10 +1913,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d.M.y G MMM y G d MMM, y G + ddd MMM, y G E, d MMM, y G + G ddd MMM y, E d.M E, d.M + ddd MMM E, d MMM + ddd MMM, E + ddd MMMM d MMMM, E y G dd.MM.y, E @@ -1691,13 +1935,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d.M.y GGGGG MMM y G d MMM, y G + ddd MMM y G E, d MMM, y G + G ddd MMM y, E MMMM, y G QQQ, y G QQQQ, y G + + + + d.M.y + + + + + + + d.M.y + + + @@ -1856,7 +2116,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic hep. güni - aýda hepdäň güni + aýda hepdäniň güni aýda hep. güni @@ -1892,8 +2152,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic şu ýb indiki ýb - {0} ýb.-den - {0} ýb.-den + {0} ýb-den + {0} ýb-den {0} ýb öň @@ -2587,11 +2847,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Librewil - - - Beýik Britaniýa tomusky wagty - - Kaýenna @@ -2649,20 +2904,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Jaýapura - - - Irlandiýa standart wagty - - Iýerusalim Men adasy - - Kalkutta - Çagos @@ -3027,7 +3274,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grand-Terk - Jamena + Njamena Kergelen @@ -3066,13 +3313,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nom - Ankoridž + Ankorij Ýakutat - Džuno + Juno Los-Anjeles @@ -3235,6 +3482,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Anadyr wagty + Anadyr standart wagty Anadyr tomusky wagty @@ -3346,6 +3594,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Braziliýa tomusky wagty + + + Beýik Britaniýa wagty + Beýik Britaniýa tomusky wagty + + Bruneý-Darussalam wagty @@ -3519,6 +3773,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Grinwiç ortaça wagty + + + Grenlandiýa wagty + Grenlandiýa standart wagty + Grenlandiýa tomusky wagty + + Gündogar Grenlandiýa wagty @@ -3545,7 +3806,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Gawaý-Aleut standart wagty + Gawaý standart wagty @@ -3606,6 +3867,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Eýran tomusky wagty + + + Irlandiýa wagty + Irlandiýa standart wagty + + Irkutsk wagty @@ -3629,8 +3896,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Petropavlowsk-Kamçatskiý wagty - Kamçatka tomusky wagty + Petropawlowsk-Kamçatskiý wagty + Petropawlowsk-Kamçatskiý standart wagty + Petropawlowsk-Kamçatskiý tomusky wagty @@ -3898,14 +4166,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Samara wagty + Samara standart wagty Samara tomusky wagty - Samoa wagty Samoa standart wagty - Samoa tomusky wagty @@ -3972,6 +4239,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Çuuk wagty + + + Türkiýe wagty + Türkiýe standart wagty + Türkiýe tomusky wagty + + Türkmenistan wagty @@ -3996,6 +4270,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Urugwaý tomusky wagty + + + Urumçi wagty + + Özbegistan wagty @@ -4156,10 +4435,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - #,##0.00 - @@ -4444,9 +4719,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic gruzin larisi - Gano sedisi - gano sedisi - gano sedisi + Gana sedisi + gana sedisi + gana sedisi Gibraltar funty @@ -4707,9 +4982,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic nikaragua kordobasy - Norwegiýa kronasy - norwegiýa kronasy - norwegiýa kronasy + Norweg kronasy + norweg kronasy + norweg kronasy Nepal rupiýasy @@ -4970,8 +5245,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic karib guldeni - karib guldeni - karib guldeni Kg. @@ -5004,14 +5277,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbabwe altyny - Zimbabwe altyny - Zimbabwe altyny {0} gün {0} günler - Sagdan {0}-nj. öwrümden öwrüliň. + {0}-njy çatrykda saga öwrüliň. + {0}-nji çatrykda saga öwrüliň. @@ -5110,11 +5382,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ýobe{0} - {1} başyna {0} + {0} {1} başyna - kwadrat {0} - kwadrat {0} + inedördül {0} + inedördül {0} kub {0} @@ -5208,11 +5480,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} millimol/litr {0} millimol/litr - - bölek - {0} bölek - {0} bölek - {0} bölejik/million {0} bölejik/million @@ -5229,9 +5496,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} permiriad {0} permiriad - - mollar - gýukoza {0} glýukoza @@ -5482,13 +5746,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic santimetr başyna piksel - {0} santimetr başyna piksel - {0} santimetr başyna piksel + {0} piksel santimetr başyna + {0} piksel santimetr başyna dýuým başyna piksel - {0} dýuým başyna piksel - {0} dýuým başyna piksel + {0} piksel dýuým başyna + {0} piksel dýuým başyna santimetr başyna nokat @@ -5726,7 +5990,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} millimetr simap sütüni - simap sütüni {0} simap sütüni {0} simap sütüni @@ -5740,9 +6003,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} dýuým simap sütüni {0} dýuým simap sütüni - - barlar - millibar {0} millibar @@ -5979,9 +6239,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} Imp. süýji çemçesi - dram - {0} dram - {0} dram + {0} dram suwuklyk + {0} dram suwuklyk Imp. kwarta @@ -6062,6 +6321,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + s{0} + Ýi{0} @@ -6290,7 +6552,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} kWt. sag - electronwolt + elektronwolt {0} eW {0} eW @@ -6342,14 +6604,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic megapiksel - sbp - {0} sbp - {0} sbp + psb + {0} psb + {0} psb - dbp - {0} dbp - {0} dbp + pdb + {0} pdb + {0} pdb nsmb @@ -6504,7 +6766,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} mmHg - simap sütüni + simap süt. {0} simap süt. {0} simap süt. @@ -6629,7 +6891,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} suw. uns. - imp. suw. uns. + Imp. suw. uns. {0} imp. suw. uns. {0} imp. suw. uns. @@ -6646,13 +6908,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic barrel + + sj. çmç. + {0} sj. çmç. + {0} sj. çmç. + + + Imp. sj. çmç. + {0} Imp. sj. çmç. + {0} Imp. sj. çmç. + damja {0} damja {0} damja - dram suwuklyk + dram + {0} dram + {0} dram çümmük @@ -6660,7 +6934,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} çümmük - kt Imp + kt Imp. {0} kt Imp. {0} kt Imp. @@ -6762,11 +7036,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}″ {0}″ - - bölek - {0} bölek - {0} bölek - bmln {0} bmln @@ -6776,7 +7045,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic % - Glýuk {0} Glýuk {0} Glýuk @@ -6833,6 +7101,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}kWs {0}kWs + + eW + lbf @@ -6882,7 +7153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mmHg - simap süt. + sim. süt. {0} sim. süt. {0} sim. süt. @@ -6899,16 +7170,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic m/s - - Bft {0} - Bft {0} - {0}l {0}l - suw uns m. {0} suw uns m. {0} suw uns m. @@ -6932,61 +7198,53 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} s. ç. - dsp Imp - {0}dsp-Imp - {0}dsp-Imp + sçm Imp + {0}sçm Imp + {0}sçm Imp - fl.dr. - {0}fl.dr. - {0}fl.dr. + dr. suw. + {0}dr. suw. + {0}dr. suw. - pn - {0}pn - {0}pn + çm + {0}çm + {0}çm - {0} kt-Imp. - {0} kt-Imp. + {0} kt Imp + {0} kt Imp - Kl {0} Kl {0} Kl - Gn {0} Gn {0} Gn - Sm {0} Sm {0} Sm - kal-IT {0} kal-IT {0} kal-IT - Bk {0} Bk {0} Bk - Zw {0} Zw {0} Zw - Gr {0} Gr {0} Gr - kgg {0} kgg {0} kgg diff --git a/make/data/cldr/common/main/tn.xml b/make/data/cldr/common/main/tn.xml index 4c0699c13a96..ac5216f90ae7 100644 --- a/make/data/cldr/common/main/tn.xml +++ b/make/data/cldr/common/main/tn.xml @@ -26,7 +26,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Danish German SeGerika - Sekgoa + English Esperanto Spanish Estonian @@ -93,7 +93,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic IsiZulu - + Botswana @@ -101,14 +101,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic - [a b d e ê f g h i j k l m n o ô p r s t u w y] + [a b d e ê f g h i j k l m n o ô p r s š t u w y] [c q v x z] [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] - ‘ - ’ “ ” @@ -136,7 +134,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Tlhakole Mopitlo Moranang - Motsheganang + Motsheganong Seetebosigo Phukwi Phatwe @@ -230,6 +228,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - + : + {1} 'ka' {0} @@ -260,10 +262,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm a v 'beke' 'ya' W 'ya' MMM 'beke' 'ya' W 'ya' MMM + y MMMM d + y MMMM d, EEE 'beke' w 'ya' Y 'beke' w 'ya' Y + + {0} – {1} + {0}–{1} + {0}–{1} + h a – h a h–h a @@ -358,6 +367,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + Selekanyetsa Nakotsatsi sa Lefatshe Lotlhe + + Palogare ya nako ya ngwaga le ngwaga ya Greenwich @@ -366,9 +380,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - ' - diff --git a/make/data/cldr/common/main/to.xml b/make/data/cldr/common/main/to.xml index c8f50a38ac21..b876964ebad9 100644 --- a/make/data/cldr/common/main/to.xml +++ b/make/data/cldr/common/main/to.xml @@ -36,8 +36,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakaʻopolo lea fakaʻangika lea fakaʻalepea-levaniti + lea fakaʻinitinīhasi lea fakaʻalepea - lea fakaʻalepea (māmani) lea fakaʻalāmiti lea fakamapuse lea fakaʻalaona @@ -147,8 +147,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakatalakuā lea fakataita lea fakasiamane - lea fakasiamane-ʻaositulia - lea fakasiamane-hake-suisilani lea fakatelauale lea fakasilave lea fakatōkelipi @@ -173,17 +171,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakakalisi lea fakaʻelamite lea fakapālangi - lea fakapālangi-ʻaositelēlia - lea fakapālangi-kānata - lea fakapilitānia - lea fakapālangi-ʻamelika lea fakapālangi-ʻAmelika lea fakapālangi-lotoloto lea fakaʻesipulanito lea fakasipēnisi - lea fakasipeini-lātini-ʻamelika - lea fakasipeini-ʻeulope - lea fakasipeini-mekisikou lea fakaiūpiki-loloto lea fakaʻesitōnia lea fakapāsiki @@ -201,8 +192,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakafaloe lea fakafōngi lea fakafalanisē - lea fakafalanisē-kānata - lea fakafalanisē-suisilani lea fakafalanisē-kasuni lea fakafalanisē-lotoloto lea fakafalanisē-motuʻa @@ -245,15 +234,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakahaita-tonga lea fakahepelū lea fakahinitī - lea fakahinitī (fakalatina) - lea fakahinitī (fakapilitānia) lea fakahinitī-fisi lea fakahilikainoni lea fakahitite lea fakamōngi - lea fakamunginiā + lea fakamōngi-niā lea fakahili-motu lea fakakuloisia + lea fakahunisiruki lea fakasōpia-hake lea fakasiaina-siangi lea fakahaiti @@ -275,6 +263,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakaʻingusi lea fakaʻito lea fakaʻaisilani + lea fakavahaʻasilave lea fakaʻītali lea fakaʻinuketītuti lea fakaʻingiliani @@ -299,6 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakatiapi lea fakamakōnite lea fakakapuvelitianu + lea fakakeketisī lea fakakeniangi lea fakakolo lea fakakongikō @@ -333,6 +323,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakapafia lea fakakolongia lea fakakulitī + lea fakakulitī-loto + lea fakakulitī-fakalahi lea fakakumiki lea fakakutenai lea fakakomi @@ -396,6 +388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakamokeno lea fakamāuli lea fakamikemaki + lea fakamanetaiki lea fakaminangikapau lea fakamasitōnia lea fakaʻinitia-malāialami @@ -406,6 +399,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakamohauki lea fakamosi lea fakamalati + lea fakamala-leī lea fakamali-hihifo lea fakamalei lea fakamalita @@ -415,6 +409,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakamilanitēsi lea fakamaliwali lea fakamenitauai + lea fakamōngi-taui lea fakapema lea fakamiene lea fakaʻelisia @@ -434,10 +429,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakaniuē lea fakaʻaonasa lea fakahōlani - lea fakahōlani-pelesiume lea fakakuasio lea fakanoauē-ninosiki lea fakangiemipōni + lea fakauanisū lea fakanouaē lea fakanokai lea fakanoauē-motuʻa @@ -495,6 +490,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakalasasitani lea fakalapanui lea fakalalotonga + lea fakaheyangi lea fakalomaniolo lea fakalouhingia lea fakalifi @@ -542,6 +538,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakaʻalepea-sāti lea fakasingihala lea fakasitamo + lea fakakilitini-saami + lea fakapaite-sami + lea fakaume-sami lea fakasolāvaki lea fakasalāʻikī lea fakasolovenia @@ -570,6 +569,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakasukuma lea fakasusū lea fakasumelia + lea fakasunuali lea fakasuēteni lea fakasuahili lea fakasuahili-kongikō @@ -651,6 +651,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakaʻuolofo lea fakasiaina-uū lea fakakalimiki + lea fakakaitaki lea fakatōsa lea fakamingilelia lea fakakangilī @@ -672,10 +673,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakatamasaiti-moloko lea fakasiaina lea fakasiaina-mānitali - lea fakasiaina-fakafaingofua - lea fakasiaina-mānitali-fakafaingofua + lea fakasiaina-mānitali (fakafaingofua) lea fakasiaina-tukufakaholo - lea fakasiaina-mānitali-tukufakaholo + lea fakasiaina-mānitali (tukufakaholo) lea fakasulu lea fakasuni ʻikai ha lea @@ -822,6 +822,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -839,6 +840,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + @@ -1196,8 +1198,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Vanuatu ʻUvea mo Futuna Haʻamoa - fasiʻalea loi - fua-ua loi + Fasiʻalea loi + Fua-ua loi Kōsovo Iemeni Maiote @@ -1214,6 +1216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakafalanisē fakaonopooni-tōmuʻa fakaako sipelatotonu fokotuʻu 1943 + lea fakafeituʻu fakaʻakīmimiki lea fakafeituʻu fakaʻakuapemi mataʻitohi liliu laipeli ʻamelika 1997 lea fakafeituʻu fakaʻaluku @@ -1233,6 +1236,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic fakaʻilonga pilisi lea fakafeituʻu fakapisikaea lea fakafeituʻu fakapila mo fakasā-siōsio + lea fakafeituʻu fakapohailisi motuʻalea fakapoholisi lea fakafeituʻu fakapunavila lea fakafeituʻu fakapōnihōmi @@ -1243,6 +1247,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic motuʻalea fakatainikō lea fakasēpia (puʻaki fakaʻekavia) lea fakapilitānia fakonopooni-tōmuʻa + lea fakafeituʻu fakafaiumisi fonētiki IPA lea fakafeituʻu fakakilisipaumi fonētiki fakaʻamelika-tokelau @@ -1271,6 +1276,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakalatakalīsu (motuʻa) lea fakalatakalīsu (foʻou) lea fakalūsia-soviete + lea fakafeituʻu fakalikopolita motuʻalea fakametēliko fasiʻalea taha lea fakafeituʻu fakanitiuka @@ -1298,6 +1304,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakafeituʻu fakalesia lea fakafeituʻu fakakilisone lea fakasaho + lea fakafeituʻu fakasahitiki lea fakasikotilani fakasīpinga lea fakafeituʻu fakasikause motuʻalea fakangofua @@ -1321,6 +1328,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic lea fakafeituʻu fakavalenisia lea fakafeituʻu fakavalate lea fakafeituʻu fakalativia-vekātuluka + lea fakafeituʻu fakauīni lea fakafeituʻu fakavivalo-alapeno mataʻitohi liliu fakauate-kilesi motuʻalea fonētiki fakaʻesipelanito-founga-X @@ -1328,51 +1336,119 @@ CLDR data files are interpreted according to the LDML specification (http://unic tohi māhina anga paʻanga + taʻe tokaʻi fakaʻilonga + fili fasiʻalea fulihi + fili mataʻitohi + fili mataʻitohi tokangaʻi tohi hokohoko + fili fakatuʻunga + fili fakafika paʻanga + Meʻa foaki ʻū ongo + Sāpate takai houa + foʻi kī fesiʻilaine + fesiʻilea founga fakafuofua + ʻuniti fakafuofua fika fakaputa + fakaputa fakasiaina + fakasiaina fakakopitika + fakakopitika fakataniki + fakataniki fakaʻītiōpia + fakaʻītiōpia fakaʻītiōpia-ʻamete-ʻalemi - fakakelekolia + fakaʻītiōpia-ʻamete-ʻalemi + tohi māhina fakakelekolia + fakakelekolia fakahepelū + fakahepelū fakaʻinitia + fakaʻinitia fakamohameti + fakamohameti fakamohameti-sivile - fakamohameti-ʻasimāhina - fakamohameti -fakatēpile + fakamohameti-sivile + tohi māhina fakamohameti-ʻasimāhina + fakamohameti-ʻasimāhina + tohi māhina fakamohameti -fakatēpile + fakamohameti -fakatēpile fakamohameti-ʻumalakula - faka-iso8601 + fakamohameti-ʻumalakula + tohi māhina faka-iso8601 + fakakelekolia (iso8601) fakasiapani + fakasiapani fakapēsia + fakapēsia fakalepupelika siaina + fakalepupelika siaina anga paʻanga-kalake paʻanga-kalake anga paʻanga-sīpinga sīpinga - ki muʻa, hoa - tikisinale + fili fakaʻilonga + fili taʻefakaʻilonga + fili fasiʻalea hono faʻafai + fili fasiʻalea hono fulihi + mataʻitohi siʻi fakaʻuluaki + mataʻitohi siʻi + fili mataʻitohi tuʻunga + mataʻitohi siʻi + mataʻitohi lahi fakaʻuluaki + mataʻitohi lahi + fili mataʻitohi taʻetokangaʻi + fili mataʻitohi tokangaʻi + fili mei muʻa, hoa + fehoanaki + fili fakatikisinale + tikisinale ʻunikōti - ngaahi ongo - fakaʻeulope + ʻunikōti tuʻunga + fili faka ʻū ongo + ʻū ongo + fili fakaʻeulope + fakaʻeulope fika telefoni - piniini + tohi telefoni + fili fakafonētiki + fonētiki + fili fakapiniini + piniini fakafoʻou fakakumi ʻi hono anga lahi - konisinanite ʻuluaki - fakasīpinga - tongi + kumi + kumi he konisinanite ʻuluaki + konisinanite ʻuluaki (fakakōlea) + fili fakasīpinga + fakasīpinga + fili fakatongi + tongi tukufakaholo - tongi tefitoʻi - sūini + fakatukutala + fili fakatongi tefitoʻi + tongi tefitoʻi + fili fakasūini + sūini + fili taʻefakatuʻunga + fili fakatuʻunga ʻunikōti + fili fakafika tāutaha + fili fakafika + sīpinga + ʻū ongo + tohi + takai houa 12 + 12 + takai houa 24 + 24 takai houa 0–11 12 (0–11) takai houa 1–12 @@ -1381,6 +1457,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) takai houa 1–24 24 (1–24) + foʻi kī, kī ʻe 101 + foʻi kī, kī ʻe 102 + foʻi kī, ./" ʻe 600 + foʻi kī, ./" ʻe 780 fesiʻilaine ngaloku ngaloku fesiʻilaine faʻafai @@ -1393,11 +1473,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic fakapilitānia founga fakaʻamelika fakaʻamelika + selisiasi + felenihaiti + kelevini fika fakaʻahomi fika fakaʻalepea fika fakaʻalepea fakalahi + fakaʻalepea fakalahi fika fakaʻāmenia fika fakaʻāmenia fakalalo + fakaʻāmenia fakalalo fika fakapali faka fakapāngilā fika fakapalami @@ -1407,27 +1492,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic fika fakatevanākalī fika fakativehi-akuru fika fakaʻītiōpia + fika fakapaʻanga + fakapaʻanga fika laulahi + laulahi fika fakakalai fika fakaseōsia fika fakakoniti-kunisala - fika fakakoniti–masalami + fika fakakoniti-masalami fika fakakalisi fika fakakalisi fakalalo + fakakalisi fakalalo fika fakakutalati fika fakakulungikema fika fakakūmuki + fika fakasiaina ʻaho-tohimāhina + fakasiaina ʻaho-tohimāhina fakatukutala fika fakasiaina + fakasiaina fika he kalafi maeʻeeʻa fika fakasiaina fakafaingofua fika fakasiaina fakafaingofua fakapaʻanga + fakasiaina fakafaingofua fakapaʻanga fika fakasiaina tukufakaholo fika fakasiaina tukufakaholo fakapaʻanga + fakasiaina tukufakaholo fakapaʻanga fika fakahepelū fika fakamōngi-pahau fika fakamōngi-niakengi fika fakasava fika fakasiapani fika fakasiapani fakapaʻanga + fakasiapani fakapaʻanga + fika fakasiapani taʻu Kaneni + fakasiapani taʻu Kaneni fika fakakaialī fika fakakaui fika fakakamipōtia @@ -1435,15 +1532,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic fika fakakilatilai fika fakatai-tami-hola fika fakatai-tami-tami + fakatai-tami-tami (fakasiasi) fika fakalau fika fakalatina fika fakalepasā fika fakalimipū fika fakamatematika-lotolahi + fakamatematika-lotolahi fika fakamatematika-tukiua + fakamatematika-tukiua fika fakamatematika-vahataha + fakamatematika-vahataha fika fakamatematika-taʻehiku-lotolahi + fakamatematika-taʻehiku-lotolahi fika fakamatematika-taʻehiku + fakamatematika-taʻehiku fika fakamalāialami fika fakamotī fika fakamongokōlia @@ -1451,20 +1554,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic fika fakametei-maieki fika fakapema fika fakapiloukaleni + fakapiloukaleni fika fakapaʻō + fakapaʻō fika fakapema-siani + fakapema-siani fika fakapema-tai + fakapema-tai fika fakamunitali-naki + fika tuʻufonua + tuʻufonua fika fakanikō fika fakaʻolisiki fika fakaʻoliʻonali fika fakaʻotia fika fakaʻosimania fika fakatapa + fakatapa fika fakalohingia-hanifi fika fakaloma + fakaloma fakaʻolunga fika fakaloma fakalalo + fakaloma fakalalo fika fakasaulasitā + fika kupu + kupu fika fakasalata fika fakakutasuāti fika fakasingihala @@ -1475,15 +1589,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic fika fakatai-lue foʻou fika fakatamili tukufakaholo fika fakatamili + fika fakatamili fakaonopooni fika fakateluku fika fakatailani fika fakatipeti fika fakatīhuta fika fakatangisā + fika fakatolongi-siki + fika fakatukutala + fakatukutala fika fakavai fika fakavalangi fika fakauāniko + + ʻikai + ʻio + fakamita fakapilitānia @@ -1590,24 +1712,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + - + + - - - - Taʻu ʻĪtiōpia - - - TI - - + + + + - + + - + Taʻu ʻĪtiōpia-ʻAmete-ʻAlemi + Taʻu ʻĪtiōpia TIAA + TI @@ -1661,11 +1787,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y G + MM y G dd MM y GGGGG + E dd/MM/y G MMM y G d MMM y G E d MMM y G - h a h:mm a H:mm h:mm:ss a @@ -1677,8 +1804,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMMM E d MMMM y G - M-y - d-M-y + M/y + d/M/y E d/M/y MM-y MMM y @@ -1688,9 +1815,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic y QQQ y QQQQ y G - y/MM GGGGG + MM-y GGGGG dd/MM/y GGGGG - E dd-MM-y GGGGG + E dd/MM/y GGGGG MMM y G d MMM y G E d MMM y G @@ -1698,7 +1825,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic y QQQ G y QQQQ G + + {0} {1} + + + {0}–{1} + {0}–{1} + d – d @@ -1740,10 +1874,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM y G E d MMM y – E d MMM y G - - h a – h a - h–h a - HH – HH @@ -1765,10 +1895,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic HH:mm – HH:mm v HH:mm – HH:mm v - - h a – h a v - h–h a v - HH – HH v @@ -1794,6 +1920,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM E d MMM – E d MMM + + d – d MMM + d MMMM – d MMMM + y – y G @@ -1879,20 +2009,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic N T - - Sānuali - Fēpueli - Maʻasi - ʻEpeleli - Mē - Sune - Siulai - ʻAokosi - Sepitema - ʻOkatopa - Nōvema - Tīsema - @@ -2024,15 +2140,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1}, {0} + + {1} 'taimi' {0} + {1}, {0} + + {1} 'taimi' {0} + @@ -2049,11 +2174,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic E h:mm a E h:mm:ss a y G + M y G dd MM y GGGGG + E d M y G MMM y G d MMM y G E d MMM y G - h a + MMMM y G + d MMMM y G + E d MMMM y G h:mm a h:mm:ss a h:mm:ss a v @@ -2073,11 +2202,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E d MMM y MMMM y + d MMMM y + E d MMMM y QQQ y QQQQ y 'uike' 'hono' w ʻ'o' Y + + {0} {1} + + + {0} – {1} + {0} – {1} + d – d @@ -2120,7 +2258,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM y – E d MMM y G - h a – h a h – h a @@ -2140,8 +2277,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm – h:mm a v h:mm–h:mm a v + + HH:mm – HH:mm v + HH:mm – HH:mm v + - h a – h a v h – h a v @@ -2169,6 +2309,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic E d MMM – E d MMM E d MMM – E d MMM + + d – d MMMM + d MMMM – d MMMM + y – y @@ -2307,6 +2451,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + MMMM 'uike' W + Y 'uike' w + + + @@ -2730,15 +2882,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic taimi fakaemāmani - TMT + TFM Feituʻu taʻeʻiloa + + Anitikua + + + Anikuila + Pangopango + + Peefi + Atelaite @@ -2751,6 +2912,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pelisipane + + ʻAlupa + + + Pāpeitosi + + + Pelise + Lalotonga @@ -2773,9 +2943,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Palesi - - houa fakapilitānia taimi liliu - Lonitoni @@ -2784,17 +2951,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kuami - - - houa fakaʻaealani taimi totonu - + + Kuiana + + + Hongi-kongi Selūsalema + + ʻOtu motu Sakōsi + Loma + + Samaika + + + Tokiō + Kanitoni @@ -2804,6 +2981,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Talava + + Komolosi + Kuasaleni @@ -2819,6 +2999,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic Saʻipani + + Mātiniki + + + Moʻungaselati + + + Maulitiusi + Bahia Banderas @@ -2858,20 +3047,110 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pukanivila + + Sā-piea + Pitikeni + + Puēto Liko + Hepeloni + + Lēunioni + + + Kalininikalati + Mosikou + + Volikokalati + + + Salatovi + + + ʻAsitalakani + + + ʻUlaianovisiki + + + Kilovi + + + Samala + + + ʻIekatelinepūki + + + ʻOmisiki + + + Novosipīsiki + + + Palanauli + + + Tomisiki + + + Novokusinetisiki + + + Kalasinoiāsiki + + + ʻĪkutisiki + + + Tisita + + + ʻIākutisiki + + + Valativositoki + + + Kanitika + + + Sakāline + + + ʻUsiti-nela + + + Makatani + + + Siletinekolimisiki + + + Kamisātika + + + ʻAnatili + Kuatākanali + + Singapula + - Sao Tomé + Sā Tomē + + + ʻOtu motu Kelikueleni Kiev @@ -2888,6 +3167,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Vatikani + + Sā Viniseni + ʻUvea @@ -2930,13 +3212,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakaʻalasika taimi liliu - - - houa fakaʻalamati - houa fakaʻalamati taimi totonu - houa fakaʻalamati taimi liliu - - houa fakaʻamasōne @@ -2986,20 +3261,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakaapia taimi liliu - - - houa fakaʻakitau - houa fakaʻakitau taimi totonu - houa fakaʻakitau taimi liliu - - - - - houa fakaʻakitōpe - houa fakaʻakitōpe taimi totonu - houa fakaʻakitōpe taimi liliu - - houa fakaʻalepea @@ -3101,6 +3362,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakapalāsila taimi liliu + + + houa fakapilitānia + houa fakapilitānia taimi liliu + + houa fakapulunei @@ -3279,6 +3546,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakakiliniuisi mālie + + + houa fakafonuamata + houa fakafonuamata taimi totonu + houa fakafonuamata taimi liliu + + houa fakafonuamata-hahake @@ -3293,11 +3567,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakafonuamata-hihifo taimi liliu - - - houa fakakuami - - houa fakakūlifi @@ -3310,7 +3579,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - houa fakahauaiʻi-aleuti taimi totonu + houa fakahauaiʻi taimi totonu @@ -3371,6 +3640,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakaʻilaani taimi liliu + + + houa fakaʻaealani + houa fakaʻaealani taimi totonu + + houa fakalūsia-ʻīkutisiki @@ -3394,9 +3669,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - houa fakalūsia-petelopavilovisiki - houa fakalūsia-petelopavilovisiki taimi totonu - houa fakalūsia-petelopavilovisiki taimi liliu + houa fakalūsia-kamisātika + houa fakalūsia-kamisātika taimi totonu + houa fakalūsia-kamisātika taimi liliu @@ -3438,11 +3713,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakakīkisitani - - - houa fakalangikā - - houa fakaʻotumotulaine @@ -3455,13 +3725,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakamotuʻeikihoue taimi liliu - - - houa fakamakau - houa fakamakau taimi totonu - houa fakamakau taimi liliu - - houa fakalūsia-makatani @@ -3577,11 +3840,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakafēnanito-te-nolōnia taimi liliu - - - houa fakamalianatokelau - - houa fakalūsia-novosipīsiki @@ -3661,13 +3919,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakapiongiangi - - - houa fakakisilōta - houa fakakisilōta taimi totonu - houa fakakisilōta taimi liliu - - houa fakalēunioni @@ -3694,9 +3945,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - houa fakahaʻamoa houa fakahaʻamoa taimi totonu - houa fakahaʻamoa taimi liliu @@ -3763,6 +4012,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakatūke + + + houa fakatoake + houa fakatoake taimi totonu + houa fakatoake taimi liliu + + houa fakatūkimenisitani @@ -3782,6 +4038,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic houa fakaʻulukuai taimi liliu + + + houa fakaʻulumitisi + + houa fakaʻusipekitani @@ -3861,6 +4122,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic TF +   TF @@ -4045,7 +4307,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ʻEulo - ʻeulo Tola fakafisi @@ -6447,17 +6708,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} mo {1} - {0}, pē {1} + {0} pē {1} + {0} pē {1} + {0} pē {1} {0} pē {1} {0} {1} {0} {1} + {0} {1} {0}, {1} {0}, {1} - {0} mo e {1} + {0}, {1} {0} mo e {1} diff --git a/make/data/cldr/common/main/tok.xml b/make/data/cldr/common/main/tok.xml index f5d336f047e0..c77ee534cb48 100644 --- a/make/data/cldr/common/main/tok.xml +++ b/make/data/cldr/common/main/tok.xml @@ -116,7 +116,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -272,7 +272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic ma Sasutan ma Sawato ma Suli - ma Suwasi + ma Sawasi ma Sate ma Toko ma Tawi @@ -311,6 +311,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic sitelen nanpa + nasin tenpo Puta + nasin Puta nasin tenpo Nijon nasin Nijon nasin nimi Juniko @@ -388,15 +390,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - 7 - 1 - 2 - 3 - 4 - 5 - 6 - suno esun #7 suno esun #1 @@ -540,9 +533,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic sike - - sike - tenpo mun tenpo mun pini @@ -558,9 +548,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic mun - - mun - tenpo esun tenpo esun pini @@ -576,9 +563,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic esun - - esun - tenpo suno tenpo suno pini @@ -594,9 +578,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic suno - - suno - tenpo esun #7 pini tenpo esun #7 ni @@ -648,7 +629,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic tenpo GMT{0} - tenpo UTC + tenpo UTC{0} tenpo pi {0} tenpo seli suno pi {0} tenpo pi {0} diff --git a/make/data/cldr/common/main/tpi.xml b/make/data/cldr/common/main/tpi.xml deleted file mode 100644 index ec11ffefca60..000000000000 --- a/make/data/cldr/common/main/tpi.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - Jeman - Austria Jeman - Swis Jeman - Inglis - Australian Inglis - Kenedien Inglis - Britis Inglis - Amerikan Inglis - Spenis - Saut Amerikan Spenis - Spenis (Spein) - Meksikan Spenis - Frens - Kenedien Frens - Swis Frens - Italien - Japanis - Potigis - Brasilien Potigis - Yurop Potigis - Rasien - Tok Pisin - Tok ples i no stap - Sainis - Isipela Sainis - Tredisinol Sainis - - - - - - - - - - - - Brasil - Saina - Jemani - Frans - Yunaited Kingdom - India - Itali - Papua Niugini - Rijen i no stap - - - Gregorien kalenda - stendet karensi fomet - stendet oda bilong skelim - westen namba - - - tok ples: {0} - skript: {0} - rijen: {0} - - - - [a b d e f g h i j k l m n o p r s t u w y] - [c q v x z] - [A B D E F G H I J K L M N O P R S T U W Y] - - - - - - - - Jan - Feb - Mas - Epr - Me - Jun - Jul - Oga - Sep - Okt - Nov - Des - - - Janueri - Februeri - Mas - Epril - Me - Jun - Julai - Ogas - Septemba - Oktoba - Novemba - Desemba - - - - - - - San - Man - Tun - Tri - Fon - Fra - Sar - - - Sande - Mande - Tunde - Trinde - Fonde - Fraide - Sarere - - - - - - - EEE, dd MMMM y - yyyyMMMMEEEdd - - - - - dd MMMM y - yyyyMMMMdd - - - - - dd MMM y - yyyyMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - hh:mm:ss a zzzz - ahhmmsszzzz - - - - - hh:mm:ss a zzz - ahhmmsszzz - - - - - hh:mm:ss a - ahhmmss - - - - - hh:mm a - ahhmm - - - - - - d/M/y - d MMM y - - - - - - - - - - #,##0.00 ¤ - #,##0.00 ¤ - - - #,##0.00 ¤ - - - - - diff --git a/make/data/cldr/common/main/tpi_PG.xml b/make/data/cldr/common/main/tpi_PG.xml deleted file mode 100644 index 3b46f18ec61d..000000000000 --- a/make/data/cldr/common/main/tpi_PG.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/tr.xml b/make/data/cldr/common/main/tr.xml index 8cca75e42410..5601b0f0d8d5 100644 --- a/make/data/cldr/common/main/tr.xml +++ b/make/data/cldr/common/main/tr.xml @@ -1216,18 +1216,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sıralama Düzeni Normalleştirilmiş Sıralama Sayısal Sıralama + Alfabe/Blok Yeniden Sıralama Sıralama Gücü Para Birimi + Dönüşüm Hedefi + Sözlük Bölme İstisnaları Emoji Gösterimi + Haftanın ilk günü + Karıştırılmış Saat Sistemi (12 - 24) + Giriş Yöntemi + Klavye + En Yüksek Düzeyde Yok Sayılanlar Satır Sonu Stili Sözcükler İçindeki Satır Sonları + Dönüşüm Kuralları Ölçü Sistemi + Ölçü Birimi Rakamlar + Ek Veriler İçin Bölge + Dönüşüm Kaynağı + Bölge Alt Bölümü Kısaltmadan Sonra Cümle Sonu + Dönüşüm + Makine Çevirisi Saat Dilimi Yerel Varyant Özel Kullanım + Özel Kullanım Dönüşümü Budist Takvimi @@ -1247,16 +1263,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ İbrani Takvimi İbrani Ulusal Hint Takvimi + Ulusal Hint Hicri Takvim Hicri Hicri Takvim (16 Temmuz 622) Hicri (16 Temmuz 622) Hicri Takvim (Suudi) + Hicri, Suudi Arabistan hilal gözlemi Hicri Takvim (15 Temmuz 622) Hicri (15 Temmuz 622) Hicri Takvim (Ümmü-l Kurra Takvimi) Hicri (Ümmü-l Kurra Takvimi) ISO-8601 Takvimi + Miladi Japon Takvimi Japon İran Takvimi @@ -1272,8 +1291,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Aksanları Normal Olarak Sıralama Aksanları Ters Sıralama Önce Küçük Harfleri Sıralama + Küçük Harf Normal Büyük/Küçük Harf Düzeninde Sıralama + Küçük Harf Önce Büyük Harfleri Sıralama + Büyük Harf Büyük/Küçük Harfe Duyarlı Olmadan Sıralama Büyük/Küçük Harfe Duyarla Sıralama Önceki Sıralama Düzeni (uyumluluk için) @@ -1283,7 +1305,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saptanmış Unicode Sıralama Düzeni Saptanmış Unicode Emoji Sıralama Düzeni + Emoji Avrupa Sıralama Kuralları + Avrupa kuralları Telefon Defteri Sıralama Düzeni Telefon Defteri Fonetik Sıralama Düzeni @@ -1293,6 +1317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Genel Amaçlı Arama Arama Hangul İlk Sessiz Harfe Göre Arama + Korece ilk ünsüz Standart Sıralama Düzeni Standart Vuruş Sıralama Düzeni @@ -1307,17 +1332,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Unicode Normalleştirilmiş Olarak Sıralama Rakamları Ayrı Sıralama Rakamları Sayısal Olarak Sıralama + Para Birimi + Rakamlar + Noktalama + Boşluk + Sembol Tümünü Sıralama + Tümü Yalnızca Taban Harflerini Sıralama + Yalnızca Temel Harfler Aksanları/Büyük-Küçük Harfleri/Genişliği/Kana’yı Sıralama + Temel, Aksanlar, Büyük ve Küçük Harfler, Türler, Kana Aksanları Sıralama + Temel, Aksanlar Aksanları/Büyük-Küçük Harfleri/Genişliği Sıralama + Temel, Aksanlar, Büyük ve Küçük Harfler, Türler Tam Genişlik Yarım genişlik Rakam Varsayılan Emoji Metin + 12 Saat Sistemi + 12 + 24 Saat Sistemi + 24 12 Saat Sistemi (0–11) 12 (0–11) 12 Saat Sistemi (1–12) @@ -1326,6 +1365,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 Saat Sistemi (1–24) 24 (1–24) + Boşlukları, noktalamayı, tüm sembolleri kaydır + Boşlukları, noktalamayı kaydır + Boşlukları, noktalamayı kaydır + Boşlukları, noktalamayı, para birimi olmayan sembolleri kaydır Serbest Satır Sonu Stili Serbest Normal Satır Sonu Stili @@ -1347,8 +1390,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ahom Rakamları Hint-Arap Rakamları Genişletilmiş Hint-Arap Rakamları + Genişletilmiş Hint-Arap Ermeni Rakamları Küçük Harf Ermeni Rakamları + Ermeni küçük harf Bali Rakamları Bengal Rakamları Brahmi Rakamları @@ -1358,53 +1403,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Devanagari Rakamları Ge’ez Rakamları Finansal Sayılar + Finansal Tam Genişlikte Rakamlar + Tam genişlikte Gürcü Rakamları Masaram Gondi Rakamları Yunan Rakamları Küçük Harf Yunan Rakamları + Yunan küçük harf Gücerat Rakamları Gurmukhi Rakamları + Geleneksel takvimler için Han karakterli ay günü numaralandırması Çin Ondalık Rakamları + Çin sayı ideograflarını rakam olarak kullanan konumsal ondalık sistem Basitleştirilmiş Çin Rakamları Finansal Basitleştirilmiş Çin Rakamları + Finansal Basitleştirilmiş Çin Geleneksel Çin Rakamları Finansal Geleneksel Çin Rakamları + Finansal Geleneksel Çin İbrani Rakamları Pahawh Hmong Rakamları Cava Rakamları Japon Rakamları Finansal Japon Rakamları + Finansal Japon + İlk yılın Gannen olduğu Japon numaralandırması Kayah Li Rakamları Kmer Rakamları Kannada Rakamları Tai Tham Hora Rakamları Tai Tham Tham Rakamları + Tai Tham Tham (dini) Lao Rakamları Batı Rakamları Lepça Rakamları Limbu Rakamları Kalın Matematiksel Rakamlar + Matematiksel kalın Çift Çizgili Matematiksel Rakamlar + Matematiksel çift çizgili Eşit Aralıklı Matematiksel Rakamlar + Matematiksel tek aralıklı Kalın Sans Serif Matematiksel Rakamlar + Matematiksel sans-serif kalın Sans Serif Matematiksel Rakamlar + Matematiksel sans-serif Malayalam Rakamları Modi Rakamları Moğolca Rakamlar Mro Rakamları Meetei Mayek Rakamları Myanmar Rakamları + Myanmar Doğu Pwo Karen + Myanmar Pao Myanmar Shan Rakamları + Myanmar Şan Myanmar Tai Laing Rakamları + Myanmar Tai Laing Yerel Rakamlar + Yerel rakamlar N’Ko Rakamları Ol Chiki Rakamları Oriya Rakamları Osmanya Rakamları + Çizgili Roma Rakamları + Roma büyük harf Küçük Harf Roma Rakamları + Roma küçük harf Saurashtra Rakamları + Segmentli Sharada Rakamları Khudawadi Rakamları Sinhala Lith Rakamları @@ -1414,16 +1483,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ New Tai Lue Rakamları Geleneksel Tamil Rakamları Tamil Rakamları + Modern Tamil Telugu Rakamları Tay Rakamları Tibet Rakamları Tirhuta Rakamları Geleneksel Rakamlar + Geleneksel rakamlar Vai Rakamları Warang Citi Rakamları Kapalı Açık + Belirtilmemiş Makine Çevirisi + POSIX varyantı + + Kapalı + Açık + Metrik İngiliz @@ -1460,6 +1537,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1481,6 +1565,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1551,13 +1642,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h B h:mm B h:mm:ss + E B h E B h:mm E B h:mm:ss d E E a h:mm E a h:mm:ss G M.y - d/M/y GGGGG + G dd.MM.y G dd.MM.y E G MMM y G d MMM y @@ -1572,7 +1664,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ dd MMMM E mm:ss GGGGG M/y - GGGGG dd.MM.y + G dd.MM.y GGGGG dd.MM.y E MM.y G G MMM y @@ -1583,6 +1675,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y/QQQQ + + {0}–{1} + B h – B h B h–h @@ -1655,6 +1750,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E – d MMM E d MMM E – d MMM E + + d – d MMMM + d MMMM – d MMMM + GGGGG M/y – M/y GGGGG M/y – M/y @@ -1893,6 +1992,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1} {0} @@ -1917,23 +2019,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h B h:mm B h:mm:ss + E B h E B h:mm E B h:mm:ss d E E a h:mm E a h:mm:ss - MM/y G - G dd.MM.y - G dd.MM.y E + G M/y + G d.M.y + G d.M.y E G MMM y G d MMM y G d MMM y E + G MMMM y + G d MMMM y + G d MMMM y E a h a h:mm a h:mm:ss a h:mm:ss v a h:mm v - HH v + a h v d/M d/M E d MMM @@ -1944,16 +2050,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMMM 'ayının' W. 'haftası' mm:ss MM/y - dd.MM.y + d.M.y d.M.y E MM.y MMM y d MMM y d MMM y E MMMM y + d MMMM y + d MMMM y E Y 'yılının' w. 'haftası' Y 'yılının' w. 'haftası' + + {0} {1} + B h – B h @@ -2008,12 +2119,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ a h:mm–h:mm - a h:mm – a h:mm v + a h:mm–a h:mm v a h:mm–h:mm v a h:mm–h:mm v - a h – a h v + a h–a h v a h–h v @@ -2038,6 +2149,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM E – d MMM E d MMM E – d MMM E + + d – d MMMM + d MMMM – d MMMM + MM.y – MM.y MM.y – MM.y @@ -2135,7 +2250,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - G M.y G d/M/y G d/M/y E @@ -2658,9 +2772,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevil - - İngiltere Yaz Saati - Londra @@ -2687,11 +2798,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Cakarta - - - İrlanda Standart Saati - - Kudüs @@ -2906,7 +3012,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Merkez, Kuzey Dakota - Semerkand + Semerkant Taşkent @@ -2956,13 +3062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alaska Yaz Saati - - - Almatı Saati - Almatı Standart Saati - Almatı Yaz Saati - - Amazon Saati @@ -3012,20 +3111,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apia Yaz Saati - - - Aktav Saati - Aktav Standart Saati - Aktav Yaz Saati - - - - - Aktöbe Saati - Aktöbe Standart Saati - Aktöbe Yaz Saati - - Arabistan Saati @@ -3127,6 +3212,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Brasilia Yaz Saati + + + İngiltere Saati + İngiltere Yaz Saati + + Brunei Darü’s-Selam Saati @@ -3305,6 +3396,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Greenwich Ortalama Saati + + + Grönland Saati + Grönland Standart Saati + Grönland Yaz Saati + + Doğu Grönland Saati @@ -3319,11 +3417,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Batı Grönland Yaz Saati - - - Guam Standart Saati - - Körfez Saati @@ -3336,7 +3429,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Hawaii-Aleut Standart Saati + Hawaii Standart Saati @@ -3397,6 +3490,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ İran Yaz Saati + + + İrlanda Saati + İrlanda Standart Saati + + İrkutsk Saati @@ -3464,11 +3563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kırgızistan Saati - - - Lanka Saati - - Line Adaları Saati @@ -3481,13 +3575,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lord Howe Yaz Saati - - - Makao Saati - Makao Standart Saati - Makao Yaz Saati - - Magadan Saati @@ -3603,11 +3690,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fernando de Noronha Yaz Saati - - - Kuzey Mariana Adaları Saati - - Novosibirsk Saati @@ -3687,13 +3769,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pyongyang Saati - - - Kızılorda Saati - Kızılorda Standart Saati - Kızılorda Yaz Saati - - Reunion Saati @@ -3720,9 +3795,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samoa Saati Samoa Standart Saati - Samoa Yaz Saati @@ -3797,6 +3870,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ TSİ + TSİ + TSİ Yaz @@ -3818,6 +3893,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Uruguay Yaz Saati + + + Urumçi Saati + + Özbekistan Saati @@ -3961,7 +4041,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ¤#,##0.00 - ¤ #,##0.00 ¤#,##0.00;(¤#,##0.00) @@ -4245,11 +4324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Çin yuanı (offshore) - - Çin Halk Cumhuriyeti Merkez Bankası Doları - Çin Halk Cumhuriyeti Merkez Bankası doları - Çin Halk Cumhuriyeti Merkez Bankası doları - Çin yuanı @@ -4913,8 +4987,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Karayip guldeni - Karayip guldeni - Karayip guldeni Özel Çekme Hakkı (SDR) @@ -5002,8 +5074,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabve altını - Zimbabve altını - Zimbabve altını Zimbabve Doları (2009) @@ -5221,7 +5291,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} milimol/litre - parça/milyon {0} parça/milyon {0} parça/milyon @@ -6526,9 +6595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} mmol/L {0} mmol/L - - Glc - l/100km {0} l/100km @@ -6673,9 +6739,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} İng. qt. {0} İng. qt. - - cal-IT - diff --git a/make/data/cldr/common/main/trv.xml b/make/data/cldr/common/main/trv.xml deleted file mode 100644 index 2b25e996db9a..000000000000 --- a/make/data/cldr/common/main/trv.xml +++ /dev/null @@ -1,570 +0,0 @@ - - - - - - - - - - - patas Monchiara - patas Towjih - patas Ingrisi - patas Espanniu - patas Bosey - patas Heyti - patas Itariya - patas Nihong - patas Bowdu - patas Pajey - patas Ruski - patas Srpian - patas Taroko - Ini klayna patas ni - patas Yurtu - patas Ipaw - Qantan Ipaw patas - Baday Ipaw patas - - - - - - - - - - - - alang Nanci - alang Posniya - alang Pajey - alang Puwei - alang Switjrrant - alang Ipaw - alang Towjih - alang Posey - alang Inglis - alang Nanjiouya ni Nansanminji - alang Htee ni Mayktan - alang Krowtia - alang Intu - alang Inglis niq Intu - alang Itariya - alang Nihong - alang Mondineygrw - alang Srbia - alang Ruski - alang Snmarinow - alang Posey niq Nan - alang Amarika - ini klayi na alang ni - - - Jiyax Yisu Thulang - - - Snamrika - Snyunaydi - - - Kari: {0} - Patas: {0} - Alang: {0} - - - - [a b c d e g h i j k l m n {ng} o p q r s t u w x y] - [ḏ f ɨ ḻ ṟ ṯ ʉ v z ʼ] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - - - - - - EEEE, G y MMMM dd - GyMMMMEEEEdd - - - - - G y MMMM d - - - - - G y MMM d - - - - - G y-MM-dd - - - - - - H:mm - M-d - E, M-d - E MMM d - E MMMM d - y - y-M - E, y-M-d - y MMM - E, y MMM d - y MMMM - y Q - y QQQ - - - - - - - - Kii - Dhi - Tri - Spi - Rii - Mti - Emi - Mai - Mni - Mxi - Mxk - Mxd - - - Kingal idas - Dha idas - Tru idas - Spat idas - Rima idas - Mataru idas - Empitu idas - Maspat idas - Mngari idas - Maxal idas - Maxal kingal idas - Maxal dha idas - - - - - K - D - T - S - R - M - E - P - A - M - K - D - - - - - - - Emp - Kin - Dha - Tru - Spa - Rim - Mat - - - Jiyax sngayan - tgKingal jiyax iyax sngayan - tgDha jiyax iyax sngayan - tgTru jiyax iyax sngayan - tgSpac jiyax iyax sngayan - tgRima jiyax iyax sngayan - tgMataru jiyax iyax sngayan - - - - - E - K - D - T - S - R - M - - - - - - - mn1 - mn2 - mn3 - mn4 - - - mnprxan - mndha - mntru - mnspat - - - - - - - Brax kndaax - Baubau kndaax - - - - - - Brah jikan Yisu Thulang - Bukuy jikan Yisu Thulang - - - BRY - BUY - - - - - - EEEE, y MMMM dd - yMMMMEEEEdd - - - - - y MMMM d - - - - - y MMM d - - - - - y-MM-dd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - H:mm - M-d - E, M-d - E MMM d - E MMMM d - y-M - E, y-M-d - E, y MMM d - y Q - - - - - - - Hngkawas - - - hngkawas - - - Idas - - - Jiyax iyax sngayan - - - Jiyax - Shiga - Jiyax sayang - Saman - - - Jiyax quri jiyax iyax sngayan - - - Jikan - - - Tuki - - - Spngan - - - Seykn - - - Alang - - - - JQG{0} - Jikan {0} - - Jikan alang Honoruru - - - Ini klayi ka Jikan hini - - - Jikan alang Purank - - - Jikan alang Grad - - - Jikan alang Snpaurow - - - Jikan alang Ankriji - - - Jikan alang Rosanci - - - Jikan alang Bonhuan - - - Jikan alang Tanbo - - - Jikan alang Jiciak - - - Jikan alang Intiannaporis - - - Jikan alang Niuyue - - - - Jikan Con-Amarika - Snegun Jikan Con-Amarika - Jikan Con-Amarika o Karat Rbagan - - - JCA - SJCA - JCAKR - - - - - Jikan Ton-Amarika - Snegun Jikan Ton-Amarika - Jikan Ton-Amarika o Karat Rbagan - - - JTA - SJTA - JTAKR - - - - - Jikan Yama-Amarika - Snegun Jikan Yama-Amarika - Jikan Hidaw niq Yama-Amarika - - - JYA - SJYA - JHYA - - - - - Jikan Daybinyan - Snegun Jikan Amarika-Daybinyan - Jikan Amarika-Daybinyan o Karat Rbagan - - - JD - SJAD - JADKR - - - - - Jikan Yayun Tasiyan - Snegun Jikan Yayun Tasiyan - Jikan Yayun Tasiyan o Karat Rbagan - - - JYT - SJYT - JYTKR - - - - - Jikan Conow - Snegun Jikan Conow - Jikan Conow o Karat Rbagan - - - JC - JC - JCKR - - - - - Jikan Tonow - Snegun Jikan Tonow - Jikan Tonow o Karat Rbagan - - - JT - JT - JTKR - - - - - Jikan Siow - Snegun Jikan Siow - Jikan Siow o Karat Rbagan - - - JS - JS - JSKR - - - - - Jikan Quri Grinweyji - - - JQG - - - - - - - - pila Autaria - - - pila Pajey - - - pila Ipaw - - - pila Irow - - - pila Inglis - - - pila Hong Kong - - - pila Intia - - - pila Nihong - - - pila Macao - - - pila Nowey - - - pila Ruski - - - pila Taiwan - - - pila America - - - ini klayi pila ni - - - - - - - {0} Hnkawas - - - {0} Idas - - - {0} Jiyax iyax sngayan - - - {0} Jiyax - - - {0} Tuki - - - {0} spngan - - - {0} Seykn - - - - - - yiru:y - mnan:m - - - diff --git a/make/data/cldr/common/main/trv_TW.xml b/make/data/cldr/common/main/trv_TW.xml deleted file mode 100644 index f321f578cd9e..000000000000 --- a/make/data/cldr/common/main/trv_TW.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/trw.xml b/make/data/cldr/common/main/trw.xml deleted file mode 100644 index 325883e5e6ee..000000000000 --- a/make/data/cldr/common/main/trw.xml +++ /dev/null @@ -1,4877 +0,0 @@ - - - - - - - - - - - {0}،{1} - - - افریقی - اگھیم - آکان - امھاریک - عربی - ماڈرن اسٹینڈرڈ عربی - اسامی - اسو - استوری - ازری - باسا - بیلاروسی - بیمبا - بینا - بلغاری - بمبارا - بنگلہ - بریٹون - بوڈو - بوسنیائی - جرمن - آسٹریائی جرمن - سوئس ہائی جرمن - انگریزی - آسٹریلیائی انگریزی - کینیڈین انگریزی - برطانوی انگریزی - انگریزی (یو کے) - امریکی انگریزی - ہسپانوی - لاطینی امریکی ہسپانوی - یورپی ہسپانوی - میکسیکن ہسپانوی - فرانسیسی - کینیڈین فرانسیسی - سوئس فرینچ - ہندی - ارمینی - انڈونیثیائی - اطالوی - جاپانی - کوریائی - بافیہ - برمی - ڈچ - فلیمِش - پولش - پُرتگالی - برازیلی پرتگالی - یورپی پرتگالی - روسی - البانی - تھائی - ترکی - توروالی - نامعلوم جِب - چینی - چینی، مندارن - چینی (آسان کوئیل) - سادہ مندارن چینی - روایتی چینی - روایتی مندارن چینی - - - - - - - - - - - - - - - - دونیئ - افریقہ - شمالی امریکہ - جنوبی امریکہ - اوشیانیا - مغربی افریقہ - وسطی امریکہ - مشرقی افریقہ - شمالی افریقہ - وسطی افریقہ - جنوبی افریقہ سی علاقہ - امیریکاز - شمالی امریکہ سی علاقہ - کریبیائی - مشرقی ایشیا - جنوبی ایشیا - جنوب مشرقی ایشیا - جنوبی یورپ - آسٹریلیشیا - مالینیشیا - مائکرونیشیائی علاقہ - پولینیشیا - ایشیا - وسطی ایشیا - مغربی ایشیا - یورپ - مشرقی یورپ - شمالی یورپ - مغربی یورپ - ذیلی صحارن افریقہ - لاطینی امریکہ - اسینشن آئلینڈ - انڈورا - متحدہ عرب امارات - افغانستان - انٹیگوا اور باربودا - انگوئیلا - البانیہ - آرمینیا - انگولا - انٹارکٹیکا - ارجنٹینا - امریکی ساموآ - آسٹریا - اسٹریلیا - اروبا - آلینڈ آئلینڈز - آذربائیجان - بوسنیا آں ہرزیگووینا - بارباڈوس - بنگلہ دیش - بیلجیم - برکینا فاسو - بلغاریہ - بحرین - برونڈی - بینن - سینٹ برتھلیمی - برمودا - برونائی - بولیویا - کریبیائی نیدرلینڈز - برازیل - بہاماس - بھوٹان - بؤویٹ آئلینڈ - بوتسوانا - بیلاروس - بیلائز - کینیڈا - کوکوس (کیلنگ) جزائر - کانگو - کنشاسا - کانگو (DRC) - وسط افریقی جمہوریہ - کانگو - برازاویلے - کانگو (جمہوریہ) - سوئٹزر لینڈ - کوٹ ڈی آئیوری - آئیوری کوسٹ - کک آئلینڈز - چلی - کیمرون - چین - کولمبیا - کلپرٹن آئلینڈ - کوسٹا ریکا - کیوبا - کیپ ورڈی - کیوراکاؤ - جزیرہ کرسمس - قبرص - چیکیا - چیک جمہوریہ - جرمنی - ڈائجو گارسیا - جبوتی - ڈنمارک - ڈومنیکا - جمہوریہ ڈومينيکن - الجیریا - سیئوٹا آں میلیلا - ایکواڈور - اسٹونیا - مصر - مغربی صحارا - اریٹیریا - ہسپانیہ - ایتھوپیا - یوروپی یونین - یوروزون - فن لینڈ - فجی - فاکلینڈ جزائر - فاکلینڈ جزائر (مالویناس) - مائکرونیشیا - جزائر فارو - فرانس - گیبون - سلطنت متحدہ - یو کے سلطنت متحدہ - گریناڈا - جارجیا - فرینچ گیانا - گوئرنسی - گھانا - جبل الطارق - گرین لینڈ - گیمبیا - گنی - گواڈیلوپ - استوائی گیانا - یونان - جنوبی جارجیا آں جنوبی سینڈوچ جزائر - گواٹے مالا - گوام - گنی بساؤ - گیانا - ہانگ کانگ SAR چین - ہانگ کانگ ہانگ کانگ SAR چین - ہیرڈ جزیرہ و میکڈولینڈ جزائر - ہونڈاروس - کروشیا - ہیٹی - ہنگری - کینری آئلینڈز - انڈونیشیا - آئرلینڈ - اسرائیل - آئل آف مین - بھارت - برطانوی بحر ہند سی علاقہ - عراق - ایران - آئس لینڈ - اٹلی - جرسی - جمائیکا - اردن - جاپان - کینیا - کرغزستان - کمبوڈیا - کریباتی - کوموروس - سینٹ کٹس اور نیویس - شمالی کوریا - جنوبی کوریا - کویت - کیمین آئلینڈز - قزاخستان - لاؤس - لبنان - سینٹ لوسیا - لیشٹنسٹائن - سری لنکا - لائبیریا - لیسوتھو - لیتھونیا - لکسمبرگ - لٹویا - لیبیا - مراکش - موناکو - مالدووا - مونٹے نیگرو - سینٹ مارٹن - مڈغاسکر - مارشل آئلینڈز - شمالی مقدونیہ - مالی - میانمار (برما) - منگولیا - مکاؤ SAR چین - مکاؤ مکاؤ SAR چین - شمالی ماریانا آئلینڈز - مارٹینک - موریطانیہ - مونٹسیراٹ - مالٹا - ماریشس - مالدیپ - ملاوی - میکسیکو - ملائشیا - موزمبیق - نامیبیا - نیو کلیڈونیا - نائجر - نارفوک آئلینڈ - نائجیریا - نکاراگووا - نیدر لینڈز - ناروے - نیپال - نؤرو - نیئو - نیوزی لینڈ - عمان - پانامہ - پیرو - فرانسیسی پولینیشیا - پاپوآ نیو گنی - فلپائن - پاکستان - پولینڈ - سینٹ پیئر آں میکلیئون - پٹکائرن جزائر - پیورٹو ریکو - فلسطینی خطے - فلسطین فلسطینی خطے - پرتگال - پلاؤ - پیراگوئے - قطر - بیرونی اوشیانیا - ری یونین - رومانیہ - سربیا - روس - روانڈا - سعودی عرب - سولومن آئلینڈز - سشلیز - سوڈان - سویڈن - سنگاپور - سینٹ ہیلینا - سلووینیا - سوالبرڈ آں جان ماین - سلوواکیہ - سیرالیون - سان مارینو - سینیگل - صومالیہ - سورینام - جنوبی سوڈان - ساؤ ٹومے آں پرنسپے - ال سلواڈور - سنٹ مارٹن - شام - سواتنی - سوازی لینڈ - ٹرسٹن ڈا کیونہا - ٹرکس آں کیکوس جزائر - چاڈ - فرانسیسی جنوبی خطے - ٹوگو - تھائی لینڈ - تاجکستان - ٹوکیلاؤ - تیمور لیسٹ - مشرقی تیمور تیمور لیسٹ - ترکمانستان - تونس - ٹونگا - ترکی - ترینیداد آں ٹوباگو - ٹووالو - تائیوان - تنزانیہ - یوکرین - یوگنڈا - امریکہ ما باہرسی لَو جزائز - اقوام متحدہ - ریاست ہائے متحدہ امریکہ - امریکا - یوروگوئے - ازبکستان - ویٹیکن سٹی - سینٹ ونسنٹ آں گرینیڈائنز - وینزوئیلا - برٹش ورجن آئلینڈز - امریکی ورجن آئلینڈز - ویتنام - وینوآٹو - ویلیز آں فیوٹیونا - ساموآ - بناوٹی لہجے - مصنوعی بیڑی - کوسووو - یمن - مایوٹ - جنوبی افریقہ - زامبیا - زمبابوے - نامعلوم علاقہ - - - جارجیائی کیلنڈر - ISO-8601 کیلنڈر - معیاری چھانٹی سی ترتیب - عربی ہندی ہندسے - مغربی ہندسے - - - میٹرک - برطانیہ - ریاست ہائے متحدہ امریکہ - - - جِب:{0} - لِک:{0} - علاقہ:{0} - - - - - right-to-left - - - - [ء ٶ آ أ ئ ا ب پ ت ث ٹ ج چ ڇ ح خ څ ݲ د ذ ڈ ر ز ڑ ژ ڙ س ش ݜ ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ی ے] - [؀؁؂؃\u200C\u200D\u200E\u200F ً ٌ ٍ َ ُ ِ ّ ْ ٔ ٖ ٗ ٘ ٰ ٻ ٺ ټ ٽ ۃ ي] - [ء ٶ آ أ ئ ا ب پ ت ث ٹ ج چ ڇ ح خ څ ݲ د ذ ڈ ر ز ڑ ژ ڙ س ش ݜ ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ی ے] - [\u200E \- ‑ , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹] - [، ؍ ٫ ٬ ؛ \: ؟ . ۔ ( ) \[ \]] - ؟ - - - - - - - - EEEE، d MMMM، y G - - - - - d MMMM، y G - - - - - d MMM، y G - - - - - d/M/y GGGGG - GGGGGyMd - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - y G - MMM y G - d MMM، y G - E، d MMM، y G - d/M - E، d/M - d MMM - E، d MMM - d MMMM - y G - y G - M/y G - d/M/y G - E، d/M/y G - MMM y G - d MMM، y G - E، d MMM، y G - MMMM y G - QQQ y G - QQQQ y G - - - - y G – y G - y – y G - - - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG - - - M/d/y – M/d/y GGGGG - M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG - - - E, M/d/y – E, M/d/y GGGGG - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - - - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G - - - MMM d – d, y G - MMM d, y G – MMM d, y G - MMM d – MMM d, y G - MMM d, y – MMM d, y G - - - E, MMM d – E, MMM d, y G - E, MMM d, y G – E, MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y – E, MMM d, y G - - - M–M - - - d/M – d/M - d/M – d/M - - - E، d/M – E، d/M - E، d/M – E، d/M - - - MMM–MMM - - - d–d MMM - d MMM – d MMM - - - E، d MMM – E، d MMM - E، d MMM – E، d MMM - - - y–y G - - - M/y – M/y G - M/y – M/y G - - - d/M/y – d/M/y G - d/M/y – d/M/y G - d/M/y – d/M/y G - - - E، d/M/y – E، d/M/y G - E، d/M/y – E، d/M/y G - E، d/M/y – E، d/M/y G - - - MMM–MMM y G - MMM y – MMM y G - - - d–d MMM، y G - d MMM – d MMM، y G - d MMM، y – d MMM، y G - - - E، d MMM – E، d MMM، y G - E، d MMM – E، d MMM، y G - E، d MMM، y – E، d MMM، y G - - - MMMM–MMMM y G - MMMM y – MMMM y G - - - - - - - - - جنوری - فروری - مارچ - اپریل - مئ - جون - جولائی - اگست - ستمبر - اکتوبر - نومبر - دسمبر - - - - - ج - ف - م - ا - م - ج - ج - ا - س - ا - ن - د - - - - - - - ایکشیمے - دُوشیمے - گھن آنگا - چارشیمے - پَئ شیمے - شُوگار - لَو آنگا - - - - - ا - د - گ - چ - پ - ش - ل - - - - - - - اول ڇامای - دوھیم ڇامای - ڇوی ڇامای - چوٹھوم ڇامای - - - اول ڇامای - دھویم ڇامای - ڇوی ڇامای - چوٹھوم ڇامای - - - - - اول ڇامای - دوھیم ڇامای - ڇوی ڇامای - چوٹھوم ڇامای - - - - - - - a - p - - - - - - عیسٰیؑ ما مُش - عیسوی - عام دور - - - ع-م - ع - ع-د - - - - - - EEEE، d MMMM، y - - - - - d MMMM، y - - - - - d MMM، y - - - - - d/M/yy - yyMd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - - {1} {0} - - - - y G - MMM y G - d MMM، y G - E، d MMM، y G - d/M - E، d/M - d MMM - E، d MMM - d MMMM - MMMM سی ہفتہ W - M/y - d/M/y - E، d/M/y - MMM y - d MMM، y - E، d MMM، y - MMMM y - QQQ y - QQQQ y - Yسی w ہفتہ - - - - y G – y G - y – y G - - - M/y GGGGG – M/y GGGGG - M/y – M/y GGGGG - M/y – M/y GGGGG - - - M/d/y – M/d/y GGGGG - M/d/y GGGGG – M/d/y GGGGG - M/d/y – M/d/y GGGGG - M/d/y – M/d/y GGGGG - - - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y GGGGG – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - E, M/d/y – E, M/d/y GGGGG - - - MMM y G – MMM y G - MMM – MMM y G - MMM y – MMM y G - - - MMM d – d, y G - MMM d, y G – MMM d, y G - MMM d – MMM d, y G - MMM d, y – MMM d, y G - - - E, MMM d – E, MMM d, y G - E, MMM d, y G – E, MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y – E, MMM d, y G - - - M–M - - - d/M – d/M - d/M – d/M - - - E، d/M – E، d/M - E، d/M – E، d/M - - - MMM–MMM - - - d–d MMM - d MMM – d MMM - - - E، d MMM – E، d MMM - E، d MMM – E، d MMM - - - M/y – M/y - M/y – M/y - - - d/M/y – d/M/y - d/M/y – d/M/y - d/M/y – d/M/y - - - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - E، d/M/y – E، d/M/y - - - MMM–MMM y - MMM y – MMM y - - - d–d MMM y - d MMM – d MMM، y - d MMM، y – d MMM، y - - - E، d MMM – E، d MMM، y - E، d MMM – E، d MMM، y - E، d MMM، y – E، d MMM، y - - - MMMM–MMMM y - MMMM y – MMMM y - - - - - - - - دور - - - کال - پیوک کال - ایݜ - کال گے - - {0} کالا میں - - - {0} کالا موش - - - - ڇا مای - - - ما - مُشُم ما - میں ما - دُوئی ما - - {0} ما میں - - - {0} مائے موش - - - - ہفتہ - مُشُم ہفتہ - میں ہفتہ - دُوئی ہفتہ - - {0} ہفتہ میں - - - {0} ہفتائے موش - - {0} سی ہفتہ - - - ما سی ہفتہ - - - دی - بأل - آش - بول - - {0} دیا میں - - - {0} دیےموش - - - - کال سی دی - - - ہفتہ سی دی - - - موشوم ایکشیمے - مے ایکشیمے - دوی ایکشیمے - - +{0} ایکشیمے - - - -{0} ایکشیمے - - - - موشوم دوشیمے - مے دوشیمے - دوی دوشیمے - - +{0} دوشیمے - - - -{0} دوشیمے - - - - موشوم گھن آنگا - مے گھن آنگا - دوی گھن آنگا - - +{0} گھن آنگا - - - -{0} گھن آنگا - - - - موشوم چارشیمے - مے چارشیمے - دوی چارشیمے - - +{0} چارشیمے - - - -{0} چارشیمے - - - - موشوم پئی شیمے - مے پئی شیمے - دوی پئی شیمے - - +{0} پئی شیمے - - - -{0} پئی شیمے - - - - موشوم شُوگار - مے شُوگار - دوی شُوگار - - +{0} شُوگار - - - -{0} شُوگار - - - - موشوم لَو آنگا - مے لَو آنگا - دوی لَو آنگا - - +{0} لَو آنگا - - - -{0} لَو آنگا - - - - پیشیا موش/پیشیا پأش - - - گینٹہ - میں گینٹہ - - {0} گینٹہ میں - - - {0} گینٹائے موش - - - - میلٹ - میں میلٹ - - +{0} میلڑا میں - - - -{0} میلڑے موش - - - - - +{0} میلٹ میں - - - -{0} میلٹ موش - - - - سیکنڈ - مھیرے - - +{0} سیکنڑا میں - - - -{0} سیکنڑے موش - - - - - +{0} سیکنڈ میں - - - -{0} سیکنڈ موش - - - - منطقۂ وَخ - - - - {0} وَخ - {0} دھات - {0} معیاری وَخ - - - کوآرڈینیٹڈ یونیورسل ٹائم - - - - نامعلوم خار - - - انڈورا - - - دبئی - - - سیبل - - - انٹیگوا - - - انگویلا - - - ٹیرانی - - - یریوان - - - لوانڈا - - - روتھیرا - - - پلمیر - - - ٹرول - - - سیووا - - - ماؤسن - - - ڈیوس - - - ووستوک - - - کیسی - - - ڈومونٹ ڈی ارویلے - - - میک مرڈو - - - ریو گالیگوس - - - مینڈوزا - - - سان جوآن - - - اوشوآئیا - - - لا ریئوجا - - - سان لوئس - - - کیٹامارسی - - - سالٹا - - - جوجوئی - - - ٹوکومین - - - کورڈوبا - - - بیونس آئرس - - - پاگو پاگو - - - ویانا - - - پرتھ - - - ایوکلا - - - ڈارون - - - اڈیلائڈ - - - بروکن ہِل - - - ملبورن - - - ہوبارٹ - - - لِنڈمین - - - سڈنی - - - برسبین - - - میکواری - - - لارڈ ہووے - - - اروبا - - - میریہام - - - باکو - - - سراجیوو - - - بارباڈوس - - - ڈھاکہ - - - برسلز - - - اؤگاڈؤگوو - - - صوفیہ - - - بحرین - - - بجمبرا - - - پورٹو نووو - - - سینٹ برتھیلمی - - - برمودا - - - برونئی - - - لا پاز - - - کرالینڈیجک - - - ایرونیپ - - - ریئو برینکو - - - پورٹو ویلہو - - - بوآ وسٹا - - - مناؤس - - - کوئیابا - - - سنٹارین - - - کیمپو گرینڈ - - - بیلیم - - - اراگویانا - - - ساؤ پالو - - - باہیا - - - فورٹالیزا - - - میسیئو - - - ریسائف - - - نورونہا - - - نساؤ - - - تھمپو - - - گبرون - - - مِنسک - - - بیلائز - - - ڈاؤسن - - - وہائٹ ہارس - - - انووِک - - - وینکوور - - - فورٹ نیلسن - - - ڈاؤسن کریک - - - کریسٹون - - - ایڈمونٹن - - - سوِفٹ کرنٹ - - - کیمبرج سی کھاڑی - - - ریجینا - - - ونّیپیگ - - - ریزولیوٹ - - - رینکن انلیٹ - - - اٹیکوکن - - - ٹورنٹو - - - ایکالوئٹ - - - مونکٹن - - - ہیلیفیکس - - - گوس سی کھاڑی - - - گلیس سی کھاڑی - - - بلانک سبلون - - - سینٹ جانز - - - کوکوس - - - کنشاسا - - - لوبمباشی - - - بنگوئی - - - برازاویلے - - - زیورخ - - - عابدجان - - - راروٹونگا - - - ایسٹر - - - پنٹا اریناس - - - سنٹیاگو - - - ڈوآلا - - - یورومکی - - - شنگھائی - - - بگوٹا - - - کوسٹا ریکا - - - ہوانا - - - کیپ ورڈی - - - کیوراکاؤ - - - کرسمس - - - نکوسیا - - - فاماگوسٹا - - - پراگ - - - بزنجن - - - برلن - - - جبوتی - - - کوپن ہیگن - - - ڈومنیکا - - - سانتو ڈومنگو - - - الجیئرس - - - گیلاپیگوس - - - گوآیاکوئل - - - ٹالن - - - قاہرہ - - - العیون - - - اسمارا - - - کینری - - - سیوٹا - - - میڈرڈ - - - عدیس ابابا - - - ہیلسنکی - - - فجی - - - اسٹینلے - - - چیوک - - - پونپیئی - - - کوسرائی - - - فارو - - - پیرس - - - لبرے ویلے - - - - برٹش سمر ٹائم - - لندن - - - غرناطہ - - - طبلیسی - - - سیئین - - - گرنزی - - - اکّرا - - - جبل الطارق - - - تھولو - - - نوک - - - اسکورز بائی سنڈ - - - ڈنمارک شاون - - - بنجول - - - کونکری - - - گواڈیلوپ - - - ملابو - - - ایتھنز - - - جنوبی جارجیا - - - گواٹے مالا - - - گوآم - - - بِساؤ - - - گیانا - - - ہانگ سینگ - - - ٹیگوسیگالپے - - - زیگریب - - - پورٹ او پرنس - - - بڈاپسٹ - - - جکارتہ - - - پونٹیانک - - - مکاسر - - - جے پورہ - - - - آئرش اسٹینڈرڈ ٹائم - - ڈبلن - - - یروشلم - - - آئل آف مین - - - کولسیتا - - - چاگوس - - - بغداد - - - تہران - - - ریکجاوک - - - روم - - - جرسی - - - جمائیکا - - - امّان - - - ٹوکیو - - - نیروبی - - - بشکیک - - - پنوم پن - - - اینڈربری - - - کریتیماٹی - - - ٹراوا - - - کومورو - - - سینٹ کٹس - - - پیونگ یانگ - - - سیئول - - - کویت - - - کیمین - - - اکتاؤ - - - اورال - - - آتیراؤ - - - اکٹوب - - - کوستانے - - - کیزیلورڈا - - - الماٹی - - - وینٹیانا - - - بیروت - - - سینٹ لوسیا - - - ویڈوز - - - کولمبو - - - مونروویا - - - مسیرو - - - وِلنیئس - - - لگژمبرگ - - - ریگا - - - ٹریپولی - - - کیسا بلانکا - - - موناکو - - - چیسیناؤ - - - پوڈگورسیا - - - میریگوٹ - - - انٹاناناریوو - - - کواجیلین - - - مجورو - - - اسکوپجے - - - بماکو - - - رنگون - - - ہووارڈ - - - اولان باتار - - - مسیؤ - - - سائپین - - - مارٹینک - - - نواکشوط - - - مونٹسیراٹ - - - مالٹا - - - ماریشس - - - مالدیپ - - - بلینٹائر - - - تیجوآنا - - - ہرموسیلو - - - میزٹلان - - - چیہوآہوآ - - - بہیا بندراز - - - اوجیناگا - - - مونٹیری - - - میکسیکو سٹی - - - میٹاموروس - - - میریڈا - - - کنکیون - - - کوالا لمپور - - - کیوچنگ - - - مپوٹو - - - ونڈہوک - - - نؤمیا - - - نیامی - - - نورفوک - - - لاگوس - - - مناگوآ - - - ایمسٹرڈم - - - اوسلو - - - سیٹھمنڈو - - - ناؤرو - - - نیئو - - - چیتھم - - - آکلینڈ - - - مسقط - - - پنامہ - - - لیما - - - تاہیتی - - - مارکیساس - - - گامبیئر - - - پورٹ موریسبی - - - بوگینولے - - - منیلا - - - کراچی - - - وارسا - - - میکلیئون - - - پٹکائرن - - - پیورٹو ریکو - - - غزہ - - - ہیبرون - - - ازوریس - - - مڈیئرا - - - لسبن - - - پلاؤ - - - اسنسیئن - - - قطر - - - ری یونین - - - بخارسٹ - - - بلغراد - - - کالينينغراد - - - ماسکو - - - وولگوگراد - - - سیراٹو - - - استراخان - - - الیانوسک - - - کیروف - - - سمارا - - - یکاٹیرِنبرگ - - - اومسک - - - نوووسِبِرسک - - - برنال - - - ٹامسک - - - نوووکیوزنیسک - - - کریسنویارسک - - - ارکتسک - - - چیتا - - - یکوتسک - - - ولادی ووستک - - - خندیگا - - - سخالین - - - اوست-نیرا - - - میگیدن - - - سرہدنیکولیمسک - - - کیمچٹکا - - - انیدر - - - کگالی - - - ریاض - - - گواڈل کینال - - - ماہی - - - خرطوم - - - اسٹاک ہوم - - - سنگاپور - - - سینٹ ہیلینا - - - لیوبلیانا - - - لانگ ایئر بین - - - بریٹِسلاوا - - - فری ٹاؤن - - - سان ماریانو - - - ڈکار - - - موگادیشو - - - پراماریبو - - - جوبا - - - ساؤ ٹوم - - - ال سلواڈور - - - لوور پرنسس کوارٹر - - - دمشق - - - مبابین - - - عظیم ترک - - - اینجامینا - - - کرگیولین - - - لوم - - - بنکاک - - - دوشانبے - - - فکاؤفو - - - ڈلی - - - اشغبت - - - تیونس - - - ٹونگاٹاپو - - - استنبول - - - پورٹ آف اسپین - - - فیونافیوٹی - - - تائپے - - - دار السلام - - - کیو - - - سمفروپول - - - کیمپالا - - - مڈوے - - - ویک - - - اداک - - - نوم - - - اینکریج - - - یکوٹیٹ - - - سیٹکا - - - جونیئو - - - میٹلا کاٹلا - - - لاس اینجلس - - - بوائس - - - فینکس - - - ڈینور - - - بیولاہ، شمالی ڈکوٹا - - - نیو سلیم، شمالی ڈکوٹا - - - وسط، شمالی ڈکوٹا - - - شکاگو - - - مینومینی - - - ونسینیز، انڈیانا - - - پیٹرزبرگ، انڈیانا - - - ٹیل سٹی، انڈیانا - - - کنوکس، انڈیانا - - - وینامیک، انڈیانا - - - مرینگو، انڈیانا - - - انڈیاناپولس - - - لوئس ویلے - - - ویوے، انڈیانا - - - مونٹیسیلو، کینٹوکی - - - ڈیٹرائٹ - - - نیو یارک - - - مونٹی ویڈیو - - - سمرقند - - - تاشقند - - - واٹیکن - - - سینٹ ونسنٹ - - - کراسیس - - - ٹورٹولا - - - سینٹ تھامس - - - ہو چی منہ سٹی - - - ایفیٹ - - - ولّیس - - - اپیا - - - عدن - - - مایوٹ - - - جوہانسبرگ - - - لیوساکا - - - ہرارے - - - - افغانستان سی وَخ - - - - - وسطی افریقہ ٹائم - - - - - مشرقی افریقہ ٹائم - - - - - جنوبی افریقہ سٹینڈرڈ ٹائم - - - - - مغربی افریقہ ٹائم - - - - - الاسکا ٹائم - الاسکا اسٹینڈرڈ ٹائم - الاسکا ڈے لائٹ ٹائم - - - - - امیزون ٹائم - ایمیزون سی معیاری وَخ - امیزون سی موسم گرما سی وَخ - - - - - سنٹرل ٹائم - سنٹرل اسٹینڈرڈ ٹائم - سنٹرل ڈے لائٹ ٹائم - - - - - ایسٹرن ٹائم - ایسٹرن اسٹینڈرڈ ٹائم - ایسٹرن ڈے لائٹ ٹائم - - - - - ماؤنٹین ٹائم - ماؤنٹین اسٹینڈرڈ ٹائم - ماؤنٹین ڈے لائٹ ٹائم - - - - - پیسفک ٹائم - پیسفک اسٹینڈرڈ ٹائم - پیسفک ڈے لائٹ ٹائم - - - - - ایپیا ٹائم - ایپیا سٹینڈرڈ ٹائم - ایپیا ڈے لائٹ ٹائم - - - - - عرب سی وَخ - عرب سی معیاری وَخ - عرب ڈے لائٹ ٹائم - - - - - ارجنٹینا سی وَخ - ارجنٹینا سی معیاری وَخ - ارجنٹینا سی موسم گرما سی وَخ - - - - - مغربی ارجنٹینا سی وَخ - مغربی ارجنٹینا سی معیاری وَخ - مغربی ارجنٹینا سی موسم گرما سی وَخ - - - - - آرمینیا سی وَخ - آرمینیا سی معیاری وَخ - آرمینیا سی موسم گرما سی وَخ - - - - - اٹلانٹک ٹائم - اٹلانٹک اسٹینڈرڈ ٹائم - اٹلانٹک ڈے لائٹ ٹائم - - - - - سنٹرل آسٹریلیا ٹائم - آسٹریلین سنٹرل اسٹینڈرڈ ٹائم - آسٹریلین سنٹرل ڈے لائٹ ٹائم - - - - - آسٹریلین سنٹرل ویسٹرن ٹائم - آسٹریلین سنٹرل ویسٹرن اسٹینڈرڈ ٹائم - آسٹریلین سنٹرل ویسٹرن ڈے لائٹ ٹائم - - - - - ایسٹرن آسٹریلیا ٹائم - آسٹریلین ایسٹرن اسٹینڈرڈ ٹائم - آسٹریلین ایسٹرن ڈے لائٹ ٹائم - - - - - ویسٹرن آسٹریلیا ٹائم - سٹریلیا ویسٹرن اسٹینڈرڈ ٹائم - آسٹریلین ویسٹرن ڈے لائٹ ٹائم - - - - - آذربائیجان سی وَخ - آذربائیجان سی معیاری وَخ - آذربائیجان سی موسم گرما سی وَخ - - - - - ازوریس سی وَخ - ازوریس سی معیاری وَخ - ازوریس سی موسم گرما سی وَخ - - - - - بنگلہ دیش سی وَخ - بنگلہ دیش سی معیاری وَخ - بنگلہ دیش سی موسم گرما سی وَخ - - - - - بھوٹان سی وَخ - - - - - بولیویا سی وَخ - - - - - برازیلیا ٹائم - برازیلیا اسٹینڈرڈ ٹائم - برازیلیا سمر ٹائم - - - - - برونئی دارالسلام ٹائم - - - - - کیپ ورڈی ٹائم - کیپ ورڈی سٹینڈرڈ ٹائم - کیپ ورڈی سمر ٹائم - - - - - چامورو سٹینڈرڈ ٹائم - - - - - چیتھم ٹائم - چیتھم اسٹینڈرڈ ٹائم - چیتھم ڈے لائٹ ٹائم - - - - - چلی سی وَخ - چلی سی معیاری وَخ - چلی سی موسم گرما سی وَخ - - - - - چین سی وَخ - چین سٹینڈرڈ ٹائم - چینی ڈے لائٹ ٹائم - - - - - کرسمس آئلینڈ ٹائم - - - - - کوکوس آئلینڈز ٹائم - - - - - کولمبیا ٹائم - کولمبیا سی معیاری وَخ - کولمبیا سی موسم گرما سی وَخ - - - - - کک آئلینڈز ٹائم - کک آئلینڈز سٹینڈرڈ ٹائم - کک آئلینڈز نصف سمر ٹائم - - - - - کیوبا ٹائم - کیوبا اسٹینڈرڈ ٹائم - کیوبا ڈے لائٹ ٹائم - - - - - ڈیوس ٹائم - - - - - ڈومونٹ-ڈی’ارویلے ٹائم - - - - - مشرقی تیمور ٹائم - - - - - ایسٹر آئلینڈ سی وَخ - ایسٹر آئلینڈ سی معیاری وَخ - ایسٹر آئلینڈ سی موسم گرما سی وَخ - - - - - ایکواڈور سی وَخ - - - - - وسط یورپ سی وَخ - وسطی یورپ سی معیاری وَخ - وسطی یورپ سی موسم گرما سی وَخ - - - - - مشرقی یورپ سی وَخ - مشرقی یورپ سی معیاری وَخ - مشرقی یورپ سی موسم گرما سی وَخ - - - - - بعید مشرقی یورپی وَخ - - - - - مغربی یورپ سی وَخ - مغربی یورپ سی معیاری وَخ - مغربی یورپ سی موسم گرما سی وَخ - - - - - فاک لینڈ آئلینڈز سی وَخ - فاک لینڈ آئلینڈز سی معیاری وَخ - فاک لینڈ آئلینڈز سی موسم گرما سی وَخ - - - - - فجی ٹائم - فجی سٹینڈرڈ ٹائم - فجی سمر ٹائم - - - - - فرینچ گیانا سی وَخ - - - - - فرینچ جنوبی آں انٹارکٹک ٹائم - - - - - گالاپاگوز سی وَخ - - - - - گیمبیئر ٹائم - - - - - جارجیا سی وَخ - جارجیا سی معیاری وَخ - جارجیا سی موسم گرما سی وَخ - - - - - جلبرٹ آئلینڈز ٹائم - - - - - گرین وچ سی اصل وَخ - - - - - مشرقی گرین لینڈ ٹائم - مشرقی گرین لینڈ اسٹینڈرڈ ٹائم - مشرقی گرین لینڈ سی موسم گرما سی وَخ - - - - - مغربی گرین لینڈ ٹائم - مغربی گرین لینڈ اسٹینڈرڈ ٹائم - مغربی گرین لینڈ سی موسم گرما سی وَخ - - - - - خلیج سی معیاری وَخ - - - - - گیانا سی وَخ - - - - - ہوائی الیوٹیئن اسٹینڈرڈ ٹائم - - - - - ہوائی الیوٹیئن ٹائم - ہوائی الیوٹیئن اسٹینڈرڈ ٹائم - ہوائی الیوٹیئن ڈے لائٹ ٹائم - - - - - ہانگ سینگ ٹائم - ہانگ سینگ سٹینڈرڈ ٹائم - ہانگ سینگ سمر ٹائم - - - - - ہووڈ ٹائم - ہووڈ سٹینڈرڈ ٹائم - ہووڈ سمر ٹائم - - - - - ہندوستان سی معیاری وَخ - - - - - بحر ہند ٹائم - - - - - ہند چین ٹائم - - - - - وسطی انڈونیشیا ٹائم - - - - - مشرقی انڈونیشیا ٹائم - - - - - مغربی انڈونیشیا ٹائم - - - - - ایران سی وَخ - ایران سی معیاری وَخ - ایران ڈے لائٹ ٹائم - - - - - ارکتسک ٹائم - ارکتسک سٹینڈرڈ ٹائم - ارکتسک سمر ٹائم - - - - - اسرائیل سی وَخ - اسرائیل سی معیاری وَخ - اسرائیل ڈے لائٹ ٹائم - - - - - جاپان ٹائم - جاپان سٹینڈرڈ ٹائم - جاپان ڈے لائٹ ٹائم - - - - - مشرقی قزاخستان سی وَخ - - - - - مغربی قزاخستان سی وَخ - - - - - کوریا ٹائم - کوریا سٹینڈرڈ ٹائم - کوریا ڈے لائٹ ٹائم - - - - - کوسرے ٹائم - - - - - کریسنویارسک ٹائم - کرسنویارسک سٹینڈرڈ ٹائم - کریسنویارسک سمر ٹائم - - - - - کرغستان سی وَخ - - - - - لائن آئلینڈز ٹائم - - - - - لارڈ ہووے ٹائم - لارڈ ہووے اسٹینڈرڈ ٹائم - لارڈ ہووے ڈے لائٹ ٹائم - - - - - میگیدن ٹائم - مگادان اسٹینڈرڈ ٹائم - میگیدن سمر ٹائم - - - - - ملیشیا ٹائم - - - - - مالدیپ سی وَخ - - - - - مارکیسس ٹائم - - - - - مارشل آئلینڈز ٹائم - - - - - ماریشس ٹائم - ماریشس سٹینڈرڈ ٹائم - ماریشس سمر ٹائم - - - - - ماؤسن ٹائم - - - - - میکسیکن پیسفک ٹائم - میکسیکن پیسفک اسٹینڈرڈ ٹائم - میکسیکن پیسفک ڈے لائٹ ٹائم - - - - - یولان بیتور ٹائم - یولان بیتور سٹینڈرڈ ٹائم - یولان بیتور سمر ٹائم - - - - - ماسکو ٹائم - ماسکو اسٹینڈرڈ ٹائم - ماسکو سمر ٹائم - - - - - میانمار ٹائم - - - - - ناؤرو ٹائم - - - - - نیپال سی وَخ - - - - - نیو کیلیڈونیا ٹائم - نیو کیلیڈونیا سٹینڈرڈ ٹائم - نیو کیلیڈونیا سمر ٹائم - - - - - نیوزی لینڈ سی وَخ - نیوزی لینڈ سی معیاری وَخ - نیوزی لینڈ ڈے لائٹ ٹائم - - - - - نیو فاؤنڈ لینڈ ٹائم - نیو فاؤنڈ لینڈ اسٹینڈرڈ ٹائم - نیو فاؤنڈ لینڈ ڈے لائٹ ٹائم - - - - - نیئو ٹائم - - - - - نارفوک آئلینڈ سی وَخ - نارفوک آئلینڈ سی معیاری وَخ - نارفوک آئلینڈ سی موسم گرما سی وَخ - - - - - فرنانڈو ڈی نورنہا سی وَخ - فرنانڈو ڈی نورنہا سی معیاری وَخ - فرنانڈو ڈی نورونہا سمر ٹائم - - - - - نوووسیبرسک ٹائم - نوووسیبرسک سٹینڈرڈ ٹائم - نوووسیبرسک سمر ٹائم - - - - - اومسک ٹائم - اومسک سٹینڈرڈ ٹائم - اومسک سمر ٹائم - - - - - پاکستان سی وَخ - پاکستان سی معیاری وَخ - پاکستان سی موسم گرما سی وَخ - - - - - پلاؤ ٹائم - - - - - پاپوآ نیو گنی ٹائم - - - - - پیراگوئے سی وَخ - پیراگوئے سی معیاری وَخ - پیراگوئے سی موسم گرما سی وَخ - - - - - پیرو سی وَخ - پیرو سی معیاری وَخ - پیرو سی موسم گرما سی وَخ - - - - - فلپائن ٹائم - فلپائن سٹینڈرڈ ٹائم - فلپائن سمر ٹائم - - - - - فینکس آئلینڈز ٹائم - - - - - سینٹ پیئر آں مکلیئون ٹائم - سینٹ پیئر آں مکلیئون اسٹینڈرڈ ٹائم - سینٹ پیئر آں مکلیئون ڈے لائٹ ٹائم - - - - - پٹکائرن ٹائم - - - - - پوناپے ٹائم - - - - - پیانگ یانگ وَخ - - - - - ری یونین ٹائم - - - - - روتھیرا سی وَخ - - - - - سخالین ٹائم - سخالین سٹینڈرڈ ٹائم - سخالین سمر ٹائم - - - - - ساموآ ٹائم - ساموآ سٹینڈرڈ ٹائم - ساموآ ڈے لائٹ ٹائم - - - - - سیشلیز ٹائم - - - - - سنگاپور سٹینڈرڈ ٹائم - - - - - سولمن آئلینڈز ٹائم - - - - - جنوبی جارجیا ٹائم - - - - - سورینام سی وَخ - - - - - سیووا ٹائم - - - - - تاہیتی ٹائم - - - - - تائی پیئی ٹائم - تائی پیئی اسٹینڈرڈ ٹائم - تئی پیئی ڈے لائٹ ٹائم - - - - - تاجکستان سی وَخ - - - - - ٹوکیلاؤ ٹائم - - - - - ٹونگا ٹائم - ٹونگا سٹینڈرڈ ٹائم - ٹونگا سمر ٹائم - - - - - چوک ٹائم - - - - - ترکمانستان سی وَخ - ترکمانستان سی معیاری وَخ - ترکمانستان سی موسم گرما سی وَخ - - - - - ٹوالو ٹائم - - - - - یوروگوئے سی وَخ - یوروگوئے سی معیاری وَخ - یوروگوئے سی موسم گرما سی وَخ - - - - - ازبکستان سی وَخ - ازبکستان سی معیاری وَخ - ازبکستان سی موسم گرما سی وَخ - - - - - وانوآٹو ٹائم - وانوآٹو سٹینڈرڈ ٹائم - وانوآٹو سمر ٹائم - - - - - وینزوئیلا سی وَخ - - - - - ولادی ووستک ٹائم - ولادی ووستک سٹینڈرڈ ٹائم - ولادی ووستک سمر ٹائم - - - - - وولگوگراد ٹائم - وولگوگراد اسٹینڈرڈ ٹائم - وولگوگراد سمر ٹائم - - - - - ووسٹاک سی وَخ - - - - - ویک آئلینڈ ٹائم - - - - - والیز اور فٹونا ٹائم - - - - - یکوتسک ٹائم - یکوتسک اسٹینڈرڈ ٹائم - یکوتسک سمر ٹائم - - - - - یکاٹیرِنبرگ ٹائم - یکاٹیرِنبرگ اسٹینڈرڈ ٹائم - یکاٹیرِنبرگ سمر ٹائم - - - - - یوکون ٹائم - - - - - - - arabext - - - {0} {1} - - - - متحدہ عرب اماراتی درہم - - - افغان افغانی - - - البانیا سی لیک - - - آرمینیائی ڈرم - - - نیدر لینڈز انٹیلیئن گلڈر - - - انگولا سی کوانزا - - - ارجنٹائن پیسہ - - - آسٹریلین ڈالر - - - اروبن فلورِن - - - آذربائجانی منات - - - بوسنیا ہرزیگووینا کا قابل منتقلی نشان - - - باربیڈین ڈالر - - - بنگلہ دیشی ٹکا - - - بلغارین لیو - - - بحرینی دینار - - - برونڈیئن فرانک - - - برموڈا ڈالر - - - برونئی ڈالر - - - بولیوین بولیویانو - - - برازیلی ریئل - - - بہامانی ڈالر - - - بھوٹانی گُلٹرم - - - بوتسوانا سی پولا - - - بیلاروسی روبل - - - بیلیز ڈالر - - - کنیڈین ڈالر - - - کانگولیز فرانک - - - سوئس فرانکس - - - چلّین پیسہ - - - چینی یوآن (آف شور) - - - چینی یوآن - - - کولمبین پیسہ - - - کوسٹا ریکا کا کولن - - - کیوبا کا قابل منتقلی پیسو - - - کیوبا سی پیسو - - - کیپ ورڈی سی اسکیوڈو - - - چیک کرونا - چیک کروناز - - - جبوتی فرانک - - - ڈنمارک کرون - - - ڈومنیکن پیسو - - - الجیریائی دینار - - - مصری پاؤنڈ - - - اریٹیریا سی نافکا - - - ایتھوپیائی بِرّ - - - یورو - - - فجی سی ڈالر - - - فاکلینڈ آئلینڈز پونڈ - - - برطانوی پاؤنڈ - - - جارجیائی لاری - - - گھانا سی سیڈی - - - جبل الطارق پونڈ - - - گامبیا سی ڈلاسی - - - گنی فرانک - - - گواٹے مالا کا کوئٹزل - - - گویانیز ڈالر - - - ھانگ کانگ ڈالر - - - ہونڈوران لیمپیرا - - - کروشین کونا - - - ہیتی کا گؤرڈی - - - ہنگرین فورنٹ - - - انڈونیشین روپیہ - - - اسرائیلی نم شیکل - - - بھارتی روپیہ - - - عراقی دینار - - - ایرانی ریال - - - آئس لينڈی کرونا - - - جمائیکن ڈالر - - - اردنی دینار - - - جاپانی ین - - - کینیائی شلنگ - - - کرغستانی سوم - - - کمبوڈیائی ریئل - - - کوموریئن فرانک - - - شمالی کوریائی وون - - - جنوبی کوریائی وون - - - کویتی دینار - - - کیمین آئلینڈز ڈالر - - - قزاخستانی ٹینگ - - - لاؤشیائی کِپ - - - لبنانی پونڈ - - - سری لنکائی روپیہ - - - لائبریائی ڈالر - - - لیسوتو لوٹی - لیسوتو لوٹیس - - - لیبیائی دینار - - - مراکشی درہم - - - مالدووی لیو - - - ملاگاسی اریاری - - - مقدونیائی دینار - - - میانمار کیاٹ - - - منگولیائی ٹگرِ - - - میکانیز پٹاکا - - - موریطانیائی اوگوئیا - - - ماریشس کا روپیہ - - - مالدیپ سی روفیہ - - - ملاوی کواچا - - - میکسیکی پیسہ - - - ملیشیائی رنگِٹ - - - موزامبیقی میٹیکل - - - نامیبیائی ڈالر - - - نائیجیریائی نائرا - - - نکارا گوا کا کورڈوبا - - - ناروے کرون - - - نیپالی روپیہ - - - نیوزی لینڈ ڈالر - - - عمانی ریال - - - پنامہ کا بالبوآ - - - پیروویئن سول - - - پاپوآ نم گنی سی کینا - - - فلپائینی پیسہ - - - پاکستانی روپیہ - - - پولش زلوٹی - - - پیراگوئے سی گوآرنی - - - قطری ریال - - - رومانیائی لیو - - - سربین دینار - - - روسی روبل - - - روانڈا سی فرانک - - - سعودی ریال - - - سولومن آئلینڈز ڈالر - - - سشلی کا روپیہ - - - سوڈانی پاؤنڈ - - - سویڈن کرونا - - - سنگا پور ڈالر - - - سینٹ ہیلینا پاؤنڈ - - - سیئرا لیون لیون - - - سیئرا لیون لیون - 1964-2022 - - - صومالی شلنگ - - - سورینامی ڈالر - - - جنوبی سوڈانی پاؤنڈ - - - ساؤ ٹومے آں پرنسپے ڈوبرا - - - شامی پونڈ - - - سوازی لیلانجینی - - - تھائی باہت - - - تاجکستانی سومونی - - - ترکمانستانی منات - - - تیونیسیائی دینار - - - ٹونگن پانگا - - - ترکی لیرا - - - ترینیداد آں ٹوباگو سی ڈالر - - - نیو تائیوان ڈالر - - - تنزانیائی شلنگ - - - یوکرینیائی ہریونیا - - - یوگانڈا شلنگ - - - امریکی ڈالر - $ - - - یوروگویان پیسو - - - ازبکستانی سوم - - - وینزویلا بولیور - - - ویتنامی ڈانگ - - - وینوواتو واتو - - - ساموآ سی ٹالا - - - وسطی افریقی [CFA] فرانک - - - مشرقی کریبیا سی ڈالر - - - مغربی افریقی [CFA] فرانک - - - CFP فرانک - - - نامعلوم پیس - - - یمنی ریال - - - جنوبی افریقی رانڈ - - - زامبیائی کواچا - - - - {0} گینٹہ - دایاں موڑ نمبر {0} مڑیں - - - - - - ڈیسی {0} - - - سینٹی {0} - - - ملی {0} - - - مائکرو {0} - - - نینو {0} - - - پکو{0} - - - فیمٹو{0} - - - اٹو{0} - - - زپٹو{0} - - - ڈیکا{0} - - - ہیکٹو{0} - - - کلو{0} - - - میگا{0} - - - گیگا {0} - - - ٹیرا{0} - - - پیٹا{0} - - - اکسا{0} - - - زیٹا{0} - - - یوٹا{0} - - - کیبی{0} - - - میبی{0} - - - جیبی{0} - - - ٹیبی{0} - - - پیبی{0} - - - ایکسبی{0} - - - زیبی{0} - - - یوب{0} - - - {0} فی {1} - - - مربع {0} - - - کیوبک {0} - - - {0} جی-فورس - - - میٹر فی مربع سیکنڈ - {0} میٹر فی مربع سیکنڈ - - - گردش - - - ریڈینس - {0} ریڈین - - - مربع کلو میٹر - {0} مربع کلو میٹر - {0} فی مربع کلو میٹر - - - {0} مربع میٹر - {0} فی مربع میٹر - - - مربع سینٹی میٹر - {0} مربع سینٹی میٹر - {0} فی مربع سینٹی میٹر - - - {0} مربع میل - {0} فی مربع میل - - - {0} مربع گز - - - {0} مربع انچا - {0} فی مربع انچا - - - {0} قیراط - - - ملی گرام فی ڈیسی لیٹر - {0} ملی گرام فی ڈیسی لیٹر - - - ملی مولس فی لیٹر - {0} ملی مول فی لیٹر - - - فی ملین حصے - {0} فی ملین حصے - - - {0} فیصد - - - {0} پرمرئیڈ - - - مولز - - - لیٹر فی کلومیٹر - {0} لیٹر فی کلومیٹر - - - لیٹر فی 100 کلو میٹر - {0} لیٹر فی 100 کلو میٹر - - - میل فی گیلن - {0} میل فی گیلن - - - میل فی امپیریل گیلن - {0} میل فی امپیریل گیلن - - - پیٹا بائٹس - {0} پیٹا بائٹ - - - ٹیرابائٹس - {0} ٹیرابائٹ - - - ٹیرابٹس - {0} ٹیرابٹ - - - گیگابائٹس - {0} گیگابائٹ - - - گیگابٹس - {0} گیگابٹ - - - ميگابائٹس - {0} میگابائٹ - - - میگابٹس - {0} میگابٹ - - - کلوبائٹس - {0} کلوبائٹ - - - کلوبٹس - {0} کلوبٹ - - - {0} بائٹ - - - بٹس - {0} بٹ - - - دہائیاں - - - فی کال {0} - - - ملی سیکنڈز - - - مائیکرو سیکنڈز - - - ایمپیئر - {0} ایمپیئر - - - ملی ایمپیئر - {0} ملی ایمپیئر - - - {0} اوہم - - - {0} وولٹ - - - کلو کیلوریز - {0} کلو کیلوری - - - کیلوریز - {0} کیلوری - - - کیلوریز - {0} کیلوری - - - کلو جول - {0} کلو جول - - - جول - {0} جول - - - کلو واٹ آور - {0} کلو واٹ آور - - - الیکٹرون وولٹس - {0} الیکٹرون وولٹ - - - برطانوی تھرمل اکائیاں - {0} برطانوی تھرمل اکائی - - - امریکی تھرمز - {0} امریکی تھرم - - - پاؤنڈز قوت - {0} پاؤنڈ قوت - - - نیوٹنز - {0} نیوٹن - - - گیگاہرٹز - {0} گیگاہرٹز - - - میگاہرٹز - {0} میگاہرٹز - - - کلوہرٹز - {0} کلوہرٹز - - - ہرٹز - {0} ہرٹز - - - ٹائپوگرافک em - - - {0} پکسل - - - {0} میگا پکسل - - - پکسلز فی سینٹی میٹر - {0} پکسل فی سینٹی میٹر - - - پکسلز فی انچا - {0} پکسل فی انچا - - - ڈاٹس فی سینٹی میٹر - {0} ڈاٹ فی سینٹی میٹر - - - ڈاٹس فی انچا - {0} ڈاٹ فی انچا - - - زمین کا رداس - {0} زمین رداس - - - {0} فی کلومیٹر - - - {0} فی میٹر - - - ڈیسی میٹر - {0} ڈیسی میٹر - - - {0} فی سینٹی میٹر - - - {0} ملیمیٹر - - - مائیکرو میٹر - {0} مائیکرو میٹر - - - نینو میٹر - {0} نینو میٹر - - - {0} فی فٹ - - - {0} فی انچا - - - ایسٹرونومیکل یونٹس - {0} ایسٹرونومیکل یونٹ - - - اسکینڈی نیویائی میل - {0} اسکینڈی نیویائی میل - - - {0} lux - - - کنڈیلا - {0} کنڈیلا - - - لیومِن - {0} لیومِن - - - شمسی چمک - {0} شمسی چمک - - - میٹرک ٹن - {0} میٹرک ٹن - - - کلو - {0} کلو - {0} فی کلو - - - {0} گرام - {0} فی گرام - - - ملی گرام - {0} ملی گرام - - - مائکرو گرام - {0} مائکرو گرام - - - {0} ٹن - - - اسٹونز - {0} اسٹون - - - {0} پاؤنڈ - {0} فی پاؤنڈ - - - اونس - {0} اونس - {0} فی اونس - - - ٹرائے اونس - {0} ٹرائے اونس - - - {0} قیراط - - - {0} ڈالٹن - - - {0} زمینی کمیت - - - {0} شمسی کمیت - - - گیگا واٹ - {0} گیگا واٹ - - - میگا واٹ - {0} میگا واٹ - - - کلو واٹ - - - ملی واٹ - {0} ملی واٹ - - - ہارس پاور - {0} ہارس پاور - - - ملی میٹر مرکری - {0} ملی میٹر مرکری - - - پاؤنڈز فی مربع انچا - {0} پاؤنڈ فی مربع انچا - - - انچا مرکری - {0} انچا مرکری - - - بارز - {0} بار - - - ملی بار - {0} ملی بار - - - ماحول - {0} ماحول - - - پاسکل - {0} پاسکل - - - ہیکٹو پاسکل - {0} ہیکٹو پاسکل - - - کلو پاسکلز - {0} کلو پاسکل - - - میگا پاسکلز - {0} میگا پاسکل - - - کلومیٹر فی گینٹہ - {0} کلومیٹر فی گینٹہ - - - {0} میٹر فی سیکنڈ - - - {0} میل فی گینٹہ - - - ناٹس - {0} ناٹ - - - {0} ڈگری سیلسیس - - - {0} ڈگری فارن ہائیٹ - - - کیلون - {0} کیلون - - - پاؤنڈ فٹ - {0} پاؤنڈ فٹ - - - نیوٹن میٹر - {0} نیوٹن میٹر - - - کیوبک کلو میٹر - {0} کیوبک کلو میٹر - - - کیوبک میٹر - {0} کیوبک میٹر - {0} فی کیوبک میٹر - - - {0} کیوبک سینٹی میٹر - {0} فی کیوبک سینٹی میٹر - - - {0} کیوبک گز - - - {0} کیوبک فٹ - - - {0} کیوبک انچا - - - میگا لیٹر - {0} میگا لیٹر - - - ہیکٹو لیٹر - {0} ہیکٹو لیٹر - - - {0} ڈیسی لیٹر - - - {0} سینٹی لیٹر - - - ملی لیٹر - {0} ملی لیٹر - - - میٹرک پائنٹ - {0} میٹرک پائنٹ - - - میٹرک کپ - {0} میٹرک کپ - - - {0} ایکڑ فٹ - - - {0} بوشیل - - - گیلن - {0} گیلن - {0} فی گیلن - - - امپیریل گیلن - {0} امپیریل گیلن - {0} فی امپیریل گیلن - - - کوارٹ - {0} کوارٹ - - - پائنٹ - {0} پائنٹ - - - {0} کپ - - - فلوئڈ اونس - {0} فلوئڈ اونس - - - امپیریل فلوئڈ اونس - {0} امپیریئل فلوئڈ اونس - - - ٹیبل سپون - {0} ٹیبل سپون - - - ٹی سپون - {0} ٹی سپون - - - بیرلز - {0} بیرل - - - کارڈینل ڈائریکشن - {0} مشرق - {0} شمال - {0} جنوب - {0} مغرب - - - - - ڈی۔ {0} - - - سی۔ {0} - - - می۔ {0} - - - نے۔ {0} - - - پی۔{0} - - - فے۔{0} - - - ا۔{0} - - - ز۔{0} - - - یوکٹو{0} - - - ڈے۔{0} - - - ہے۔{0} - - - کی{0} - - - مے۔{0} - - - گی۔{0} - - - ٹے۔{0} - - - پے۔{0} - - - ای۔{0} - - - زے{0} - - - یو{0} - - - جی-فورس - - - ڈگری - {0} ڈگری - - - آرک منٹ - {0} آرک منٹ - - - آرک سیکنڈ - {0} آرک سیکنڈ - - - ہیکٹر - {0} ہیکٹر - - - مربع میٹر - - - مربع میل - {0} sq mi - - - ایکڑ - {0} ایکڑ - - - مربع گز - - - مربع فٹ - {0} مربع فٹ - - - مربع انچا - - - دُنامز - {0} دُنام - - - قیراط - - - ملی مول/لیٹر - - - حصے/ملین - - - فیصد - - - فی ملی - {0} فی ملی - - - پرمرئیڈ - - - مول - {0} مول - - - لیٹر/100 کلو میٹر - - - mpg - {0} mpg - - - miles/gal Imp. - - - پی بائٹ - {0} پی بی - - - Tbit - - - Gbit - - - MByte - - - kByte - - - kbit - - - بائٹ - - - قرن - {0} قرن - - - دہائی - {0} دہائی - - - کال - {0} کال - - - ما - {0} ما - فی ما {0} - - - ہفتہ - {0} ہفتہ - {0} فی ہفتہ - - - دی - {0} دی - {0} فی دی - - - گینٹہ - {0} گینٹہ - {0} فی گینٹہ - - - میلٹ - {0} میلٹ - {0} فی میلٹ - - - سیکنڈ - {0} سیکنڈ - {0} فی سیکنڈ - - - ملی سیکنڈ - {0} ملی سیکنڈ - - - مائیکرو سیکنڈ - {0} مائیکرو سیکنڈ - - - نینو سیکنڈز - {0} نینو سیکنڈ - - - اوہم - - - وولٹ - - - الیکٹرون وولٹ - - - امریکی تھرم - {0} امریکی تھرمز - - - پاؤنڈ قوت - - - نیوٹن - - - پکسلز - - - میگا پکسلز - - - ڈاٹ - {0} ڈاٹ - - - کلو میٹر - {0} کلو میٹر - {0} فی کلو میٹر - - - میٹر - {0} میٹر - - - سینٹی میٹر - {0} سینٹی میٹر - {0}/سینٹی میٹر - - - ملی میٹر - {0} ملی میٹر - - - پیکو میٹر - {0} پیکو میٹر - - - میل - {0} میل - - - گز - {0} گز - - - فٹ - {0} فٹ - {0}/فٹ - - - انچا - {0} انچا - {0}/انچا - - - پارسیک - {0} پارسیک - - - نوری کال - {0} نوری کال - - - فرلانگ - {0} فرلانگ - - - فیتھامز - {0} فیتھامز - - - بحری میل - {0} بحری میل - - - پوائنٹس - {0} پوائنٹس - - - شمسی رداس - {0} شمسی رداس - - - lux - - - گرام - - - ٹن - - - پاؤنڈ - - - قیراط - - - ڈالٹنز - - - زمینی کمیتیں - - - شمسی کمیتیں - - - گرین - {0} گرین - - - {0} کلو واٹ - - - واٹ - {0} واٹ - - - بار - {0} بارز - - - کلومیٹر/گھنٹہ - {0} kph - - - میٹر فی سیکنڈ - - - میل فی گینٹہ - {0} mph - - - ڈگری سیلسیس - {0}‎°C - - - ڈگری فارن ہائیٹ - - - کیوبک سینٹی میٹر - - - کیوبک میل - {0} کیوبک میل - - - کیوبک گز - - - کیوبک فٹ - - - کیوبک انچا - - - لیٹر - {0} لیٹر - {0} فی لیٹر - - - ڈیسی لیٹر - - - سینٹی لیٹر - - - ایکڑ فٹ - - - بوشیل - - - gal - {0} gal - {0}/gal - - - qts - - - کپ - - - fl oz - {0} fl oz - - - بیرل - - - ٹیگیل - {0} ٹیگیل - - - پینچ - {0} پینچ - - - ڈائریکشن - - - - - ڈیسی {0} - - - سینٹی {0} - - - ملی {0} - - - نینو {0} - - - پکو{0} - - - فیمٹو{0} - - - اٹو{0} - - - زپٹو{0} - - - ڈیکا{0} - - - ہیکٹو{0} - - - کلو{0} - - - میگا{0} - - - گیگا {0} - - - ٹیرا{0} - - - پیٹا{0} - - - اکسا{0} - - - زیٹا{0} - - - یوٹا{0} - - - کیبی{0} - - - {0} ملی س - - - {0} م س - - - {0} ن س - - - {0}cm - - - {0} شمسی ر - - - {0} گرام - - - km/hr - {0}kph - - - - - - {0}،{1} - {0}،{1} - {0} ،آں {1} - {0} آں {1} - - - {0}،{1} - {0}،{1} - {0}، یا {1} - {0} یا {1} - - - {0}،{1} - {0}،{1} - - - - - ہاں:ہاں - نأ:نأ - - - diff --git a/make/data/cldr/common/main/trw_PK.xml b/make/data/cldr/common/main/trw_PK.xml deleted file mode 100644 index 3e8950d5ebf4..000000000000 --- a/make/data/cldr/common/main/trw_PK.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/ts.xml b/make/data/cldr/common/main/ts.xml deleted file mode 100644 index 301201fcaaa8..000000000000 --- a/make/data/cldr/common/main/ts.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - Xi Czech - Xi Danish - Xi Jarimani - Xi Giriki - Xi Nghezi - Xi spain - hi xi Estonia - Xi Finnish - Xi Furwa - XiHeberu - hi xi Hungary - hi xi Iceland - Xi Ithali - Xi Japani - Xikorea - hi xi Lithuania - hi xi Latvia - Xi bunu - Xi Norway - Xi Polixi - Putukezi - hi xi Romania - Xi Rhaxiya - Xi Swiden - Xitsonga - - - - [a b c d e f g h i j k l m n o p q r s t u v w x y z] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - ‘ - ’ - “ - ” - - - - - - - - Sun - Yan - Kul - Dzi - Mud - Kho - Maw - Mha - Ndz - Nhl - Huk - N’w - - - Sunguti - Nyenyenyani - Nyenyankulu - Dzivamisoko - Mudyaxihi - Khotavuxika - Mawuwani - Mhawuri - Ndzhati - Nhlangula - Hukuri - N’wendzamhala - - - - - - - Son - Mus - Bir - Har - Ne - Tlh - Mug - - - Sonta - Musumbhunuku - Ravumbirhi - Ravunharhu - Ravumune - Ravuntlhanu - Mugqivela - - - - - - - K1 - K2 - K3 - K4 - - - Kotara yo sungula - Kotara ya vumbirhi - Kotara ya vunharhu - Kotara ya vumune - - - - - - BC - BCE - - - - - E h:mm a - E h:mm:ss a - h a - h:mm a - h:mm:ss a - h:mm:ss a v - h:mm a v - 'week' W 'of' MMM - 'week' W 'of' MMM - - - - h a – h a - h–h a - - - h:mm a – h:mm a - h:mm–h:mm a - h:mm–h:mm a - - - h:mm a – h:mm a v - h:mm–h:mm a v - h:mm–h:mm a v - - - h a – h a v - h–h a v - - - MM-dd – MM-dd - MM-dd – MM-dd - - - MM-dd, E – MM-dd, E - MM-dd, E – MM-dd, E - - - MMM d – MMM d - - - MMM d, E – MMM d, E - MMM d, E – MMM d, E - - - y-MM – y-MM - y-MM – y-MM - - - y-MM-dd – y-MM-dd - y-MM-dd – y-MM-dd - y-MM-dd – y-MM-dd - - - y-MM-dd, E – y-MM-dd, E - y-MM-dd, E – y-MM-dd, E - y-MM-dd, E – y-MM-dd, E - - - y MMM – y MMM - - - y MMM d – MMM d - y MMM d – y MMM d - - - y MMM d, E – MMM d, E - y MMM d, E – MMM d, E - y MMM d, E – y MMM d, E - - - y MMMM – y MMMM - - - - - - - - - , -   - - - {0} {1} - {0} {1} - - - - R - - - - diff --git a/make/data/cldr/common/main/ts_ZA.xml b/make/data/cldr/common/main/ts_ZA.xml deleted file mode 100644 index 9dcef53ad048..000000000000 --- a/make/data/cldr/common/main/ts_ZA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/tt.xml b/make/data/cldr/common/main/tt.xml index 0d7297da0b74..82a80e5f8d5e 100644 --- a/make/data/cldr/common/main/tt.xml +++ b/make/data/cldr/common/main/tt.xml @@ -628,6 +628,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic һиҗри тәкъвим (Өммелкора) һиҗри (Өммелкора) ISO-8601 календаре + Gregoriano sutiyuq runa япун тәкъвиме япун иран тәкъвиме @@ -647,6 +648,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic беренчел эмоҗи мәтен + 12 сәгать системасы + 12 + 24 сәгать системасы + 24 12 сәгать системасы (0–11) 12 (0–11) 12 сәгать системасы (1–12) @@ -714,6 +719,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic сүн каб + + сүн + каб + метрик Бөекбритания @@ -1052,6 +1061,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + . + {1}, {0} @@ -1115,11 +1127,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic y 'ел', d MMM y 'ел', d MMM, E y 'ел', MMMM + y 'ел', d MMMM + y 'ел', d MMMM, EEE y 'ел', QQQ y 'ел', QQQQ Y 'елның' w 'атнасы' + + {0} – {1} + {0} – {1} + {0} – {1} G y 'ел' – G y 'ел' @@ -2008,9 +2026,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Либревиль - - Британия җәйге вакыты - Лондон @@ -2101,9 +2116,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Җәяпура - - Ирландия стандарт вакыты - Дублин @@ -2988,6 +3000,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Бразилиа җәйге вакыты + + + British Tiempo + Британия җәйге вакыты + + Бруней-Даруссалам вакыты @@ -3161,6 +3179,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Гринвич уртача вакыты + + + Groenlandia pacha + Groenlandia Tiempo Estándar + Groenlandia Inti raymi pacha + + Көнчыгыш Гренландия вакыты @@ -3187,7 +3212,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Гавай-Алеут стандарт вакыты + Гавай вакыты @@ -3248,6 +3273,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Иран җәйге вакыты + + + Irlanda pacha + Ирландия стандарт вакыты + + Иркутск вакыты @@ -3547,9 +3578,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Самоа вакыты Самоа стандарт вакыты - Самоа җәйге вакыты @@ -3616,6 +3645,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Чуук вакыты + + + Türkiye Tiempo + Türkiye Standard Time + Türkiye Inti raymi pacha + + Төркмәнстан вакыты @@ -3635,6 +3671,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Уругвай җәйге вакыты + + + Urumqi Tiempo + + Үзбәкстан вакыты diff --git a/make/data/cldr/common/main/tyv.xml b/make/data/cldr/common/main/tyv.xml index c9dfb2b998a8..4fb4de42cbe7 100644 --- a/make/data/cldr/common/main/tyv.xml +++ b/make/data/cldr/common/main/tyv.xml @@ -16,12 +16,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Амгы стандарт араб Бенгал Немец - Немец (AT) - Немец (CH) Англи - Англи (AU) Англи (CA) - Англи (GB) Англи (US) Испан Латин Америкада Испан @@ -29,7 +25,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Мексикан Испан Француз Француз (CA) - Француз (CH) Хинди (латин) Хинглиш Индонези @@ -46,6 +41,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Тай Турк Тыва + Билдинмес дыл Кыдат Кыдат Мандарин Кыдат (бөдүүнчүткен) @@ -284,20 +280,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Нояб. Дек. - - Я - Ф - М - А - М - И - И - А - С - О - Н - Д - Январь Февраль @@ -314,20 +296,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - Янв. - Февр. - Мар. - Апр. - Май - Июн. - Июл. - Авг. - Сент. - Окт. - Нояб. - Дек. - Я Ф @@ -342,20 +310,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Н Д - - Январь - Февраль - Март - Апрель - Май - Июнь - Июль - Август - Сентябрь - Октябрь - Ноябрь - Декабрь - @@ -369,24 +323,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ПТ СБ - - У - П - В - С - Ч - П - С - - - УХ - ПН - ВТ - СР - ЧТ - ПТ - СБ - Улуг-хүн Понедельник @@ -398,15 +334,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - УХ - ПН - ВТ - СР - ЧТ - ПТ - СБ - У П @@ -416,24 +343,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic П С - - УХ - ПН - ВТ - СР - ЧТ - ПТ - СБ - - - Улуг-хүн - Понедельник - Вторник - Среда - Четверг - Пятница - Суббота - @@ -451,20 +360,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 4кү квартал - - - 1ги кв. - 2ги кв. - 3кү кв. - 4кү кв. - - - 1ги квартал - 2ги квартал - 3кү квартал - 4кү квартал - - @@ -527,45 +422,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1}, {0} - - {1}, {0} - - - {1}, {0} - {1}, {0} - - {1}, {0} - - - {1}, {0} - {1}, {0} - - {1}, {0} - - - {1}, {0} - {1}, {0} - - {1}, {0} - - - {1}, {0} - E, h B @@ -582,11 +453,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic y'ч' MMM d y'ч' MMM d, E y'ч' MMMM + y'ч' MMMM d + y'ч' MMMM d, E y'ч' QQQ y'ч' QQQQ Y'ч', w 'чедилик' + + {0} – {1} + {0}–{1} + {0}–{1} + G y'ч' – G y'ч' G y–y'чч' @@ -632,45 +510,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic ч. - - ч. - квартал кв. - - кв. - ай - - ай - - - ай - чедилик чед. - - чед. - хүн х. - - х. - чедилик хүнү @@ -683,9 +543,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ш. - - ш. - минута @@ -711,16 +568,117 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}, чайгы үе {0}, стандарт үе + + + Бүгү-делегейниң дугурушкан үези + + + + Андорра + + + Вена + + + Сараево + + + Минск + + + Берлин + + + Копенгаген + + + Мадрид + + + Париж + + + Лондон + + + Дублин + + + Рим + + + Люксенбург + + + Рига + + + Мальта + + + Амстердам + + + Осло + + + Белград + + + Любляна + + + Братислава + + + Симферополь + + + Ватикан + + + + Британ үе + Великобритания, чайгы үе + + + + + Төп Европа үези + Төп Европаның стандарт үези + Төп Европаның чайгы үези + + + + + Чөөн Европа үези + Чөөн Европаның стандарт үези + Чөөн Европаның чайгы үези + + Гринвичтиң ортаа үези + + + Ирланд үе + Ирландия, стандарт үе + +   + + + + #,##0.00 ¤ + + + diff --git a/make/data/cldr/common/main/ug.xml b/make/data/cldr/common/main/ug.xml index ece5683bdda5..6c9c198a2c88 100644 --- a/make/data/cldr/common/main/ug.xml +++ b/make/data/cldr/common/main/ug.xml @@ -1566,6 +1566,11 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci Y، w-ھەپتە + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} d – d @@ -1915,16 +1920,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci كۇراسو - - - ئەنگلىيە يازلىق ۋاقتى - - - - - ئىرېلاند يازلىق ۋاقتى - - ئاسۇنسىيون @@ -1976,13 +1971,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci ئالياسكا يازلىق ۋاقتى - - - ئالمۇتا ۋاقتى - ئالمۇتا ئۆلچەملىك ۋاقتى - ئالمۇتا يازلىق ۋاقتى - - ئامازون ۋاقتى @@ -2025,20 +2013,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci ئانادىر يازلىق ۋاقتى - - - ئاقتاي ۋاقتى - ئاقتاي ئۆلچەملىك ۋاقتى - ئاقتاي يازلىق ۋاقتى - - - - - ئاقتۆبە ۋاقتى - ئاقتۆبە ئۆلچەملىك ۋاقتى - ئاقتۆبە يازلىق ۋاقتى - - ئەرەب ۋاقتى @@ -2140,6 +2114,11 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci بىرازىلىيە يازلىق ۋاقتى + + + ئەنگلىيە يازلىق ۋاقتى + + بىرۇنىي دارۇسسالام ۋاقتى @@ -2327,11 +2306,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci غەربىي گىرېنلاند يازلىق ۋاقتى - - - گۇئام ئۆلچەملىك ۋاقتى - - گۇلف ئۆلچەملىك ۋاقتى @@ -2405,6 +2379,11 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci ئىران يازلىق ۋاقتى + + + ئىرېلاند يازلىق ۋاقتى + + ئىركۇتسك ۋاقتى @@ -2467,11 +2446,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci قىرغىزىستان ۋاقتى - - - سىرى لانكا ۋاقتى - - لاين ئاراللىرى ۋاقتى @@ -2484,13 +2458,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci لورد-خاي يازلىق ۋاقتى - - - ئاۋمېن ۋاقتى - ئاۋمېن ئۆلچەملىك ۋاقتى - ئاۋمېن يازلىق ۋاقتى - - ماگادان ۋاقتى @@ -2606,11 +2573,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci فېرناندو-نورونخا يازلىق ۋاقتى - - - شىمالىي مارىيانا ئاراللىرى ۋاقتى - - نوۋوسىبىرسك ۋاقتى @@ -2685,13 +2647,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci پونپېي ۋاقتى - - - قىزىلئوردا ۋاقتى - قىزىلئوردا ئۆلچەملىك ۋاقتى - قىزىلئوردا يازلىق ۋاقتى - - رېئونىيون ۋاقتى @@ -2718,9 +2673,7 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci - ساموئا ۋاقتى ساموئا ئۆلچەملىك ۋاقتى - سەمەرقەنت يازلىق ۋاقتى @@ -3193,9 +3146,6 @@ Reviewed by Waris Abdukerim Janbaz of the Uyghur Computer Sci چىلى پېسوسى - - جۇڭگو خەلق بانكىسى دوللىرى - جۇڭگو يۈەنى ¥ diff --git a/make/data/cldr/common/main/uk.xml b/make/data/cldr/common/main/uk.xml index a9b062e2a410..55152b2b65b8 100644 --- a/make/data/cldr/common/main/uk.xml +++ b/make/data/cldr/common/main/uk.xml @@ -435,6 +435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ палі піджин польська + пʼємонтська понапе малесіт-пасамакводі прусська @@ -1055,7 +1056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ватикан Сент-Вінсент і Гренадіни Венесуела - Британські Віргінські острови + Британські Віргінські Острови Віргінські Острови (США) Вʼєтнам Вануату @@ -1121,18 +1122,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ порядок сортування уніфіковане сортування цифрове сортування + зміна порядку систем письма й блоків інтенсивність сортування валюта + ціль перетворення + винятки словникових розривів емодзі + перший день тижня + змішаний формат часу (12 або 24 години) + метод введення + клавіатура + найвищий ігнорований стиль розриву рядка розриви рядків у словах + правила трансформації система вимірювання + одиниця вимірювання цифри + регіон для додаткових даних + джерело трансформації + адміністративний поділ регіону розрив речення після скорочення + трансформація + машинний переклад часовий пояс варіант мовного коду - особисте використання + приватне використання + трансформація для приватного використання буддійський календар @@ -1152,15 +1169,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ єврейський календар єврейський індійський світський календар + індійській національний календар Хіджра Хіджра календар Хіджра, світський Хіджра, світський ісламський календар Саудівської Аравії + Хіджра, за спостереженням місяця в Саудівській Аравії ісламський астрономічний календар + Хіджра, табличний (астрономічний) календар Хіджра (Умм аль-Кура) Хіджра (Умм аль-Кура) календар ISO-8601 + григоріанський японський календар японський перський календар @@ -1176,8 +1197,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ сортувати за діакритичними знаками уніфіковано сортувати за діактричними знаками у зворотньому порядку сортувати нижній регістр наперед + нижній регістр сортувати в порядку звичайного регістру + нижній регістр сортувати спершу за великими символами + верхній регістр сортувати без урахування регістру сортувати з урахуванням регістру попередній порядок сортування, для сумісності @@ -1187,7 +1211,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ типовий порядок сортування Юнікод типовий Юнікод порядок сортування за емодзі + емодзі європейські правила упорядкування + європейські правила порядок сортування за телефонним довідником за телефонним довідником фонетичний порядок сортування @@ -1197,6 +1223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ універсальний пошук пошук пошук за початковою приголосною хангул + початковий приголосний (корейська) стандартний порядок сортування стандартний порядок сортування за рисками @@ -1211,17 +1238,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ сортувати за Unicode уніфіковано сортувати цифри окремо сортувати за цифрами чисельно + валюта + цифри + пунктуація + пробіл + символ сортувати всі + усе сортувати лише за основними літерами + лише основні літери сортувати за діактричними знаками/регістром/шириною/кана + основа, діакритика, регістр, варіанти, кана сортувати за діактричними знаками + основа, діакритика сортувати за діактричними знаками/регістром/шириною + основа, діакритика, регістр, варіанти повна ширина половинна ширина цифри типово емодзі текст + 12-годинний формат + 12 + 24-годинний формат + 24 12-годинний формат (0–11) 12 (0–11) 12-годинний формат (1–12) @@ -1230,6 +1271,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24-годинний формат (1–24) 24 (1–24) + ігнорувати пробіли, пунктуацію, усі символи + ігнорувати пробіли, пунктуацію + ігнорувати пробіли, пунктуацію + ігнорувати пробіли, пунктуацію, невалютні символи неточний стиль розриву рядка неточний звичайний стиль розриву рядка @@ -1250,51 +1295,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ американська арабсько-індійські цифри арабсько-індійські розширені цифри + арабсько-індійські розширені вірменські цифри вірменські малі цифри - бенґальські цифри + вірменські малі + бенгальські цифри цифри чакма цифри деванагарі ефіопські цифри фінансові символи чисел - цифри повної ширини + фінансові + повноширинні цифри + повноширинні грузинські цифри грецькі цифри грецькі малі цифри + грецькі малі цифри гуджараті цифри гурмукхі + ієрогліфічна нумерація днів місяця для традиційних календарів китайські десяткові цифри - китайські символи чисел (спрощене письмо) - китайські фінансові символи чисел (спрощене письмо) - китайські символи чисел (традиційне письмо) - китайські фінансові символи чисел (традиційне письмо) + позиційна десяткова система з китайськими ієрогліфічними цифрами + китайські цифри (спрощене письмо) + китайські фінансові цифри (спрощене письмо) + китайські фінансові (спрощене письмо) + китайські цифри (традиційне письмо) + китайські фінансові цифри (традиційне письмо) + китайські фінансові (традиційне письмо) цифри івриту яванські цифри японські цифри японські фінансові цифри + японські фінансові + японське літочислення від першого року правління (ганнен) кхмерські цифри цифри каннада + тай-тамські (релігійні) лаоські цифри західні цифри + математичні (жирні) + математичні (ажурні) + математичні (моноширинні) + математичні (жирні без засічок) + математичні (без засічок) малаяламські цифри монгольські цифри цифри маніпурі мʼянмські цифри + м’янмські (східна пво-карен) + м’янмські (пао) + мʼянмські (шанська) + мʼянмські (тай-лайнг) місцеві цифри + місцеві цифри цифри ол-чикі цифри орія + контурні римські цифри + римські великі римські малі цифри + римські малі + сегментні тамільські традиційні цифри тамільські цифри + сучасні тамільські цифри телугу тайські цифри тибетські цифри традиційні символи чисел + традиційні цифри цифри ваї вимкнено увімкнено + невизначений машинний переклад + варіант POSIX + + вимкнено + увімкнено + Метрична Британська @@ -1496,6 +1575,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-тє + {0}-е + + + @@ -1550,21 +1637,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d E h:mm a E h:mm:ss a - y G - MM-y G - dd-MM-y GGGGG - E, dd-MM-y, G + y 'р'. G + MM.y G + dd.MM.y GGGGG + E, dd.MM.y, G LLL y 'р'. G d MMM y 'р'. G + ddd MMM y 'р'. G E, d MMM y 'р'. G + E, ddd MMM y 'р'. G h:mm a h:mm:ss a - HH v dd.MM E, dd.MM d MMM + ddd MMM E, d MMM + ddd MMM, E d MMMM + ddd MMMM E, d MMMM y G y G @@ -1573,12 +1664,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd.MM.y G LLL y 'р'. G d MMM y 'р'. G + ddd MMM y 'р'. G E, d MMM y 'р'. G + y 'р'. G, ddd MMM, E LLLL y 'р'. G QQQ y G QQQQ y 'р'. G + + {0} – {1} + {0} – {1} y 'р'. G – y 'р'. G @@ -1653,6 +1749,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d – E, d MMM E, d MMM – E, d MMM + + d–d MMMM + d MMMM — d MMMM + y–y @@ -1768,6 +1868,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + {0}-тє + {0}-е + + + @@ -1903,6 +2011,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1940,25 +2051,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E h:mm a E h:mm:ss a y G - MM y G - dd-MM-y GGGGG - dd-MM-y, E, G + MM.y G + dd.MM.y GGGGG + dd.MM.y, E, G LLL y 'р'. G d MMM y 'р'. G + d MMM y 'р'. G E, d MMM y 'р'. G - H + E, d MMM y 'р'. G + LLLL y 'р'. G + d MMMM y 'р'. G + ddd MMMM y 'р'. G + E, d MMMM y 'р'. G + E, ddd MMMM y 'р'. G h:mm a h:mm:ss a h:mm:ss a v h:mm a v - HH v LL dd.MM E, dd.MM d MMM + ddd MMM E, d MMM + E, ddd MMM d MMMM + ddd MMMM E, d MMMM + E, ddd MMMM W-'й' 'тиж'. MMMM W-'й' 'тиж'. MMMM W-'й' 'тиж'. MMMM @@ -1968,8 +2088,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, dd.MM.y LLL y 'р'. d MMM y 'р'. + ddd MMM y 'р'. E, d MMM y 'р'. + E, ddd MMM y 'р'. LLLL y 'р'. + d MMMM y 'р'. + y 'р'., ddd MMMM + E, d MMMM y 'р'. + y 'р'., ddd MMMM, E QQQ y QQQQ y 'р'. w-'й' 'тиж'. Y 'р'. @@ -1977,118 +2103,138 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w-'й' 'тиж'. Y 'р'. w-'й' 'тиж'. Y 'р'. + + {0}, {1} + {1}, {0} + {0} {1} + {1}, {0} + + + {0} – {1} + {0} – {1} + {0} – {1} + + h B — h B + + + h:mm B — h:mm B + - y 'р'. G – y 'р'. G + y 'р'. G — y 'р'. G y–y 'рр'. G - MM.y G – MM.y G - MM.y – MM.y G - MM.y – MM.y G + MM.y G — MM.y G + MM.y — MM.y G + MM.y — MM.y G - dd.MM.y – dd.MM.y G - dd.MM.y G – dd.MM.y G - dd.MM.y – dd.MM.y G - dd.MM.y – dd.MM.y G + dd.MM.y — dd.MM.y G + dd.MM.y G — dd.MM.y G + dd.MM.y — dd.MM.y G + dd.MM.y — dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y G – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G - ccc, dd.MM.y – ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G + ccc, dd.MM.y G — ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G + ccc, dd.MM.y — ccc, dd.MM.y G - LLL y 'р'. G – LLL y 'р'. G - LLL – LLL y 'р'. G - LLL y – LLL y 'рр'. G + LLL y 'р'. G — LLL y 'р'. G + LLL — LLL y 'р'. G + LLL y — LLL y 'рр'. G d–d MMM y 'р'. G - d MMM y 'р'. G – d MMM y 'р'. G - d MMM – d MMM y 'р'. G - d MMM y – d MMM y 'рр'. G + d MMM y 'р'. G — d MMM y 'р'. G + d MMM — d MMM y 'р'. G + d MMM y — d MMM y 'рр'. G - ccc, d MMM – ccc, d MMM y 'р'. G - ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G - ccc, d MMM – ccc, d MMM y 'р'. G - ccc, d MMM y – ccc, d MMM y 'рр'. G + ccc, d MMM — ccc, d MMM y 'р'. G + ccc, d MMM y 'р'. G — ccc, d MMM y 'р'. G + ccc, d MMM — ccc, d MMM y 'р'. G + ccc, d MMM y — ccc, d MMM y 'рр'. G - h a – h a + h a — h a HH–HH 'год' - h:mm a – h:mm a + h:mm a — h:mm a h:mm–h:mm a h:mm–h:mm a - h:mm a – h:mm a v + h:mm a — h:mm a v h:mm–h:mm a v h:mm–h:mm a v - h a – h a v - - - HH–HH v + h a — h a v M–M - dd.MM – dd.MM - dd.MM – dd.MM + dd.MM — dd.MM + dd.MM — dd.MM - E, dd.MM – E, dd.MM - E, dd.MM – E, dd.MM + E, dd.MM — E, dd.MM + E, dd.MM — E, dd.MM + + + LLL — LLL d–d MMM - d MMM – d MMM + d MMM — d MMM - E, d – E, d MMM - E, d MMM – E, d MMM + E, d — E, d MMM + E, d MMM — E, d MMM + + + d–d MMMM + d MMMM — d MMMM - MM.y – MM.y - MM.y – MM.y + MM.y — MM.y + MM.y — MM.y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y - dd.MM.y – dd.MM.y + dd.MM.y — dd.MM.y + dd.MM.y — dd.MM.y + dd.MM.y — dd.MM.y - E, dd.MM.y – E, dd.MM.y - E, dd.MM.y – E, dd.MM.y - E, dd.MM.y – E, dd.MM.y + E, dd.MM.y — E, dd.MM.y + E, dd.MM.y — E, dd.MM.y + E, dd.MM.y — E, dd.MM.y - LLL–LLL y 'р'. - LLL y – LLL y 'рр'. + LLL — LLL y 'р'. + LLL y — LLL y 'рр'. d–d MMM y 'р'. - d MMM – d MMM y 'р'. - d MMM y – d MMM y 'рр'. + d MMM — d MMM y 'р'. + d MMM y — d MMM y 'рр'. - E, d – E, d MMM y 'р'. - E, d MMM – E, d MMM y 'р'. - E, d MMM y – E, d MMM y 'рр'. + E, d — E, d MMM y 'р'. + E, d MMM — E, d MMM y 'р'. + E, d MMM y — E, d MMM y 'рр'. - LLLL – LLLL y 'р'. - LLLL y – LLLL y 'рр'. + LLLL — LLLL y 'р'. + LLLL y — LLLL y 'рр'. @@ -2217,241 +2363,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + MMM, W-'й' 'тиж'. + LLLL, 'тиж'. W + MMM, W-'й' 'тиж'. + MMM, W-'й' 'тиж'. + + + - Тайка (645–650) - Хакуті (650–671) - Хакухо (672–686) - Сютьо (686–701) - Тайхо (701–704) - Кейун (704–708) - Вадо (708–715) - Рейкі (715–717) - Йоро (717–724) - Дзінгі (724–729) - Темпьо (729–749) - Темпьо-кампо (749–749) - Темпьо-сьохо (749–757) - Темпьо-ходзі (757–765) - Темпьо-дзінго (765–767) - Дзінго кейун (767–770) - Хокі (770–780) - Тен’о (781–782) - Енряку (782–806) - Дайдо (806–810) - Конін (810–824) - Тентьо (824–834) - Сьова (834–848) - Кадзьо (848–851) - Ніндзю (851–854) - Сайко (854–857) - Теннан (857–859) - Дзьоган (859–877) - Генкей (877–885) - Нінна (885–889) - Кампьо (889–898) - Сьотай (898–901) - Енгі (901–923) - Ентьо (923–931) - Сьохей (931–938) - Тенгьо (938–947) - Тенряку (947–957) - Тентоку (957–961) - Ова (961–964) - Кохо (964–968) - Анна (968–970) - Тенроку (970–973) - Тен’ен (973–976) - Дзьоген (976–978) - Тенген (978–983) - Ейкан (983–985) - Канна (985–987) - Ейен (987–989) - Ейсо (989–990) - Сьоряку (990–995) - Тьотоку (995–999) - Тьохо (999–1004) - Канко (1004–1012) - Тьова (1012–1017) - Каннін (1017–1021) - Дзіан (1021–1024) - Мандзю (1024–1028) - Тьоген (1028–1037) - Тьоряку (1037–1040) - Тьокю (1040–1044) - Кантоку (1044–1046) - Ейсьо (1046–1053) - Тенгі (1053–1058) - Кохей (1058–1065) - Дзіряку (1065–1069) - Енкю (1069–1074) - Сьохо (1074–1077) - Сьоряку (1077–1081) - Ейхо (1081–1084) - Отоку (1084–1087) - Кандзі (1087–1094) - Кахо (1094–1096) - Ейсьо (1096–1097) - Сьотоку (1097–1099) - Кова (1099–1104) - Тьодзі (1104–1106) - Кадзьо (1106–1108) - Теннін (1108–1110) - Тен’ей (1110–1113) - Ейкю (1113–1118) - Ген’ей (1118–1120) - Хоан (1120–1124) - Тендзі (1124–1126) - Дайдзі (1126–1131) - Тенсьо (1131–1132) - Тьосьо (1132–1135) - Хоен (1135–1141) - Ейдзі (1141–1142) - Кодзі (1142–1144) - Теньо (1144–1145) - Кюан (1145–1151) - Німпей (1151–1154) - Кюдзю (1154–1156) - Хоген (1156–1159) - Хейдзі (1159–1160) - Ейряку (1160–1161) - Охо (1161–1163) - Тьокан (1163–1165) - Ейман (1165–1166) - Нін’ан (1166–1169) - Као (1169–1171) - Сьоан (1171–1175) - Анген (1175–1177) - Дзісьо (1177–1181) - Йова (1181–1182) - Дзюей (1182–1184) - Генряку (1184–1185) - Бундзі (1185–1190) - Кенкю (1190–1199) - Сьодзі (1199–1201) - Кеннін (1201–1204) - Генкю (1204–1206) - Кен’ей (1206–1207) - Сьоген (1207–1211) - Кенряку (1211–1213) - Кенпо (1213–1219) - Дзьокю (1219–1222) - Дзьоо (1222–1224) - Геннін (1224–1225) - Кароку (1225–1227) - Антей (1227–1229) - Канкі (1229–1232) - Дзюей (1232–1233) - Темпуку (1233–1234) - Бунряку (1234–1235) - Катей (1235–1238) - Рякунін (1238–1239) - Ен’о (1239–1240) - Ніндзі (1240–1243) - Канген (1243–1247) - Хейдзі (1247–1249) - Кентьо (1249–1256) - Коген (1256–1257) - Сьока (1257–1259) - Сьоген (1259–1260) - Бун’о (1260–1261) - Котьо (1261–1264) - Бун’ей (1264–1275) - Кендзі (1275–1278) - Коан (1278–1288) - Сьоо (1288–1293) - Ейнін (1293–1299) - Сьоан (1299–1302) - Кенген (1302–1303) - Каген (1303–1306) - Токудзі (1306–1308) - Енкей (1308–1311) - Отьо (1311–1312) - Сьова (1312–1317) - Бумпо (1317–1319) - Ген’о (1319–1321) - Генкьо (1321–1324) - Сьотю (1324–1326) - Карекі (1326–1329) - Гентоку (1329–1331) - Генко (1331–1334) - Кемму (1334–1336) - Ейген (1336–1340) - Кококу (1340–1346) - Сьохей (1346–1370) - Кентоку (1370–1372) - Бунтю (1372–1375) - Тендзю (1375–1379) - Коряку (1379–1381) - Кова (1381–1384) - Гентю (1384–1392) - Мейтоку (1384–1387) - Какей (1387–1389) - Коо (1389–1390) - Мейтоку (1390–1394) - Оей (1394–1428) - Сьотьо (1428–1429) - Ейкьо (1429–1441) - Какіцу (1441–1444) - Буннан (1444–1449) - Хотоку (1449–1452) - Кьотоку (1452–1455) - Косьо (1455–1457) - Тьороку (1457–1460) - Кансьо (1460–1466) - Бунсьо (1466–1467) - Онін (1467–1469) - Буммей (1469–1487) - Тьокьо (1487–1489) - Ентоку (1489–1492) - Мейо (1492–1501) - Бункі (1501–1504) - Ейсьо (1504–1521) - Тайей (1521–1528) - Кьороку (1528–1532) - Теммон (1532–1555) - Кодзі (1555–1558) - Ейроку (1558–1570) - Генкі (1570–1573) - Тенсьо (1573–1592) - Бунроку (1592–1596) - Кейтьо (1596–1615) - Генна (1615–1624) - Кан’ей (1624–1644) - Сьохо (1644–1648) - Кейан (1648–1652) - Сьоо (1652–1655) - Мейряку (1655–1658) - Мандзі (1658–1661) - Камбун (1661–1673) - Емпо (1673–1681) - Тенва (1681–1684) - Дзьокьо (1684–1688) - Генроку (1688–1704) - Хоей (1704–1711) - Сьотоку (1711–1716) - Кьохо (1716–1736) - Гембун (1736–1741) - Канпо (1741–1744) - Енкьо (1744–1748) - Кан’ен (1748–1751) - Хоряку (1751–1764) - Мейва (1764–1772) - Ан’ей (1772–1781) - Теммей (1781–1789) - Кансей (1789–1801) - Кьова (1801–1804) - Бунка (1804–1818) - Бунсей (1818–1830) - Тенпо (1830–1844) - Кока (1844–1848) - Каей (1848–1854) - Ансей (1854–1860) - Ман’ен (1860–1861) - Бункю (1861–1864) - Гендзі (1864–1865) - Кейо (1865–1868) Мейдзі Тайсьо Сьова @@ -3299,7 +3223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Кейсі - Дюмон-дʼЮрвіль + Дюмон-Дюрвіль Мак-Мердо @@ -3716,9 +3640,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Лібревіль - - за літнім часом у Великій Британії - Лондон @@ -3809,9 +3730,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Джайпур - - за літнім часом в Ірландії - Дублін @@ -4509,9 +4427,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - час: Акрі - час: Акрі, стандартний - час: Акрі, літній + за часом в Акрі + за стандартним часом в Акрі + за літнім часом в Акрі @@ -4555,30 +4473,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за північноамериканським центральним часом - за північноамериканським центральним стандартним часом - за північноамериканським центральним літнім часом + за центральним часом (CT) + за центральним стандартним часом (CST) + за центральним літнім часом (CDT) - за північноамериканським східним часом - за північноамериканським східним стандартним часом - за північноамериканським східним літнім часом + за східним часом (ET) + за східним стандартним часом (EST) + за східним літнім часом (EDT) - за північноамериканським гірським часом - за північноамериканським гірським стандартним часом - за північноамериканським гірським літнім часом + за гірським часом (MT) + за гірським стандартним часом (MST) + за гірським літнім часом (MDT) - за північноамериканським тихоокеанським часом - за північноамериканським тихоокеанським стандартним часом - за північноамериканським тихоокеанським літнім часом + за тихоокеанським часом (PT) + за тихоокеанським стандартним часом (PST) + за тихоокеанським літнім часом (PDT) @@ -4696,6 +4614,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за літнім бразильським часом + + + за часом у Великій Британії + за літнім часом у Великій Британії + + за часом у Брунеї @@ -4772,7 +4696,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за часом на станції Дюмон дʼЮрвіль + за часом на станції Дюмон-Дюрвіль @@ -4869,23 +4793,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за Гринвічем - + - за східним часом у Ґренландії - за стандартним східним часом у Ґренландії - за літнім східним часом у Ґренландії + за часом у Гренландії + за стандартним часом у Гренландії + за літнім часом у Гренландії - + - за західним часом у Ґренландії - за стандартним західним часом у Ґренландії - за літнім західним часом у Ґренландії + за східним часом у Гренландії + за стандартним східним часом у Гренландії + за літнім східним часом у Гренландії - + - за часом на острові Гуам + за західним часом у Гренландії + за стандартним західним часом у Гренландії + за літнім західним часом у Гренландії @@ -4900,7 +4826,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за стандартним гавайсько-алеутським часом + за стандартним гавайським часом @@ -4961,6 +4887,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за іранським літнім часом + + + за часом в Ірландії + за літнім часом в Ірландії + + за іркутським часом @@ -4984,9 +4916,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за камчатським часом - за камчатським стандартним часом - за камчатським літнім часом + за камчатським часом + за камчатським стандартним часом + за камчатським літнім часом @@ -5028,11 +4960,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за часом у Киргизстані - - - час: Ланка - - за часом на острові Лайн @@ -5239,13 +5166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за часом у Пхеньяні - - - час: Кизилорда - час: Кизилорда, стандартний - час: Кизилорда, літній - - за часом на острові Реюньйон @@ -5265,16 +5185,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за самарським часом - за самарським стандартним часом - за самарським літнім часом + за самарським часом + за самарським стандартним часом + за самарським літнім часом - за часом на острові Самоа за стандартним часом на острові Самоа - за літнім часом на острові Самоа @@ -5343,9 +5261,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - за турецьким часом - за турецьким стандартним часом - за турецьким літнім часом + за турецьким часом + за турецьким стандартним часом + за турецьким літнім часом @@ -5367,6 +5285,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ за літнім часом в Уруґваї + + + за часом в Урумчі + + за часом в Узбекистані @@ -5498,28 +5421,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 тис'.' + 0 тис'.' + 0 тис'.' 0 тис'.' 00 тис'.' + 00 тис'.' + 00 тис'.' 00 тис'.' 000 тис'.' + 000 тис'.' + 000 тис'.' 000 тис'.' 0 млн + 0 млн + 0 млн 0 млн 00 млн + 00 млн + 00 млн 00 млн 000 млн + 000 млн + 000 млн 000 млн 0 млрд + 0 млрд + 0 млрд 0 млрд 00 млрд + 00 млрд + 00 млрд 00 млрд 000 млрд + 000 млрд + 000 млрд 000 млрд 0 трлн + 0 трлн + 0 трлн 0 трлн 00 трлн + 00 трлн + 00 трлн 00 трлн 000 трлн + 000 трлн + 000 трлн 000 трлн @@ -5530,9 +5477,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - @@ -7320,8 +7264,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ квадратні {0} - квадратний {0} - квадратний {0} + квадратне {0} + квадратне {0} квадратному {0} квадратного {0} квадратним {0} @@ -7332,8 +7276,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ квадратної {0} квадратною {0} квадратній {0} - квадратний {0} - квадратний {0} + квадратне {0} + квадратне {0} квадратному {0} квадратного {0} квадратним {0} @@ -7395,8 +7339,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ кубічні {0} - кубічний {0} - кубічний {0} + кубічне {0} + кубічне {0} кубічному {0} кубічного {0} кубічним {0} @@ -7407,8 +7351,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ кубічної {0} кубічною {0} кубічній {0} - кубічний {0} - кубічний {0} + кубічне {0} + кубічне {0} кубічному {0} кубічного {0} кубічним {0} @@ -12926,7 +12870,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ч. - ч/млн {0}ч/млн {0}ч/млн {0}ч/млн @@ -13870,7 +13813,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}м.чаш. - ун. рід. метр. {0}ун.рід.м. {0}ун.рід.м. {0}ун.рід.м. @@ -14008,91 +13950,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}англ.квар. - ср {0}ср {0}ср {0}ср {0}ср - кат {0}кат {0}кат {0}кат {0}кат - Кл {0}Кл {0}Кл {0}Кл {0}Кл - Ф {0}Ф {0}Ф {0}Ф {0}Ф - Гн {0}Гн {0}Гн {0}Гн {0}Гн - См {0}См {0}См {0}См {0}См - калмн {0}калмн {0}калмн {0}калмн {0}калмн - Бк {0}Бк {0}Бк {0}Бк {0}Бк - Зв {0}Зв {0}Зв {0}Зв {0}Зв - Гр {0}Гр {0}Гр {0}Гр {0}Гр - кгс {0}кгс {0}кгс {0}кгс {0}кгс - Тл {0}Тл {0}Тл {0}Тл {0}Тл - Вб {0}Вб {0}Вб {0}Вб @@ -14106,7 +14035,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}шв.св. - ч/млрд {0}ч/млрд {0}ч/млрд {0}ч/млрд diff --git a/make/data/cldr/common/main/ur.xml b/make/data/cldr/common/main/ur.xml index bdceec53a444..7d1c7f9400ef 100644 --- a/make/data/cldr/common/main/ur.xml +++ b/make/data/cldr/common/main/ur.xml @@ -67,7 +67,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ بنگلہ تبتی بریٹن - بوڈو + بوڑو بوسنیائی بگینیز بلین @@ -125,7 +125,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ آسٹریلیائی انگریزی کینیڈین انگریزی برطانوی انگریزی - انگریزی (یو کے) امریکی انگریزی ایسپرانٹو ہسپانوی @@ -217,7 +216,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ کويرا شيني کیکویو کونیاما - قزاخ + قازق کاکو کالاليست کالينجين @@ -272,7 +271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ لیٹوین مدورسی مگاہی - میتھیلی + میتھلی مکاسر مسائی موکشا @@ -346,6 +345,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ نائجیریائی پڈگن پجن پولش + پیڈمونٹیز مالیسیٹ پاساماکوڈی پارسی پشتو @@ -673,8 +673,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ جزائر فارو فرانس گیبون - سلطنت متحدہ - یو کے + برطانیہ گریناڈا جارجیا فرینچ گیانا @@ -695,7 +694,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ہانگ کانگ SAR چین ہانگ کانگ ہیرڈ جزیرہ و میکڈولینڈ جزائر - ہونڈاروس + ہونڈوراس کروشیا ہیٹی ہنگری @@ -873,24 +872,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ کیلنڈر کرنسی فارمیٹ علامات کی چھٹائی نظرانداز کریں - معکوس تلفظ کی چھٹائی + لہجے کی معکوس ترتیب بڑے حروف/ چھوٹے حروف کی ترتیب بندی - حروف کے تئیں حساس چھٹائی + حروف کی نوعیت کے مطابق ترتیب چھٹائی کی ترتیب معمول کی چھانٹی عددی چھانٹی + اسکرپٹ/بلاک کی ترتیبِ نو چھانٹی کی قوت کرنسی + تبدیلی کا ہدف + ڈکشنری بریک کے استثناء ایموجی پریزینٹیشن - گھنٹہ سائیکل (12 بنام 24) + ہفتے کا پہلا دن + مخلوط + گھنٹہ سائیکل (12 بمقابلہ 24) + ان پٹ کا طریقہ کار + کی بورڈ + سب سے زیادہ نظرانداز شدہ لائن بریک انداز الفاظ کے اندر لائن بریکس + تبدیلی کے قواعد پیمائش کا نظام + پیمائش کی اکائی اعداد + اضافی ڈیٹا کے لیے علاقہ + تبدیلی کا ماخذ + علاقائی ذیلی تقسیم مخففات کے بعد سنٹینس بریک + تبدیلی + مشینی ترجمہ منطقۂ وقت مقام کا متغیرہ نجی-استعمال + نجی استعمال کی تبدیلی بودھ کلینڈر @@ -915,11 +930,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ہجری اسلامی شہری کیلنڈر (ٹیبیولر، مدنی دور) ہجری (شہری تقویم) + ہجری، سعودی عرب میں رویت ہلال ہجری کیلنڈر (لوحی، ایسٹرونومیکل ایپوک) ہجری (فلکیاتی تقویم) ہجری کیلنڈر (ام القریٰ) ہجری (ام القریٰ) ISO-8601 کیلنڈر + عیسوی جاپانی کیلنڈر جاپانی فارسی کیلنڈر @@ -935,41 +952,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ لہجوں کی چھٹائی معمول کے انداز میں کریں لہجوں کی معکوس چھٹائی کریں پہلے چھوٹے حروف کی چھٹائی کریں + چھوٹے حروف معمول کے حروف کی ترتیب کی چھٹائی کریں + چھوٹے حروف پہلے بالائی حروف کی چھٹائی کریں + بڑے حروف حروف کی عدم حساسیت کی چھٹائی کریں حروف کے تئیں حساس کی چھٹائی کریں سابقہ چھٹائی کی ترتیب، مطابقت کیلئے + موافقت لغت کی چھٹنی کی ترتیب + لغت ڈیفالٹ یونی کوڈ چھانٹی کی ترتیب ڈیفالٹ یونی کوڈ + ایموجی یورپی ترتیبی قوانین + یورپی قوانین فون بک کی چھٹنی کی ترتیب + فون بُک صوتی چھٹائی کی ترتیب + صوتیاتی پن ین کی چھٹنی کی ترتیب + پِن یِن عمومی تلاش تلاش Hangul Initial Consonant کے لحاظ سے تلاش کریں + کوریائی ابتدائی حرفِ صحیح معیاری چھانٹی کی ترتیب معیاری سٹروک کی چھٹنی کی ترتیب + اسٹروک روایتی چھٹنی کی ترتیب + روایتی اساسی-سٹروک کی چھٹنی کی ترتیب + ریڈیکل اسٹروک + ژو یِن حسب معمول بنائے بغیر چھٹائی کریں معمول کے یونیکوڈ کی چھٹائی کریں انفرادی طور پر ہندسوں کی چھٹائی کریں اعداد کے لحاظ سے ہندسوں کی چھٹائی کریں + کرنسی + ہندسے + رموز اوقاف + خالی جگہ + علامت سبھی کی چھٹائی کریں + تمام صرف اساسی حروف کی چھٹائی کریں + صرف بنیادی حروف لہجہ/ بڑے چھوٹے حروف/چوڑائی/Kana کی چھٹائی کریں + بنیادی حروف، اعرابی علامات، حروف کی حالت، متغیرات، کانا لہجوں کی چھٹائی کریں + بنیادی حروف، اعرابی علامات لہجوں/حروف/چوڑائی کی چھٹائی کریں + بنیادی حروف، اعرابی علامات، حروف کی حالت، متغیرات پورا عرض نصف عرض عددی ڈیفالٹ ایموجی متن + 12 گھنٹے کا نظام + 12 + 24 گھنٹے کا نظام + 24 12 گھنٹے کا نظام (0–11) 12 (0–11) 12 گھنٹے کا نظام (1–12) @@ -978,6 +1024,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 گھنٹے کا نظام (1–24) 24 (1–24) + شفٹ اسپیسز، اوقاف اور تمام علامتیں + شفٹ اسپیسز، اوقاف + شفٹ اسپیسز، اوقاف + شفٹ اسپیسز، اوقاف اور غیر کرنسی کی علامتیں ڈھیلا لائن بریک انداز ڈھیلا عمومی لائن بریک انداز @@ -995,63 +1045,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ پیمائش کا امپیریل نظام UK پیمائش کا امریکی نظام - US + امریکی عربی ہندی ہندسے توسیع شدہ عربی ہندی ہندسے + توسیع شدہ عربی ہندی آرمینیائی اعداد آرمینیائی زیریں اعداد + آرمینیائی چھوٹے حروف بنگالی ہندسے چکما اعداد دیوناگری ہندسے ایتھوپیائی اعداد مالیاتی ہندسے + مالی پورے عرض والے ہندسے + مکمل چوڑائی جارجیائی اعداد یونانی اعداد یونانی زیریں اعداد + یونانی چھوٹے حروف گجراتی ہندسے گرمکھی ہندسے + روایتی کیلنڈروں کے لیے ہان حروف پر مبنی مہینے کی تاریخ کی نمبرنگ چینی اعشاری اعداد + چینی آڈیوگرافس کو بطور ہندسے استعمال کرنے والا مقامی اعشاری نظام آسان چینی اعداد آسان چینی مالی اعداد + آسان چینی مالی روایتی چینی اعداد روایتی چینی مالی اعداد + روایتی چینی مالی عبرانی اعداد جاویانی اعداد جاپانی اعداد جاپانی مالی اعداد + جاپانی مالی + جاپانی آغازِ سال گانن نمبرنگ خمیر ہندسے کنڑ ہندسے + تائی تھام تھام (کلیسائی) لاؤ ہندسے مغربی ہندسے + ریاضیاتی بولڈ + ریاضیاتی ڈبل اسٹرک + ریاضیاتی مونوسپیس + ریاضیاتی سینس سیرف بولڈ + ریاضیاتی سینس سیرف ملیالم ہندسے منگولیائی ہندسے میٹی مئیک اعداد میانمار کے ہندسے + میانمار مشرقی پوو کیرن + میانمار پاؤ + میانمار شان + میانمار تائی لائنگ اصل ہندسے + مقامی ہندسے اول چیکی اعداد اڑیہ ہندسے + آؤٹ لائن کردہ رومن اعداد + رومن بڑے حروف رومن زیریں اعداد + رومی چھوٹے حروف + تقسیم شدہ روایتی تمل اعداد تمل اعداد + ماڈرن تمل تیلگو ہندسے تھائی ہندسے تبتی اعداد روایتی اعداد + روایتی اعداد وائی ہندسے آف آن + غیر متعین مشینی ترجمہ + POSIX متغیر + + آف + آن + میٹرک برطانیہ ریاست ہائے متحدہ امریکہ - زبان:{0} - رسم الخط:{0} - خطہ:{0} + زبان: {0} + رسم الخط: {0} + خطہ: {0} @@ -1088,6 +1172,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1109,6 +1200,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + + - + + + @@ -1224,6 +1322,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0} – {1} + {0} – {1} h:mm – h:mm B @@ -1289,6 +1390,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E، d MMM – E، d MMM E، d MMM – E، d MMM + + d – d MMMM + d MMMM – d MMMM + y–y G @@ -1330,6 +1435,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + ج + ف + م + ا + م + ج + ج + ا + س + ا + ن + د + جنوری فروری @@ -1347,23 +1466,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - J - F - M - A - M - J - J - A - S - O + ج + ف + م + ا + م + ج + ج + ا + س + ا N - D + د + + ا + پ + م + ب + ج + ج + ہ + اتوار پیر @@ -1374,6 +1502,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ہفتہ + + + ا + پ + م + ب + ج + ج + ہ + + @@ -1477,27 +1616,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} - - {1} کو {0} - - - {1} {0} پر - {1} {0} - - {1} کو {0} - - - {1} کو {0} - @@ -1530,11 +1660,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM، y G E، d MMM، y G + MMMM y G + d MMMM، y G + E، d MMMM، y G d/M E، d/M d MMM E، d MMM d MMMM + E، d MMMM MMMM کا ہفتہ W MMMM کا ہفتہ W M/y @@ -1544,12 +1678,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM، y E، d MMM، y MMMM y + d MMMM، y + E، d MMMM، y QQQ y QQQQ y Y کا w ہفتہ Y کا w ہفتہ + + {1}، {0} + {0} {1} + {1}, {0} + + + {0} – {1} + {0} – {1} h – h B @@ -1618,6 +1762,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E، d MMM – E، d MMM E، d MMM – E، d MMM + + d–d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -1786,7 +1934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - M/y G E، d/M/y G @@ -1945,7 +2092,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ دن گزشتہ پرسوں - گزشتہ کل + کل آج آئندہ کل آنے والا پرسوں @@ -1959,11 +2106,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + کل + آج + آئندہ کل {0} دن پہلے {0} دن پہلے + + کل + آج + آئندہ کل + یوم سال @@ -2610,9 +2765,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ لبرے ویلے - - برٹش سمر ٹائم - لندن @@ -2703,9 +2855,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ جے پورہ - - آئرش اسٹینڈرڈ ٹائم - ڈبلن @@ -3401,6 +3550,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ہرارے + + + ایکر ٹائم + ایکر اسٹینڈرڈ ٹائم + ایکر سمر ٹائم + + افغانستان کا وقت @@ -3423,7 +3579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - مغربی افریقہ ٹائم + مغربی افریقہ کا وقت @@ -3583,6 +3739,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ برازیلیا سمر ٹائم + + + برطانوی وقت + برٹش سمر ٹائم + + برونئی دارالسلام ٹائم @@ -3756,6 +3918,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ گرین وچ کا اصل وقت + + + گرین لینڈ ٹائم + گرین لینڈ اسٹینڈرڈ ٹائم + گرین لینڈ سمر ٹائم + + مشرقی گرین لینڈ ٹائم @@ -3782,7 +3951,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - ہوائی الیوٹیئن اسٹینڈرڈ ٹائم + ہوائی کا وقت @@ -3843,6 +4012,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ایران ڈے لائٹ ٹائم + + + آئرش ٹائم + آئرش اسٹینڈرڈ ٹائم + + ارکتسک ٹائم @@ -3866,9 +4041,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - پیٹروپاؤلووسک-کیمچسکی ٹائم - پیٹروپاؤلووسک-کیمچسکی اسٹینڈرڈ ٹائم - پیٹروپاؤلووسک-کیمچسکی سمر ٹائم + کمچٹکا کا وقت + کمچٹکا کا معیاری وقت + کمچٹکا کا موسم گرما کا وقت @@ -4135,16 +4310,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - سمارا ٹائم - سمارا اسٹینڈرڈ ٹائم - سمارا سمر ٹائم + سمارا کا وقت + سمارا کا معیاری وقت + سمارا کا موسم گرما کا وقت - ساموآ ٹائم ساموآ سٹینڈرڈ ٹائم - ساموآ ڈے لائٹ ٹائم @@ -4211,6 +4384,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ چوک ٹائم + + + ترکیہ ٹائم + ترکیہ اسٹینڈرڈ ٹائم + ترکیہ سمر ٹائم + + ترکمانستان کا وقت @@ -4230,6 +4410,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ یوروگوئے کا موسم گرما کا وقت + + + اورومکی کا وقت + + ازبکستان کا وقت @@ -4306,15 +4491,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ، , + ٪ + E ; - % - ‰ + ٪ ‎+ ‎- @@ -4461,8 +4646,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ارجنٹائن پیسو - ارجنٹائن پیسو - ارجنٹائن پیسو آسٹریلین ڈالر @@ -4535,8 +4718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ چلین پیسو - چلین پیسو - چلین پیسو چینی یوآن (آف شور) @@ -4546,8 +4727,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ کولمبین پیسو - کولمبین پیسو - کولمبین پیسو کوسٹا ریکا کا کولن @@ -4600,7 +4779,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ فجی کا ڈالر - فاکلینڈ آئلینڈز پونڈ + فاکلینڈ آئلینڈز پاؤنڈ + فاکلینڈ آئلینڈز پاؤنڈ + فاکلینڈ آئلینڈز پاؤنڈ فرانسیسی فرانک @@ -4615,7 +4796,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ گھانا کا سیڈی - جبل الطارق پونڈ + جبل الطارق پاؤنڈ + جبل الطارق پاؤنڈ + جبل الطارق پاؤنڈ گامبیا کا ڈلاسی @@ -4708,7 +4891,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ لاؤشیائی کِپ - لبنانی پونڈ + لبنانی پاؤنڈ + لبنانی پاؤنڈ + لبنانی پاؤنڈ سری لنکائی روپیہ @@ -4766,8 +4951,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ میکسیکی پیسو - میکسیکی پیسو - میکسیکی پیسو ملیشیائی رنگِٹ @@ -4809,8 +4992,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ فلپائنی پیسو - فلپائنی پیسو - فلپائنی پیسو PHP @@ -4893,7 +5074,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ساؤ ٹومے اور پرنسپے ڈوبرا - شامی پونڈ + شامی پاؤنڈ + شامی پاؤنڈ + شامی پاؤنڈ سوازی لیلانجینی @@ -4989,7 +5172,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ یمنی ریال - جنوبی افریقی رانڈ + جنوبی افریقی رینڈ + جنوبی افریقی رینڈ + جنوبی افریقی رینڈ زامبیائی کواچا (1968–2012) @@ -4999,8 +5184,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ زمبابوے گولڈ - زمبابوے گولڈ - زمبابوے گولڈ @@ -5229,9 +5412,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine - فی ملین حصے - {0} فی ملین حصے - {0} فی ملین حصے + فی ملین اجزا + {0} جزو فی ملین + {0} اجزا فی ملین feminine @@ -5572,6 +5755,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine + {0} ملی میٹر + {0} ملی میٹر masculine @@ -5768,9 +5953,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ملی میٹر مرکری - مرکری کے - {0} مرکری کے - {0} مرکری کے + مرکری + {0} مرکری + {0} مرکری پاؤنڈز فی مربع انچ @@ -5848,6 +6033,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ masculine + ڈگری درجۂ حرارت + {0} ڈگری درجۂ حرارت + {0} ڈگری درجۂ حرارت feminine @@ -6044,9 +6232,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} کاتلز - کولمبز + کولمب {0} کولمب - {0} کولمبز + {0} کولمب فیراڈ @@ -6054,9 +6242,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} فیراڈ - ہینریز - {0} ہینری - {0} ہینریز + ہنری + {0} ہنری + {0} ہنری سیمنز @@ -6216,7 +6404,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} پارٹ - حصے/ملین + اجزا/ملین فیصد @@ -6419,7 +6607,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ملی میٹر {0} ملی میٹر - {0} ملیمیٹر + {0} ملی میٹر پیکو میٹر @@ -6510,9 +6698,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} واٹ - of Hg - {0} of Hg - {0} of Hg + {0} Hg + {0} Hg بار @@ -6535,6 +6722,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ بیوفورٹ + + ڈگری درجۂ حرارت + ڈگری سیلسیس {0}‎°C @@ -6729,6 +6919,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ریڈین + + {0}° + {0}° + {0}′ {0}′ @@ -6757,7 +6951,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ دُنام - پارٹ {0} پارٹ {0} پارٹ @@ -6773,11 +6966,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ‱ - - Glc - {0} Glc - {0} Glc - {0}L/100km {0}L/100km @@ -6852,8 +7040,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} فی سینٹی میٹر - {0} ملی میٹر - {0}ملی میٹر + {0} mm + {0} mm pm @@ -6925,9 +7113,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}hp - of Hg - {0} of Hg - {0} of Hg + Hg + {0} Hg + {0} Hg ″ Hg @@ -6993,6 +7181,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pt + + {0} fl oz m. + {0} fl oz m. + بُشل @@ -7023,40 +7215,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}fl.dr. {0}fl.dr. - - {0} sr - {0} sr - - - {0} kat - {0} kat - - - cal-IT - {0} cal-IT - {0} cal-IT - - - {0} Sv - {0} Sv + + {0} C + {0} C - - {0} Gy - {0} Gy + + {0} F + {0} F - - {0} kgf - {0} kgf + + {0} H + {0} H - - {0} T - {0} T + + {0} S + {0} S - - {0} Wb - {0} Wb + + {0} Bq + {0} Bq + ppb {0}ppb {0}ppb diff --git a/make/data/cldr/common/main/uz.xml b/make/data/cldr/common/main/uz.xml index 7cc4484f91cc..61acb94a95b4 100644 --- a/make/data/cldr/common/main/uz.xml +++ b/make/data/cldr/common/main/uz.xml @@ -57,7 +57,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ bislama bini siksika - Anii + anii bambara bengal tibet @@ -339,6 +339,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kreol (Nigeriya) pijin polyakcha + pyemont maliset-passamakvoddi pruss pushtu @@ -466,7 +467,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nyengatu kanton xitoy, kanton - Chjuan + chjuan tamazigxt xitoy xitoy, mandarin @@ -858,15 +859,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ taqvim valyuta formati + belgilarni hisobga olmasdan saralash + urgʻu boʻyicha teskari saralash + yuqori yoki quyi registr boʻyicha saralash + registrni hisobga olgan holda saralash saralash tartibi + normallashtirilgan saralash + raqamli saralash + qayta saralash (yozuv/blok) + saralash samaradorligi valyuta + oʻzgartirish manzili + koʻchirishning lugʻat qoidalaridan istisnolar emoji namoyishi + haftaning birinchi kuni + aralash soat tizimi (12 yoki 24) + kiritish uslubi + klaviatura + eng yuqori rad etilgan qatorni uzish uslubi so‘z ko‘chirish uslubi + oʻgirish qoidalari o‘lchov tizimi + oʻlchov birligi raqamlar + qoʻshimcha maʼlumotlar uchun mintaqa + oʻzgartirish manbasi + mintaqa boʻlinmasi qisqartirilgandan keyin gapning uzilishi + oʻzgartirish + mashinaviy tarjima + Vaqt mintaqasi + mahalliy sozlamalar varianti + shaxsiy + shaxsiy oʻzgartirish buddizm taqvimi @@ -885,15 +912,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ grigorian yahudiy taqvimi yahudiy + hind milliy hijriy taqvim hijriy jadvalli hijriy taqvim jadvalli hijriy + hijriy, Saudiya Arabistoni kuzatuvi jadvalli hijriy taqvim (astronomik davr) jadvalli hijriy (atronomik davr) hijriy taqvim (Ummul Quro) hijriy (Ummul Quro) ISO-8601 taqvimi + gregorian yapon taqvimi yapon fors taqvimi @@ -904,15 +934,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ moliyaviy standart valyuta formati standart + quyi registr + quyi registr + yuqori registr + moslik + lugʻat standart Unicode saralash tartibi standart Unicode + emoji + yevropa qoidalari + telefon kitobi + fonetik + pinyin qidiruv qidiruv + koreyscha boshlangʻich undoshlar standart saralash tartibi standart + chiziqli + anʼanaviy + radikal-chiziqli + zhuyin + valyuta + raqamlar + punktuatsiya + boʻsh joy + belgi + hammasi + faqat asosiy harflar + asosiy, urgʻu, registr, variantlar, kana + asosiy, urgʻu + asosiy, urgʻu, registr, variantlar + toʻliq kenglikdagi belgilar + yarim kenglikdagi belgilar birlamchi emoji matn + 12 soatlik tizim + 12 + 24 soatlik tizim + 24 12 soatlik tizim (0–11) 12 (0–11) 12 soatlik tizim (1–12) @@ -921,6 +982,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 soatlik tizim (1–24) 24 (1–24) + boʻsh joy, punktuatsiya, barcha belgilar + boʻsh joy, punktuatsiya + boʻsh joy, punktuatsiya + boʻsh joy, punktuatsiya, valyuta boʻlmagan belgilar qatorni yumshoq uzish yumshoq qatorni odatiy uzish @@ -931,6 +996,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ hammasini saqlash oddiy uslub iboralarda saqlash + US BGN transliteratsiyasi + UN GEGN transliteratsiyasi metrik tizim metrik Britaniya o‘lchov tizimi @@ -939,47 +1006,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ AQSH arab-hind raqamlari kengaytirilgan arab-hind raqamlari + kengaytirilgan arab-hind arman raqamlari arman kichik raqamlari + arman kichik bengal raqamlari chakma raqamlari devanagari raqamlari habash raqamlari + moliyaviy to‘liq enli raqamlar + toʻliq enli gruzin raqamlari grek raqamlari kichik grek raqamlari + grek kichik gujarot raqamlari gurmukxi raqamlari + anʼanaviy taqvimlar uchun oy kunlarini Han iyerogliflari bilan raqamlash xitoy o‘nli raqamlari + raqamlar sifatida xitoy iyerogliflaridan foydalaniladigan pozitsion oʻnlik sanoq tizimi soddalashgan xitoy raqamlari soddalashgan xitoy raqamlari (moliyaviy) + soddalashgan xitoy (moliyaviy) an’anaviy xitoy raqamlari an’anaviy xitoy raqamlari (moliyaviy) + anʼanaviy xitoy (moliyaviy) ivrit raqamlari yava raqamlari yapon raqamlari yapon raqamlari (moliyaviy) + yapon (moliyaviy) + yapon Gannen birinchi yil nomlanishi kxmer raqamlari kannada raqamlari + tai tham tham (diniy) laos raqamlari zamonaviy arab raqamlari + matematik (qalin) + matematik (ikki chiziqli) + matematik (bir kenglikdagi) + matematik (qalin chiziqlarsiz) + matematik (chiziqlarsiz) malayalam raqamlari manipuri raqamlari - birma raqamlari + myanma raqamlari + myanma sharqiy pwo karen + myanma pao + myanma shan + myanma tai laing + tabiiy raqamlar + tub xalqlar raqamlari ol chiki taqamlari oriya raqamlari + chizilgan rim raqamlari + rim katta kichik rim raqamlari + rim kichik + segmentli an’anaviy tamil raqamlari tamil raqamlari + zamonaviy tamil telugu raqamlari tay raqamlari tibet raqamlari + anʼanaviy raqamlar vay raqamlari oʻchiq yoniq + tahrirsiz mashinaviy tarjima + POSIX varianti + + oʻchiq + yoniq + Metrik Buyuk Britaniya @@ -1028,6 +1130,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + . + {1}, {0} @@ -1052,21 +1157,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B h B h:mm B h:mm:ss + E, B h E, B h:mm E, B h:mm:ss E, d + E, h (a) E, h:mm (a) E, HH:mm E, h:mm:ss (a) E, HH:mm:ss y (G) - dd.MM.y GGGGG + MM-y (G) + dd.MM.y (G) + E, dd-MM-y (G) MMM, y (G) d-MMM, y (G) E, d-MMM, y (G) h (a) h:mm (a) h:mm:ss (a) + h (a) v dd.MM E, dd.MM d-MMM @@ -1147,6 +1257,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d-MMM – E, d-MMM E, d-MMM – E, d-MMM + + d–d MMMM + d-MMMM – d-MMMM + y–y (G) @@ -1394,6 +1508,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1}, {0} @@ -1432,6 +1549,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM, G y d-MMM, G y E, d-MMM, G y + MMMM, G y + d-MMMM, G y + E, d-MMMM, G y h:mm a h:mm:ss a h:mm:ss a (v) @@ -1444,6 +1564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d-MMM E, d-MMM d-MMMM + E, d-MMMM MMMM, W-'hafta' MMMM, W-'hafta' MM.y @@ -1453,12 +1574,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d-MMM, y E, d-MMM, y MMMM, y + d-MMMM, y + E, d-MMMM, y y, QQQ y, QQQQ Y, w-'hafta' Y, w-'hafta' + + {1}, {0} + + + {0} – {1} + {0} – {1} + B h – B h B h – h @@ -1545,6 +1675,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d-MMM – E, d-MMM E, d-MMM – E, d-MMM + + d–d-MMMM + d-MMMM – d-MMMM + MM/y – MM/y MM/y – MM/y @@ -1620,6 +1754,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + MM-y (G) + E, dd-MM-y (G) MMM, y (G) d-MMM, y G MMMM, y G @@ -2189,6 +2325,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pasxa oroli + + Koyayke + Punta-Arenas @@ -2288,11 +2427,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Librevil - - - Britaniya yozgi vaqti - - Kayenna @@ -2353,11 +2487,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Jaypur - - - Irlandiya yozgi vaqti - - Quddus @@ -2397,6 +2526,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Pnompen + + Kanton oroli + Tarava @@ -2808,6 +2940,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Xarare + + + Akri vaqti + Akri standart vaqti + Akri yozgi vaqti + + Afgʻoniston vaqti @@ -2983,6 +3122,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Braziliya yozgi vaqti + + + Britaniya vaqti + Britaniya yozgi vaqti + + Bruney-Dorussalom vaqti @@ -3156,6 +3301,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Grinvich o‘rtacha vaqti + + + Grenlandiya vaqti + Grenlandiya standart vaqti + Grenlandiya yozgi vaqti + + Sharqiy Grenlandiya vaqti @@ -3182,7 +3334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Gavayi-aleut standart vaqti + Gavayi vaqti @@ -3243,6 +3395,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Eron yozgi vaqti + + + Irlandiya vaqti + Irlandiya standart vaqti + + Irkutsk vaqti @@ -3264,6 +3422,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yaponiya yozgi vaqti + + + Kamchatka vaqti + Kamchatka standart vaqti + Kamchatka yozgi vaqti + + Qozogʻiston vaqti @@ -3526,11 +3691,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Saxalin yozgi vaqti + + + Samara vaqti + Samara standart vaqti + Samara yozgi vaqti + + - Samoa vaqti Samoa standart vaqti - Samoa yozgi vaqti @@ -3597,6 +3767,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chuuk vaqti + + + Turkiya vaqti + Turkiya standart vaqti + Turkiya yozgi vaqti + + Turkmaniston vaqti @@ -3616,6 +3793,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Urugvay yozgi vaqti + + + Urumchi vaqti + + O‘zbekiston vaqti @@ -3772,8 +3954,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ - ¤#,##0.00;(¤#,##0.00) - ¤ #,##0.00;(¤ #,##0.00) + #,##0.00¤;(#,##0.00¤) + #,##0.00 ¤;(#,##0.00 ¤) #,##0.00;(#,##0.00) @@ -4292,8 +4474,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Karib guldeni - Karib guldeni - Karib guldeni G‘arbiy Afrika CFA franki @@ -4317,8 +4497,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Zimbabve oltini - Zimbabve oltini - Zimbabve oltini @@ -4522,11 +4700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ elementlar - - qism - {0} qismi - {0} qismi - {0} milliondan ulush {0} milliondan ulush @@ -5118,7 +5291,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} zivert - Grey + grey {0} grey {0} grey @@ -5138,12 +5311,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} veber - yorug‘lik {0} yorug‘lik tezligi {0} yorug‘lik tezligi - milliarddan ulush {0} milliarddan ulush {0} milliarddan ulush @@ -5895,8 +6066,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ milliarddan ulush - {0} ppb - {0} ppb kecha @@ -5937,11 +6106,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} ft² {0} ft² - - qism - {0} qismi - {0} qismi - ppm {0}ppm @@ -5951,7 +6115,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ % - Glk {0} Glk {0} Glk @@ -6002,10 +6165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} o.k. {0} hp - - {0} Hg - {0} Hg - {0} mi/h {0} mi/h @@ -6023,20 +6182,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}L - kal-IT {0} kal-IT {0} kal-IT - Gr {0} Gr {0} Gr - - yorug‘lik - {0} yorug‘lik - {0} yorug‘lik - ppb {0}ppb diff --git a/make/data/cldr/common/main/uz_Cyrl.xml b/make/data/cldr/common/main/uz_Cyrl.xml index ad4dbfd862c2..52649b994005 100644 --- a/make/data/cldr/common/main/uz_Cyrl.xml +++ b/make/data/cldr/common/main/uz_Cyrl.xml @@ -1008,6 +1008,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y, w-'ҳафта' + + {0} – {1} + {0} – {1} + {0} – {1} + {0} – {1} h a – h a @@ -1255,16 +1260,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Номаълум - - - Британия ёзги вақти - - - - - Ирландия ёзги вақти - - Lower Princeʼs Quarter @@ -1436,6 +1431,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Бразилия ёзги вақти + + + Британия ёзги вақти + + Бруней Даруссалом вақти @@ -1691,6 +1691,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Эрон кундузги вақти + + + Ирландия ёзги вақти + + Иркутск вақти @@ -1959,9 +1964,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Самоа вақти Самоа стандарт вақти - Самоа кундузги вақти diff --git a/make/data/cldr/common/main/ve.xml b/make/data/cldr/common/main/ve.xml deleted file mode 100644 index 373b5c93a438..000000000000 --- a/make/data/cldr/common/main/ve.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - Tshivenḓa - - - - [a b dḓ e f g h i k lḽ m nṅṋ o p r s tṱ u v w x y z] - [c j q] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - - - ‘ - ’ - “ - ” - - - - - - - - Pha - Luh - Ṱhf - Lam - Shu - Lwi - Lwa - Ṱha - Khu - Tsh - Ḽar - Nye - - - Phando - Luhuhi - Ṱhafamuhwe - Lambamai - Shundunthule - Fulwi - Fulwana - Ṱhangule - Khubvumedzi - Tshimedzi - Ḽara - Nyendavhusiku - - - - - - - Swo - Mus - Vhi - Rar - Ṋa - Ṱan - Mug - - - Swondaha - Musumbuluwo - Ḽavhuvhili - Ḽavhuraru - Ḽavhuṋa - Ḽavhuṱanu - Mugivhela - - - - - - - K1 - K2 - K3 - K4 - - - Kotara ya u thoma - Kotara ya vhuvhili - Kotara ya vhuraru - Kotara ya vhuṋa - - - - - - - - - , -   - - - - - ¤#,##0.00 - - - - - - R - - - - diff --git a/make/data/cldr/common/main/ve_ZA.xml b/make/data/cldr/common/main/ve_ZA.xml deleted file mode 100644 index c0a2ca26c1cd..000000000000 --- a/make/data/cldr/common/main/ve_ZA.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/vec.xml b/make/data/cldr/common/main/vec.xml index f8efbbd1f20b..7aefc0f2ae8d 100644 --- a/make/data/cldr/common/main/vec.xml +++ b/make/data/cldr/common/main/vec.xml @@ -1043,6 +1043,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic reserca jenèrega òrdane standard standard + sistema a 12 ore + sistema a 24 ore sistema a 12 ore (0–11) sistema a 12 ore (1–12) sistema a 24 ore (0–23) @@ -1544,6 +1546,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic w'ª' 'setemana' 'de''l' Y + + {0} – {1} + {0} – {1} + {0} – {1} + h – h B @@ -2314,7 +2321,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic UTC{0} - UTC UTC+? Ora {0} Ora d’istà {0} @@ -2517,9 +2523,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pariji - - Ora d’istà britànega - Londra @@ -2558,11 +2561,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Makasar - - - Ora d’istà irlandeze - - Jeruzaleme @@ -3176,6 +3174,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora d’istà de Brazilia + + + Ora d’istà britànega + + Ora de’l Brunéi @@ -3436,6 +3439,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ora d’istà de l’Iran + + + Ora d’istà irlandeze + + Ora de Irkutsk @@ -3721,9 +3729,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Ora de le Ìzole Samòa Ora normale de le Ìzole Samòa - Ora d’istà de le Ìzole Samòa @@ -4807,8 +4813,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}-{1} - {0} pomo - {0} pomi Ciapa la {0}ª a dreta diff --git a/make/data/cldr/common/main/vi.xml b/make/data/cldr/common/main/vi.xml index c6e6019e4b1f..52461acd305c 100644 --- a/make/data/cldr/common/main/vi.xml +++ b/make/data/cldr/common/main/vi.xml @@ -259,7 +259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tiếng Ingush Tiếng Ido Tiếng Iceland - Tiếng Italy + Tiếng Ý Tiếng Inuktitut Tiếng Ingria Tiếng Nhật @@ -447,6 +447,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tiếng Pali Tiếng Pijin Tiếng Ba Lan + Tiếng Piemonte Tiếng Pohnpeian Tiếng Maliseet-Passamaquoddy Tiếng Prussia @@ -1167,18 +1168,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Thứ tự sắp xếp Sắp xếp theo chuẩn hóa Sắp xếp theo số + Sắp xếp lại thứ tự hệ chữ viết/khối ký tự Cường độ sắp xếp Tiền tệ + Đích biến đổi + Ngoại lệ ngắt từ theo từ điển Trình bày emoji + Ngày đầu tuần + Kết hợp Chu kỳ giờ (12 với 24) + Phương thức nhập liệu + Bàn phím + Ký tự cao nhất được bỏ qua Kiểu xuống dòng Ngắt dòng trong từ + Quy tắc chuyển đổi Hệ thống đo lường + Đơn vị đo lường Số + Vùng cho dữ liệu bổ trợ + Nguồn biến đổi + Phân khu của vùng Ngắt câu sau khi viết tắt. + Chuyển đổi + Dịch máy Múi giờ Biến thể ngôn ngữ Sử dụng cá nhân + Chuyển đổi sử dụng riêng Lịch Phật Giáo @@ -1198,15 +1215,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lịch Do Thái Do Thái Lịch Quốc gia Ấn Độ + Lịch quốc gia Ấn Độ Lịch Hồi Giáo Hồi giáo Lịch Hồi Giáo (dạng bảng, kỷ nguyên dân sự) Hồi giáo (dạng bảng, kỷ nguyên dân sự) Lịch Hồi Giáo - Ả Rập Xê-út + Lịch Hồi giáo, Ả Rập Xê Út quan sát trăng non Lịch Hồi Giáo - Thiên văn + Lịch Hồi giáo (theo bảng, kỷ nguyên thiên văn) Lịch Hồi Giáo (Umm al-Qura) Hồi giáo (Umm al-Qura) Lịch ISO-8601 + Dương lịch Lịch Nhật Bản Nhật Bản Lịch Ba Tư @@ -1222,8 +1243,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sắp xếp dấu trọng âm bình thường Sắp xếp dấu trọng âm đảo ngược Sắp xếp chữ thường đầu tiên + Chữ thường Sắp xếp thứ tự chữ cái bình thường + Chữ thường Sắp xếp chữ hoa đầu tiên + Chữ hoa Sắp xếp không phân biệt chữ hoa/chữ thường Sắp xếp phân biệt chữ hoa/chữ thường Thứ tự sắp xếp trước đây, để tương thích @@ -1233,7 +1257,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Thứ tự sắp xếp unicode mặc định Unicode mặc định Thứ tự sắp xếp biểu tượng + Biểu tượng cảm xúc Quy tắc sắp xếp Châu Âu + quy tắc châu Âu Thứ tự sắp xếp theo danh bạ điện thoại Danh bạ điện thoại Thứ tự sắp xếp theo ngữ âm @@ -1243,13 +1269,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Tìm kiếm mục đích chung Tìm kiếm Tìm kiếm theo Phụ âm Đầu Hangul + phụ âm đầu trong tiếng Hàn Thứ tự sắp xếp chuẩn Chuẩn Thứ tự sắp xếp theo nét chữ Nét chữ Thứ tự sắp xếp truyền thống Truyền thống - Trình tự sắp xếp theo bộ-nét + Thứ tự sắp xếp theo bộ nét Bộ-nét Thứ tự sắp xếp theo chú âm phù hiệu Chú âm phù hiệu @@ -1257,17 +1284,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Sắp xếp unicode được chuẩn hóa Sắp xếp từng chữ số Sắp xếp chữ số theo số + Đơn vị tiền tệ + Chữ số + Dấu câu + Khoảng trắng + Ký hiệu Sắp xếp tất cả + Tất cả Chỉ sắp xếp chữ cái cơ sở + Chỉ các chữ cái cơ sở Sắp xếp dấu trọng âm/chữ cái/độ rộng/chữ Kana + Chữ cơ bản, dấu thanh, chữ hoa chữ thường, biến thể, chữ Kana Sắp xếp dấu trọng âm + Chữ cơ bản, dấu thanh Sắp xếp dấu trọng âm/chữ cái/độ rộng + Chữ cơ bản, dấu thanh, chữ hoa chữ thường, biến thể Độ rộng tối đa Nửa độ rộng Số Mặc định Emoji Văn bản + Hệ thống 12 giờ + 12 + Hệ thống 24 giờ + 24 Hệ thống 12 giờ (0–11) 12 (0–11) Hệ thống 12 giờ (1–12) @@ -1276,6 +1317,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) Hệ thống 24 giờ (1–24) 24 (1–24) + Bỏ qua khoảng trắng, dấu câu, tất cả ký hiệu + Bỏ qua khoảng trắng, dấu câu + Bỏ qua khoảng trắng, dấu câu + Bỏ qua khoảng trắng, dấu câu, ký hiệu không phải tiền tệ Kiểu xuống dòng thoáng Thoáng Kiểu xuống dòng thường @@ -1297,8 +1342,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chữ số Ahom Chữ số Ả Rập - Ấn Độ Chữ số Ả Rập - Ấn Độ mở rộng + Ả Rập-Ấn Độ mở rộng Chữ số Armenia Chữ số Armenia viết thường + Armenia viết thường Chữ số Bali Chữ số Bangladesh Chữ số Brahmi @@ -1308,56 +1355,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chữ số Devanagari Chữ số Ethiopia Chữ số dùng trong tài chính + Tài chính Chữ số có độ rộng đầy đủ + Độ rộng đầy đủ Chữ số Georgia Chữ số Gong Chữ số Gonm Chữ số Hy Lạp Chữ số Hy Lạp viết thường + Hy Lạp viết thường Chữ số Gujarati Chữ số Gurmukhi + Cách đánh số ngày bằng Hán tự cho lịch truyền thống Chữ số thập phân Trung Quốc + Hệ thập phân vị trị sử dụng chữ số Trung Quốc làm chữ số Chữ số của tiếng Trung giản thể Chữ số dùng trong tài chính của tiếng Trung giản thể + Tài chính tiếng Trung giản thể Chữ số tiếng Trung phồn thể Chữ số dùng trong tài chính của tiếng Trung phồn thể + Tài chính tiếng Trung phồn thể Chữ số Do Thái Chữ số Hmng Chữ số Hmnp Chữ số Java Chữ số Nhật Bản Chữ số dùng trong tài chính của tiếng Nhật + Tài chính tiếng Nhật + Cách đánh số năm đầu trong tiếng Nhật Chữ số Kayah Li Chữ số Khơ-me Chữ số Kannada Chữ số Hora Thái Đam Chữ số Tham Thái Đam + Chữ Tai Tham (giáo hội) Chữ số Lào Chữ số phương Tây Chữ số Lepcha Chữ số Limbu Chữ số Mathbold + Chữ số toán học in đậm Chữ số Mathdbl + Chữ số toán học nét đôi Chữ số Mathmono + Chữ số toán học đơn cách Chữ số Mathsanb + Chữ số toán học sans-serif đậm Chữ số Mathsans + Chữ số toán học sans-serif Chữ số Malayalam Chữ số Modi Chữ số Mông Cổ Chữ số Mroo Chữ số Meetei Mayek Chữ số Myanma + Chữ số Pwo Karen Đông Myanmar + Chữ số Pao Myanmar Chữ số Myanmar Shan + Chữ số Shan Myanmar Chữ số Mymrtlng + Chữ số Tai Laing Myanmar Chữ số tự nhiên + Chữ số tự nhiên Chữ số N’Ko Chữ số Ol Chiki Chữ số Odia Chữ số Osmanya + Nét viền Chữ số Rohg Chữ số La mã + La Mã viết hoa Chữ số La Mã viết thường + La Mã viết thường Chữ số Saurashtra + Dạng đoạn Chữ số Sharada Chữ số Sind Chữ số Sinh @@ -1367,17 +1438,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Chữ số Thái Lặc mới Chữ số Tamil Truyền thống Chữ số Tamil + Tamil hiện đại Chữ số Telugu Chữ số Thái Chữ số Tây Tạng Chữ số Tirh Số truyền thống + Chữ số truyền thống Chữ số Vai Chữ số Wara Chữ số Wancho Tắt Bật + Bản dịch máy không xác định + biến thể POSIX + + Tắt + Bật + Hệ mét Hệ Anh @@ -1892,6 +1971,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ QQQQ y G + + {0}–{1} + {0}–{1} + h 'giờ' B – h 'giờ' B h – h 'giờ' B @@ -1984,6 +2067,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + y–y G @@ -2165,9 +2252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ nửa đêm - s tr - c sáng chiều tối @@ -2251,6 +2336,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {0} {1} @@ -2301,6 +2389,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ MMM y G d MMM, y G E, d MMM, y G + MMMM y G + d MMMM y G + E, d MMMM y G HH 'giờ' h:mm a H:mm @@ -2326,10 +2417,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ d MMM, y E, d MMM, y MMMM 'năm' y + d MMMM y + E, d MMMM y QQQ y QQQQ 'năm' y 'tuần' w 'của' 'năm' Y + + {1}, {0} + {0} {1} + {1}, {0} + h 'giờ' B – h 'giờ' B @@ -2412,6 +2510,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E, d MMM – E, d MMM E, d MMM – E, d MMM + + d – d MMMM + d MMMM – d MMMM + M/y – M/y M/y – M/y @@ -2681,11 +2783,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ngày - Hôm kia - Hôm qua - Hôm nay - Ngày mai - Ngày kia + hôm kia + hôm qua + hôm nay + ngày mai + ngày kia sau {0} ngày nữa @@ -2834,7 +2936,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Thành phố không xác định + Vị trí không xác định + + + Đảo Phục Sinh Thượng Hải @@ -2842,22 +2947,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Praha - - - Giờ Mùa Hè Anh - - Nam Georgia Hồng Kông - - - Giờ chuẩn Ai-len - - Đảo Man @@ -2914,9 +3009,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Giờ Acre - Giờ Chuẩn Acre - Giờ Mùa Hè Acre + Giờ Acre + Giờ chuẩn Acre + Giờ mùa hè Acre @@ -2936,7 +3031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Giờ Chuẩn Nam Phi + Giờ chuẩn Nam Phi @@ -2947,27 +3042,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Alaska - Giờ Chuẩn Alaska - Giờ Mùa Hè Alaska - - - AKT - AKST - AKDT - - - - - Giờ Almaty - Giờ Chuẩn Almaty - Giờ Mùa Hè Almaty + Giờ chuẩn Alaska + Giờ mùa hè Alaska Giờ Amazon - Giờ Chuẩn Amazon - Giờ Mùa Hè Amazon + Giờ chuẩn Amazon + Giờ mùa hè Amazon @@ -2976,11 +3059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ chuẩn miền Trung Giờ mùa hè miền Trung - - CT - CST - CDT - @@ -2988,11 +3066,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ chuẩn miền Đông Giờ mùa hè miền Đông - - ET - EST - EDT - @@ -3000,11 +3073,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ chuẩn miền núi Giờ mùa hè miền núi - - MT - MST - MDT - @@ -3012,11 +3080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ chuẩn Thái Bình Dương Giờ mùa hè Thái Bình Dương - - PT - PST - PDT - @@ -3028,36 +3091,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Apia - Giờ Chuẩn Apia - Giờ Mùa Hè Apia - - - - - Giờ Aqtau - Giờ Chuẩn Aqtau - Giờ Mùa Hè Aqtau - - - - - Giờ Aqtobe - Giờ Chuẩn Aqtobe - Giờ Mùa Hè Aqtobe + Giờ chuẩn Apia + Giờ mùa hè Apia Giờ Ả Rập Giờ chuẩn Ả Rập - Giờ Mùa Hè Ả Rập + Giờ mùa hè Ả Rập Giờ Argentina - Giờ Chuẩn Argentina - Giờ Mùa Hè Argentina + Giờ chuẩn Argentina + Giờ mùa hè Argentina @@ -3070,55 +3119,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Armenia - Giờ Chuẩn Armenia - Giờ Mùa Hè Armenia + Giờ chuẩn Armenia + Giờ mùa hè Armenia Giờ Đại Tây Dương - Giờ Chuẩn Đại Tây Dương + Giờ chuẩn Đại Tây Dương Giờ mùa hè Đại Tây Dương - - AT - AST - ADT - Giờ Miền Trung Australia - Giờ Chuẩn Miền Trung Australia - Giờ Mùa Hè Miền Trung Australia + Giờ chuẩn Miền Trung Australia + Giờ mùa hè Miền Trung Australia Giờ Miền Trung Tây Australia - Giờ Chuẩn Miền Trung Tây Australia - Giờ Mùa Hè Miền Trung Tây Australia + Giờ chuẩn Miền Trung Tây Australia + Giờ mùa hè Miền Trung Tây Australia Giờ Miền Đông Australia - Giờ Chuẩn Miền Đông Australia - Giờ Mùa Hè Miền Đông Australia + Giờ chuẩn Miền Đông Australia + Giờ mùa hè Miền Đông Australia Giờ Miền Tây Australia - Giờ Chuẩn Miền Tây Australia - Giờ Mùa Hè Miền Tây Australia + Giờ chuẩn Miền Tây Australia + Giờ mùa hè Miền Tây Australia Giờ Azerbaijan - Giờ Chuẩn Azerbaijan - Giờ Mùa Hè Azerbaijan + Giờ chuẩn Azerbaijan + Giờ mùa hè Azerbaijan @@ -3131,8 +3175,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Bangladesh - Giờ Chuẩn Bangladesh - Giờ Mùa Hè Bangladesh + Giờ chuẩn Bangladesh + Giờ mùa hè Bangladesh @@ -3148,8 +3192,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Brasilia - Giờ Chuẩn Brasilia - Giờ Mùa Hè Brasilia + Giờ chuẩn Brasilia + Giờ mùa hè Brasilia + + + + + Giờ Vương quốc Anh + Giờ mùa hè Vương quốc Anh @@ -3161,7 +3211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Cape Verde Giờ Chuẩn Cape Verde - Giờ Mùa Hè Cape Verde + Giờ mùa hè Cape Verde @@ -3177,22 +3227,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Chatham - Giờ Chuẩn Chatham - Giờ Mùa Hè Chatham + Giờ chuẩn Chatham + Giờ mùa hè Chatham Giờ Chile - Giờ Chuẩn Chile - Giờ Mùa Hè Chile + Giờ chuẩn Chile + Giờ mùa hè Chile Giờ Trung Quốc - Giờ Chuẩn Trung Quốc - Giờ Mùa Hè Trung Quốc + Giờ chuẩn Trung Quốc + Giờ mùa hè Trung Quốc @@ -3208,22 +3258,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Colombia - Giờ Chuẩn Colombia - Giờ Mùa Hè Colombia + Giờ chuẩn Colombia + Giờ mùa hè Colombia Giờ Quần Đảo Cook - Giờ Chuẩn Quần Đảo Cook - Giờ Nửa Mùa Hè Quần Đảo Cook + Giờ chuẩn Quần Đảo Cook + Giờ mùa hè Quần Đảo Cook Giờ Cuba - Giờ Chuẩn Cuba - Giờ Mùa Hè Cuba + Giờ chuẩn Cuba + Giờ mùa hè Cuba @@ -3244,8 +3294,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Đảo Phục Sinh - Giờ Chuẩn Đảo Phục Sinh - Giờ Mùa Hè Đảo Phục Sinh + Giờ chuẩn Đảo Phục Sinh + Giờ mùa hè Đảo Phục Sinh @@ -3275,22 +3325,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Tây Âu - Giờ Chuẩn Tây Âu + Giờ chuẩn Tây Âu Giờ mùa hè Tây Âu - Giờ Quần Đảo Falkland - Giờ Chuẩn Quần Đảo Falkland - Giờ Mùa Hè Quần Đảo Falkland + Giờ Quần đảo Falkland + Giờ chuẩn Quần đảo Falkland + Giờ mùa hè Quần đảo Falkland Giờ Fiji - Giờ Chuẩn Fiji - Giờ Mùa Hè Fiji + Giờ chuẩn Fiji + Giờ mùa hè Fiji @@ -3316,8 +3366,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Georgia - Giờ Chuẩn Georgia - Giờ Mùa Hè Georgia + Giờ chuẩn Georgia + Giờ mùa hè Georgia @@ -3330,28 +3380,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Trung bình Greenwich - + - Giờ Miền Đông Greenland - Giờ Chuẩn Miền Đông Greenland - Giờ Mùa Hè Miền Đông Greenland + Giờ Greenland + Giờ chuẩn Greenland + Giờ mùa hè Greenland - + - Giờ Miền Tây Greenland - Giờ Chuẩn Miền Tây Greenland - Giờ Mùa Hè Miền Tây Greenland + Giờ miền đông Greenland + Giờ chuẩn miền đông Greenland + Giờ mùa hè miền đông Greenland - + - Giờ Chuẩn Guam + Giờ miền tây Greenland + Giờ chuẩn miền tây Greenland + Giờ mùa hè miền tây Greenland - Giờ Chuẩn Vùng Vịnh + Giờ chuẩn Vùng Vịnh @@ -3361,41 +3413,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Giờ Chuẩn Hawaii-Aleut + Giờ Hawaii - - HAST - Giờ Hawaii-Aleut - Giờ Chuẩn Hawaii-Aleut - Giờ Mùa Hè Hawaii-Aleut + Giờ chuẩn Hawaii-Aleut + Giờ mùa hè Hawaii-Aleut - - HAT - HAST - HADT - Giờ Hồng Kông - Giờ Chuẩn Hồng Kông - Giờ Mùa Hè Hồng Kông + Giờ chuẩn Hồng Kông + Giờ mùa hè Hồng Kông Giờ Hovd - Giờ Chuẩn Hovd - Giờ Mùa Hè Hovd + Giờ chuẩn Hovd + Giờ mùa hè Hovd - Giờ Chuẩn Ấn Độ + Giờ chuẩn Ấn Độ @@ -3426,36 +3470,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Iran - Giờ Chuẩn Iran - Giờ Mùa Hè Iran + Giờ chuẩn Iran + Giờ mùa hè Iran + + + + + Giờ Ireland + Giờ chuẩn Ireland Giờ Irkutsk - Giờ Chuẩn Irkutsk - Giờ Mùa Hè Irkutsk + Giờ chuẩn Irkutsk + Giờ mùa hè Irkutsk Giờ Israel - Giờ Chuẩn Israel - Giờ Mùa Hè Israel + Giờ chuẩn Israel + Giờ mùa hè Israel Giờ Nhật Bản - Giờ Chuẩn Nhật Bản - Giờ Mùa Hè Nhật Bản + Giờ chuẩn Nhật Bản + Giờ mùa hè Nhật Bản - Giờ Petropavlovsk-Kamchatski - Giờ chuẩn Petropavlovsk-Kamchatski - Giờ mùa hè Petropavlovsk-Kamchatski + Giờ Petropavlovsk-Kamchatski + Giờ chuẩn Petropavlovsk-Kamchatski + Giờ mùa hè Petropavlovsk-Kamchatski @@ -3476,8 +3526,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Hàn Quốc - Giờ Chuẩn Hàn Quốc - Giờ Mùa Hè Hàn Quốc + Giờ chuẩn Hàn Quốc + Giờ mùa hè Hàn Quốc @@ -3488,8 +3538,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Krasnoyarsk - Giờ Chuẩn Krasnoyarsk - Giờ Mùa Hè Krasnoyarsk + Giờ chuẩn Krasnoyarsk + Giờ mùa hè Krasnoyarsk @@ -3497,11 +3547,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Kyrgystan - - - Giờ Lanka - - Giờ Quần Đảo Line @@ -3510,21 +3555,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Lord Howe - Giờ Chuẩn Lord Howe - Giờ Mùa Hè Lord Howe - - - - - Giờ Ma Cao - Giờ Chuẩn Ma Cao - Giờ Mùa Hè Ma Cao + Giờ chuẩn Lord Howe + Giờ mùa hè Lord Howe Giờ Magadan - Giờ Chuẩn Magadan + Giờ chuẩn Magadan Giờ mùa hè Magadan @@ -3551,8 +3589,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Mauritius - Giờ Chuẩn Mauritius - Giờ Mùa Hè Mauritius + Giờ chuẩn Mauritius + Giờ mùa hè Mauritius @@ -3563,8 +3601,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Thái Bình Dương Mexico - Giờ Chuẩn Thái Bình Dương Mexico - Giờ Mùa Hè Thái Bình Dương Mexico + Giờ chuẩn Thái Bình Dương Mexico + Giờ mùa hè Thái Bình Dương Mexico @@ -3577,8 +3615,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Matxcơva - Giờ Chuẩn Matxcơva - Giờ Mùa Hè Matxcơva + Giờ chuẩn Matxcơva + Giờ mùa hè Matxcơva @@ -3599,22 +3637,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ New Caledonia - Giờ Chuẩn New Caledonia - Giờ Mùa Hè New Caledonia + Giờ chuẩn New Caledonia + Giờ mùa hè New Caledonia Giờ New Zealand - Giờ Chuẩn New Zealand - Giờ Mùa Hè New Zealand + Giờ chuẩn New Zealand + Giờ mùa hè New Zealand Giờ Newfoundland - Giờ Chuẩn Newfoundland - Giờ Mùa Hè Newfoundland + Giờ chuẩn Newfoundland + Giờ mùa hè Newfoundland @@ -3625,20 +3663,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Đảo Norfolk - Giờ Chuẩn Đảo Norfolk - Giờ Mùa Hè Đảo Norfolk + Giờ chuẩn Đảo Norfolk + Giờ mùa hè Đảo Norfolk Giờ Fernando de Noronha - Giờ Chuẩn Fernando de Noronha - Giờ Mùa Hè Fernando de Noronha - - - - - Giờ Quần Đảo Bắc Mariana + Giờ chuẩn Fernando de Noronha + Giờ mùa hè Fernando de Noronha @@ -3658,8 +3691,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Pakistan - Giờ Chuẩn Pakistan - Giờ Mùa Hè Pakistan + Giờ chuẩn Pakistan + Giờ mùa hè Pakistan @@ -3675,22 +3708,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Paraguay - Giờ Chuẩn Paraguay - Giờ Mùa Hè Paraguay + Giờ chuẩn Paraguay + Giờ mùa hè Paraguay Giờ Peru - Giờ Chuẩn Peru - Giờ Mùa Hè Peru + Giờ chuẩn Peru + Giờ mùa hè Peru Giờ Philippin - Giờ Chuẩn Philippin - Giờ Mùa Hè Philippin + Giờ chuẩn Philippin + Giờ mùa hè Philippin @@ -3701,7 +3734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ St. Pierre và Miquelon - Giờ Chuẩn St. Pierre và Miquelon + Giờ chuẩn St. Pierre và Miquelon Giờ Mùa Hè Saint Pierre và Miquelon @@ -3720,13 +3753,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Bình Nhưỡng - - - Giờ Qyzylorda - Giờ Chuẩn Qyzylorda - Giờ Mùa Hè Qyzylorda - - Giờ Reunion @@ -3740,22 +3766,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Sakhalin - Giờ Chuẩn Sakhalin + Giờ chuẩn Sakhalin Giờ mùa hè Sakhalin - Giờ Samara - Giờ Chuẩn Samara - Giờ mùa hè Samara + Giờ Samara + Giờ chuẩn Samara + Giờ mùa hè Samara - Giờ Samoa - Giờ Chuẩn Samoa - Giờ ban ngày Samoa + Giờ chuẩn Samoa @@ -3796,8 +3820,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Đài Bắc - Giờ Chuẩn Đài Bắc - Giờ Mùa Hè Đài Bắc + Giờ chuẩn Đài Bắc + Giờ mùa hè Đài Bắc @@ -3813,8 +3837,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Tonga - Giờ Chuẩn Tonga - Giờ Mùa Hè Tonga + Giờ chuẩn Tonga + Giờ mùa hè Tonga @@ -3824,16 +3848,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Giờ Thổ Nhĩ Kỳ - Giờ Chuẩn Thổ Nhĩ Kỳ - Giờ Mùa Hè Thổ Nhĩ Kỳ + Giờ Thổ Nhĩ Kỳ + Giờ chuẩn Thổ Nhĩ Kỳ + Giờ mùa hè Thổ Nhĩ Kỳ Giờ Turkmenistan - Giờ Chuẩn Turkmenistan - Giờ Mùa Hè Turkmenistan + Giờ chuẩn Turkmenistan + Giờ mùa hè Turkmenistan @@ -3844,22 +3868,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Uruguay - Giờ Chuẩn Uruguay - Giờ Mùa Hè Uruguay + Giờ chuẩn Uruguay + Giờ mùa hè Uruguay + + + + + Giờ Urumqi Giờ Uzbekistan - Giờ Chuẩn Uzbekistan - Giờ Mùa Hè Uzbekistan + Giờ chuẩn Uzbekistan + Giờ mùa hè Uzbekistan Giờ Vanuatu - Giờ Chuẩn Vanuatu - Giờ Mùa Hè Vanuatu + Giờ chuẩn Vanuatu + Giờ mùa hè Vanuatu @@ -3870,15 +3899,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Vladivostok - Giờ Chuẩn Vladivostok + Giờ chuẩn Vladivostok Giờ mùa hè Vladivostok Giờ Volgograd - Giờ Chuẩn Volgograd - Giờ Mùa Hè Volgograd + Giờ chuẩn Volgograd + Giờ mùa hè Volgograd @@ -3899,14 +3928,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Giờ Yakutsk - Giờ Chuẩn Yakutsk + Giờ chuẩn Yakutsk Giờ mùa hè Yakutsk Giờ Yekaterinburg - Giờ Chuẩn Yekaterinburg + Giờ chuẩn Yekaterinburg Giờ mùa hè Yekaterinburg @@ -3962,10 +3991,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ #,##0.00 ¤ #,##0.00 ¤ - - #,##0.00 ¤ - #,##0.00 - @@ -4044,10 +4069,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Đô la Australia + đô la Australia AU$ Florin Aruba + florin Aruba Đồng Manat của Azerbaijan (1993–2006) @@ -4072,6 +4099,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Taka Bangladesh + taka Bangladesh Đồng Franc Bỉ (có thể chuyển đổi) @@ -4152,6 +4180,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Ngultrum Bhutan + ngultrum Bhutan Đồng Kyat Miến Điện @@ -4409,6 +4438,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rupee Ấn Độ + rupee Ấn Độ Dinar Iraq @@ -4416,6 +4446,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rial Iran + rial Iran Króna Iceland @@ -4489,6 +4520,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rupee Sri Lanka + rupee Sri Lanka Đô la Liberia @@ -4496,6 +4528,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Loti Lesotho + loti Lesotho Litas Lít-va @@ -4515,7 +4548,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lats Latvia - lats Lativia + lats Latvia Đồng Rúp Latvia @@ -4592,6 +4625,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rufiyaa Maldives + rufiyaa Maldives Kwacha Malawi @@ -4645,6 +4679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rupee Nepal + rupee Nepal Đô la New Zealand @@ -4679,6 +4714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Rupee Pakistan + rupee Pakistan Zloty Ba Lan @@ -4765,9 +4801,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Leone Sierra Leone + leone Sierra Leone Leone Sierra Leone (1964—2022) + leone Sierra Leone (1964—2022) Shilling Somali @@ -4946,7 +4984,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guilder Caribe - Guilder Caribe + guilder Caribe Quyền Rút vốn Đặc biệt @@ -5028,8 +5066,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Đồng Đô la Zimbabwe (1980–2008) - Zimbabwean Gold - Zimbabwean Gold + Zimbabwe Gold + Zimbabwe gold Đồng Đô la Zimbabwe (2009) @@ -5043,7 +5081,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}-{1} - {0} ngày + Bạn có {0} mặt hàng trong giỏ hàng; bạn có muốn mua nó? + Bạn có {0} mặt hàng trong giỏ hàng; bạn có muốn mua chúng? + Rẽ phải tại lối rẽ thứ {0}. Theo lối rẽ thứ {0} bên phải. @@ -5210,18 +5250,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ carat {0} carat - - phần - {0} phần - - - phần triệu - {0} phần triệu - {0} phần vạn + glucose {0} glucose @@ -5274,6 +5307,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ kilobit {0} kilobit + + tiếng + {0} tiếng + ampe {0} ampe @@ -5743,13 +5780,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ weber {0} weber - - ánh sáng - {0} ánh sáng - - - {0} phần tỷ - phương trời {0} Đông @@ -5850,8 +5880,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}/ngày - giờ - {0} giờ + tiếng + {0} tiếng {0}/giờ @@ -6126,21 +6156,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}ha - - phần - {0} phần - - - phần triệu - {0} phần triệu - ‱ - - Glc - {0} Glc - PB @@ -6148,6 +6166,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ B {0} B + + tiếng + {0} tiếng + eV @@ -6212,10 +6234,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}hp - - of Hg - {0} of Hg - {0}" Hg @@ -6232,62 +6250,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}L {0}/l - - {0} fl oz m. - {0}/gal {0} fl ozIm - - {0} sr - - - {0} kat - - - {0} C - - - {0} F - - - {0} H - - - {0} S - - - cal-IT - {0} cal-IT - - - {0} Bq - - - {0} Sv - - - {0} Gy - - - {0} kgf - - - {0} T - - - {0} Wb - - - ánh sáng - {0} ánh sáng - - - {0} phần tỷ - diff --git a/make/data/cldr/common/main/vo.xml b/make/data/cldr/common/main/vo.xml deleted file mode 100644 index 7fe59abfa44a..000000000000 --- a/make/data/cldr/common/main/vo.xml +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - Deutänapük - Linglänapük - Sperantapük - Spanyänapük - Fransänapük - Litaliyänapük - Yapänapük - Portugänapük - Rusänapük - Volapük - Tsyinänapük - - - Brasilän - Tsyinän - Deutän - Spanyän - Fransän - Regän Pebalöl - Grusiyän - Grikän - Lindän - Litaliyän - Yapän - Mäxikän - Naureän - Portugän - Palauäns - Rusän - Lamerikän - - - Pük: {0} - Topäd: {0} - - - - [a ä b c d e f g h i j k l m n o ö p r s t u ü v x y z] - [q w] - [A Ä B C D E F G H I J K L M N O Ö P R S T U Ü V X Y Z] - [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” « » ( ) \[ \] \{ \} § @ * / \& #] - … {0} - {0} … {1} - - - - - - - - G y MMMM'a' 'd'. d'id' - GyMMMMd - - - - - G y MMMM d - - - - - G y MMM. d - - - - - G y-MM-dd - - - - - - - - - yan - feb - mäz - prl - may - yun - yul - gst - set - ton - nov - dek - - - yanul - febul - mäzul - prilul - mayul - yunul - yulul - gustul - setul - tobul - novul - dekul - - - - - yan - feb - mäz - prl - may - yun - yul - gst - set - tob - nov - dek - - - Y - F - M - P - M - Y - Y - G - S - T - N - D - - - - - - - su. - mu. - tu. - ve. - dö. - fr. - zä. - - - sudel - mudel - tudel - vedel - dödel - fridel - zädel - - - - - Su - Mu - Tu - Ve - Dö - Fr - Zä - - - S - M - T - V - D - F - Z - - - - - - - Yf1 - Yf2 - Yf3 - Yf4 - - - 1id yelafoldil - 2id yelafoldil - 3id yelafoldil - 4id yelafoldil - - - - - - b. t. kr. - p. t. kr. - - - - - - y MMMM'a' 'd'. d'id' - yMMMMd - - - - - y MMMM d - - - - - y MMM. d - - - - - y-MM-dd - - - - - - - HH:mm:ss zzzz - - - - - HH:mm:ss z - - - - - HH:mm:ss - - - - - HH:mm - - - - - - - - Epoche - - - yel - äyelo - ayelo - oyelo - - - mul - ämulo - amulo - omulo - - - vig - ävigo - avigo - ovigo - - - Tag - edelo - ädelo - adelo - odelo - udelo - - - vodabel - - - delalaf - - - düp - - - minut - - - sekun - - - zon - - - - - - - yels - yel {0} - yels {0} - - - muls - mul {0} - muls {0} - - - vigs - - - dels - - - - - - si:s - - - diff --git a/make/data/cldr/common/main/vo_001.xml b/make/data/cldr/common/main/vo_001.xml deleted file mode 100644 index f47ef1569b2c..000000000000 --- a/make/data/cldr/common/main/vo_001.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/wa.xml b/make/data/cldr/common/main/wa.xml deleted file mode 100644 index 4527e6fd93ea..000000000000 --- a/make/data/cldr/common/main/wa.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - walon - - - - [aàâå æ b cç d eéèêë f g h iîï j k l m n oô œ p q r s t uùûü v w x yÿ z] - [áäãā ē íìī ñ óòöø úǔ] - [A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] - [\- ‐‑ – — , ; \: ! ? . … ’ "“” « » ( ) \[ \] § @ * / \& # † ‡] - - diff --git a/make/data/cldr/common/main/wa_BE.xml b/make/data/cldr/common/main/wa_BE.xml deleted file mode 100644 index 334031616ef5..000000000000 --- a/make/data/cldr/common/main/wa_BE.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/wae.xml b/make/data/cldr/common/main/wae.xml index ef459589d07a..cf770fdb5916 100644 --- a/make/data/cldr/common/main/wae.xml +++ b/make/data/cldr/common/main/wae.xml @@ -945,6 +945,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d. MMM y + + {0} – {1} + {0} – {1} + {0} – {1} + h B – h B h – h B diff --git a/make/data/cldr/common/main/wal.xml b/make/data/cldr/common/main/wal.xml deleted file mode 100644 index fcad1b582696..000000000000 --- a/make/data/cldr/common/main/wal.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - ዐርቢኛ - ጀርመን - እንግሊዝኛ - ስፓኒሽ - ፈረንሳይኛ - ሐንድኛ - ጣሊያንኛ - ጃፓንኛ - ፖርቱጋሊኛ - ራሽኛ - ወላይታቱ - ቻይንኛ - - - - - - አንዶራ - የተባበሩት አረብ ኤምሬትስ - አልባኒያ - አርሜኒያ - አርጀንቲና - ኦስትሪያ - አውስትሬሊያ - አዘርባጃን - ቦስኒያ እና ሄርዞጎቪኒያ - ባርቤዶስ - ቤልጄም - ቡልጌሪያ - ባህሬን - ቤርሙዳ - ቦሊቪያ - ብራዚል - ቡህታን - ቤላሩስ - ቤሊዘ - ኮንጎ - የመካከለኛው አፍሪካ ሪፐብሊክ - ስዊዘርላንድ - ቺሊ - ካሜሩን - ቻይና - ኮሎምቢያ - ኬፕ ቬርዴ - ሳይፕረስ - ቼክ ሪፑብሊክ - ጀርመን - ዴንማርክ - ዶሚኒካ - ዶሚኒክ ሪፑብሊክ - አልጄሪያ - ኢኳዶር - ኤስቶኒያ - ግብጽ - ምዕራባዊ ሳህራ - ኤርትራ - ስፔን - ኢትዮጵያ - ፊንላንድ - ፊጂ - ሚክሮኔዢያ - ፈረንሳይ - እንግሊዝ - ጆርጂያ - የፈረንሳይ ጉዊአና - ጋምቢያ - ጊኒ - ኢኳቶሪያል ጊኒ - ግሪክ - ቢሳዎ - ጉያና - ሆንግ ኮንግ - ክሮኤሽያ - ሀይቲ - ሀንጋሪ - ኢንዶኔዢያ - አየርላንድ - እስራኤል - ህንድ - ኢራቅ - አይስላንድ - ጣሊያን - ጃማይካ - ጆርዳን - ጃፓን - ካምቦዲያ - ኮሞሮስ - ሰሜን ኮሪያ - ደቡብ ኮሪያ - ክዌት - ሊባኖስ - ሊቱዌኒያ - ላትቪያ - ሊቢያ - ሞሮኮ - ሞልዶቫ - ማከዶኒያ - ሞንጎሊያ - ማካዎ - ሞሪቴኒያ - ማልታ - ማሩሸስ - ሜክሲኮ - ማሌዢያ - ናሚቢያ - ኒው ካሌዶኒያ - ናይጄሪያ - ኔዘርላንድ - ኖርዌ - ኔፓል - ኒው ዚላንድ - ፔሩ - የፈረንሳይ ፖሊኔዢያ - ፓፑዋ ኒው ጊኒ - ፖላንድ - ፖርታ ሪኮ - ሮሜኒያ - ራሺያ - ሳውድአረቢያ - ሱዳን - ስዊድን - ሲንጋፖር - ስሎቬኒያ - ስሎቫኪያ - ሴኔጋል - ሱማሌ - ሲሪያ - ቻድ - የፈረንሳይ ደቡባዊ ግዛቶች - ታይላንድ - ታጃኪስታን - ምስራቅ ቲሞር - ቱኒዚያ - ቱርክ - ትሪኒዳድ እና ቶባጎ - ታንዛኒያ - ዩጋንዳ - አሜሪካ - ዩዝበኪስታን - ቬንዙዌላ - የእንግሊዝ ድንግል ደሴቶች - የአሜሪካ ቨርጂን ደሴቶች - የመን - ደቡብ አፍሪካ - ዛምቢያ - - - - [፟ ᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሀ ሁ ሂ ሃ ሄ ህ ሆ ሇ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ⶀ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ᎀ ᎁ ᎂ ᎃ ⶁ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ⶂ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ⶃ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ⶄ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቇ ቈ ቊ ቋ ቌ ቍ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ቘ ቚ ቛ ቜ ቝ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ᎄ ᎅ ᎆ ᎇ ⶅ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ⶆ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ⶇ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኇ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ⶈ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ ⶉ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ⶊ ከ ኩ ኪ ካ ኬ ክ ኮ ኯ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ዀ ዂ ዃ ዄ ዅ ወ ዉ ዊ ዋ ዌ ው ዎ ዏ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ⶋ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ዯ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ⶎ ገ ጉ ጊ ጋ ጌ ግ ጎ ጏ ጐ ጒ ጓ ጔ ጕ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ⶏ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ⶐ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ⶑ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፇ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ᎈ ᎉ ᎊ ᎋ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ] - [ሀ ለ ⶀ መ ᎀ ᎁ ᎃ ⶁ ረ ⶂ ሰ ሸ ⶄ ቈ ቐ ቘ ᎄ ᎅ ᎇ ⶅ ቨ ⶆ ቸ ኀ ኈ ነ ኘ ⶉ ⶊ ከ ኰ ዀ ወ ዐ ⶋ ዠ ደ ⶌ ዸ ጀ ⶎ ጐ ጘ ⶓ ⶕ ⶖ ⶏ ጨ ⶐ ⶑ ጸ ፈ ᎈ ᎉ ᎋ ፐ ᎍ ᎎ ᎏ ፘ ⶠ ⶢ ⶣ ⶤ ⶦ ⶨ ⶩ ⶫ ⶬ ⶮ ⶰ ⶱ ⶳ ⶴ ⶶ ⶸ ⶹ ⶻ ⶼ ⶾ ⷀ ⷁ ⷃ ⷄ ⷆ ⷈ ⷉ ⷋ ⷌ ⷎ ⷐ ⷑ ⷓ ⷔ ⷖ ⷘ ⷙ ⷛ ⷜ ⷝ] - - - - - - - - EEEE፥ dd MMMM ጋላሳ y G - GyMMMMEEEEdd - - - - - dd MMMM y G - GyMMMMdd - - - - - dd-MMM-y G - GyMMMdd - - - - - dd/MM/yy GGGGG - GGGGGyyMMdd - - - - - - - - - ጃንዩ - ፌብሩ - ማርች - ኤፕረ - ሜይ - ጁን - ጁላይ - ኦገስ - ሴፕቴ - ኦክተ - ኖቬም - ዲሴም - - - ጃንዩወሪ - ፌብሩወሪ - ማርች - ኤፕረል - ሜይ - ጁን - ጁላይ - ኦገስት - ሴፕቴምበር - ኦክተውበር - ኖቬምበር - ዲሴምበር - - - - - ጃ - ፌ - ማ - ኤ - ሜ - ጁ - ጁ - ኦ - ሴ - ኦ - ኖ - ዲ - - - - - - - ወጋ - ሳይኖ - ማቆሳኛ - አሩዋ - ሃሙሳ - አርባ - ቄራ - - - - - ወ - ሳ - ማ - አ - ሃ - አ - ቄ - - - - - - - ማለዶ - ቃማ - - - - - - አዳ ዎዴ - ግሮተታ ላይታ - - - - - - EEEE፥ dd MMMM ጋላሳ y G - GyMMMMEEEEdd - - - - - dd MMMM y - yMMMMdd - - - - - dd-MMM-y - yMMMdd - - - - - dd/MM/yy - yyMMdd - - - - - - - h:mm:ss a zzzz - ahmmsszzzz - - - - - h:mm:ss a z - ahmmssz - - - - - h:mm:ss a - ahmmss - - - - - h:mm a - ahmm - - - - - - - - - ethi - - - ' - - - - - ¤#,##0.00 - - - - - - የብራዚል ሪል - - - የቻይና ዩአን ረንሚንቢ - - - የኢትዮጵያ ብር - Br - - - አውሮ - - - የእንግሊዝ ፓውንድ ስተርሊንግ - - - የሕንድ ሩፒ - - - የጃፓን የን - - - የራሻ ሩብል - - - የአሜሪካን ዶላር - - - - diff --git a/make/data/cldr/common/main/wal_ET.xml b/make/data/cldr/common/main/wal_ET.xml deleted file mode 100644 index b49a9579eeeb..000000000000 --- a/make/data/cldr/common/main/wal_ET.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/wbp.xml b/make/data/cldr/common/main/wbp.xml deleted file mode 100644 index e92e37c03a21..000000000000 --- a/make/data/cldr/common/main/wbp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - Yinkirliji - Warlpiri - - - - [a d g i j k l m n p r t u w y] - [b c e f h o q s v x z] - [J K L {LY} M N {NG} {NY} P R {RD} {RL} {RN} {RR} {RT} T W Y] - - diff --git a/make/data/cldr/common/main/wbp_AU.xml b/make/data/cldr/common/main/wbp_AU.xml deleted file mode 100644 index b6e970d7e0ee..000000000000 --- a/make/data/cldr/common/main/wbp_AU.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/make/data/cldr/common/main/wo.xml b/make/data/cldr/common/main/wo.xml index 52efbd0085db..10a8e2eb4b2c 100644 --- a/make/data/cldr/common/main/wo.xml +++ b/make/data/cldr/common/main/wo.xml @@ -496,6 +496,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Arminaatu Gregoriyee Gregorian ISO-8601 Calendar + Griogairianach SSO (Toftalin wiñ gën a xam) Njàng miir Siifari Tugal @@ -785,6 +786,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM y MMMM y + d MMMM y + EEE, d MMMM y QQQ y QQQQ y @@ -1207,16 +1210,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Dëkk buñ xamul - + - Waxtu ete bu Grande Bretagne - - - - - waxtu Irlande + Jamonoy Acre + Acre waxtu buñ miin + Waxtu ete bu Acre - + waxtu Afganistan @@ -1392,6 +1392,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasilia summer time + + + Waxtu Grande Bretagne + Waxtu ete bu Grande Bretagne + + Brunei Darussalam @@ -1565,6 +1571,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic GMT (waxtu Greenwich) + + + Àm Ghraonlainn + Àm Coitcheann Ghraonlainn + Àm Samhraidh Ghraonlainn + + waxtu penku Greenland @@ -1591,7 +1604,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Waxtu buñ jagleel Hawaii-Aleutian + Waxtu Hawaii @@ -1652,6 +1665,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waxtu bëccëg ci Iran + + + Waxtu Irlande + Waxtu estàndaaru Irlande + + Waxtu rkutsk @@ -1673,6 +1692,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Japon waxtu bëccëg + + + Waxtu Kamchatka + Kamchatka waxtu + Jamonoy ete ci Kamchatka + + Waxtu Kazakhstaan @@ -1935,11 +1961,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sakhalin Sakhalin + + + Waxtu Samara + Samara Waxtu + Waxtu été bu Samara + + - waxtu Samoa Samoa Standard Time - Samoa waxtu bëccëg @@ -2006,6 +2037,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Waxtu Chuuk + + + Waxtu Turki + Jamonoy Turki + Jamonoy ete ci Turki + + Waxtu Turkmenistan @@ -2025,6 +2063,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Uruguay waxtu ete + + + Waxtu Urumqi + + Waxtu Ouzbékistan @@ -2741,7 +2784,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gildiye Karayib - Gildiye Karayib Franc CFA bu Afrik Sowwu-jant @@ -2767,13 +2809,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Zimbabwean ZiG - Zimbabwean ZiG ⩾{0} + {0} fan Jël {0} ci ndeyjoor. diff --git a/make/data/cldr/common/main/xh.xml b/make/data/cldr/common/main/xh.xml index c1b56890c708..630634fcfa6c 100644 --- a/make/data/cldr/common/main/xh.xml +++ b/make/data/cldr/common/main/xh.xml @@ -13,23 +13,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic IsiBhulu + IsiAkan IsiAmharic Isi-Arabhu Isi-Arabhu (Sale mihla) IsiAssamese + IsiAsturian Isi-Azerbaijani + IsiBashkir + IsiBaluchi Isi-Belarusian Isi-Bulgaria + IsiHaryanvi + IsiBhojpuri + IsiAnii IsiBangla IsiBreton + IsiBodo Isi-Bosnia Isi-Calatan + IsiCebuano + IsiCherokee Isi-Czech + IsiSwampy Cree + IsiChuvash Isi-Welsh Isi-Danish IsiJamani IsiJamani Sase-Austria IsiJamani Esiyi-High Swiss + IsiDogri + IsiLower Sorbian + IsiEwe Isi-Greek IsiNgesi IsiNgesi Sase-Australia @@ -46,6 +61,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Isi-Estonian Isi-Basque Isi-Persia + IsiFula Isi-Finnish Isi-Taglog Isi-Faroese @@ -54,59 +70,96 @@ CLDR data files are interpreted according to the LDML specification (http://unic IsiFrentshi SaseSwitzerland Isi-Frisian Isi-Irish + IsiGa Scots Gaelic Isi-Galician Guarani Isi-Gujarati + IsiHausa Isi-Hebrew IsiHindi IsiHindi (Latin) IsiHinglish Isi-Croatia + IsiUpper Sorbian Isi-Hungarian IsiArmenia Isi-Interlingua Isi-Indonesia Isi-Interlingue + Isi-Igbo + IsiSichuan Yi Isi-Icelandic IsiTaliyane IsiJapan Isi-Javanese Isi-Georgia + IsiKabuverdianu + IsiKaingang + IsiKazakh IsiCambodia Isi-Kannada Isi-Korean + IsiKonkani + IsiKashmiri IsiKurdish + IsiKurdish + IsiKurmanji + IsiKuvi IsiKyrgz Isi-Latin + IsiLuxembourgish + IsiLigurian + IsiLombard Iilwimi IsiLoathian Isi-Lithuanian Isi-Latvian + IsiMaithili + IsiMāori Isi-Macedonian Isi-Malayalam IsiMongolian + IsiManipuri Isi-Marathi Isi-Malay Isi-Maltese + Iilwimi Ezininzi + IsiBurmese + IsiLow German Isi-Nepali IsiDatshi IsiFlemish Isi-Norwegia (Nynorsk) Isi-Norwegian + IsiN’Ko + IsiPedi Iso-Occitan + IsiOromo Oriya Isi-Punjabi + IsiNigerian Pidgin Isi-Polish + IsiPiedmontese + IsiPrussian IsiPashto IsiPhuthukezi IsiPhuthukezi SaseBrazil IsiPhuthukezi SasePortugal + IsiQuechua + IsiRajasthani + IsiRomansh Isi-Romanian Isi-Russian + IsiKinyarwanda IsiSanskrit + IsiYakut + IsiSantali + IsiSardinian + IsiSicilian IsiSindhi Serbo-Croatian + IsiShan Isi-Sinhalese Isi-Slovak Isi-Slovenian @@ -117,22 +170,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic Isi-Sudanese Isi-Swedish Isi-Swahili + IsiSyriac + IsiSilesian Isi-Tamil Isi-Telegu + IsiTajik Isi-Thai Isi-Tigrinya IsiTurkmen Klingon + IsiTswana + IsiTonga Isi-Turkish + IsiTatar Twi + IsiTuvinian Isi Uighur Isi-Ukranian Ulwimi olungaziwayo IsiUrdu Isi-Uzbek + IsiVenetian Isi-Vietnamese + IsiMakhuwa + IsiWolof IsiXhosa + IsiKangri Yiddish + IsiYoruba + IsiNheengatu + IsiCantonese + IsiTshayina, isiCantonse + IsiZhuang IsiMandarin IsiTshayina, IsiMandarin IsiTshayina Esenziwe Lula @@ -140,18 +209,68 @@ CLDR data files are interpreted according to the LDML specification (http://unic IsiTshayina Esiqhelekileyo IsiMandarin Esiqhelekileyo IsiZulu + Akukho Khontenti + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -466,10 +585,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic EZimbabwe Ingingqi Engaziwayo + + Khalenda + Ungahoyi Ukuhlela Ngeesimboli + Ukihlela Okubuyela Umva Ngobukhulu + Ukuhlel Ngokoonobumba Abancinci/Abakhulu + Unobumba omkhulu + + Ikhalenda yamaBhuda + EyamaBhuda + Ikhalenda yamaTshayina + IsiTshayina + I-Coptic Calendar + I-Coptic + IKhalenda yesiDangi + IsiDangi + I-Ethiopic Calendar + I-Ethiopic + I-Ethiopic Amete Alem Calendar + I-Ethiopic Amete Alem Ngokwekhalenda KaGregorian IGregorian + IKhalenda yamaHebhere + IsiHebere + EyeIndian National + I-Hijri Calendar + I-Hijri + I-Hijri Calendar (tabular, civil epoch) + I-Hijri (tabular, civil epoch) + I-Hijri, Saudi Arabia sighting + I-Hijri (tabular, astronomical epoch) + I-Hijri Calendar (Umm al-Qura) + I-Hijri (Umm al-Qura) Ikhalenda kaGregorian + IGregorian + IJapanese Calendar + IJapanese + I-Persian Calendar + I-Persian + I-Minguo Calendar + -Minguo + Unobumba omncinci + Unobumba omncinci + Unobumba omkhulu Standard Sort Order Eqhelekileyo Western Digits @@ -565,6 +724,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y G + + {0}–{1} + {0}–{1} + d – d @@ -627,6 +790,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, MMM d – E, MMM d E, MMM d – E, MMM d + + MMMM d – d + y – y G @@ -682,20 +848,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Nov Dis - - J - F - M - A - M - J - J - A - S - O - N - D - Janyuwari Februwari @@ -882,6 +1034,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -939,6 +1094,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM d, y E, MMM d, y MMMM y + MMMM d, y + EEE, MMMM d, y QQQ y QQQQ y 'iveki' w 'ka' Y @@ -1102,56 +1259,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic kule iCawa kwiCawa ezayo - - kwiCawa edlulileyo - kule iCawa - kwiCawa ezayo - - - kwiCawa edlulileyo - kule iCawa - kwiCawa ezayo - uMvulo odlulileyo ngalo Mvulo ngoMvulo ozayi - - uMvulo odlulileyo - ngalo Mvulo - ngoMvulo ozayi - - - uMvulo odlulileyo - ngalo Mvulo - ngoMvulo ozayi - ngoLwesibini odlulileyo ngalo uLwesibini ngoLwesibini ozayo - - ngoLwesibini odlulileyo - ngalo uLwesibini - ngoLwesibini ozayo - - - ngoLwesibini odlulileyo - ngalo uLwesibini - ngoLwesibini ozayo - ngoLwesithathu odlulileyo ngalo Lwesithathu ngoLwesithathu ozayo - - ngoLwesithathu odlulileyo - ngalo Lwesithathu - ngoLwesithathu ozayo - ngoLwesithathu odlulileyo ngalo Lwesithathu @@ -1162,46 +1284,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic ngalo Lwesine ngoLwesine ozayo - - ngoLwesine odlulileyo - ngalo Lwesine - ngoLwesine ozayo - - - ngoLwesine odlulileyo - ngalo Lwesine - ngoLwesine ozayo - ngoLwesihlanu odlulileyo ngalo Lwesihlanu ngoLwesihlanu ozayo - - ngoLwesihlanu odlulileyo - ngalo Lwesihlanu - ngoLwesihlanu ozayo - - - ngoLwesihlanu odlulileyo - ngalo Lwesihlanu - ngoLwesihlanu ozayo - ngoMgqibelo odlulileyo ngalo Mgqibelo ngoMgqibelo ozayo - - ngoMgqibelo odlulileyo - ngalo Mgqibelo - ngoMgqibelo ozayo - - - ngoMgqibelo odlulileyo - ngalo Mgqibelo - ngoMgqibelo ozayo - Kusasa/Emva kwemini @@ -1251,16 +1343,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Indawo Engaziwayo - - - British Summer Time - - - - - Irish Standard Time - - ICanton Island @@ -1279,6 +1361,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ho Chi Minh City + + + Acre Time + Acre Standard Time + Acre Summer Time + + Afghanistan Time @@ -1454,6 +1543,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Brasilia Summer Time + + + Ixesha laseBritane + British Summer Time + + Brunei Darussalam Time @@ -1627,6 +1722,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Greenwich Mean Time + + + Greenland Time + Greenland Standard Time + Greenland Summer Time + + East Greenland Time @@ -1659,7 +1761,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Hawaii-Aleutian Time - Hawaii-Aleutian Standard Time + I-Hawaii-Aleutian Standard Time Hawaii-Aleutian Daylight Time @@ -1714,6 +1816,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Iran Daylight Time + + + Ixesha lase-Ireland + Irish Standard Time + + Irkutsk Time @@ -1735,6 +1843,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Japan Daylight Time + + + Kamchatka Time + Kamchatka Standard Time + Kamchatka Summer Time + + Kazakhstan Time @@ -1997,11 +2112,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sakhalin Summer Time + + + Samara Time + Samara Standard Time + Samara Summer Time + + - Samoa Time Samoa Standard Time - Samoa Daylight Time @@ -2068,6 +2188,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Chuuk Time + + + Türkiye Time + Türkiye Standard Time + Türkiye Summer Time + + Turkmenistan Time @@ -2087,6 +2214,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Uruguay Summer Time + + + Ürümqi Time + + Uzbekistan Time @@ -2192,17 +2324,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic ¤ 000M ¤000M ¤ 000M - ¤0G + ¤0B ¤ 0G - ¤0G + ¤0B ¤ 0G - ¤00G + ¤00B ¤ 00G - ¤00G + ¤00B ¤ 00G - ¤000G + ¤000B ¤ 000G - ¤000G + ¤000B ¤ 000G ¤0T ¤ 0T @@ -2985,8 +3117,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ICaribbean guilder - ICaribbean guilder - ICaribbean guilder ICg. diff --git a/make/data/cldr/common/main/xnr.xml b/make/data/cldr/common/main/xnr.xml index 6b4f0af5041f..427cf8dde7d0 100644 --- a/make/data/cldr/common/main/xnr.xml +++ b/make/data/cldr/common/main/xnr.xml @@ -900,6 +900,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic मानक सॉर्ट क्रम स्ट्रोक वर्गीकरण पारम्पारिक वर्गीकरण + 12 घंटेयां दी प्रणाली + 24 घंटेयां दी प्रणाली 12 घंटेयां दी प्रणाली (0–11) 12 घंटेयां दी प्रणाली (1–12) 24 घंटेयां दी प्रणाली (0–23) @@ -1317,6 +1319,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Y दा सप्ताह w + + {0} – {1} + {0}–{1} + {0}–{1} + M–M @@ -2199,9 +2206,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic लिब्रेविले - - ब्रिटिश दी तोंदिया दा टैम - लंदन @@ -2292,9 +2296,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic जयापुरा - - आइरिश दा मानक टैम - डबलिन @@ -3162,6 +3163,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ब्राज़ीलिया दी तोंदिया दा टैम + + + ब्रिटिश दी तोंदिया दा टैम + + ब्रूनेई दारूस्सलम दा टैम @@ -3422,6 +3428,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic ईरान दे ध्याड़े दे उजाले दा टैम + + + आइरिश दा मानक टैम + + इर्कुत्स्क दा टैम @@ -3702,9 +3713,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - समोआ दा टैम समोआ दा मानक टैम - समोआ दे ध्याड़े दे उजाले दा टैम diff --git a/make/data/cldr/common/main/yi.xml b/make/data/cldr/common/main/yi.xml index 7e5ca6c0e2c8..ce1d71786c37 100644 --- a/make/data/cldr/common/main/yi.xml +++ b/make/data/cldr/common/main/yi.xml @@ -705,6 +705,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic {1} {0} + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} M–M diff --git a/make/data/cldr/common/main/yo.xml b/make/data/cldr/common/main/yo.xml index 095313d03268..b3cf794a540f 100644 --- a/make/data/cldr/common/main/yo.xml +++ b/make/data/cldr/common/main/yo.xml @@ -328,6 +328,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Èdè Pijini ti Naijiriya Èdè Piji Èdè Póláǹdì + Èdè Pídímọ̀ntísì Èdè Maliseti-Pasamkodi Púrúṣíànù Páshítò @@ -625,7 +626,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kuusita Ríkà Kúbà Etíokun Kápé féndè - Curaçao + Kírósáwù Erékùsù Christmas Kúrúsì Ṣẹ́ẹ́kì @@ -835,7 +836,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Faniatu Wali ati futuna Samọ - ìsọ̀rọ̀sí irọ́ + Ìsọ̀rọ̀sí irọ́ Agbègbè irọ́ Kòsófò Yemeni @@ -853,15 +854,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kàlẹ́ńdà Ònà Ìgbekalẹ̀ owó + Fojú fo Títo Àmì + Títo Àmì Ohùn Láti Ẹ̀yìn + Ìṣètò Lẹ́tà ńlá/lẹ́tà kéreré + Títò nípasẹ̀ ṣíṣe ìyàtọ̀ láàárín àwọn lẹ́tà ńlá àti kékeré Ètò Ẹlẹ́sẹẹsẹ + Ètò tó ṣe déédéé + Ṣíṣètò nípasẹ̀ nọ́ńbà + Àtúntò ọ̀nà ìkọ̀wé/Lẹ́tà ńlá + Agbára Títo Owó + Ṣe àyípadà ibùdó + Ìyọkúrò Àlàfo Ìwé Atúmọ̀ Èdè Ìgbékalẹ̀ Ẹ̀mójì + Ọjọ́ kìíní ọ̀sẹ̀ + Àdàpọ̀ Òbíríkiti Wákàtí (12 vs 24) + Ọ̀nà Ìgbéwọlé + Àtẹ bọ́tìnì + púpọ̀ jùlọ tí a fojúfò Àra Ìda Ìlà Àwọn Ìdá Ìlà Láàárín Àwọn Ọ̀rọ̀ + Ṣe àyípadà àwọn Òfin Èto Ìdiwọ̀n + Ìwọ̀n Òṣùwọ̀n Àwọn nọ́ńbà + Agbègbè Fún Àfikún Dátà + Ṣe àyípadà Orísun + Ìpín Agbègbè Ìdá Gbólóhùn Lẹ́yìn Ìgékúrú + Ṣe àyípadà + Tí Ẹ̀rọ Túmọ̀ + Àkókò Agbègbè + Ẹ̀dà ìbílẹ̀ + Ìlò Àdáni + Ìyípadà Ílò Àdáni Kàlẹ́ńdà Buddhist @@ -880,13 +907,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ti Gregory Kàlẹ́ńdà Hébérù Hébérù + Ti orílẹ́-èdè India Kàlẹ́ńdà Lárúbáwá Híjìrì Kàlẹ́ńdà ti Musulumi Híjìrí (kàlẹ́ńdà oní-àtòkọ ti arà-ìlú) + Híjrí, rírí òṣùpá Saudi + Híjìrì (oní tábìlì, ìgbà ìbílẹ̀) Kàlẹ́ńdà Musulumi Híjìrí (Umm al-Qura) Kàlẹ́ńdà ISO-8601 + Ti Gregory Kàlẹ́ńdà ti Jàpánù Ti Japan Kàlẹ́ńdà Pásíànù @@ -897,15 +928,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ìṣirò owó Ònà ìgbekalẹ̀ owó tó jẹ́ àjùmọ̀lò Àjùmọ̀lò + Lẹ́tà kéreré + Lẹ́tà kéreré + Lẹ́tà ńlá + Ìbáramu + Ìwé atúmọ̀ èdè Ètò Ẹlẹ́sẹẹsẹ Àkùàyàn Unicode Unicode Àkùnyàn + Emoji + Àwon òfin Yúróòpù + Ìwé nọ́ńbà tẹlifóònù + Ìró ọ̀rọ̀ + Pinyin Ìṣàwárí Ète-Gbogbogbò Ṣàwárí + Kọ́ńsónáǹtì Kòríà àkọ́kọ́ Ìlànà Onírúurú Ètò Àjùmọ̀lò + Ilà + Ti ìbílẹ̀ + Ètò Ìkọ̀wé Orílẹ̀-Èdè Ṣáínà + Zhuyin + Owó + Díjíìtì + Àmì ìpín gbólóhùn + Àlàfo + Àmì + Gbogbo + Àwọn Lẹ́tà Ìpìlẹ̀ Nìkan + Ìpìlẹ̀, Àwọn àmì ohùn, Irú lẹ́tà, Àwọn oríṣi, Kana + Ìpìlẹ̀, Àwọn àmì ohùn + Ìpìlẹ̀, Àwọn àmì ohùn, Irú lẹ́tà, Àwọn oríṣi + Sí Ìwọ̀n fífẹ̀ kíkún + Ṣí Ààbọ̀ ìwọ́n fífẹ̀ Àkùnàyàn Ẹ̀mójì àtẹ̀jíṣẹ́ + Èto Wákàtí 12 + 12 + Èto Wákàtí 24 + 24 Èto Wákàtí 12 (0–11) 12 (0–11) Èto Wákàtí 12 (1–12) @@ -914,6 +976,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) Èto Wákàtí 24 (1–24) 24 (1–24) + Sún àwọn àyè, àmì ìpín gbólóhùn, gbogbo àmi + Sún àwọn àyè, àmì ìpín gbólóhùn + Sún àwọn àyè, àmì ìpín gbólóhùn + Sún àwọn àyè, àmì ìpín gbólóhùn, àmì tí kìí ṣe ti owó Àra Ìda Ìlà Títú Tó dẹ̀ Àra Ìda Ìlà Déédéé @@ -924,6 +990,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Pa gbogbo ẹ̀ mọ́ Déédéé Fi sílẹ̀ ní àpólà + Àtúnkọ àwọn lẹ́tà sí èdè mìíràn ti US BGN + Àtúnkọ àwọn lẹ́tà sí èdè mìíràn ti UN GEGN Èto Mẹ́tíríìkì Mẹ́tíríìkì Èto Ìdiwọ̀n Ọba @@ -932,54 +1000,89 @@ CLDR data files are interpreted according to the LDML specification (http://unic US àwọn díjítì Làrubáwá-Índíà Àwọn Díjíìtì Lárúbáwá-Índíà fífẹ̀ + Nọ́ńbà Lárúbáwá tó gbòòrò Àwọn nọ́ńbà Àmẹ́níà Àwọn Nọ́ńbà Kékèké ti Amẹ́ríkà + Lẹ́tà kékeré ti Àmẹ́níà Àwọn díjíìtì Báńgílà Àwọn díjíìtì Shakma Àwọn díjììtì Defanagárì Àwọn nọ́ńbà Ẹtiópíìkì + Ìṣúná Àwọn Díjíìtì Fífẹ̀-Ẹ̀kún + Ìwọ̀n fífẹ̀ kíkún Àwọn nọ́ńbà Jọ́jíà Àwọn nọ́ńbà Gíríìkì Àwọn Nọ́ńbà Gíríìkì Kékèké + Lẹ́tà kékéré ti Gíríìkì Àwọn díjíìtì Gùjárátì Àwọn Díjíìtì Gurumukì + kàlẹ́ńdà òṣùpá Han fún àwọn kàlẹ́ńdà ìbílẹ̀ Àwọn nọ́ńbà Dẹ́símà Ṣáìnà - Àwọn nọ́ńbà Ìrọ̀rùn ti Ṣáìnà + Ètò nọ́ńbà tí ó ń lo àwọn àwòrán ìṣirò tí ó jẹ́ ti èdè Ṣáínà gẹ́gẹ́ bí iye. + Àwọn nọ́ńbà Ìrọ̀rùn ti Ṣáínà Àwọn nọ́ńbà Ìṣúná Ìrọ̀rùn Ṣáìnà + Ìṣúná owó Ṣáínà ìrọ̀rùn Àwọn nọ́ńbà Ìbílẹ̀ Ṣáìnà Àwọn nọ́ńbà Ìṣúná Ìbílẹ̀ Ṣáìnà + Ìṣúná owó Ṣáínà ìbílẹ̀ Àwọn nọ́ńbà Hébérù Àwọn díjíìtì Jafaniisi Àwọn nọ́ńbà Jápànù Àwọn nọ́ńbà Ìṣúná Jàpáànù + Ìṣúná owó Jàpáànù + Ìlànà kíkọ nọ́ńbà ọdún àkọ́kọ́ ti Gannen Àwọn díjíìtì Kẹ́mẹ̀ Àwọn díjíìtì kanada + Ìkọ̀wé Tai Tham Tham (ti ìjọ Krístì) Àwọn díjíìtì Láó Díjíítì Ìwọ̀ Oòrùn + Matimátíìkì + Ilà méjì ti matimátíìkì + Ilà kan ti matimátíìkì + Sans-serif matimátíìkì tó nípọn + Sans-serif matimátíìkì Àwọn díjíìtì Málàyálámù Àwọn díjíìtì Mete Mayeki Àwọn díjíìtì Myánmarí + Èdè Ìbílẹ̀ Karen Ti Ìlà Oòrùn Myanmar + Myanmar Pao + Myanmar Shan + Myanmar Tai Laing + Àwọn Díjíìtì ìbílẹ̀ + Àwọn díjíìtì ìbílẹ̀ Àwọn díjíìtì Shiki Àwọn díjíìtì Òdíà + Tí wọ́n fa ilà yíká Àwọn díjíìtì Rómánù + Lẹ́tà ńlá ti Rómánù Àwọn díjíìtì Rómánù Kékeré + lẹ́tà kéreré ti Rómánù + Tí a pín sí ababa Àwọn díjíìtì Ìbílẹ̀ Támílù Àwọn díjíìtì Tàmílù + Támílù ìgbàlódé Àwọn díjíìtì Télúgù Àwọn díjíìtì Thai Àwọn díjíìtì Tibetán + Àwọn nọ́ńbà ìbìlẹ̀ Àwọn díjíìtì Fai Pípa Títàn + Ìtumọ̀ èdè Ẹ̀rọ tí a kò sọ ní pàtó + ẹ̀yà POSIX + + Pípa + Títàn + Mẹ́tíríìkì Èdè: {0} Ìṣọwọ́kọ̀wé: {0} - Àgbègbè: {0} + Agbègbè: {0} @@ -990,6 +1093,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + G dd-MM-y + + + + + + + - + + + + + + + - + + + @@ -1063,21 +1187,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic + M/y G d/M/y GGGGG + E, d/M/y G + MMM y G + d MMM y G h:mm a - M/d - E, M/d - E, MMM d - E, MMMM d + d/M + E, d/M + d MMM + E, d MMM + d MMMM + E, d MMMM y M/y - E, M/d/y + E, d/M/y MMM y - E, MMM d, y + E, d MMM y MMMM y QQQ y QQQQ y + y G + MM/y G + d/M/y G + E, d/M/y G + MMM y G + d MMM y G + E, d MMM y G + + + d–d MMMM + d MMMM – d MMMM + + + G MM-y – MM-y + G MM -y–MM-y + + + G -dd-MM -y– dd-MM-y + + @@ -1183,7 +1333,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Saju Kristi + Ṣáájú Kírístì Sáájú ìgbà mímọ̀ Lehin Kristi @@ -1244,6 +1394,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -1292,9 +1445,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic E, d E h:mm a E h:mm:ss a - MM-y G + M/y G d/M/y GGGGG E, d/M/y G + MMM y G + d MMM, y G + E, d MMM, y G + MMMM y G + d MMMM, y G + E, d MMMM, y G h:mm a h:mm:ss a h:mm:ss a v @@ -1304,7 +1463,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM d MMM, E d MMMM - d, MMMM E + E, d MMMM M/y d/M/y d/M/y, E @@ -1312,9 +1471,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic d MMM y E, d MMM , y MMMM y + d MMMM, y + E, d MMMM y QQQ y QQQQ y + + {1}, {0} + {0} {1} + {1}, {0} + y G – y G @@ -1325,16 +1491,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic M/y – M/y G - M/d/y – M/d/y G - M/d/y G – M/d/y G - M/d/y – M/d/y G - M/d/y – M/d/y G + d/M/y – d/M/y G + d/M/y G – d/M/y G + d/M/y – d/M/y G + d/M/y – d/M/y G - E, M/d/y – E, M/d/y G - E, M/d/y G – E, M/d/y G - E, M/d/y – E, M/d/y G - E, M/d/y – E, M/d/y G + E, d/M/y – E, d/M/y G + E, d/M/y G – E, d/M/y G + E, d/M/y – E, d/M/y G + E, d/M/y – E, d/M/y G MMM y G – MMM y G @@ -1342,16 +1508,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic MMM y – MMM y G - MMM d – d, y G - MMM d, y G – MMM d, y G - MMM d – MMM d, y G - MMM d, y – MMM d, y G + d–d, MMM y G + d MMM y G – d MMM y G + d MMM –d MMM y G + d MMM y – d MMM y G - E, MMM d – E, MMM d, y G - E, MMM d, y G – E, MMM d, y G - E, MMM d – E, MMM d, y G - E, MMM d, y – E, MMM d, y G + E, d MMM – E, d MMM y G + E, d MMM y G – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G h:mm a – h:mm a @@ -1363,20 +1529,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic h:mm–h:mm a v h:mm–h:mm a v + + d/M – d/M + d/M – d/M + MM-y – MM-y + + d/M/y – d/M/y + d/M/y – d/M/y + d/M/y – d/M/y + - E, dd-MM-y – E dd-MM-y, E + E, dd/MM/y – E, dd/MM/y, E + E, d/M/y – E, d/M/y - MMM d–d y - MMM d – MMM d y + d–d MMM y + d MMM – d MMM y - MMM d, E – MMM d, E y - MMM d, E – MMM d, E y - y MMM d y, E – MMM d, E y + E, d MMM – E, d MMM y + E, d MMM – E, d MMM y + E, d MMM y – E, d MMM y MMMM–MMMM y @@ -1388,7 +1564,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - sáà + Sáà + + + Sáà Sáà @@ -1415,6 +1594,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ìdá mẹ́rin + ìdámẹ́rin tó kọjá + ìdámẹ́rin yìí + ìdamẹ́ri tó ń bọ̀ Osù @@ -1453,10 +1635,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ọjọ́ tó wà láàárín ọ̀sẹ̀ - ọjọ́ inú ọṣẹ̀. + Ọjọ́ inú ọ̀ṣẹ̀ + + + Ọjọ́ inú ọ̀ṣẹ̀ - ọjọ́ ọṣẹ̀ inú oṣù + Ọjọ́ ọ̀ṣẹ̀ inú oṣù + + + Ọjọ́ ọ̀ṣẹ̀ inú oṣù + + + Ọjọ́ ọ̀ṣẹ̀ inú oṣù Ọjọ́ Àìkú tó kọjá @@ -1471,7 +1662,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic ọjọ́ Ajé tó kọjá ọjọ́ Ajé yìí - next Monday + Ọjọ́ ajé tó ń bọ̀ + + + ọjọ́ Ajé tó kọjá + ọjọ́ Ajé yìí + Ọjọ́ ajé tó ń bọ̀ + + + ọjọ́ Ajé tó kọjá + ọjọ́ Ajé yìí + Ọjọ́ ajé tó ń bọ̀ Ìṣẹ́gun tókọ́já @@ -1623,7 +1824,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic WAT{0} - WAT Ìgbà {0} {0} Àkókò ojúmọmọ {0} Ìlànà Àkókò @@ -1746,11 +1946,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ìlú Santo Domigo - - - Àkókò Sọmà Gẹẹsi - - ìlú Grenada @@ -1778,11 +1973,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ìlú Port-au-Prince - - - Àkókò Àfẹnukò Airiisi - - ìlú Jamaikà @@ -1957,6 +2147,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ilu Ho Chi Minh + + + Àkókò Ékà + Àkókò Ékà Àfẹnukò + Àkókò Ékà Ìgbà ẹ̀rùn + + Àkókò Afghanistan @@ -2132,6 +2329,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Aago Soma Brasilia + + + Àkọ́kọ̀ ilẹ̀ Gẹ̀ẹ́sì + Àkókò Ẹ̀rùn ilẹ̀ Gẹẹsi + + Brunei Darussalam Time @@ -2302,7 +2505,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic - Greenwich Mean Time + Àkókò Greenwich + + + + + Àkókò Greenland + Àkókò Àfenukò Greenland + Ìgbà Ẹ̀rùn Greenland @@ -2337,7 +2547,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Hawaii-Aleutian - Àkókò Àfẹnukò Hawaii-Aleutian + Àkókò Àfẹnukò ti Hawaii-Aleutian Àkókò Ojúmọmọ Hawaii-Aleutian @@ -2351,8 +2561,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Hofidi - Àkókò Ìfẹnukòsí Hofidi - Àkókò Sọmà Hofidi + Àkókò Ìfẹnukò Hofidi + Àkókò Ìgbà Ẹ̀rùn Hofidi @@ -2392,6 +2602,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Ojúmọmọ Irani + + + Àkókò orílẹ́-èdè Ireland + Àkókò Àfẹnukò orílẹ́-èdè Ireland + + Àkókò Íkósíkì @@ -2413,6 +2629,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sọmà Japan + + + Àkókò Kamchatka + Àkókò Kamchatka Àfẹnukò + Àkókò Kamchatka Ìgbà Ẹrùn + + Aago Kasasitáànì @@ -2675,11 +2898,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sọmà Sakhalin + + + Àkókò Sàmárà + Àkókò Sàmárà Àfẹnukò + Àkókò Ìgbà ẹ̀rùn Sàmárà + + - Àkókò Samoa Àkókò Àfẹnukò Samoa - Àkókò Ojúmọmọ Samoa @@ -2746,6 +2974,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Chuuk + + + Àkókò Tọ́kì + Àkókò Tọ́kì Àfẹnukò + Àkókò Ìgbàẹ̀rùn Tọ́kì + + Àkókò Turkimenistani @@ -2765,6 +3000,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic Aago Soma Uruguay + + + Àkókò Ürümqi + + Àkókò Usibekistani @@ -3465,7 +3705,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Owó ìlú Kùrásọ̀ àti Saint Mátìnì - Owó ìlú Kùrásọ̀ àti Saint Mátìnì Faransì ìwọ̀-oorùn Afíríkà @@ -3496,7 +3735,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Owó ìlú Sìnbábúwè - Owó ìlú Sìnbábúwè @@ -3612,10 +3850,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic àwọ́n ohun {0} àwon ohun - - ìpín - ìpín {0} - {0} ìdákan nínú ẹgbẹ̀rún @@ -4090,10 +4324,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}ohun - - ìpín - ìpín {0} - {0}ppm @@ -4103,9 +4333,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}mol - - Glc - {0}L/km @@ -4481,9 +4708,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}àmì ìdásímérin - - cal-IT - {0}ìmọ́lẹ̀ diff --git a/make/data/cldr/common/main/yo_BJ.xml b/make/data/cldr/common/main/yo_BJ.xml index 327fd2d80812..f2494ca4fc66 100644 --- a/make/data/cldr/common/main/yo_BJ.xml +++ b/make/data/cldr/common/main/yo_BJ.xml @@ -49,6 +49,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Sháńbálà Kɔdishì Èdè Kɔ́dìshì + Èdè Kùmáǹjì Èdè Kɔ́nììshì Lùshɛ́mbɔ́ɔ̀gì Ɔlɔ́pɔ̀ èdè @@ -63,6 +64,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Èdè Ɔ̀kísítáànì Òròmɔ́ Ɔshɛ́tíìkì + Èdè Pídímɔ̀ntísì Púrúshíànù Èdè Pɔtogí Èdè Pɔtogí (Orilɛ̀-èdè Bràsíl) @@ -218,7 +220,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Etikun Fagini ti Amɛrika Fɛtinami Samɔ - ìsɔ̀rɔ̀sí irɔ́ + Ìsɔ̀rɔ̀sí irɔ́ Agbègbè irɔ́ Gúúshù Áfíríkà Shamibia @@ -232,12 +234,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kàlɛ́ńdà Ònà Ìgbekalɛ̀ owó + Títo Àmì Ohùn Láti Ɛ̀yìn + Ìshètò Lɛ́tà ńlá/lɛ́tà kéreré + Títò nípasɛ̀ shíshe ìyàtɔ̀ láàárín àwɔn lɛ́tà ńlá àti kékeré Ètò Ɛlɛ́sɛɛsɛ + Ètò tó she déédéé + Shíshètò nípasɛ̀ nɔ́ńbà + Àtúntò ɔ̀nà ìkɔ̀wé/Lɛ́tà ńlá + She àyípadà ibùdó + Ìyɔkúrò Àlàfo Ìwé Atúmɔ̀ Èdè Ìgbékalɛ̀ Ɛ̀mójì + Ɔjɔ́ kìíní ɔ̀sɛ̀ + Àdàpɔ̀ + Ɔ̀nà Ìgbéwɔlé + Àtɛ bɔ́tìnì + púpɔ̀ jùlɔ tí a fojúfò Àwɔn Ìdá Ìlà Láàárín Àwɔn Ɔ̀rɔ̀ + She àyípadà àwɔn Òfin Èto Ìdiwɔ̀n + Ìwɔ̀n Òshùwɔ̀n Àwɔn nɔ́ńbà + She àyípadà Orísun Ìdá Gbólóhùn Lɛ́yìn Ìgékúrú + She àyípadà + Tí Ɛ̀rɔ Túmɔ̀ + Ɛ̀dà ìbílɛ̀ Kàlɛ́ńdà Buddhist @@ -249,9 +270,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Kàlɛ́ńdà Etiópíà Kàlɛ́ńdà Gregory Kàlɛ́ńdà Hébérù + Ti orílɛ́-èdè India Kàlɛ́ńdà Lárúbáwá Kàlɛ́ńdà ti Musulumi Híjìrí (kàlɛ́ńdà oní-àtòkɔ ti arà-ìlú) + Híjrí, rírí òshùpá Saudi + Híjìrì (oní tábìlì, ìgbà ìbílɛ̀) Kàlɛ́ńdà Musulumi Kàlɛ́ńdà ISO-8601 Kàlɛ́ńdà ti Jàpánù @@ -263,60 +287,103 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ìshirò owó Ònà ìgbekalɛ̀ owó tó jɛ́ àjùmɔ̀lò Àjùmɔ̀lò + Lɛ́tà kéreré + Lɛ́tà kéreré + Lɛ́tà ńlá + Ìwé atúmɔ̀ èdè Ètò Ɛlɛ́sɛɛsɛ Àkùàyàn Unicode + Ìwé nɔ́ńbà tɛlifóònù + Ìró ɔ̀rɔ̀ Ìshàwárí Ète-Gbogbogbò Shàwárí + Kɔ́ńsónáǹtì Kòríà àkɔ́kɔ́ Àjùmɔ̀lò + Ti ìbílɛ̀ + Ètò Ìkɔ̀wé Orílɛ̀-Èdè Sháínà + Àwɔn Lɛ́tà Ìpìlɛ̀ Nìkan + Ìpìlɛ̀, Àwɔn àmì ohùn, Irú lɛ́tà, Àwɔn oríshi, Kana + Ìpìlɛ̀, Àwɔn àmì ohùn + Ìpìlɛ̀, Àwɔn àmì ohùn, Irú lɛ́tà, Àwɔn oríshi + Sí Ìwɔ̀n fífɛ̀ kíkún + Shí Ààbɔ̀ ìwɔ́n fífɛ̀ Ɛ̀mójì àtɛ̀jíshɛ́ + Sún àwɔn àyè, àmì ìpín gbólóhùn, gbogbo àmi + Sún àwɔn àyè, àmì ìpín gbólóhùn + Sún àwɔn àyè, àmì ìpín gbólóhùn + Sún àwɔn àyè, àmì ìpín gbólóhùn, àmì tí kìí she ti owó Tó dɛ̀ Fɔ́ gbogbo ɛ̀ Pa gbogbo ɛ̀ mɔ́ Fi sílɛ̀ ní àpólà + Àtúnkɔ àwɔn lɛ́tà sí èdè mìíràn ti US BGN + Àtúnkɔ àwɔn lɛ́tà sí èdè mìíràn ti UN GEGN Èto Mɛ́tíríìkì Mɛ́tíríìkì Èto Ìdiwɔ̀n Ɔba Èto Ìdiwɔ̀n US àwɔn díjítì Làrubáwá-Índíà Àwɔn Díjíìtì Lárúbáwá-Índíà fífɛ̀ + Nɔ́ńbà Lárúbáwá tó gbòòrò Àwɔn nɔ́ńbà Àmɛ́níà Àwɔn Nɔ́ńbà Kékèké ti Amɛ́ríkà + Lɛ́tà kékeré ti Àmɛ́níà Àwɔn díjíìtì Báńgílà Àwɔn díjíìtì Shakma Àwɔn díjììtì Defanagárì Àwɔn nɔ́ńbà Ɛtiópíìkì + Ìshúná Àwɔn Díjíìtì Fífɛ̀-Ɛ̀kún + Ìwɔ̀n fífɛ̀ kíkún Àwɔn nɔ́ńbà Jɔ́jíà Àwɔn nɔ́ńbà Gíríìkì Àwɔn Nɔ́ńbà Gíríìkì Kékèké + Lɛ́tà kékéré ti Gíríìkì Àwɔn díjíìtì Gùjárátì Àwɔn Díjíìtì Gurumukì + kàlɛ́ńdà òshùpá Han fún àwɔn kàlɛ́ńdà ìbílɛ̀ Àwɔn nɔ́ńbà Dɛ́símà Sháìnà - Àwɔn nɔ́ńbà Ìrɔ̀rùn ti Sháìnà + Ètò nɔ́ńbà tí ó ń lo àwɔn àwòrán ìshirò tí ó jɛ́ ti èdè Sháínà gɛ́gɛ́ bí iye. + Àwɔn nɔ́ńbà Ìrɔ̀rùn ti Sháínà Àwɔn nɔ́ńbà Ìshúná Ìrɔ̀rùn Sháìnà + Ìshúná owó Sháínà ìrɔ̀rùn Àwɔn nɔ́ńbà Ìbílɛ̀ Sháìnà Àwɔn nɔ́ńbà Ìshúná Ìbílɛ̀ Sháìnà + Ìshúná owó Sháínà ìbílɛ̀ Àwɔn nɔ́ńbà Hébérù Àwɔn díjíìtì Jafaniisi Àwɔn nɔ́ńbà Jápànù Àwɔn nɔ́ńbà Ìshúná Jàpáànù + Ìshúná owó Jàpáànù + Ìlànà kíkɔ nɔ́ńbà ɔdún àkɔ́kɔ́ ti Gannen Àwɔn díjíìtì Kɛ́mɛ̀ Àwɔn díjíìtì kanada + Ìkɔ̀wé Tai Tham Tham (ti ìjɔ Krístì) Àwɔn díjíìtì Láó Díjíítì Ìwɔ̀ Oòrùn + Sans-serif matimátíìkì tó nípɔn Àwɔn díjíìtì Málàyálámù Àwɔn díjíìtì Mete Mayeki Àwɔn díjíìtì Myánmarí + Èdè Ìbílɛ̀ Karen Ti Ìlà Oòrùn Myanmar + Àwɔn Díjíìtì ìbílɛ̀ + Àwɔn díjíìtì ìbílɛ̀ Àwɔn díjíìtì Shiki Àwɔn díjíìtì Òdíà + Tí wɔ́n fa ilà yíká Àwɔn díjíìtì Rómánù + Lɛ́tà ńlá ti Rómánù Àwɔn díjíìtì Rómánù Kékeré + lɛ́tà kéreré ti Rómánù Àwɔn díjíìtì Ìbílɛ̀ Támílù Àwɔn díjíìtì Tàmílù Àwɔn díjíìtì Télúgù Àwɔn díjíìtì Thai Àwɔn díjíìtì Tibetán + Àwɔn nɔ́ńbà ìbìlɛ̀ Àwɔn díjíìtì Fai + Ìtumɔ̀ èdè Ɛ̀rɔ tí a kò sɔ ní pàtó + ɛ̀yà POSIX Mɛ́tíríìkì @@ -433,6 +500,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic + Sháájú Kírístì Sáájú ìgbà mímɔ̀ @@ -461,6 +529,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ìdá mɛ́rin + ìdámɛ́rin tó kɔjá + ìdámɛ́rin yìí + ìdamɛ́ri tó ń bɔ̀ óshù tó kɔjá @@ -497,10 +568,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic Ɔjɔ́ tó wà láàárín ɔ̀sɛ̀ - ɔjɔ́ inú ɔshɛ̀. + Ɔjɔ́ inú ɔ̀shɛ̀ + + + Ɔjɔ́ inú ɔ̀shɛ̀ - ɔjɔ́ ɔshɛ̀ inú oshù + Ɔjɔ́ ɔ̀shɛ̀ inú oshù + + + Ɔjɔ́ ɔ̀shɛ̀ inú oshù + + + Ɔjɔ́ ɔ̀shɛ̀ inú oshù Ɔjɔ́ Àìkú tó kɔjá @@ -515,7 +595,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic ɔjɔ́ Ajé tó kɔjá ɔjɔ́ Ajé yìí - next Monday + Ɔjɔ́ ajé tó ń bɔ̀ + + + ɔjɔ́ Ajé tó kɔjá + ɔjɔ́ Ajé yìí + Ɔjɔ́ ajé tó ń bɔ̀ + + + ɔjɔ́ Ajé tó kɔjá + ɔjɔ́ Ajé yìí + Ɔjɔ́ ajé tó ń bɔ̀ Ìshɛ́gun tókɔ́já @@ -652,16 +742,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic ìlú Kurashao - - - Àkókò Sɔmà Gɛɛsi - - - - - Àkókò Àfɛnukò Airiisi - - ìlú Marigɔ́ɔ̀tì @@ -695,6 +775,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic ìlú St Tɔ́màsì + + + Àkókò Ékà + Àkókò Ékà Àfɛnukò + Àkókò Ékà Ìgbà ɛ̀rùn + + Àkókò Ìwɔ̀-Oòrùn Afírikà @@ -833,6 +920,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sɔmà Bangladesh + + + Àkɔ́kɔ̀ ilɛ̀ Gɛ̀ɛ́sì + Àkókò Ɛ̀rùn ilɛ̀ Gɛɛsi + + Àkókò Képú Fáàdì @@ -932,6 +1025,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Àwɔn Erekusu Gilibati + + + Àkókò Greenland + Àkókò Àfenukò Greenland + Ìgbà Ɛ̀rùn Greenland + + Àkókò Ìlà oorùn Greenland @@ -959,7 +1059,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Hawaii-Aleutian - Àkókò Àfɛnukò Hawaii-Aleutian + Àkókò Àfɛnukò ti Hawaii-Aleutian Àkókò Ojúmɔmɔ Hawaii-Aleutian @@ -973,8 +1073,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Hofidi - Àkókò Ìfɛnukòsí Hofidi - Àkókò Sɔmà Hofidi + Àkókò Ìfɛnukò Hofidi + Àkókò Ìgbà Ɛ̀rùn Hofidi @@ -994,6 +1094,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Ojúmɔmɔ Irani + + + Àkókò orílɛ́-èdè Ireland + Àkókò Àfɛnukò orílɛ́-èdè Ireland + + Àkókò Íkósíkì @@ -1015,6 +1121,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sɔmà Japan + + + Àkókò Kamchatka + Àkókò Kamchatka Àfɛnukò + Àkókò Kamchatka Ìgbà Ɛrùn + + Àkókò Ìwɔ̀-Oòrùn Kasasitáànì @@ -1180,11 +1293,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sɔmà Sakhalin + + + Àkókò Sàmárà + Àkókò Sàmárà Àfɛnukò + Àkókò Ìgbà ɛ̀rùn Sàmárà + + - Àkókò Samoa Àkókò Àfɛnukò Samoa - Àkókò Ojúmɔmɔ Samoa @@ -1221,6 +1339,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic Àkókò Sɔmà Tonga + + + Àkókò Tɔ́kì + Àkókò Tɔ́kì Àfɛnukò + Àkókò Ìgbàɛ̀rùn Tɔ́kì + + Àkókò Turkimenistani @@ -1745,7 +1870,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic Owó ìlú Kùrásɔ̀ àti Saint Mátìnì - Owó ìlú Kùrásɔ̀ àti Saint Mátìnì Faransì ìwɔ̀-oorùn Afíríkà diff --git a/make/data/cldr/common/main/yrl.xml b/make/data/cldr/common/main/yrl.xml index 3c89da29034c..3761bfe8a4c9 100644 --- a/make/data/cldr/common/main/yrl.xml +++ b/make/data/cldr/common/main/yrl.xml @@ -1114,6 +1114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Turususawa teipausape Turususawa pisawera Papasawera + Sistẽma 24 húra-ita + Sistẽma 24 húra-ita Sistẽma 12 húra-ita (0-11) Sistẽma 24 húra-ita (1-24) Sistẽma 24 húra-ita (0-23) @@ -1677,6 +1679,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ w'ª' 'sẽmãna' Y + + {0} – {1} + {0} – {1} + {0} – {1} + h B – h B h – h B @@ -2688,9 +2695,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Riberevili - - Hurariyu Kurasí Ara Biritãniku - Londres @@ -2778,9 +2782,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yayapura - - Hurariyu Retewa Irãdei - Dubirĩ @@ -3460,13 +3461,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Alasika Kurasí Ara Hurariyu - - - Aumati Hurariyu - Aumati Hurariyu Eté - Aumati Kurasí Ara Hurariyu - - Amasuna Hurariyu @@ -3521,20 +3515,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Apiya Kurasí Ara Hurariyu - - - Akitau Hurariyu - Akitau Hurariyu Retewa - Akitau Kurasí Ara Hurariyu - - - - - Akitubi Hurariyu - Akitubi Hurariyu Retewa - Akitubi Kurasí Ara Hurariyu - - Arábiya Hurariyu @@ -3641,6 +3621,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ BRST + + + Hurariyu Kurasí Ara Biritãniku + + Burunei Darusaram Hurariyu @@ -3828,11 +3813,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Guruẽrãdiya Usidẽtawara Kurasí Ara Hurariyu - - - Guwã Hurariyu Retewa - - Golfo Hurariyu @@ -3906,6 +3886,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Irã Kurasí Ara Hurariyu + + + Hurariyu Retewa Irãdei + + Irkutisiki Hurariyu @@ -3968,11 +3953,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Kirigiretãma Hurariyu - - - Rãka Hurariyu - - Kapuã-ita Inĩbu Hurariyu @@ -3985,13 +3965,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Lurudi Howe Kurasí Ara Hurariyu - - - Makau Hurariyu - Makau Hurariyu Retewa - Makau Kurasí Ara Hurariyu - - Magadã Hurariyu @@ -4107,11 +4080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Fenãdu Nuruyã Kurasí Ara Hurariyu - - - Kapuã-ita Mariyãna Nuti suí Hurariyu - - Sibirisiki Pisasú Hurariyu @@ -4191,13 +4159,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Piúgiãgi Hurariyu - - - Kisiroda Hurariyu - Kisiroda Hurariyu Retewa - Kisiroda Kurasí Ara Hurariyu - - Yumuatirisawa Hurariyu @@ -4224,9 +4185,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Samowa Hurariyu Samowa Hurariyu Retewa - Samowa Kurasí Ara Hurariyu @@ -4412,29 +4371,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 0 miu 0 miu - 00 miu 00 miu - 000 miu 000 miu - 0 mi 0 mi - 00 mi 00 mi - 000 mi 000 mi - 0 bi 0 bi - 00 bi 00 bi - 000 bi 000 bi - 0 tiri 0 tiri - 00 tiri 00 tiri - 000 tiri 000 tiri @@ -4792,11 +4739,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Yuwã Xinawara (offshore) Yuwã-ita Xinawara (offshore) - - Dóra Bãku Pupulari Xinawara suí - Dóra Bãku Pupulari Xinawara suí - Dóra-ita Bãku Pupulari Xinawara suí - Yuwã Xinawara Yuwã Xinawara diff --git a/make/data/cldr/common/main/yue.xml b/make/data/cldr/common/main/yue.xml index 25103721160a..81b4438f0364 100644 --- a/make/data/cldr/common/main/yue.xml +++ b/make/data/cldr/common/main/yue.xml @@ -1211,23 +1211,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic 貨幣格式 略過符號排序 反向重音排序 - 大寫/小寫排列 - 區分大小寫排序 + 大細楷排序 + 分大細楷排序 排序 正規化排序 數字排序 + 語系文字/區塊重新排序 排序強度 貨幣 + 轉換目的地 + 字典斷詞排除項目 Emoji 顯示方式 + 一星期嘅第一日 + 混合 時間週期(12 小時制與 24 小時制) + 輸入法 + 鍵盤 + 略過嘅最高級別項目 換行樣式 單字強制換行 + 轉換規則 度量單位系統 + 度量單位 數字 + 補充資料專用區域 + 轉換來源 + 區域次分區 縮寫後斷句 + 轉換 + 機器翻譯 時區 區域變異 專用區 + 專用區轉換 佛曆 @@ -1247,15 +1263,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic 希伯來曆 希伯來曆 印度國曆 + 印度國定曆 伊斯蘭曆 伊斯蘭曆 伊斯蘭民用曆 (表格式) 伊斯蘭民用曆 (表格式) 伊斯蘭新月曆 + 伊斯蘭新月曆 伊斯蘭天文曆 + 伊斯蘭天文曆 伊斯蘭曆 (烏姆庫拉) 伊斯蘭曆 (烏姆庫拉) 公曆 (元年) + 公曆 日本曆 日本曆 波斯曆 @@ -1271,41 +1291,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic 正常排序重音 依反向重音排序 優先排序小寫 + 細楷 正常大小寫順序排序 + 細楷 優先排序大寫 + 大楷 不分大小寫排序 依大小寫排序 + 相容性 字典排序 + 字典 預設 Unicode 排序 預設 Unicode + Emoji 歐洲排序規則 + 歐洲規則 電話簿排序 + 電話簿 發音排序 + 發音 拼音排序 + 拼音 一般用途搜尋 搜尋 韓文子音排序 + 韓文初聲子音 標準排序 標準 筆畫排序 + 筆畫 傳統排序 + 傳統 部首筆畫排序 + 部首筆畫 注音排序 + 注音 非正規化排序 依正規化排序 Unicode 個別排序數字 依數字順序排序數字 + 貨幣 + 數字 + 標點符號 + 空白字元 + 符號 全部排序 + 全部 僅排序基礎字母 + 只限基礎字母 排序重音/大小寫/全半形/假名 + 基礎、重音、大細楷、變體、假名 排序重音 + 基礎、重音 排序重音/大小寫/全半形 + 基礎、重音、大細寫、變體 全形 半形 數值 預設 Emoji 文字 + 12 小時制 + 12 + 24 小時制 + 24 12 小時制 (0–11) 12 (0–11) 12 小時制 (1–12) @@ -1314,6 +1363,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 小時制 (1–24) 24 (1–24) + Shift、空格、標點符號、所有符號 + Shift、空格、標點符號 + Shift、空格、標點符號 + Shift、空格、標點符號、非貨幣符號 寬鬆換行樣式 寬鬆 一般換行樣式 @@ -1334,8 +1387,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 美制 阿拉伯-印度數字 阿拉伯-印度擴充數字 + 阿拉伯-印度擴充 亞美尼亞數字 小寫亞美尼亞數字 + 小寫亞美尼亞 峇里文數字 孟加拉數字 婆羅米數字 @@ -1344,43 +1399,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic 梵文數字 衣索比亞數字 金融數字 + 財務 全形數字 + 全形 喬治亞數字 希臘數字 小寫希臘數字 + 小寫希臘 古吉拉特數字 古爾穆奇數字 + 傳統曆法漢字月日寫法 中文十進位數字 + 使用漢字數字計數的位置十進制 小寫簡體中文數字 大寫簡體中文數字 + 大寫簡體中文 小寫繁體中文數字 大寫繁體中文數字 + 大寫繁體中文 希伯來數字 爪哇文數字 小寫日文數字 大寫日文數字 + 大寫日文 + 日本元年紀年法 克耶數字 高棉數字 坎那達數字 老傣文數字 蘭納文數字 + 蘭納文 (教會用語) 寮國數字 阿拉伯數字 西納文數字 林布文數字 + 數學粗體 + 數學雙線體 + 數學等寬字體 + 數學無襯線粗體 + 數學無襯線字體 馬來亞拉姆數字 蒙古數字 曼尼普爾數字 緬甸數字 + 緬甸東部波克倫族 + 緬甸巴歐族 緬甸撣文數字 + 緬甸撣族 + 緬甸紅傣族 原始數字 + 原始數字 曼德數字 桑塔利文數字 歐利亞數字 奧斯曼亞數字 + 大綱 羅馬數字 + 大寫羅馬數字 小寫羅馬數字 + 小寫羅馬數字 索拉什特拉文數字 + 分段 夏拉達數字 索朗桑朋數字 巽他數字 @@ -1388,14 +1467,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic 新傣仂文數字 坦米爾數字 坦米爾數字 + 現代泰米爾 泰盧固數字 泰文數字 西藏數字 傳統數字 + 傳統數字 瓦伊文數字 閂 開 + 未指定嘅機器翻譯 + POSIX 變體 + + 閂 + 開 + 公制 英制 @@ -2077,6 +2164,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic G y年QQQQ + + {0}日至{1}日 + {0}至{1} Bh時至Bh時 @@ -2178,6 +2268,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLLL至LLLL + + M月d–d日 + M月d日–M月d日 + G y至y @@ -2287,27 +2381,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic 清晨 朝早 中午 - 下晝 + 下午 夜晚 凌晨 - 上晝 - 下晝 + 午夜 + 清晨 + 朝早 + 中午 + 下午 + 夜晚 + 凌晨 - 上晝 - 下晝 + 午夜 + 清晨 + 朝早 + 中午 + 下午 + 夜晚 + 凌晨 - 上晝 - 下晝 + 清晨 + 朝早 + 中午 + 下午 + 夜晚 + 凌晨 - 上晝 - 下晝 + 清晨 + 朝早 + 中午 + 下午 + 夜晚 + 凌晨 + + + 上午 + 下午 + 清晨 + 朝早 + 中午 + 下午 + 夜晚 + 凌晨 @@ -2372,6 +2494,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -2432,6 +2557,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gy年M月 Gy年M月d日 Gy年M月d日 E + Gy年M月 + Gy年M月d日 + Gy年M月d日 (E) ah時 H點 ah:mm @@ -2449,6 +2577,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic M月d日 M月d日 E M月d日 + MMMMd (E) M月第W個星期 y年 y/M @@ -2459,10 +2588,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic y年M月d日 y年M月d日 E y年M月 + y年M月d日 + y年M月d日 (E) y年QQQ y年QQQQ Y年第w個星期 + + {0} ({1}) + {0} ({1}) + {1}{0} + {1}{0} + {0} ({1}) + {0}至{1} @@ -2568,6 +2706,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLLL至LLLL + + MMMMd–d日 + M月d日至M月d日 + y至y @@ -2765,238 +2907,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 大化 - 白雉 - 白鳳 - 朱鳥 - 大寶 - 慶雲 - 和銅 - 靈龜 - 養老 - 神龜 - 天平 - 天平感寶 - 天平勝寶 - 天平寶字 - 天平神護 - 神護景雲 - 寶龜 - 天應 - 延曆 - 大同 - 弘仁 - 天長 - 承和 - 嘉祥 - 仁壽 - 齊衡 - 天安 - 貞觀 - 元慶 - 仁和 - 寬平 - 昌泰 - 延喜 - 延長 - 承平 - 天慶 - 天曆 - 天德 - 應和 - 康保 - 安和 - 天祿 - 天延 - 貞元 - 天元 - 永觀 - 寬和 - 永延 - 永祚 - 正曆 - 長德 - 長保 - 寬弘 - 長和 - 寬仁 - 治安 - 萬壽 - 長元 - 長曆 - 長久 - 寬德 - 永承 - 天喜 - 康平 - 治曆 - 延久 - 承保 - 承曆 - 永保 - 應德 - 寬治 - 嘉保 - 永長 - 承德 - 康和 - 長治 - 嘉承 - 天仁 - 天永 - 永久 - 元永 - 保安 - 天治 - 大治 - 天承 - 長承 - 保延 - 永治 - 康治 - 天養 - 久安 - 仁平 - 久壽 - 保元 - 平治 - 永曆 - 應保 - 長寬 - 永萬 - 仁安 - 嘉應 - 承安 - 安元 - 治承 - 養和 - 壽永 - 元曆 - 文治 - 建久 - 正治 - 建仁 - 元久 - 建永 - 承元 - 建曆 - 建保 - 承久 - 貞應 - 元仁 - 嘉祿 - 安貞 - 寬喜 - 貞永 - 天福 - 文曆 - 嘉禎 - 曆仁 - 延應 - 仁治 - 寬元 - 寶治 - 建長 - 康元 - 正嘉 - 正元 - 文應 - 弘長 - 文永 - 建治 - 弘安 - 正應 - 永仁 - 正安 - 乾元 - 嘉元 - 德治 - 延慶 - 應長 - 正和 - 文保 - 元應 - 元亨 - 正中 - 嘉曆 - 元德 - 元弘 - 建武 - 延元 - 興國 - 正平 - 建德 - 文中 - 天授 - 康曆 - 弘和 - 元中 - 至德 - 嘉慶 - 康應 - 明德 - 應永 - 正長 - 永享 - 嘉吉 - 文安 - 寶德 - 享德 - 康正 - 長祿 - 寬正 - 文正 - 應仁 - 文明 - 長享 - 延德 - 明應 - 文龜 - 永正 - 大永 - 享祿 - 天文 - 弘治 - 永祿 - 元龜 - 天正 - 文祿 - 慶長 - 元和 - 寬永 - 正保 - 慶安 - 承應 - 明曆 - 萬治 - 寬文 - 延寶 - 天和 - 貞享 - 元祿 - 寶永 - 正德 - 享保 - 元文 - 寬保 - 延享 - 寬延 - 寶曆 - 明和 - 安永 - 天明 - 寬政 - 享和 - 文化 - 文政 - 天保 - 弘化 - 嘉永 - 安政 - 萬延 - 文久 - 元治 - 慶應 明治 大正 昭和 @@ -3828,9 +3738,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 自由市 - - 英國夏令時間 - 倫敦 @@ -3921,9 +3828,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 加亞布拉 - - 愛爾蘭標準時間 - 都柏林 @@ -4658,13 +4562,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 阿拉斯加夏令時間 - - - 阿拉木圖時間 - 阿拉木圖標準時間 - 阿拉木圖夏令時間 - - 亞馬遜時間 @@ -4714,20 +4611,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 阿皮亞夏令時間 - - - 阿克陶時間 - 阿克陶標準時間 - 阿克陶夏令時間 - - - - - 阿克托比時間 - 阿克托比標準時間 - 阿克托比夏令時間 - - 阿拉伯時間 @@ -4829,6 +4712,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic 巴西利亞夏令時間 + + + 英國時間 + 英國夏令時間 + + 汶萊時間 @@ -5007,6 +4896,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic 格林威治標準時間 + + + 格陵蘭時間 + 格陵蘭標準時間 + 格陵蘭夏令時間 + + 格陵蘭東部時間 @@ -5021,11 +4917,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 格陵蘭西部夏令時間 - - - 關島標準時間 - - 波斯灣海域標準時間 @@ -5038,7 +4929,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 夏威夷-阿留申標準時間 + 夏威夷申標準時間 @@ -5099,6 +4990,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic 伊朗夏令時間 + + + 愛爾蘭時間 + 愛爾蘭標準時間 + + 伊爾庫次克時間 @@ -5166,11 +5063,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 吉爾吉斯時間 - - - 蘭卡時間 - - 萊恩群島時間 @@ -5183,13 +5075,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 豪勳爵島夏令時間 - - - 澳門時間 - 澳門標準時間 - 澳門夏令時間 - - 馬加丹時間 @@ -5305,11 +5190,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 費爾南多 - 迪諾羅尼亞夏令時間 - - - 北馬里亞納群島時間 - - 新西伯利亞時間 @@ -5389,13 +5269,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 平壤時間 - - - 克孜勒奧爾達時間 - 克孜勒奧爾達標準時間 - 克孜勒奧爾達夏令時間 - - 留尼旺時間 @@ -5422,9 +5295,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 薩摩亞時間 薩摩亞標準時間 - 薩摩亞夏令時間 @@ -5491,6 +5362,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic 楚克島時間 + + + 土耳其時間 + 土耳其標準時間 + 土耳其夏令時間 + + 土庫曼時間 @@ -5510,6 +5388,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 烏拉圭夏令時間 + + + 烏魯木齊時間 + + 烏茲別克時間 @@ -6478,7 +6361,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 加勒比盾 - 加勒比盾 特殊提款權 @@ -6562,7 +6444,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 辛巴威金 - 辛巴威金 辛巴威元 (2009) @@ -6600,14 +6481,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 每平方英吋 {0} - - 等份 - {0} 等份 - - - 葡萄糖 - {0} 葡萄糖 - {0} 個世紀 @@ -6717,10 +6590,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 每公升 {0} - - 公制液量安士 - {0} 公制液量安士 - 每加侖 {0} @@ -6730,14 +6599,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 英制甜品匙{0}匙 - - 球面度 - {0} 球面度 - - - 開特 - {0} 開特 - 庫侖 {0} 庫侖 @@ -6770,10 +6631,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 戈瑞 {0} 戈瑞 - - 公斤力 - {0} 公斤力 - 特斯拉 {0} 特斯拉 @@ -7674,11 +7531,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 等份 {0} 等份 - 葡萄糖 {0} 葡萄糖 @@ -7717,9 +7572,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 每安士 {0} - - {0} Hg - 每平方吋 {0} 磅 @@ -7736,31 +7588,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic °C - 公制液量安士 {0} 公制液量安士 - 球面度 {0} 球面度 - 開特 {0} 開特 - 庫 {0} 庫 - 法 {0} 法 - 亨 {0} 亨 - 西 {0} 西 @@ -7768,27 +7613,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0} 卡路里-IT - 貝克 {0} 貝克 - 希 {0} 希 - 戈 {0} 戈 - 公斤力 {0} 公斤力 - 特 {0} 特 - 韋 {0} 韋 diff --git a/make/data/cldr/common/main/yue_Hans.xml b/make/data/cldr/common/main/yue_Hans.xml index 42d473ca86a7..4ed394700d8b 100644 --- a/make/data/cldr/common/main/yue_Hans.xml +++ b/make/data/cldr/common/main/yue_Hans.xml @@ -1217,18 +1217,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic 排序 正规化排序 数字排序 + 语系文字/区块重新排序 排序强度 货币 + 转换目的地 + 字典断词排除项目 Emoji 显示方式 + 一星期嘅第一日 + 混合 时间周期(12 小时制与 24 小时制) + 输入法 + 键盘 + 略过嘅最高级别项目 换行样式 单字强制换行 + 转换规则 度量单位系统 + 度量单位 数字 + 补充资料专用区域 + 转换来源 + 区域次分区 缩写后断句 + 转换 + 机器翻译 时区 区域变异 专用区 + 专用区转换 佛历 @@ -1248,15 +1264,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic 希伯来历 希伯来历 印度国历 + 印度国定历 伊斯兰历 伊斯兰历 伊斯兰民用历 (表格式) 伊斯兰民用历 (表格式) 伊斯兰新月历 + 伊斯兰新月历 伊斯兰天文历 + 伊斯兰天文历 伊斯兰历 (乌姆库拉) 伊斯兰历 (乌姆库拉) 公历 (元年) + 公历 日本历 日本历 波斯历 @@ -1272,41 +1292,70 @@ CLDR data files are interpreted according to the LDML specification (http://unic 正常排序重音 依反向重音排序 优先排序小写 + 细楷 正常大小写顺序排序 + 细楷 优先排序大写 + 大楷 不分大小写排序 依大小写排序 + 相容性 字典排序 + 字典 预设 Unicode 排序 预设 Unicode + Emoji 欧洲排序规则 + 欧洲规则 电话簿排序 + 电话簿 发音排序 + 发音 拼音排序 + 拼音 一般用途搜寻 搜寻 韩文子音排序 + 韩文初声子音 标准排序 标准 笔画排序 + 笔画 传统排序 + 传统 部首笔画排序 + 部首笔画 注音排序 + 注音 非正规化排序 依正规化排序 Unicode 个别排序数字 依数字顺序排序数字 + 货币 + 数字 + 标点符号 + 空白字元 + 符号 全部排序 + 全部 仅排序基础字母 + 只限基础字母 排序重音/大小写/全半形/假名 + 基础、重音、大细楷、变体、假名 排序重音 + 基础、重音 排序重音/大小写/全半形 + 基础、重音、大细写、变体 全形 半形 数值 预设 Emoji 文字 + 12 小时制 + 12 + 24 小时制 + 24 12 小时制 (0–11) 12 (0–11) 12 小时制 (1–12) @@ -1315,6 +1364,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 24 (0–23) 24 小时制 (1–24) 24 (1–24) + Shift、空格、标点符号、所有符号 + Shift、空格、标点符号 + Shift、空格、标点符号 + Shift、空格、标点符号、非货币符号 宽松换行样式 宽松 一般换行样式 @@ -1335,8 +1388,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic 美制 阿拉伯-印度数字 阿拉伯-印度扩充数字 + 阿拉伯-印度扩充 亚美尼亚数字 小写亚美尼亚数字 + 小写亚美尼亚 峇里文数字 孟加拉数字 婆罗米数字 @@ -1345,43 +1400,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic 梵文数字 衣索比亚数字 金融数字 + 财务 全形数字 + 全形 乔治亚数字 希腊数字 小写希腊数字 + 小写希腊 古吉拉特数字 古尔穆奇数字 + 传统历法汉字月日写法 中文十进位数字 + 使用汉字数字计数的位置十进制 小写简体中文数字 大写简体中文数字 + 大写简体中文 小写繁体中文数字 大写繁体中文数字 + 大写繁体中文 希伯来数字 爪哇文数字 小写日文数字 大写日文数字 + 大写日文 + 日本元年纪年法 克耶数字 高棉数字 坎那达数字 老傣文数字 兰纳文数字 + 兰纳文 (教会用语) 寮国数字 阿拉伯数字 西纳文数字 林布文数字 + 数学粗体 + 数学双线体 + 数学等宽字体 + 数学无衬线粗体 + 数学无衬线字体 马来亚拉姆数字 蒙古数字 曼尼普尔数字 缅甸数字 + 缅甸东部波克伦族 + 缅甸巴欧族 缅甸掸文数字 + 缅甸掸族 + 缅甸红傣族 原始数字 + 原始数字 曼德数字 桑塔利文数字 欧利亚数字 奥斯曼亚数字 + 大纲 罗马数字 + 大写罗马数字 小写罗马数字 + 小写罗马数字 索拉什特拉文数字 + 分段 夏拉达数字 索朗桑朋数字 巽他数字 @@ -1389,14 +1468,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic 新傣仂文数字 坦米尔数字 坦米尔数字 + 现代泰米尔 泰卢固数字 泰文数字 西藏数字 传统数字 + 传统数字 瓦伊文数字 闩 开 + 未指定嘅机器翻译 + POSIX 变体 + + 闩 + 开 + 公制 英制 @@ -2078,6 +2165,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic G y年QQQQ + + {0}日至{1}日 + {0}至{1} Bh时至Bh时 @@ -2179,6 +2269,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLLL至LLLL + + M月d–d日 + M月d日–M月d日 + G y至y @@ -2373,6 +2467,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + / + {1} {0} @@ -2433,6 +2530,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gy年M月 Gy年M月d日 Gy年M月d日 E + Gy年M月 + Gy年M月d日 + Gy年M月d日 (E) ah时 H点 ah:mm @@ -2450,6 +2550,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic M月d日 M月d日 E M月d日 + MMMMd (E) M月第W个星期 y年 y/M @@ -2460,11 +2561,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic y年M月d日 y年M月d日 E y年M月 + y年M月d日 + y年M月d日 (E) y年QQQ y年QQQQ Y年第w个星期 + + {0} ({1}) + {0} ({1}) + {1}{0} + {1}{0} + + + {0}至{1} + {0}至{1} + {0}至{1} + {0}至{1} Bh时至Bh时 @@ -2569,6 +2683,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic LLLL至LLLL + + MMMMd–d日 + M月d日至M月d日 + y至y @@ -2766,238 +2884,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 大化 - 白雉 - 白凤 - 朱鸟 - 大宝 - 庆云 - 和铜 - 灵龟 - 养老 - 神龟 - 天平 - 天平感宝 - 天平胜宝 - 天平宝字 - 天平神护 - 神护景云 - 宝龟 - 天应 - 延历 - 大同 - 弘仁 - 天长 - 承和 - 嘉祥 - 仁寿 - 齐衡 - 天安 - 贞观 - 元庆 - 仁和 - 宽平 - 昌泰 - 延喜 - 延长 - 承平 - 天庆 - 天历 - 天德 - 应和 - 康保 - 安和 - 天禄 - 天延 - 贞元 - 天元 - 永观 - 宽和 - 永延 - 永祚 - 正历 - 长德 - 长保 - 宽弘 - 长和 - 宽仁 - 治安 - 万寿 - 长元 - 长历 - 长久 - 宽德 - 永承 - 天喜 - 康平 - 治历 - 延久 - 承保 - 承历 - 永保 - 应德 - 宽治 - 嘉保 - 永长 - 承德 - 康和 - 长治 - 嘉承 - 天仁 - 天永 - 永久 - 元永 - 保安 - 天治 - 大治 - 天承 - 长承 - 保延 - 永治 - 康治 - 天养 - 久安 - 仁平 - 久寿 - 保元 - 平治 - 永历 - 应保 - 长宽 - 永万 - 仁安 - 嘉应 - 承安 - 安元 - 治承 - 养和 - 寿永 - 元历 - 文治 - 建久 - 正治 - 建仁 - 元久 - 建永 - 承元 - 建历 - 建保 - 承久 - 贞应 - 元仁 - 嘉禄 - 安贞 - 宽喜 - 贞永 - 天福 - 文历 - 嘉祯 - 历仁 - 延应 - 仁治 - 宽元 - 宝治 - 建长 - 康元 - 正嘉 - 正元 - 文应 - 弘长 - 文永 - 建治 - 弘安 - 正应 - 永仁 - 正安 - 干元 - 嘉元 - 德治 - 延庆 - 应长 - 正和 - 文保 - 元应 - 元亨 - 正中 - 嘉历 - 元德 - 元弘 - 建武 - 延元 - 兴国 - 正平 - 建德 - 文中 - 天授 - 康历 - 弘和 - 元中 - 至德 - 嘉庆 - 康应 - 明德 - 应永 - 正长 - 永享 - 嘉吉 - 文安 - 宝德 - 享德 - 康正 - 长禄 - 宽正 - 文正 - 应仁 - 文明 - 长享 - 延德 - 明应 - 文龟 - 永正 - 大永 - 享禄 - 天文 - 弘治 - 永禄 - 元龟 - 天正 - 文禄 - 庆长 - 元和 - 宽永 - 正保 - 庆安 - 承应 - 明历 - 万治 - 宽文 - 延宝 - 天和 - 贞享 - 元禄 - 宝永 - 正德 - 享保 - 元文 - 宽保 - 延享 - 宽延 - 宝历 - 明和 - 安永 - 天明 - 宽政 - 享和 - 文化 - 文政 - 天保 - 弘化 - 嘉永 - 安政 - 万延 - 文久 - 元治 - 庆应 明治 大正 昭和 @@ -3829,9 +3715,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 自由市 - - 英国夏令时间 - 伦敦 @@ -3922,9 +3805,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 加亚布拉 - - 爱尔兰标准时间 - 都柏林 @@ -4659,13 +4539,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 阿拉斯加夏令时间 - - - 阿拉木图时间 - 阿拉木图标准时间 - 阿拉木图夏令时间 - - 亚马逊时间 @@ -4715,20 +4588,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 阿皮亚夏令时间 - - - 阿克陶时间 - 阿克陶标准时间 - 阿克陶夏令时间 - - - - - 阿克托比时间 - 阿克托比标准时间 - 阿克托比夏令时间 - - 阿拉伯时间 @@ -4830,6 +4689,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic 巴西利亚夏令时间 + + + 英国时间 + 英国夏令时间 + + 汶莱时间 @@ -5008,6 +4873,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic 格林威治标准时间 + + + 格陵兰时间 + 格陵兰标准时间 + 格陵兰夏令时间 + + 格陵兰东部时间 @@ -5022,11 +4894,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 格陵兰西部夏令时间 - - - 关岛标准时间 - - 波斯湾海域标准时间 @@ -5100,6 +4967,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic 伊朗夏令时间 + + + 爱尔兰时间 + 爱尔兰标准时间 + + 伊尔库次克时间 @@ -5167,11 +5040,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 吉尔吉斯时间 - - - 兰卡时间 - - 莱恩群岛时间 @@ -5184,13 +5052,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 豪勋爵岛夏令时间 - - - 澳门时间 - 澳门标准时间 - 澳门夏令时间 - - 马加丹时间 @@ -5306,11 +5167,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 费尔南多 - 迪诺罗尼亚夏令时间 - - - 北马里亚纳群岛时间 - - 新西伯利亚时间 @@ -5390,13 +5246,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 平壤时间 - - - 克孜勒奥尔达时间 - 克孜勒奥尔达标准时间 - 克孜勒奥尔达夏令时间 - - 留尼旺时间 @@ -5423,9 +5272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - 萨摩亚时间 萨摩亚标准时间 - 萨摩亚夏令时间 @@ -5492,6 +5339,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic 楚克岛时间 + + + 土耳其时间 + 土耳其标准时间 + 土耳其夏令时间 + + 土库曼时间 @@ -5511,6 +5365,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic 乌拉圭夏令时间 + + + 乌鲁木齐时间 + + 乌兹别克时间 diff --git a/make/data/cldr/common/main/yue_Hant_CN.xml b/make/data/cldr/common/main/yue_Hant_CN.xml index f0e33086c55c..9f9d385f2930 100644 --- a/make/data/cldr/common/main/yue_Hant_CN.xml +++ b/make/data/cldr/common/main/yue_Hant_CN.xml @@ -15,6 +15,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + 上午 + 下午 + + + 上午 + 下午 + + + 上午 + 下午 + + + + + 上午 + 下午 + + + 上午 + 下午 + + + diff --git a/make/data/cldr/common/main/zgh.xml b/make/data/cldr/common/main/zgh.xml index c6414f8b4903..fb4769e26a76 100644 --- a/make/data/cldr/common/main/zgh.xml +++ b/make/data/cldr/common/main/zgh.xml @@ -534,6 +534,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic QQQQ y + + {0} – {1} + {0}–{1} + {0}–{1} + {0} – {1} diff --git a/make/data/cldr/common/main/zh.xml b/make/data/cldr/common/main/zh.xml index d1d4dd573536..29b91ba4c556 100644 --- a/make/data/cldr/common/main/zh.xml +++ b/make/data/cldr/common/main/zh.xml @@ -441,6 +441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 巴利语 皮京语 波兰语 + 皮埃蒙特语 波纳佩语 马利塞-帕萨马科迪语 普鲁士语 @@ -1256,18 +1257,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 排序 规范化排序 数字排序 + 文字/区块顺序重排 排序强度 货币 + 切换 + 字典断字例外情况 表情符号表示法 + 一周起始日 + 混合型 小时制(12或24) + 输入法 + 键盘 + 最高忽略 中文、日文及韩语换行规则 词内换行规则 + 转换规则 度量衡制 + 度量衡单位 数字 + 补充数据的区域 + 转换源 + 区域分区 在缩写后断句 + 转换 + 机器翻译 时区 - 语言区域别名 + 语言区域变体 专用 + 专用转换 佛历 @@ -1287,16 +1304,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 希伯来历 希伯来历 印度国定历 + 印度国定历 伊斯兰历 伊斯兰历 表格式伊斯兰历(民用纪元) 表格式伊斯兰历(民用纪元) 沙特阿拉伯伊斯兰历 + 伊斯兰历(沙特阿拉伯观月) 表格式伊斯兰历(天文纪元) 表格式伊斯兰历(天文纪元) 伊斯兰历(乌姆库拉) 伊斯兰历(乌姆库拉) 国际标准历法 + 阳历 和历 和历 波斯历 @@ -1312,8 +1332,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 对重音进行正常排序 对重音进行逆向排序 先对小写字母进行排序 + 小写字母 对正常大小写顺序进行排序 + 小写字母 先对大写字母进行排序 + 大写字母 不区分大小写进行排序 区分大小写进行排序 基于兼容性沿用既往排序 @@ -1323,7 +1346,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 默认Unicode排序 默认Unicode 表情符号排序 + 表情符号 欧洲排序规则 + 欧洲规则 电话簿排序 电话簿 语音排序 @@ -1333,6 +1358,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 常规搜索 搜索 按谚文初声辅音搜索 + 韩语初声 标准排序 标准 笔画排序 @@ -1347,17 +1373,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 对 Unicode 进行规范化排序 对数字进行单独排序 按数字顺序对数字进行排序 + 货币 + 数字 + 标点符号 + 空白字符 + 符号 对所有内容进行排序 + 全部 只对基本字母进行排序 + 仅限基础字母 对重音/大小写/长度/假名进行排序 + 基础字符、重音、大小写、变体、假名 对重音进行排序 + 基础字符、重音 对重音/大小写/长度进行排序 + 基础字符、重音、大小写、变体 全角 半角 数字 默认 表情符号 文字 + 12小时制 + 12 + 24小时制 + 24 12小时制(0–11) 12 (0–11) 12小时制(1–12) @@ -1366,6 +1406,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24小时制(1–24) 24 (1–24) + Shift+Space、标点符号、所有符号 + Shift+Space、标点符号 + Shift+Space、标点符号 + Shift+Space、标点符号、非货币符号 宽松换行样式 宽松 正常换行样式 @@ -1387,8 +1431,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿霍姆数字 阿拉伯-印度数字 扩展阿拉伯-印度数字 + 扩展阿拉伯-印度数字 亚美尼亚数字 亚美尼亚小写数字 + 亚美尼亚小写体 巴厘文数字 孟加拉数字 婆罗米数字 @@ -1399,57 +1445,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 迪维西阿库鲁数字 埃塞俄比亚数字 金融数字 + 财务 全角数字 + 全角 格鲁吉亚数字 马萨拉姆冈德数字 马萨拉姆冈德数字 希腊数字 希腊小写数字 + 希腊小写体 古吉拉特数字 果鲁穆奇数字 + 传统历法的汉字日期编号 中文十进制数字 + 中文数字十进制记数法 简体中文数字 简体中文大写数字 + 简体中文财务 繁体中文数字 繁体中文大写数字 + 繁体中文财务 希伯来数字 杨松录苗文数字 尼亚肯蒲丘苗文数字 爪哇文数字 日文数字 日文大写数字 + 日文财务 + 日本元年纪年法 克耶字母数字 卡维数字 高棉数字 卡纳达数字 老傣文数字 兰纳文数字 + 傣昙文(宗教用) 老挝数字 西方数字 雷布查文数字 林布文数字 数学粗体数字 + 数学粗体 数学空心数字 + 数学双线体 数学等宽数字 + 数学等宽体 数学无衬线粗体数字 + 数学无衬线粗体 数学无衬线数字 + 数学无衬线体 马拉雅拉姆数字 莫迪数字 蒙古文数字 谬文数字 曼尼普尔数字 缅甸数字 + 缅甸东波克伦文 + 缅甸勃欧文 缅甸掸文数字 + 缅甸掸文 缅甸泰兰数字 + 缅甸傣亮文 当地数字 + 当地数字 曼德数字 桑塔利文数字 奥里亚数字 奥斯曼数字 + 轮廓体 哈乃斐罗兴亚数字 罗马数字 + 罗马大写体 罗马小写数字 + 罗马小写体 索拉什特拉文数字 + 数码管 夏拉达数字 库达瓦迪数字 僧伽罗文数字 @@ -1459,18 +1529,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 新傣仂文数字 传统泰米尔数字 泰米尔数字 + 现代泰米尔文 泰卢固数字 泰文数字 藏文数字 迈蒂利数字 坦萨数字 传统数字 + 传统数字 瓦伊文数字 瓦郎奇蒂数字 万秋数字 关闭 开启 + 未特别指明的机器翻译 + POSIX 变体 + + 关闭 + 开启 + 公制 英制 @@ -1537,6 +1615,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + {1} {0} @@ -2151,17 +2232,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M月d日 Gy年 Gy年 - Gy年M月 + G y/M G y/M/d G y/M/dE Gy年M月 Gy年M月d日 - Gy年MM月d日E + Gy年M月d日E Gy年M月 Gy年第Q季度 Gy年第Q季度 + + {0}–{1} + {0}–{1} + {0} – {1} Bh时至Bh时 @@ -2257,6 +2342,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M月d日E至d日E M月d日E至M月d日E + + M月d–d日 + M月d日–M月d日 + Gy–y年 @@ -2456,6 +2545,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} @@ -2497,6 +2589,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Gy年M月 Gy年M月d日 Gy年M月d日E + Gy年M月 + Gy年M月d日 + Gy年M月d日E ah时 H时 ah:mm @@ -2514,6 +2609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M月d日 M月d日E M月d日 + M月d日E MMMM第W周 y年 y/M @@ -2525,14 +2621,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y年M月d日 y年M月d日E y年M月 + y年M月d日 + y年M月d日E y年第Q季度 y年第Q季度 Y年第w周 - {1}{0} + {0}{1} + {0}{1} + {1}{0} + {1}{0} + {1} {0} + + {0} – {1} + {0} – {1} Bh时至Bh时 @@ -2631,6 +2736,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M月d日E至d日E M月d日E至M月d日E + + M月d–d日 + M月d日–M月d日 + y–y年 @@ -2868,11 +2977,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - Gy/M - Gy-MM-dd E + Gy/M/dE M月 - M-d - M-dE LLL Gy/M/d Gy/M/dE @@ -2915,413 +3021,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 大化 (645–650) - 白雉 (650–671) - 白凤 (672–686) - 朱鸟 (686–701) - 大宝 (701–704) - 庆云 (704–708) - 和铜 (708–715) - 灵龟 (715–717) - 养老 (717–724) - 神龟 (724–729) - 天平 (729–749) - 天平感宝 (749–749) - 天平胜宝 (749–757) - 天平宝字 (757–765) - 天平神护 (765–767) - 神护景云 (767–770) - 宝龟 (770–780) - 天应 (781–782) - 延历 (782–806) - 大同 (806–810) - 弘仁 (810–824) - 天长 (824–834) - 承和 (834–848) - 嘉祥 (848–851) - 仁寿 (851–854) - 齐衡 (854–857) - 天安 (857–859) - 贞观 (859–877) - 元庆 (877–885) - 仁和 (885–889) - 宽平 (889–898) - 昌泰 (898–901) - 延喜 (901–923) - 延长 (923–931) - 承平 (931–938) - 天庆 (938–947) - 天历 (947–957) - 天德 (957–961) - 应和 (961–964) - 康保 (964–968) - 安和 (968–970) - 天禄 (970–973) - 天延 (973–976) - 贞元 (976–978) - 天元 (978–983) - 永观 (983–985) - 宽和 (985–987) - 永延 (987–989) - 永祚 (989–990) - 正历 (990–995) - 长德 (995–999) - 长保 (999–1004) - 宽弘 (1004–1012) - 长和 (1012–1017) - 宽仁 (1017–1021) - 治安 (1021–1024) - 万寿 (1024–1028) - 长元 (1028–1037) - 长历 (1037–1040) - 长久 (1040–1044) - 宽德 (1044–1046) - 永承 (1046–1053) - 天喜 (1053–1058) - 康平 (1058–1065) - 治历 (1065–1069) - 延久 (1069–1074) - 承保 (1074–1077) - 正历 (1077–1081) - 永保 (1081–1084) - 应德 (1084–1087) - 宽治 (1087–1094) - 嘉保 (1094–1096) - 永长 (1096–1097) - 承德 (1097–1099) - 康和 (1099–1104) - 长治 (1104–1106) - 嘉承 (1106–1108) - 天仁 (1108–1110) - 天永 (1110–1113) - 永久 (1113–1118) - 元永 (1118–1120) - 保安 (1120–1124) - 天治 (1124–1126) - 大治 (1126–1131) - 天承 (1131–1132) - 长承 (1132–1135) - 保延 (1135–1141) - 永治 (1141–1142) - 康治 (1142–1144) - 天养 (1144–1145) - 久安 (1145–1151) - 仁平 (1151–1154) - 久寿 (1154–1156) - 保元 (1156–1159) - 平治 (1159–1160) - 永历 (1160–1161) - 应保 (1161–1163) - 长宽 (1163–1165) - 永万 (1165–1166) - 仁安 (1166–1169) - 嘉应 (1169–1171) - 承安 (1171–1175) - 安元 (1175–1177) - 治承 (1177–1181) - 养和 (1181–1182) - 寿永 (1182–1184) - 元历 (1184–1185) - 文治 (1185–1190) - 建久 (1190–1199) - 正治 (1199–1201) - 建仁 (1201–1204) - 元久 (1204–1206) - 建永 (1206–1207) - 承元 (1207–1211) - 建历 (1211–1213) - 建保 (1213–1219) - 承久 (1219–1222) - 贞应 (1222–1224) - 元仁 (1224–1225) - 嘉禄 (1225–1227) - 安贞 (1227–1229) - 宽喜 (1229–1232) - 贞永 (1232–1233) - 天福 (1233–1234) - 文历 (1234–1235) - 嘉祯 (1235–1238) - 历仁 (1238–1239) - 延应 (1239–1240) - 仁治 (1240–1243) - 宽元 (1243–1247) - 宝治 (1247–1249) - 建长 (1249–1256) - 康元 (1256–1257) - 正嘉 (1257–1259) - 正元 (1259–1260) - 文应 (1260–1261) - 弘长 (1261–1264) - 文永 (1264–1275) - 建治 (1275–1278) - 弘安 (1278–1288) - 正应 (1288–1293) - 永仁 (1293–1299) - 正安 (1299–1302) - 干元 (1302–1303) - 嘉元 (1303–1306) - 德治 (1306–1308) - 延庆 (1308–1311) - 应长 (1311–1312) - 正和 (1312–1317) - 文保 (1317–1319) - 元应 (1319–1321) - 元亨 (1321–1324) - 正中 (1324–1326) - 嘉历 (1326–1329) - 元德 (1329–1331) - 元弘 (1331–1334) - 建武 (1334–1336) - 延元 (1336–1340) - 兴国 (1340–1346) - 正平 (1346–1370) - 建德 (1370–1372) - 文中 (1372–1375) - 天授 (1375–1379) - 康历 (1379–1381) - 弘和 (1381–1384) - 元中 (1384–1392) - 至德 (1384–1387) - 嘉庆 (1387–1389) - 康应 (1389–1390) - 明德 (1390–1394) - 应永 (1394–1428) - 正长 (1428–1429) - 永享 (1429–1441) - 嘉吉 (1441–1444) - 文安 (1444–1449) - 宝德 (1449–1452) - 享德 (1452–1455) - 康正 (1455–1457) - 长禄 (1457–1460) - 宽正 (1460–1466) - 文正 (1466–1467) - 应仁 (1467–1469) - 文明 (1469–1487) - 长享 (1487–1489) - 延德 (1489–1492) - 明应 (1492–1501) - 文龟 (1501–1504) - 永正 (1504–1521) - 大永 (1521–1528) - 享禄 (1528–1532) - 天文 (1532–1555) - 弘治 (1555–1558) - 永禄 (1558–1570) - 元龟 (1570–1573) - 天正 (1573–1592) - 文禄 (1592–1596) - 庆长 (1596–1615) - 元和 (1615–1624) - 宽永 (1624–1644) - 正保 (1644–1648) - 庆安 (1648–1652) - 承应 (1652–1655) - 明历 (1655–1658) - 万治 (1658–1661) - 宽文 (1661–1673) - 延宝 (1673–1681) - 天和 (1681–1684) - 贞享 (1684–1688) - 元禄 (1688–1704) - 宝永 (1704–1711) - 正德 (1711–1716) - 享保 (1716–1736) - 元文 (1736–1741) - 宽保 (1741–1744) - 延享 (1744–1748) - 宽延 (1748–1751) - 宝历 (1751–1764) - 明和 (1764–1772) - 安永 (1772–1781) - 天明 (1781–1789) - 宽政 (1789–1801) - 享和 (1801–1804) - 文化 (1804–1818) - 文政 (1818–1830) - 天保 (1830–1844) - 弘化 (1844–1848) - 嘉永 (1848–1854) - 安政 (1854–1860) - 万延 (1860–1861) - 文久 (1861–1864) - 元治 (1864–1865) - 庆应 (1865–1868) 明治 大正 昭和 平成 令和 - - 大化(645–650) - 白雉(650–671) - 白凤(672–686) - 朱鸟(686–701) - 大宝(701–704) - 庆云(704–708) - 和铜(708–715) - 灵龟(715–717) - 养老(717–724) - 神龟(724–729) - 天平(729–749) - 天平感宝(749–749) - 天平胜宝(749–757) - 天平宝字(757–765) - 天平神护(765–767) - 神护景云(767–770) - 宝龟(770–780) - 天应(781–782) - 延历(782–806) - 大同(806–810) - 弘仁(810–824) - 天长(824–834) - 承和(834–848) - 嘉祥(848–851) - 仁寿(851–854) - 齐衡(854–857) - 天安(857–859) - 贞观(859–877) - 元庆(877–885) - 仁和(885–889) - 宽平(889–898) - 昌泰(898–901) - 延喜(901–923) - 延长(923–931) - 承平(931–938) - 天庆(938–947) - 天历(947–957) - 天德(957–961) - 应和(961–964) - 康保(964–968) - 安和(968–970) - 天禄(970–973) - 天延(973–976) - 贞元(976–978) - 天元(978–983) - 永观(983–985) - 宽和(985–987) - 永延(987–989) - 永祚(989–990) - 正历(990–995) - 长德(995–999) - 长保(999–1004) - 宽弘(1004–1012) - 长和(1012–1017) - 宽仁(1017–1021) - 治安(1021–1024) - 万寿(1024–1028) - 长元(1028–1037) - 长历(1037–1040) - 长久(1040–1044) - 宽德(1044–1046) - 永承(1046–1053) - 天喜(1053–1058) - 康平(1058–1065) - 治历(1065–1069) - 延久(1069–1074) - 承保(1074–1077) - 承历(1077–1081) - 永保(1081–1084) - 应德(1084–1087) - 宽治(1087–1094) - 嘉保(1094–1096) - 永长(1096–1097) - 承德(1097–1099) - 康和(1099–1104) - 长治(1104–1106) - 嘉承(1106–1108) - 天仁(1108–1110) - 天永(1110–1113) - 永久(1113–1118) - 元永(1118–1120) - 保安(1120–1124) - 天治(1124–1126) - 大治(1126–1131) - 天承(1131–1132) - 长承(1132–1135) - 保延(1135–1141) - 永治(1141–1142) - 康治(1142–1144) - 天养(1144–1145) - 久安(1145–1151) - 仁平(1151–1154) - 久寿(1154–1156) - 保元(1156–1159) - 平治(1159–1160) - 永历(1160–1161) - 应保(1161–1163) - 长宽(1163–1165) - 永万(1165–1166) - 仁安(1166–1169) - 嘉应(1169–1171) - 承安(1171–1175) - 安元(1175–1177) - 治承(1177–1181) - 养和(1181–1182) - 寿永(1182–1184) - 元历(1184–1185) - 文治(1185–1190) - 建久(1190–1199) - 正治(1199–1201) - 建仁(1201–1204) - 元久(1204–1206) - 建永(1206–1207) - 承元(1207–1211) - 建历(1211–1213) - 建保(1213–1219) - 承久(1219–1222) - 贞应(1222–1224) - 元仁(1224–1225) - 嘉禄(1225–1227) - 安贞(1227–1229) - 宽喜(1229–1232) - 贞永(1232–1233) - 天福(1233–1234) - 文历(1234–1235) - 嘉祯(1235–1238) - 历仁(1238–1239) - 延应(1239–1240) - 仁治(1240–1243) - 宽元(1243–1247) - 宝治(1247–1249) - 建长(1249–1256) - 康元(1256–1257) - 正嘉(1257–1259) - 正元(1259–1260) - 文应(1260–1261) - 弘长(1261–1264) - 文永(1264–1275) - 建治(1275–1278) - 弘安(1278–1288) - 正应(1288–1293) - 永仁(1293–1299) - 正安(1299–1302) - 乾元(1302–1303) - 嘉元(1303–1306) - 德治(1306–1308) - 延庆(1308–1311) - 应长(1311–1312) - 正和(1312–1317) - 文保(1317–1319) - 元应(1319–1321) - 元亨(1321–1324) - 正中(1324–1326) - 嘉历(1326–1329) - 元德(1329–1331) - 元弘(1331–1334) - 建武(1334–1336) - 延元(1336–1340) - 兴国(1340–1346) - 正平(1346–1370) - 建德(1370–1372) - 文中(1372–1375) - 天授(1375–1379) - 康历(1379–1381) - 弘和(1381–1384) - 元中(1384–1392) - 明德(1384–1387) - @@ -3347,6 +3052,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + - + {1} {0} @@ -4134,9 +3842,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 利伯维尔 - - 英国夏令时间 - 伦敦 @@ -4227,9 +3932,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 查亚普拉 - - 爱尔兰标准时间 - 都柏林 @@ -4964,13 +4666,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿拉斯加夏令时间 - - - 阿拉木图时间 - 阿拉木图标准时间 - 阿拉木图夏令时间 - - 亚马逊时间 @@ -5020,20 +4715,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿皮亚夏令时间 - - - 阿克套时间 - 阿克套标准时间 - 阿克套夏令时间 - - - - - 阿克托别时间 - 阿克托别标准时间 - 阿克托别夏令时间 - - 阿拉伯时间 @@ -5135,6 +4816,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 巴西利亚夏令时间 + + + 英国时间 + 英国夏令时间 + + 文莱达鲁萨兰时间 @@ -5313,6 +5000,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 格林尼治标准时间 + + + 格陵兰岛时间 + 格陵兰岛标准时间 + 格陵兰岛夏令时间 + + 格陵兰岛东部时间 @@ -5327,11 +5021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 格陵兰岛西部夏令时间 - - - 关岛时间 - - 海湾标准时间 @@ -5344,7 +5033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 夏威夷-阿留申标准时间 + 夏威夷-阿留申标准时 @@ -5405,6 +5094,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 伊朗夏令时间 + + + 爱尔兰时间 + 爱尔兰标准时间 + + 伊尔库茨克时间 @@ -5472,11 +5167,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 吉尔吉斯斯坦时间 - - - 兰卡时间 - - 莱恩群岛时间 @@ -5489,13 +5179,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 豪勋爵岛夏令时间 - - - 澳门时间 - 澳门标准时间 - 澳门夏令时间 - - 马加丹时间 @@ -5611,11 +5294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 费尔南多-迪诺罗尼亚岛夏令时间 - - - 北马里亚纳群岛时间 - - 新西伯利亚时间 @@ -5695,13 +5373,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 平壤时间 - - - 克孜洛尔达时间 - 克孜洛尔达标准时间 - 克孜洛尔达夏令时间 - - 留尼汪时间 @@ -5728,9 +5399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 萨摩亚时间 萨摩亚标准时间 - 萨摩亚夏令时间 @@ -5823,6 +5492,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 乌拉圭夏令时间 + + + 乌鲁木齐时间 + + 乌兹别克斯坦时间 @@ -5996,6 +5670,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 0 + ¤ 0K ¤0万 ¤ 0万 ¤00万 @@ -6289,9 +5964,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 人民币(离岸) - - 中国人民银行元 - 人民币 ¥ @@ -6931,7 +6603,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 加勒比盾 - 加勒比盾 特别提款权 @@ -7015,7 +6686,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 津巴布韦金元 - 津巴布韦金元 津巴布韦元 (2009) @@ -7141,10 +6811,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 毫摩尔/升 每升{0}毫摩尔 - - 份 - {0}份 - 百万分之{0} @@ -7471,10 +7137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 牛顿米 {0}牛顿米 - - 公制液量盎司 - {0}公制液量盎司 - 英制甜点匙 {0}英制甜点匙 @@ -7519,14 +7181,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 贝克勒尔 {0}贝克勒尔 - - 西弗 - {0} 西弗 - - - 戈瑞 - {0}戈瑞 - 千克力 {0}千克力 @@ -7540,7 +7194,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}韦伯 - 十亿分比 + 十亿分率 十亿分之{0} @@ -8046,11 +7700,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 西弗 - {0}西弗 戈瑞 - {0}戈瑞 {0}kgf @@ -8143,17 +7795,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmol/L - - 份 - {0}份 - {0}mol - - Glc - {0}Glc - {0}L/km @@ -8424,9 +8068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}mmHg - - {0}Hg - {0}psi @@ -8595,12 +8236,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 英制夸脱 {0}qt-Imp. - - {0}sr - - - {0}kat - cal-IT {0}cal-IT @@ -8609,23 +8244,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}Bq + Sv {0}Sv + Gy {0}Gy - - {0}kgf - - - {0}T - - - {0}Wb - - - {0}ppb - {0}E {0}N diff --git a/make/data/cldr/common/main/zh_Hant.xml b/make/data/cldr/common/main/zh_Hant.xml index 5ddfcb40fbda..82fbf960d791 100644 --- a/make/data/cldr/common/main/zh_Hant.xml +++ b/make/data/cldr/common/main/zh_Hant.xml @@ -352,7 +352,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 利洛威特文 利伏尼亞文 拉科塔文 - 拉定文 + 拉定文 倫巴底文 林加拉文 寮文 @@ -1261,18 +1261,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 排序 正規化排序 數字排序 + 語系文字/區塊重新排序 排序強度 貨幣 + 轉換目標 + 字典斷詞排除項目 表情符號展示 + 一週起始日 + 混合 時間週期(12 小時制與 24 小時制) + 輸入法 + 鍵盤 + 略過的最高級別項目 換行樣式 單字內的換行 + 轉換規則 度量單位系統 + 度量單位 數字 + 補充資料專用區域 + 轉換來源 + 區域次分區 縮寫後斷句 + 轉換 + 機器翻譯 時區 區域變異 私人使用 + 私人使用轉換 佛曆 @@ -1292,16 +1308,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 希伯來曆 希伯來曆 印度國曆 + 印度國定曆 伊斯蘭曆 伊斯蘭曆 伊斯蘭民用曆 表格式伊斯蘭曆(民用紀元) 伊斯蘭新月曆 + 伊斯蘭曆(沙烏地阿拉伯觀月制) 伊斯蘭天文曆 表格式伊斯蘭曆(天文紀元) 伊斯蘭曆(烏姆庫拉) 伊斯蘭曆(烏姆庫拉) ISO 8601 國際曆法 + 公曆 和曆 和曆 波斯曆 @@ -1317,8 +1336,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 正常排序重音 依反向重音排序 優先排序小寫 + 小寫 正常大小寫順序排序 + 小寫 優先排序大寫 + 大寫 不分大小寫排序 依大小寫排序 舊制排序 @@ -1328,7 +1350,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 預設 Unicode 排序 預設 Unicode 表情符號 + 表情符號 歐洲排序規則 + 歐洲規則 電話簿排序 電話簿 發音排序 @@ -1338,6 +1362,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 一般用途搜尋 搜尋 依諺文聲母搜尋 + 韓文初聲子音 標準排序 標準 筆畫排序 @@ -1352,17 +1377,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 依正規化排序 Unicode 個別排序數字 依數字順序排序數字 + 貨幣 + 數字 + 標點符號 + 空白字元 + 符號 全部排序 + 全部 僅排序基礎字母 + 僅限基礎字母 排序重音/大小寫/全半形/假名 + 基礎、重音、大小寫、變體、假名 排序重音 + 基礎、重音 排序重音/大小寫/全半形 + 基礎、重音、大小寫、變體 全形 半形 數字 預設 表情符號 文字 + 12 小時制 + 12 + 24 小時制 + 24 12 小時制 (0–11) 12 (0–11) 12 小時制 (1–12) @@ -1371,6 +1410,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 24 (0–23) 24 小時制 (1–24) 24 (1–24) + 略過空格、標點符號、所有符號 + 略過空格、標點符號 + 略過空格、標點符號 + 略過空格、標點符號、非貨幣符號 寬鬆換行樣式 寬鬆 一般換行樣式 @@ -1392,8 +1435,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿洪姆數字 阿拉伯-印度數字 阿拉伯-印度擴充數字 + 阿拉伯-印度擴充 亞美尼亞數字 小寫亞美尼亞數字 + 小寫亞美尼亞 峇里文數字 孟加拉數字 婆羅米數字 @@ -1403,37 +1448,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 梵文數字 衣索比亞數字 金融數字 + 財務 全形數字 + 全形 喬治亞數字 馬薩拉姆貢地數字 希臘數字 小寫希臘數字 + 小寫希臘 古吉拉特數字 古爾穆奇數字 + 傳統曆法的漢字日期計數方式 中文十進位數字 + 使用中文數字表意文字為數碼的位值十進位制 小寫簡體中文數字 大寫簡體中文數字 + 大寫簡體中文 小寫繁體中文數字 大寫繁體中文數字 + 大寫繁體中文 希伯來數字 帕哈苗數字 爪哇文數字 小寫日文數字 大寫日文數字 + 大寫日文 + 日文元年紀年法 克耶數字 高棉數字 坎那達數字 老傣文數字 蘭納文數字 + 蘭納文(宗教用) 寮國數字 阿拉伯數字 西納文數字 林布文數字 數學粗體數字 + 數學粗體 數學雙重數字 + 數學雙線體 數學等寬數字 + 數學等寬體 數學無襯線粗體數字 + 數學無襯線粗體 數學無襯線數字 + 數學無襯線體 馬來亞拉姆數字 莫笛數字 蒙古數字 @@ -1441,17 +1501,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 曼尼普爾數字 緬甸數字 緬甸東山地克倫數字 + 緬甸東部波克倫族 緬甸勃歐數字 + 緬甸巴歐族 緬甸撣文數字 + 緬甸撣族 緬甸傣族數字 + 緬甸紅傣族 原始數字 + 原始數字 曼德數字 桑塔利文數字 歐迪亞數字 奧斯曼亞數字 + 輪廓 羅馬數字 + 大寫羅馬 小寫羅馬數字 + 小寫羅馬 索拉什特拉文數字 + 分段 夏拉達數字 信德數字 僧伽羅數字 @@ -1461,16 +1530,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 新傣仂文數字 坦米爾數字 坦米爾數字 + 現代坦米爾 泰盧固數字 泰文數字 藏文數字 提爾胡塔數字 傳統數字 + 傳統數字 瓦伊文數字 瓦蘭齊地數字 關閉 開啟 + 未指定的機器翻譯 + POSIX 變體 + + 關閉 + 開啟 + 公制 英制 @@ -2235,6 +2312,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ G y年QQQQ + + {0}日至{1}日 + d日至d日 @@ -2288,6 +2368,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL至LLLL + + M月d日–d日 + M月d日–M月d日 + G y至y @@ -2473,13 +2557,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + / + {1} {0} - - {1} {0} - {1}{0} @@ -2488,9 +2572,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - - {1} {0} - {1}{0} @@ -2499,9 +2580,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {1} {0} - - {1} {0} - {1}{0} @@ -2533,6 +2611,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Gy年M月 Gy年M月d日 Gy年M月d日 E + Gy年M月 + Gy年M月d日 + Gy年M月d日 E Bh時 H時 Bh:mm @@ -2550,6 +2631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ M月d日 M月d日E M月d日 + M月d日E MMMM的第W週 y年 y/M @@ -2561,11 +2643,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ y年M月d日 y年M月d日E y年M月 + y年M月d日 + y年M月d日 E y年QQQ y年QQQQ Y年的第w週 + + {1} {0} + {0}{1} + {1}{0} + {1}{0} + + + {0}–{1}日 + Bh時 – Bh時 Bh–h時 @@ -2677,6 +2770,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ LLLL至LLLL + + MMMMd日–d日 + M月d日至M月d日 + y至y @@ -2919,238 +3016,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 大化 - 白雉 - 白鳳 - 朱鳥 - 大寶 - 慶雲 - 和銅 - 靈龜 - 養老 - 神龜 - 天平 - 天平感寶 - 天平勝寶 - 天平寶字 - 天平神護 - 神護景雲 - 寶龜 - 天應 - 延曆 - 大同 - 弘仁 - 天長 - 承和 - 嘉祥 - 仁壽 - 齊衡 - 天安 - 貞觀 - 元慶 - 仁和 - 寬平 - 昌泰 - 延喜 - 延長 - 承平 - 天慶 - 天曆 - 天德 - 應和 - 康保 - 安和 - 天祿 - 天延 - 貞元 - 天元 - 永觀 - 寬和 - 永延 - 永祚 - 正曆 - 長德 - 長保 - 寬弘 - 長和 - 寬仁 - 治安 - 萬壽 - 長元 - 長曆 - 長久 - 寬德 - 永承 - 天喜 - 康平 - 治曆 - 延久 - 承保 - 承曆 - 永保 - 應德 - 寬治 - 嘉保 - 永長 - 承德 - 康和 - 長治 - 嘉承 - 天仁 - 天永 - 永久 - 元永 - 保安 - 天治 - 大治 - 天承 - 長承 - 保延 - 永治 - 康治 - 天養 - 久安 - 仁平 - 久壽 - 保元 - 平治 - 永曆 - 應保 - 長寬 - 永萬 - 仁安 - 嘉應 - 承安 - 安元 - 治承 - 養和 - 壽永 - 元曆 - 文治 - 建久 - 正治 - 建仁 - 元久 - 建永 - 承元 - 建曆 - 建保 - 承久 - 貞應 - 元仁 - 嘉祿 - 安貞 - 寬喜 - 貞永 - 天福 - 文曆 - 嘉禎 - 曆仁 - 延應 - 仁治 - 寬元 - 寶治 - 建長 - 康元 - 正嘉 - 正元 - 文應 - 弘長 - 文永 - 建治 - 弘安 - 正應 - 永仁 - 正安 - 乾元 - 嘉元 - 德治 - 延慶 - 應長 - 正和 - 文保 - 元應 - 元亨 - 正中 - 嘉曆 - 元德 - 元弘 - 建武 - 延元 - 興國 - 正平 - 建德 - 文中 - 天授 - 康曆 - 弘和 - 元中 - 至德 - 嘉慶 - 康應 - 明德 - 應永 - 正長 - 永享 - 嘉吉 - 文安 - 寶德 - 享德 - 康正 - 長祿 - 寬正 - 文正 - 應仁 - 文明 - 長享 - 延德 - 明應 - 文龜 - 永正 - 大永 - 享祿 - 天文 - 弘治 - 永祿 - 元龜 - 天正 - 文祿 - 慶長 - 元和 - 寬永 - 正保 - 慶安 - 承應 - 明曆 - 萬治 - 寬文 - 延寶 - 天和 - 貞享 - 元祿 - 寶永 - 正德 - 享保 - 元文 - 寬保 - 延享 - 寬延 - 寶曆 - 明和 - 安永 - 天明 - 寬政 - 享和 - 文化 - 文政 - 天保 - 弘化 - 嘉永 - 安政 - 萬延 - 文久 - 元治 - 慶應 明治 大正 昭和 @@ -3158,238 +3023,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 令和 - 大化 - 白雉 - 白鳳 - 朱鳥 - 大寶 - 慶雲 - 和銅 - 靈龜 - 養老 - 神龜 - 天平 - 天平感寶 - 天平勝寶 - 天平寶字 - 天平神護 - 神護景雲 - 寶龜 - 天應 - 延曆 - 大同 - 弘仁 - 天長 - 承和 - 嘉祥 - 仁壽 - 齊衡 - 天安 - 貞觀 - 元慶 - 仁和 - 寬平 - 昌泰 - 延喜 - 延長 - 承平 - 天慶 - 天曆 - 天德 - 應和 - 康保 - 安和 - 天祿 - 天延 - 貞元 - 天元 - 永觀 - 寬和 - 永延 - 永祚 - 正曆 - 長德 - 長保 - 寬弘 - 長和 - 寬仁 - 治安 - 萬壽 - 長元 - 長曆 - 長久 - 寬德 - 永承 - 天喜 - 康平 - 治曆 - 延久 - 承保 - 承曆 - 永保 - 應德 - 寬治 - 嘉保 - 永長 - 承德 - 康和 - 長治 - 嘉承 - 天仁 - 天永 - 永久 - 元永 - 保安 - 天治 - 大治 - 天承 - 長承 - 保延 - 永治 - 康治 - 天養 - 久安 - 仁平 - 久壽 - 保元 - 平治 - 永曆 - 應保 - 長寬 - 永萬 - 仁安 - 嘉應 - 承安 - 安元 - 治承 - 養和 - 壽永 - 元曆 - 文治 - 建久 - 正治 - 建仁 - 元久 - 建永 - 承元 - 建曆 - 建保 - 承久 - 貞應 - 元仁 - 嘉祿 - 安貞 - 寬喜 - 貞永 - 天福 - 文曆 - 嘉禎 - 曆仁 - 延應 - 仁治 - 寬元 - 寶治 - 建長 - 康元 - 正嘉 - 正元 - 文應 - 弘長 - 文永 - 建治 - 弘安 - 正應 - 永仁 - 正安 - 乾元 - 嘉元 - 德治 - 延慶 - 應長 - 正和 - 文保 - 元應 - 元亨 - 正中 - 嘉曆 - 元德 - 元弘 - 建武 - 延元 - 興國 - 正平 - 建德 - 文中 - 天授 - 康曆 - 弘和 - 元中 - 至德 - 嘉慶 - 康應 - 明德 - 應永 - 正長 - 永享 - 嘉吉 - 文安 - 寶德 - 享德 - 康正 - 長祿 - 寬正 - 文正 - 應仁 - 文明 - 長享 - 延德 - 明應 - 文龜 - 永正 - 大永 - 享祿 - 天文 - 弘治 - 永祿 - 元龜 - 天正 - 文祿 - 慶長 - 元和 - 寬永 - 正保 - 慶安 - 承應 - 明曆 - 萬治 - 寬文 - 延寶 - 天和 - 貞享 - 元祿 - 寶永 - 正德 - 享保 - 元文 - 寬保 - 延享 - 寬延 - 寶曆 - 明和 - 安永 - 天明 - 寬政 - 享和 - 文化 - 文政 - 天保 - 弘化 - 嘉永 - 安政 - 萬延 - 文久 - 元治 - 慶應 明治 大正 昭和 @@ -3420,6 +3053,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ + + + {1} {0} + + {1} {0} @@ -4239,9 +3877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 自由市 - - 英國夏令時間 - 倫敦 @@ -4332,9 +3967,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 加亞布拉 - - 愛爾蘭標準時間 - 都柏林 @@ -5068,18 +4700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿拉斯加標準時間 阿拉斯加夏令時間 - - AKT - AKST - AKDT - - - - - 阿拉木圖時間 - 阿拉木圖標準時間 - 阿拉木圖夏令時間 - @@ -5094,11 +4714,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 中部標準時間 中部夏令時間 - - CT - CST - CDT - @@ -5106,11 +4721,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 東部標準時間 東部夏令時間 - - ET - EST - EDT - @@ -5118,11 +4728,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 山區標準時間 山區夏令時間 - - MT - MST - MDT - @@ -5130,11 +4735,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 太平洋標準時間 太平洋夏令時間 - - PT - PST - PDT - @@ -5150,20 +4750,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 阿皮亞夏令時間 - - - 阿克陶時間 - 阿克陶標準時間 - 阿克陶夏令時間 - - - - - 阿克托比時間 - 阿克托比標準時間 - 阿克托比夏令時間 - - 阿拉伯時間 @@ -5198,11 +4784,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 大西洋標準時間 大西洋夏令時間 - - AT - AST - ADT - @@ -5270,6 +4851,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 巴西利亞夏令時間 + + + 英國時間 + 英國夏令時間 + + 汶萊時間 @@ -5451,6 +5038,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ GMT + + + 格陵蘭時間 + 格陵蘭標準時間 + 格陵蘭夏令時間 + + 格陵蘭東部時間 @@ -5465,11 +5059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 格陵蘭西部夏令時間 - - - 關島標準時間 - - 波斯灣海域標準時間 @@ -5482,11 +5071,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 夏威夷-阿留申標準時間 + 夏威夷時間 - - HAST - @@ -5494,11 +5080,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 夏威夷-阿留申標準時間 夏威夷-阿留申夏令時間 - - HAT - HAST - HADT - @@ -5551,6 +5132,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 伊朗夏令時間 + + + 愛爾蘭時間 + 愛爾蘭標準時間 + + 伊爾庫次克時間 @@ -5618,11 +5205,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 吉爾吉斯時間 - - - 蘭卡時間 - - 萊恩群島時間 @@ -5635,13 +5217,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 豪勳爵島夏令時間 - - - 澳門時間 - 澳門標準時間 - 澳門夏令時間 - - 馬加丹時間 @@ -5757,11 +5332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 費爾南多 - 迪諾羅尼亞夏令時間 - - - 北馬里亞納群島時間 - - 新西伯利亞時間 @@ -5841,13 +5411,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 平壤時間 - - - 克孜勒奧爾達時間 - 克孜勒奧爾達標準時間 - 克孜勒奧爾達夏令時間 - - 留尼旺時間 @@ -5874,9 +5437,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - 薩摩亞時間 薩摩亞標準時間 - 薩摩亞夏令時間 @@ -5969,6 +5530,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 烏拉圭夏令時間 + + + 烏魯木齊時間 + + 烏茲別克時間 @@ -6378,7 +5944,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 厄利垂亞納可法 - 厄利垂亞納可法 西班牙比塞塔(會計單位) @@ -6600,7 +6165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 摩爾多瓦列伊 - 摩爾多瓦列伊 馬達加斯加阿里亞里 @@ -6678,11 +6242,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 奈及利亞奈拉 - 尼加拉瓜科多巴 + 尼加拉瓜科多巴(1988–1991) + 尼加拉瓜科多巴(1988–1991) 尼加拉瓜科多巴 - 尼加拉瓜科多巴 荷蘭盾 @@ -6925,7 +6489,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 中非法郎 - 中非法郎 白銀 @@ -6950,7 +6513,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 加勒比盾 - 加勒比盾 特殊提款權 @@ -6966,14 +6528,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 西非法郎 - 西非法郎 帕拉狄昂 太平洋法郎 - 太平洋法郎 白金 @@ -7036,7 +6596,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 辛巴威金 - 辛巴威金 辛巴威元 (2009) @@ -7120,11 +6679,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 每公升 {0} 毫莫耳 - 比例 {0} 比例 - 葡萄糖 {0} 葡萄糖 @@ -7308,10 +6865,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} 公升 每公升 {0} - - 公制液盎司 - {0}公制液盎司 - 每加侖 {0} @@ -7323,28 +6876,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0} 球面度 - 開特 {0} 開特 - 庫侖 {0} 庫侖 - 法拉 {0} 法拉 - 亨利 {0} 亨利 - 西門子 {0} 西門子 - - 卡路里-IT - 貝克勒 {0} 貝克勒 @@ -7369,10 +6914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ 韋伯 {0} 韋伯 - - 光速 - {0} 倍光速 - 十億分點濃度 {0} 十億分點濃度 @@ -8225,7 +7766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}個項目 - 比例 {0} 比例 @@ -8234,9 +7774,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}莫耳 - - 葡萄糖 - {0}升/公里 @@ -8406,10 +7943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}碼 - - {0}英尺 - {0}/英尺 - {0}吋 @@ -8618,10 +8151,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}公制杯 - - 公制液盎司 - {0}公制液盎司 - {0}英畝英尺 @@ -8679,27 +8208,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ {0}英制夸脫 - - 開特 - - - 庫侖 - - - 法拉 - - - 亨利 - {0} 亨利 - - - 西門子 - - - 卡路里-IT - - 光速 {0}倍光速 diff --git a/make/data/cldr/common/main/zh_Hant_HK.xml b/make/data/cldr/common/main/zh_Hant_HK.xml index 25b615278b9c..87eece59006f 100644 --- a/make/data/cldr/common/main/zh_Hant_HK.xml +++ b/make/data/cldr/common/main/zh_Hant_HK.xml @@ -200,29 +200,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic 蘇格蘭標準英語 + 轉換目的地 + 一星期的第一日 度量衡系統 + 測量單位 專用區 + 專用區轉換 埃塞俄比亞曆 埃塞俄比亞曆 埃塞俄比亞阿美德阿萊姆曆 埃塞俄比亞阿美德阿萊姆曆 + 印度曆 伊斯蘭曆(表格曆,民用紀元) + 伊斯蘭曆,沙特觀月 伊斯蘭曆(表格式,天文紀元) 詞典排序 詞典 + 只限基礎字母 + Shift 鍵、空格、標點符號、所有符號 + Shift 鍵、空格、標點符號 + Shift 鍵、空格、標點符號 + Shift 鍵、空格、標點符號、非貨幣符號。 英制 美制 天城體數字 埃塞俄比亞數字 格魯吉亞數字 + 小寫希臘文 + 傳統曆法漢字月日寫法 + 使用漢字數字計數的位置十進制 + 日本元年紀年法 卡納達數字 + 泰譚譚(教會用語) 老撾數字 + 數學等寬字體 + 數學無襯線字體 馬拉雅拉姆數字 奧里亞數字 + 大寫羅馬數字 + 小寫羅馬字 泰米爾數字 泰米爾數字 + 現代泰米爾 @@ -430,6 +451,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic Gy年QQQQ + + {0} – {1} + {0}–{1} + ah時至ah時 ah時至h時 @@ -654,6 +679,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + / + + + @@ -757,12 +789,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 星期幾 - - 星期幾 - - - 星期幾 - 上星期日 本星期日 @@ -1853,10 +1879,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic 等份 {0} 等份 - - 百萬分比 - {0} 百萬分比 - 公升/公里 {0} 公升/公里 @@ -2418,12 +2440,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}等份 - 百萬分比 {0} ppm - - {0}葡萄糖 - {0}L/100km @@ -2481,6 +2499,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}哩 + + {0} 每呎 + {0} pt @@ -2519,6 +2540,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic 公制液穴士 + {0} 公制液安士 {0}英液安士 @@ -2526,46 +2548,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic {0}英制甜品匙 - - 球面度 - {0}球面度 - - - {0}開特 - - - {0} 庫侖 - - - {0} 法拉 - {0} 卡路里-IT - 貝克 {0}貝克 - 希 {0}希 - 戈 {0}戈 - - 公斤力 - {0}公斤力 - - - 特斯拉 - {0}特斯拉 - - - 韋伯 - {0}韋伯 - {0}夜 diff --git a/make/data/cldr/common/main/zh_Latn.xml b/make/data/cldr/common/main/zh_Latn.xml deleted file mode 100644 index fa30b1094f15..000000000000 --- a/make/data/cldr/common/main/zh_Latn.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - -

} cells in the header row. @@ -128,28 +128,11 @@ public TableHeader styles(List styles) { return this; } - /** - * {@inheritDoc} - * - * @implSpec This implementation always returns {@code false}. - * - * @return {@code false} - */ - @Override - public boolean isEmpty() { - return false; - } - - @Override - public boolean write(Writer out, String newline, boolean atNewline) throws IOException { - return toContent().write(out, newline, atNewline); - } - /** * Converts this header to a {@link Content} object, for use in an {@link HtmlTree}. * @return a Content object */ - private Content toContent() { + public Content toContent() { Content header = new ContentBuilder(); int i = 0; for (Content cellContent : cellContents) { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java index 124fbce3c7f6..a347d6badb6a 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,7 +91,8 @@ public void buildPage() throws DocFileIOException { addTree(classTree.recordClasses(), "doclet.Record_Class_Hierarchy", mainContent); body.add(bodyContents .addMainContent(mainContent) - .setFooter(getFooter())); + .setFooter(getFooter()) + .toContent()); printHtmlDocument(null, "class tree", body); } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java index d7c865b8350f..63631365d193 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ * can be scrolled if necessary, and optional side and footer * contents that are only rendered if available. */ -public class BodyContents extends Content { +public class BodyContents { private final List mainContents = new ArrayList<>(); private Content side = null; @@ -71,29 +71,12 @@ public BodyContents setFooter(Content footer) { return this; } - /** - * {@inheritDoc} - * - * @implSpec This implementation always returns {@code false}. - * - * @return {@code false} - */ - @Override - public boolean isEmpty() { - return false; - } - - @Override - public boolean write(Writer out, String newline, boolean atNewline) throws IOException { - return toContent().write(out, newline, atNewline); - } - /** * Returns the HTML for the contents of the BODY element. * * @return the HTML */ - private Content toContent() { + public Content toContent() { if (header == null) throw new NullPointerException(); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java index e1ae97079872..3dea20442385 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java @@ -49,7 +49,7 @@ * * Many methods return the current object, to facilitate fluent builder-style usage. */ -public class Head extends Content { +public class Head { private final Runtime.Version docletVersion; private final ZonedDateTime generatedDate; private final DocPath pathToRoot; @@ -260,29 +260,12 @@ public Head addContent(Content... contents) { return this; } - /** - * {@inheritDoc} - * - * @implSpec This implementation always returns {@code false}. - * - * @return {@code false} - */ - @Override - public boolean isEmpty() { - return false; - } - - @Override - public boolean write(Writer out, String newline, boolean atNewline) throws IOException { - return toContent().write(out, newline, atNewline); - } - /** * Returns the HTML for the HEAD element. * * @return the HTML */ - private Content toContent() { + public Content toContent() { var head = HtmlTree.of(HtmlTag.HEAD) .add(getGeneratedBy(showTimestamp, generatedDate)) .add(HtmlTree.TITLE(title)); From 25ce7c2cbba3e803eb47ef71ee9e114bea024f9c Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Fri, 6 Nov 2026 13:08:39 +0000 Subject: [PATCH 031/110] 8396058: test/jdk/java/net/httpclient/http2/H2GoAwayPromptConnectionClose.java may fail intermittently if responseSubscriber is still null when connection close is processed Reviewed-by: djelinski, vyazici --- .../classes/jdk/internal/net/http/Stream.java | 72 ++++++++-- .../http2/H2GoAwayPromptConnectionClose.java | 133 +++++++++++++++++- 2 files changed, 188 insertions(+), 17 deletions(-) diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java index f879cb2956a0..e66f2dfd4f1b 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java @@ -138,7 +138,7 @@ class Stream extends ExchangeImpl { // The exception with which this stream was canceled. private final AtomicReference errorRef = new AtomicReference<>(); final CompletableFuture requestBodyCF = new MinimalFuture<>(); - volatile CompletableFuture responseBodyCF; + final CompletableFuture responseBodyCF = new MinimalFuture<>(); volatile BodySubscriber pendingResponseSubscriber; volatile boolean stopRequested; @@ -521,6 +521,30 @@ private void sendDataFrame(DataFrame frame) { } } + // Check whether we have an error, and if we have no pending data + // and FIN was not processed, complete the given cf exceptionally + // This avoids cancelling the response too early. + private void completeCfIfErrorAndNoPendingData(CompletableFuture cf) { + Throwable error = null; + inputQLock.lock(); + try { + // if the exchange is cancelled, and the scheduler is stopped, + // or we have no pending data, and we haven't reached the end of + // the stream, we need to cancel the cf. + // Otherwise, we will continue processing buffered data, even if + // we have an error. We will later report the error after the data + // has been processed if needed. + if (isCanceled() && (sched.isStopped() || (inputQ.isEmpty() && !endStreamReceived()))) { + error = getCancelCause(); + } + } finally { + inputQLock.unlock(); + } + if (error != null) { + cf.completeExceptionally(error); + } + } + // pushes entire response body into response subscriber // blocking when required by local or remote flow control CompletableFuture receiveData(BodySubscriber bodySubscriber, Executor executor) { @@ -530,13 +554,11 @@ CompletableFuture receiveData(BodySubscriber bodySubscriber, Executor exec // We want to allow the subscriber's getBody() method to block so it // can work with InputStreams. So, we offload execution. - responseBodyCF = ResponseSubscribers.getBodyAsync(executor, bodySubscriber, - new MinimalFuture<>(), this::cancelImpl); + var cf = ResponseSubscribers.getBodyAsync(executor, bodySubscriber, + responseBodyCF, this::cancelImpl); + assert responseBodyCF == cf; - if (isCanceled()) { - Throwable t = getCancelCause(); - responseBodyCF.completeExceptionally(t); - } + completeCfIfErrorAndNoPendingData(cf); sched.runOrSchedule(); // in case data waiting already to be processed, or error @@ -1357,6 +1379,7 @@ CompletableFuture getResponseAsync(Executor executor) { * uncompleted CF then creates one (completes it) and adds to list */ void completeResponse(Response resp) { + CompletableFuture toComplete = null; response_cfs_lock.lock(); try { CompletableFuture cf; @@ -1369,7 +1392,7 @@ void completeResponse(Response resp) { if (debug.on()) debug.log("Completing responseCF(%d) with response headers", i); response_cfs.remove(cf); - cf.complete(resp); + toComplete = cf; return; } else if (expectTimeoutRaised()) { Log.logTrace("Completing response (streamid={0}): {1}", @@ -1377,7 +1400,7 @@ void completeResponse(Response resp) { if (debug.on()) debug.log("Completing responseCF(%d) with response headers", i); // The Request will be removed in getResponseAsync() - cf.complete(resp); + toComplete = cf; return; } // else we found the previous response: just leave it alone. } @@ -1389,6 +1412,7 @@ void completeResponse(Response resp) { response_cfs.add(cf); } finally { response_cfs_lock.unlock(); + if (toComplete != null) toComplete.complete(resp); } } @@ -1432,6 +1456,7 @@ void responseReceived() { * same as above but for errors */ void completeResponseExceptionally(Throwable t) { + CompletableFuture toComplete = null; response_cfs_lock.lock(); try { // use index to avoid ConcurrentModificationException @@ -1440,13 +1465,14 @@ void completeResponseExceptionally(Throwable t) { CompletableFuture cf = response_cfs.get(i); if (!cf.isDone()) { response_cfs.remove(i); - cf.completeExceptionally(t); + toComplete = cf; return; } } response_cfs.add(MinimalFuture.failedFuture(t)); } finally { response_cfs_lock.unlock(); + if (toComplete != null) toComplete.completeExceptionally(t); } } @@ -1512,12 +1538,28 @@ void onProtocolError(final IOException cause, int code) { } void connectionClosing(Throwable cause) { - Flow.Subscriber subscriber = - responseSubscriber == null ? pendingResponseSubscriber : responseSubscriber; - errorRef.compareAndSet(null, cause); - if (subscriber != null && !sched.isStopped() && !inputQ.isEmpty()) { + boolean runScheduler = false; + // The inputQLock is needed to synchronize with the scheduler loop: + // if the scheduler loop pulls the last DATA frame that contains + // the END_STREAM, then without the lock, connectionClosing() + // may observe an empty inputQ and call cancelImpl() before + // the loop has a chance to call onComplete(). + inputQLock.lock(); + try { + errorRef.compareAndSet(null, cause); + if (!sched.isStopped() && !inputQ.isEmpty()) { + // avoid cancelling right away if we have buffered data. + runScheduler = true; + } + } finally { + inputQLock.unlock(); + } + if (runScheduler) { + requestBodyCF.complete(null); // no need to continue sending sched.runOrSchedule(); - } else cancelImpl(cause); + } else { + cancelImpl(cause); + } } // This method sends an RST_STREAM frame diff --git a/test/jdk/java/net/httpclient/http2/H2GoAwayPromptConnectionClose.java b/test/jdk/java/net/httpclient/http2/H2GoAwayPromptConnectionClose.java index a94d42c41434..960115f2dd3e 100644 --- a/test/jdk/java/net/httpclient/http2/H2GoAwayPromptConnectionClose.java +++ b/test/jdk/java/net/httpclient/http2/H2GoAwayPromptConnectionClose.java @@ -31,6 +31,7 @@ import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; +import java.net.http.HttpRequest.BodyPublisher; import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.nio.ByteBuffer; @@ -44,7 +45,11 @@ import java.util.Random; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLParameters; @@ -70,8 +75,8 @@ /* * @test - * @bug 8385131 8394607 - * @summary Verifies that if the HttpClient receives a GOAWAY frame on a HTTP/2 connection, + * @bug 8385131 8394607 8396058 + * @summary Verifies that if the HttpClient receives a GOAWAY frame on an HTTP/2 connection, * then the HttpClient terminates the connection as promptly as appropriate instead * of relying on the idle connection management to do so. Also verifies that if * the server closes the connection first, the client can still receive the response @@ -227,6 +232,130 @@ void testBufferedResponseReceived() throws Exception { } } + @Test + void testDelayedEmptyRequestBody() throws Exception { + sendDelayedRequestBody(""); + } + + @Test + void testDelayedRequestBody() throws Exception { + sendDelayedRequestBody("Un soir, t'en souvient-il? nous voguions en silence"); + } + + private void sendDelayedRequestBody(String requestBody) throws Exception{ + final InetSocketAddress serverAddr = server.getServerAddress(); + final URI reqURI = URIBuilder.newBuilder() + .scheme("https") + .host(serverAddr.getAddress()) + .port(serverAddr.getPort()) + .path(REQUEST_PATH) + .build(); + for (int i=0; i < 5; i++) { + assertEquals(0, connTerminationLatch.availablePermits()); + // released when the request body publisher is subscribed + var publisherReady = new Semaphore(0); + // released when we have pulled all response body bytes + var responseBodyObtained = new Semaphore(0); + // a reference to the publisher's thread + var publisherThread = new AtomicReference(); + // A delayed body publisher which will delay invonking onSubscribe + // on its subscriber until the connTerminationLatch has been released, + // and all response body bytes have been obtained + final DelayedBodyPublisher publisher = new DelayedBodyPublisher( + requestBody, + connTerminationLatch, + publisherReady, + responseBodyObtained, + publisherThread); + + final HttpRequest req = HttpRequest.newBuilder().version(HTTP_2) + .uri(reqURI) + .POST(publisher) + .header(XKEY, "yes") + .build(); + try { + System.out.printf("issuing request[%s]: %s%n", i, req); + System.err.printf("issuing request[%s]: %s%n", i, req); + final HttpResponse resp = client.send(req, BodyHandlers.ofInputStream()); + publisherReady.acquire(); // wait until the body publisher is subscribed + assertEquals(200, resp.statusCode(), "unexpected status code"); + assertEquals(HTTP_2, resp.version(), "unexpected HTTP version in response"); + System.out.println("Pulling response bytes"); + System.err.println("Pulling response bytes"); + byte[] bytes = resp.body().readAllBytes(); + assertArrayEquals(RESPONSE.getBytes(StandardCharsets.UTF_8), bytes); + System.out.printf("Got expected response for request[%s]%n", i); + System.err.printf("Got expected response for request[%s]%n", i); + } finally { + // tell the request body publisher that we got all the + // response bytes + responseBodyObtained.release(); + } + // wait for the publisher thread to finish + Thread thread = publisherThread.get(); + if (thread != null) { + System.out.println("Joining publisher's thread"); + System.err.println("Joining publisher's thread"); + thread.join(); + } + } + } + + record DelayedBodyPublisher(String requestBody, + Semaphore connectionClosed, + Semaphore publisherReady, + Semaphore responseAcquired, + AtomicReference threadRef) + implements BodyPublisher { + @Override + public void subscribe(Subscriber subscriber) { + DelayedSubscription subscription = + new DelayedSubscription(new AtomicBoolean(), this, subscriber); + threadRef.set(Thread.ofPlatform().start(new SubscriberTask(subscription))); + } + @Override + public long contentLength() {return requestBody.getBytes(StandardCharsets.UTF_8).length;} + } + record DelayedSubscription(AtomicBoolean completed, + DelayedBodyPublisher publisher, + Subscriber subscriber) implements Subscription { + @Override + public void request(long n) { + if (completed.compareAndSet(false, true)) { + if (publisher.contentLength() != 0) { + subscriber.onNext(ByteBuffer.wrap(publisher.requestBody().getBytes(StandardCharsets.UTF_8))); + } + subscriber.onComplete(); + } + } + @Override + public void cancel() { completed.compareAndSet(false, true);} + } + record SubscriberTask(DelayedSubscription subscription) implements Runnable { + @Override + public void run() { + DelayedBodyPublisher publisher = subscription.publisher(); + var subscriber = subscription.subscriber(); + try { + System.out.println("awaiting connection termination"); + System.err.println("awaiting connection termination"); + publisher.connectionClosed().acquire(); + publisher.publisherReady().release(); + System.out.println("awaiting response body"); + System.err.println("awaiting response body"); + publisher.responseAcquired().acquire(); + boolean noBody = publisher.contentLength() == 0; + subscriber.onSubscribe(subscription); + // complete immediately if no body + if (noBody && subscription.completed().compareAndSet(false, true)) { + subscriber.onComplete(); + } + } catch (Throwable t) { + subscriber.onError(t); + } + } + } + /* * The test requires fine-grained control over when the server sends the GOAWAY frame * over the HTTP/2 connection and also to detect that the client has closed the underlying From 9a49ee3b24b35cb4933ada616772039993b751ed Mon Sep 17 00:00:00 2001 From: Ashutosh Mehra Date: Fri, 6 Nov 2026 16:35:46 +0000 Subject: [PATCH 032/110] 8396839: Multiple AOTCache load failure message when the validation fails Reviewed-by: iklam, kvn --- src/hotspot/share/cds/aotMetaspace.cpp | 26 ++++++++++++++++---------- src/hotspot/share/cds/aotMetaspace.hpp | 7 +++++++ src/hotspot/share/cds/filemap.cpp | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp index a12b267ca7db..d26d9dec4170 100644 --- a/src/hotspot/share/cds/aotMetaspace.cpp +++ b/src/hotspot/share/cds/aotMetaspace.cpp @@ -114,6 +114,7 @@ ReservedSpace AOTMetaspace::_symbol_rs; VirtualSpace AOTMetaspace::_symbol_vs; +bool AOTMetaspace::_static_archive_validation_failed = false; bool AOTMetaspace::_archive_loading_failed = false; bool AOTMetaspace::_remapped_readwrite = false; void* AOTMetaspace::_aot_metaspace_static_top = nullptr; @@ -1027,11 +1028,7 @@ void AOTMetaspace::init_heap_settings() { // FLAG_SET_ERGO_IF_DEFAULT(AOTCompatibleOopCompression, true); } else if (CDSConfig::is_using_archive()) { - FileMapInfo* static_mapinfo = FileMapInfo::static_input_archive(); - // may have been opened by get_aot_code_region_size() - if (static_mapinfo == nullptr) { - static_mapinfo = open_static_archive(); - } + FileMapInfo* static_mapinfo = get_static_archive(); if (static_mapinfo != nullptr && static_mapinfo->header()->compatible_oop_compression()) { // Use the same setting as recorded in the archive. FLAG_SET_ERGO(AOTCompatibleOopCompression, true); @@ -1549,10 +1546,7 @@ void AOTMetaspace::initialize_runtime_shared_and_meta_spaces() { assert(CDSConfig::is_using_archive(), "Must be called when UseSharedSpaces is enabled"); MapArchiveResult result = MAP_ARCHIVE_OTHER_FAILURE; - FileMapInfo* static_mapinfo = FileMapInfo::static_input_archive(); // may have been opened by init_heap_settings() - if (static_mapinfo == nullptr) { - static_mapinfo = open_static_archive(); - } + FileMapInfo* static_mapinfo = get_static_archive(); // may have been opened by init_heap_settings() FileMapInfo* dynamic_mapinfo = nullptr; if (static_mapinfo != nullptr) { @@ -1636,7 +1630,7 @@ void AOTMetaspace::get_aot_code_region_size() { } else if (CDSConfig::is_using_archive()) { // production run with AOT code cache precond(FileMapInfo::static_input_archive() == nullptr); precond(CodeCache::max_capacity() == 0); - FileMapInfo* static_mapinfo = open_static_archive(); + FileMapInfo* static_mapinfo = get_static_archive(); if (static_mapinfo != nullptr) { FileMapRegion* aot_code_region = static_mapinfo->region_at(AOTMetaspace::ac); AOTCacheAccess::set_aot_code_region_size(aot_code_region->used_aligned()); @@ -1644,6 +1638,18 @@ void AOTMetaspace::get_aot_code_region_size() { } } +FileMapInfo* AOTMetaspace::get_static_archive() { + if (has_static_archive_validation_failed()) { + return nullptr; + } + FileMapInfo* static_mapinfo = FileMapInfo::static_input_archive(); + // may have already been opened; if not, open it now + if (static_mapinfo == nullptr) { + static_mapinfo = open_static_archive(); + } + return static_mapinfo; +} + FileMapInfo* AOTMetaspace::open_static_archive() { const char* static_archive = CDSConfig::input_static_archive_path(); assert(static_archive != nullptr, "sanity"); diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp index 40181b963901..d76b47ea8157 100644 --- a/src/hotspot/share/cds/aotMetaspace.hpp +++ b/src/hotspot/share/cds/aotMetaspace.hpp @@ -53,6 +53,7 @@ enum MapArchiveResult { class AOTMetaspace : AllStatic { static ReservedSpace _symbol_rs; // used only during -Xshare:dump static VirtualSpace _symbol_vs; // used only during -Xshare:dump + static bool _static_archive_validation_failed; static bool _archive_loading_failed; static bool _remapped_readwrite; static void* _aot_metaspace_static_top; @@ -96,6 +97,11 @@ class AOTMetaspace : AllStatic { static void print_on(outputStream* st); + static void set_static_archive_validation_failed() { + _static_archive_validation_failed = true; + } + static bool has_static_archive_validation_failed() { return _static_archive_validation_failed; } + static void set_archive_loading_failed() { _archive_loading_failed = true; } @@ -196,6 +202,7 @@ class AOTMetaspace : AllStatic { FileMapInfo* map_info, AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info); + static FileMapInfo* get_static_archive(); static FileMapInfo* open_static_archive(); static FileMapInfo* open_dynamic_archive(); // use_requested_addr: If true (default), attempt to map at the address the diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 43c92d393b47..9ef17b0923b9 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -1885,6 +1885,7 @@ bool FileMapInfo::open_as_input() { } else { AOTMetaspace::report_loading_error("Loading static archive failed."); } + AOTMetaspace::set_static_archive_validation_failed(); return false; } else { AOTMetaspace::report_loading_error("Loading dynamic archive failed."); From 1ffe92c66faf85d9795c0992928620dc2f22014d Mon Sep 17 00:00:00 2001 From: Larry Date: Fri, 6 Nov 2026 18:05:57 +0000 Subject: [PATCH 033/110] 8394260: x86: improve Adler32 intrinsic on AVX2 Reviewed-by: vpaprotski, kvn, jbhateja, aivy --- .../cpu/x86/stubGenerator_x86_64_adler.cpp | 552 +++++++++++------- .../compiler/intrinsics/zip/TestAdler32.java | 34 ++ .../openjdk/bench/java/util/TestAdler32.java | 6 +- 3 files changed, 389 insertions(+), 203 deletions(-) diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_adler.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_adler.cpp index a9424978e0e3..9f49382ca578 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_64_adler.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_adler.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2021, 2025, Intel Corporation. All rights reserved. +* Copyright (c) 2021, 2026, Intel Corporation. All rights reserved. * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -40,16 +40,20 @@ ATTRIBUTE_ALIGNED(64) static const juint ADLER32_ASCALE_TABLE[] = { 0x0000000CUL, 0x0000000DUL, 0x0000000EUL, 0x0000000FUL }; -ATTRIBUTE_ALIGNED(32) static const juint ADLER32_SHUF0_TABLE[] = { - 0xFFFFFF00UL, 0xFFFFFF01UL, 0xFFFFFF02UL, 0xFFFFFF03UL, - 0xFFFFFF04UL, 0xFFFFFF05UL, 0xFFFFFF06UL, 0xFFFFFF07UL -}; +// AVX2 weight tables for the vpmaddubsw/vpmaddwd dot product that computes +// the weighted byte sum used to update b. -ATTRIBUTE_ALIGNED(32) static const juint ADLER32_SHUF1_TABLE[] = { - 0xFFFFFF08UL, 0xFFFFFF09UL, 0xFFFFFF0AUL, 0xFFFFFF0BUL, - 0xFFFFFF0CUL, 0xFFFFFF0DUL, 0xFFFFFF0EUL, 0xFFFFFF0FUL +// ADLER32_DOT2V_TABLE covers bytes 0..31 with the weights 64..33, +ATTRIBUTE_ALIGNED(32) static const juint ADLER32_DOT2V_TABLE[] = { + 0x3D3E3F40UL, 0x393A3B3CUL, 0x35363738UL, 0x31323334UL, + 0x2D2E2F30UL, 0x292A2B2CUL, 0x25262728UL, 0x21222324UL }; +// ADLER32_DOT2V_0_TABLE covers bytes 32..63 with the weights 32..1. +ATTRIBUTE_ALIGNED(32) static const juint ADLER32_DOT2V_0_TABLE[] = { + 0x1D1E1F20UL, 0x191A1B1CUL, 0x15161718UL, 0x11121314UL, + 0x0D0E0F10UL, 0x090A0B0CUL, 0x05060708UL, 0x01020304UL +}; /*** * Arguments: @@ -76,265 +80,411 @@ address StubGenerator::generate_updateBytesAdler32() { StubCodeMark mark(this, stub_id); start = __ pc(); - // Choose an appropriate LIMIT for inner loop based on the granularity - // of intermediate results. For int, LIMIT of 5552 will ensure intermediate - // results does not overflow Integer.MAX_VALUE before modulo operations. + // Choose an appropriate LIMIT for the inner loop based on the granularity + // of intermediate results. For unsigned 32-bit values, LIMIT of 5552 + // ensures intermediate results do not overflow 2^32 before modulo operations. const int LIMIT = 5552; const int BASE = 65521; - const int CHUNKSIZE = 16; + const int DIV_BASE_MULTIPLIER_SHIFT = 47; + const uint32_t DIV_BASE_MULTIPLIER = 2147975281U; // ceil(2^47 / 65521) + const int CHUNKSIZE = 16; const int CHUNKSIZE_M1 = CHUNKSIZE - 1; - const Register init_d = c_rarg0; - const Register data = r9; - const Register size = r10; - const Register s = r11; - const Register a_d = r12; //r12d - const Register b_d = r8; //r8d - const Register end = r13; + // Reciprocal modulo reduction used by the AVX2 path and final scalar tail. + // The caller passes DIV_BASE_MULTIPLIER in multiplier. + // For the bounded unsigned 32-bit input x, this is equivalent to: + // q = x / BASE + // reg = x % BASE + auto reduce_mod_base = [&](const Register reg, const Register multiplier) { + assert_different_registers(reg, rax, rdx, multiplier); + __ movl(rax, reg); // x = reg + __ imulq(rax, multiplier); // x * multiplier + __ shrq(rax, DIV_BASE_MULTIPLIER_SHIFT); // q = x * multiplier >> DIV_BASE_MULTIPLIER_SHIFT + __ imull(rdx, rax, BASE); // q * BASE + __ subl(reg, rdx); // reg = x - q * BASE = x % BASE + }; + + // The _d suffix denotes a 32-bit (doubleword) value in the generated code; + const Register init_d = c_rarg0; // packed Adler value: B in high 16, A in low 16 + const Register a_d = r12; // Adler A; canonical between LIMIT blocks + const Register b_d = r8; // Adler B; canonical between LIMIT blocks + const Register data = r9; // current input pointer + const Register size = r10; // bytes not yet processed + const Register chunk_size = r11; // current outer-block size + const Register end = r13; // AVX-512 loop end, then scalar-tail end assert_different_registers(c_rarg0, c_rarg1, c_rarg2, data, size); - assert_different_registers(init_d, data, size, s, a_d, b_d, end, rax); - - const XMMRegister yshuf0 = xmm6; - const XMMRegister yshuf1 = xmm7; + assert_different_registers(init_d, data, size, chunk_size, a_d, b_d, end, rax); + + // Vector-register aliases: 0/1 means first/second member of a pair, not an + // initial value or iteration number. AVX2 pairs are 32-byte halves; AVX-512 + // ydata pairs are consecutive 16-byte slices. A sole accumulator, such as + // yb0 in AVX-512, keeps index 0. + // + // Shared by both paths: + // ya: byte sums (4 qword lanes in AVX2, 16 dword lanes in AVX-512) + // yb0: weighted B sums + // ydata0/ydata1: input or weighted-data vectors const XMMRegister ya = xmm0; - const XMMRegister yb = xmm1; - const XMMRegister ydata0 = xmm2; - const XMMRegister ydata1 = xmm3; - const XMMRegister ysa = xmm4; - const XMMRegister ydata = ysa; - const XMMRegister ytmp0 = ydata0; - const XMMRegister ytmp1 = ydata1; - const XMMRegister ytmp2 = xmm5; - const XMMRegister xa = xmm0; - const XMMRegister xb = xmm1; - const XMMRegister xtmp0 = xmm2; - const XMMRegister xtmp1 = xmm3; - const XMMRegister xsa = xmm4; - const XMMRegister xtmp2 = xmm5; - const XMMRegister xtmp3 = xmm8; - const XMMRegister xtmp4 = xmm9; - const XMMRegister xtmp5 = xmm10; - - Label SLOOP1, SLOOP1A_AVX2, SLOOP1A_AVX3, AVX3_REDUCE, SKIP_LOOP_1A; - Label SKIP_LOOP_1A_AVX3, FINISH, LT64, DO_FINAL, FINAL_LOOP, ZERO_SIZE, END; + const XMMRegister yb0 = xmm1; + const XMMRegister ydata0 = xmm13; // AVX2: bytes 0..31; AVX-512: 16-byte slice + const XMMRegister ydata1 = xmm14; // AVX2: bytes 32..63; AVX-512: 16-byte slice + + // AVX2-only state: + // yb1: second weighted-B chain for bytes 32..63 (yb0 handles bytes 0..31) + // ysum_a: running A before each full 64-byte block or final 32-byte block + // yzero: zero operand for vpsadbw + // yones: all-one words for pairwise widening by vpmaddwd + // ytmp0/ytmp1: byte-sum and horizontal-reduction temporaries + // yweight0/yweight1: weight vectors for the two 32-byte halves + const XMMRegister yb1 = xmm2; + const XMMRegister ysum_a = xmm4; + const XMMRegister yzero = xmm5; + const XMMRegister yones = xmm6; + const XMMRegister ytmp0 = xmm7; + const XMMRegister ytmp1 = xmm15; + const XMMRegister yweight0 = xmm11; + const XMMRegister yweight1 = xmm12; + + // 128-bit views shared by the two horizontal reductions. + const XMMRegister xa = ya; + const XMMRegister xb = yb0; + + // AVX-512-only aliases. They reuse AVX2 registers after those values have + // been consumed by the selected path. + // ya_scaled: per-lane A * [0..15] + // xa_scaled: horizontal reduction of ya_scaled, subtracted from B + // xtmp_*: 512-to-256-bit reduction temporaries + const XMMRegister ya_scaled = yb1; + const XMMRegister xa_scaled = ya_scaled; + const XMMRegister xtmp_a = ydata0; + const XMMRegister xtmp_b = ydata1; + const XMMRegister xtmp_scaled = ytmp1; + + Label LIMIT_CHUNK_LOOP; + Label AVX2_SETUP, AVX2_LOOP_64, AVX2_MERGE_FULL_BLOCKS, AVX2_REDUCE; + Label AVX512_LOOP_32, AVX512_REDUCE, AVX512_SCALAR_TAIL; + Label LT16, PROCESS_16_BLOCK, SCALAR_LOOP, FINAL_REDUCE, PACK_RESULT; __ enter(); // required for proper stackwalking of RuntimeStub frame - __ movq(xtmp3, r12); - __ movq(xtmp4, r13); - __ movq(xtmp5, r14); + __ push_ppx(r12); + __ push_ppx(r13); + __ push_ppx(r14); + + __ vmovdqu(yweight0, ExternalAddress((address)ADLER32_DOT2V_TABLE), r14 /*rscratch*/); + __ vmovdqu(yweight1, ExternalAddress((address)ADLER32_DOT2V_0_TABLE), r14 /*rscratch*/); - __ vmovdqu(yshuf0, ExternalAddress((address)ADLER32_SHUF0_TABLE), r14 /*rscratch*/); - __ vmovdqu(yshuf1, ExternalAddress((address)ADLER32_SHUF1_TABLE), r14 /*rscratch*/); + __ movptr(data, c_rarg1); // data + __ movl(size, c_rarg2); // length - __ movptr(data, c_rarg1); //data - __ movl(size, c_rarg2); //length + __ movl(b_d, init_d); // b_d = init_d (packed B:A) + __ shrl(b_d, 16); // b_d = B + __ andl(init_d, 0xFFFF); // init_d = A + __ movl(a_d, init_d); // a_d = A + + __ cmpl(size, 16); + __ jcc(Assembler::below, LT16); + + __ vpxor(yzero, yzero, yzero, Assembler::AVX_256bit); + __ vpcmpeqw(yones, yones, yones, Assembler::AVX_256bit); + __ vpsrlw(yones, yones, 15, Assembler::AVX_256bit); - __ movl(b_d, init_d); //adler - __ shrl(b_d, 16); - __ andl(init_d, 0xFFFF); __ cmpl(size, 32); - __ jcc(Assembler::below, LT64); - __ movdl(xa, init_d); //vmovd - 32bit - - __ bind(SLOOP1); - __ vpxor(yb, yb, yb, VM_Version::supports_avx512vl() ? Assembler::AVX_512bit : Assembler::AVX_256bit); - __ movl(s, LIMIT); - __ cmpl(s, size); - __ cmovl(Assembler::above, s, size); // s = min(size, LIMIT) - __ lea(end, Address(s, data, Address::times_1, -CHUNKSIZE_M1)); - __ cmpptr(data, end); - __ jcc(Assembler::aboveEqual, SKIP_LOOP_1A); + __ jcc(Assembler::below, PROCESS_16_BLOCK); + + __ bind(LIMIT_CHUNK_LOOP); + __ movl(chunk_size, LIMIT); + __ cmpl(chunk_size, size); + __ cmovl(Assembler::above, chunk_size, size); // chunk_size = min(size, LIMIT) - __ align32(); if (VM_Version::supports_avx512vl()) { - // AVX2 performs better for smaller inputs because of leaner post loop reduction sequence.. - __ cmpl(s, MAX2(128, CopyAVX3Threshold)); - __ jcc(Assembler::belowEqual, SLOOP1A_AVX2); - __ lea(end, Address(s, data, Address::times_1, - (2*CHUNKSIZE -1))); + // Use AVX2 up to the AVX-512 dispatch threshold. + __ cmpl(chunk_size, MAX2(128, CopyAVX3Threshold)); + __ jcc(Assembler::belowEqual, AVX2_SETUP); + + __ movdl(ya, a_d); + __ vpxor(yb0, yb0, yb0, Assembler::AVX_512bit); + __ lea(end, Address(chunk_size, data, Address::times_1, - (2*CHUNKSIZE - 1))); // Some notes on vectorized main loop algorithm. // Additions are performed in slices of 16 bytes in the main loop. // input size : 64 bytes (a0 - a63). // Iteration0 : ya = [a0 - a15] - // yb = [a0 - a15] + // yb0 = [a0 - a15] // Iteration1 : ya = [a0 - a15] + [a16 - a31] - // yb = 2 x [a0 - a15] + [a16 - a31] + // yb0 = 2 x [a0 - a15] + [a16 - a31] // Iteration2 : ya = [a0 - a15] + [a16 - a31] + [a32 - a47] - // yb = 3 x [a0 - a15] + 2 x [a16 - a31] + [a32 - a47] + // yb0 = 3 x [a0 - a15] + 2 x [a16 - a31] + [a32 - a47] // Iteration4 : ya = [a0 - a15] + [a16 - a31] + [a32 - a47] + [a48 - a63] - // yb = 4 x [a0 - a15] + 3 x [a16 - a31] + 2 x [a32 - a47] + [a48 - a63] + // yb0 = 4 x [a0 - a15] + 3 x [a16 - a31] + 2 x [a32 - a47] + [a48 - a63] // Before performing reduction we must scale the intermediate result appropriately. // Since addition was performed in chunks of 16 bytes, thus to match the scalar implementation // Oth lane element must be repeatedly added 16 times, 1st element 15 times and so on so forth. - // Thus we first multiply yb by 16 followed by subtracting appropriately scaled ya value. - // yb = 16 x yb - [a0 - a15] x ya - // = 64 x [a0 - a15] + 48 x [a16 - a31] + 32 x [a32 - a47] + 16 x [a48 - a63] - [a0 - a15] x ya - // = 64 x a0 + 63 x a1 + 62 x a2 ...... + a63 - __ bind(SLOOP1A_AVX3); + // Thus we first multiply yb0 by 16 followed by subtracting appropriately scaled ya value. + // yb0 = 16 x yb0 - [a0 - a15] x ya + // = 64 x [a0 - a15] + 48 x [a16 - a31] + 32 x [a32 - a47] + 16 x [a48 - a63] - [a0 - a15] x ya + // = 64 x a0 + 63 x a1 + 62 x a2 ...... + a63 + __ align32(); + __ bind(AVX512_LOOP_32); __ evpmovzxbd(ydata0, Address(data, 0), Assembler::AVX_512bit); __ evpmovzxbd(ydata1, Address(data, CHUNKSIZE), Assembler::AVX_512bit); __ vpaddd(ya, ya, ydata0, Assembler::AVX_512bit); - __ vpaddd(yb, yb, ya, Assembler::AVX_512bit); + __ vpaddd(yb0, yb0, ya, Assembler::AVX_512bit); __ vpaddd(ya, ya, ydata1, Assembler::AVX_512bit); - __ vpaddd(yb, yb, ya, Assembler::AVX_512bit); + __ vpaddd(yb0, yb0, ya, Assembler::AVX_512bit); __ addptr(data, 2*CHUNKSIZE); __ cmpptr(data, end); - __ jcc(Assembler::below, SLOOP1A_AVX3); + __ jcc(Assembler::below, AVX512_LOOP_32); __ addptr(end, CHUNKSIZE); __ cmpptr(data, end); - __ jcc(Assembler::aboveEqual, AVX3_REDUCE); + __ jcc(Assembler::aboveEqual, AVX512_REDUCE); __ evpmovzxbd(ydata0, Address(data, 0), Assembler::AVX_512bit); __ vpaddd(ya, ya, ydata0, Assembler::AVX_512bit); - __ vpaddd(yb, yb, ya, Assembler::AVX_512bit); + __ vpaddd(yb0, yb0, ya, Assembler::AVX_512bit); __ addptr(data, CHUNKSIZE); - __ bind(AVX3_REDUCE); - __ vpslld(yb, yb, 4, Assembler::AVX_512bit); //b is scaled by 16(avx512)) - __ vpmulld(ysa, ya, ExternalAddress((address)ADLER32_ASCALE_TABLE), Assembler::AVX_512bit, r14 /*rscratch*/); - - // compute horizontal sums of ya, yb, ysa - __ vextracti64x4(xtmp0, ya, 1); - __ vextracti64x4(xtmp1, yb, 1); - __ vextracti64x4(xtmp2, ysa, 1); - __ vpaddd(xtmp0, xtmp0, ya, Assembler::AVX_256bit); - __ vpaddd(xtmp1, xtmp1, yb, Assembler::AVX_256bit); - __ vpaddd(xtmp2, xtmp2, ysa, Assembler::AVX_256bit); - __ vextracti128(xa, xtmp0, 1); - __ vextracti128(xb, xtmp1, 1); - __ vextracti128(xsa, xtmp2, 1); - __ vpaddd(xa, xa, xtmp0, Assembler::AVX_128bit); - __ vpaddd(xb, xb, xtmp1, Assembler::AVX_128bit); - __ vpaddd(xsa, xsa, xtmp2, Assembler::AVX_128bit); + __ bind(AVX512_REDUCE); + __ vpslld(yb0, yb0, 4, Assembler::AVX_512bit); // b is scaled by 16 (AVX-512) + __ vpmulld(ya_scaled, ya, ExternalAddress((address)ADLER32_ASCALE_TABLE), Assembler::AVX_512bit, r14 /*rscratch*/); + + // compute horizontal sums of ya, yb0, ya_scaled + __ vextracti64x4(xtmp_a, ya, 1); + __ vextracti64x4(xtmp_b, yb0, 1); + __ vextracti64x4(xtmp_scaled, ya_scaled, 1); + __ vpaddd(xtmp_a, xtmp_a, ya, Assembler::AVX_256bit); + __ vpaddd(xtmp_b, xtmp_b, yb0, Assembler::AVX_256bit); + __ vpaddd(xtmp_scaled, xtmp_scaled, ya_scaled, Assembler::AVX_256bit); + __ vextracti128(xa, xtmp_a, 1); + __ vextracti128(xb, xtmp_b, 1); + __ vextracti128(xa_scaled, xtmp_scaled, 1); + __ vpaddd(xa, xa, xtmp_a, Assembler::AVX_128bit); + __ vpaddd(xb, xb, xtmp_b, Assembler::AVX_128bit); + __ vpaddd(xa_scaled, xa_scaled, xtmp_scaled, Assembler::AVX_128bit); __ vphaddd(xa, xa, xa, Assembler::AVX_128bit); __ vphaddd(xb, xb, xb, Assembler::AVX_128bit); - __ vphaddd(xsa, xsa, xsa, Assembler::AVX_128bit); + __ vphaddd(xa_scaled, xa_scaled, xa_scaled, Assembler::AVX_128bit); __ vphaddd(xa, xa, xa, Assembler::AVX_128bit); __ vphaddd(xb, xb, xb, Assembler::AVX_128bit); - __ vphaddd(xsa, xsa, xsa, Assembler::AVX_128bit); + __ vphaddd(xa_scaled, xa_scaled, xa_scaled, Assembler::AVX_128bit); - __ vpsubd(xb, xb, xsa, Assembler::AVX_128bit); + __ vpsubd(xb, xb, xa_scaled, Assembler::AVX_128bit); __ addptr(end, CHUNKSIZE_M1); - __ testl(s, CHUNKSIZE_M1); - __ jcc(Assembler::notEqual, DO_FINAL); - __ jmp(SKIP_LOOP_1A_AVX3); + __ testl(chunk_size, CHUNKSIZE_M1); + __ jcc(Assembler::notEqual, AVX512_SCALAR_TAIL); + + __ subl(size, chunk_size); + + __ movdl(rax, xa); + __ xorl(rdx, rdx); + __ movl(rcx, BASE); + __ divl(rcx); // divide edx:eax by ecx, quot->eax, rem->edx + __ movl(a_d, rdx); + + __ movdl(rax, xb); + __ addl(rax, b_d); + __ xorl(rdx, rdx); + __ movl(rcx, BASE); + __ divl(rcx); // divide edx:eax by ecx, quot->eax, rem->edx + __ movl(b_d, rdx); + + __ testl(size, size); + __ jcc(Assembler::zero, PACK_RESULT); + __ cmpl(size, 16); + __ jcc(Assembler::below, LT16); + __ cmpl(size, 32); + __ jcc(Assembler::below, PROCESS_16_BLOCK); + __ jmp(LIMIT_CHUNK_LOOP); + + __ bind(AVX512_SCALAR_TAIL); + __ movdl(a_d, xa); + __ movdl(rax, xb); + __ addl(b_d, rax); + __ jmp(SCALAR_LOOP); } + // AVX2 64-byte main loop. + // + // ydata0 and ydata1 initially contain bytes 0..31 and 32..63. vpsadbw + // produces their byte sums for ya. vpmaddubsw/vpmaddwd replace ydata0 and + // ydata1 with the corresponding weighted byte sums. + // + // Starting with ya=A, yb0=B, yb1=0 and ysum_a=0: + // Iteration0: + // ysum_a = A + // ya = A + sum(bytes 0..63) + // yb0 = B + weighted sum(bytes 0..31) + // yb1 = weighted sum(bytes 32..63) + // Iteration1: + // ysum_a = A + (A + sum(bytes 0..63)) + // ya = A + sum(bytes 0..63) + sum(bytes 64..127) + // yb0 = B + weighted sum(bytes 0..31) + weighted sum(bytes 64..95) + // yb1 = weighted sum(bytes 32..63) + weighted sum(bytes 96..127) + // + // The equations above are lane-wise; after horizontal reduction, m full + // blocks produce: + // sum(ya) = A + sum(all input bytes) + // sum(yb0) + sum(yb1) + 64*sum(ysum_a) + // = B + 64*m*A + sum((64*m-i)*a[i]) + __ bind(AVX2_SETUP); + __ movl(rcx, DIV_BASE_MULTIPLIER); + __ andl(chunk_size, -32); // process 32 bytes at a time + __ subl(size, chunk_size); + + __ movdl(ya, a_d); // ya = A + __ movdl(yb0, b_d); // yb0 = B + __ vpxor(yb1, yb1, yb1, Assembler::AVX_256bit); // yb1 = 0 + __ vpxor(ysum_a, ysum_a, ysum_a, Assembler::AVX_256bit); // ysum_a = 0 + + __ cmpl(chunk_size, 64); + __ jcc(Assembler::below, AVX2_MERGE_FULL_BLOCKS); __ align32(); - __ bind(SLOOP1A_AVX2); - __ vbroadcastf128(ydata, Address(data, 0), Assembler::AVX_256bit); - __ addptr(data, CHUNKSIZE); - __ vpshufb(ydata0, ydata, yshuf0, Assembler::AVX_256bit); - __ vpaddd(ya, ya, ydata0, Assembler::AVX_256bit); - __ vpaddd(yb, yb, ya, Assembler::AVX_256bit); - __ vpshufb(ydata1, ydata, yshuf1, Assembler::AVX_256bit); - __ vpaddd(ya, ya, ydata1, Assembler::AVX_256bit); - __ vpaddd(yb, yb, ya, Assembler::AVX_256bit); - __ cmpptr(data, end); - __ jcc(Assembler::below, SLOOP1A_AVX2); - - __ bind(SKIP_LOOP_1A); - - // reduce - __ vpslld(yb, yb, 3, Assembler::AVX_256bit); //b is scaled by 8(avx) - __ vpmulld(ysa, ya, ExternalAddress((address)ADLER32_ASCALE_TABLE), Assembler::AVX_256bit, r14 /*rscratch*/); - - // compute horizontal sums of ya, yb, ysa - __ vextracti128(xtmp0, ya, 1); - __ vextracti128(xtmp1, yb, 1); - __ vextracti128(xtmp2, ysa, 1); - __ vpaddd(xa, xa, xtmp0, Assembler::AVX_128bit); - __ vpaddd(xb, xb, xtmp1, Assembler::AVX_128bit); - __ vpaddd(xsa, xsa, xtmp2, Assembler::AVX_128bit); - __ vphaddd(xa, xa, xa, Assembler::AVX_128bit); - __ vphaddd(xb, xb, xb, Assembler::AVX_128bit); - __ vphaddd(xsa, xsa, xsa, Assembler::AVX_128bit); - __ vphaddd(xa, xa, xa, Assembler::AVX_128bit); - __ vphaddd(xb, xb, xb, Assembler::AVX_128bit); - __ vphaddd(xsa, xsa, xsa, Assembler::AVX_128bit); - - __ vpsubd(xb, xb, xsa, Assembler::AVX_128bit); - - __ addptr(end, CHUNKSIZE_M1); - __ testl(s, CHUNKSIZE_M1); - __ jcc(Assembler::notEqual, DO_FINAL); - - __ bind(SKIP_LOOP_1A_AVX3); - // either we're done, or we just did LIMIT - __ subl(size, s); - - __ movdl(rax, xa); - __ xorl(rdx, rdx); - __ movl(rcx, BASE); - __ divl(rcx); // divide edx:eax by ecx, quot->eax, rem->edx - __ movl(a_d, rdx); - - __ movdl(rax, xb); - __ addl(rax, b_d); - __ xorl(rdx, rdx); - __ movl(rcx, BASE); - __ divl(rcx); // divide edx:eax by ecx, quot->eax, rem->edx - __ movl(b_d, rdx); + __ bind(AVX2_LOOP_64); + + __ vmovdqu(ydata0, Address(data, 0)); + __ vmovdqu(ydata1, Address(data, 32)); + __ addptr(data, 64); + __ subl(chunk_size, 64); + + // Process the current 64-byte block. ydata0 and ydata1 contain its two + // 32-byte input halves. Preserve ya before updating A, then use vpsadbw to + // add both halves' byte sums to ya. The following vpmaddubsw/vpmaddwd + // instructions replace ydata0/ydata1 with their weighted sums for B; these + // are accumulated independently into yb0/yb1 and merged after the loop. + // + // Per iteration: + // ysum_a += ya + // ya += byte sums of ydata0 and ydata1 + // yb0 += weighted sum of ydata0 + // yb1 += weighted sum of ydata1 + __ vpsadbw(ytmp0, ydata0, yzero, Assembler::AVX_256bit); + __ vpsadbw(ytmp1, ydata1, yzero, Assembler::AVX_256bit); + __ vpaddd(ysum_a, ysum_a, ya, Assembler::AVX_256bit); + __ vpaddd(ya, ya, ytmp0, Assembler::AVX_256bit); + __ vpmaddubsw(ydata0, ydata0, yweight0, Assembler::AVX_256bit); + __ vpmaddubsw(ydata1, ydata1, yweight1, Assembler::AVX_256bit); + __ vpmaddwd(ydata0, ydata0, yones, Assembler::AVX_256bit); + __ vpmaddwd(ydata1, ydata1, yones, Assembler::AVX_256bit); + __ vpaddd(ya, ya, ytmp1, Assembler::AVX_256bit); + __ vpaddd(yb0, yb0, ydata0, Assembler::AVX_256bit); + __ vpaddd(yb1, yb1, ydata1, Assembler::AVX_256bit); + + __ cmpl(chunk_size, 64); + __ jcc(Assembler::aboveEqual, AVX2_LOOP_64); + + // Merge the two B chains after the full 64-byte blocks, apply the 64x A + // contribution, and reset ysum_a for the optional 32-byte tail. + __ bind(AVX2_MERGE_FULL_BLOCKS); + __ vpaddd(yb0, yb0, yb1, Assembler::AVX_256bit); + __ vpslld(ysum_a, ysum_a, 6, Assembler::AVX_256bit); + __ vpaddd(yb0, yb0, ysum_a, Assembler::AVX_256bit); + __ vpxor(ysum_a, ysum_a, ysum_a, Assembler::AVX_256bit); + + __ cmpl(chunk_size, 32); + __ jcc(Assembler::below, AVX2_REDUCE); + + __ vmovdqu(ydata0, Address(data, 0)); + __ addptr(data, 32); + __ subl(chunk_size, 32); + + __ vpsadbw(ytmp0, ydata0, yzero, Assembler::AVX_256bit); + __ vpaddd(ysum_a, ysum_a, ya, Assembler::AVX_256bit); + __ vpaddd(ya, ya, ytmp0, Assembler::AVX_256bit); + __ vpmaddubsw(ydata0, ydata0, yweight1, Assembler::AVX_256bit); + __ vpmaddwd(ydata0, ydata0, yones, Assembler::AVX_256bit); + __ vpaddd(yb0, yb0, ydata0, Assembler::AVX_256bit); + + __ bind(AVX2_REDUCE); + // A final 32-byte block contributes 32 * the A value from before that block. + __ vpslld(ysum_a, ysum_a, 5, Assembler::AVX_256bit); + __ vpaddd(yb0, yb0, ysum_a, Assembler::AVX_256bit); + + // Horizontally reduce ya. Its byte sums occupy dwords 0, 2, 4 and 6. + __ vextracti128(ytmp0, ya, 1); + __ vpaddd(xa, xa, ytmp0, Assembler::AVX_128bit); + __ vpunpckhqdq(ytmp0, xa, xa, Assembler::AVX_128bit); + __ vpaddd(xa, xa, ytmp0, Assembler::AVX_128bit); + + // Horizontally reduce yb0. Its partial weighted sums occupy all eight dwords. + __ vextracti128(ytmp1, yb0, 1); + __ vpaddd(xb, xb, ytmp1, Assembler::AVX_128bit); + __ vpunpckhqdq(ytmp1, xb, xb, Assembler::AVX_128bit); + __ vpaddd(xb, xb, ytmp1, Assembler::AVX_128bit); + __ vpshufd(ytmp1, xb, 1, Assembler::AVX_128bit); + __ vpaddd(xb, xb, ytmp1, Assembler::AVX_128bit); - __ testl(size, size); - __ jcc(Assembler::zero, FINISH); + __ movdl(a_d, xa); + __ movdl(b_d, xb); - // continue loop - __ movdl(xa, a_d); - __ jmp(SLOOP1); + reduce_mod_base(a_d, rcx); + reduce_mod_base(b_d, rcx); - __ bind(FINISH); - __ movl(rax, b_d); - __ shll(rax, 16); - __ orl(rax, a_d); - __ jmp(END); - - __ bind(LT64); - __ movl(a_d, init_d); - __ lea(end, Address(data, size, Address::times_1)); + // The AVX2 chunk reduction has already normalized A and B. __ testl(size, size); - __ jcc(Assembler::notZero, FINAL_LOOP); - __ jmp(ZERO_SIZE); + __ jcc(Assembler::zero, PACK_RESULT); - __ bind(DO_FINAL); - __ movdl(a_d, xa); - __ movdl(rax, xb); + __ cmpl(size, 32); + __ jcc(Assembler::aboveEqual, LIMIT_CHUNK_LOOP); + __ cmpl(size, 16); + __ jcc(Assembler::below, LT16); + + __ bind(PROCESS_16_BLOCK); + // No vector loop is active here; reuse chunk_size to save A_before. + __ movl(chunk_size, a_d); + __ vmovdqu(ydata0, Address(data, 0), Assembler::AVX_128bit); + __ addptr(data, 16); + __ subl(size, 16); + + __ vpsadbw(ytmp0, ydata0, yzero, Assembler::AVX_128bit); + __ movdl(rax, ytmp0); + __ vpsrldq(ytmp0, ytmp0, 8, Assembler::AVX_128bit); + __ movdl(r14, ytmp0); + __ addl(rax, r14); + __ addl(a_d, rax); + + __ vextracti128(ytmp0, yweight1, 1); + __ vpmaddubsw(ytmp1, ydata0, ytmp0, Assembler::AVX_128bit); + __ vpmaddwd(ytmp1, ytmp1, yones, Assembler::AVX_128bit); + __ vpunpckhqdq(ytmp0, ytmp1, ytmp1, Assembler::AVX_128bit); + __ vpaddd(ytmp1, ytmp1, ytmp0, Assembler::AVX_128bit); + __ vpshufd(ytmp0, ytmp1, 1, Assembler::AVX_128bit); + __ vpaddd(ytmp1, ytmp1, ytmp0, Assembler::AVX_128bit); + __ movdl(rax, ytmp1); + __ addl(b_d, rax); + __ movl(rax, chunk_size); + __ shll(rax, 4); // Add 16 * a_before_block. __ addl(b_d, rax); + __ bind(LT16); + __ testl(size, size); + __ jcc(Assembler::zero, FINAL_REDUCE); + __ lea(end, Address(data, size, Address::times_1)); + __ align32(); - __ bind(FINAL_LOOP); + __ bind(SCALAR_LOOP); __ movzbl(rax, Address(data, 0)); //movzx eax, byte[data] __ addl(a_d, rax); __ addptr(data, 1); __ addl(b_d, a_d); __ cmpptr(data, end); - __ jcc(Assembler::below, FINAL_LOOP); - - __ bind(ZERO_SIZE); + __ jcc(Assembler::below, SCALAR_LOOP); - __ movl(rax, a_d); - __ xorl(rdx, rdx); - __ movl(rcx, BASE); - __ divl(rcx); // div ecx -- divide edx:eax by ecx, quot->eax, rem->edx - __ movl(a_d, rdx); + __ bind(FINAL_REDUCE); + __ movl(rcx, DIV_BASE_MULTIPLIER); + reduce_mod_base(a_d, rcx); + reduce_mod_base(b_d, rcx); + __ bind(PACK_RESULT); __ movl(rax, b_d); - __ xorl(rdx, rdx); - __ movl(rcx, BASE); - __ divl(rcx); // divide edx:eax by ecx, quot->eax, rem->edx - __ shll(rdx, 16); - __ orl(rdx, a_d); - __ movl(rax, rdx); - - __ bind(END); + __ shll(rax, 16); + __ orl(rax, a_d); - __ movq(r14, xtmp5); - __ movq(r13, xtmp4); - __ movq(r12, xtmp3); + __ pop_ppx(r14); + __ pop_ppx(r13); + __ pop_ppx(r12); __ vzeroupper(); __ leave(); @@ -351,8 +501,8 @@ address StubGenerator::generate_updateBytesAdler32() { void StubGenerator::init_AOTAddressTable_adler(GrowableArray
& external_addresses) { #define ADD(addr) external_addresses.append((address)(addr)) ADD(ADLER32_ASCALE_TABLE); - ADD(ADLER32_SHUF0_TABLE); - ADD(ADLER32_SHUF1_TABLE); + ADD(ADLER32_DOT2V_TABLE); + ADD(ADLER32_DOT2V_0_TABLE); #undef ADD } #endif // INCLUDE_CDS diff --git a/test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java b/test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java index 6214f9d56ca8..6473cbde3b40 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java +++ b/test/hotspot/jtreg/compiler/intrinsics/zip/TestAdler32.java @@ -29,9 +29,32 @@ * @run main/othervm/timeout=600 -Xbatch compiler.intrinsics.zip.TestAdler32 -m */ +/** + * @test + * @bug 8394260 + * @summary Verify the Adler32 AVX2 intrinsic with maximum byte values near LIMIT + * @requires vm.compiler2.enabled + * @requires os.simpleArch == "x64" + * @requires vm.cpu.features ~= ".*avx2.*" + * + * @run main/othervm/timeout=600 -Xbatch -XX:UseAVX=2 -DallFF=true compiler.intrinsics.zip.TestAdler32 -m + */ + +/** + * @test + * @bug 8394260 + * @summary Verify the Adler32 AVX2 intrinsic with a mixed byte pattern near LIMIT + * @requires vm.compiler2.enabled + * @requires os.simpleArch == "x64" + * @requires vm.cpu.features ~= ".*avx2.*" + * + * @run main/othervm/timeout=600 -Xbatch -XX:UseAVX=2 -Dtest.adler32.mixedPattern=true compiler.intrinsics.zip.TestAdler32 -m + */ + package compiler.intrinsics.zip; import java.nio.ByteBuffer; +import java.util.Arrays; import java.util.zip.Adler32; import java.util.zip.Checksum; @@ -153,6 +176,16 @@ private static boolean check(Checksum adler0, Checksum adler1) { private static byte[] initializedBytes(int M, int offset) { byte[] bytes = new byte[M + offset]; + if (Boolean.getBoolean("allFF")) { + Arrays.fill(bytes, (byte) 0xFF); + return bytes; + } + if (Boolean.getBoolean("test.adler32.mixedPattern")) { + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) ((i % 2 == 0) ? 0xFF : 0xF0); + } + return bytes; + } for (int i = 0; i < offset; i++) { bytes[i] = (byte) i; } @@ -177,6 +210,7 @@ private static void test_multi(int iters) { len2*2, len2*4, len2*8, len2*16, len2*32, len2*64, len3, len3+1, len3+3, len3+5, len3+7, len3*2, len3*4, len3*8, + len4-7, len4-5, len4-3, len4-1, len4, len4+1, len4+3, len4+5, len4+7, len4+len1, len4+len2, len4+len3, len4*2, len4*4, len4*2+1, len4*4+4, len1+len2, len1+len2+1, len1+len2+3, len1+len2+5, len1+len2+7, diff --git a/test/micro/org/openjdk/bench/java/util/TestAdler32.java b/test/micro/org/openjdk/bench/java/util/TestAdler32.java index b9a43d39d68b..a90ab31e5de3 100644 --- a/test/micro/org/openjdk/bench/java/util/TestAdler32.java +++ b/test/micro/org/openjdk/bench/java/util/TestAdler32.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,9 @@ public class TestAdler32 { private Random random; private byte[] bytes; - @Param({"64", "128", "256", "512", "1024", "2048", "5012", "8192", "16384", "32768", "65536"}) + @Param({"1", "2", "4", "8", "15", "16", "24", "31", "32", + "64", "128", "256", "512", "1024", "2048", "4096", "5012", "8192", + "16384", "32768", "65536"}) private int count; public TestAdler32() { From 7c57e940cf75c3c5738639caf77260c849c885cf Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 6 Nov 2026 18:09:27 +0000 Subject: [PATCH 034/110] 8390062: aarch64: CPU_SB is set only on BSD, not on Linux Reviewed-by: fbredberg, kvn, ruben, aph, asmehra --- .../os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp index e5762fa3ba53..10171844b14d 100644 --- a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp +++ b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -146,15 +146,18 @@ void VM_Version::get_os_cpu_info() { check_feature(auxv, BIT_MASK(CPU_SHA2), HWCAP_SHA2) | check_feature(auxv, BIT_MASK(CPU_CRC32), HWCAP_CRC32) | check_feature(auxv, BIT_MASK(CPU_LSE), HWCAP_ATOMICS) | + check_feature(auxv, BIT_MASK(CPU_FPHP), HWCAP_FPHP) | + check_feature(auxv, BIT_MASK(CPU_ASIMDHP), HWCAP_ASIMDHP) | check_feature(auxv, BIT_MASK(CPU_DCPOP), HWCAP_DCPOP) | check_feature(auxv, BIT_MASK(CPU_SHA3), HWCAP_SHA3) | check_feature(auxv, BIT_MASK(CPU_SHA512), HWCAP_SHA512) | check_feature(auxv, BIT_MASK(CPU_SVE), HWCAP_SVE) | + check_feature(auxv, BIT_MASK(CPU_SB), HWCAP_SB) | check_feature(auxv, BIT_MASK(CPU_PACA), HWCAP_PACA) | - check_feature(auxv, BIT_MASK(CPU_FPHP), HWCAP_FPHP) | - check_feature(auxv, BIT_MASK(CPU_ASIMDHP), HWCAP_ASIMDHP) | - check_feature(auxv2, BIT_MASK(CPU_SVE2), HWCAP2_SVE2) | check_feature(auxv2, BIT_MASK(CPU_SVEBITPERM), HWCAP2_SVEBITPERM) | + check_feature(auxv2, BIT_MASK(CPU_SVE2), HWCAP2_SVE2) | + // The synthetic CPU_A53MAC flag is set in VM_Version::initialize() because + // there is no corresponding HWCAP flag. check_feature(auxv2, BIT_MASK(CPU_ECV), HWCAP2_ECV) | check_feature(auxv2, BIT_MASK(CPU_WFXT), HWCAP2_WFXT); From b0c5b1ba2f3f06b478b39d41c5fadff9ceb6afa4 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Fri, 6 Nov 2026 19:59:05 +0000 Subject: [PATCH 035/110] 8396231: Remove unused, buggy XlibWrapper.SetBitmapShape (unchecked size arithmetic) Reviewed-by: azvegint, psadhukhan --- .../unix/classes/sun/awt/X11/XlibWrapper.java | 5 -- .../native/libawt_xawt/xawt/XlibWrapper.c | 54 ------------------- 2 files changed, 59 deletions(-) diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java index 76b1d177955d..9d705e2e7c47 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java +++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java @@ -546,11 +546,6 @@ static native void XChangeActivePointerGrab(long display, int mask, static native void SetRectangularShape(long display, long window, int lox, int loy, int hix, int hiy, sun.java2d.pipe.Region region); - /** Each int in the bitmap array is one pixel with a 32-bit color: - * R, G, B, and Alpha. - */ - static native void SetBitmapShape(long display, long window, - int width, int height, int[] bitmap); static native void SetZOrder(long display, long window, long above); diff --git a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c index 4682595811e6..eac3b869349f 100644 --- a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c +++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c @@ -2264,57 +2264,3 @@ Java_sun_awt_X11_XlibWrapper_SetZOrder (Window)jlong_to_ptr(window), value_mask, &wc ); } - -/* - * Class: XlibWrapper - * Method: SetBitmapShape - */ -JNIEXPORT void JNICALL -Java_sun_awt_X11_XlibWrapper_SetBitmapShape -(JNIEnv *env, jclass clazz, jlong display, jlong window, - jint width, jint height, jintArray bitmap) -{ - jsize len; - jint *values; - jboolean isCopy = JNI_FALSE; - size_t worstBufferSize = (size_t)((width / 2 + 1) * height); - RECT_T * pRect; - int numrects; - - if (!IS_SAFE_SIZE_MUL(width / 2 + 1, height)) { - return; - } - - AWT_CHECK_HAVE_LOCK(); - - len = (*env)->GetArrayLength(env, bitmap); - if (len == 0 || len < width * height) { - return; - } - - values = (*env)->GetIntArrayElements(env, bitmap, &isCopy); - if (JNU_IsNull(env, values)) { - return; - } - - pRect = (RECT_T *)SAFE_SIZE_ARRAY_ALLOC(malloc, worstBufferSize, sizeof(RECT_T)); - if (!pRect) { - (*env)->ReleaseIntArrayElements(env, bitmap, values, JNI_ABORT); - return; - } - - /* Note: the values[0] and values[1] are supposed to contain the width - * and height (see XIconInfo.getIntData() for details). So, we do +2. - */ - numrects = BitmapToYXBandedRectangles(32, (int)width, (int)height, - (unsigned char *)(values + 2), pRect); - - XShapeCombineRectangles((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window), - ShapeClip, 0, 0, pRect, numrects, ShapeSet, YXBanded); - XShapeCombineRectangles((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window), - ShapeBounding, 0, 0, pRect, numrects, ShapeSet, YXBanded); - - free(pRect); - - (*env)->ReleaseIntArrayElements(env, bitmap, values, JNI_ABORT); -} From b6d8a728f95fc9c40b3788aec39ce9acce95a5a4 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Sat, 7 Nov 2026 01:14:42 +0000 Subject: [PATCH 036/110] 8396738: Clean up C++ APIs for accessing AOT configuration and AOT cache Reviewed-by: asmehra, kvn --- src/hotspot/share/cds/aotCacheAccess.cpp | 8 +-- src/hotspot/share/cds/aotCacheAccess.hpp | 4 +- src/hotspot/share/cds/aotClassLocation.cpp | 6 +- .../share/cds/aotConstantPoolResolver.cpp | 4 +- src/hotspot/share/cds/aotMetaspace.cpp | 70 +++++++++---------- src/hotspot/share/cds/aotMetaspace.hpp | 6 +- ...ageRecipes.cpp => aotMetaspaceRecipes.cpp} | 52 +++++++------- ...ageRecipes.hpp => aotMetaspaceRecipes.hpp} | 31 ++++---- src/hotspot/share/cds/aotModules.cpp | 4 +- .../share/cds/aotReferenceObjSupport.cpp | 4 +- src/hotspot/share/cds/aotSystemDictionary.cpp | 14 ++-- src/hotspot/share/cds/cdsConfig.cpp | 64 ++++++++--------- src/hotspot/share/cds/cdsConfig.hpp | 19 ++--- src/hotspot/share/cds/cppVtables.cpp | 4 +- src/hotspot/share/cds/filemap.cpp | 36 +++++----- src/hotspot/share/cds/filemap.hpp | 2 +- src/hotspot/share/cds/lambdaFormInvokers.cpp | 6 +- .../share/cds/lambdaProxyClassDictionary.cpp | 4 +- src/hotspot/share/classfile/classLoader.cpp | 2 +- src/hotspot/share/classfile/moduleEntry.cpp | 2 +- src/hotspot/share/code/aotCodeCache.cpp | 6 +- .../share/compiler/compilationPolicy.cpp | 2 +- src/hotspot/share/compiler/compileBroker.cpp | 4 +- src/hotspot/share/include/cds.h | 4 +- src/hotspot/share/oops/constantPool.cpp | 2 +- src/hotspot/share/oops/cpCache.cpp | 6 +- src/hotspot/share/oops/instanceKlass.cpp | 2 +- src/hotspot/share/oops/method.cpp | 2 +- src/hotspot/share/oops/trainingData.hpp | 2 +- src/hotspot/share/prims/jvm.cpp | 4 +- src/hotspot/share/prims/jvmtiAgent.cpp | 2 +- .../share/runtime/abstract_vm_version.cpp | 4 +- src/hotspot/share/runtime/java.cpp | 2 +- src/hotspot/share/runtime/mutexLocker.cpp | 4 +- src/hotspot/share/runtime/mutexLocker.hpp | 2 +- src/hotspot/share/runtime/threads.cpp | 4 +- .../share/services/diagnosticCommand.cpp | 6 +- 37 files changed, 197 insertions(+), 203 deletions(-) rename src/hotspot/share/cds/{finalImageRecipes.cpp => aotMetaspaceRecipes.cpp} (87%) rename src/hotspot/share/cds/{finalImageRecipes.hpp => aotMetaspaceRecipes.hpp} (75%) diff --git a/src/hotspot/share/cds/aotCacheAccess.cpp b/src/hotspot/share/cds/aotCacheAccess.cpp index 970e9ebba4cb..d4289e334d11 100644 --- a/src/hotspot/share/cds/aotCacheAccess.cpp +++ b/src/hotspot/share/cds/aotCacheAccess.cpp @@ -38,12 +38,12 @@ #include "oops/method.hpp" bool AOTCacheAccess::can_generate_aot_code(address addr) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_dumping_aot_cache(), "must be"); return ArchiveBuilder::is_active() && ArchiveBuilder::current()->has_been_archived(addr); } bool AOTCacheAccess::can_generate_aot_code_for(InstanceKlass* ik) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_dumping_aot_cache(), "must be"); if (!ArchiveBuilder::is_active()) { return false; } @@ -111,7 +111,7 @@ oop AOTCacheAccess::get_archived_object(int permanent_index) { #endif // INCLUDE_CDS_JAVA_HEAP void* AOTCacheAccess::allocate_aot_code_region(size_t size) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_dumping_aot_cache(), "must be"); return (void*)ArchiveBuilder::ac_region_alloc(size); } @@ -141,7 +141,7 @@ void AOTCacheAccess::unmap_aot_code_region() { } bool AOTCacheAccess::is_aot_code_region_empty() { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_dumping_aot_cache(), "must be"); return ArchiveBuilder::current()->ac_region()->is_empty(); } diff --git a/src/hotspot/share/cds/aotCacheAccess.hpp b/src/hotspot/share/cds/aotCacheAccess.hpp index 3912cca3148d..b3cc3d9fedae 100644 --- a/src/hotspot/share/cds/aotCacheAccess.hpp +++ b/src/hotspot/share/cds/aotCacheAccess.hpp @@ -62,7 +62,7 @@ class AOTCacheAccess : AllStatic { */ template static narrowPtr to_narrow_ptr(T addr) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_dumping_aot_cache(), "must be"); assert(ArchiveBuilder::is_active(), "must be"); return AOTCompressedPointers::encode_not_null(addr); } @@ -102,7 +102,7 @@ class AOTCacheAccess : AllStatic { // Used during production run to convert a Method in AOTCache to encoded pointer static narrowPtr method_to_narrow_ptr(Method* method) { - assert(CDSConfig::is_using_archive() && !CDSConfig::is_dumping_final_static_archive(), "must be"); + assert(CDSConfig::is_using_archive() && !CDSConfig::is_dumping_aot_cache(), "must be"); assert(AOTMetaspace::in_aot_cache(method), "method %p is not in AOTCache", method); return AOTCompressedPointers::encode_address_in_cache(method); } diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp index c8fcccd37b17..4ed81459e57f 100644 --- a/src/hotspot/share/cds/aotClassLocation.cpp +++ b/src/hotspot/share/cds/aotClassLocation.cpp @@ -478,9 +478,9 @@ void AOTClassLocationConfig::dumptime_init(JavaThread* current) { vm_exit_during_initialization("AOTClassLocationConfig::dumptime_init_helper() failed unexpectedly"); } - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { // The _max_used_index is usually updated by ClassLoader::record_result(). However, - // when dumping the final archive, the classes are loaded from their images in + // when dumping the AOT cache, the classes are loaded from their images in // the AOT config file, so we don't go through ClassLoader::record_result(). dumptime_update_max_used_index(runtime()->_max_used_index); // Same value as recorded in the training run. } @@ -1110,7 +1110,7 @@ bool AOTClassLocationConfig::validate(const char* cache_filename, bool has_aot_l const char* hint_msg = log_is_enabled(Info, class, path) ? "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)"; if (RequireSharedSpaces && !PrintSharedArchiveAndExit) { - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { aot_log_error(aot)("class path and/or module path are not compatible with the " "ones specified when the AOTConfiguration file was recorded%s", hint_msg); AOTMetaspace::unrecoverable_writing_error("Unable to use create AOT cache."); diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp index 3863bb0d383e..fbfe4c6ec893 100644 --- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp +++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp @@ -528,8 +528,8 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_methodhandle_arg(Constant { Klass* k = find_loaded_class(Thread::current(), cp->pool_holder()->class_loader(), klass_name); if (k == nullptr) { - // Dumping AOT cache: all classes should have been loaded by FinalImageRecipes::load_all_classes(). k must have - // been a class that was excluded when FinalImageRecipes recorded all classes at the end of the training run. + // Dumping AOT cache: all classes should have been loaded by AOTMetaspaceRecipes::load_all_classes(). k must have + // been a class that was excluded when AOTMetaspaceRecipes recorded all classes at the end of the training run. // // Dumping static CDS archive: all classes in the classlist have already been loaded, before we resolve // constants. k must have been a class that was excluded when the classlist was written diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp index d26d9dec4170..fc4796599252 100644 --- a/src/hotspot/share/cds/aotMetaspace.cpp +++ b/src/hotspot/share/cds/aotMetaspace.cpp @@ -34,6 +34,7 @@ #include "cds/aotMapLogger.hpp" #include "cds/aotMappedHeapLoader.hpp" #include "cds/aotMetaspace.hpp" +#include "cds/aotMetaspaceRecipes.hpp" #include "cds/aotModules.hpp" #include "cds/aotReferenceObjSupport.hpp" #include "cds/aotSystemDictionary.hpp" @@ -47,7 +48,6 @@ #include "cds/dumpAllocStats.hpp" #include "cds/dynamicArchive.hpp" #include "cds/filemap.hpp" -#include "cds/finalImageRecipes.hpp" #include "cds/lambdaFormInvokers.hpp" #include "cds/lambdaProxyClassDictionary.hpp" #include "classfile/classLoaderDataGraph.hpp" @@ -121,7 +121,7 @@ void* AOTMetaspace::_aot_metaspace_static_top = nullptr; intx AOTMetaspace::_relocation_delta; char* AOTMetaspace::_requested_base_address; Array* AOTMetaspace::_archived_method_handle_intrinsics = nullptr; -int volatile AOTMetaspace::_preimage_static_archive_dumped = 0; +int volatile AOTMetaspace::_aot_configuration_dumped = 0; FileMapInfo* AOTMetaspace::_output_mapinfo = nullptr; // The CDS archive is divided into the following regions: @@ -326,7 +326,7 @@ void AOTMetaspace::initialize_for_static_dump() { AOTMetaspace::unrecoverable_writing_error(); } _symbol_region.init(&_symbol_rs, &_symbol_vs); - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { // We are in the AOT training run. User code is executed. // // On Windows, if the user code closes System.out and we open the AOT config file for output @@ -529,7 +529,7 @@ void AOTMetaspace::serialize(SerializeClosure* soc) { AOTHeap::serialize_tables(soc); AOTSystemDictionary::serialize_dictionary_headers(soc); AOTLinkedClassBulkLoader::serialize(soc); - FinalImageRecipes::serialize(soc); + AOTMetaspaceRecipes::serialize(soc); TrainingData::serialize(soc); InstanceMirrorKlass::serialize_offsets(soc); @@ -546,9 +546,9 @@ void AOTMetaspace::serialize(SerializeClosure* soc) { soc->do_tag(666); } -// In AOTCache workflow, when dumping preimage, the constant pool entries are stored in unresolved state. +// In AOTCache workflow, when dumping the AOT config file, the constant pool entries are stored in unresolved state. // So the fast version of getfield/putfield needs to be converted to nofast version. -// When dumping the final image in the assembly phase, these nofast versions are converted back to fast versions +// When dumping the AOT cache, these nofast versions are converted back to fast versions // if the constant pool entry refered by these bytecodes is stored in resolved state. // Same principle applies to static and dynamic archives. If the constant pool entry is in resolved state, then // the fast version of the bytecodes can be preserved, else use the nofast version. @@ -578,7 +578,7 @@ static void rewrite_bytecodes(const methodHandle& method) { uint rfe_index = bcs.get_index_u2(); bool is_resolved = cp->is_resolved(rfe_index, opcode); if (is_resolved) { - assert(!CDSConfig::is_dumping_preimage_static_archive(), "preimage should not have resolved field references"); + assert(!CDSConfig::is_dumping_aot_configuration(), "AOT configuration should not have resolved field references"); ResolvedFieldEntry* rfe = cp->resolved_field_entry_at(bcs.get_index_u2()); switch(rfe->tos_state()) { case btos: @@ -611,7 +611,7 @@ static void rewrite_bytecodes(const methodHandle& method) { uint rfe_index = bcs.get_index_u2(); bool is_resolved = cp->is_resolved(rfe_index, opcode); if (is_resolved) { - assert(!CDSConfig::is_dumping_preimage_static_archive(), "preimage should not have resolved field references"); + assert(!CDSConfig::is_dumping_aot_configuration(), "AOT configuration should not have resolved field references"); ResolvedFieldEntry* rfe = cp->resolved_field_entry_at(bcs.get_index_u2()); switch(rfe->tos_state()) { case btos: new_code = Bytecodes::_fast_bputfield; break; @@ -753,8 +753,8 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*& AOTSystemDictionary::write_to_archive(); cl_config = AOTClassLocationConfig::dumptime()->write_to_archive(); AOTClassLinker::write_to_archive(); - if (CDSConfig::is_dumping_preimage_static_archive()) { - FinalImageRecipes::record_recipes(); + if (CDSConfig::is_dumping_aot_configuration()) { + AOTMetaspaceRecipes::record_recipes(); } TrainingData::dump_training_data(); @@ -928,17 +928,17 @@ void AOTMetaspace::link_shared_classes(TRAPS) { AOTClassLinker::initialize(); AOTClassInitializer::init_test_class(CHECK); - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { // - Load and link all classes used in the training run. // - Initialize @AOTSafeClassInitializer classes that were // initialized in the training run. // - Perform per-class optimization such as AOT-resolution of // constant pool entries that were resolved during the training run. - FinalImageRecipes::apply_recipes(CHECK); + AOTMetaspaceRecipes::apply_recipes(CHECK); // Because the AOT assembly phase does not run the same exact code as in the // training run (e.g., we use different lambda form invoker classes; - // generated lambda form classes are not recorded in FinalImageRecipes), + // generated lambda form classes are not recorded in AOTMetaspaceRecipes), // the recipes do not cover all classes that have been loaded so far. As // a result, we might have some unlinked classes at this point. Since we // require cached classes to be linked, all such classes will be linked @@ -965,7 +965,7 @@ void AOTMetaspace::dump_static_archive(TRAPS) { ResourceMark rm(THREAD); HandleMark hm(THREAD); - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { if (AOTPrintTrainingInfo) { tty->print_cr("==================== archived_training_data ** before dumping ===================="); TrainingData::print_archived_training_data_on(tty); @@ -983,7 +983,7 @@ void AOTMetaspace::dump_static_archive(TRAPS) { } if (CDSConfig::new_aot_flags_used()) { - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { // We are in the JVM that runs the training run. Continue execution, // so that it can finish all clean-up and return the correct exit // code to the OS. @@ -1013,7 +1013,7 @@ void AOTMetaspace::init_heap_settings() { if (!AOTCodeCache::is_caching_enabled()) { // We don't need it -- always disable for better jitted code. FLAG_SET_ERGO(AOTCompatibleOopCompression, false); - } else if (CDSConfig::is_dumping_final_static_archive()) { + } else if (CDSConfig::is_dumping_aot_cache()) { // Enable by default: use the CompressedOops::HeapBasedNarrowOop mode // so that AOT code can always work regardless of runtime heap range. // @@ -1094,17 +1094,17 @@ void AOTMetaspace::exercise_runtime_cds_code(TRAPS) { CDSProtectionDomain::to_file_URL("dummy.jar", Handle(), CHECK); } -bool AOTMetaspace::preimage_static_archive_dumped() { - assert(CDSConfig::is_dumping_preimage_static_archive(), "Required"); - return AtomicAccess::load_acquire(&_preimage_static_archive_dumped) == 1; +bool AOTMetaspace::aot_configuration_dumped() { + assert(CDSConfig::is_dumping_aot_configuration(), "Required"); + return AtomicAccess::load_acquire(&_aot_configuration_dumped) == 1; } void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS) { - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { // When dumping to the AOT configuration file ensure this function is only executed once. // Multiple invocations may happen via JCmd, during VM exit or other means (in the future) // from different threads and possibly concurrently. - if (AtomicAccess::cmpxchg(&_preimage_static_archive_dumped, 0, 1) != 0) { + if (AtomicAccess::cmpxchg(&_aot_configuration_dumped, 0, 1) != 0) { return; } } @@ -1120,7 +1120,7 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS } } - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { log_info(aot)("Reading lambda form invokers from JDK default classlist ..."); char default_classlist[JVM_MAXPATHLEN]; get_default_classlist(default_classlist, JVM_MAXPATHLEN); @@ -1133,9 +1133,9 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS #if INCLUDE_CDS_JAVA_HEAP if (CDSConfig::is_dumping_heap()) { - if (!CDSConfig::is_dumping_preimage_static_archive()) { + if (!CDSConfig::is_dumping_aot_configuration()) { // A single thread is required for Reference handling and deterministic CDS archive. - // Its's not required for dumping preimage, where References won't be archived and + // It is not required for dumping AOT configuration, where References won't be archived and // determinism is not needed. assert(CDSConfig::allow_only_single_java_thread(), "Required"); } @@ -1148,7 +1148,7 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS } #endif - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { if (ExtraSharedClassListFile) { log_info(aot)("Loading extra classes from %s ...", ExtraSharedClassListFile); ClassListParser::parse_classlist(ExtraSharedClassListFile, @@ -1188,15 +1188,15 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS } #endif - if (!CDSConfig::is_dumping_preimage_static_archive()) { + if (!CDSConfig::is_dumping_aot_configuration()) { open_output_mapinfo(); } VM_PopulateDumpSharedSpace op(builder, _output_mapinfo); VMThread::execute(&op); - if (AOTCodeCache::is_caching_enabled() && CDSConfig::is_dumping_final_static_archive()) { - // We have just created the final image. Now dump AOT adapters, stubs and compiled code. + if (AOTCodeCache::is_caching_enabled() && CDSConfig::is_dumping_aot_cache()) { + // We have dumped the metaspace regions. Now dump AOT adapters, stubs and compiled code. builder.start_ac_region(); if (AOTCodeCache::is_dumping_code()) { // Let's run the AOT compiler. @@ -1216,11 +1216,11 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS bool status = write_static_archive(&builder, _output_mapinfo, op.mapped_heap_info(), op.streamed_heap_info()); assert(!_output_mapinfo->is_open(), "Must be closed already"); _output_mapinfo = nullptr; - if (status && CDSConfig::is_dumping_preimage_static_archive()) { + if (status && CDSConfig::is_dumping_aot_configuration()) { tty->print_cr("%sAOTConfiguration recorded: %s", CDSConfig::has_temp_aot_config_file() ? "Temporary " : "", AOTConfiguration); if (CDSConfig::is_single_command_training()) { - fork_and_dump_final_static_archive(CHECK); + fork_and_dump_aot_cache(CHECK); } } @@ -1346,8 +1346,8 @@ static int exec_jvm_with_java_tool_options(const char* java_launcher_path, TRAPS return result.get_jint(); } -void AOTMetaspace::fork_and_dump_final_static_archive(TRAPS) { - assert(CDSConfig::is_dumping_preimage_static_archive(), "sanity"); +void AOTMetaspace::fork_and_dump_aot_cache(TRAPS) { + assert(CDSConfig::is_dumping_aot_configuration(), "sanity"); ResourceMark rm; stringStream ss; @@ -1430,7 +1430,7 @@ bool AOTMetaspace::try_link_class(JavaThread* current, InstanceKlass* ik) { void VM_PopulateDumpSharedSpace::dump_java_heap_objects() { if (CDSConfig::is_dumping_heap()) { AOTHeap::write_heap(&_mapped_heap_info, &_streamed_heap_info); - } else if (!CDSConfig::is_dumping_preimage_static_archive()) { + } else if (!CDSConfig::is_dumping_aot_configuration()) { CDSConfig::log_reasons_for_not_dumping_heap(); } } @@ -1467,7 +1467,7 @@ bool AOTMetaspace::in_aot_cache_static_region(void* p) { void AOTMetaspace::unrecoverable_loading_error(const char* message) { report_loading_error("%s", message); - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { vm_exit_during_initialization("Unable to use AOT configuration file", AOTConfiguration); } else if (CDSConfig::new_aot_flags_used()) { vm_exit_during_initialization("Unable to use AOT cache.", AOTCache); @@ -1625,7 +1625,7 @@ void AOTMetaspace::initialize_runtime_shared_and_meta_spaces() { // and the size of the AOT code region during production run. // We need the size to reserve space to map code from AOT code region. void AOTMetaspace::get_aot_code_region_size() { - if (!AOTCodeCache::is_caching_enabled() || CDSConfig::is_dumping_final_static_archive()) { + if (!AOTCodeCache::is_caching_enabled() || CDSConfig::is_dumping_aot_cache()) { return; } else if (CDSConfig::is_using_archive()) { // production run with AOT code cache precond(FileMapInfo::static_input_archive() == nullptr); diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp index d76b47ea8157..31ad355a4174 100644 --- a/src/hotspot/share/cds/aotMetaspace.hpp +++ b/src/hotspot/share/cds/aotMetaspace.hpp @@ -60,7 +60,7 @@ class AOTMetaspace : AllStatic { static intx _relocation_delta; static char* _requested_base_address; static Array* _archived_method_handle_intrinsics; - static int volatile _preimage_static_archive_dumped; + static int volatile _aot_configuration_dumped; static FileMapInfo* _output_mapinfo; public: @@ -124,7 +124,7 @@ class AOTMetaspace : AllStatic { // inside the metaspace of the dynamic static CDS archive static bool in_aot_cache_dynamic_region(void* p) NOT_CDS_RETURN_(false); - static bool preimage_static_archive_dumped() NOT_CDS_RETURN_(false); + static bool aot_configuration_dumped() NOT_CDS_RETURN_(false); [[noreturn]] static void unrecoverable_loading_error(const char* message = "unrecoverable error"); static void report_loading_error(const char* format, ...) ATTRIBUTE_PRINTF(1, 0); @@ -196,7 +196,7 @@ class AOTMetaspace : AllStatic { private: static void read_extra_data(JavaThread* current, const char* filename) NOT_CDS_RETURN; - static void fork_and_dump_final_static_archive(TRAPS); + static void fork_and_dump_aot_cache(TRAPS); static void open_output_mapinfo(); static bool write_static_archive(ArchiveBuilder* builder, FileMapInfo* map_info, diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/aotMetaspaceRecipes.cpp similarity index 87% rename from src/hotspot/share/cds/finalImageRecipes.cpp rename to src/hotspot/share/cds/aotMetaspaceRecipes.cpp index 3c2727e276d8..13694c00b1e4 100644 --- a/src/hotspot/share/cds/finalImageRecipes.cpp +++ b/src/hotspot/share/cds/aotMetaspaceRecipes.cpp @@ -23,11 +23,11 @@ */ #include "cds/aotConstantPoolResolver.hpp" +#include "cds/aotMetaspaceRecipes.hpp" #include "cds/aotSystemDictionary.hpp" #include "cds/archiveBuilder.hpp" #include "cds/archiveUtils.inline.hpp" #include "cds/cdsConfig.hpp" -#include "cds/finalImageRecipes.hpp" #include "classfile/classLoader.hpp" #include "classfile/javaClasses.hpp" #include "classfile/javaStackTraceClasses.hpp" @@ -39,23 +39,23 @@ #include "runtime/handles.inline.hpp" #include "runtime/mutexLocker.hpp" -static FinalImageRecipes* _final_image_recipes = nullptr; +static AOTMetaspaceRecipes* _aot_metaspace_recipes = nullptr; -void* FinalImageRecipes::operator new(size_t size) throw() { +void* AOTMetaspaceRecipes::operator new(size_t size) throw() { return ArchiveBuilder::current()->ro_region_alloc(size); } -void FinalImageRecipes::record_all_classes() { +void AOTMetaspaceRecipes::record_all_classes() { _all_klasses = ArchiveUtils::archive_array(ArchiveBuilder::current()->klasses()); ArchivePtrMarker::mark_pointer(&_all_klasses); } -void FinalImageRecipes::record_recipes_for_constantpool() { +void AOTMetaspaceRecipes::record_recipes_for_constantpool() { ResourceMark rm; // The recipes are recorded regardless of CDSConfig::is_dumping_{invokedynamic,dynamic_proxies,reflection_data}(). // If some of these options are not enabled, the corresponding recipes will be - // ignored during the final image assembly. + // ignored during the AOT cache assembly. GrowableArray*> tmp_cp_recipes; GrowableArray tmp_flags; @@ -152,8 +152,8 @@ void FinalImageRecipes::record_recipes_for_constantpool() { ArchivePtrMarker::mark_pointer(&_flags); } -void FinalImageRecipes::apply_recipes_for_constantpool(JavaThread* current) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); +void AOTMetaspaceRecipes::apply_recipes_for_constantpool(JavaThread* current) { + assert(CDSConfig::is_dumping_aot_cache(), "must be"); for (int i = 0; i < _all_klasses->length(); i++) { Array* cp_indices = _cp_recipes->at(i); @@ -181,7 +181,7 @@ void FinalImageRecipes::apply_recipes_for_constantpool(JavaThread* current) { } } -void FinalImageRecipes::load_all_classes(TRAPS) { +void AOTMetaspaceRecipes::load_all_classes(TRAPS) { Handle class_loader(THREAD, SystemDictionary::java_system_loader()); for (int i = 0; i < _all_klasses->length(); i++) { Klass* k = _all_klasses->at(i); @@ -204,7 +204,7 @@ void FinalImageRecipes::load_all_classes(TRAPS) { } } -void FinalImageRecipes::link_all_classes(TRAPS) { +void AOTMetaspaceRecipes::link_all_classes(TRAPS) { for (int i = 0; i < _all_klasses->length(); i++) { Klass* k = _all_klasses->at(i); if (k->is_instance_klass()) { @@ -217,7 +217,7 @@ void FinalImageRecipes::link_all_classes(TRAPS) { } } -void FinalImageRecipes::initialize_all_safe_classes(TRAPS) { +void AOTMetaspaceRecipes::initialize_all_safe_classes(TRAPS) { for (int i = 0; i < _all_klasses->length(); i++) { Klass* k = _all_klasses->at(i); int flags = _flags->at(i); @@ -236,17 +236,17 @@ void FinalImageRecipes::initialize_all_safe_classes(TRAPS) { } } -void FinalImageRecipes::record_recipes() { - assert(CDSConfig::is_dumping_preimage_static_archive(), "must be"); - _final_image_recipes = new FinalImageRecipes(); - _final_image_recipes->record_all_classes(); - _final_image_recipes->record_recipes_for_constantpool(); +void AOTMetaspaceRecipes::record_recipes() { + assert(CDSConfig::is_dumping_aot_configuration(), "must be"); + _aot_metaspace_recipes = new AOTMetaspaceRecipes(); + _aot_metaspace_recipes->record_all_classes(); + _aot_metaspace_recipes->record_recipes_for_constantpool(); } -void FinalImageRecipes::apply_recipes(TRAPS) { - assert(CDSConfig::is_dumping_final_static_archive(), "must be"); - if (_final_image_recipes != nullptr) { - _final_image_recipes->apply_recipes_impl(THREAD); +void AOTMetaspaceRecipes::apply_recipes(TRAPS) { + assert(CDSConfig::is_dumping_aot_cache(), "must be"); + if (_aot_metaspace_recipes != nullptr) { + _aot_metaspace_recipes->apply_recipes_impl(THREAD); if (HAS_PENDING_EXCEPTION) { log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION))); @@ -255,19 +255,19 @@ void FinalImageRecipes::apply_recipes(TRAPS) { } } - // Set it to null as we don't need to write this table into the final image. - _final_image_recipes = nullptr; + // Set it to null as we don't need to write this table into the AOT cache + _aot_metaspace_recipes = nullptr; } // Follow the same class processing phases as during production run -void FinalImageRecipes::apply_recipes_impl(TRAPS) { - assert(CDSConfig::is_dumping_final_static_archive(), "sanity"); +void AOTMetaspaceRecipes::apply_recipes_impl(TRAPS) { + assert(CDSConfig::is_dumping_aot_cache(), "sanity"); load_all_classes(CHECK); link_all_classes(CHECK); initialize_all_safe_classes(CHECK); apply_recipes_for_constantpool(THREAD); } -void FinalImageRecipes::serialize(SerializeClosure* soc) { - soc->do_ptr((void**)&_final_image_recipes); +void AOTMetaspaceRecipes::serialize(SerializeClosure* soc) { + soc->do_ptr((void**)&_aot_metaspace_recipes); } diff --git a/src/hotspot/share/cds/finalImageRecipes.hpp b/src/hotspot/share/cds/aotMetaspaceRecipes.hpp similarity index 75% rename from src/hotspot/share/cds/finalImageRecipes.hpp rename to src/hotspot/share/cds/aotMetaspaceRecipes.hpp index f665534b9c9a..750473162922 100644 --- a/src/hotspot/share/cds/finalImageRecipes.hpp +++ b/src/hotspot/share/cds/aotMetaspaceRecipes.hpp @@ -22,33 +22,34 @@ * */ -#ifndef SHARE_CDS_FINALIMAGERECIPES_HPP -#define SHARE_CDS_FINALIMAGERECIPES_HPP +#ifndef SHARE_CDS_AOTMETASPACERECIPES_HPP +#define SHARE_CDS_AOTMETASPACERECIPES_HPP #include "oops/oopsHierarchy.hpp" #include "utilities/exceptions.hpp" class InstanceKlass; class Klass; +class SerializeClosure; template class GrowableArray; template class Array; -// This class is used for transferring information from the AOTConfiguration file (aka the "preimage") -// to the JVM that creates the AOTCache (aka the "final image"). -// - The recipes are recorded when CDSConfig::is_dumping_preimage_static_archive() is true. -// - The recipes are applied when CDSConfig::is_dumping_final_static_archive() is true. +// This class is used for recoding AOT metaspace optimizations to be applied +// to the AOT cache: +// - The recipes are recorded when CDSConfig::is_dumping_aot_configuration() is true. +// - The recipes are applied when CDSConfig::is_dumping_aot_cache() is true. // The following information are recorded: // - The list of all classes that are stored in the AOTConfiguration file. // - The list of all classes that require AOT resolution of invokedynamic call sites. -class FinalImageRecipes { +class AOTMetaspaceRecipes { static constexpr int CP_RESOLVE_CLASS = 0x1 << 0; // CP has preresolved class entries static constexpr int CP_RESOLVE_FIELD_AND_METHOD = 0x1 << 1; // CP has preresolved field/method entries static constexpr int CP_RESOLVE_INDY = 0x1 << 2; // CP has preresolved indy entries static constexpr int WAS_INITED = 0x1 << 3; // Class was initialized during training run - // A list of all the archived classes from the preimage. We want to transfer all of these - // into the final image. + // A list of all the archived classes from the AOT configuration. We want to transfer all of these + // into the AOT cache. Array* _all_klasses; // For each klass k _all_klasses->at(i): _cp_recipes->at(i) lists all the {klass,field,method,indy} @@ -56,15 +57,15 @@ class FinalImageRecipes { Array*>* _cp_recipes; Array* _flags; - FinalImageRecipes() : _all_klasses(nullptr), _cp_recipes(nullptr), _flags(nullptr) {} + AOTMetaspaceRecipes() : _all_klasses(nullptr), _cp_recipes(nullptr), _flags(nullptr) {} void* operator new(size_t size) throw(); - // Called when dumping preimage + // Called when dumping AOT configuration. void record_all_classes(); void record_recipes_for_constantpool(); - // Called when dumping final image + // Called when dumping AOT cache void apply_recipes_impl(TRAPS); void load_all_classes(TRAPS); void link_all_classes(TRAPS); @@ -74,11 +75,11 @@ class FinalImageRecipes { public: static void serialize(SerializeClosure* soc); - // Called when dumping preimage + // Called when dumping AOT configuration static void record_recipes(); - // Called when dumping final image + // Called when dumping AOT cache static void apply_recipes(TRAPS); }; -#endif // SHARE_CDS_FINALIMAGERECIPES_HPP +#endif // SHARE_CDS_AOTMETASPACERECIPES_HPP diff --git a/src/hotspot/share/cds/aotModules.cpp b/src/hotspot/share/cds/aotModules.cpp index 1922eb2b7396..faf505010c66 100644 --- a/src/hotspot/share/cds/aotModules.cpp +++ b/src/hotspot/share/cds/aotModules.cpp @@ -296,7 +296,7 @@ void AOTModules::ArchivedProperty::runtime_check() const { const char* new_label1; const char* new_label2; - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { old_label1 = "in AOTConfiguration"; old_label2 = ", AOTConfiguration ="; new_label1 = "for current JVM"; @@ -335,7 +335,7 @@ void AOTModules::ArchivedProperty::runtime_check() const { AOTMetaspace::report_loading_error("Disabling full module graph"); CDSConfig::disable_full_module_graph(); - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { AOTMetaspace::unrecoverable_writing_error("mismatched module options"); } } diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.cpp b/src/hotspot/share/cds/aotReferenceObjSupport.cpp index 082c116edb91..dcddfc953a2e 100644 --- a/src/hotspot/share/cds/aotReferenceObjSupport.cpp +++ b/src/hotspot/share/cds/aotReferenceObjSupport.cpp @@ -194,8 +194,8 @@ bool AOTReferenceObjSupport::check_if_ref_obj(oop obj) { // is not running. // // This code is called on every object found by AOTArtifactFinder. When dumping the - // preimage archive, AOTArtifactFinder should not find any Reference objects. - precond(!CDSConfig::is_dumping_preimage_static_archive()); + // AOT configuration, AOTArtifactFinder should not find any Reference objects. + precond(!CDSConfig::is_dumping_aot_configuration()); precond(CDSConfig::allow_only_single_java_thread()); precond(AOTReferenceObjSupport::is_enabled()); diff --git a/src/hotspot/share/cds/aotSystemDictionary.cpp b/src/hotspot/share/cds/aotSystemDictionary.cpp index 1760379cc2a9..a7631cb32214 100644 --- a/src/hotspot/share/cds/aotSystemDictionary.cpp +++ b/src/hotspot/share/cds/aotSystemDictionary.cpp @@ -205,7 +205,7 @@ DumpTimeClassInfo* AOTSystemDictionary::get_info_locked(InstanceKlass* k) { } void AOTSystemDictionary::check_code_source(InstanceKlass* ik, const ClassFileStream* cfs) { - if (CDSConfig::is_dumping_preimage_static_archive() && !is_builtin_loader(ik->class_loader_data())) { + if (CDSConfig::is_dumping_aot_configuration() && !is_builtin_loader(ik->class_loader_data())) { if (cfs == nullptr || cfs->source() == nullptr || strncmp(cfs->source(), "file:", 5) != 0) { // AOT cache filtering: // For non-built-in loaders, cache only the classes that have a file: code source, so @@ -468,9 +468,9 @@ const char* AOTSystemDictionary::check_self_exclusion_helper(InstanceKlass* k, b // An unlinked class may fail to verify in AOTLinkedClassBulkLoader::init_required_classes_for_loader(), // causing the JVM to fail at bootstrap. return "Unlinked class not supported by AOTClassLinking"; - } else if (CDSConfig::is_dumping_preimage_static_archive()) { - // When dumping the final static archive, we will unconditionally load and link all - // classes from the preimage. We don't want to get a VerifyError when linking this class. + } else if (CDSConfig::is_dumping_aot_configuration()) { + // When dumping the AOT cache, we will unconditionally load and link all + // classes from the AOT configuration. We don't want to get a VerifyError when linking this class. return "Unlinked class not supported by AOTConfiguration"; } } else { @@ -825,7 +825,7 @@ void AOTSystemDictionary::handle_class_unloading(InstanceKlass* klass) { } void AOTSystemDictionary::init_dumptime_info_from_input_archive(InstanceKlass* k) { - if (CDSConfig::is_dumping_preimage_static_archive() && k->defined_by_other_loaders()) { + if (CDSConfig::is_dumping_aot_configuration() && k->defined_by_other_loaders()) { DEBUG_ONLY({ DumpTimeClassInfo* info = _dumptime_table->get(k); guarantee(info != nullptr, "Already added in AOTSystemDictionary::copy_unregistered_classes_for_retraining()"); @@ -1009,7 +1009,7 @@ bool AOTSystemDictionary::should_be_excluded(Klass* k) { void AOTSystemDictionary::finish_exclusion_checks() { assert_at_safepoint(); - if (CDSConfig::is_dumping_dynamic_archive() || CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_dynamic_archive() || CDSConfig::is_dumping_aot_configuration()) { // Do this first -- if a base class is excluded due to duplication, // all of its subclasses will also be excluded. ResourceMark rm; @@ -1158,7 +1158,7 @@ void AOTSystemDictionary::check_verification_constraints(InstanceKlass* klass, if (from_name == nullptr) { // This is for old verifier. No need to check, as we can guarantee that all classes checked by // the old verifier during AOT training phase cannot be replaced in the asembly phase. - precond(CDSConfig::is_dumping_final_static_archive()); + precond(CDSConfig::is_dumping_aot_cache()); continue; } diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp index 9cd7f58d0a8b..afa107e876b8 100644 --- a/src/hotspot/share/cds/cdsConfig.cpp +++ b/src/hotspot/share/cds/cdsConfig.cpp @@ -50,8 +50,8 @@ #include "utilities/globalDefinitions.hpp" bool CDSConfig::_is_dumping_static_archive = false; -bool CDSConfig::_is_dumping_preimage_static_archive = false; -bool CDSConfig::_is_dumping_final_static_archive = false; +bool CDSConfig::_is_dumping_aot_configuration = false; +bool CDSConfig::_is_dumping_aot_cache = false; bool CDSConfig::_is_dumping_dynamic_archive = false; bool CDSConfig::_is_dumping_full_module_graph = true; bool CDSConfig::_is_using_full_module_graph = true; @@ -606,10 +606,10 @@ void CDSConfig::check_aotmode_record() { } _is_dumping_static_archive = true; - _is_dumping_preimage_static_archive = true; + _is_dumping_aot_configuration = true; // At the end of the training run, the module graph may be contaminated with program states. - // We will rebuild the module graph when dumping the CDS final image. + // We will rebuild the module graph when dumping the AOT cache. _is_dumping_full_module_graph = false; } @@ -635,12 +635,12 @@ void CDSConfig::check_aotmode_create() { substitute_aot_filename(FLAG_MEMBER_ENUM(AOTCache)); - _is_dumping_final_static_archive = true; + _is_dumping_aot_cache = true; _is_using_full_module_graph = false; UseSharedSpaces = true; RequireSharedSpaces = true; - FileMapInfo::check_preimage_static_archive(AOTConfiguration); + FileMapInfo::check_aot_configuration(AOTConfiguration); CDSConfig::enable_dumping_static_archive(); // We don't load any agents in the assembly phase, so we can ensure that the agents @@ -657,11 +657,11 @@ void CDSConfig::check_aotmode_create() { void CDSConfig::ergo_init_aot_paths() { assert(_cds_ergo_initialize_started, "sanity"); if (is_dumping_static_archive()) { - if (is_dumping_preimage_static_archive()) { + if (is_dumping_aot_configuration()) { _input_static_archive_path = AOTCache; // non-null when re-training _output_archive_path = AOTConfiguration; } else { - assert(is_dumping_final_static_archive(), "must be"); + assert(is_dumping_aot_cache(), "must be"); _input_static_archive_path = AOTConfiguration; _output_archive_path = AOTCache; } @@ -700,9 +700,9 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla } if (is_dumping_static_archive()) { - if (is_dumping_preimage_static_archive()) { + if (is_dumping_aot_configuration()) { // Don't tweak execution mode during AOT training run - } else if (is_dumping_final_static_archive()) { + } else if (is_dumping_aot_cache()) { if (Arguments::mode() == Arguments::_comp) { // AOT assembly phase submits the non-blocking compilation requests // for methods collected during training run, then waits for all compilations @@ -889,16 +889,16 @@ void CDSConfig::prepare_for_dumping() { bool CDSConfig::is_dumping_classic_static_archive() { return _is_dumping_static_archive && - !is_dumping_preimage_static_archive() && - !is_dumping_final_static_archive(); + !is_dumping_aot_configuration() && + !is_dumping_aot_cache(); } -bool CDSConfig::is_dumping_preimage_static_archive() { - return _is_dumping_preimage_static_archive; +bool CDSConfig::is_dumping_aot_configuration() { + return _is_dumping_aot_configuration; } -bool CDSConfig::is_dumping_final_static_archive() { - return _is_dumping_final_static_archive; +bool CDSConfig::is_dumping_aot_cache() { + return _is_dumping_aot_cache; } void CDSConfig::enable_dumping_dynamic_archive(const char* output_path) { @@ -915,7 +915,7 @@ void CDSConfig::enable_dumping_dynamic_archive(const char* output_path) { bool CDSConfig::allow_only_single_java_thread() { // See comments in JVM_StartThread() - return is_dumping_classic_static_archive() || is_dumping_final_static_archive(); + return is_dumping_classic_static_archive() || is_dumping_aot_cache(); } bool CDSConfig::is_using_archive() { @@ -931,13 +931,13 @@ bool CDSConfig::is_using_only_default_archive() { } bool CDSConfig::is_logging_lambda_form_invokers() { - return ClassListWriter::is_enabled() || is_dumping_dynamic_archive() || is_dumping_preimage_static_archive(); + return ClassListWriter::is_enabled() || is_dumping_dynamic_archive() || is_dumping_aot_configuration(); } bool CDSConfig::is_dumping_regenerated_lambdaform_invokers() { - if (is_dumping_final_static_archive()) { + if (is_dumping_aot_cache()) { // No need to regenerate -- the lambda form invokers should have been regenerated - // in the preimage archive (if allowed) + // in the AOT configuration (if allowed) return false; } else if (is_dumping_dynamic_archive() && is_using_aot_linked_classes()) { // The base archive has aot-linked classes that may have AOT-resolved CP references @@ -975,7 +975,7 @@ bool CDSConfig::in_dumper_thread() { } const char* CDSConfig::type_of_archive_being_loaded() { - if (is_dumping_final_static_archive()) { + if (is_dumping_aot_cache()) { return "AOT configuration file"; } else if (new_aot_flags_used()) { return "AOT cache"; @@ -985,7 +985,7 @@ const char* CDSConfig::type_of_archive_being_loaded() { } const char* CDSConfig::type_of_archive_being_written() { - if (is_dumping_preimage_static_archive()) { + if (is_dumping_aot_configuration()) { return "AOT configuration file"; } else if (new_aot_flags_used()) { return "AOT cache"; @@ -1038,9 +1038,9 @@ bool CDSConfig::is_preserving_verification_constraints() { // in the assembly phase, all of the verifier's assignability checks will remain // valid in the production run, so we don't need to verify aot-linked classes again. - if (is_dumping_preimage_static_archive()) { // writing AOT config + if (is_dumping_aot_configuration()) { return AOTClassLinking; - } else if (is_dumping_final_static_archive()) { // writing AOT cache + } else if (is_dumping_aot_cache()) { return is_dumping_aot_linked_classes(); } else if (is_dumping_classic_static_archive()) { return false; @@ -1059,7 +1059,7 @@ bool CDSConfig::are_vm_options_incompatible_with_dumping_heap() { } bool CDSConfig::is_dumping_heap() { - // Note: when dumping preimage static archive, only a very limited set of oops + // Note: when dumping AOT configuration, only a very limited set of oops // are dumped. if (!is_dumping_static_archive() || are_vm_options_incompatible_with_dumping_heap() @@ -1094,8 +1094,8 @@ bool CDSConfig::is_dumping_klass_subgraphs() { return false; } - if (is_dumping_preimage_static_archive()) { - // KlassSubGraphs are disabled in the preimage static archive, which contains a very + if (is_dumping_aot_configuration()) { + // KlassSubGraphs are disabled in the AOT Configuration, which contains a very // limited set of oops. return false; } @@ -1113,7 +1113,7 @@ bool CDSConfig::is_dumping_klass_subgraphs() { bool CDSConfig::is_using_klass_subgraphs() { return (is_loading_heap() && !CDSConfig::is_using_aot_linked_classes() && - !CDSConfig::is_dumping_final_static_archive()); + !CDSConfig::is_dumping_aot_cache()); } // Prevent the JVM from dumping or using the archived full module graph @@ -1162,7 +1162,7 @@ void CDSConfig::stop_using_full_module_graph(const char* reason) { } bool CDSConfig::is_dumping_aot_linked_classes() { - if (is_dumping_final_static_archive()) { + if (is_dumping_aot_cache()) { // FMG is required to guarantee that all cached boot/platform/app classes // are visible in the production run, so they can be unconditionally // loaded during VM bootstrap. @@ -1200,9 +1200,9 @@ bool CDSConfig::is_dumping_method_handles() { #endif // INCLUDE_CDS_JAVA_HEAP // AOT code generation and its archiving is disabled by default. -// We enable it only in the final image dump after the metadata and heap are dumped. +// We enable it only after the metadata and heap are dumped for the AOT cache. // This affects only JITed code because it may have embedded oops and metadata pointers -// which AOT code encodes as offsets in final CDS archive regions. +// which AOT code encodes as offsets in the metaspace regions of the AOT cache. static bool _is_dumping_aot_code = false; @@ -1219,5 +1219,5 @@ void CDSConfig::enable_dumping_aot_code() { } bool CDSConfig::is_dumping_adapters() { - return (AOTAdapterCaching && is_dumping_final_static_archive()); + return (AOTAdapterCaching && is_dumping_aot_cache()); } diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp index 1ced67f38f4c..20942ca441b9 100644 --- a/src/hotspot/share/cds/cdsConfig.hpp +++ b/src/hotspot/share/cds/cdsConfig.hpp @@ -35,8 +35,8 @@ class InstanceKlass; class CDSConfig : public AllStatic { #if INCLUDE_CDS static bool _is_dumping_static_archive; - static bool _is_dumping_preimage_static_archive; - static bool _is_dumping_final_static_archive; + static bool _is_dumping_aot_configuration; + static bool _is_dumping_aot_cache; static bool _is_dumping_dynamic_archive; static bool _is_dumping_full_module_graph; static bool _is_using_full_module_graph; @@ -130,9 +130,6 @@ class CDSConfig : public AllStatic { // // The first 3 types are also referred to as "static archives". At any time, a JVM can load // at most one static archive, and at most one dynamic archive. - // - // Note: [2] is also known as the "preimage static archive". [3] is also known as the "final static archive". - // These are outdated terminology and will be removed in the future. // archive(s) in general static bool is_dumping_archive() { return is_dumping_static_archive() || is_dumping_dynamic_archive(); } @@ -146,18 +143,14 @@ class CDSConfig : public AllStatic { static void enable_dumping_static_archive() { CDS_ONLY(_is_dumping_static_archive = true); } static bool is_dumping_classic_static_archive() NOT_CDS_RETURN_(false); - static bool is_dumping_preimage_static_archive() NOT_CDS_RETURN_(false); - static bool is_dumping_final_static_archive() NOT_CDS_RETURN_(false); + static bool is_dumping_aot_configuration() NOT_CDS_RETURN_(false); + static bool is_dumping_aot_cache() NOT_CDS_RETURN_(false); // Is the current JVM loading classes from an input archive and dumping into an output archive. - static bool is_dumping_with_input_archive() { return is_dumping_aot_cache() || is_redumping_aot_configuration(); } - - // New names: - static bool is_dumping_aot_configuration() { return is_dumping_preimage_static_archive(); } - static bool is_dumping_aot_cache() { return is_dumping_final_static_archive(); } + static bool is_dumping_with_input_archive() { return is_dumping_aot_cache() || is_redumping_aot_configuration(); } // Iterative training - static bool is_redumping_aot_configuration() { return is_dumping_aot_configuration() && is_using_archive(); } + static bool is_redumping_aot_configuration() { return is_dumping_aot_configuration() && is_using_archive(); } // dynamic_archive static bool is_dumping_dynamic_archive() { return CDS_ONLY(_is_dumping_dynamic_archive) NOT_CDS(false); } diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp index 9bf958ebcc68..56651d665584 100644 --- a/src/hotspot/share/cds/cppVtables.cpp +++ b/src/hotspot/share/cds/cppVtables.cpp @@ -231,8 +231,8 @@ enum ClonedVtableKind { // the following holds true: // _orig_cpp_vtptrs[ConstantPool_Kind] == ((intptr_t**)cp)[0] // -// _archived_cpp_vtptrs is a map of all the vptprs used by classes in a preimage. E.g., for -// InstanceKlass* k = a class loaded from the preimage; +// _archived_cpp_vtptrs is a map of all the vptprs used by classes in an input archive. E.g., for +// InstanceKlass* k = a class loaded from the input archive; // ConstantPool* cp = k->constants(); // the following holds true: // _archived_cpp_vtptrs[ConstantPool_Kind] == ((intptr_t**)cp)[0] diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 9ef17b0923b9..e199de46673d 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -282,8 +282,8 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment, set_base_archive_name_size((unsigned int)base_archive_name_size); if (CDSConfig::is_dumping_dynamic_archive()) { set_magic(CDS_DYNAMIC_ARCHIVE_MAGIC); - } else if (CDSConfig::is_dumping_preimage_static_archive()) { - set_magic(CDS_PREIMAGE_ARCHIVE_MAGIC); + } else if (CDSConfig::is_dumping_aot_configuration()) { + set_magic(AOT_CONFIGURATION_MAGIC); } else { set_magic(CDS_ARCHIVE_MAGIC); } @@ -497,7 +497,7 @@ class FileHeaderHelper { if (gen_header._magic != CDS_ARCHIVE_MAGIC && gen_header._magic != CDS_DYNAMIC_ARCHIVE_MAGIC && - gen_header._magic != CDS_PREIMAGE_ARCHIVE_MAGIC) { + gen_header._magic != AOT_CONFIGURATION_MAGIC) { aot_log_warning(aot)("The %s has a bad magic number: %#x", file_type, gen_header._magic); return false; } @@ -557,7 +557,7 @@ class FileHeaderHelper { return _base_archive_name; } - bool is_static_archive() const { + bool is_classic_static_archive_or_aot_cache() const { return _header->_magic == CDS_ARCHIVE_MAGIC; } @@ -565,8 +565,8 @@ class FileHeaderHelper { return _header->_magic == CDS_DYNAMIC_ARCHIVE_MAGIC; } - bool is_preimage_static_archive() const { - return _header->_magic == CDS_PREIMAGE_ARCHIVE_MAGIC; + bool is_aot_configuration() const { + return _header->_magic == AOT_CONFIGURATION_MAGIC; } bool aot_class_linking_value() const { @@ -599,7 +599,7 @@ class FileHeaderHelper { return false; } - if (is_static_archive() || is_preimage_static_archive()) { + if (is_classic_static_archive_or_aot_cache() || is_aot_configuration()) { if (name_offset != 0) { aot_log_warning(aot)("static shared archive must have zero _base_archive_name_offset"); return false; @@ -658,7 +658,7 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name, } GenericCDSFileMapHeader* header = file_helper.get_generic_file_header(); switch (header->_magic) { - case CDS_PREIMAGE_ARCHIVE_MAGIC: + case AOT_CONFIGURATION_MAGIC: return false; // This is a binary config file, not a proper archive case CDS_DYNAMIC_ARCHIVE_MAGIC: break; @@ -680,9 +680,9 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name, return true; } -void FileMapInfo::check_preimage_static_archive(const char* file) { +void FileMapInfo::check_aot_configuration(const char* file) { FileHeaderHelper file_helper(file, false); - if (!file_helper.initialize() || !file_helper.is_preimage_static_archive()) { + if (!file_helper.initialize() || !file_helper.is_aot_configuration()) { vm_exit_during_initialization("Must be a valid AOT configuration generated by the current JVM", file); } @@ -709,7 +709,7 @@ bool FileMapInfo::init_from_file(int fd) { const char* file_type = CDSConfig::type_of_archive_being_loaded(); if (_is_static) { if ((gen_header->_magic == CDS_ARCHIVE_MAGIC) || - (gen_header->_magic == CDS_PREIMAGE_ARCHIVE_MAGIC && CDSConfig::is_dumping_final_static_archive())) { + (gen_header->_magic == AOT_CONFIGURATION_MAGIC && CDSConfig::is_dumping_aot_cache())) { // Good } else { if (CDSConfig::new_aot_flags_used()) { @@ -804,7 +804,7 @@ bool FileMapInfo::open_for_read() { return true; } const char* file_type = CDSConfig::type_of_archive_being_loaded(); - const char* info = CDSConfig::is_dumping_final_static_archive() ? + const char* info = CDSConfig::is_dumping_aot_cache() ? "AOTConfiguration file " : ""; aot_log_info(aot)("trying to map %s%s", info, _full_path); int fd = os::open(_full_path, O_RDONLY | O_BINARY, 0); @@ -829,7 +829,7 @@ bool FileMapInfo::open_for_read() { void FileMapInfo::open_as_output() { if (CDSConfig::new_aot_flags_used()) { - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { log_info(aot)("Writing binary AOTConfiguration file: %s", _full_path); } else { log_info(aot)("Writing AOTCache file: %s", _full_path); @@ -1143,7 +1143,7 @@ void FileMapInfo::write_bytes(const void* buffer, size_t nbytes) { close(); remove(_full_path); - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { AOTMetaspace::writing_error("Unable to write to AOT configuration file."); } else if (CDSConfig::new_aot_flags_used()) { AOTMetaspace::writing_error("Unable to write to AOT cache."); @@ -1364,7 +1364,7 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba // Note that this may either be a "fresh" mapping into unreserved address // space (Windows, first mapping attempt), or a mapping into pre-reserved // space (Posix). See also comment in AOTMetaspace::map_archives(). - bool read_only = r->read_only() && !CDSConfig::is_dumping_final_static_archive(); + bool read_only = r->read_only() && !CDSConfig::is_dumping_aot_cache(); char* base = map_memory(_fd, _full_path, r->file_offset(), requested_addr, size, read_only, @@ -1709,8 +1709,8 @@ bool FileMapInfo::can_use_heap_region() { return false; } if (!CDSConfig::is_using_full_module_graph()) { - if (CDSConfig::is_dumping_final_static_archive()) { - // We are loading the preimage static archive, which has no KlassSubGraphs. + if (CDSConfig::is_dumping_aot_cache()) { + // We are loading the AOT configuration, which has no KlassSubGraphs. // See CDSConfig::is_dumping_klass_subgraphs() } else { AOTMetaspace::report_loading_error("CDS heap data is disabled because archived full module graph is not used."); @@ -1936,7 +1936,7 @@ bool FileMapInfo::validate_aot_class_linking() { #endif } - if (CDSConfig::is_dumping_final_static_archive() && header()->aot_class_linking_value() && !CDSConfig::is_dumping_aot_linked_classes()) { + if (CDSConfig::is_dumping_aot_cache() && header()->aot_class_linking_value() && !CDSConfig::is_dumping_aot_linked_classes()) { ResourceMark rm; const char* msg = err_msg("AOT class linking was enabled in training run but has been disabled%s", (CDSConfig::is_dumping_full_module_graph() ? "" : " due to incompatible module options")); diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp index f3cc4fe517b4..46a2bcb1ed76 100644 --- a/src/hotspot/share/cds/filemap.hpp +++ b/src/hotspot/share/cds/filemap.hpp @@ -327,7 +327,7 @@ class FileMapInfo : public CHeapObj { FileMapHeader *header() const { return _header; } static bool get_base_archive_name_from_header(const char* archive_name, const char** base_archive_name); - static void check_preimage_static_archive(const char* file); + static void check_aot_configuration(const char* file); bool init_from_file(int fd); diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp index 5b0bfcf59f7e..98a7c0a04b84 100644 --- a/src/hotspot/share/cds/lambdaFormInvokers.cpp +++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp @@ -290,12 +290,12 @@ void LambdaFormInvokers::read_static_archive_invokers() { void LambdaFormInvokers::serialize(SerializeClosure* soc) { soc->do_ptr(&_static_archive_invokers); - if (soc->reading() && CDSConfig::is_dumping_final_static_archive()) { + if (soc->reading() && CDSConfig::is_dumping_aot_cache()) { if (!CDSConfig::is_dumping_aot_linked_classes()) { // See CDSConfig::is_dumping_regenerated_lambdaform_invokers() -- a dynamic archive can // regenerate lambda form invokers only if the base archive does not contain aot-linked classes. - // If so, we copy the contents of _static_archive_invokers (from the preimage) into - //_lambdaform_lines, which will be written as _static_archive_invokers into final static archive. + // If so, we copy the contents of _static_archive_invokers (from the AOT configuration) into + //_lambdaform_lines, which will be written as _static_archive_invokers into the AOT cache. LambdaFormInvokers::read_static_archive_invokers(); } _static_archive_invokers = nullptr; diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp index c1c1c6b0658a..282f049df9c4 100644 --- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp +++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp @@ -164,8 +164,8 @@ void LambdaProxyClassDictionary::add_lambda_proxy_class(InstanceKlass* caller_ik return; } - if (CDSConfig::is_dumping_preimage_static_archive()) { - // Information about lambda proxies are recorded in FinalImageRecipes. + if (CDSConfig::is_dumping_aot_configuration()) { + // Information about lambda proxies are recorded in AOTMetaspaceRecipes. return; } diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index 0dd715b00b0c..039a1d2b68b1 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -1422,7 +1422,7 @@ void ClassLoader::record_result_for_builtin_loader(s2 classpath_index, InstanceK precond(loader == nullptr); } - if (CDSConfig::is_dumping_preimage_static_archive() || CDSConfig::is_dumping_dynamic_archive()) { + if (CDSConfig::is_dumping_aot_configuration() || CDSConfig::is_dumping_dynamic_archive()) { if (!AOTClassLocationConfig::dumptime()->is_valid_classpath_index(classpath_index, result)) { classpath_index = -1; } diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp index e0e1a0faa4b5..68bd17aa0932 100644 --- a/src/hotspot/share/classfile/moduleEntry.cpp +++ b/src/hotspot/share/classfile/moduleEntry.cpp @@ -420,7 +420,7 @@ void ModuleEntry::remove_unshareable_info() { } // Clear handles and restore at run time. Handles cannot be archived. - if (CDSConfig::is_dumping_final_static_archive()) { + if (CDSConfig::is_dumping_aot_cache()) { OopHandle null_handle; _shared_pd = null_handle; } else { diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp index 10bf9fcbe82e..c51542120fbf 100644 --- a/src/hotspot/share/code/aotCodeCache.cpp +++ b/src/hotspot/share/code/aotCodeCache.cpp @@ -232,7 +232,7 @@ bool AOTCodeCache::is_using_code() { // This is used before AOTCodeCache is initialized // but after AOT (CDS) Cache flags consistency is checked. bool AOTCodeCache::maybe_dumping_code() { - return AOTCodeCaching && CDSConfig::is_dumping_final_static_archive(); + return AOTCodeCaching && CDSConfig::is_dumping_aot_cache(); } // Next methods could be called regardless of AOT code cache status. @@ -287,7 +287,7 @@ uint AOTCodeCache::max_aot_code_size() { } bool AOTCodeCache::is_code_load_thread_on() { - return AOTCodeCaching && !CDSConfig::is_dumping_final_static_archive(); + return AOTCodeCaching && !CDSConfig::is_dumping_aot_cache(); } // It is called from AOTMetaspace::initialize_shared_spaces() @@ -303,7 +303,7 @@ void AOTCodeCache::initialize() { bool is_dumping = false; bool is_using = false; - if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) { + if (CDSConfig::is_dumping_aot_cache() && CDSConfig::is_dumping_aot_linked_classes()) { is_dumping = is_caching_enabled(); } else if (CDSConfig::is_using_archive() && CDSConfig::is_using_aot_linked_classes()) { is_using = is_caching_enabled(); diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp index 38e0df7fa468..44db8b346d7d 100644 --- a/src/hotspot/share/compiler/compilationPolicy.cpp +++ b/src/hotspot/share/compiler/compilationPolicy.cpp @@ -227,7 +227,7 @@ void CompilationPolicy::replay_training_at_init_impl(InstanceKlass* klass, JavaT void CompilationPolicy::replay_training_at_init(InstanceKlass* klass, JavaThread* current) { assert(klass->is_initialized(), ""); if (TrainingData::have_data() && klass->in_aot_cache() && - !CDSConfig::is_dumping_final_static_archive()) { // No need during assembly phase + !CDSConfig::is_dumping_aot_cache()) { // No need during assembly phase _training_replay_queue.push(klass, TrainingReplayQueue_lock, current); } } diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index 0349e1f83b07..650434c49d30 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -335,7 +335,7 @@ void CompileQueue::add(CompileTask* task) { task->log_task_queued(); } - if (TrainingData::need_data() && !CDSConfig::is_dumping_final_static_archive()) { + if (TrainingData::need_data() && !CDSConfig::is_dumping_aot_cache()) { CompileTrainingData* ctd = CompileTrainingData::make(task); if (ctd != nullptr) { task->set_training_data(ctd); @@ -1029,7 +1029,7 @@ void CompileBroker::init_training_replay() { // Ensure any exceptions lead to vm_exit_during_initialization. EXCEPTION_MARK; // No need to replay training during assembly phase. Only training data is used. - if (TrainingData::have_data() && !CDSConfig::is_dumping_final_static_archive()) { + if (TrainingData::have_data() && !CDSConfig::is_dumping_aot_cache()) { Handle thread_oop = JavaThread::create_system_thread_object("Training replay thread", CHECK); jobject thread_handle = JNIHandles::make_local(THREAD, thread_oop()); make_thread(training_replay_t, thread_handle, nullptr, nullptr, THREAD); diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h index 0068b9a1ec00..baa3bb81e76e 100644 --- a/src/hotspot/share/include/cds.h +++ b/src/hotspot/share/include/cds.h @@ -36,9 +36,9 @@ // Also, this is a C header file. Do not use C++ here. #define NUM_CDS_REGIONS 5 // this must be the same as AOTMetaspace::n_regions -#define CDS_ARCHIVE_MAGIC 0xf00baba2 +#define CDS_ARCHIVE_MAGIC 0xf00baba2 // This is used for both classic static archive and AOT cache #define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8 -#define CDS_PREIMAGE_ARCHIVE_MAGIC 0xcafea07c +#define AOT_CONFIGURATION_MAGIC 0xcafea07c #define CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION 13 #define CURRENT_CDS_ARCHIVE_VERSION 21 diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp index f414fc33a99b..7c3dc6f68a6c 100644 --- a/src/hotspot/share/oops/constantPool.cpp +++ b/src/hotspot/share/oops/constantPool.cpp @@ -542,7 +542,7 @@ void ConstantPool::remove_resolved_klass_if_non_archivable(int cp_index) { bool can_archive; Klass* k = nullptr; - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { can_archive = false; } else { k = resolved_klass_at(cp_index); diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp index 2d17e79f8bf9..2c100403bf35 100644 --- a/src/hotspot/share/oops/cpCache.cpp +++ b/src/hotspot/share/oops/cpCache.cpp @@ -433,7 +433,7 @@ void ConstantPoolCache::iterate_resolved_field_entries_with_archivability_check( resolved = true; } - bool archivable = (resolved && !CDSConfig::is_dumping_preimage_static_archive() && + bool archivable = (resolved && !CDSConfig::is_dumping_aot_configuration() && AOTConstantPoolResolver::is_resolution_deterministic(src_cp, cp_index)); // The state of strict static field accesses is reset in InstanceKlass::remove_unshareable_info @@ -499,7 +499,7 @@ void ConstantPoolCache::iterate_resolved_method_entries_with_archivability_check (rme->is_resolved(Bytecodes::_invokestatic) && VM_Version::supports_fast_class_init_checks()); const char* rejection_reason = nullptr; - bool archivable = (resolved && !CDSConfig::is_dumping_preimage_static_archive() && + bool archivable = (resolved && !CDSConfig::is_dumping_aot_configuration() && can_archive_resolved_method(src_cp, rme, rejection_reason)); f(cp, src_cp, cp_index, rme, resolved, archivable, rejection_reason); } @@ -556,7 +556,7 @@ void ConstantPoolCache::iterate_resolved_indy_entries_with_archivability_check(F ResolvedIndyEntry* rie = _resolved_indy_entries->adr_at(i); int cp_index = rie->constant_pool_index(); bool resolved = rie->is_resolved(); - bool archivable = (resolved && !CDSConfig::is_dumping_preimage_static_archive() && + bool archivable = (resolved && !CDSConfig::is_dumping_aot_configuration() && AOTConstantPoolResolver::is_resolution_deterministic(src_cp, cp_index)); f(cp, src_cp, i, cp_index, rie, resolved, archivable); } diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index 031ac6ce34bb..bc64ab41b0e0 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -3322,7 +3322,7 @@ bool InstanceKlass::can_be_verified_at_dumptime() const { return false; } - if (CDSConfig::is_dumping_final_static_archive() && fail_over_verified()) { + if (CDSConfig::is_dumping_aot_cache() && fail_over_verified()) { // This is a class with version >50 but was verified with the old verifier in the training run, // which had -XX:+AOTClassLinking. However, we are now in the assembly run with -XX:-AOTClassLinking. // As AOTSystemDictionary::check_verification_constraints() does not support this case, diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp index 4f89ec20e578..f9c6abac607e 100644 --- a/src/hotspot/share/oops/method.cpp +++ b/src/hotspot/share/oops/method.cpp @@ -1314,7 +1314,7 @@ void Method::remove_unshareable_flags() { // the current VM. Recompute it when the method is linked and // its adapter is selected. set_has_scalarized_args(false); - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { // These flags may reflect class linking state during training run. // Recompute them during assembly phase and preserve the results // in the final AOT cache so production run uses the same diff --git a/src/hotspot/share/oops/trainingData.hpp b/src/hotspot/share/oops/trainingData.hpp index 9f08d0c13602..314e708d8293 100644 --- a/src/hotspot/share/oops/trainingData.hpp +++ b/src/hotspot/share/oops/trainingData.hpp @@ -294,7 +294,7 @@ class TrainingData : public Metadata { static bool have_data() { return AOTReplayTraining; } // Going to read static bool need_data() { return AOTRecordTraining; } // Going to write - static bool assembling_data() { return have_data() && CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes(); } + static bool assembling_data() { return have_data() && CDSConfig::is_dumping_aot_cache() && CDSConfig::is_dumping_aot_linked_classes(); } static bool is_klass_loaded(Klass* k) { if (have_data()) { diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index 71f45f66c5b8..4664ab72c195 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -234,8 +234,8 @@ extern void trace_class_resolution(Klass* to_class) { JVM_ENTRY(jboolean, JVM_AOTEndRecording(JNIEnv *env)) #if INCLUDE_CDS - if (CDSConfig::is_dumping_preimage_static_archive()) { - if (!AOTMetaspace::preimage_static_archive_dumped()) { + if (CDSConfig::is_dumping_aot_configuration()) { + if (!AOTMetaspace::aot_configuration_dumped()) { AOTMetaspace::dump_static_archive(THREAD); return JNI_TRUE; } diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp index cdc0097c2d02..a021ad8f6f8e 100644 --- a/src/hotspot/share/prims/jvmtiAgent.cpp +++ b/src/hotspot/share/prims/jvmtiAgent.cpp @@ -587,7 +587,7 @@ static void check_cds_dump(JvmtiAgent* agent) { if (CDSConfig::new_aot_flags_used()) { // JEP 483 // Agents are allowed with -XX:AOTMode=record and -XX:AOTMode=required/auto. // Agents are completely disabled when -XX:AOTMode=create (see cdsConfig.cpp) - assert(!CDSConfig::is_dumping_final_static_archive(), "agents should have been disabled with -XX:AOTMode=create"); + assert(!CDSConfig::is_dumping_aot_cache(), "agents should have been disabled with -XX:AOTMode=create"); } else if (CDSConfig::is_dumping_classic_static_archive() || CDSConfig::is_dumping_dynamic_archive()) { // Classic CDS (static or dynamic dump). Disallow agents. vm_exit_during_cds_dumping("JVMTI agents are not allowed when dumping CDS archives"); diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp index 702909409a76..86b293af3f42 100644 --- a/src/hotspot/share/runtime/abstract_vm_version.cpp +++ b/src/hotspot/share/runtime/abstract_vm_version.cpp @@ -154,9 +154,9 @@ const char* Abstract_VM_Version::vm_info_string() { if (is_vm_statically_linked()) { ss.print("%s", ", static"); } - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { ss.print("%s", ", aot training"); - } else if (CDSConfig::is_dumping_final_static_archive()) { + } else if (CDSConfig::is_dumping_aot_cache()) { ss.print("%s", ", aot assembly"); } else if (CDSConfig::is_using_archive()) { ss.print("%s", CDSConfig::new_aot_flags_used() ? ", aot production" : ", sharing"); diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp index 4ec55fb052f0..4950408d2c98 100644 --- a/src/hotspot/share/runtime/java.cpp +++ b/src/hotspot/share/runtime/java.cpp @@ -451,7 +451,7 @@ void before_exit(JavaThread* thread, bool halt) { #if INCLUDE_CDS ClassListWriter::write_resolved_constants(); - if (CDSConfig::is_dumping_preimage_static_archive()) { + if (CDSConfig::is_dumping_aot_configuration()) { AOTMetaspace::dump_static_archive(thread); } #endif diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp index 291815647d7c..cdbf6ff4da47 100644 --- a/src/hotspot/share/runtime/mutexLocker.cpp +++ b/src/hotspot/share/runtime/mutexLocker.cpp @@ -155,7 +155,7 @@ Mutex* ClassListFile_lock = nullptr; Mutex* UnregisteredClassesTable_lock= nullptr; Mutex* LambdaFormInvokers_lock = nullptr; Mutex* ScratchObjects_lock = nullptr; -Mutex* FinalImageRecipes_lock = nullptr; +Mutex* AOTMetaspaceRecipes_lock = nullptr; #endif // INCLUDE_CDS Mutex* Bootclasspath_lock = nullptr; @@ -305,7 +305,7 @@ void mutex_init() { MUTEX_DEFN(UnregisteredClassesTable_lock , PaddedMutex , nosafepoint-1); MUTEX_DEFN(LambdaFormInvokers_lock , PaddedMutex , safepoint); MUTEX_DEFL(ScratchObjects_lock , PaddedMutex , DumpTimeTable_lock); - MUTEX_DEFN(FinalImageRecipes_lock , PaddedMutex , nosafepoint); + MUTEX_DEFN(AOTMetaspaceRecipes_lock , PaddedMutex , nosafepoint); #endif // INCLUDE_CDS MUTEX_DEFN(Bootclasspath_lock , PaddedMutex , nosafepoint); diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp index 060d79a2f970..5f19f0356a53 100644 --- a/src/hotspot/share/runtime/mutexLocker.hpp +++ b/src/hotspot/share/runtime/mutexLocker.hpp @@ -133,7 +133,7 @@ extern Mutex* ClassListFile_lock; // ClassListWriter() extern Mutex* UnregisteredClassesTable_lock; // UnregisteredClassesTableTable extern Mutex* LambdaFormInvokers_lock; // Protecting LambdaFormInvokers::_lambdaform_lines extern Mutex* ScratchObjects_lock; // Protecting _scratch_xxx_table in heapShared.cpp -extern Mutex* FinalImageRecipes_lock; // Protecting the tables used by FinalImageRecipes. +extern Mutex* AOTMetaspaceRecipes_lock; // Protecting the tables used by AOTMetaspaceRecipes. #endif // INCLUDE_CDS #if INCLUDE_JFR extern Mutex* JfrStacktrace_lock; // used to guard access to the JFR stacktrace table diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp index fa979f92d8f6..5b93d82ecaf7 100644 --- a/src/hotspot/share/runtime/threads.cpp +++ b/src/hotspot/share/runtime/threads.cpp @@ -843,7 +843,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { #if INCLUDE_MANAGEMENT bool start_agent = true; #if INCLUDE_CDS - start_agent = !CDSConfig::is_dumping_final_static_archive(); + start_agent = !CDSConfig::is_dumping_aot_cache(); if (!start_agent) { log_info(aot)("Not starting management agent during creation of AOT cache."); } @@ -887,7 +887,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { if (CDSConfig::is_dumping_classic_static_archive()) { // Classic -Xshare:dump, aka "old workflow" AOTMetaspace::dump_static_archive(CHECK_JNI_ERR); - } else if (CDSConfig::is_dumping_final_static_archive()) { + } else if (CDSConfig::is_dumping_aot_cache()) { tty->print_cr("Reading AOTConfiguration %s and writing AOTCache %s", AOTConfiguration, AOTCache); AOTMetaspace::dump_static_archive(CHECK_JNI_ERR); } else if (CDSConfig::is_redumping_aot_configuration()) { diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp index 3b4939a9d955..d6baf0316c97 100644 --- a/src/hotspot/share/services/diagnosticCommand.cpp +++ b/src/hotspot/share/services/diagnosticCommand.cpp @@ -1008,18 +1008,18 @@ void ClassesDCmd::execute(DCmdSource source, TRAPS) { #if INCLUDE_CDS void AOTEndRecordingDCmd::execute(DCmdSource source, TRAPS) { - if (!CDSConfig::is_dumping_preimage_static_archive()) { + if (!CDSConfig::is_dumping_aot_configuration()) { output()->print_cr("AOT.end_recording is unsupported when VM flags -XX:AOTMode=record or -XX:AOTCacheOutput= are missing."); return; } - if (AOTMetaspace::preimage_static_archive_dumped()) { + if (AOTMetaspace::aot_configuration_dumped()) { output()->print_cr("Recording has already ended."); return; } AOTMetaspace::dump_static_archive(THREAD); - if (!AOTMetaspace::preimage_static_archive_dumped()) { + if (!AOTMetaspace::aot_configuration_dumped()) { output()->print_cr("Error: Failed to end recording."); return; } From 986c9a759f369b001557df2e05432496ca0c4527 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Sat, 7 Nov 2026 01:37:53 +0000 Subject: [PATCH 037/110] 8393591: AOT cache creation fails with -XX:+StressRewriter Reviewed-by: asmehra, kvn --- src/hotspot/share/interpreter/rewriter.cpp | 8 ++++ .../aotCache/aotClassLinking/TrainingRun.java | 45 ++++++++++++++++--- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/interpreter/rewriter.cpp b/src/hotspot/share/interpreter/rewriter.cpp index 1353fda40c59..c62ae1494a30 100644 --- a/src/hotspot/share/interpreter/rewriter.cpp +++ b/src/hotspot/share/interpreter/rewriter.cpp @@ -101,6 +101,14 @@ void Rewriter::restore_bytecodes(Thread* thread) { scan_method(thread, method, true, &invokespecial_error); assert(!invokespecial_error, "reversing should not get an invokespecial error"); } + + // These need to be reset in case we want to rewrite again. + _invokedynamic_index = 0; + _field_entry_index = 0; + _method_entry_index = 0; + _initialized_indy_entries.clear(); + _initialized_field_entries.clear(); + _initialized_method_entries.clear(); } // Creates a constant pool cache given a CPC map diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/aotClassLinking/TrainingRun.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/aotClassLinking/TrainingRun.java index df466151f98b..1dadd02a918e 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/aotClassLinking/TrainingRun.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/aotClassLinking/TrainingRun.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /* * @test * @summary -XX:AOTMode=record should not interfere with app execution: (1) thread creation; (2) exit code - * @bug 8351327 + * @bug 8351327 8393591 * @requires vm.cds.supports.aot.class.linking * @library /test/jdk/lib/testlibrary /test/lib * @build TrainingRun @@ -33,6 +33,9 @@ * @run driver TrainingRun AOT */ +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; import jdk.test.lib.cds.CDSAppTester; import jdk.test.lib.helpers.ClassFileInstaller; import jdk.test.lib.process.OutputAnalyzer; @@ -42,13 +45,16 @@ public class TrainingRun { static final String mainClass = "MyTestApp"; public static void main(String[] args) throws Exception { - (new Tester()).run(args); + (new Tester(false)).run(args); + (new Tester(true)).run(args); } static class Tester extends CDSAppTester { - public Tester() { - super(mainClass); + boolean stressRewriter; + public Tester(boolean stressRewriter) { + super(mainClass); + this.stressRewriter = stressRewriter; // CDSAppTester usually wants the app to return exit value 0, but this test // checks whether the training run can return 2. setCheckExitValue(false); @@ -59,6 +65,18 @@ public String classpath(RunMode runMode) { return appJar; } + @Override + public String[] vmArgs(RunMode runMode) { + if (stressRewriter) { + return new String[] { + "-XX:+IgnoreUnrecognizedVMOptions", + "-XX:+StressRewriter" + }; + } else { + return new String[0]; + } + } + @Override public String[] appCommandLine(RunMode runMode) { return new String[] { @@ -79,7 +97,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) { class MyTestApp { volatile static int x = 0; - public static void main(String args[]) throws Exception { + public static void main(String args[]) throws Throwable { Thread t = new Thread(() -> { x = 1; }); @@ -90,7 +108,22 @@ public static void main(String args[]) throws Exception { throw new RuntimeException("x should be 1 but is " + x); } System.out.println("Hello: x is " + x); + + testInvoke(); + System.out.println("I am calling System.exit(2)"); System.exit(2); } + + static void testInvoke() throws Throwable { + MethodHandles.Lookup lookup = MethodHandles.lookup(); + MethodType mt = MethodType.methodType(void.class, float.class, double.class, int.class, + boolean.class, Object.class, long.class, double.class); + MethodHandle mh = lookup.findStatic(MyTestApp.class, "callme", mt); + mh.invokeExact(4.0f, 5.0, 6, true, (Object)null, 7L, 8.0); + } + + private static void callme(float f, double d, int i, boolean b, Object o, long l, double d2) { + System.out.println("called"); + } } From c73d7d13aeea1caec275d9df6e429fc979339318 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Sat, 7 Nov 2026 08:32:06 +0000 Subject: [PATCH 038/110] 8395930: [macos] Accessible returning null from getAccessibleContext leads to a NullPointerException after JDK-8381236 Reviewed-by: kizune, prr --- .../classes/sun/lwawt/macosx/CAccessible.java | 17 +++++++++-- .../8381236/VoiceOverHierarchyChangeTest.java | 28 ++++++++++++++----- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java index b0794da2e29d..95674a035750 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java @@ -57,18 +57,29 @@ final class CAccessible extends CFRetainedResource implements Accessible { public static CAccessible getCAccessible(final Accessible a) { - return getCAccessible(a, true); + return getCAccessible(a, true, false); } /** + * This returns null immediately if `a` is null. + * * @param createIfUndefined if there is not yet a cached CAccessible for * the given Accessible, then this boolean * controls whether this method creates a new * CAccessible or returns null. + * @param returnNullOnNullContext if true then this returns null if + * `a.getAccessibleContext() == null`. + * If false and `createIfUndefined == true` + * then this method may trigger a NPE. */ - private static CAccessible getCAccessible(final Accessible a, final boolean createIfUndefined) { + private static CAccessible getCAccessible(final Accessible a, + final boolean createIfUndefined, + final boolean returnNullOnNullContext) { if (a == null) return null; AccessibleContext context = a.getAccessibleContext(); + if (returnNullOnNullContext && context == null) { + return null; + } AWTAccessor.AccessibleContextAccessor accessor = AWTAccessor.getAccessibleContextAccessor(); final CAccessible cachedCAX = (CAccessible) accessor.getNativeAXResource(context); @@ -101,7 +112,7 @@ private void disposeRecursively(Component c) { } } if (c instanceof Accessible ax) { - CAccessible ca = getCAccessible(ax, false); + CAccessible ca = getCAccessible(ax, false, true); if (ca != null) { ca.dispose(); } diff --git a/test/jdk/javax/accessibility/8381236/VoiceOverHierarchyChangeTest.java b/test/jdk/javax/accessibility/8381236/VoiceOverHierarchyChangeTest.java index 42a0de1c4053..6a2c45c3db00 100644 --- a/test/jdk/javax/accessibility/8381236/VoiceOverHierarchyChangeTest.java +++ b/test/jdk/javax/accessibility/8381236/VoiceOverHierarchyChangeTest.java @@ -23,6 +23,7 @@ import javax.swing.JButton; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; import java.awt.BorderLayout; @@ -30,11 +31,12 @@ import java.awt.Rectangle; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import javax.accessibility.AccessibleContext; /* * @test * @key headful - * @bug 8381236 + * @bug 8381236 8395930 * @summary manual test for VoiceOver that moves Components across Windows * @requires os.family == "mac" * @library /java/awt/regtesthelpers @@ -47,12 +49,13 @@ public static void main(String[] args) throws Exception { String INSTRUCTIONS = """ INSTRUCTIONS: 1. Open VoiceOver - 2. Move the mouse over the "Does Nothing" button + 2. Move the mouse over both of the labels 3. Click the "Move To Other Window" button - 4. Move the mouse over the "Does Nothing" button + 4. Move the mouse over both labels again. - Expected behavior: VoiceOver reads "Does Nothing" after steps - 2 and 4. + Expected behavior: VoiceOver reads "Normal Label" after steps + 2 and 4, and it does not read "Unreadable Label". There + should not be an exception in System.err. """; PassFailJFrame.builder() @@ -70,10 +73,21 @@ public static JFrame createUI() { f2.getContentPane().setPreferredSize(new Dimension(300, 100)); JButton hopButton = new JButton("Move To Other Window"); - JButton noopButton = new JButton("Does Nothing"); + JLabel label = new JLabel("Normal Label"); + + // the "Unreadable Label" is testing JDK-8395930: + // When there is a null AccessibleContext are we safely skipping it? + JLabel unreadableLabel = new JLabel("Unreadable Label") { + @Override + public AccessibleContext getAccessibleContext() { + return null; + } + }; + JPanel panel = new JPanel(new BorderLayout()); panel.add(hopButton, BorderLayout.NORTH); - panel.add(noopButton, BorderLayout.SOUTH); + panel.add(label, BorderLayout.CENTER); + panel.add(unreadableLabel, BorderLayout.SOUTH); hopButton.addActionListener(e -> { if (SwingUtilities.isDescendingFrom(hopButton, f1)) { From b97deb0f22edb0bc4a823d9f4766d374106acf0c Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Sun, 8 Nov 2026 18:04:08 +0000 Subject: [PATCH 039/110] 8396854: Test runtime/cds/DeterministicDump.java still fails with mismatched _value_field_info_array Reviewed-by: kvn, heidinga --- src/hotspot/share/oops/layoutKind.hpp | 40 ++++++++++--------------- src/hotspot/share/runtime/vmStructs.cpp | 2 +- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/hotspot/share/oops/layoutKind.hpp b/src/hotspot/share/oops/layoutKind.hpp index 8f03d1390a8d..fc27b24fc546 100644 --- a/src/hotspot/share/oops/layoutKind.hpp +++ b/src/hotspot/share/oops/layoutKind.hpp @@ -167,20 +167,13 @@ class FlatLayoutSlot { // This is only set when a flat layout is present. FlatLayout _flat_layout; - struct { - // This bool is set when the flat layout is not present. - // - // Its value is used to determine if this slot should be considered - // initialized - bool _initialized_non_flat; - - // Paddings to ensure deterministic content in AOT cache. They prevent - // the C++ compiler from potentially inserting random values in unused gaps. - static_assert(sizeof(FlatLayout) == 4); - bool _padding1; - bool _padding2; - bool _padding3; - }; + // This is set when the flat layout is not present. + // Conceptually a bool but wants deterministic padding for AOT. + // + // Its value is used to determine if this slot should be considered + // initialized + uint32_t _initialized_non_flat; + static_assert(sizeof(FlatLayout) == sizeof(uint32_t)); }; public: @@ -188,8 +181,7 @@ class FlatLayoutSlot { : _flat_layout(flat_layout) {} explicit FlatLayoutSlot(bool initialized_non_flat = false) - : _initialized_non_flat(initialized_non_flat), - _padding1(0), _padding2(0), _padding3(0) {} + : _initialized_non_flat(initialized_non_flat) {} // Get the FlatLayout. The external has_flat_layout discriminator is used to // catch when code tries to fetch layout without having a flat layout. @@ -199,7 +191,7 @@ class FlatLayoutSlot { } bool is_initialized(bool has_flat_layout) const { - return has_flat_layout || _initialized_non_flat; + return has_flat_layout || (_initialized_non_flat != 0); } }; @@ -212,7 +204,7 @@ class FlatLayoutSlot { class OptionalFlatLayout { friend class VMStructs; - bool _is_flat; + uint32_t _is_flat; // Conceptually a bool but wants deterministic padding for AOT FlatLayoutSlot _flat_layout; OptionalFlatLayout(bool is_flat, FlatLayoutSlot flat_layout) @@ -240,17 +232,17 @@ class OptionalFlatLayout { } bool is_initialized() const { - return _flat_layout.is_initialized(_is_flat); + return _flat_layout.is_initialized(_is_flat != 0); } bool is_flat() const { precond(is_initialized()); - return _is_flat; + return _is_flat != 0; } // Get the FlatLayout, assert if it isn't present. FlatLayout get() const { - return _flat_layout.get_if(_is_flat); + return _flat_layout.get_if(is_flat()); } bool is_nullable_flat() const { @@ -265,15 +257,15 @@ class OptionalFlatLayout { precond(is_initialized()); precond(other.is_initialized()); - if (_is_flat) { - if (other._is_flat) { + if (is_flat()) { + if (other.is_flat()) { return get() == other.get(); } else { return false; } } else { // No other data to check for non-flat field layouts - return !other._is_flat; + return !other.is_flat(); } } }; diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp index 9e1afea96db9..f06c4b585559 100644 --- a/src/hotspot/share/runtime/vmStructs.cpp +++ b/src/hotspot/share/runtime/vmStructs.cpp @@ -194,7 +194,7 @@ nonstatic_field(ResolvedIndyEntry, _cpool_index, u2) \ nonstatic_field(FlatLayout, _layout_kind, LayoutKind) \ nonstatic_field(FlatLayoutSlot, _flat_layout, FlatLayout) \ - nonstatic_field(OptionalFlatLayout, _is_flat, bool) \ + nonstatic_field(OptionalFlatLayout, _is_flat, uint32_t) \ nonstatic_field(OptionalFlatLayout, _flat_layout, FlatLayoutSlot) \ nonstatic_field(ValueFieldInfo, _klass, ValueKlass*) \ nonstatic_field(ValueFieldInfo, _optional_flat_layout, OptionalFlatLayout) \ From 95595449122889c8322ec941f4e7e5c0db707106 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Mon, 9 Nov 2026 00:10:44 +0000 Subject: [PATCH 040/110] 8395359: RISC-V: Add C2 VectorSlice support Reviewed-by: fyang, gcao --- src/hotspot/cpu/riscv/assembler_riscv.hpp | 1 + .../cpu/riscv/c2_MacroAssembler_riscv.cpp | 12 +++ .../cpu/riscv/c2_MacroAssembler_riscv.hpp | 3 + src/hotspot/cpu/riscv/riscv_v.ad | 28 +++++ .../TestSliceOptValueTransforms.java | 102 +++++++++++++++++- 5 files changed, 144 insertions(+), 2 deletions(-) diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp index be258f14b120..86588b73bb95 100644 --- a/src/hotspot/cpu/riscv/assembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp @@ -2437,6 +2437,7 @@ enum VectorMask { INSN(vrsub_vx, 0b1010111, 0b100, 0b000011); // Vector Slide Instructions + INSN(vslideup_vx, 0b1010111, 0b100, 0b001110); INSN(vslidedown_vx, 0b1010111, 0b100, 0b001111); #undef INSN diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp index c81883ae38b8..178221ec7dd0 100644 --- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp @@ -3617,3 +3617,15 @@ void C2_MacroAssembler::slidedown_v(VectorRegister dst, VectorRegister src, vslidedown_vx(dst, src, tmp); } } + +// Move elements up a vector register group. +// Offset is the start index (offset) for the destination. +void C2_MacroAssembler::slideup_v(VectorRegister dst, VectorRegister src, + uint32_t offset, Register tmp) { + if (is_uimm5(offset)) { + vslideup_vi(dst, src, offset); + } else { + mv(tmp, offset); + vslideup_vx(dst, src, tmp); + } +} diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp index 1713b60ccc6a..353f259b95ff 100644 --- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp +++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp @@ -337,4 +337,7 @@ void slidedown_v(VectorRegister dst, VectorRegister src, uint32_t offset, Register tmp = t0); + void slideup_v(VectorRegister dst, VectorRegister src, + uint32_t offset, Register tmp = t0); + #endif // CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad index d78d941bc511..8cfea2af528a 100644 --- a/src/hotspot/cpu/riscv/riscv_v.ad +++ b/src/hotspot/cpu/riscv/riscv_v.ad @@ -5396,6 +5396,34 @@ instruct select_from_two_vectors(vReg dst, vReg src1, vReg src2, vReg index, vRe ins_pipe(pipe_slow); %} +// ------------------------------ Vector slice --------------------------------- + +instruct vector_slice(vReg dst, vReg src1, vReg src2, immI origin) %{ + match(Set dst (VectorSlice (Binary src1 src2) origin)); + effect(TEMP_DEF dst); + format %{ "vector_slice $dst, $src1, $src2, $origin" %} + ins_encode %{ + BasicType bt = Matcher::vector_element_basic_type(this); + uint vlen = Matcher::vector_length(this); + uint element_bytes = type2aelembytes(bt); + uint byte_offset = $origin$$constant; + assert(byte_offset % element_bytes == 0, "slice origin must be element aligned"); + uint offset = byte_offset / element_bytes; + assert(offset <= vlen, "slice origin must be in range"); + VectorRegister vd = as_VectorRegister($dst$$reg); + __ vsetvli_helper(bt, vlen); + if (offset == 0) { + __ vmv_v_v(vd, as_VectorRegister($src1$$reg)); + } else if (offset == vlen) { + __ vmv_v_v(vd, as_VectorRegister($src2$$reg)); + } else { + __ slidedown_v(vd, as_VectorRegister($src1$$reg), offset); + __ slideup_v(vd, as_VectorRegister($src2$$reg), vlen - offset); + } + %} + ins_pipe(pipe_slow); +%} + // ------------------------------ Vector rearrange ----------------------------- instruct rearrange(vReg dst, vReg src, vReg shuffle) %{ diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestSliceOptValueTransforms.java b/test/hotspot/jtreg/compiler/vectorapi/TestSliceOptValueTransforms.java index e2762e5e27c4..374dc7e75309 100644 --- a/test/hotspot/jtreg/compiler/vectorapi/TestSliceOptValueTransforms.java +++ b/test/hotspot/jtreg/compiler/vectorapi/TestSliceOptValueTransforms.java @@ -23,8 +23,8 @@ /** * @test -* @bug 8303762 -* @summary Optimize vector slice operation with constant index using VPALIGNR instruction +* @bug 8303762 8395359 +* @summary Verify constant-index vector slice optimizations * @modules jdk.incubator.vector * @library /test/lib / * @run main/othervm compiler.vectorapi.TestSliceOptValueTransforms @@ -133,6 +133,8 @@ public TestSliceOptValueTransforms() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_B}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_B}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -143,6 +145,8 @@ public void testZeroSliceIndexByte() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_B}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_B}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -153,6 +157,8 @@ public void testMaxSliceIndexByte() { @Test @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -164,6 +170,8 @@ public void testConstantSliceIndexByte() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -176,6 +184,8 @@ public void test16BSliceIndexByte() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -188,6 +198,8 @@ public void testMultipleOf4BSliceIndexByte() { @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VB, IRNode.VECTOR_SIZE_32, " >0 "}, failOn = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512_vbmi", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -200,6 +212,8 @@ public void testGT16AndLT48SliceIndexByte() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_GT16_AND_LT48_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true", "avx512_vbmi", "false"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexByteNoVBMI() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -212,6 +226,8 @@ public void testGT16AndLT48SliceIndexByteNoVBMI() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_LT16_OR_GT48_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexByte() { for (int i = 0; i < B256.loopBound(SIZE); i += B256.length()) { ByteVector.fromArray(B256, bsrc1, i) @@ -224,6 +240,8 @@ public void testLT16SliceIndexByte() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_LT16_OR_GT48_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_B, IRNode.VECTOR_SIZE_64, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexByte() { for (int i = 0; i < B512.loopBound(SIZE); i += B512.length()) { ByteVector.fromArray(B512, bsrc1, i) @@ -236,6 +254,8 @@ public void testGT48SliceIndexByte() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_S}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_S}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -246,6 +266,8 @@ public void testZeroSliceIndexShort() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_S}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_S}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -256,6 +278,8 @@ public void testMaxSliceIndexShort() { @Test @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -267,6 +291,8 @@ public void testConstantSliceIndexShort() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -279,6 +305,8 @@ public void test16BSliceIndexShort() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -291,6 +319,8 @@ public void testMultipleOf4BSliceIndexShort() { @IR(counts = {IRNode.SELECT_FROM_TWO_VECTOR_VS, IRNode.VECTOR_SIZE_16, " >0 "}, failOn = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_16}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -303,6 +333,8 @@ public void testGT16AndLT48SliceIndexShort() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_LT16_OR_GT48_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexShort() { for (int i = 0; i < S256.loopBound(SIZE); i += S256.length()) { ShortVector.fromArray(S256, ssrc1, i) @@ -315,6 +347,8 @@ public void testLT16SliceIndexShort() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_LT16_OR_GT48_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_S, IRNode.VECTOR_SIZE_32, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexShort() { for (int i = 0; i < S512.loopBound(SIZE); i += S512.length()) { ShortVector.fromArray(S512, ssrc1, i) @@ -327,6 +361,8 @@ public void testGT48SliceIndexShort() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_I}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_I}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -337,6 +373,8 @@ public void testZeroSliceIndexInt() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_I}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_I}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -347,6 +385,8 @@ public void testMaxSliceIndexInt() { @Test @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -358,6 +398,8 @@ public void testConstantSliceIndexInt() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -370,6 +412,8 @@ public void test16BSliceIndexInt() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -382,6 +426,8 @@ public void testMultipleOf4BSliceIndexInt() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -394,6 +440,8 @@ public void testLT16SliceIndexInt() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexInt() { for (int i = 0; i < I256.loopBound(SIZE); i += I256.length()) { IntVector.fromArray(I256, isrc1, i) @@ -406,6 +454,8 @@ public void testGT16AndLT48SliceIndexInt() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_I, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexInt() { for (int i = 0; i < I512.loopBound(SIZE); i += I512.length()) { IntVector.fromArray(I512, isrc1, i) @@ -418,6 +468,8 @@ public void testGT48SliceIndexInt() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_L}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_L}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -428,6 +480,8 @@ public void testZeroSliceIndexLong() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_L}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_L}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -438,6 +492,8 @@ public void testMaxSliceIndexLong() { @Test @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -449,6 +505,8 @@ public void testConstantSliceIndexLong() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -461,6 +519,8 @@ public void test16BSliceIndexLong() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -473,6 +533,8 @@ public void testMultipleOf4BSliceIndexLong() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -485,6 +547,8 @@ public void testLT16SliceIndexLong() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexLong() { for (int i = 0; i < L256.loopBound(SIZE); i += L256.length()) { LongVector.fromArray(L256, lsrc1, i) @@ -497,6 +561,8 @@ public void testGT16AndLT48SliceIndexLong() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_L, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexLong() { for (int i = 0; i < L512.loopBound(SIZE); i += L512.length()) { LongVector.fromArray(L512, lsrc1, i) @@ -509,6 +575,8 @@ public void testGT48SliceIndexLong() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_F}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_F}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -519,6 +587,8 @@ public void testZeroSliceIndexFloat() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_F}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_F}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -529,6 +599,8 @@ public void testMaxSliceIndexFloat() { @Test @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -540,6 +612,8 @@ public void testConstantSliceIndexFloat() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -552,6 +626,8 @@ public void test16BSliceIndexFloat() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -564,6 +640,8 @@ public void testMultipleOf4BSliceIndexFloat() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -576,6 +654,8 @@ public void testLT16SliceIndexFloat() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexFloat() { for (int i = 0; i < F256.loopBound(SIZE); i += F256.length()) { FloatVector.fromArray(F256, fsrc1, i) @@ -588,6 +668,8 @@ public void testGT16AndLT48SliceIndexFloat() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_F, IRNode.VECTOR_SIZE_16, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexFloat() { for (int i = 0; i < F512.loopBound(SIZE); i += F512.length()) { FloatVector.fromArray(F512, fsrc1, i) @@ -600,6 +682,8 @@ public void testGT48SliceIndexFloat() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_D}, applyIfCPUFeatureAnd = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_D}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testZeroSliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -610,6 +694,8 @@ public void testZeroSliceIndexDouble() { @Test @IR(failOn = {IRNode.VECTOR_SLICE_D}, applyIfCPUFeature = {"avx2", "true"}) + @IR(failOn = {IRNode.VECTOR_SLICE_D}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testMaxSliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -620,6 +706,8 @@ public void testMaxSliceIndexDouble() { @Test @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIfCPUFeature = {"avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_ANY, " >0 "}, applyIf = {"MaxVectorSize", ">= 32"}, + applyIfCPUFeature = {"rvv", "true"}) public void testConstantSliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -631,6 +719,8 @@ public void testConstantSliceIndexDouble() { @Test @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_16_16B_AVX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512f", "false", "avx2", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void test16BSliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -643,6 +733,8 @@ public void test16BSliceIndexDouble() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testMultipleOf4BSliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -655,6 +747,8 @@ public void testMultipleOf4BSliceIndexDouble() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testLT16SliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -667,6 +761,8 @@ public void testLT16SliceIndexDouble() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_4, " >0 "}, + applyIf = {"MaxVectorSize", ">= 32"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT16AndLT48SliceIndexDouble() { for (int i = 0; i < D256.loopBound(SIZE); i += D256.length()) { DoubleVector.fromArray(D256, dsrc1, i) @@ -679,6 +775,8 @@ public void testGT16AndLT48SliceIndexDouble() { @IR(counts = {IRNode.X86_VECTOR_SLICE_CONST_ORIGIN_MULTIPLE4_GT16B_EVEX, " >0 "}, phase = {CompilePhase.MATCHING}, applyIfCPUFeatureAnd = {"avx512vl", "true", "avx512bw", "true"}) + @IR(counts = {IRNode.VECTOR_SLICE_D, IRNode.VECTOR_SIZE_8, " >0 "}, + applyIf = {"MaxVectorSize", ">= 64"}, applyIfCPUFeature = {"rvv", "true"}) public void testGT48SliceIndexDouble() { for (int i = 0; i < D512.loopBound(SIZE); i += D512.length()) { DoubleVector.fromArray(D512, dsrc1, i) From 1619d8064d3571301e205ef1682cddd6821b5ae6 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 9 Nov 2026 01:53:38 +0000 Subject: [PATCH 041/110] 8396414: C2: Extend redundant mask elimination before left shifts Reviewed-by: mchevalier, gli --- src/hotspot/share/opto/mulnode.cpp | 30 ++++++++++--- .../irTests/LShiftINodeIdealizationTests.java | 44 ++++++++++++++++++ .../irTests/LShiftLNodeIdealizationTests.java | 45 +++++++++++++++++++ 3 files changed, 112 insertions(+), 7 deletions(-) diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp index 93b73c17cd40..28d5b817f7c5 100644 --- a/src/hotspot/share/opto/mulnode.cpp +++ b/src/hotspot/share/opto/mulnode.cpp @@ -1143,13 +1143,29 @@ Node* LShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) { } } - // Check for ((x & ((1<<(32-c0))-1)) << c0) which ANDs off high bits - // before shifting them away. - const jlong bits_mask = max_unsigned_integer(bt) >> con; - assert(bt != T_INT || bits_mask == right_n_bits(num_bits - con), "inconsistent"); - if (add1_op == Op_And(bt) && - phase->type(add1->in(2)) == TypeInteger::make(bits_mask, bt)) { - return LShiftNode::make(add1->in(1), in(2), bt); + // (x & mask) << con => x << con, where mask is known to have all bits that + // survive the shift set; additional bits are shifted away. + const julong bits_mask = max_unsigned_integer(bt) >> con; + assert(bt != T_INT || bits_mask == right_n_bits(num_bits - con), "inconsistent"); + if (add1_op == Op_And(bt)) { + // Either operand of the commutative And can be the mask. + for (uint i = 1; i <= 2; i++) { + const TypeInteger* mask_t = phase->type(add1->in(i))->isa_integer(bt); + if (mask_t == nullptr) { + // AND operands have the matching integer type unless they are TOP. + // Thus nullptr means TOP here; leave the dead AND for dead-code cleanup. + break; + } + uint64_t known_ones; + if (bt == T_INT) { + known_ones = mask_t->is_int()->_bits._ones; + } else { + known_ones = mask_t->is_long()->_bits._ones; + } + if ((known_ones & bits_mask) == bits_mask) { + return LShiftNode::make(add1->in(3 - i), in(2), bt); + } + } } // Collapse nested left-shifts with constant rhs: diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java index a6a9f545d166..1cd200379b80 100644 --- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java +++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java @@ -65,6 +65,10 @@ public static void main(String[] args) { "testLShiftOfAndOfRShift", "testLShiftOfAndOfURShift", "testLShiftOfAndOfCon", + "testLShiftOfMaskedInt", + "testLShiftOfMaskedIntVar", + "testLShiftOfMaskedIntVarMaskFirst", + "testLShiftOfPartialMaskedIntVarHighShift", "testShiftOfSubConstant", }) public void runMethod() { @@ -106,6 +110,11 @@ private void assertResult(int a, int b) { Asserts.assertEQ(((a >>> 4) & b) << 4, testLShiftOfAndOfURShiftSameCon(a)); Asserts.assertEQ(((a >> 4) & b) << 8, testLShiftOfAndOfRShift(a)); Asserts.assertEQ(((a >>> 4) & b) << 8, testLShiftOfAndOfURShift(a)); + Asserts.assertEQ((a & (b | 0x3fffffff)) << 2, testLShiftOfMaskedIntVar(a)); + Asserts.assertEQ(((b | 0x3fffffff) & (a + 1)) << 2, + testLShiftOfMaskedIntVarMaskFirst(a)); + Asserts.assertEQ((a & (b | 1)) << 30, + testLShiftOfPartialMaskedIntVarHighShift(a)); } @DontCompile @@ -123,6 +132,8 @@ public void assertResult(int a) { Asserts.assertEQ((a + a) << 31, testLargeShiftOfAddSameInput(a)); Asserts.assertEQ(((a + 1) << 1) + 1, testShiftOfAddConstant(a)); Asserts.assertEQ((a & ((1 << (32 - 10)) -1)) << 10, testLShiftOfAndOfCon(a)); + Asserts.assertEQ((a & 0x7fffffff) << 2, + testLShiftOfMaskedInt(a)); Asserts.assertEQ(((1 - a) << 1) + 1, testShiftOfSubConstant(a)); assertDoubleShiftResult(a); @@ -440,6 +451,39 @@ public int testLShiftOfAndOfCon(int x) { return (x & ((1 << (32 - 10)) -1)) << 10; } + @Test + @IR(counts = { IRNode.LSHIFT_I, "1" }, failOn = { IRNode.AND_I }) + // Checks (x & 0x7fffffff) << 2 => x << 2 + public int testLShiftOfMaskedInt(int x) { + return (x & 0x7fffffff) << 2; + } + + @Test + @IR(counts = { IRNode.LSHIFT_I, "1" }, failOn = { IRNode.AND_I }) + // Checks (x & (y | 0x3fffffff)) << 2 => x << 2, the mask is not constant + // but its type guarantees that the 30 surviving bits are set + public int testLShiftOfMaskedIntVar(int x) { + int y = otherInput; + return (x & (y | 0x3fffffff)) << 2; + } + + @Test + @IR(counts = { IRNode.LSHIFT_I, "1" }, failOn = { IRNode.AND_I }) + // The mask can be either operand of the And: + // ((y | 0x3fffffff) & (x + 1)) << 2 => (x + 1) << 2 + public int testLShiftOfMaskedIntVarMaskFirst(int x) { + int y = otherInput; + return ((y | 0x3fffffff) & (x + 1)) << 2; + } + + @Test + @IR(counts = { IRNode.AND_I, "1", IRNode.LSHIFT_I, "1" }) + // << 30 needs bits 0 and 1, but only bit 0 is known to be set + public int testLShiftOfPartialMaskedIntVarHighShift(int x) { + int y = otherInput; + return (x & (y | 1)) << 30; + } + @Test @IR(counts = { IRNode.LSHIFT_I, "1", IRNode.SUB_I, "1" }, failOn = { IRNode.ADD_I }) public int testShiftOfSubConstant(int x) { diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java index d1a419a9c8c2..0ee8bf277e06 100644 --- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java +++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java @@ -63,6 +63,10 @@ public static void main(String[] args) { "testLShiftOfAndOfRShift", "testLShiftOfAndOfURShift", "testLShiftOfAndOfCon", + "testLShiftOfMaskedLong", + "testLShiftOfMaskedLongVar", + "testLShiftOfMaskedLongVarMaskFirst", + "testLShiftOfPartialMaskedLongVarHighShift", "testShiftOfSubConstant", }) public void runMethod() { @@ -104,6 +108,12 @@ private void assertResult(long a, long b) { Asserts.assertEQ(((a >>> 4) & b) << 4, testLShiftOfAndOfURShiftSameCon(a)); Asserts.assertEQ(((a >> 4) & b) << 8, testLShiftOfAndOfRShift(a)); Asserts.assertEQ(((a >>> 4) & b) << 8, testLShiftOfAndOfURShift(a)); + Asserts.assertEQ((a & (b | 0x3fffffffffffffffL)) << 2, + testLShiftOfMaskedLongVar(a)); + Asserts.assertEQ(((b | 0x3fffffffffffffffL) & (a + 1L)) << 2, + testLShiftOfMaskedLongVarMaskFirst(a)); + Asserts.assertEQ((a & (b | 1L)) << 62, + testLShiftOfPartialMaskedLongVarHighShift(a)); } @DontCompile @@ -119,6 +129,8 @@ public void assertResult(long a) { Asserts.assertEQ((a + a) << 63, testLargeShiftOfAddSameInput(a)); Asserts.assertEQ(((a + 1) << 1) + 1, testShiftOfAddConstant(a)); Asserts.assertEQ((a & ((1L << (64 - 10)) -1)) << 10, testLShiftOfAndOfCon(a)); + Asserts.assertEQ((a & 0xfedb871fL) << 63, + testLShiftOfMaskedLong(a)); Asserts.assertEQ(((1L - a) << 1) + 1, testShiftOfSubConstant(a)); assertDoubleShiftResult(a); @@ -361,6 +373,39 @@ public long testLShiftOfAndOfCon(long x) { return (x & ((1L << (64 - 10)) -1)) << 10; } + @Test + @IR(counts = { IRNode.LSHIFT_L, "1" }, failOn = { IRNode.AND_L }) + // Checks (x & 0xfedb871fL) << 63 => x << 63 + public long testLShiftOfMaskedLong(long x) { + return (x & 0xfedb871fL) << 63; + } + + @Test + @IR(counts = { IRNode.LSHIFT_L, "1" }, failOn = { IRNode.AND_L }) + // Checks (x & (y | 0x3fffffffffffffffL)) << 2 => x << 2, the mask is not + // constant but its type guarantees that the 62 surviving bits are set + public long testLShiftOfMaskedLongVar(long x) { + long y = otherInput; + return (x & (y | 0x3fffffffffffffffL)) << 2; + } + + @Test + @IR(counts = { IRNode.LSHIFT_L, "1" }, failOn = { IRNode.AND_L }) + // The mask can be either operand of the And: + // ((y | 0x3fffffffffffffffL) & (x + 1L)) << 2 => (x + 1L) << 2 + public long testLShiftOfMaskedLongVarMaskFirst(long x) { + long y = otherInput; + return ((y | 0x3fffffffffffffffL) & (x + 1L)) << 2; + } + + @Test + @IR(counts = { IRNode.AND_L, "1", IRNode.LSHIFT_L, "1" }) + // << 62 needs bits 0 and 1, but only bit 0 is known to be set + public long testLShiftOfPartialMaskedLongVarHighShift(long x) { + long y = otherInput; + return (x & (y | 1L)) << 62; + } + @Test @IR(counts = { IRNode.LSHIFT_L, "1", IRNode.SUB_L, "1" }, failOn = { IRNode.ADD_L }) public long testShiftOfSubConstant(long x) { From 1e381b3d18a5ea6dc28acfae8e882724bf926060 Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Mon, 9 Nov 2026 01:57:36 +0000 Subject: [PATCH 042/110] 8392322: RISC-V: Optimize C++ atomic loads and stores on Ztso Reviewed-by: dzhang, fyang, gli, ayang --- src/hotspot/cpu/riscv/vm_version_riscv.cpp | 17 +++++-- src/hotspot/cpu/riscv/vm_version_riscv.hpp | 34 ++++++++----- .../linux_riscv/atomicAccess_linux_riscv.hpp | 49 +++++++++++++------ 3 files changed, 67 insertions(+), 33 deletions(-) diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp index 6d3ca9130055..86da4035d602 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp @@ -52,7 +52,7 @@ static constexpr bool toolchain_uses_psabi_atomics() { } uint32_t VM_Version::_initial_vector_length = 0; -bool VM_Version::_use_zalasr_atomics = false; +VM_Version::AtomicAccessMode VM_Version::_atomic_access_mode = AtomicAccessMode::RVWMO; VM_Version::AtomicCasMode VM_Version::_atomic_cas_mode = AtomicCasMode::BASELINE; #define DEF_RV_EXT_FEATURE(PRETTY, LINUX_BIT, FSTRING, FLAGF) \ @@ -204,10 +204,17 @@ void VM_Version::common_initialize() { FLAG_SET_DEFAULT(UseZalasr, false); } - // Latch the native AtomicAccess dispatch flag only after every UseZalasr - // adjustment above has settled. See the comment on _use_zalasr_atomics in - // vm_version_riscv.hpp. - _use_zalasr_atomics = UseZalasr; + // Latch the native AtomicAccess dispatch mode only after every UseZalasr and + // UseZtso adjustment above has settled. See the comment on + // _atomic_access_mode in vm_version_riscv.hpp. + if (UseZalasr && !UseZtso) { + _atomic_access_mode = AtomicAccessMode::RVWMO_ZALASR; + } else if (UseZtso) { + _atomic_access_mode = AtomicAccessMode::ZTSO; + } else { + _atomic_access_mode = AtomicAccessMode::RVWMO; + } + if (UseZacas && UseZabha) { _atomic_cas_mode = AtomicCasMode::ZACAS_ZABHA; } else if (UseZacas) { diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp index ebb15737bd72..a17e1ecb29ee 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp @@ -42,6 +42,12 @@ class VM_Version : public Abstract_VM_Version { friend RiscvHwprobe; public: + enum class AtomicAccessMode : uint8_t { + RVWMO, + RVWMO_ZALASR, + ZTSO + }; + enum class AtomicCasMode : uint8_t { BASELINE, ZACAS, @@ -516,18 +522,20 @@ class VM_Version : public Abstract_VM_Version { static uint32_t cpu_vector_length(); static uint32_t _initial_vector_length; - // Native AtomicAccess dispatches on this instead of UseZalasr. UseZalasr is - // set from command-line and extension detection before VM_Version::initialize() - // runs the toolchain-psABI and UseZtso mutual-exclusion checks, so during - // startup UseZalasr may be transiently true even on configurations where those - // checks would later disable it. AtomicAccess is invoked from os::init_2, - // vm_init_globals, ObjectSynchronizer::initialize and other subsystems that - // run before init_globals() calls VM_Version_init(), so dispatching on - // UseZalasr directly can either SIGILL (CPU lacks the extension) or emit - // Zalasr sequences that later get paired with the incompatible pre-psABI - // atomics mapping. This flag is false by default and is latched to the final - // UseZalasr value after all validation completes. - static bool _use_zalasr_atomics; + // Native AtomicAccess dispatches on this instead of reading UseZalasr and + // UseZtso separately. UseZalasr is set from command-line and extension + // detection before VM_Version::initialize() runs the toolchain-psABI and + // UseZtso mutual-exclusion checks, so during startup it may be transiently + // true even on configurations where those checks would later disable it. + // AtomicAccess is invoked from os::init_2, vm_init_globals, + // ObjectSynchronizer::initialize and other subsystems that run before + // init_globals() calls VM_Version_init(), so dispatching on UseZalasr + // directly can either SIGILL (CPU lacks the extension) or emit Zalasr + // sequences that later get paired with the incompatible pre-psABI atomics + // mapping. This mode is RVWMO by default and is latched to the final flag + // values after all validation completes. + static AtomicAccessMode _atomic_access_mode; + // Keep native CAS on the baseline ISA until CPU feature initialization // completes, then latch the final Zacas/Zabha configuration. static AtomicCasMode _atomic_cas_mode; @@ -545,7 +553,7 @@ class VM_Version : public Abstract_VM_Version { static uint32_t initial_vector_length() { return _initial_vector_length; } - static bool use_zalasr_atomics() { return _use_zalasr_atomics; } + static AtomicAccessMode atomic_access_mode() { return _atomic_access_mode; } static AtomicCasMode atomic_cas_mode() { return _atomic_cas_mode; } constexpr static bool supports_stack_watermark_barrier() { return true; } diff --git a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp index 9afe3e2f74b6..6c8a35694745 100644 --- a/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp +++ b/src/hotspot/os_cpu/linux_riscv/atomicAccess_linux_riscv.hpp @@ -466,16 +466,25 @@ struct AtomicAccess::PlatformOrderedLoad T operator()(const volatile T* p) const { static_assert(byte_size == sizeof(T)); static_assert(byte_size == 1 || byte_size == 2 || byte_size == 4 || byte_size == 8); - if (VM_Version::use_zalasr_atomics()) { - // Zalasr has no zero-extending form; l{b|h|w}.aq sign-extend. Narrowing - // the result back to T discards the extra bits, so both signed and - // unsigned T end up with the value the caller expects. - return (T)zalasr_load_acquire((const void*)p); - } else { - T data; - __atomic_load(const_cast(p), &data, __ATOMIC_ACQUIRE); - return data; + const VM_Version::AtomicAccessMode mode = VM_Version::atomic_access_mode(); + T data; + switch (mode) { + case VM_Version::AtomicAccessMode::RVWMO: + __atomic_load(const_cast(p), &data, __ATOMIC_ACQUIRE); + break; + case VM_Version::AtomicAccessMode::RVWMO_ZALASR: + // Zalasr has no zero-extending form; l{b|h|w}.aq sign-extend. Narrowing + // the result back to T discards the extra bits, so both signed and + // unsigned T end up with the value the caller expects. + return (T)zalasr_load_acquire((const void*)p); + case VM_Version::AtomicAccessMode::ZTSO: + __atomic_load(const_cast(p), &data, __ATOMIC_RELAXED); + compiler_barrier(); + break; + default: + ShouldNotReachHere(); } + return data; } }; @@ -486,12 +495,22 @@ struct AtomicAccess::PlatformOrderedStore void operator()(volatile T* p, T v) const { static_assert(byte_size == sizeof(T)); static_assert(byte_size == 1 || byte_size == 2 || byte_size == 4 || byte_size == 8); - if (VM_Version::use_zalasr_atomics()) { - // s{b|h|w|d}.rl stores the low byte_size bytes of the register, so - // widening v here is value-preserving for both signed and unsigned T. - zalasr_store_release((void*)p, (uint64_t)v); - } else { - __atomic_store(const_cast(p), &v, __ATOMIC_RELEASE); + const VM_Version::AtomicAccessMode mode = VM_Version::atomic_access_mode(); + switch (mode) { + case VM_Version::AtomicAccessMode::RVWMO: + __atomic_store(const_cast(p), &v, __ATOMIC_RELEASE); + break; + case VM_Version::AtomicAccessMode::RVWMO_ZALASR: + // s{b|h|w|d}.rl stores the low byte_size bytes of the register, so + // widening v here is value-preserving for both signed and unsigned T. + zalasr_store_release((void*)p, (uint64_t)v); + break; + case VM_Version::AtomicAccessMode::ZTSO: + compiler_barrier(); + __atomic_store(const_cast(p), &v, __ATOMIC_RELAXED); + break; + default: + ShouldNotReachHere(); } } }; From f4a2811f727b9d677e30232cd953f62e43ad9e9a Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Mon, 9 Nov 2026 06:23:47 +0000 Subject: [PATCH 043/110] 8395715: RemoteAgentHandshakeTest fails when JFR is not present or disabled Reviewed-by: afarley, asotona --- test/langtools/jdk/jshell/RemoteAgentHandshakeTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/langtools/jdk/jshell/RemoteAgentHandshakeTest.java b/test/langtools/jdk/jshell/RemoteAgentHandshakeTest.java index bb44ff275bb4..f2cacf92dd9c 100644 --- a/test/langtools/jdk/jshell/RemoteAgentHandshakeTest.java +++ b/test/langtools/jdk/jshell/RemoteAgentHandshakeTest.java @@ -24,6 +24,8 @@ /* * @test 8384736 * @summary Verify the correct handshake is used for remote agents. + * @modules jdk.jshell + * jdk.jfr * @run junit RemoteAgentHandshakeTest */ @@ -32,12 +34,14 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import jdk.jfr.FlightRecorder; import jdk.jfr.consumer.RecordingStream; import jdk.jshell.JShell; import jdk.jshell.execution.JdiExecutionControlProvider; import jdk.jshell.execution.RemoteExecutionControl; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assumptions.assumeTrue; public class RemoteAgentHandshakeTest { @@ -71,6 +75,8 @@ public void testCustomAgentNewHandshake() throws Exception { @Test public void testDefaultAgentUsesNewHandshake() throws Exception { + assumeTrue(FlightRecorder.isAvailable()); + try (var rs = new RecordingStream()) { rs.enable("jdk.ProcessStart"); rs.enable("jdk.CPULoad").withPeriod(Duration.ofMillis(10)); From bcdc2e020c1b137d649932d714912432a030e49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= Date: Mon, 9 Nov 2026 08:12:43 +0000 Subject: [PATCH 044/110] 8396445: C2: Missed Identity optimization opportunity in PhaseIterGVN for ReverseBytes(U)S Reviewed-by: mchevalier, epeter, hgreule --- src/hotspot/share/opto/phaseX.cpp | 3 +- ...estReverseBytesInvolutionNotification.java | 72 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/igvn/TestReverseBytesInvolutionNotification.java diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp index 6beb99f3bb3d..dc4cd873acf1 100644 --- a/src/hotspot/share/opto/phaseX.cpp +++ b/src/hotspot/share/opto/phaseX.cpp @@ -2946,7 +2946,8 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_ } // f(f(x)) => x for f = Reverse / ReverseBytes - if (use_op == Op_ReverseV || use_op == Op_ReverseBytesV) { + if (use_op == Op_ReverseV || use_op == Op_ReverseBytesV || + use_op == Op_ReverseBytesS || use_op == Op_ReverseBytesUS) { add_users_to_worklist_if(worklist, use, [use_op](Node* u) { return u->Opcode() == use_op; }); diff --git a/test/hotspot/jtreg/compiler/igvn/TestReverseBytesInvolutionNotification.java b/test/hotspot/jtreg/compiler/igvn/TestReverseBytesInvolutionNotification.java new file mode 100644 index 000000000000..6d8ec3cb48e2 --- /dev/null +++ b/test/hotspot/jtreg/compiler/igvn/TestReverseBytesInvolutionNotification.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8396445 + * @summary Test that the two-hop notification for the ReverseBytes(U)S involution happens. + * @library /test/lib + * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110 + * -XX:CompileCommand=compileonly,${test.main.class}::test* + * ${test.main.class} + * @run main ${test.main.class} + */ + +package compiler.igvn; + +import jdk.test.lib.Asserts; + +public class TestReverseBytesInvolutionNotification { + public static void main(String[] args) { + int resultSInt = testS(42); + int resultUSInt = testUS(42); + for (int i = 0; i < 10_000; i++) { + testS(i); + testUS(i); + } + int resultSComp = testS(42); + int resultUSComp = testUS(42); + Asserts.assertEQ(resultSInt, resultSComp, "wrong result for ReversBytesS"); + Asserts.assertEQ(resultUSInt, resultUSComp, "wrong result for ReversBytesUS"); + } + + static int testS(long l) { + int x = 8; + short s = 2; + for (int i = 0; i < 10_000; i++) { + x *= Short.reverseBytes(Short.reverseBytes(s)); + s = (short)l; + } + return x; + } + + static int testUS(long l) { + int x = 8; + char c = 2; + for (int i = 0; i < 10_000; i++) { + x *= Character.reverseBytes(Character.reverseBytes(c)); + c = (char)l; + } + return x; + } +} From dbdef4f234567c0a882f94d41809850c9817b2b5 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Mon, 9 Nov 2026 08:41:30 +0000 Subject: [PATCH 045/110] 8395723: G1: Possible G1MonotonicArena counter underflow due to race Reviewed-by: shade --- src/hotspot/share/gc/g1/g1MonotonicArena.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.cpp b/src/hotspot/share/gc/g1/g1MonotonicArena.cpp index aea6f4335e8c..108bea8b22fb 100644 --- a/src/hotspot/share/gc/g1/g1MonotonicArena.cpp +++ b/src/hotspot/share/gc/g1/g1MonotonicArena.cpp @@ -71,15 +71,25 @@ void G1MonotonicArena::SegmentFreeList::print_on(outputStream* out, const char* G1MonotonicArena::Segment* G1MonotonicArena::SegmentFreeList::get_all(size_t& num_segments, size_t& mem_size) { - GlobalCounter::CriticalSection cs(Thread::current()); - - Segment* result = _list.pop_all(); - num_segments = _num_segments.load_relaxed(); - mem_size = _mem_size.load_relaxed(); + Segment* result; + { + GlobalCounter::CriticalSection cs(Thread::current()); + result = _list.pop_all(); + } if (result != nullptr) { + // Let concurrent get() calls finish the counter updates before doing the + // snapshot and the subtraction. Later get() call will see the empty list + // and not update the counters. + GlobalCounter::write_synchronize(); + num_segments = _num_segments.load_relaxed(); + mem_size = _mem_size.load_relaxed(); + _num_segments.sub_then_fetch(num_segments, memory_order_relaxed); _mem_size.sub_then_fetch(mem_size, memory_order_relaxed); + } else { + num_segments = 0; + mem_size = 0; } return result; } From a9ea90831c02d0ecb75067aa5bf3855d6ba33e84 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Mon, 9 Nov 2026 08:43:57 +0000 Subject: [PATCH 046/110] 8396417: Parallel: MutableSpace::verify() crashes iterating forwarded objects with compressed headers after promotion failure Reviewed-by: ogillespie, ayang --- .../share/gc/parallel/mutableSpace.cpp | 17 +++--- .../TestPromotionFailureVerification.java | 53 +++++++++++++++++++ 2 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 test/hotspot/jtreg/gc/parallel/TestPromotionFailureVerification.java diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp index dd0ce6f635a1..a6c42070c6b2 100644 --- a/src/hotspot/share/gc/parallel/mutableSpace.cpp +++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp @@ -190,7 +190,7 @@ void MutableSpace::object_iterate(ObjectClosure* cl) { oop obj = cast_to_oop(p); // When promotion-failure occurs during Young GC, eden/from space is not cleared, // so we can encounter objects with "forwarded" markword. - // They are essentially dead, so skipping them + // They are essentially dead, so skipping them is fine. if (obj->is_forwarded()) { assert(!obj->is_self_forwarded(), "must not be self-forwarded"); // It is safe to use the forwardee here. Parallel GC only uses @@ -202,6 +202,7 @@ void MutableSpace::object_iterate(ObjectClosure* cl) { p += obj->size(); } } + guarantee(p == top(), "end of last object must match end of space"); } void MutableSpace::print_short() const { print_short_on(tty); } @@ -219,11 +220,11 @@ void MutableSpace::print_on(outputStream* st, const char* prefix) const { } void MutableSpace::verify() { - HeapWord* p = bottom(); - HeapWord* t = top(); - while (p < t) { - oopDesc::verify(cast_to_oop(p)); - p += cast_to_oop(p)->size(); - } - guarantee(p == top(), "end of last object must match end of space"); + class VerifyObjectsClosure : public ObjectClosure { + public: + void do_object(oop obj) override { + oopDesc::verify(obj); + } + } cl; + object_iterate(&cl); } diff --git a/test/hotspot/jtreg/gc/parallel/TestPromotionFailureVerification.java b/test/hotspot/jtreg/gc/parallel/TestPromotionFailureVerification.java new file mode 100644 index 000000000000..3f7814bfaecf --- /dev/null +++ b/test/hotspot/jtreg/gc/parallel/TestPromotionFailureVerification.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package gc.parallel; + +/* + * @test + * @bug 8396417 + * @requires vm.gc.Parallel + * @requires vm.debug + * @requires vm.flagless + * @requires vm.bits != "32" + * @summary Make sure that Parallel GC does not crash when verifying after promotion failure + * @library /test/lib + * @modules java.base/jdk.internal.misc + * @build jdk.test.whitebox.WhiteBox + * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -Xlog:gc -XX:MaxTenuringThreshold=1 -XX:+UseCompactObjectHeaders -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseParallelGC -XX:+PromotionFailureALot -XX:PromotionFailureALotInterval=1 -XX:PromotionFailureALotCount=1 -XX:+VerifyAfterGC -Xmx16m gc.parallel.TestPromotionFailureVerification + */ + +import jdk.test.whitebox.WhiteBox; + +public class TestPromotionFailureVerification { + public static void main(String[] args) { + WhiteBox wb = WhiteBox.getWhiteBox(); + + Object sink = new Object(); + // Run two young gcs that guarantee a promotion failure of our sink object (if not other objects during startup) + wb.youngGC(); + wb.youngGC(); + java.lang.ref.Reference.reachabilityFence(sink); + } +} From 936f2f3ff0432f814f95626906fe07953e2092ab Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Mon, 9 Nov 2026 12:05:01 +0000 Subject: [PATCH 047/110] 8394652: [IR Framework] Clean up skip code and clarify -DTest and -DExclude semantics Reviewed-by: mchevalier, epeter --- .../jtreg/compiler/lib/ir_framework/README.md | 4 +- .../lib/ir_framework/TestFramework.java | 7 +- .../ir_framework/driver/TestVMProcess.java | 22 ++- .../OverlappingTestAndExcludeException.java | 53 ++++++ .../shared/TestExecutionPolicy.java | 150 ++++++++++++++++ .../lib/ir_framework/test/AbstractTest.java | 14 +- .../test/ApplicableIRRulesPrinter.java | 20 +-- .../lib/ir_framework/test/BaseTest.java | 4 +- .../lib/ir_framework/test/CheckedTest.java | 4 +- .../lib/ir_framework/test/CustomRunTest.java | 8 +- .../lib/ir_framework/test/TestVM.java | 170 ++++++------------ .../ir_framework/tests/TestBadFormat.java | 9 + .../tests/TestDTestAndExclude.java | 56 ++++-- .../ir_framework/tests/TestRunTests.java | 27 ++- .../ir_framework/tests/TestSkip.java | 27 +++ 15 files changed, 395 insertions(+), 180 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/lib/ir_framework/shared/OverlappingTestAndExcludeException.java create mode 100644 test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestExecutionPolicy.java diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md index 77b11277b3c1..a6010e997336 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md @@ -173,8 +173,8 @@ testFramework The framework provides various stress and debug flags. They should mainly be used as JTreg VM and/or Javaoptions (apart from `VerifyIR`). The following (property) flags are supported: - `-DVerifyIR=false`: Explicitly disable IR verification. This is useful, for example, if some scenarios use VM flags that let `@IR` annotation rules fail and the user does not want to provide separate IR rules or add flag preconditions to the already existing IR rules. -- `-DTest=test1,test2`: Provide a list of `@Test` method names which should be executed. Case-insensitive, plural is allowed (`-DTests`, `-Dtest`, `Dtests` are all fine). -- `-DExclude=test3`: Provide a list of `@Test` method names which should be excluded from execution. Case-insensitive, plural is allowed. +- `-DTest=test1,test2`: Provide a list of `@Test` method names which should be executed. When one of these `@Test`-methods is called from a `@Run`-method that specifies multiple `@Test`-methods, then all of these methods will be run. Case-insensitive, plural is allowed (`-DTests`, `-Dtest`, `Dtests` are all fine). +- `-DExclude=test3`: Provide a list of `@Test` method names which should be excluded from execution. When one of these `@Test`-methods is called from a `@Run`-method that specifies multiple `@Test`-methods, then the entire `@Run`-method is excluded which excludes all its `@Test`-methods as well. Case-insensitive, plural is allowed. - `-DScenario=1,2`: Provide a list of scenario indexes to specify which scenarios should be executed. Case-insensitive, plural is allowed. - `-DWarmup=200`: Provide a new default value of the number of warm-up iterations (framework default is 2000). This might have an influence on the resulting IR and could lead to matching failures (the user can also set a fixed default warm-up value in a test with `testFrameworkObject.setDefaultWarmup(200)`). - `-DReportStdout=true`: Print the standard output of the Test VM. diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java index 1b74232a81f3..7e6345f9ab07 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java @@ -31,6 +31,7 @@ import compiler.lib.ir_framework.driver.irmatching.Matchable; import compiler.lib.ir_framework.driver.irmatching.parser.TestClassParser; import compiler.lib.ir_framework.shared.*; +import compiler.lib.ir_framework.shared.TestExecutionPolicy; import compiler.lib.ir_framework.test.TestVM; import jdk.test.lib.Platform; import jdk.test.lib.Utils; @@ -158,8 +159,6 @@ public class TestFramework { public static final boolean VERBOSE = Boolean.getBoolean("Verbose"); public static final boolean PRINT_RULE_MATCHING_TIME = Boolean.getBoolean("PrintRuleMatchingTime"); - private static final boolean TEST_LIST_IS_EMPTY = SystemProperty.getTestList().isEmpty(); - private static final boolean EXCLUDE_LIST_IS_EMPTY = SystemProperty.getExcludeList().isEmpty(); private static final boolean REPORT_STDOUT = Boolean.getBoolean("ReportStdout"); // Only used for internal testing and should not be used for normal user testing. @@ -178,6 +177,7 @@ public class TestFramework { private static boolean toggleBool; private final Class testClass; + private final TestExecutionPolicy testExecutionPolicy; private Set> helperClasses; private List scenarios; private Set scenarioIndices; @@ -212,6 +212,7 @@ public TestFramework() { public TestFramework(Class testClass) { TestRun.check(testClass != null, "Test class cannot be null"); this.testClass = testClass; + this.testExecutionPolicy = new TestExecutionPolicy(); if (VERBOSE) { System.out.println("Test class: " + testClass); } @@ -792,7 +793,7 @@ private void reportScenarioFailures(Map exceptionMap) { builder.append(System.lineSeparator()); } System.err.println(builder); - if (!VERBOSE && !REPORT_STDOUT && TEST_LIST_IS_EMPTY && EXCLUDE_LIST_IS_EMPTY) { + if (!VERBOSE && !REPORT_STDOUT && !testExecutionPolicy.isTestOrExcludePolicyActive()) { // Provide a hint to the user how to get additional output/debugging information. System.err.println(RERUN_HINT); } diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java index c77951755025..e8f38ca801fa 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java @@ -25,10 +25,7 @@ import compiler.lib.ir_framework.TestFramework; import compiler.lib.ir_framework.driver.network.TestVMData; -import compiler.lib.ir_framework.shared.TestFrameworkException; -import compiler.lib.ir_framework.shared.TestFrameworkSocket; -import compiler.lib.ir_framework.shared.NoTestsRunException; -import compiler.lib.ir_framework.shared.TestFormatException; +import compiler.lib.ir_framework.shared.*; import compiler.lib.ir_framework.test.TestVM; import jdk.test.lib.Platform; import jdk.test.lib.Utils; @@ -102,7 +99,7 @@ private TestVMData processTestVmResult(TestFrameworkSocket socket, boolean allow dumpTestVmOutputIfRequested(); throw createNoTestsRunException(); } - throw createTestVMExceptionForNonZeroExit(socket, allowNotCompilable); + throw createExceptionForNonZeroExit(socket, allowNotCompilable); } /** @@ -147,7 +144,11 @@ private NoTestsRunException createNoTestsRunException() { "Make sure to define a set of at least one @Test method"); } - private TestVMException createTestVMExceptionForNonZeroExit(TestFrameworkSocket socket, boolean allowNotCompilable) { + private boolean overlappingIncludeExclude() { + return oa.getStderr().contains("OverlappingTestAndExclude"); + } + + private RuntimeException createExceptionForNonZeroExit(TestFrameworkSocket socket, boolean allowNotCompilable) { String secondaryException = ""; try { readAndDumpTestVmData(socket, allowNotCompilable); @@ -158,8 +159,13 @@ private TestVMException createTestVMExceptionForNonZeroExit(TestFrameworkSocket secondaryException = buildSecondaryExceptionInfo(e); } // Primary exception: non-zero Test VM exit. - String exceptionInfo = buildPrimaryExceptionInfo() + secondaryException; - return new TestVMException(exceptionInfo); + String primaryException = buildPrimaryExceptionInfo(); + if (overlappingIncludeExclude()) { + // The user specified conflicting -DTest and -DExlucd properties. This kind of failure only happens during + // debugging when specifying an empty test set with property flags. Directly show the primary exception. + return new OverlappingTestAndExcludeException(primaryException); + } + return new TestVMException(primaryException + secondaryException); } private String buildSecondaryExceptionInfo(RuntimeException e) { diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/OverlappingTestAndExcludeException.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/OverlappingTestAndExcludeException.java new file mode 100644 index 000000000000..ddb7d975ccd4 --- /dev/null +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/OverlappingTestAndExcludeException.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.lib.ir_framework.shared; + +import java.lang.reflect.Method; +import java.util.List; + +/** + * Exception that is thrown when the user uses -DTest and -DExclude which both define the same test which is most + * likely a mistake. + */ +@SuppressWarnings("serial") +public class OverlappingTestAndExcludeException extends RuntimeException { + public OverlappingTestAndExcludeException(String message) { + super(message); + } + + public static OverlappingTestAndExcludeException create(List overlaps) { + return new OverlappingTestAndExcludeException("-DTest and -DExclude share duplicates: " + String.join(", ", overlaps)); + } + + public static OverlappingTestAndExcludeException createForRunWithMultipleTests(List testList, + List excludeList, + Method runMethod) { + return new OverlappingTestAndExcludeException("-DTest and -DExclude specify methods that are both part of the " + + "test definition for @Run method \"" + runMethod + "\":" + + System.lineSeparator() + + "- -DTest: " + String.join(", ", testList) + System.lineSeparator() + + "- -DExclude: " + String.join(", ", excludeList)); + } +} + diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestExecutionPolicy.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestExecutionPolicy.java new file mode 100644 index 000000000000..d2b371ec69dc --- /dev/null +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestExecutionPolicy.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.lib.ir_framework.shared; + +import compiler.lib.ir_framework.test.DeclaredTest; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * Class to answer queries about whether a test or method should be excluded or not which includes: + * - @Skip + * - DTest + * - DExclude + */ +public class TestExecutionPolicy { + private static final String TEST_LIST = SystemProperty.getTestList(); + private static final String EXCLUDE_LIST = SystemProperty.getExcludeList(); + private static final boolean IGNORE_SKIP = Boolean.getBoolean("IgnoreSkip"); + + private final List excludeList; + private final List testList; + + public TestExecutionPolicy() { + this.testList = createTestFilterList(TEST_LIST); + this.excludeList = createTestFilterList(EXCLUDE_LIST); + checkPolicy(); + } + + /** + * Parse "test1,test2,test3" into a list of method names. + */ + private static List createTestFilterList(String methods) { + if (methods.isBlank()) { + return new ArrayList<>(); + } + return new ArrayList<>(Arrays.asList(methods.split(","))); + } + + private void checkPolicy() { + if (!Collections.disjoint(excludeList, testList)) { + List overlaps = new ArrayList<>(testList); + overlaps.retainAll(excludeList); + throw OverlappingTestAndExcludeException.create(overlaps); + } + } + + public void checkPolicyForCustomRunTest(Method runMethod, String[] testNames) { + List testNamesList = Arrays.asList(testNames); + List overlapInclude = new ArrayList<>(testList); + List overlapExclude = new ArrayList<>(excludeList); + overlapInclude.retainAll(testNamesList); + overlapExclude.retainAll(testNamesList); + if (!overlapInclude.isEmpty() && !overlapExclude.isEmpty()) { + throw OverlappingTestAndExcludeException.createForRunWithMultipleTests(overlapInclude, overlapExclude, + runMethod); + } + } + + /** + * Has the user set any valid -DTest or -DExclude properties? + */ + public boolean isTestOrExcludePolicyActive() { + return isTestPolicyActive() || !excludeList.isEmpty(); + } + + private boolean isTestPolicyActive() { + return !testList.isEmpty(); + } + + /** + * A base or checked test is excluded from execution if either: + * - -DTest does not list the method + * - -DExclude lists the method + * - The method specifies a (temporary) @Skip annotation. + */ + public boolean shouldExcludeBaseOrCheckedTest(DeclaredTest test) { + Method testMethod = test.getTestMethod(); + String testName = testMethod.getName(); + return isNotOnExistingTestList(testName) || + isOnExcludeList(testName) || + shouldSkip(test); + } + + private boolean isNotOnExistingTestList(String testName) { + return isTestPolicyActive() && !testList.contains(testName); + } + + private boolean isOnExcludeList(String testName) { + return excludeList.contains(testName); + } + + private boolean shouldSkip(DeclaredTest test) { + return !IGNORE_SKIP && test.hasSkipAnno(); + } + + /** + * A custom run test is excluded from execution if either: + * - -DTest does not list any associated test method + * - -DExclude lists at least one associated test method + * - At least one associated test method has a (temporary) @Skip annotation. + * + *

+ * Note that specifying distinct methods in -DTest and -DExclude which are both associated with the same @Run-method + * results in a {@link OverlappingTestAndExcludeException}. + */ + public boolean shouldExcludeCustomRunTest(List tests) { + return hasSkipOrOnExcludeList(tests) || isNotOnExistingTestList(tests); + } + + private boolean hasSkipOrOnExcludeList(List tests) { + return tests.stream() + .anyMatch(test -> shouldSkip(test) || + isOnExcludeList(test.getTestMethod().getName())); + } + + private boolean isNotOnExistingTestList(List tests) { + return isTestPolicyActive() && + tests.stream() + .noneMatch(test -> isOnTestList(test.getTestMethod().getName())); + } + + private boolean isOnTestList(String testName) { + return testList.contains(testName); + } +} diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java index 241f7aa5b542..8eed7dd65248 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java @@ -44,11 +44,9 @@ abstract class AbstractTest { protected static final boolean VERIFY_OOPS = (Boolean)WHITE_BOX.getVMFlag("VerifyOops"); protected final int warmupIterations; - protected final boolean skip; - AbstractTest(int warmupIterations, boolean skip) { + AbstractTest(int warmupIterations) { this.warmupIterations = warmupIterations; - this.skip = skip; } protected boolean shouldCompile(DeclaredTest test) { @@ -57,13 +55,6 @@ protected boolean shouldCompile(DeclaredTest test) { abstract String getName(); - /** - * Should test be executed? - */ - public boolean isSkipped() { - return skip; - } - /** * See {@link CompLevel#WAIT_FOR_COMPILATION}. */ @@ -93,9 +84,6 @@ protected static Object createInvocationTarget(Method method) { * Run the associated test. */ public void run() { - if (skip) { - return; - } for (int i = 0; i < warmupIterations; i++) { invokeTest(); } diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java index 94d1b039f212..96399e222849 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java @@ -138,23 +138,21 @@ public class ApplicableIRRulesPrinter { * - indices of all @IR rules that should be applied, separated by a comma * - "-1" if no @IR rule should not be applied */ - public void emitApplicableIRRules(Method m, boolean skipped) { + public void emitApplicableIRRules(Method m) { method = m; int i = 0; ArrayList validRules = new ArrayList<>(); IR[] irAnnos = m.getAnnotationsByType(IR.class); - if (!skipped) { - for (IR irAnno : irAnnos) { - ruleIndex = i + 1; - try { - if (shouldApplyIrRule(irAnno, m.getName(), ruleIndex, irAnnos.length)) { - validRules.add(ruleIndex); - } - } catch (TestFormatException e) { - // Catch logged failure and continue to check other IR annotations. + for (IR irAnno : irAnnos) { + ruleIndex = i + 1; + try { + if (shouldApplyIrRule(irAnno, m.getName(), ruleIndex, irAnnos.length)) { + validRules.add(ruleIndex); } - i++; + } catch (TestFormatException e) { + // Catch logged failure and continue to check other IR annotations. } + i++; } if (irAnnos.length == 0 || validRules.isEmpty()) { diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java index 0e5c4f799871..43479468748f 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/BaseTest.java @@ -40,8 +40,8 @@ class BaseTest extends AbstractTest { private final boolean waitForCompilation; private int invocationCounter; - public BaseTest(DeclaredTest test, boolean skip) { - super(test.getWarmupIterations(), skip); + public BaseTest(DeclaredTest test) { + super(test.getWarmupIterations()); this.test = test; this.testMethod = test.getTestMethod(); this.testInfo = new TestInfo(testMethod, test.getCompLevel()); diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/CheckedTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/CheckedTest.java index 287960d5703c..11056cfb6c31 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/CheckedTest.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/CheckedTest.java @@ -44,8 +44,8 @@ enum Parameter { NONE, RETURN_ONLY, TEST_INFO_ONLY, BOTH } - public CheckedTest(DeclaredTest test, Method checkMethod, Check checkSpecification, Parameter parameter, boolean excludedByUser) { - super(test, excludedByUser); + public CheckedTest(DeclaredTest test, Method checkMethod, Check checkSpecification, Parameter parameter) { + super(test); // Make sure we can also call non-public or public methods in package private classes checkMethod.setAccessible(true); this.checkMethod = checkMethod; diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/CustomRunTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/CustomRunTest.java index 98a829fcc015..2ab67f101a08 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/CustomRunTest.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/CustomRunTest.java @@ -47,10 +47,9 @@ class CustomRunTest extends AbstractTest { private final List tests; private final RunInfo runInfo; - public CustomRunTest(Method runMethod, Warmup warmUpAnno, Run runSpecification, List tests, boolean skip) { + public CustomRunTest(Method runMethod, Warmup warmUpAnno, Run runSpecification, List tests) { // Make sure we can also call non-public or public methods in package private classes - super(warmUpAnno != null ? warmUpAnno.value() : TestVM.WARMUP_ITERATIONS, skip); - TestFormat.checkNoThrow(warmupIterations >= 0, "Cannot have negative value for @Warmup at " + runMethod); + super(warmUpAnno != null ? warmUpAnno.value() : TestVM.WARMUP_ITERATIONS); runMethod.setAccessible(true); this.runMethod = runMethod; this.runInvocationTarget = createInvocationTarget(runMethod); @@ -78,9 +77,6 @@ String getName() { @Override public void run() { - if (skip) { - return; - } switch (mode) { case STANDALONE -> { runInfo.setWarmUpFinished(); diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java index 32e6ae5faa32..8921d9367df0 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java @@ -95,10 +95,7 @@ assertions from main() of your test! private static final boolean PRINT_TIMES = Boolean.getBoolean("PrintTimes") || VERBOSE; public static final boolean USE_COMPILER = WHITE_BOX.getBooleanVMFlag("UseCompiler"); static final boolean EXCLUDE_RANDOM = Boolean.getBoolean("ExcludeRandom"); - private static final String TEST_LIST = SystemProperty.getTestList(); - private static final String EXCLUDE_LIST = SystemProperty.getExcludeList(); // We ignore @Skip when running with -DIgnoreSkip=true - private static final boolean IGNORE_SKIP = Boolean.getBoolean("IgnoreSkip"); private static final boolean DUMP_REPLAY = Boolean.getBoolean("DumpReplay"); private static final boolean GC_AFTER = Boolean.getBoolean("GCAfter"); private static final boolean SHUFFLE_TESTS = Boolean.parseBoolean(System.getProperty("ShuffleTests", "true")); @@ -114,8 +111,7 @@ assertions from main() of your test! private final List allTests = new ArrayList<>(); private final HashMap testMethodMap = new HashMap<>(); private final HashMap setupMethodMap = new HashMap<>(); - private final List excludeList; - private final List testList; + private final TestExecutionPolicy testExecutionPolicy; private Set> helperClasses = null; // Helper classes that contain framework annotations to be processed. private final ApplicableIRRulesPrinter irMatchRulePrinter; private final Class testClass; @@ -124,9 +120,7 @@ assertions from main() of your test! private TestVM(Class testClass) { TestRun.check(testClass != null, "Test class cannot be null"); this.testClass = testClass; - this.testList = createTestFilterList(TEST_LIST, testClass); - this.excludeList = createTestFilterList(EXCLUDE_LIST, testClass); - + this.testExecutionPolicy = new TestExecutionPolicy(); if (PRINT_VALID_IR_RULES) { irMatchRulePrinter = new ApplicableIRRulesPrinter(); } else { @@ -134,30 +128,6 @@ private TestVM(Class testClass) { } } - /** - * Parse "test1,test2,test3" into a list. - */ - private static List createTestFilterList(String list, Class testClass) { - if (list.isEmpty()) { - return new ArrayList<>(); - } - - String classPrefix = testClass.getSimpleName() + "."; - List filterList = new ArrayList<>(Arrays.asList(list.split(","))); - for (int i = filterList.size() - 1; i >= 0; i--) { - String test = filterList.get(i); - if (test.indexOf(".") > 0) { - if (test.startsWith(classPrefix)) { - test = test.substring(classPrefix.length()); - filterList.set(i, test); - } else { - filterList.remove(i); - } - } - } - return filterList; - } - /** * Main entry point of the Test VM. */ @@ -298,10 +268,14 @@ private void addBaseTests() { try { Arguments argumentsAnno = getAnnotation(m, Arguments.class); TestFormat.check(argumentsAnno != null || m.getParameterCount() == 0, "Missing @Arguments annotation to define arguments of " + m); - BaseTest baseTest = new BaseTest(test, shouldExcludeTest(m)); + if (testExecutionPolicy.shouldExcludeBaseOrCheckedTest(test)) { + return; + } + + BaseTest baseTest = new BaseTest(test); allTests.add(baseTest); if (PRINT_VALID_IR_RULES) { - irMatchRulePrinter.emitApplicableIRRules(m, baseTest.isSkipped()); + irMatchRulePrinter.emitApplicableIRRules(m); } } catch (TestFormatException e) { // Failure logged. Continue and report later. @@ -310,35 +284,6 @@ private void addBaseTests() { }); } - /** - * A test is excluded from execution if: - * - -DTest does not list the method - * - -DExclude lists the method - * - The method specifies a (temporary) @Skip annotation. - */ - private boolean shouldExcludeTest(Method testMethod) { - String testName = testMethod.getName(); - return isNotOnTestList(testName) || - isOnExcludeList(testName) || - shouldSkip(testMethod); - } - - private boolean isNotOnTestList(String testName) { - return !testList.isEmpty() && !testList.contains(testName); - } - - private boolean isOnExcludeList(String testName) { - return excludeList.contains(testName); - } - - private boolean shouldSkip(Method method) { - return !IGNORE_SKIP && hasSkipAnnotation(method); - } - - private boolean hasSkipAnnotation(Method method) { - return getAnnotation(method, Skip.class) != null; - } - /** * Generate replay compilation files. */ @@ -716,12 +661,16 @@ private void addCheckedTest(Method m, Check checkAnno, Run runAnno) { "Missing @Arguments annotation to define arguments of " + testMethod + " required by " + "checked test " + m); CheckedTest.Parameter parameter = getCheckedTestParameter(m, testMethod); + if (testExecutionPolicy.shouldExcludeBaseOrCheckedTest(test)) { + return; + } + dontCompileAndDontInlineMethod(m); - CheckedTest checkedTest = new CheckedTest(test, m, checkAnno, parameter, shouldExcludeTest(testMethod)); + CheckedTest checkedTest = new CheckedTest(test, m, checkAnno, parameter); allTests.add(checkedTest); if (PRINT_VALID_IR_RULES) { // Only need to emit IR verification information if IR verification is actually performed. - irMatchRulePrinter.emitApplicableIRRules(testMethod, checkedTest.isSkipped()); + irMatchRulePrinter.emitApplicableIRRules(testMethod); } } @@ -765,73 +714,79 @@ private CheckedTest.Parameter getCheckedTestParameter(Method m, Method testMetho * Set up a custom run test by first verifying the correct format of the @Test and @Run method and then adding it * to the allTests list which keeps track of all framework tests that are eventually executed. */ - private void addCustomRunTest(Method m, Run runAnno) { - checkRunMethod(m, runAnno); + private void addCustomRunTest(Method runMethod, Run runAnno) { + checkRunMethod(runMethod, runAnno); List tests = new ArrayList<>(); - boolean shouldExcludeTest = true; for (String testName : runAnno.test()) { try { Method testMethod = testMethodMap.get(testName); DeclaredTest test = declaredTests.get(testMethod); - checkCustomRunTest(m, testName, testMethod, test, runAnno.mode()); - test.setAttachedMethod(m); + checkCustomRunTest(runMethod, testName, testMethod, test, runAnno.mode()); + test.setAttachedMethod(runMethod); tests.add(test); - // Only exclude custom run test if all its associated test methods are excluded - shouldExcludeTest &= shouldExcludeTest(testMethod); } catch (TestFormatException e) { // Logged, continue. } } + if (tests.size() != runAnno.test().length) { // At least one test is invalid. Return and report the already recorded format violation(s) later. return; } - checkNoneOrAllAssociatedTestsSkipped(m, tests); - dontCompileAndDontInlineMethod(m); - CustomRunTest customRunTest = new CustomRunTest(m, getAnnotation(m, Warmup.class), runAnno, tests, shouldExcludeTest); + checkNoneOrAllAssociatedTestsSkipped(runMethod, tests); + testExecutionPolicy.checkPolicyForCustomRunTest(runMethod, runAnno.test()); + if (testExecutionPolicy.shouldExcludeCustomRunTest(tests)) { + return; + } + + dontCompileAndDontInlineMethod(runMethod); + CustomRunTest customRunTest = new CustomRunTest(runMethod, getAnnotation(runMethod, Warmup.class), runAnno, tests); allTests.add(customRunTest); if (PRINT_VALID_IR_RULES) { - // Even though we cannot exclude a @Test method from being run when invoked from a @Run method for multiple - // tests, we can disable its IR verification. - tests.forEach(test -> irMatchRulePrinter.emitApplicableIRRules(test.getTestMethod(), shouldExcludeTest(test.getTestMethod()))); + tests.forEach(test -> irMatchRulePrinter.emitApplicableIRRules(test.getTestMethod())); } } /** * Only allow parameters as specified in {@link Run}. */ - private void checkCustomRunTest(Method m, String testName, Method testMethod, DeclaredTest test, RunMode runMode) { - TestFormat.check(testMethod != null, "Did not find associated @Test method \"" + m.getDeclaringClass().getName() - + "." + testName + "\" specified in @Run at " + m); + private void checkCustomRunTest(Method runMethod, String testName, Method testMethod, DeclaredTest test, RunMode runMode) { + TestFormat.check(testMethod != null, "Did not find associated @Test method \"" + runMethod.getDeclaringClass().getName() + + "." + testName + "\" specified in @Run at " + runMethod); TestFormat.check(test != null, - "Missing @Test annotation for associated test method " + testName + " for @Run at " + m); + "Missing @Test annotation for associated test method " + testName + " for @Run at " + runMethod); Method attachedMethod = test.getAttachedMethod(); TestFormat.check(attachedMethod == null, "Cannot use @Test " + testMethod + " for more than one @Run/@Check method. Found: " - + m + ", " + attachedMethod); + + runMethod + ", " + attachedMethod); Arguments argumentsAnno = getAnnotation(testMethod, Arguments.class); TestFormat.check(argumentsAnno == null, - "Cannot use @Arguments at test method " + testMethod + " in combination with @Run method " + m); + "Cannot use @Arguments at test method " + testMethod + " in combination with @Run method " + runMethod); Warmup warmupAnno = getAnnotation(testMethod, Warmup.class); TestFormat.checkNoThrow(warmupAnno == null, "Cannot set @Warmup at @Test method " + testMethod + " when used with its @Run method " - + m + ". Use @Warmup at @Run method instead."); + + runMethod + ". Use @Warmup at @Run method instead."); Test testAnno = getAnnotation(testMethod, Test.class); TestFormat.checkNoThrow(runMode != RunMode.STANDALONE || testAnno.compLevel() == CompLevel.ANY, "Setting explicit compilation level for @Test method " + testMethod + " has no effect " - + "when used with STANDALONE @Run method " + m); + + "when used with STANDALONE @Run method " + runMethod); } - private void checkRunMethod(Method m, Run runAnno) { - TestFormat.check(runAnno.test().length > 0, "@Run method " + m + " must specify at least one test method"); - TestFormat.checkNoThrow(m.getParameterCount() == 0 || (m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(RunInfo.class)), - "@Run method " + m + " must specify either no parameter or exactly one " + RunInfo.class + " parameter."); - Warmup warmupAnno = getAnnotation(m, Warmup.class); - TestFormat.checkNoThrow(warmupAnno == null || runAnno.mode() != RunMode.STANDALONE, - "Cannot set @Warmup at @Run method " + m + " when used with RunMode.STANDALONE. The @Run method is only invoked once."); - } + private void checkRunMethod(Method runMethod, Run runAnno) { + TestFormat.check(runAnno.test().length > 0, "@Run method " + runMethod + " must specify at least one test method"); + TestFormat.checkNoThrow(runMethod.getParameterCount() == 0 || (runMethod.getParameterCount() == 1 && runMethod.getParameterTypes()[0].equals(RunInfo.class)), + "@Run method " + runMethod + " must specify either no parameter or exactly one " + RunInfo.class + " parameter."); + Warmup warmupAnno = getAnnotation(runMethod, Warmup.class); + if (warmupAnno != null) { + TestFormat.checkNoThrow(warmupAnno.value() >= 0, "Cannot have negative value for @Warmup at " + runMethod); + TestFormat.checkNoThrow(runAnno.mode() != RunMode.STANDALONE, + "Cannot set @Warmup at @Run method " + runMethod + " when used with RunMode.STANDALONE. " + + "The @Run method is only invoked once."); + + } + } private void checkNoneOrAllAssociatedTestsSkipped(Method runMethod, List tests) { List testMethodsWithoutSkip = testMethodsWithoutSkipAnnotation(tests); @@ -859,7 +814,7 @@ private void reportPartiallySkippingTests(Method runMethod, List testMet TestFormat.fail(builder.toString()); } - private static T getAnnotation(AnnotatedElement element, Class c) { + public static T getAnnotation(AnnotatedElement element, Class c) { T[] annos = element.getAnnotationsByType(c); TestFormat.check(annos.length < 2, element + " has duplicated annotations"); return Arrays.stream(annos).findFirst().orElse(null); @@ -897,34 +852,27 @@ private void checkForcedCompilationsCompleted() { */ private void runTests() { long startTime = System.nanoTime(); - List testList; - boolean testFilterPresent = testFilterPresent(); - if (testFilterPresent) { - // Only run the specified tests by the user filters -DTest and/or -DExclude. - testList = allTests.stream().filter(test -> !test.isSkipped()).collect(Collectors.toList()); - if (testList.isEmpty()) { - // Throw an exception to inform the user about an empty specified test set with -DTest and/or -DExclude - throw new NoTestsRunException(); - } - } else { - testList = allTests; + boolean testExecutionPolicyActive = testExecutionPolicy.isTestOrExcludePolicyActive(); + if (testExecutionPolicyActive && allTests.isEmpty()) { + // Throw an exception to inform the user about an empty specified test set with -DTest and/or -DExclude + throw new NoTestsRunException(); } if (SHUFFLE_TESTS) { // Execute tests in random order (execution sequence affects profiling). This is done by default. - Collections.shuffle(testList, Utils.getRandomInstance()); + Collections.shuffle(allTests, Utils.getRandomInstance()); } StringBuilder builder = new StringBuilder(); int failures = 0; // Execute all tests and keep track of each exception that is thrown. These are then reported once all tests // are executing. This prevents a premature exit without running all tests. - for (AbstractTest test : testList) { + for (AbstractTest test : allTests) { String testName = test.getName(); if (VERBOSE) { System.out.println("Run \"" + testName + "\""); } - if (testFilterPresent) { + if (testExecutionPolicyActive) { TestVmSocket.sendWithTag(MessageTag.TEST_LIST, test.toString()); } try { @@ -960,10 +908,6 @@ private void runTests() { } } - private boolean testFilterPresent() { - return !testList.isEmpty() || !excludeList.isEmpty(); - } - enum TriState { Maybe, Yes, diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java index 3df645be17ee..b695c4ef4128 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java @@ -814,6 +814,15 @@ public static void testSkipOnlyOneTestWithRunMultiple2() {} @Run(test = {"testSkipOnlyOneTestWithRunMultiple1", "testSkipOnlyOneTestWithRunMultiple2"}) public static void runTestSkipOnlyOneTestWithRunMultiple() {} + + @Test + @NoFail // Bad warmup is reported only for runBadWarmupAtSkip() + @Skip + public static void testBadWarmupAtSkip() {} + + @Warmup(-1) + @Run(test = {"testBadWarmupAtSkip"}) + public static void runBadWarmupAtSkip() {} } class BadIRAnnotationBeforeFlagVM { diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDTestAndExclude.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDTestAndExclude.java index 04b3393b9467..420953959a5f 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDTestAndExclude.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestDTestAndExclude.java @@ -29,6 +29,7 @@ import compiler.lib.ir_framework.TestFramework; import compiler.lib.ir_framework.driver.TestVMException; import compiler.lib.ir_framework.shared.NoTestsRunException; +import compiler.lib.ir_framework.shared.OverlappingTestAndExcludeException; import jdk.test.lib.Asserts; import jdk.test.lib.Utils; import jdk.test.lib.process.OutputAnalyzer; @@ -47,26 +48,27 @@ public static void main(String[] args) throws Exception { if (args.length == 0) { run("good1,good2", "", "good"); run("good1,good2", "bad1", "good"); - run("good1,bad1", "bad1", "good"); - run("good1,bad1", "bad1,good", "good"); - run("good3,bad2", "bad1,bad2", "good"); + run("good1,bad1", "bad1", "overlap"); + run("good1,bad1", "badSingle,good", "bad1"); + run("good3,badSingle", "bad1,badSingle", "overlap"); run("goodMulti1,goodMulti2", "", "good"); run("bad1,good1", "", "bad1"); - run("bad1,good1", "good1", "bad1"); + run("bad1,good1", "good1", "overlap"); run("bad1,good1", "asdf", "bad1"); - run("bad2,good1", "", "runBadSingle"); - run("bad2", "runBadSingle", "runBadSingle"); + run("badSingle,good1", "", "runBadSingle"); + run("badSingle", "runBadSingle", "runBadSingle"); run("badMulti1,badMulti2", "", "runBadMulti"); run("badMulti1", "", "runBadMulti"); - run("badMulti1", "badMulti2", "runBadMulti"); - run("badMulti2", "badMulti1", "runBadMulti"); + run("badMulti1,good1", "badMulti2", "overlap"); + run("badMulti1", "badMulti2", "overlap"); + run("badMulti2", "badMulti1", "overlap"); run("runBadSingle", "", "empty"); run("runBadMulti", "", "empty"); run("asdf", "", "empty"); - run("", "good1,good2,good3,bad1,bad2,goodMulti1,goodMulti2,badMulti1,badMulti2", "empty"); - run("asdf", "good1,good2,good3,bad1,bad2,goodMulti1,goodMulti2,badMulti1,badMulti2", "empty"); - run("bad1", "bad1", "empty"); - run("good1", "asdf,good,good1", "empty"); + run("", "good1,good2,good3,bad1,badSingle,goodMulti1,goodMulti2,badMulti1,badMulti2", "empty"); + run("asdf", "good1,good2,good3,bad1,badSingle,goodMulti1,goodMulti2,badMulti1,badMulti2", "empty"); + run("bad1", "bad1", "overlap"); + run("good1", "asdf,good,good1", "overlap"); } else { switch (args[0]) { case "good" -> TestFramework.run(); @@ -76,6 +78,8 @@ public static void main(String[] args) throws Exception { throw new RuntimeException("should not reach"); } catch (TestVMException e) { Asserts.assertTrue(e.getExceptionInfo().contains("expected " + args[0] + " exception")); + } catch (Exception e) { + Asserts.fail("unexpected exception", e); } } case "empty" -> { @@ -84,6 +88,18 @@ public static void main(String[] args) throws Exception { throw new RuntimeException("should not reach"); } catch (NoTestsRunException e) { // Expected + } catch (Exception e) { + Asserts.fail("unexpected exception", e); + } + } + case "overlap" -> { + try { + TestFramework.run(); + throw new RuntimeException("should not reach"); + } catch (OverlappingTestAndExcludeException e) { + // Expected + } catch (Exception e) { + Asserts.fail("unexpected exception", e); } } default -> throw new RuntimeException("should not reach"); @@ -104,11 +120,17 @@ protected static void run(String dTest, String dExclude, String arg) throws Exce dTestFlag = dTestFlag + "s"; dExcludeFlag = dExcludeFlag + "s"; } - System.out.println("Run " + dTestFlag + "=" + dTest + " " + dExcludeFlag + "=" + dExclude + " arg=" + arg); + String include = dTestFlag + "=" + dTest; + String exclude = dExcludeFlag + "=" + dExclude; + String includeExclude = include + " " + exclude; + System.out.println("Run " + includeExclude + " arg=" + arg); OutputAnalyzer oa; ProcessBuilder process = ProcessTools.createLimitedTestJavaProcessBuilder( - "-Dtest.class.path=" + Utils.TEST_CLASS_PATH, "-Dtest.jdk=" + Utils.TEST_JDK, - "-Dtest.vm.opts=" + dTestFlag + "=" + dTest + " " + dExcludeFlag + "=" + dExclude, + "-Dtest.class.path=" + Utils.TEST_CLASS_PATH, + "-Dtest.jdk=" + Utils.TEST_JDK, + "-Dtest.vm.opts=" + includeExclude, + include, + exclude, "ir_framework.tests.TestDTestAndExclude", arg); oa = ProcessTools.executeProcess(process); oa.shouldHaveExitValue(0); @@ -149,7 +171,7 @@ public void runGoodMulti() { } @Test - public void bad2() { + public void badSingle() { } @Test @@ -160,7 +182,7 @@ public void badMulti1() { public void badMulti2() { } - @Run(test = "bad2") + @Run(test = "badSingle") public void runBadSingle() { throw new RuntimeException("expected runBadSingle exception"); } diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java index feae6987aefb..58ce54b2701c 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java @@ -25,6 +25,7 @@ import compiler.lib.ir_framework.*; import compiler.lib.ir_framework.driver.irmatching.IRViolationException; +import compiler.lib.ir_framework.shared.NoTestsRunException; import compiler.lib.ir_framework.shared.TestRunException; import jdk.test.lib.Asserts; @@ -64,10 +65,19 @@ public static void main(String[] args) { new TestFramework(SkipC2Compilation.class).addFlags("-XX:TieredStopAtLevel=1").start(); new TestFramework(SkipC2Compilation.class).addFlags("-XX:TieredStopAtLevel=2").start(); new TestFramework(SkipC2Compilation.class).addFlags("-XX:TieredStopAtLevel=3").start(); - new TestFramework(FilteredIRRun.class).addFlags("-DTest=test1").start(); + new TestFramework(FilteredIRRun.class).addFlags("-DTest=testGood").start(); new TestFramework(FilteredIRRun.class).addFlags("-DExclude=test2").start(); - new TestFramework(FilteredIRRun.class).addFlags("-DTest=test1,test2", "-DExclude=test2").start(); - for (String[] flags : new String[][] { {}, { "-DTest=test2" } }) { + new TestFramework(FilteredIRRun.class).addFlags("-DTest=testGood", "-DExclude=test2").start(); + + for (String[] flags : new String[][] { { "-DTest=testNotExist" }, { "-DTest=testNotExist", "-DExclude=test2" } }) { + try { + new TestFramework(FilteredIRRun.class).addFlags(flags).start(); + Asserts.fail("expected NoTestsRunException"); + } catch (NoTestsRunException e) { + // Expected + } + } + for (String[] flags : new String[][] { {}, { "-DTest=test1" }, { "-DTest=test2" } }) { try { new TestFramework(FilteredIRRun.class).addFlags(flags).start(); Asserts.fail("Expected test2 to fail IR verification"); @@ -304,6 +314,17 @@ public void run(RunInfo info) { TestFramework.assertCompiledByC2(info.getTest("test2")); } } + + @Test + @IR(counts = {IRNode.STORE_I, "1"}) + public void testGood(int x) { + iFld = x; + } + + @Run(test = {"testGood"}) + public void runGood() { + testGood(34); + } } // Run with TieredStopAt=[1,3]. IR verification is skipped. diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSkip.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSkip.java index 509f899bd694..0eb5e98c3b00 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSkip.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSkip.java @@ -50,6 +50,7 @@ public static void main(String[] args) { private static void runGood() { TestFramework.run(SkipBasics.class); + TestFramework.run(SkipEarly.class); } private static void runMix() { @@ -173,6 +174,32 @@ public static void runWithMultipleTestsAllSkipFail() { } } + static class SkipEarly { + SkipEarly() { + throw new RuntimeException("should not be constructed"); + } + + @Test + @Skip + void baseTest() {} + + @Test + @Skip + void runTest() {} + + @Run(test = "runTest") + void run() { + runTest(); + } + + @Test + @Skip + void checkedTest() {} + + @Check(test = "checkedTest") + void check() {} + } + static class IRVerification { static int iFld; From d849a5dafad8b9766e248979983afd927015174e Mon Sep 17 00:00:00 2001 From: Marc Chevalier Date: Mon, 9 Nov 2026 13:03:57 +0000 Subject: [PATCH 048/110] 8396668: Fix various tests where flags appear after the class name Reviewed-by: thartmann, stefank, chagedorn, prr --- .../TestSHA512MultiBlockIntrinsics.java | 12 +++++----- .../jtreg/compiler/types/TestMeetXor.java | 2 +- .../hotspot/jtreg/gc/TestObjectAlignment.java | 24 +++++++++---------- .../gc/shenandoah/TestArrayCopyCheckCast.java | 4 ++-- .../cds/CheckSharingWithDefaultArchive.java | 2 +- .../java/awt/Debug/DumpOnKey/DumpOnKey.java | 12 +++++----- .../jfr/startupargs/TestStartNoSettings.java | 3 +-- .../ssl/SSLSocketImpl/ReverseNameLookup.java | 2 +- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java index 52a465104259..801ee74fcc35 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java @@ -41,7 +41,7 @@ * -XX:+UseSHA512Intrinsics -XX:-UseMD5Intrinsics * -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics * -Dalgorithm=SHA-384 - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * ${test.main.class} * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 @@ -49,7 +49,7 @@ * -XX:CompileOnly=sun.security.provider.DigestBase::* * -XX:CompileOnly=sun.security.provider.SHA5::* * -XX:+UseSHA512Intrinsics -Dalgorithm=SHA-384 - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * ${test.main.class} * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 @@ -57,7 +57,7 @@ * -XX:CompileOnly=sun.security.provider.DigestBase::* * -XX:CompileOnly=sun.security.provider.SHA5::* -XX:-UseSHA * -Dalgorithm=SHA-384 - * compiler.intrinsics.sha.sanity.TestSHA1Intrinsics + * ${test.main.class} * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 @@ -67,7 +67,7 @@ * -XX:+UseSHA512Intrinsics -XX:-UseMD5Intrinsics * -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics * -Dalgorithm=SHA-512 - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * ${test.main.class} * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 @@ -75,7 +75,7 @@ * -XX:CompileOnly=sun.security.provider.DigestBase::* * -XX:CompileOnly=sun.security.provider.SHA5::* * -XX:+UseSHA512Intrinsics -Dalgorithm=SHA-512 - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * ${test.main.class} * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 @@ -83,7 +83,7 @@ * -XX:CompileOnly=sun.security.provider.DigestBase::* * -XX:CompileOnly=sun.security.provider.SHA5::* -XX:-UseSHA * -Dalgorithm=SHA-512 - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * ${test.main.class} * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE * compiler.testlibrary.intrinsics.Verifier positive_384.log positive_512.log * positive_384_def.log positive_512_def.log negative_384.log diff --git a/test/hotspot/jtreg/compiler/types/TestMeetXor.java b/test/hotspot/jtreg/compiler/types/TestMeetXor.java index c25d22c73e13..1cf1e769b11c 100644 --- a/test/hotspot/jtreg/compiler/types/TestMeetXor.java +++ b/test/hotspot/jtreg/compiler/types/TestMeetXor.java @@ -27,7 +27,7 @@ * @bug 8267332 * @summary Test meet on xor * @library /test/lib / - * @run main/othervm compiler.types.TestMeetXor -Xbatch -XX::CompileCommand=dontinline,*::test* + * @run main/othervm -Xbatch -XX:CompileCommand=dontinline,*::test* ${test.main.class} */ package compiler.types; diff --git a/test/hotspot/jtreg/gc/TestObjectAlignment.java b/test/hotspot/jtreg/gc/TestObjectAlignment.java index 8879d59de820..ab191a70c960 100644 --- a/test/hotspot/jtreg/gc/TestObjectAlignment.java +++ b/test/hotspot/jtreg/gc/TestObjectAlignment.java @@ -30,18 +30,18 @@ * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs * @library /test/lib * @modules java.base/jdk.internal.misc - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=8 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=16 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=32 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=64 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=128 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=256 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=8 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=16 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=32 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=64 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=128 - * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=256 + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=8 ${test.main.class} + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=16 ${test.main.class} + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=32 ${test.main.class} + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=64 ${test.main.class} + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=128 ${test.main.class} + * @run main/othervm -XX:+ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=256 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=8 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=16 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=32 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=64 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=128 ${test.main.class} + * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:ObjectAlignmentInBytes=256 ${test.main.class} */ public class TestObjectAlignment { diff --git a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java index c370d03a55e5..8080346568f9 100644 --- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java +++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java @@ -27,14 +27,14 @@ * @test id=default * @requires vm.gc.Shenandoah * - * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyCheckCast + * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m ${test.main.class} */ /* * @test id=generational * @requires vm.gc.Shenandoah * - * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyCheckCast -XX:ShenandoahGCMode=generational + * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m -XX:ShenandoahGCMode=generational ${test.main.class} */ public class TestArrayCopyCheckCast { diff --git a/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java index baf30c3f02c6..ff771428d7b4 100644 --- a/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java +++ b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java @@ -31,7 +31,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions - * -XX:+WhiteBoxAPI CheckSharingWithDefaultArchive -showversion + * -XX:+WhiteBoxAPI -showversion ${test.main.class} */ import jdk.test.lib.Platform; import jtreg.SkippedException; diff --git a/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java b/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java index d43f09580585..55a90bb50571 100644 --- a/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java +++ b/test/jdk/java/awt/Debug/DumpOnKey/DumpOnKey.java @@ -34,12 +34,12 @@ * @test * @key headful * @bug 4379403 - * @run main/othervm DumpOnKey false - * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true true - * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=true true - * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=true false - * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=true -Dawtdebug.on=false false - * @run main/othervm DumpOnKey -Dsun.awt.nativedebug=false -Dawtdebug.on=false false + * @run main/othervm ${test.main.class} false + * @run main/othervm -Dsun.awt.nativedebug=true ${test.main.class} true + * @run main/othervm -Dsun.awt.nativedebug=true -Dawtdebug.on=true ${test.main.class} true + * @run main/othervm -Dsun.awt.nativedebug=false -Dawtdebug.on=true ${test.main.class} false + * @run main/othervm -Dsun.awt.nativedebug=true -Dawtdebug.on=false ${test.main.class} false + * @run main/othervm -Dsun.awt.nativedebug=false -Dawtdebug.on=false ${test.main.class} false */ public final class DumpOnKey { diff --git a/test/jdk/jdk/jfr/startupargs/TestStartNoSettings.java b/test/jdk/jdk/jfr/startupargs/TestStartNoSettings.java index 61188f224e0c..001fd444f5d9 100644 --- a/test/jdk/jdk/jfr/startupargs/TestStartNoSettings.java +++ b/test/jdk/jdk/jfr/startupargs/TestStartNoSettings.java @@ -35,8 +35,7 @@ * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib - * @run main/othervm jdk.jfr.startupargs.TestStartNoSettings - * -XX:StartFlightRecording:settings=none + * @run main/othervm -XX:StartFlightRecording:settings=none ${test.main.class} */ public class TestStartNoSettings { diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java b/test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java index 9149c98aa4e5..55e230ae42b6 100644 --- a/test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java +++ b/test/jdk/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java @@ -26,7 +26,7 @@ * @bug 4748292 * @library /test/lib * @summary Prevent/Disable reverse name lookups with JSSE SSL sockets - * @run main/othervm ReverseNameLookup -Djava.net.preferIPv4Stack + * @run main/othervm -Djava.net.preferIPv4Stack ${test.main.class} * * SunJSSE does not support dynamic system properties, no way to re-use * system properties in samevm/agentvm mode. From 2f916127e3f83c3e35d7a86a272f63ae046a02ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Mon, 9 Nov 2026 13:18:50 +0000 Subject: [PATCH 049/110] 8387146: C2: Improve operands for byte array address expressions on x64 Reviewed-by: roland, thartmann --- src/hotspot/cpu/x86/x86.ad | 30 ++- .../compiler/c2/TestArrayAddressing.java | 181 ++++++++++++++++++ .../compiler/lib/ir_framework/IRNode.java | 5 + .../vm/compiler/ByteArrayAddressing.java | 63 ++++++ 4 files changed, 269 insertions(+), 10 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestArrayAddressing.java create mode 100644 test/micro/org/openjdk/bench/vm/compiler/ByteArrayAddressing.java diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad index 21d096eeb19b..860300096709 100644 --- a/src/hotspot/cpu/x86/x86.ad +++ b/src/hotspot/cpu/x86/x86.ad @@ -3956,6 +3956,18 @@ uint Matcher::vector_ideal_reg(int size) { return 0; } +static bool clone_conv(Node* conv, Matcher* matcher, Matcher::MStack& mstack, VectorSet& address_visited) { + if (conv->Opcode() == Op_ConvI2L && + conv->as_Type()->type()->is_long()->_lo >= 0 && + // Are there other uses besides address expressions? + !matcher->is_visited(conv)) { + address_visited.set(conv->_idx); // Flag as address_visited + mstack.push(conv->in(1), Matcher::Pre_Visit); + return true; + } + return false; +} + // Check for shift by small constant as well static bool clone_shift(Node* shift, Matcher* matcher, Matcher::MStack& mstack, VectorSet& address_visited) { if (shift->Opcode() == Op_LShiftX && shift->in(2)->is_Con() && @@ -3968,13 +3980,7 @@ static bool clone_shift(Node* shift, Matcher* matcher, Matcher::MStack& mstack, // Allow Matcher to match the rule which bypass // ConvI2L operation for an array index on LP64 // if the index value is positive. - if (conv->Opcode() == Op_ConvI2L && - conv->as_Type()->type()->is_long()->_lo >= 0 && - // Are there other uses besides address expressions? - !matcher->is_visited(conv)) { - address_visited.set(conv->_idx); // Flag as address_visited - mstack.push(conv->in(1), Matcher::Pre_Visit); - } else { + if (!clone_conv(conv, matcher, mstack, address_visited)) { mstack.push(conv, Matcher::Pre_Visit); } return true; @@ -4118,9 +4124,10 @@ bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, // Are there other uses besides address expressions? !is_visited(adr)) { address_visited.set(adr->_idx); // Flag as address_visited - Node *shift = adr->in(AddPNode::Offset); - if (!clone_shift(shift, this, mstack, address_visited)) { - mstack.push(shift, Pre_Visit); + Node *shift_or_conv = adr->in(AddPNode::Offset); + if (!clone_shift(shift_or_conv, this, mstack, address_visited) && + !clone_conv(shift_or_conv, this, mstack, address_visited)) { + mstack.push(shift_or_conv, Pre_Visit); } mstack.push(adr->in(AddPNode::Address), Pre_Visit); mstack.push(adr->in(AddPNode::Base), Pre_Visit); @@ -4133,6 +4140,9 @@ bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, mstack.push(m->in(AddPNode::Base), Pre_Visit); return true; } else if (clone_shift(off, this, mstack, address_visited)) { + // Note: clone_conv is intentionally not called here. + // x86 has no memory operand matching bare AddP(reg, ConvI2L(idx)) + // without a constant displacement. address_visited.test_set(m->_idx); // Flag as address_visited mstack.push(m->in(AddPNode::Address), Pre_Visit); mstack.push(m->in(AddPNode::Base), Pre_Visit); diff --git a/test/hotspot/jtreg/compiler/c2/TestArrayAddressing.java b/test/hotspot/jtreg/compiler/c2/TestArrayAddressing.java new file mode 100644 index 000000000000..c0d1f91e8d2b --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestArrayAddressing.java @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2026 IBM Corporation. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8387146 + * @summary Verify lower IR expectations for array addressing operations + * @modules java.base/jdk.internal.misc + * @library /test/lib / + * @run main/othervm --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ${test.main.class} + */ + +package compiler.c2; + +import compiler.lib.compile_framework.CompileFramework; +import compiler.lib.template_framework.Template; +import compiler.lib.template_framework.TemplateToken; +import compiler.lib.template_framework.library.CodeGenerationDataNameType; +import compiler.lib.template_framework.library.PrimitiveType; +import compiler.lib.template_framework.library.TestFrameworkClass; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import static compiler.lib.template_framework.Template.let; +import static compiler.lib.template_framework.Template.scope; +import static compiler.lib.template_framework.library.CodeGenerationDataNameType.booleans; +import static compiler.lib.template_framework.library.CodeGenerationDataNameType.bytes; +import static compiler.lib.template_framework.library.CodeGenerationDataNameType.chars; +import static compiler.lib.template_framework.library.CodeGenerationDataNameType.shorts; + +public class TestArrayAddressing { + public static void main(String[] args) { + // Create a new CompileFramework instance. + CompileFramework comp = new CompileFramework(); + + // Add a java source file. + comp.addJavaSourceCode("compiler.c2.templated.ArrayAddressing", generate(comp)); + + // Compile the source file. + comp.compile("--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED"); + + comp.invoke("compiler.c2.templated.ArrayAddressing", "main", new Object[] {new String[] { + "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED" + }}); + } + + private static String generate(CompileFramework comp) { + final List types = List.of(booleans(), bytes(), shorts(), chars()); + + final List tests = new ArrayList<>(); + tests.add(valueGenerator()); + for (PrimitiveType type : types) { + tests.add(new TestGenerator(type).generate()); + } + + // Create the test class, which runs all testTemplateTokens. + return TestFrameworkClass.render( + // package and class name. + "compiler.c2.templated", "ArrayAddressing", + // List of imports. + Set.of("compiler.lib.generators.*", + "java.util.Objects", + "jdk.internal.misc.Unsafe"), + // classpath, so the Test VM has access to the compiled class files. + comp.getEscapedClassPathOfCompiledClasses(), + // The list of tests. + tests); + } + + static TemplateToken valueGenerator() { + var template = Template.make(() -> scope( + """ + private static final Generator GEN_I = Generators.G.ints(); + private static final Unsafe UNSAFE = Unsafe.getUnsafe(); + """ + )); + return template.asToken(); + } + + record TestGenerator(PrimitiveType type) { + TemplateToken generate() { + var template = Template.make(() -> scope( + let("type", type.name()), + let("valueCast", type == CodeGenerationDataNameType.booleans() + ? "((GEN_I.next().intValue() & 1) == 0)" : "GEN_I.next().intValue()"), + let("returnType", type == CodeGenerationDataNameType.booleans() ? "boolean" : "int"), + let("op", type == CodeGenerationDataNameType.booleans() ? "&" : "+"), + let("uMethodName", "get" + type.name().substring(0, 1).toUpperCase() + type.name().substring(1)), + """ + @Setup + public static Object[] $setupOneArray() { + final #type[] arr = new #type[100]; + for (int i = 0; i < arr.length; i++) { + arr[i] = (#type) #valueCast; + } + return new Object[] {arr, 42}; + } + + @Test + @Arguments(setup = "$setupOneArray") + @IR(counts = {IRNode.X86_SCONV_I2L, "= 0"}, + applyIfPlatform = {"x64", "true"}, + phase = CompilePhase.MATCHING) + private static #type $test(#type[] arr, int i) { + return arr[i]; + } + + static volatile int $volatileField; + + @Test + @Arguments(setup = "$setupOneArray") + @IR(counts = {IRNode.X86_SCONV_I2L, "= 0"}, + applyIfPlatform = {"x64", "true"}, + phase = CompilePhase.MATCHING) + private static #returnType $testSameOffset(#type[] arr, int i) { + i = Integer.min(Integer.max(i, 0), 1000); + #type v = arr[i]; + $volatileField = 42; + return v #op arr[i]; + } + + @Test + @Arguments(setup = "$setupOneArray") + @IR(counts = {IRNode.X86_SCONV_I2L, "= 0"}, + applyIfPlatform = {"x64", "true"}, + phase = CompilePhase.MATCHING) + private static #returnType $testDifferentOffset(#type[] arr, int i) { + i = Integer.min(Integer.max(i, 0), 1000); + return arr[i] #op arr[i + 1]; + } + + private static final int $base = (int) UNSAFE.arrayBaseOffset(#type[].class); + + @Setup + public static Object[] $setupTwoArrays() { + final #type[] a = new #type[100]; + final #type[] b = new #type[100]; + for (int i = 0; i < a.length; i++) { + a[i] = (#type) #valueCast; + b[i] = (#type) #valueCast; + } + return new Object[] {a, b, $base + 42}; + } + + @Test + @Arguments(setup = "$setupTwoArrays") + @IR(counts = {IRNode.X86_SCONV_I2L, "= 1"}, + applyIfPlatform = {"x64", "true"}, + phase = CompilePhase.MATCHING) + private static #returnType $testUnsafe(#type[] a, #type b[], int offset) { + int checked = Objects.checkIndex(offset, 1000); + return UNSAFE.#uMethodName(a, checked) #op UNSAFE.#uMethodName(b, checked); + } + """ + )); + return template.asToken(); + } + } +} diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java index 54ee0a220169..a7dc8830677d 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java @@ -3152,6 +3152,11 @@ public static void anyStoreOfNodes(String irNodePlaceholder, String fieldHolder) machOnlyNameRegex(X86_SCONV_F2L, "convF2L_reg_reg"); } + public static final String X86_SCONV_I2L = PREFIX + "X86_SCONV_I2L" + POSTFIX; + static { + machOnlyNameRegex(X86_SCONV_I2L, "convI2L_reg_reg"); + } + public static final String X86_SCONV_D2I_AVX10_2 = PREFIX + "X86_SCONV_D2I_AVX10_2" + POSTFIX; static { machOnlyNameRegex(X86_SCONV_D2I_AVX10_2, "convD2I_(reg_reg|reg_mem)_avx10_2"); diff --git a/test/micro/org/openjdk/bench/vm/compiler/ByteArrayAddressing.java b/test/micro/org/openjdk/bench/vm/compiler/ByteArrayAddressing.java new file mode 100644 index 000000000000..6a631823c2f6 --- /dev/null +++ b/test/micro/org/openjdk/bench/vm/compiler/ByteArrayAddressing.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2026 IBM Corporation. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package org.openjdk.bench.vm.compiler; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; + +import java.util.Random; +import java.util.concurrent.TimeUnit; + +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.MICROSECONDS) +@Warmup(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS) +@Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) +@State(Scope.Thread) +@Fork(3) +public class ByteArrayAddressing { + int index; + + byte[] a; + + @Setup + public void init() { + index = 42; + a = new byte[100]; + } + + @Benchmark + public int test() { + int i = Integer.min(Integer.max(index, 0), 1000); + return a[i] + a[i + 1]; + } +} From 0296cb4898e7ee2eaa7356e64b414fad49ea8e16 Mon Sep 17 00:00:00 2001 From: Casper Norrbin Date: Mon, 9 Nov 2026 14:44:39 +0000 Subject: [PATCH 050/110] 8383383: Make the initial empty block of value classes PADDING Reviewed-by: matsaave, stefank --- .../share/classfile/fieldLayoutBuilder.cpp | 18 ++-- .../share/classfile/fieldLayoutBuilder.hpp | 4 +- .../ValueClassInitialPaddingTest.java | 98 +++++++++++++++++++ 3 files changed, 111 insertions(+), 9 deletions(-) create mode 100644 test/hotspot/jtreg/runtime/valhalla/valuetypes/field_layout/ValueClassInitialPaddingTest.java diff --git a/src/hotspot/share/classfile/fieldLayoutBuilder.cpp b/src/hotspot/share/classfile/fieldLayoutBuilder.cpp index d1414382d19e..050f5dfea5af 100644 --- a/src/hotspot/share/classfile/fieldLayoutBuilder.cpp +++ b/src/hotspot/share/classfile/fieldLayoutBuilder.cpp @@ -269,7 +269,7 @@ void FieldLayout::initialize_static_layout() { } } -void FieldLayout::initialize_instance_layout(const InstanceKlass* super_klass, bool& super_ends_with_oop) { +void FieldLayout::initialize_instance_layout(const InstanceKlass* super_klass, const bool is_value_compatible_class, bool& super_ends_with_oop) { if (super_klass == nullptr) { super_ends_with_oop = false; _blocks = new LayoutRawBlock(LayoutRawBlock::EMPTY, INT_MAX); @@ -279,7 +279,7 @@ void FieldLayout::initialize_instance_layout(const InstanceKlass* super_klass, b insert(first_empty_block(), new LayoutRawBlock(LayoutRawBlock::RESERVED, instanceOopDesc::base_offset_in_bytes())); } else { reconstruct_layout(super_klass, _super_has_nonstatic_fields, super_ends_with_oop); - fill_holes(super_klass); + fill_holes(super_klass, is_value_compatible_class); if ((!super_klass->has_contended_annotations()) || !_super_has_nonstatic_fields) { _start = _blocks; // start allocating fields from the first empty block } else { @@ -548,16 +548,19 @@ void FieldLayout::reconstruct_layout(const InstanceKlass* ik, bool& has_nonstati // This method handles classes with @Contended annotations differently // by inserting PADDING blocks instead of EMPTY block to prevent subclasses' // fields to interfere with contended fields/classes. -void FieldLayout::fill_holes(const InstanceKlass* super_klass) { +void FieldLayout::fill_holes(const InstanceKlass* super_klass, bool is_value_compatible_class) { assert(_blocks != nullptr, "Sanity check"); assert(_blocks->offset() == 0, "first block must be at offset zero"); - LayoutRawBlock::Kind filling_type = super_klass->has_contended_annotations() ? LayoutRawBlock::PADDING: LayoutRawBlock::EMPTY; + const bool super_is_contended = super_klass->has_contended_annotations(); LayoutRawBlock* b = _blocks; while (b->next_block() != nullptr) { if (b->next_block()->offset() > (b->offset() + b->size())) { int size = b->next_block()->offset() - (b->offset() + b->size()); - // FIXME it would be better if initial empty blocks were tagged as PADDING for value classes - // Tracked by JDK-8383383 + + const bool is_initial_value_padding = (b == _blocks) && is_value_compatible_class; + LayoutRawBlock::Kind filling_type = super_is_contended || is_initial_value_padding + ? LayoutRawBlock::PADDING : LayoutRawBlock::EMPTY; + LayoutRawBlock* empty = new LayoutRawBlock(filling_type, size); empty->set_offset(b->offset() + b->size()); empty->set_next_block(b->next_block()); @@ -841,7 +844,8 @@ FieldGroup* FieldLayoutBuilder::get_or_create_contended_group(int g) { void FieldLayoutBuilder::prologue() { _layout = new FieldLayout(_field_info, _value_field_info_array, _constant_pool); const InstanceKlass* super_klass = _super_klass; - _layout->initialize_instance_layout(super_klass, _super_ends_with_oop); + const bool is_value_compatible_class = _is_abstract_value || _is_concrete_value; + _layout->initialize_instance_layout(super_klass, is_value_compatible_class, _super_ends_with_oop); _nonstatic_oopmap_count = super_klass == nullptr ? 0 : super_klass->nonstatic_oop_map_count(); if (super_klass != nullptr) { _has_nonstatic_fields = super_klass->has_nonstatic_fields(); diff --git a/src/hotspot/share/classfile/fieldLayoutBuilder.hpp b/src/hotspot/share/classfile/fieldLayoutBuilder.hpp index c6bbccbcebe3..190385fa3781 100644 --- a/src/hotspot/share/classfile/fieldLayoutBuilder.hpp +++ b/src/hotspot/share/classfile/fieldLayoutBuilder.hpp @@ -202,7 +202,7 @@ class FieldLayout : public ResourceObj { public: FieldLayout(GrowableArray* field_info, Array* value_field_info_array, ConstantPool* cp); void initialize_static_layout(); - void initialize_instance_layout(const InstanceKlass* ik, bool& super_ends_with_oop); + void initialize_instance_layout(const InstanceKlass* ik, const bool is_value_compatible_class, bool& super_ends_with_oop); LayoutRawBlock* first_empty_block() { LayoutRawBlock* block = _start; @@ -239,7 +239,7 @@ class FieldLayout : public ResourceObj { void add_contiguously(GrowableArray* list, LayoutRawBlock* start = nullptr); LayoutRawBlock* insert_field_block(LayoutRawBlock* slot, LayoutRawBlock* block); void reconstruct_layout(const InstanceKlass* ik, bool& has_nonstatic_fields, bool& ends_with_oop); - void fill_holes(const InstanceKlass* ik); + void fill_holes(const InstanceKlass* ik, bool is_value_compatible_class); LayoutRawBlock* insert(LayoutRawBlock* slot, LayoutRawBlock* block); void remove(LayoutRawBlock* block); void shift_fields(int shift); diff --git a/test/hotspot/jtreg/runtime/valhalla/valuetypes/field_layout/ValueClassInitialPaddingTest.java b/test/hotspot/jtreg/runtime/valhalla/valuetypes/field_layout/ValueClassInitialPaddingTest.java new file mode 100644 index 000000000000..fc1197b7b7a4 --- /dev/null +++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/field_layout/ValueClassInitialPaddingTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @summary Verify that value subclasses preserve initial padding and identity subclasses reuse it + * @requires vm.bits == 64 + * @requires vm.flagless + * @enablePreview + * @library /test/lib + * @run driver runtime.valhalla.valuetypes.field_layout.ValueClassInitialPaddingTest + */ + +package runtime.valhalla.valuetypes.field_layout; + +import java.util.regex.Pattern; + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +public class ValueClassInitialPaddingTest { + static abstract value class AbstractValue { + byte b = 0; + } + + static abstract value class AbstractMiddle extends AbstractValue {} + + static value class ConcreteValue extends AbstractMiddle { + int i = 0; + } + + static class IdentityMiddle extends AbstractValue {} + + static class IdentityLeaf extends IdentityMiddle { + int i; + } + + static class IdentityMiddleWithField extends AbstractValue { + int middleField; + } + + static class IdentityLeafWithField extends IdentityMiddleWithField {} + + static class TestMain { + public static void main(String[] args) { + new ConcreteValue(); + new IdentityLeaf(); + new IdentityLeafWithField(); + } + } + + static void checkInitialLayout(OutputAnalyzer output, Class klass, String initialBlock) { + String className = klass.getName().replace('.', '/'); + output.shouldMatch("Layout of class " + Pattern.quote(className) + + "@.*\\RInstance fields:" + + "\\R @0 RESERVED 12/-" + + "\\R @12 " + Pattern.quote(initialBlock) + + "\\R @16 INHERITED 1/1 \"b\" B"); + } + + public static void main(String[] args) throws Exception { + ProcessBuilder process = ProcessTools.createLimitedTestJavaProcessBuilder( + "--enable-preview", + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+PrintFieldLayout", + "-XX:-UseCompactObjectHeaders", + TestMain.class.getName()); + OutputAnalyzer output = new OutputAnalyzer(process.start()); + output.shouldHaveExitValue(0); + + checkInitialLayout(output, AbstractMiddle.class, "PADDING 4/1"); + checkInitialLayout(output, ConcreteValue.class, "PADDING 4/1"); + checkInitialLayout(output, IdentityMiddle.class, "EMPTY 4/1"); + checkInitialLayout(output, IdentityLeaf.class, "REGULAR 4/4 \"i\" I"); + checkInitialLayout(output, IdentityMiddleWithField.class, "REGULAR 4/4 \"middleField\" I"); + checkInitialLayout(output, IdentityLeafWithField.class, "INHERITED 4/4 \"middleField\" I"); + } +} From fe08d71428195fb19d51b5acab37da12369d0a6d Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Mon, 9 Nov 2026 15:21:04 +0000 Subject: [PATCH 051/110] 8396910: RISC-V: Sign-extend the BigInteger mulAdd intrinsic result Reviewed-by: dzhang, ayang, fyang --- .../cpu/riscv/macroAssembler_riscv.cpp | 1 + .../c2/riscv64/TestMulAddSignExtension.java | 98 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 test/hotspot/jtreg/compiler/c2/riscv64/TestMulAddSignExtension.java diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp index 0177288a0770..bb70a3e8f895 100644 --- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp @@ -6164,6 +6164,7 @@ void MacroAssembler::mul_add(Register out, Register in, Register offset, j(L_tail_loop); bind(L_end); + sext(out, out, 32); } // Multiply and multiply-accumulate unsigned 64-bit registers. diff --git a/test/hotspot/jtreg/compiler/c2/riscv64/TestMulAddSignExtension.java b/test/hotspot/jtreg/compiler/c2/riscv64/TestMulAddSignExtension.java new file mode 100644 index 000000000000..62ff4cad54d1 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/riscv64/TestMulAddSignExtension.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2026, Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8396910 + * @summary Verify that the BigInteger mulAdd intrinsic sign-extends its integer return value + * @requires os.arch == "riscv64" & vm.compiler2.enabled + * @modules java.base/java.math:open + * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CompileThreshold=1000 + * -XX:+UnlockDiagnosticVMOptions -XX:+UseMulAddIntrinsic + * -XX:CompileCommand=compileonly,compiler.c2.riscv64.TestMulAddSignExtension::testCarry + * compiler.c2.riscv64.TestMulAddSignExtension + */ + +package compiler.c2.riscv64; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.math.BigInteger; +import java.util.Arrays; + +public class TestMulAddSignExtension { + private static final MethodHandle MUL_ADD; + + static { + try { + MUL_ADD = MethodHandles.privateLookupIn(BigInteger.class, MethodHandles.lookup()) + .findStatic(BigInteger.class, "implMulAdd", + MethodType.methodType(int.class, int[].class, int[].class, + int.class, int.class, int.class)); + } catch (ReflectiveOperationException e) { + throw new ExceptionInInitializerError(e); + } + } + + private static void testCarry(int[] out, int[] in, int len, int k, int expected) throws Throwable { + int carry = (int) MUL_ADD.invokeExact(out, in, 0, len, k); + // Compare before a spill or a Java call can normalize the intrinsic result. + if (carry != expected) { + throw new RuntimeException("Unexpected carry for length " + len + " and multiplier " + k); + } + } + + public static void main(String[] args) throws Throwable { + // The RISC-V intrinsic processes 8 elements per unrolled iteration. + // Cover empty input, one element, and lengths around the 8- and 16-element boundaries. + int[] lengths = {0, 1, 7, 8, 9, 15, 16, 17}; + int[] in = new int[17]; + int[] out = new int[17]; + // Each input element is treated as unsigned 0xFFFFFFFF, not signed -1. + Arrays.fill(in, -1); + + // Warm up past the C2 compilation threshold, then keep checking compiled code. + for (int i = 0; i < 2_000; i++) { + for (int len : lengths) { + // Reset out before each call because mulAdd updates it in place. + // Zero length always returns zero carry. + // Unsigned 0xFFFFFFFF * 0xFFFFFFFF gives carry 0xFFFFFFFE (int -2). + Arrays.fill(out, 0); + testCarry(out, in, len, -1, len == 0 ? 0 : -2); + + // Unsigned multiplier 0x80000000 gives carry 0x7FFFFFFF: a positive control. + Arrays.fill(out, 0); + testCarry(out, in, len, Integer.MIN_VALUE, len == 0 ? 0 : Integer.MAX_VALUE); + + // Adding existing output 0xFFFFFFFF raises the carry to 0xFFFFFFFF (int -1). + Arrays.fill(out, -1); + testCarry(out, in, len, -1, len == 0 ? 0 : -1); + + // With zero multiplier and zero output, the carry stays zero. + Arrays.fill(out, 0); + testCarry(out, in, len, 0, 0); + } + } + } +} From 065fbaead6ad0049bb4f70d17cb1c18180227531 Mon Sep 17 00:00:00 2001 From: Jorn Vernee Date: Mon, 9 Nov 2026 18:03:10 +0000 Subject: [PATCH 052/110] 8395823: tools/jar/JarEntryTime.java fails on DST fall-back day when a derived timestamp lands in the overlap hour Reviewed-by: lancea --- test/jdk/tools/jar/JarEntryTime.java | 81 ++++++++++------------------ 1 file changed, 27 insertions(+), 54 deletions(-) diff --git a/test/jdk/tools/jar/JarEntryTime.java b/test/jdk/tools/jar/JarEntryTime.java index 4d84547d0747..b0b2f4f3cb46 100644 --- a/test/jdk/tools/jar/JarEntryTime.java +++ b/test/jdk/tools/jar/JarEntryTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,33 +23,25 @@ /** * @test - * @bug 4225317 6969651 8277422 + * @bug 4225317 6969651 8277422 8395823 * @modules jdk.jartool + * @library /test/lib * @summary Check extracted files have date as per those in the .jar file */ +import jdk.test.lib.JDKToolLauncher; +import jdk.test.lib.process.ProcessTools; + import java.io.File; import java.io.PrintWriter; import java.nio.file.attribute.FileTime; -import java.time.ZoneId; -import java.util.Date; -import java.util.TimeZone; -import java.util.spi.ToolProvider; +import java.util.stream.Stream; public class JarEntryTime { - static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar") - .orElseThrow(() -> - new RuntimeException("jar tool not found") - ); - - // ZipEntry's mod date has 2 seconds precision: give extra time to // allow for e.g. rounding/truncation and networked/samba drives. static final long PRECISION = 10000L; - static final TimeZone TZ = TimeZone.getDefault(); - static final boolean DST = TZ.inDaylightTime(new Date()); - static boolean cleanup(File dir) throws Throwable { boolean rc = true; File[] x = dir.listFiles(); @@ -62,23 +54,27 @@ static boolean cleanup(File dir) throws Throwable { } static void extractJar(File jarFile, boolean useExtractionTime) throws Throwable { - String javahome = System.getProperty("java.home"); - String jarcmd = javahome + File.separator + "bin" + File.separator + "jar"; - String[] args; + jar(useExtractionTime, "xf", jarFile.getName()); + } + + static void createJar(File jarFile, File dirOuter) throws Throwable { + jar(false, "cf", jarFile.getName(), dirOuter.getName()); + } + + private static void jar(boolean useExtractionTime, String... args) throws Throwable { + JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jar"); + // The ZIP file local timestamp format cannot be unambiguously + // translated to "milliseconds since epoch" on systems with a timezone + // that has daylight savings time. Explicitly set the timezone + // to UTC, which doesn't have DST, to avoid issues with the timestamp + // comparisons in this test when the test is run around the time + // of a DST change. + launcher.addVMArg("-Duser.timezone=UTC"); if (useExtractionTime) { - args = new String[] { - jarcmd, - "-J-Dsun.tools.jar.useExtractionTime=true", - "xf", - jarFile.getName() }; - } else { - args = new String[] { - jarcmd, - "xf", - jarFile.getName() }; + launcher.addVMArg("-Dsun.tools.jar.useExtractionTime=true"); } - Process p = Runtime.getRuntime().exec(args); - check(p != null && (p.waitFor() == 0)); + Stream.of(args).forEach(launcher::addToolArg); + ProcessTools.executeCommand(launcher.getCommand()).shouldHaveExitValue(0); } public static void realMain(String[] args) throws Throwable { @@ -94,14 +90,6 @@ public static void realMain(String[] args) throws Throwable { jarFile.delete(); testFile.delete(); - var date = new Date(); - var defZone = ZoneId.systemDefault(); - if (defZone.getRules().getTransition( - date.toInstant().atZone(defZone).toLocalDateTime()) != null) { - System.out.println("At the offset transition. JarEntryTime test skipped."); - return; - } - /* Create a directory structure * outer/ * inner/ @@ -128,8 +116,7 @@ public static void realMain(String[] args) throws Throwable { check(fileInner.setLastModified(earlier)); // Make a jar file from that directory structure - check(JAR_TOOL.run(System.out, System.err, - "cf", jarFile.getName(), dirOuter.getName()) == 0); + createJar(jarFile, dirOuter); check(jarFile.exists()); check(cleanup(dirInner)); @@ -176,10 +163,6 @@ public static void realMain(String[] args) throws Throwable { } static void checkFileTime(long now, long original) { - if (isTimeSettingChanged()) { - return; - } - if (Math.abs(now - original) > PRECISION) { System.out.format("Extracted to %s, expected to be close to %s%n", FileTime.fromMillis(now), FileTime.fromMillis(original)); @@ -188,10 +171,6 @@ static void checkFileTime(long now, long original) { } static void checkFileTime(long start, long now, long end) { - if (isTimeSettingChanged()) { - return; - } - if (now < start || now > end) { System.out.format("Extracted to %s, " + "expected to be after %s and before %s%n", @@ -202,12 +181,6 @@ static void checkFileTime(long start, long now, long end) { } } - private static boolean isTimeSettingChanged() { - TimeZone currentTZ = TimeZone.getDefault(); - boolean currentDST = currentTZ.inDaylightTime(new Date()); - return (!currentTZ.equals(TZ) || currentDST != DST); - } - //--------------------- Infrastructure --------------------------- static volatile int passed = 0, failed = 0; static void pass() {passed++;} From 8f2d9609ff8678922a8d7fd53c605865774bfbf8 Mon Sep 17 00:00:00 2001 From: Shiv Shah Date: Mon, 9 Nov 2026 19:09:08 +0000 Subject: [PATCH 053/110] 8395813: jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java fails with -XX:CompileThresholdScaling=0.01 Reviewed-by: dholmes, jbechberger --- .../jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java index ef2c73514a3c..9b8437486415 100644 --- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java +++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java @@ -38,6 +38,7 @@ /** * @test * @requires vm.hasJFR & os.family == "linux" + * @requires vm.opt.CompileThresholdScaling == null & vm.opt.CompileThreshold == null * @library /test/lib * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleThrottling */ @@ -76,8 +77,6 @@ float rate() { *

* The result is wall-clock independent; it only records the CPU-time and the number of * emitted events. The result, therefore, does not depend on the load of the machine. - * And because failed events are counted too, the result is not affected by the thread - * doing other in-JVM work (like garbage collection). */ private static EventCount countEvents(int timeMs, String throttle) throws Exception { try (Recording recording = new Recording()) { From 0b9e390558142f054ef5ab449f52b94453e2f621 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Mon, 9 Nov 2026 23:26:44 +0000 Subject: [PATCH 054/110] 8396972: TestAOTLocalDateTime fails sporadically with regex mismatch on (AP4) vs (A4) Reviewed-by: iklam --- .../jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java index 2461281a3779..20a1c63e8fd9 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/TestAOTLocalDateTime.java @@ -212,7 +212,8 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception out.shouldMatch("aot,codecache,exit.*\\s+AOT code cache size: [1-9]\\d+ bytes"); } else if (runMode == RunMode.PRODUCTION) { if (compTier == 4) { - out.shouldMatch("aot,codecache,nmethod.*\\(A4\\).*LocalDate.*create.*Loaded nmethod from AOT Code Cache"); + // AP4 may transition directly to JIT level 4. As result, A4 may not be loaded. Check both cases. + out.shouldMatch("aot,codecache,nmethod.*\\(AP?4\\).*LocalDate.*create.*Loaded nmethod from AOT Code Cache"); } /* In production run VM may request Tier 2 compilation before * TrainingReplayThread can process class init dependencies. From 7b9ad65629c458acaa269e6b83c4a4fc9f8b1126 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 9 Nov 2026 23:58:25 +0000 Subject: [PATCH 055/110] 8396919: C2: Keep LShift test reference calculations interpreted Reviewed-by: gli, qamai --- .../jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java | 1 + .../jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java | 1 + 2 files changed, 2 insertions(+) diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java index 1cd200379b80..3a2797767881 100644 --- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java +++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java @@ -104,6 +104,7 @@ public void runMethod() { assertResult(max, max); } + @DontCompile private void assertResult(int a, int b) { otherInput = b; Asserts.assertEQ(((a >> 4) & b) << 4, testLShiftOfAndOfRShiftSameCon(a)); diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java index 0ee8bf277e06..13e91b918df2 100644 --- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java +++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java @@ -102,6 +102,7 @@ public void runMethod() { assertResult(max, max); } + @DontCompile private void assertResult(long a, long b) { otherInput = b; Asserts.assertEQ(((a >> 4) & b) << 4, testLShiftOfAndOfRShiftSameCon(a)); From e54645830784ab23f48241bc3bb751dc8b3a7e18 Mon Sep 17 00:00:00 2001 From: Lijuan Li Date: Tue, 10 Nov 2026 00:39:08 +0000 Subject: [PATCH 056/110] 8350085: RISC-V: Enable upper GPR registers in C1 Reviewed-by: fyang, dzhang --- src/hotspot/cpu/riscv/c1_Defs_riscv.hpp | 6 +++--- src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp | 20 ++++++++++++++----- src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp | 8 ++++---- src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp | 10 ++-------- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp index 6c93ce14ef0c..4f82534f143c 100644 --- a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp +++ b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -38,11 +38,11 @@ enum { pd_nof_fpu_regs_frame_map = FloatRegister::number_of_registers, // number of float registers used during code emission // caller saved - pd_nof_caller_save_cpu_regs_frame_map = 13, // number of registers killed by calls + pd_nof_caller_save_cpu_regs_frame_map = 22, // number of registers killed by calls pd_nof_caller_save_fpu_regs_frame_map = 32, // number of float registers killed by calls pd_first_callee_saved_reg = pd_nof_caller_save_cpu_regs_frame_map, - pd_last_callee_saved_reg = 21, + pd_last_callee_saved_reg = pd_first_callee_saved_reg - 1, // in fact, no callee saved regs pd_last_allocatable_cpu_reg = pd_nof_caller_save_cpu_regs_frame_map - 1, diff --git a/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp index b3a0b261f54f..b0e4396f5d8e 100644 --- a/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp +++ b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -183,10 +183,13 @@ LIR_Opr FrameMap::_caller_save_fpu_regs[] = {}; // |---x2---| // |---x1---| // |---x0---| -// |---x26--|<---pd_last_callee_saved_reg +// |---x26--| +// |---x25--| +// |---x24--| +// |---x22--| // |---..---| // |---x18--| -// |---x9---|<---pd_first_callee_saved_reg +// |---x9---| // |---x31--| // |---..---| // |---x28--| @@ -214,8 +217,6 @@ void FrameMap::initialize() { map_register(i, x29); r29_opr = LIR_OprFact::single_cpu(i); i++; map_register(i, x30); r30_opr = LIR_OprFact::single_cpu(i); i++; map_register(i, x31); r31_opr = LIR_OprFact::single_cpu(i); i++; - - // callee save register map_register(i, x9); r9_opr = LIR_OprFact::single_cpu(i); i++; map_register(i, x18); r18_opr = LIR_OprFact::single_cpu(i); i++; map_register(i, x19); r19_opr = LIR_OprFact::single_cpu(i); i++; @@ -265,6 +266,15 @@ void FrameMap::initialize() { _caller_save_cpu_regs[i++] = r29_opr; _caller_save_cpu_regs[i++] = r30_opr; _caller_save_cpu_regs[i++] = r31_opr; + _caller_save_cpu_regs[i++] = r9_opr; + _caller_save_cpu_regs[i++] = r18_opr; + _caller_save_cpu_regs[i++] = r19_opr; + _caller_save_cpu_regs[i++] = r20_opr; + _caller_save_cpu_regs[i++] = r21_opr; + _caller_save_cpu_regs[i++] = r22_opr; + _caller_save_cpu_regs[i++] = r24_opr; + _caller_save_cpu_regs[i++] = r25_opr; + _caller_save_cpu_regs[i++] = r26_opr; _init_done = true; diff --git a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp index d7ca7b0fd052..554c8495e7d0 100644 --- a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp +++ b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,10 +42,10 @@ inline bool LinearScan::requires_adjacent_regs(BasicType type) { inline bool LinearScan::is_caller_save(int assigned_reg) { assert(assigned_reg >= 0 && assigned_reg < nof_regs, "should call this only for registers"); - if (assigned_reg < pd_first_callee_saved_reg) { + if (assigned_reg < FrameMap::nof_caller_save_cpu_regs()) { return true; } - if (assigned_reg > pd_last_callee_saved_reg && assigned_reg < pd_first_callee_saved_fpu_reg_1) { + if (assigned_reg >= pd_first_fpu_reg && assigned_reg < pd_first_callee_saved_fpu_reg_1) { return true; } if (assigned_reg > pd_last_callee_saved_fpu_reg_1 && assigned_reg < pd_first_callee_saved_fpu_reg_2) { @@ -74,7 +74,7 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) } else if (cur->type() == T_INT || cur->type() == T_LONG || cur->type() == T_OBJECT || cur->type() == T_ADDRESS || cur->type() == T_METADATA) { _first_reg = pd_first_cpu_reg; - _last_reg = pd_last_allocatable_cpu_reg; + _last_reg = FrameMap::last_cpu_reg(); return true; } return false; diff --git a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp index 30627b21055c..2e01f348aa14 100644 --- a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp +++ b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp @@ -262,14 +262,8 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) { OopMap* oop_map = new OopMap(frame_size_in_slots, 0); assert_cond(oop_map != nullptr); - // caller save registers only, see FrameMap::initialize - // in c1_FrameMap_riscv.cpp for detail. - const static Register caller_save_cpu_regs[FrameMap::max_nof_caller_save_cpu_regs] = { - x7, x10, x11, x12, x13, x14, x15, x16, x17, x28, x29, x30, x31 - }; - - for (int i = 0; i < FrameMap::max_nof_caller_save_cpu_regs; i++) { - Register r = caller_save_cpu_regs[i]; + for (int i = 0; i < FrameMap::nof_caller_save_cpu_regs(); i++) { + Register r = FrameMap::caller_save_cpu_reg_at(i)->as_register(); int sp_offset = cpu_reg_save_offsets[r->encoding()]; oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset), r->as_VMReg()); From 9d18722449d7c1b4f64a37089d22b26a1c49c717 Mon Sep 17 00:00:00 2001 From: Kuai Wei Date: Tue, 10 Nov 2026 02:06:23 +0000 Subject: [PATCH 057/110] 8396865: AArch64: assert(_num_regs == reg || !_num_regs) failed with Long.expand Reviewed-by: qamai, aph, gli --- src/hotspot/cpu/aarch64/aarch64.ad | 2 +- .../c2/aarch64/TestLongExpandCrash.java | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/c2/aarch64/TestLongExpandCrash.java diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad index 0a4b2d479ae5..6880f2bb5a63 100644 --- a/src/hotspot/cpu/aarch64/aarch64.ad +++ b/src/hotspot/cpu/aarch64/aarch64.ad @@ -16522,7 +16522,7 @@ instruct expandBitsL_reg(iRegLNoSp dst, iRegL src, iRegL mask, %} -instruct expandBitsL_memcon(iRegINoSp dst, memory8 mem, immL mask, +instruct expandBitsL_memcon(iRegLNoSp dst, memory8 mem, immL mask, vRegF tdst, vRegF tsrc, vRegF tmask) %{ match(Set dst (ExpandBits (LoadL mem) mask)); effect(TEMP tdst, TEMP tsrc, TEMP tmask); diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestLongExpandCrash.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestLongExpandCrash.java new file mode 100644 index 000000000000..acd735c348fb --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestLongExpandCrash.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2026, Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8396865 + * @summary assert(_num_regs == reg || !_num_regs) failed with Long.expand on aarch64 + * @requires os.arch == "aarch64" & vm.compiler2.enabled & + * vm.cpu.features ~= ".*sve2.*" & vm.cpu.features ~= ".*svebitperm.*" + * @library /test/lib + * @run main/othervm -Xcomp -XX:-TieredCompilation + * -XX:CompileOnly=compiler.c2.aarch64.TestLongExpandCrash::test + * ${test.main.class} + */ + +package compiler.c2.aarch64; + +import jdk.test.lib.Asserts; + +public class TestLongExpandCrash { + private static final long MASK = 0x0F0F0F0F0F0F0F0FL; + private static final long[] arr = new long[64]; + private static final long[] masks = new long[16]; + + // C2 will match expandBitsL_memcon/expandBitsL_reg rules in adfile + static long test(int i, boolean constMask) { + return constMask ? Long.expand(arr[i & 63], MASK) + : Long.expand(arr[i & 63], masks[i & 15]); + } + + public static void main(String[] args) { + for (int i = 0; i < arr.length; i++) { + arr[i] = 0x0123456789ABCDEFL + i; + } + for (int i = 0; i < masks.length; i++) { + masks[i] = 0x00FF00FF00FF00FFL; + } + + long expectedConst = Long.expand(arr[0], MASK); + long expectedVar = Long.expand(arr[1], masks[1]); + + Asserts.assertEquals(test(0, true), expectedConst, "const mask"); + Asserts.assertEquals(test(1, false), expectedVar, "var mask"); + } +} From 9c171524ccd509bfccbac02a272c8e9f68ed2e63 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Tue, 10 Nov 2026 02:31:26 +0000 Subject: [PATCH 058/110] 8396901: RISC-V: Eliminate redundant sign extensions after masking Reviewed-by: fyang, gcao --- src/hotspot/cpu/riscv/riscv.ad | 16 +++ src/hotspot/cpu/riscv/riscv_b.ad | 14 +++ .../c2/riscv64/TestMaskedWidening.java | 104 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 test/hotspot/jtreg/compiler/c2/riscv64/TestMaskedWidening.java diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad index bb9d0e676762..4a01ad9b200b 100644 --- a/src/hotspot/cpu/riscv/riscv.ad +++ b/src/hotspot/cpu/riscv/riscv.ad @@ -8998,6 +8998,22 @@ instruct convI2L_reg_reg(iRegLNoSp dst, iRegIorL2I src) ins_pipe(ialu_reg); %} +// AND preserves the canonical sign extension of an int register. +instruct convI2L_andI_reg_imm(iRegLNoSp dst, iRegI src, immI_simm12 mask) %{ + match(Set dst (ConvI2L (AndI src mask))); + + ins_cost(ALU_COST); + format %{ "andi $dst, $src, $mask\t#@convI2L_andI_reg_imm" %} + + ins_encode %{ + __ andi(as_Register($dst$$reg), + as_Register($src$$reg), + (int32_t)($mask$$constant)); + %} + + ins_pipe(ialu_reg_imm); +%} + // Fused int-producer + ConvI2L rules. instruct convI2L_addI_reg_reg(iRegLNoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{ match(Set dst (ConvI2L (AddI src1 src2))); diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad index a4be56cb069e..f0e07e67fd66 100644 --- a/src/hotspot/cpu/riscv/riscv_b.ad +++ b/src/hotspot/cpu/riscv/riscv_b.ad @@ -171,6 +171,20 @@ instruct convS2UI_reg_reg_b(iRegINoSp dst, iRegIorL2I src, immI_16bits mask) %{ ins_pipe(ialu_reg); %} +instruct convI2L_andI_16bits_b(iRegLNoSp dst, iRegI src, immI_16bits mask) %{ + predicate(UseZbb); + match(Set dst (ConvI2L (AndI src mask))); + + format %{ "zext.h $dst, $src\t#@convI2L_andI_16bits_b" %} + + ins_cost(ALU_COST); + ins_encode %{ + __ zext_h(as_Register($dst$$reg), as_Register($src$$reg)); + %} + + ins_pipe(ialu_reg); +%} + // int to unsigned long (zero extend) instruct convI2UL_reg_reg_b(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask) %{ predicate(UseZba); diff --git a/test/hotspot/jtreg/compiler/c2/riscv64/TestMaskedWidening.java b/test/hotspot/jtreg/compiler/c2/riscv64/TestMaskedWidening.java new file mode 100644 index 000000000000..d3424f7f3842 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/riscv64/TestMaskedWidening.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2026, Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test id=zbb + * @summary Test that int-to-long conversions of masked ints are not sign extended + * @library /test/lib / + * @requires os.arch == "riscv64" & vm.compiler2.enabled + * @requires vm.cpu.features ~= ".*zbb.*" + * @run driver compiler.c2.riscv64.TestMaskedWidening -XX:+UseZbb + */ + +/* + * @test id=no-zbb + * @summary Test that int-to-long conversions of masked ints are not sign extended + * @library /test/lib / + * @requires os.arch == "riscv64" & vm.compiler2.enabled + * @run driver compiler.c2.riscv64.TestMaskedWidening -XX:-UseZbb + */ + +package compiler.c2.riscv64; + +import compiler.lib.ir_framework.CompilePhase; +import compiler.lib.ir_framework.DontCompile; +import compiler.lib.ir_framework.IR; +import compiler.lib.ir_framework.Run; +import compiler.lib.ir_framework.Test; +import compiler.lib.ir_framework.TestFramework; +import jdk.test.lib.Asserts; + +public class TestMaskedWidening { + private static final String I2L = "convI2L_reg_reg"; + private static final String I2L_ANDI = "convI2L_andI_reg_imm"; + private static final String I2L_ZEXT_H = "convI2L_andI_16bits_b"; + + private static final int[] VALUES = { + 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE, + 0x40000000, 0x80000001, 0x55555555, 0xaaaaaaaa + }; + + public static void main(String[] args) { + TestFramework.runWithFlags(args); + } + + @Test + @IR(counts = {I2L_ANDI, "1"}, failOn = {I2L}, phase = CompilePhase.FINAL_CODE) + static long maskImmediate(int value) { + return (long) (value & 0x7ff); + } + + @Test + @IR(counts = {I2L_ANDI, "1"}, failOn = {I2L}, phase = CompilePhase.FINAL_CODE) + static long maskNegativeImmediate(int value) { + return (long) (value & -2048); + } + + @Test + @IR(counts = {I2L, "1"}, failOn = {I2L_ANDI}, phase = CompilePhase.FINAL_CODE) + static long maskOutOfRangeImmediate(int value) { + return (long) (value & 0xfff); + } + + @Test + @IR(counts = {I2L_ZEXT_H, "1"}, failOn = {I2L}, + applyIf = {"UseZbb", "true"}, phase = CompilePhase.FINAL_CODE) + static long maskShort(int value) { + return (long) (value & 0xffff); + } + + @Run(test = {"maskImmediate", "maskNegativeImmediate", "maskOutOfRangeImmediate", "maskShort"}) + static void runTests() { + for (int value : VALUES) { + verify(value); + } + } + + @DontCompile + static void verify(int value) { + Asserts.assertEQ(maskImmediate(value), (long) (value & 0x7ff)); + Asserts.assertEQ(maskNegativeImmediate(value), (long) (value & -2048)); + Asserts.assertEQ(maskOutOfRangeImmediate(value), (long) (value & 0xfff)); + Asserts.assertEQ(maskShort(value), (long) (value & 0xffff)); + } +} From 7f9a2c57a37980c1cd560d0d9578675ef075fc37 Mon Sep 17 00:00:00 2001 From: Shiv Shah Date: Tue, 10 Nov 2026 04:09:05 +0000 Subject: [PATCH 059/110] 8391440: Test vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java failed: Unexpected VM_DEATH event received: 99 (expected: 2) Co-authored-by: Chris Plummer Reviewed-by: pchilanomate, sspitsyn --- .../templateInterpreterGenerator_aarch64.cpp | 25 ++-- .../arm/templateInterpreterGenerator_arm.cpp | 4 + .../ppc/templateInterpreterGenerator_ppc.cpp | 14 ++- .../templateInterpreterGenerator_riscv.cpp | 25 ++-- .../templateInterpreterGenerator_s390.cpp | 19 +-- .../x86/templateInterpreterGenerator_x86.cpp | 30 +++-- src/hotspot/cpu/zero/zeroInterpreter_zero.cpp | 4 + .../share/interpreter/interpreterRuntime.cpp | 18 +-- .../share/interpreter/interpreterRuntime.hpp | 1 + .../share/interpreter/templateInterpreter.cpp | 3 +- .../share/interpreter/templateInterpreter.hpp | 4 +- .../templateInterpreterGenerator.cpp | 6 +- .../templateInterpreterGenerator.hpp | 3 +- .../interpreter/zero/zeroInterpreter.hpp | 1 + src/hotspot/share/prims/jvmtiEnvBase.cpp | 34 ++++- .../share/runtime/continuationFreezeThaw.cpp | 67 ++++++++++ test/hotspot/jtreg/ProblemList-Virtual.txt | 8 +- test/hotspot/jtreg/ProblemList.txt | 4 + test/hotspot/jtreg/TEST.quick-groups | 3 +- .../java/lang/invoke/MethodHandleHelper.java | 5 + .../PopFrameMethodNameInvariantTest.java | 117 ++++++++++++++++-- .../StackFrame/PopFrames/popframes001.java | 50 ++++++-- .../StackFrame/PopFrames/popframes001a.java | 84 +++++++++++-- .../popframes002/TestDescription.java | 80 ++++++++++++ .../popframes003/TestDescription.java | 88 +++++++++++++ 25 files changed, 614 insertions(+), 83 deletions(-) create mode 100644 test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java create mode 100644 test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes003/TestDescription.java diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp index 57e2cdc7107f..eb12ab6c88dc 100644 --- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp @@ -550,6 +550,16 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, return entry; } +// Continuation entry for an interpreted frame thawed after its callee was +// popped by JVMTI PopFrame. +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + address entry = __ pc(); + // We reuse the deopt entry with step=0, which restores the interpreter + // state and reexecutes the invoke. + __ jump_to_entry(Interpreter::deopt_entry(vtos, 0)); + return entry; +} + address TemplateInterpreterGenerator::generate_result_handler_for( BasicType type) { address entry = __ pc(); @@ -1880,16 +1890,17 @@ void TemplateInterpreterGenerator::generate_throw_exception() { __ strw(r3, Address(rthread, JavaThread::popframe_condition_offset())); { - // Check to see whether we are returning to a deoptimized frame. - // (The PopFrame call ensures that the caller of the popped frame is - // either interpreted or compiled and deoptimizes it if compiled.) - // In this case, we can't call dispatch_next() after the frame is - // popped, but instead must save the incoming arguments and restore - // them after deoptimization has occurred. + // Check to see whether we are returning to a deoptimized frame or + // into the continuation return barrier (the PopFrame call ensures that + // the caller of the popped frame is either interpreted or compiled and + // deoptimizes it if compiled). In both cases, we can't call dispatch_next() + // after the frame is popped, but instead must save the incoming arguments + // and restore them after deoptimization or thaw has occurred. // // Note that we don't compare the return PC against the // deoptimization blob's unpack entry because of the presence of - // adapter frames in C2. + // adapter frames in C2. Checking for an interpreter return PC covers + // the return barrier as well. Label caller_not_deoptimized; __ ldr(c_rarg1, Address(rfp, frame::return_addr_offset * wordSize)); // This is a return address, so requires authenticating for PAC. diff --git a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp index b7e055b317b9..de7f10fde72d 100644 --- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp +++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp @@ -425,6 +425,10 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i return entry; } +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + return nullptr; +} + address TemplateInterpreterGenerator::generate_result_handler_for(BasicType type) { address entry = __ pc(); diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp index 3cd907389ee2..37fbb78e69be 100644 --- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp +++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp @@ -689,6 +689,10 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i return entry; } +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + return nullptr; +} + address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state, address runtime_entry) { address entry = __ pc(); @@ -2089,12 +2093,14 @@ void TemplateInterpreterGenerator::generate_throw_exception() { __ empty_expression_stack(); __ unlock_if_synchronized_method(vtos, /* throw_monitor_exception */ false, /* install_monitor_exception */ false); - // Check to see whether we are returning to a deoptimized frame. - // (The PopFrame call ensures that the caller of the popped frame is - // either interpreted or compiled and deoptimizes it if compiled.) + // Check to see whether we are returning to a deoptimized frame or + // into the continuation return barrier (the PopFrame call ensures that + // the caller of the popped frame is either interpreted or compiled and + // deoptimizes it if compiled). // Note that we don't compare the return PC against the // deoptimization blob's unpack entry because of the presence of - // adapter frames in C2. + // adapter frames in C2. Checking for an interpreter return PC covers + // the return barrier as well. Label Lcaller_not_deoptimized; Register return_pc = R3_ARG1; __ ld(return_pc, 0, R1_SP); diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp index 2848ccf8a133..1f9aad71dc70 100644 --- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp +++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp @@ -510,6 +510,16 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, return entry; } +// Continuation entry for an interpreted frame thawed after its callee was +// popped by JVMTI PopFrame. +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + address entry = __ pc(); + // We reuse the deopt entry with step=0, which restores the interpreter + // state and reexecutes the invoke. + __ jump_to_entry(Interpreter::deopt_entry(vtos, 0)); + return entry; +} + address TemplateInterpreterGenerator::generate_result_handler_for(BasicType type) { address entry = __ pc(); if (type == T_OBJECT) { @@ -1703,16 +1713,17 @@ void TemplateInterpreterGenerator::generate_throw_exception() { __ sw(x13, Address(xthread, JavaThread::popframe_condition_offset())); { - // Check to see whether we are returning to a deoptimized frame. - // (The PopFrame call ensures that the caller of the popped frame is - // either interpreted or compiled and deoptimizes it if compiled.) - // In this case, we can't call dispatch_next() after the frame is - // popped, but instead must save the incoming arguments and restore - // them after deoptimization has occurred. + // Check to see whether we are returning to a deoptimized frame or + // into the continuation return barrier (the PopFrame call ensures that + // the caller of the popped frame is either interpreted or compiled and + // deoptimizes it if compiled). In both cases, we can't call dispatch_next() + // after the frame is popped, but instead must save the incoming arguments + // and restore them after deoptimization or thaw has occurred. // // Note that we don't compare the return PC against the // deoptimization blob's unpack entry because of the presence of - // adapter frames in C2. + // adapter frames in C2. Checking for an interpreter return PC covers + // the return barrier as well. Label caller_not_deoptimized; __ ld(c_rarg1, Address(fp, frame::return_addr_offset * wordSize)); __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::interpreter_contains), c_rarg1); diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp index 7fc962dbc0e3..707a37b4486b 100644 --- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp +++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp @@ -713,6 +713,10 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, return entry; } +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + return nullptr; +} + address TemplateInterpreterGenerator::generate_safept_entry_for (TosState state, address runtime_entry) { address entry = __ pc(); @@ -2183,16 +2187,17 @@ void TemplateInterpreterGenerator::generate_throw_exception() { __ z_sty(Z_tmp_1, thread_(popframe_condition)); { - // Check to see whether we are returning to a deoptimized frame. - // (The PopFrame call ensures that the caller of the popped frame is - // either interpreted or compiled and deoptimizes it if compiled.) - // In this case, we can't call dispatch_next() after the frame is - // popped, but instead must save the incoming arguments and restore - // them after deoptimization has occurred. + // Check to see whether we are returning to a deoptimized frame or + // into the continuation return barrier (the PopFrame call ensures that + // the caller of the popped frame is either interpreted or compiled and + // deoptimizes it if compiled). In both cases, we can't call dispatch_next() + // after the frame is popped, but instead must save the incoming arguments + // and restore them after deoptimization or thaw has occurred. // // Note that we don't compare the return PC against the // deoptimization blob's unpack entry because of the presence of - // adapter frames in C2. + // adapter frames in C2. Checking for an interpreter return PC covers + // the return barrier as well. NearLabel caller_not_deoptimized; __ z_lg(Z_ARG1, _z_parent_ijava_frame_abi(return_pc), Z_fp); __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::interpreter_contains), Z_ARG1); diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp index 47e28cf94700..319e91288c10 100644 --- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp +++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp @@ -248,6 +248,21 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i return entry; } +// Continuation entry for an interpreted frame thawed after its callee was +// popped by JVMTI PopFrame. +address TemplateInterpreterGenerator::generate_cont_popframe_reexecute_entry() { + address entry = __ pc(); + // The thawed frame arrives with an aligned rsp that can sit below the + // expression stack top. Restore it from last_sp, which was saved before + // jumping to the callee. + __ movptr(rscratch1, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize)); + __ lea(rsp, Address(rbp, rscratch1, Address::times_ptr)); + // We reuse the deopt entry with step=0, which restores the interpreter + // state and reexecutes the invoke. + __ jump_to_entry(Interpreter::deopt_entry(vtos, 0)); + return entry; +} + address TemplateInterpreterGenerator::generate_result_handler_for( BasicType type) { address entry = __ pc(); @@ -1428,16 +1443,17 @@ void TemplateInterpreterGenerator::generate_throw_exception() { __ movl(Address(thread, JavaThread::popframe_condition_offset()), rdx); { - // Check to see whether we are returning to a deoptimized frame. - // (The PopFrame call ensures that the caller of the popped frame is - // either interpreted or compiled and deoptimizes it if compiled.) - // In this case, we can't call dispatch_next() after the frame is - // popped, but instead must save the incoming arguments and restore - // them after deoptimization has occurred. + // Check to see whether we are returning to a deoptimized frame or + // into the continuation return barrier (the PopFrame call ensures that + // the caller of the popped frame is either interpreted or compiled and + // deoptimizes it if compiled). In both cases, we can't call dispatch_next() + // after the frame is popped, but instead must save the incoming arguments + // and restore them after deoptimization or thaw has occurred. // // Note that we don't compare the return PC against the // deoptimization blob's unpack entry because of the presence of - // adapter frames in C2. + // adapter frames in C2. Checking for an interpreter return PC covers + // the return barrier as well. Label caller_not_deoptimized; __ movptr(c_rarg1, Address(rbp, frame::return_addr_offset * wordSize)); __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, diff --git a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp index cc2f5ff0f2e2..defed9d11fd6 100644 --- a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp +++ b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp @@ -871,6 +871,10 @@ address ZeroInterpreter::deopt_entry(TosState state, int length) { return nullptr; } +address ZeroInterpreter::cont_popframe_reexecute_entry() { + return nullptr; +} + address ZeroInterpreter::remove_activation_preserving_args_entry() { // Do an uncommon trap type entry. c++ interpreter will know // to pop frame and preserve the args diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp index cf356c6b19a5..c8328d445ede 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp @@ -1566,16 +1566,14 @@ JRT_END #if INCLUDE_JVMTI // This is a support of the JVMTI PopFrame interface. // Make sure it is an invokestatic of a polymorphic intrinsic that has a member_name argument -// and return it as a vm_result_oop so that it can be reloaded in the list of invokestatic parameters. +// and return it so that it can be reloaded in the list of invokestatic parameters. // The member_name argument is a saved reference (in local#0) to the member_name. // For backward compatibility with some JDK versions (7, 8) it can also be a direct method handle. // FIXME: remove DMH case after j.l.i.InvokerBytecodeGenerator code shape is updated. -JRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* current, address member_name, - Method* method, address bcp)) +oop InterpreterRuntime::popframe_member_name_arg_or_null(address member_name, Method* method, address bcp) { Bytecodes::Code code = Bytecodes::code_at(method, bcp); if (code != Bytecodes::_invokestatic) { - current->set_vm_result_oop(nullptr); - return; + return nullptr; } ConstantPool* cpool = method->constants(); @@ -1584,8 +1582,7 @@ JRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* current, Symbol* mname = cpool->name_ref_at(cp_index, code); if (!MethodHandles::has_member_arg(cname, mname)) { - current->set_vm_result_oop(nullptr); - return; + return nullptr; } oop member_name_oop = cast_to_oop(member_name); @@ -1599,7 +1596,12 @@ JRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* current, if (java_lang_invoke_DirectMethodHandle::is_instance(member_name_oop)) { member_name_oop = java_lang_invoke_DirectMethodHandle::member(member_name_oop); } - current->set_vm_result_oop(member_name_oop); + return member_name_oop; +} + +JRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* current, address member_name, + Method* method, address bcp)) + current->set_vm_result_oop(popframe_member_name_arg_or_null(member_name, method, bcp)); JRT_END #endif // INCLUDE_JVMTI diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp index 59246c1d7ead..a9e2ab322780 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.hpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp @@ -95,6 +95,7 @@ class InterpreterRuntime: AllStatic { static address exception_handler_for_exception(JavaThread* current, oopDesc* exception); #if INCLUDE_JVMTI static void member_name_arg_or_null(JavaThread* current, address dmh, Method* m, address bcp); + static oop popframe_member_name_arg_or_null(address member_name, Method* m, address bcp); #endif static void throw_pending_exception(JavaThread* current); diff --git a/src/hotspot/share/interpreter/templateInterpreter.cpp b/src/hotspot/share/interpreter/templateInterpreter.cpp index 44804221dc76..3e409ab58229 100644 --- a/src/hotspot/share/interpreter/templateInterpreter.cpp +++ b/src/hotspot/share/interpreter/templateInterpreter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -220,6 +220,7 @@ EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_ret EntryPoint TemplateInterpreter::_earlyret_entry; EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ]; address TemplateInterpreter::_deopt_reexecute_return_entry; +address TemplateInterpreter::_cont_popframe_reexecute_entry; EntryPoint TemplateInterpreter::_safept_entry; address TemplateInterpreter::_invoke_return_entry[TemplateInterpreter::number_of_return_addrs]; diff --git a/src/hotspot/share/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp index 0b37412737e5..6be0cd4c6f4e 100644 --- a/src/hotspot/share/interpreter/templateInterpreter.hpp +++ b/src/hotspot/share/interpreter/templateInterpreter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -121,6 +121,7 @@ class TemplateInterpreter: public AbstractInterpreter { static EntryPoint _earlyret_entry; // entry point to return early from a call static EntryPoint _deopt_entry[number_of_deopt_entries]; // entry points to return to from a deoptimization static address _deopt_reexecute_return_entry; + static address _cont_popframe_reexecute_entry; // reexecutes the invoke in a caller thawed after JVMTI PopFrame static EntryPoint _safept_entry; static address _invoke_return_entry[number_of_return_addrs]; // for invokestatic, invokespecial, invokevirtual return entries @@ -177,6 +178,7 @@ class TemplateInterpreter: public AbstractInterpreter { static address deopt_entry(TosState state, int length); static address deopt_reexecute_return_entry() { return _deopt_reexecute_return_entry; } + static address cont_popframe_reexecute_entry() { return _cont_popframe_reexecute_entry; } static address return_entry(TosState state, int length, Bytecodes::Code code); // Safepoint support diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp index 9e8d6fa782f1..50bd7ecacfc0 100644 --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -263,6 +263,10 @@ void TemplateInterpreterGenerator::generate_all() { Interpreter::_deopt_reexecute_return_entry = generate_deopt_entry_for(vtos, 0, return_continuation); } + { CodeletMark cm(_masm, "continuation popframe reexecute entry"); + Interpreter::_cont_popframe_reexecute_entry = generate_cont_popframe_reexecute_entry(); + } + } //------------------------------------------------------------------------------------------------------------------------ diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp index 74da0824fb81..ea340bd79ad9 100644 --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,6 +55,7 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator { address generate_return_entry_for(TosState state, int step, size_t index_size); address generate_earlyret_entry_for(TosState state); address generate_deopt_entry_for(TosState state, int step, address continuation = nullptr); + address generate_cont_popframe_reexecute_entry(); address generate_safept_entry_for(TosState state, address runtime_entry); address generate_cont_resume_interpreter_adapter(); void generate_throw_exception(); diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp index 15dffcbbb549..0f12a21fe207 100644 --- a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp +++ b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp @@ -56,6 +56,7 @@ class ZeroInterpreter: public AbstractInterpreter { static address return_entry (TosState state, int length, Bytecodes::Code code); static address deopt_entry (TosState state, int length); + static address cont_popframe_reexecute_entry(); static address remove_activation_entry() { return (address)-1; } static address remove_activation_early_entry(TosState state); diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp index b50972020636..b234594d0562 100644 --- a/src/hotspot/share/prims/jvmtiEnvBase.cpp +++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp @@ -27,6 +27,7 @@ #include "classfile/moduleEntry.hpp" #include "classfile/symbolTable.hpp" #include "classfile/vmSymbols.hpp" +#include "interpreter/interpreter.hpp" #include "jvmtifiles/jvmtiEnv.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" @@ -2539,6 +2540,7 @@ UpdateForPopTopFrameClosure::doit(Thread *target) { int frame_count = 0; bool is_interpreted[2]; intptr_t *frame_sp[2]; + javaVFrame* heap_jvf[2] = { nullptr, nullptr }; // The 2-nd arg of constructor is needed to stop iterating at java entry frame. for (vframeStream vfs(java_thread, true, false /* process_frames */); !vfs.at_end(); vfs.next()) { methodHandle mh(current_thread, vfs.method()); @@ -2547,6 +2549,29 @@ UpdateForPopTopFrameClosure::doit(Thread *target) { return; } is_interpreted[frame_count] = vfs.is_interpreted_frame(); + if (is_interpreted[frame_count] && frame_count == 1 && vfs.reg_map()->in_cont() && + Interpreter::cont_popframe_reexecute_entry() == nullptr) { + // No entry on this platform to reexecute the invoke of a frozen interpreted caller. + _result = JVMTI_ERROR_OPAQUE_FRAME; + return; + } + if (!is_interpreted[frame_count]) { + javaVFrame* jvf = vfs.asJavaVFrame(); + // The frame is frozen in a stack chunk on the heap, not on the thread stack. + if (vfs.reg_map()->in_cont()) { + assert(_state->is_virtual(), "invariant"); + if (frame_count == 0) { + // If the top frame is compiled and in the heap, PopFrame is not supported. + _result = JVMTI_ERROR_OPAQUE_FRAME; + return; + } + heap_jvf[frame_count] = jvf; + } + if (!jvf->fr().can_be_deoptimized()) { + _result = JVMTI_ERROR_OPAQUE_FRAME; + return; + } + } frame_sp[frame_count] = vfs.frame_id(); if (++frame_count > 1) break; } @@ -2570,7 +2595,14 @@ UpdateForPopTopFrameClosure::doit(Thread *target) { // If any of the top 2 frames is a compiled one, need to deoptimize it for (int i = 0; i < 2; i++) { if (!is_interpreted[i]) { - Deoptimization::deoptimize_frame(java_thread, frame_sp[i]); + // deoptimize_frame only walks the thread stack, a frozen frame is patched + // in its stack chunk instead. + if (heap_jvf[i] != nullptr) { + frame fr = heap_jvf[i]->fr(); + fr.deoptimize(nullptr, heap_jvf[i]->stack_chunk()); + } else { + Deoptimization::deoptimize_frame(java_thread, frame_sp[i]); + } } } diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp index 9f79dee63460..0899e50aca97 100644 --- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp +++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp @@ -37,15 +37,18 @@ #include "interpreter/bytecodeStream.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/interpreterRuntime.hpp" +#include "interpreter/oopMapCache.hpp" #include "jfr/jfrEvents.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" #include "oops/access.inline.hpp" #include "oops/constantPool.inline.hpp" #include "oops/method.inline.hpp" +#include "oops/methodData.hpp" #include "oops/objArrayOop.inline.hpp" #include "oops/oopsHierarchy.hpp" #include "oops/stackChunkOop.inline.hpp" +#include "prims/jvmtiExport.hpp" #include "prims/jvmtiThreadState.hpp" #include "runtime/arguments.hpp" #include "runtime/continuation.hpp" @@ -70,6 +73,7 @@ #include "runtime/stackWatermarkSet.inline.hpp" #include "runtime/vframe.inline.hpp" #include "runtime/vframe_hp.hpp" +#include "utilities/copy.hpp" #include "utilities/debug.hpp" #include "utilities/exceptions.hpp" #include "utilities/macros.hpp" @@ -1715,6 +1719,68 @@ static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, fram } JRT_BLOCK_END } + +static bool popframe_reexecutes_interpreted_caller(JavaThread* thread, const frame& f) { + if (!JvmtiExport::can_pop_frame() || !thread->popframe_forcing_deopt_reexecution()) { + return false; + } + if (!f.is_interpreted_frame()) { + assert(f.is_deoptimized_frame(), "popframe reexecution into a frozen compiled caller that was not deoptimized"); + return false; + } + return true; +} + +// Called after fix_thawed_frame in case we need to recover MemberName from local0. +static void popframe_restore_args(JavaThread* thread, frame& f) { + // The expression stack already includes the callee arguments, since last_sp + // was saved after they were pushed. + int top_element = f.interpreter_frame_expression_stack_size() - 1; + // For a linkTo* call the trailing MemberName was consumed by the linker and + // is not among the preserved arguments. Take it from local 0 like the + // interpreter's popframe entry does. + Method* method = f.interpreter_frame_method(); + address local0 = method->max_locals() > 0 ? (address)*f.interpreter_frame_local_at(0) : nullptr; + oop member_name = InterpreterRuntime::popframe_member_name_arg_or_null(local0, method, f.interpreter_frame_bcp()); + int words = in_words(thread->popframe_preserved_args_size_in_words()); +#ifdef ASSERT + ResourceMark rm; + InterpreterOopMap mask; + f.interpreted_frame_oop_map(&mask); + assert(f.interpreter_frame_expression_stack_size() == + mask.expression_stack_size() + words + (member_name != nullptr ? 1 : 0), "not enough room for arguments"); +#endif + if (words > 0) { + int first = top_element - (member_name != nullptr ? 1 : 0); + Copy::conjoint_jbytes(thread->popframe_preserved_args(), f.interpreter_frame_expression_stack_at(first), words * wordSize); + thread->popframe_free_preserved_args(); + } + if (member_name != nullptr) { + *f.interpreter_frame_expression_stack_at(top_element) = cast_from_oop(member_name); + } + if (ProfileInterpreter) { + // Call profiling moved the mdp past the invoke, set it back for the current bci + // like the interpreter's popframe entry does. + MethodData* mdo = method->method_data(); + f.interpreter_frame_set_mdp(mdo != nullptr ? mdo->bci_to_dp(f.interpreter_frame_bci()) : nullptr); + } + thread->clear_popframe_condition(); +} + +// Check if the callee frame was popped by JVMTI PopFrame. If so, the interpreter's +// popframe entry has preserved the arguments and set the deopt reexecution bit as for a +// deoptimized caller. If the top frame is compiled, UpdateForPopTopFrameClosure already +// marked it for deoptimization, so we just return and let the deoptimization code handle +// the pop frame as usual. If the top frame is interpreted, we need to copy the arguments +// back in the expression stack and patch the return address so that the invoke is reexecuted. +static void popframe_reexecute_invoke(JavaThread* thread, frame& f) { + if (!popframe_reexecutes_interpreted_caller(thread, f)) { + return; + } + assert(Interpreter::cont_popframe_reexecute_entry() != nullptr, "PopFrame should have rejected this frame"); + ContinuationHelper::Frame::patch_pc(f, Interpreter::cont_popframe_reexecute_entry()); + popframe_restore_args(thread, f); +} #endif // INCLUDE_JVMTI #ifdef ASSERT @@ -3104,6 +3170,7 @@ void ThawBase::finish_thaw(frame& f) { } else { chunk->fix_thawed_frame(f, SmallRegisterMap::instance_no_args()); } + JVMTI_ONLY(popframe_reexecute_invoke(_thread, f);) assert(_cont.is_empty() == _cont.last_frame().is_empty(), ""); diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt index 7edf6ce88f71..0561a0def81c 100644 --- a/test/hotspot/jtreg/ProblemList-Virtual.txt +++ b/test/hotspot/jtreg/ProblemList-Virtual.txt @@ -86,11 +86,9 @@ vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemor # to make progress when all other threads are currently suspended. vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java 8338713 generic-all -#### -## NSK JDWP tests failing with wrapper - -# JVMTI bug when popping to a frozen frame -vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java 8391440 generic-all +### +# PopFrame with the caller frozen in a stack chunk is not supported on these platforms yet. +vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java 8396838 linux-ppc64le,aix-ppc64,linux-s390x ############################################################################# diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 1994933faa50..08f33216658d 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -95,6 +95,8 @@ gc/shenandoah/generational/TestGenerationalReferenceProcessing.java#young-no-com # :hotspot_runtime +runtime/interpreter/PopFrameMethodNameInvariantTest.java#virtual 8396838 linux-ppc64le,aix-ppc64,linux-s390x +runtime/interpreter/PopFrameMethodNameInvariantTest.java#virtual-invokeExact 8396838 linux-ppc64le,aix-ppc64,linux-s390x runtime/jni/terminatedThread/TestTerminatedThread.java 8317789 aix-ppc64 runtime/Monitor/SyncOnValueBasedClassTest.java 8340995 linux-s390x runtime/os/TestTracePageSizes.java#no-options 8267460 linux-aarch64 @@ -166,6 +168,8 @@ vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInTarget/TestDescription.java 83 vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id1 8324756 generic-all vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all +vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java 8396838 linux-ppc64le,aix-ppc64,linux-s390x +vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes003/TestDescription.java 8396838 linux-ppc64le,aix-ppc64,linux-s390x vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription.java 8076494 windows-x64 diff --git a/test/hotspot/jtreg/TEST.quick-groups b/test/hotspot/jtreg/TEST.quick-groups index b9f517c3edfe..c5b6c061346d 100644 --- a/test/hotspot/jtreg/TEST.quick-groups +++ b/test/hotspot/jtreg/TEST.quick-groups @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -1457,6 +1457,7 @@ vmTestbase_nsk_jdwp_quick = \ vmTestbase/nsk/jdwp/Method/IsObsolete/isobsolete002/TestDescription.java \ vmTestbase/nsk/jdwp/ReferenceType/SourceDebugExtension/srcdebugext001/TestDescription.java \ vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001/TestDescription.java \ + vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java \ vmTestbase/nsk/jdwp/VirtualMachine/CapabilitiesNew/capabilitiesnew001/TestDescription.java \ vmTestbase/nsk/jdwp/VirtualMachine/RedefineClasses/redefinecls001/TestDescription.java \ vmTestbase/nsk/jdwp/VirtualMachine/SetDefaultStratum/setdefstrat001/TestDescription.java \ diff --git a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java index 64eb58c5a2dc..816ff73562fc 100644 --- a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java +++ b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java @@ -53,6 +53,11 @@ public static void linkToStatic(Object name, float arg) throws Throwable { MethodHandle.linkToStatic(arg, name); } + @ForceInline + public static void linkToStatic(Object name, int a, long b, Object c) throws Throwable { + MethodHandle.linkToStatic(a, b, c, name); + } + @ForceInline public static void invokeBasicV(MethodHandle mh, float arg) throws Throwable { mh.invokeBasic(arg); diff --git a/test/hotspot/jtreg/runtime/interpreter/PopFrameMethodNameInvariantTest.java b/test/hotspot/jtreg/runtime/interpreter/PopFrameMethodNameInvariantTest.java index bd02227c4647..92a336d6e2e3 100644 --- a/test/hotspot/jtreg/runtime/interpreter/PopFrameMethodNameInvariantTest.java +++ b/test/hotspot/jtreg/runtime/interpreter/PopFrameMethodNameInvariantTest.java @@ -46,9 +46,9 @@ import java.util.Map; /* - * @test + * @test id=platform * @bug 8380080 - * @summary MemberName in local0 must be preserved when PopFrame re-executes direct MethodHandles.linkToStatic + * @summary MemberName in local0 must be preserved when PopFrame re-executes direct MethodHandle.linkToStatic * @requires vm.jvmti * @requires vm.flavor != "zero" * @library ../../compiler/jsr292/patches /test/lib @@ -58,21 +58,113 @@ * @run driver runtime.interpreter.PopFrameMethodNameInvariantTest */ +/* + * @test id=virtual + * @bug 8391440 + * @summary MemberName in local0 must be preserved when PopFrame re-executes direct MethodHandle.linkToStatic + * in a caller restored from the heap + * @requires vm.jvmti + * @requires vm.flavor != "zero" + * @requires vm.continuations + * @library ../../compiler/jsr292/patches /test/lib + * @modules java.base/jdk.internal.vm.annotation + * jdk.jdi + * @build java.base/java.lang.invoke.MethodHandleHelper + * @run driver runtime.interpreter.PopFrameMethodNameInvariantTest virtual + */ + +/* + * @test id=platform-invokeExact + * @bug 8391440 + * @summary MemberName must be restored from the DirectMethodHandle in local0 when PopFrame re-executes + * linkToStatic in a LambdaForm frame + * @requires vm.jvmti + * @requires vm.flavor != "zero" + * @library ../../compiler/jsr292/patches /test/lib + * @modules java.base/jdk.internal.vm.annotation + * jdk.jdi + * @build java.base/java.lang.invoke.MethodHandleHelper + * @run driver runtime.interpreter.PopFrameMethodNameInvariantTest invokeExact + */ + +/* + * @test id=virtual-invokeExact + * @bug 8391440 + * @summary MemberName must be restored from the DirectMethodHandle in local0 when PopFrame re-executes + * linkToStatic in a LambdaForm caller restored from the heap + * @requires vm.jvmti + * @requires vm.flavor != "zero" + * @requires vm.continuations + * @library ../../compiler/jsr292/patches /test/lib + * @modules java.base/jdk.internal.vm.annotation + * jdk.jdi + * @build java.base/java.lang.invoke.MethodHandleHelper + * @run driver runtime.interpreter.PopFrameMethodNameInvariantTest virtual invokeExact + */ + public class PopFrameMethodNameInvariantTest { public static class Target { - static void body(float x) {} + static final boolean VIRTUAL = Boolean.getBoolean("popframe.virtual"); + static int entered; + static final long LONG_ARG = 0x1234567890ABL; + static final Object MARKER = new Object(); + static final boolean USE_INVOKE_EXACT = Boolean.getBoolean("popframe.invokeExact"); + + // the debugger pops body, the caller of this one + static void stop() {} + + static void body(int a, long b, Object c) throws InterruptedException { + entered++; + if (VIRTUAL) { + // Sleep unmounts the virtual thread. After mounting again, the + // caller of body is not thawed, so PopFrame must restore it + // from the heap. + Thread.sleep(1000); + } + stop(); + // only the reexecuted invocation gets here + if (entered != 2 || a != 7 || b != LONG_ARG || c != MARKER) { + throw new RuntimeException("entered " + entered + " times, a = " + a + ", b = " + b + ", c = " + c); + } + } + + // The caller of body keeps a DirectMethodHandle in local 0 for invokeExact, + // or a MemberName for the explicit linkToStatic call. + static void call(MethodHandle target, Object name) throws Throwable { + if (USE_INVOKE_EXACT) { + target.invokeExact(7, LONG_ARG, MARKER); + } else { + MethodHandleHelper.linkToStatic(name, 7, LONG_ARG, MARKER); + } + } + public static void main(String[] args) throws Throwable { MethodHandle target = MethodHandles.lookup().findStatic( Target.class, "body", - MethodType.methodType(void.class, float.class)); + MethodType.methodType(void.class, int.class, long.class, Object.class)); Object name = MethodHandleHelper.internalMemberName(target); - MethodHandleHelper.linkToStatic(name, (float)1.0); + if (!VIRTUAL) { + call(target, name); + return; + } + Throwable[] failure = new Throwable[1]; + Thread thread = Thread.ofVirtual().start(() -> { + try { + call(target, name); + } catch (Throwable t) { + failure[0] = t; + } + }); + thread.join(); + if (failure[0] != null) { + throw failure[0]; + } } } public static void main(String[] args) throws Exception { - VirtualMachine vm = getVm(); + VirtualMachine vm = getVm(args); EventRequestManager eventRequestManager = vm.eventRequestManager(); ClassPrepareRequest classPrepareRequest = eventRequestManager.createClassPrepareRequest(); classPrepareRequest.addClassFilter(Target.class.getName()); @@ -84,14 +176,14 @@ public static void main(String[] args) throws Exception { if (event instanceof ClassPrepareEvent prepareEvent) { eventRequestManager.createBreakpointRequest( prepareEvent.referenceType() - .methodsByName("body") + .methodsByName("stop") .get(0) .location() ).enable(); } if (event instanceof BreakpointEvent breakpointEvent) { breakpointEvent.request().disable(); - breakpointEvent.thread().popFrames(breakpointEvent.thread().frame(0)); + breakpointEvent.thread().popFrames(breakpointEvent.thread().frame(1)); eventSet.resume(); break outerLoop; } @@ -104,7 +196,7 @@ public static void main(String[] args) throws Exception { } } - private static VirtualMachine getVm() throws IOException, IllegalConnectorArgumentsException, VMStartException { + private static VirtualMachine getVm(String[] args) throws IOException, IllegalConnectorArgumentsException, VMStartException { LaunchingConnector connector = Bootstrap.virtualMachineManager().defaultConnector(); Map argumentMap = connector.defaultArguments(); argumentMap.get("main").setValue(Target.class.getName()); @@ -113,6 +205,13 @@ private static VirtualMachine getVm() throws IOException, IllegalConnectorArgume if (patchPath != null) { options += " --patch-module=java.base=\"" + Path.of(patchPath, "java.base") + "\""; } + for (String arg : args) { + if (arg.equals("virtual")) { + options += " -Dpopframe.virtual=true"; + } else if (arg.equals("invokeExact")) { + options += " -Dpopframe.invokeExact=true"; + } + } argumentMap.get("options").setValue((options + " -Xint").trim()); return connector.launch(argumentMap); } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java index b4ad931f0443..b65ce64fb327 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ package nsk.jdwp.StackFrame.PopFrames; import java.io.*; +import java.util.Arrays; import nsk.share.*; import nsk.share.jpda.*; @@ -67,7 +68,12 @@ public class popframes001 { // field and method names static final String TESTED_METHOD_NAME = "testedMethod"; + static final String STOP_METHOD_NAME = "stop"; static final int BREAKPOINT_LINE_NUMBER = popframes001a.BREAKPOINT_LINE_NUMBER; + static final int STOP_LINE_NUMBER = popframes001a.STOP_LINE_NUMBER; + + // with -popCaller the breakpoint is in stop() and the pop names its caller + boolean popCaller = false; // usual scaffold objects ArgumentHandler argumentHandler = null; @@ -113,6 +119,12 @@ public static int run(String argv[], PrintStream out) { */ public int runIt(String argv[], PrintStream out) { + // -popCaller is ours, not an ArgumentHandler option + popCaller = Arrays.asList(argv).contains("-popCaller"); + if (popCaller) { + argv = Arrays.stream(argv).filter(arg -> !arg.equals("-popCaller")).toArray(String[]::new); + } + // make log for debugger messages argumentHandler = new ArgumentHandler(argv); log = new Log(out, argumentHandler); @@ -232,13 +244,21 @@ void prepareForTest() { log.display(" ... got methodID: " + testedMethodID); log.display(""); + // query debuggee for the methodID of the breakpoint method + String breakpointMethodName = popCaller ? STOP_METHOD_NAME : TESTED_METHOD_NAME; + int breakpointLineNumber = popCaller ? STOP_LINE_NUMBER : BREAKPOINT_LINE_NUMBER; + log.display("Getting breakpoint methodID by name: " + breakpointMethodName); + long breakpointMethodID = debugee.getMethodID(testedClassID, breakpointMethodName, true); + log.display(" ... got methodID: " + breakpointMethodID); + log.display(""); + // make BREAKPOINT event request log.display("Creating breakpoint requests at: " - + TESTED_METHOD_NAME + ":" + BREAKPOINT_LINE_NUMBER); + + breakpointMethodName + ":" + breakpointLineNumber); breakpointRequestID = debugee.requestBreakpointEvent(JDWP.TypeTag.CLASS, - testedClassID, testedMethodID, - BREAKPOINT_LINE_NUMBER, + testedClassID, breakpointMethodID, + breakpointLineNumber, JDWP.SuspendPolicy.ALL); log.display(" ... got breakpoint requestID: " + breakpointRequestID); @@ -253,9 +273,10 @@ void prepareForTest() { testedThreadID = waitForBreakpointEvent(breakpointRequestID, "first"); log.display(" ... breakpoint reached with threadID: " + testedThreadID); - // query debuggee for top frameID - log.display("Getting top frameID for threadID: " + testedThreadID); - testedFrameID = queryTopFrameID(testedThreadID); + // query debuggee for the frameID of the tested method + int frameIndex = popCaller ? 1 : 0; + log.display("Getting frameID at index " + frameIndex + " for threadID: " + testedThreadID); + testedFrameID = queryFrameID(testedThreadID, frameIndex); log.display(" ... got frameID: " + testedFrameID); log.display(""); @@ -347,14 +368,15 @@ void checkResult() { } /** - * Query debuggee for top frameID value for given threadID. + * Query debuggee for frameID value at the given index for given threadID + * and check that it is a frame of the tested method. */ - long queryTopFrameID(long threadID) { - String error = "Error occured while getting top frameID for threadID: " + threadID; + long queryFrameID(long threadID, int index) { + String error = "Error occured while getting frameID at index " + index + " for threadID: " + threadID; CommandPacket command = new CommandPacket(JDWP.Command.ThreadReference.Frames); command.addObjectID(threadID); - command.addInt(0); // top frame index + command.addInt(index); // frame index command.addInt(1); // number of frames ReplyPacket reply = debugee.receiveReplyFor(command, "ThreadReference.Frames"); @@ -368,6 +390,12 @@ long queryTopFrameID(long threadID) { throw new Failure(error); } long frameID = reply.getFrameID(); + JDWP.Location location = reply.getLocation(); + if (location.getMethodID() != testedMethodID) { + log.complain("Wrong methodID of the frame at index " + index + ": " + location.getMethodID() + + " (expected: " + testedMethodID + ")"); + throw new Failure(error); + } return frameID; } catch (BoundException e) { log.complain("Unable to extract data from reply packet:\n\t" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java index cfe1a919bf93..72a79df07b7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes001a.java @@ -40,8 +40,11 @@ public class popframes001a { // name of the tested thread public static final String THREAD_NAME = "testedThread"; - // line nunber for breakpoint - public static final int BREAKPOINT_LINE_NUMBER = 114; + // line number for breakpoint + public static final int BREAKPOINT_LINE_NUMBER = 160; + + // line number of the popframes003 breakpoint in stop() + public static final int STOP_LINE_NUMBER = 177; // scaffold objects private static volatile ArgumentHandler argumentHandler = null; @@ -62,6 +65,18 @@ public int runIt(String args[], PrintStream out) { TestedThreadClass thread = new TestedThreadClass(THREAD_NAME); log.display(" ... thread created"); + if (thread.isVirtual()) { + // The thread joined by the virtual thread in testedMethod. It exits once the + // virtual thread has unmounted. Created here to avoid setup code in testedMethod + // that could trigger deoptimization before join(). + Thread tested = thread.getThread(); + TestedThreadClass.parker = Thread.ofVirtual().start(() -> { + while (tested.getState() != Thread.State.WAITING) { + Thread.yield(); + } + }); + } + // start tested thread log.display("Starting tested thread"); thread.start(); @@ -78,6 +93,19 @@ public int runIt(String args[], PrintStream out) { return popframes001.FAILED; } + // the tested method is expected to be invoked twice + if (TestedThreadClass.invocations != 2) { + log.complain("Tested method invoked " + TestedThreadClass.invocations + " times, expected 2"); + log.display("Debugee FAILED"); + return popframes001.FAILED; + } + + if (TestedThreadClass.argsMismatch != null) { + log.complain("Tested method got wrong arguments: " + TestedThreadClass.argsMismatch); + log.display("Debugee FAILED"); + return popframes001.FAILED; + } + log.display("Debugee PASSED"); return popframes001.PASSED; } @@ -85,36 +113,68 @@ public int runIt(String args[], PrintStream out) { // tested thread class public static class TestedThreadClass extends ThreadWrapper { - // number of invokations of tested method - public static volatile int invokations = 0; + // number of invocations of tested method + public static volatile int invocations = 0; + + // arguments run() passes to testedMethod, checked on every invocation + static final long LONG_ARG = 0x1234567890ABL; + public static volatile String argsMismatch = null; + + // popframes003 runs this debuggee with this set + private static final boolean COMPILED_CALLER = Boolean.getBoolean("popframes001.compiledCaller"); + + // joined by the tested method when the tested thread is virtual, started in runIt + public static Thread parker = null; public TestedThreadClass(String name) { super(name); } - // invoke tested method + // invoke tested method, nothing before the call that could deoptimize this frame public void run() { - log.display("Tested thread: started"); - - // invoke tested method int foo = 100; - foo = testedMethod(foo); + foo = testedMethod(foo, LONG_ARG, this); log.display("Tested thread: finished"); } // tested method to pop frames - public int testedMethod(int arg) { - invokations++; - log.display("Tested method invoked " + invokations + " time"); + public int testedMethod(int arg, long arg2, Object arg3) { + invocations++; int boo = 0; + if (isVirtual()) { + // PopFrame pops this frame, testedMethod() runs twice. The first join unmounts the + // thread, leaving the caller in the heap when PopFrame runs. Code before this join + // must not deoptimize this frame, an interpreted frame thaws its compiled caller. + try { + parker.join(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + log.display("Tested method invoked " + invocations + " time"); + log.display("Breakpoint line reached"); // next line is for breakpoint boo = arg * 2; // BREAKPOINT_LINE_NUMBER log.display("Breakpoint line passed"); + if (arg != 100 || arg2 != LONG_ARG || arg3 != this) { + argsMismatch = "arg " + arg + " arg2 " + arg2 + " arg3 " + arg3; + } + + if (COMPILED_CALLER) { + // popframes003 breaks in stop() and pops this frame together with it + stop(); + } return boo; } + + // breakpoint method for popframes003 + public void stop() { + // next line is for breakpoint + log.display("Stop line reached"); // STOP_LINE_NUMBER + } } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java new file mode 100644 index 000000000000..6f3736a9dcbc --- /dev/null +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes002/TestDescription.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * + * @bug 8391440 + * @summary StackFrame.PopFrames on a virtual thread whose caller frame is still frozen + * VM Testbase keywords: [quick, jpda, jdwp] + * VM Testbase readme: + * DESCRIPTION + * This test performs checking for + * command set: StackFrame + * command: PopFrames + * Same check as popframes001, but the tested thread is a virtual + * thread and before the breakpoint the tested method joins another + * virtual thread. The tested thread is unmounted there and comes + * back with only its top frame thawed, the caller frame stays frozen + * in the stack chunk. The pop has to bring that frame back. + * Test checks that debugee accept the command packet and + * replies with correct reply packet. Also test checks that + * after current frame is popped the tested method is invoked + * second time. + * Test consists of two compoments: + * debugger: popframes001 + * debuggee: popframes001a + * First, debugger uses nsk.share support classes to launch debuggee + * and obtain Transport object, that represents JDWP transport channel. + * Next, debugger waits for tested class loaded, requests methodID + * for tested method, sets breakpoint and wait for breakpoint reached. + * After breakpoint event is received with a thread, debugger gets top + * stack frame for this thread. + * Then, debugger creates command packet for StackFrame.PopFrames + * command with the found threadID and frameID, writes this packet + * to the transport channel, and waits for a reply packet. + * When reply packet is received, debugger parses the packet structure + * and checks if no reply data returned in the packet. + * Then, checks if the tested method will be invoked second time. + * To do so, it resumes debuggee and waits for BREAKPOINT event + * will be received again. If expected BREAKPOINT event is not received, + * debugger complains an error. + * Finally, debugger disconnects debuggee, waits for it exits + * and exits too with the proper exit code. + * + * @requires vm.jvmti & vm.continuations + * @library /vmTestbase /test/hotspot/jtreg/vmTestbase + * /test/lib + * @build nsk.jdwp.StackFrame.PopFrames.popframes001a + * @run driver + * nsk.jdwp.StackFrame.PopFrames.popframes001 + * -arch=${os.family}-${os.simpleArch} + * -verbose + * -waittime=5 + * -debugee.vmkind=java + * -transport.address=dynamic + * -debugee.vmkeys="${test.vm.opts} ${test.java.opts} + * -XX:CompileCommand=exclude,*TestedThreadClass::run + * -Dtest.thread.factory=Virtual" + */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes003/TestDescription.java new file mode 100644 index 000000000000..99272c62814a --- /dev/null +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/StackFrame/PopFrames/popframes003/TestDescription.java @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * + * @bug 8391440 + * @summary StackFrame.PopFrames on a virtual thread whose frozen caller is a compiled frame + * VM Testbase keywords: [quick, jpda, jdwp] + * VM Testbase readme: + * DESCRIPTION + * This test performs checking for + * command set: StackFrame + * command: PopFrames + * Same as popframes002, the tested method joins another virtual thread + * so the caller frame stays frozen in the stack chunk. Here the + * debuggee runs with -Xcomp and the breakpoint is in a separate + * method stop() called by the tested method, so the tested method + * is still compiled when it unmounts and its caller stays a frozen + * compiled frame. The debugger pops the frame of the tested method, the + * caller of the breakpoint frame. The debuggee checks that the + * tested method was invoked exactly two times. + * Test checks that debugee accept the command packet and + * replies with correct reply packet. Also test checks that + * after the frames are popped the tested method is invoked + * second time. + * Test consists of two compoments: + * debugger: popframes001 + * debuggee: popframes001a + * First, debugger uses nsk.share support classes to launch debuggee + * and obtain Transport object, that represents JDWP transport channel. + * Next, debugger waits for tested class loaded, requests methodIDs + * for tested method and stop, sets breakpoint in stop and wait for + * breakpoint reached. After breakpoint event is received with a + * thread, debugger gets the second stack frame for this thread and + * checks it belongs to the tested method. + * Then, debugger creates command packet for StackFrame.PopFrames + * command with the found threadID and frameID, writes this packet + * to the transport channel, and waits for a reply packet. + * When reply packet is received, debugger parses the packet structure + * and checks if no reply data returned in the packet. + * Then, checks if the tested method will be invoked second time. + * To do so, it resumes debuggee and waits for BREAKPOINT event + * will be received again. If expected BREAKPOINT event is not received, + * debugger complains an error. + * Finally, debugger disconnects debuggee, waits for it exits + * and exits too with the proper exit code. + * + * @requires vm.jvmti & vm.flavor != "zero" & vm.continuations + * @library /vmTestbase /test/hotspot/jtreg/vmTestbase + * /test/lib + * @build nsk.jdwp.StackFrame.PopFrames.popframes001a + * @run driver + * nsk.jdwp.StackFrame.PopFrames.popframes001 + * -arch=${os.family}-${os.simpleArch} + * -verbose + * -waittime=5 + * -debugee.vmkind=java + * -transport.address=dynamic + * -popCaller + * -debugee.vmkeys="${test.vm.opts} ${test.java.opts} + * -Xcomp -XX:+PreserveFramePointer + * -XX:CompileCommand=dontinline,*::testedMethod + * -XX:CompileCommand=dontinline,*::stop + * -Dtest.thread.factory=Virtual + * -Dpopframes001.compiledCaller=true" + */ From 8b519abeafc0c98c8c3ca081ec077a4cc8f62e9c Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 10 Nov 2026 04:41:03 +0000 Subject: [PATCH 060/110] 8369472: Assess and remedy any unsafe usage of the Semaphore used by the ZipLibraryLoaderLock Reviewed-by: shade, mgronlun --- src/hotspot/share/runtime/threads.cpp | 5 +++++ src/hotspot/share/utilities/zipLibrary.cpp | 20 ++++++++++++++++---- src/hotspot/share/utilities/zipLibrary.hpp | 4 +++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp index 5b93d82ecaf7..73e253469412 100644 --- a/src/hotspot/share/runtime/threads.cpp +++ b/src/hotspot/share/runtime/threads.cpp @@ -109,6 +109,7 @@ #include "utilities/events.hpp" #include "utilities/macros.hpp" #include "utilities/vmError.hpp" +#include "utilities/zipLibrary.hpp" #ifdef COMPILER2 #include "opto/idealGraphPrinter.hpp" #include "runtime/hotCodeCollector.hpp" @@ -476,6 +477,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { // Initialize the os module os::init(); + // Initialize the ZipLibraryLoaderLock before we potentially start + // loading resources from jar/zip files. + ZipLibrary::initialize_loader_lock(); + // Initialize memory pools Arena::initialize_chunk_pool(); diff --git a/src/hotspot/share/utilities/zipLibrary.cpp b/src/hotspot/share/utilities/zipLibrary.cpp index ad6bb82d43f8..4431132b1d91 100644 --- a/src/hotspot/share/utilities/zipLibrary.cpp +++ b/src/hotspot/share/utilities/zipLibrary.cpp @@ -29,6 +29,7 @@ #include "runtime/os.inline.hpp" #include "runtime/semaphore.inline.hpp" #include "runtime/thread.inline.hpp" +#include "utilities/deferredStatic.hpp" #include "utilities/zipLibrary.hpp" // Entry points in zip.dll for loading zip/jar file entries @@ -122,7 +123,14 @@ static void load_zip_library(bool vm_exit_on_failure) { // class ZipLibraryLoaderLock : public StackObj { private: - static Semaphore _lock; + static DeferredStatic _lock; + friend class ZipLibrary; + // Called from Threads::create_vm() via initialize_loader_lock + static void initialize() { + int sem_count = 1; + _lock.initialize(sem_count); + } + JavaThread* _jt; public: ZipLibraryLoaderLock() : _jt(nullptr) { @@ -134,17 +142,21 @@ class ZipLibraryLoaderLock : public StackObj { ThreadStateTransition::transition_from_vm(jt, _thread_in_native, false); } } - _lock.wait(); + _lock->wait(); } ~ZipLibraryLoaderLock() { - _lock.signal(); + _lock->signal(); if (_jt != nullptr) { ThreadStateTransition::transition_from_native(_jt, _thread_in_vm, false); } } }; -Semaphore ZipLibraryLoaderLock::_lock(1); +DeferredStatic ZipLibraryLoaderLock::_lock; + +void ZipLibrary::initialize_loader_lock() { + ZipLibraryLoaderLock::initialize(); +} static void initialize(bool vm_exit_on_failure = true) { if (is_loaded()) { diff --git a/src/hotspot/share/utilities/zipLibrary.hpp b/src/hotspot/share/utilities/zipLibrary.hpp index 90f55c24c192..5389f015600e 100644 --- a/src/hotspot/share/utilities/zipLibrary.hpp +++ b/src/hotspot/share/utilities/zipLibrary.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,8 @@ typedef struct { } jzentry; class ZipLibrary : AllStatic { + friend class Threads; + static void initialize_loader_lock(); public: static void** open(const char* name, char** pmsg); static void close(jzfile* zip); From 753f8118f053fa9207bfc760185da0654d15cf0e Mon Sep 17 00:00:00 2001 From: Volkan Yazici Date: Tue, 10 Nov 2026 08:01:02 +0000 Subject: [PATCH 061/110] 8396047: build.tools.spp.Spp invocations leave untracked files behind Reviewed-by: erikj, naoto --- .../classes/jdk/incubator/vector/gen-src.sh | 23 ++++--- .../unsafe/generate-unsafe-access-tests.sh | 12 ++-- .../invoke/VarHandles/generate-vh-tests.sh | 35 +++++++++-- test/jdk/java/nio/Buffer/genBasic.sh | 15 +++-- .../java/nio/Buffer/genCopyDirectMemory.sh | 17 +++-- test/jdk/java/nio/Buffer/genOrder.sh | 18 ++++-- .../java/util/Formatter/Basic-X.java.template | 62 ++++++++++++++++++- .../java/util/Formatter/BasicBigDecimal.java | 2 +- .../java/util/Formatter/BasicBigInteger.java | 2 +- .../jdk/java/util/Formatter/BasicBoolean.java | 2 +- .../util/Formatter/BasicBooleanObject.java | 2 +- test/jdk/java/util/Formatter/BasicByte.java | 2 +- .../java/util/Formatter/BasicByteObject.java | 2 +- test/jdk/java/util/Formatter/BasicChar.java | 2 +- .../java/util/Formatter/BasicCharObject.java | 2 +- .../java/util/Formatter/BasicDateTime.java | 14 ++--- test/jdk/java/util/Formatter/BasicDouble.java | 2 +- .../util/Formatter/BasicDoubleObject.java | 2 +- test/jdk/java/util/Formatter/BasicFloat.java | 2 +- .../java/util/Formatter/BasicFloatObject.java | 2 +- test/jdk/java/util/Formatter/BasicInt.java | 2 +- .../java/util/Formatter/BasicIntObject.java | 2 +- test/jdk/java/util/Formatter/BasicLong.java | 2 +- .../java/util/Formatter/BasicLongObject.java | 2 +- test/jdk/java/util/Formatter/BasicShort.java | 2 +- .../java/util/Formatter/BasicShortObject.java | 2 +- test/jdk/java/util/Formatter/genBasic.sh | 17 +++-- .../incubator/vector/ByteVector128Tests.java | 3 +- .../incubator/vector/ByteVector256Tests.java | 3 +- .../incubator/vector/ByteVector512Tests.java | 3 +- .../incubator/vector/ByteVector64Tests.java | 3 +- .../incubator/vector/ByteVectorMaxTests.java | 3 +- .../vector/DoubleVector128Tests.java | 3 +- .../vector/DoubleVector256Tests.java | 3 +- .../vector/DoubleVector512Tests.java | 3 +- .../incubator/vector/DoubleVector64Tests.java | 3 +- .../vector/DoubleVectorMaxTests.java | 3 +- .../incubator/vector/FloatVector128Tests.java | 3 +- .../incubator/vector/FloatVector256Tests.java | 3 +- .../incubator/vector/FloatVector512Tests.java | 3 +- .../incubator/vector/FloatVector64Tests.java | 3 +- .../incubator/vector/FloatVectorMaxTests.java | 3 +- .../incubator/vector/IntVector128Tests.java | 3 +- .../incubator/vector/IntVector256Tests.java | 3 +- .../incubator/vector/IntVector512Tests.java | 3 +- .../incubator/vector/IntVector64Tests.java | 3 +- .../incubator/vector/IntVectorMaxTests.java | 3 +- .../incubator/vector/LongVector128Tests.java | 3 +- .../incubator/vector/LongVector256Tests.java | 3 +- .../incubator/vector/LongVector512Tests.java | 3 +- .../incubator/vector/LongVector64Tests.java | 3 +- .../incubator/vector/LongVectorMaxTests.java | 3 +- .../incubator/vector/ShortVector128Tests.java | 3 +- .../incubator/vector/ShortVector256Tests.java | 3 +- .../incubator/vector/ShortVector512Tests.java | 3 +- .../incubator/vector/ShortVector64Tests.java | 3 +- .../incubator/vector/ShortVectorMaxTests.java | 3 +- test/jdk/jdk/incubator/vector/clean.sh | 25 -------- test/jdk/jdk/incubator/vector/config.sh | 12 ++-- test/jdk/jdk/incubator/vector/gen-tests.sh | 35 +++++------ .../org/openjdk/bench/java/nio/genBuffers.sh | 18 ++++-- 61 files changed, 275 insertions(+), 154 deletions(-) delete mode 100644 test/jdk/jdk/incubator/vector/clean.sh diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh index 7735085a16b3..cf975267caf5 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh @@ -24,6 +24,12 @@ # questions. # +# Toggle Bash strict mode +set -euo pipefail + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + # For manual invocation. # You can regenerate the source files, # and you can clean them up. @@ -44,9 +50,7 @@ case $* in --help|*) echo "Usage: $0 [--generate [file] | --clean | --revert | --list]"; exit 1;; esac -javac -d . ../../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java - -SPP=build.tools.spp.Spp +SPP="../../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" typeprefix= @@ -202,9 +206,15 @@ do shuffletype=${typeprefix}${Type}Shuffle${bits} bitsvectortype=${typeprefix}${Bitstype}Vector${bits} fpvectortype=${typeprefix}${Fptype}Vector${bits} - vectorindexbits=$((bits * 4 / sizeInBytes)) - numLanes=$((bits / (sizeInBytes * 8))) + if [[ $bits == Max ]]; then + vectorindexbits=Max + numLanes=Max + else + vectorindexbits=$((bits * 4 / sizeInBytes)) + numLanes=$((bits / (sizeInBytes * 8))) + fi + if [[ "${numLanes}" == "1" ]]; then lanes=1L elif [[ "${numLanes}" == "2" ]]; then @@ -260,6 +270,3 @@ do done done - -rm -fr build - diff --git a/test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh b/test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh index 32db4148efb3..09dc2a3918c5 100644 --- a/test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh +++ b/test/hotspot/jtreg/compiler/unsafe/generate-unsafe-access-tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,9 +23,13 @@ # questions. # -javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Toggle Bash strict mode +set -euo pipefail -SPP=build.tools.spp.Spp +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" # Generates unsafe access tests for objects and all primitive types # $1 = package name to Unsafe, sun.misc | jdk.internal.misc @@ -138,5 +142,3 @@ function generate { generate sun.misc SunMisc jdk.unsupported generate jdk.internal.misc JdkInternalMisc java.base - -rm -fr build diff --git a/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh b/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh index bbed2bcaf83c..8532b846add6 100644 --- a/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh +++ b/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh @@ -1,8 +1,35 @@ #!/bin/bash -javac -d . ../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java - -SPP=build.tools.spp.Spp +# +# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Toggle Bash strict mode +set -euo pipefail + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" # Generates variable handle tests for objects and all primitive types # This is likely to be a temporary testing approach as it may be more @@ -194,5 +221,3 @@ do rm -f $out java $SPP -nel $args -iX-VarHandleTestByteArrayView.java.template -o$out done - -rm -fr build diff --git a/test/jdk/java/nio/Buffer/genBasic.sh b/test/jdk/java/nio/Buffer/genBasic.sh index d08ca32300fa..51b1198ea020 100644 --- a/test/jdk/java/nio/Buffer/genBasic.sh +++ b/test/jdk/java/nio/Buffer/genBasic.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#!/bin/bash # -# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,12 +23,19 @@ # questions. # -javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Toggle Bash strict mode +set -euo pipefail +IFS=$'\n\t' + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" gen() { out=Basic$2.java rm -f $out - java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iBasic-X.java.template -o$out + java $SPP -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iBasic-X.java.template -o$out } gen byte Byte Byte diff --git a/test/jdk/java/nio/Buffer/genCopyDirectMemory.sh b/test/jdk/java/nio/Buffer/genCopyDirectMemory.sh index 90072c52950c..4c0dfe236a43 100644 --- a/test/jdk/java/nio/Buffer/genCopyDirectMemory.sh +++ b/test/jdk/java/nio/Buffer/genCopyDirectMemory.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#!/bin/bash # -# Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,12 +23,19 @@ # questions. # -javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Toggle Bash strict mode +set -euo pipefail +IFS=$'\n\t' + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" gen() { out=CopyDirect$2Memory.java rm -f $out - java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iCopyDirect-X-Memory.java.template -o$out + java $SPP -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iCopyDirect-X-Memory.java.template -o$out } gen byte Byte Byte @@ -38,5 +45,3 @@ gen int Int Integer gen long Long Long gen float Float Float gen double Double Double - -rm -rf build diff --git a/test/jdk/java/nio/Buffer/genOrder.sh b/test/jdk/java/nio/Buffer/genOrder.sh index cbdd9863df82..bfd04428c549 100644 --- a/test/jdk/java/nio/Buffer/genOrder.sh +++ b/test/jdk/java/nio/Buffer/genOrder.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#!/bin/bash # -# Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,11 +23,19 @@ # questions. # -javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Toggle Bash strict mode +set -euo pipefail +IFS=$'\n\t' + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" + gen() { out=Order$2.java rm -f $out - java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iOrder-X.java.template -o$out + java $SPP -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 -iOrder-X.java.template -o$out } gen char Char Character @@ -36,5 +44,3 @@ gen int Int Integer gen long Long Long gen float Float Float gen double Double Double - -rm -rf build diff --git a/test/jdk/java/util/Formatter/Basic-X.java.template b/test/jdk/java/util/Formatter/Basic-X.java.template index e259bdad5cc0..5c98bd39e538 100644 --- a/test/jdk/java/util/Formatter/Basic-X.java.template +++ b/test/jdk/java/util/Formatter/Basic-X.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,6 +39,10 @@ import java.util.*; import static java.util.Calendar.*; #if[datetime] import static java.util.SimpleTimeZone.*; +import java.text.DecimalFormatSymbols; +import java.time.*; +import java.time.chrono.*; +import java.time.temporal.*; import java.util.regex.Pattern; #end[datetime] @@ -1745,5 +1749,61 @@ public class Basic$Type$ extends Basic { tryCatch("%%%", UnknownFormatConversionException.class); // perhaps an IllegalFormatArgumentIndexException should be defined? tryCatch("%<%", IllegalFormatFlagsException.class); +#if[datetime] + + // %tF LocalDate + test("%tF", "2023-01-13", LocalDate.of(2023, 1, 13)); + test("%tF", "2023-10-03", LocalDate.of(2023, 10, 3)); + test("%tF", "0001-10-03", LocalDate.of(1, 10, 3)); + test("%tF", "0012-10-03", LocalDate.of(12, 10, 3)); + test("%tF", "0123-10-03", LocalDate.of(123, 10, 3)); + test("%tF", "+12345-10-03", LocalDate.of(12345, 10, 3)); + test("%tF", "+12345-10-03", LocalDateTime.of(12345, 10, 3, 0, 0, 0)); + test("%tF", "+12345-10-03", OffsetDateTime.of(LocalDateTime.of(12345, 10, 3, 0, 0, 0), ZoneOffset.UTC)); + test("%tF", "+12345-10-03", ZonedDateTime.of(LocalDateTime.of(12345, 10, 3, 0, 0, 0), ZoneOffset.UTC)); + test("%tF", "-0001-10-03", LocalDate.of(-1, 10, 3)); + test("%tF", "-0012-10-03", LocalDate.of(-12, 10, 3)); + test("%tF", "-0123-10-03", LocalDate.of(-123, 10, 3)); + test("%tF", "-1234-10-03", LocalDate.of(-1234, 10, 3)); + test("%tF", "-12345-10-03", LocalDate.of(-12345, 10, 3)); + test("%tF", "-12345-10-03", LocalDate.of(-12345, 10, 3)); + test("%tF", "-12345-10-03", LocalDateTime.of(-12345, 10, 3, 0, 0, 0)); + test("%tF", "-12345-10-03", OffsetDateTime.of(LocalDateTime.of(-12345, 10, 3, 0, 0, 0), ZoneOffset.UTC)); + test("%tF", "-12345-10-03", ZonedDateTime.of(LocalDateTime.of(-12345, 10, 3, 0, 0, 0), ZoneOffset.UTC)); + + // check minusSign + int year = 2023, month = 1, dayOfMonth = 13; + String specifier = "%tF"; + for (Locale locale : Locale.getAvailableLocales()) { + char minusSign = DecimalFormatSymbols.getInstance(locale).getMinusSign(); + String str = new Formatter(new StringBuilder(), locale) + .format(specifier, LocalDate.of(year, month, dayOfMonth)) + .toString(); + test(locale, specifier, minusSign + str, LocalDate.of(-year, month, dayOfMonth)); + } + + // ja-JP-u-ca-japanese + ChronoLocalDate jpDate = Chronology + .ofLocale(Locale.forLanguageTag("ja-JP-u-ca-japanese")) + .dateNow(); + test(Locale.JAPANESE, + "%tF", + String.format( + "%04d-%02d-%02d", + jpDate.get(ChronoField.YEAR_OF_ERA), + jpDate.get(ChronoField.MONTH_OF_YEAR), + jpDate.get(ChronoField.DAY_OF_MONTH)), + jpDate); + + ChronoLocalDate jpDate1 = JapaneseChronology.INSTANCE.dateNow(); + test(Locale.JAPANESE, + "%tF", + String.format( + "%04d-%02d-%02d", + jpDate1.get(ChronoField.YEAR_OF_ERA), + jpDate1.get(ChronoField.MONTH_OF_YEAR), + jpDate1.get(ChronoField.DAY_OF_MONTH)), + jpDate1); +#end[datetime] } } diff --git a/test/jdk/java/util/Formatter/BasicBigDecimal.java b/test/jdk/java/util/Formatter/BasicBigDecimal.java index 738c30eff597..37d3bcc2582f 100644 --- a/test/jdk/java/util/Formatter/BasicBigDecimal.java +++ b/test/jdk/java/util/Formatter/BasicBigDecimal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicBigInteger.java b/test/jdk/java/util/Formatter/BasicBigInteger.java index cec882d6a0ae..fb5373bc4e26 100644 --- a/test/jdk/java/util/Formatter/BasicBigInteger.java +++ b/test/jdk/java/util/Formatter/BasicBigInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicBoolean.java b/test/jdk/java/util/Formatter/BasicBoolean.java index 19ed3f372244..c35f142aeed0 100644 --- a/test/jdk/java/util/Formatter/BasicBoolean.java +++ b/test/jdk/java/util/Formatter/BasicBoolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicBooleanObject.java b/test/jdk/java/util/Formatter/BasicBooleanObject.java index a92643f45d78..f6a7214584e5 100644 --- a/test/jdk/java/util/Formatter/BasicBooleanObject.java +++ b/test/jdk/java/util/Formatter/BasicBooleanObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicByte.java b/test/jdk/java/util/Formatter/BasicByte.java index c90e03a47c35..ffc26a8e1930 100644 --- a/test/jdk/java/util/Formatter/BasicByte.java +++ b/test/jdk/java/util/Formatter/BasicByte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicByteObject.java b/test/jdk/java/util/Formatter/BasicByteObject.java index 25e752409875..e94014221fe8 100644 --- a/test/jdk/java/util/Formatter/BasicByteObject.java +++ b/test/jdk/java/util/Formatter/BasicByteObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicChar.java b/test/jdk/java/util/Formatter/BasicChar.java index da990f1c998b..9c2c96c09c78 100644 --- a/test/jdk/java/util/Formatter/BasicChar.java +++ b/test/jdk/java/util/Formatter/BasicChar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicCharObject.java b/test/jdk/java/util/Formatter/BasicCharObject.java index 44d16860da65..ee64707d603b 100644 --- a/test/jdk/java/util/Formatter/BasicCharObject.java +++ b/test/jdk/java/util/Formatter/BasicCharObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicDateTime.java b/test/jdk/java/util/Formatter/BasicDateTime.java index 936b695e77f7..fdca179a95a5 100644 --- a/test/jdk/java/util/Formatter/BasicDateTime.java +++ b/test/jdk/java/util/Formatter/BasicDateTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,18 +34,14 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.text.DateFormatSymbols; -import java.text.DecimalFormatSymbols; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.OffsetDateTime; -import java.time.ZonedDateTime; -import java.time.ZoneOffset; -import java.time.chrono.*; -import java.time.temporal.ChronoField; import java.util.*; import static java.util.Calendar.*; import static java.util.SimpleTimeZone.*; +import java.text.DecimalFormatSymbols; +import java.time.*; +import java.time.chrono.*; +import java.time.temporal.*; import java.util.regex.Pattern; public class BasicDateTime extends Basic { diff --git a/test/jdk/java/util/Formatter/BasicDouble.java b/test/jdk/java/util/Formatter/BasicDouble.java index 1bc395713a40..5f627d55efde 100644 --- a/test/jdk/java/util/Formatter/BasicDouble.java +++ b/test/jdk/java/util/Formatter/BasicDouble.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicDoubleObject.java b/test/jdk/java/util/Formatter/BasicDoubleObject.java index e499f0cdce81..2883a0812813 100644 --- a/test/jdk/java/util/Formatter/BasicDoubleObject.java +++ b/test/jdk/java/util/Formatter/BasicDoubleObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicFloat.java b/test/jdk/java/util/Formatter/BasicFloat.java index e490af6f6f3a..6294bff998a1 100644 --- a/test/jdk/java/util/Formatter/BasicFloat.java +++ b/test/jdk/java/util/Formatter/BasicFloat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicFloatObject.java b/test/jdk/java/util/Formatter/BasicFloatObject.java index ab3de8099f0e..d047f7d13702 100644 --- a/test/jdk/java/util/Formatter/BasicFloatObject.java +++ b/test/jdk/java/util/Formatter/BasicFloatObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicInt.java b/test/jdk/java/util/Formatter/BasicInt.java index 4d849534293c..7286703f4f73 100644 --- a/test/jdk/java/util/Formatter/BasicInt.java +++ b/test/jdk/java/util/Formatter/BasicInt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicIntObject.java b/test/jdk/java/util/Formatter/BasicIntObject.java index b07eef69c214..266069f0690c 100644 --- a/test/jdk/java/util/Formatter/BasicIntObject.java +++ b/test/jdk/java/util/Formatter/BasicIntObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicLong.java b/test/jdk/java/util/Formatter/BasicLong.java index 750b07f1d120..6c6ea3059bdb 100644 --- a/test/jdk/java/util/Formatter/BasicLong.java +++ b/test/jdk/java/util/Formatter/BasicLong.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicLongObject.java b/test/jdk/java/util/Formatter/BasicLongObject.java index b8e1a787b366..e10634becba8 100644 --- a/test/jdk/java/util/Formatter/BasicLongObject.java +++ b/test/jdk/java/util/Formatter/BasicLongObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicShort.java b/test/jdk/java/util/Formatter/BasicShort.java index 771120e2183b..54cefd770503 100644 --- a/test/jdk/java/util/Formatter/BasicShort.java +++ b/test/jdk/java/util/Formatter/BasicShort.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/BasicShortObject.java b/test/jdk/java/util/Formatter/BasicShortObject.java index b73e3d84e646..128cd5cdfc6e 100644 --- a/test/jdk/java/util/Formatter/BasicShortObject.java +++ b/test/jdk/java/util/Formatter/BasicShortObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/java/util/Formatter/genBasic.sh b/test/jdk/java/util/Formatter/genBasic.sh index 247f42a4edea..6f0b5c90dc3b 100644 --- a/test/jdk/java/util/Formatter/genBasic.sh +++ b/test/jdk/java/util/Formatter/genBasic.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#!/bin/bash # -# Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,14 @@ # questions. # -javac -d . ../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Enable Bash strict mode +set -euo pipefail +IFS=$'\n\t' + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" gen() { # if [ $3 = "true" ] @@ -32,7 +39,7 @@ gen() { # fi out=Basic$2.java rm -f $out - java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 -iBasic-X.java.template -nel -o$out + java $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 -iBasic-X.java.template -nel -o$out } gen boolean Boolean prim "" "" "" @@ -56,5 +63,3 @@ gen Double DoubleObject "" fp "" "" gen BigDecimal BigDecimal "" fp "" "" gen Calendar DateTime "" "" "" datetime - -rm -rf build diff --git a/test/jdk/jdk/incubator/vector/ByteVector128Tests.java b/test/jdk/jdk/incubator/vector/ByteVector128Tests.java index b605182e496e..13413a411a5b 100644 --- a/test/jdk/jdk/incubator/vector/ByteVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/ByteVector128Tests.java @@ -6912,7 +6912,8 @@ static void toStringByteVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); byte subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ByteVector256Tests.java b/test/jdk/jdk/incubator/vector/ByteVector256Tests.java index bc05a0bd6cae..cb33f6d3268c 100644 --- a/test/jdk/jdk/incubator/vector/ByteVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/ByteVector256Tests.java @@ -6912,7 +6912,8 @@ static void toStringByteVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); byte subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ByteVector512Tests.java b/test/jdk/jdk/incubator/vector/ByteVector512Tests.java index 45038c538243..a51296aeca38 100644 --- a/test/jdk/jdk/incubator/vector/ByteVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/ByteVector512Tests.java @@ -6912,7 +6912,8 @@ static void toStringByteVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); byte subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ByteVector64Tests.java b/test/jdk/jdk/incubator/vector/ByteVector64Tests.java index b350d0a8ee0f..e8973e1b8027 100644 --- a/test/jdk/jdk/incubator/vector/ByteVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/ByteVector64Tests.java @@ -6912,7 +6912,8 @@ static void toStringByteVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); byte subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java b/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java index ba2307f15b12..789279eaa389 100644 --- a/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java @@ -6918,7 +6918,8 @@ static void toStringByteVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); byte subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java b/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java index 7bec91b698b3..14670f3a97c9 100644 --- a/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java @@ -5377,7 +5377,8 @@ static void toStringDoubleVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); double subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java b/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java index 3da554e67e57..e10ef8af0d4b 100644 --- a/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java @@ -5377,7 +5377,8 @@ static void toStringDoubleVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); double subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java b/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java index 6c060714da8f..ae8f375b975f 100644 --- a/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java @@ -5377,7 +5377,8 @@ static void toStringDoubleVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); double subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java b/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java index 9e34cbc3a318..aee5be2947f4 100644 --- a/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java @@ -5377,7 +5377,8 @@ static void toStringDoubleVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); double subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java b/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java index 74be9b42a8b5..6fdbe0f0be17 100644 --- a/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java @@ -5383,7 +5383,8 @@ static void toStringDoubleVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); double subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/FloatVector128Tests.java b/test/jdk/jdk/incubator/vector/FloatVector128Tests.java index eb4b686d41fa..69e80b8ff02a 100644 --- a/test/jdk/jdk/incubator/vector/FloatVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/FloatVector128Tests.java @@ -5362,7 +5362,8 @@ static void toStringFloatVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); float subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/FloatVector256Tests.java b/test/jdk/jdk/incubator/vector/FloatVector256Tests.java index f00bf19d383a..394605f518e6 100644 --- a/test/jdk/jdk/incubator/vector/FloatVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/FloatVector256Tests.java @@ -5362,7 +5362,8 @@ static void toStringFloatVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); float subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/FloatVector512Tests.java b/test/jdk/jdk/incubator/vector/FloatVector512Tests.java index 573bcc59c639..e97f603a5799 100644 --- a/test/jdk/jdk/incubator/vector/FloatVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/FloatVector512Tests.java @@ -5362,7 +5362,8 @@ static void toStringFloatVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); float subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/FloatVector64Tests.java b/test/jdk/jdk/incubator/vector/FloatVector64Tests.java index 8244ffabb51a..ca14d4b69a48 100644 --- a/test/jdk/jdk/incubator/vector/FloatVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/FloatVector64Tests.java @@ -5362,7 +5362,8 @@ static void toStringFloatVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); float subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java b/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java index 30c470e05f42..5f793f9b5096 100644 --- a/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java @@ -5368,7 +5368,8 @@ static void toStringFloatVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); float subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/IntVector128Tests.java b/test/jdk/jdk/incubator/vector/IntVector128Tests.java index 2b36a2802eb6..09fe6ee8f848 100644 --- a/test/jdk/jdk/incubator/vector/IntVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/IntVector128Tests.java @@ -6956,7 +6956,8 @@ static void toStringIntVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/IntVector256Tests.java b/test/jdk/jdk/incubator/vector/IntVector256Tests.java index 9d4632b88dd2..ac25fd78dae2 100644 --- a/test/jdk/jdk/incubator/vector/IntVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/IntVector256Tests.java @@ -6956,7 +6956,8 @@ static void toStringIntVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/IntVector512Tests.java b/test/jdk/jdk/incubator/vector/IntVector512Tests.java index aa3c3eccf5b8..fe22bdf2fa27 100644 --- a/test/jdk/jdk/incubator/vector/IntVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/IntVector512Tests.java @@ -6956,7 +6956,8 @@ static void toStringIntVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/IntVector64Tests.java b/test/jdk/jdk/incubator/vector/IntVector64Tests.java index 89247f9f932d..8d09a4475dc0 100644 --- a/test/jdk/jdk/incubator/vector/IntVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/IntVector64Tests.java @@ -6956,7 +6956,8 @@ static void toStringIntVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java b/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java index 3272dbbb3de9..6ac995fd1042 100644 --- a/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java @@ -6962,7 +6962,8 @@ static void toStringIntVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/LongVector128Tests.java b/test/jdk/jdk/incubator/vector/LongVector128Tests.java index 30f1ecc2bf43..26ec1bfa87a9 100644 --- a/test/jdk/jdk/incubator/vector/LongVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/LongVector128Tests.java @@ -6902,7 +6902,8 @@ static void toStringLongVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); long subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/LongVector256Tests.java b/test/jdk/jdk/incubator/vector/LongVector256Tests.java index 6dd2f359742e..d3a50d4b4bd2 100644 --- a/test/jdk/jdk/incubator/vector/LongVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/LongVector256Tests.java @@ -6902,7 +6902,8 @@ static void toStringLongVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); long subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/LongVector512Tests.java b/test/jdk/jdk/incubator/vector/LongVector512Tests.java index 6347a1b53a28..8c9536441bd3 100644 --- a/test/jdk/jdk/incubator/vector/LongVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/LongVector512Tests.java @@ -6902,7 +6902,8 @@ static void toStringLongVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); long subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/LongVector64Tests.java b/test/jdk/jdk/incubator/vector/LongVector64Tests.java index 0518c17b75f0..0e27044a694d 100644 --- a/test/jdk/jdk/incubator/vector/LongVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/LongVector64Tests.java @@ -6902,7 +6902,8 @@ static void toStringLongVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); long subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java b/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java index f5ab956b5a7c..725307e305a0 100644 --- a/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java @@ -6908,7 +6908,8 @@ static void toStringLongVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); long subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ShortVector128Tests.java b/test/jdk/jdk/incubator/vector/ShortVector128Tests.java index 1573748b925d..07f16a0cf2ed 100644 --- a/test/jdk/jdk/incubator/vector/ShortVector128Tests.java +++ b/test/jdk/jdk/incubator/vector/ShortVector128Tests.java @@ -6908,7 +6908,8 @@ static void toStringShortVector128TestsSmokeTest(IntFunction fa) { String str = av.toString(); short subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ShortVector256Tests.java b/test/jdk/jdk/incubator/vector/ShortVector256Tests.java index 059388477e89..6cdd2f953cf1 100644 --- a/test/jdk/jdk/incubator/vector/ShortVector256Tests.java +++ b/test/jdk/jdk/incubator/vector/ShortVector256Tests.java @@ -6908,7 +6908,8 @@ static void toStringShortVector256TestsSmokeTest(IntFunction fa) { String str = av.toString(); short subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ShortVector512Tests.java b/test/jdk/jdk/incubator/vector/ShortVector512Tests.java index 3e39d1bc32f0..fea7400a640f 100644 --- a/test/jdk/jdk/incubator/vector/ShortVector512Tests.java +++ b/test/jdk/jdk/incubator/vector/ShortVector512Tests.java @@ -6908,7 +6908,8 @@ static void toStringShortVector512TestsSmokeTest(IntFunction fa) { String str = av.toString(); short subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ShortVector64Tests.java b/test/jdk/jdk/incubator/vector/ShortVector64Tests.java index e78eb2ee2837..0641eebbee84 100644 --- a/test/jdk/jdk/incubator/vector/ShortVector64Tests.java +++ b/test/jdk/jdk/incubator/vector/ShortVector64Tests.java @@ -6908,7 +6908,8 @@ static void toStringShortVector64TestsSmokeTest(IntFunction fa) { String str = av.toString(); short subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java b/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java index dbcb69123232..12c0cc68ce82 100644 --- a/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java +++ b/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java @@ -6914,7 +6914,8 @@ static void toStringShortVectorMaxTestsSmokeTest(IntFunction fa) { String str = av.toString(); short subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length()); - Assert.assertTrue(str.equals(Arrays.toString(subarr)), "at index " + i + ", string should be = " + Arrays.toString(subarr) + ", but is = " + str); + String expectedStr = Arrays.toString(subarr); + Assert.assertTrue(str.equals(expectedStr), "at index " + i + ", string should be = " + expectedStr + ", but is = " + str); } } diff --git a/test/jdk/jdk/incubator/vector/clean.sh b/test/jdk/jdk/incubator/vector/clean.sh deleted file mode 100644 index 6b2d6f5e0ea3..000000000000 --- a/test/jdk/jdk/incubator/vector/clean.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -rm -rf build.log diff --git a/test/jdk/jdk/incubator/vector/config.sh b/test/jdk/jdk/incubator/vector/config.sh index 19551b4d8809..626b1804713b 100644 --- a/test/jdk/jdk/incubator/vector/config.sh +++ b/test/jdk/jdk/incubator/vector/config.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,11 +27,9 @@ JDK_SRC_HOME="./../../../../../" JAVA="${JAVA_HOME}/bin/java" JAVAC="${JAVA_HOME}/bin/javac" BUILDLOG_FILE="./build.log" -SPP_CLASSNAME="build.tools.spp.Spp" -# Windows: Classpath Separator is ';' -# Linux: ':' -SEPARATOR=":" -TYPEPREFIX="" +SPP="${JDK_SRC_HOME}/make/jdk/src/classes/build/tools/spp/Spp.java" +typeprefix="" +abstractbitsvectortype="" TEMPLATE_FILE="unit_tests.template" TEST_ITER_COUNT=100 @@ -57,7 +55,7 @@ function LogRun () { # Windows uses ";", while Unix-based OSes use ":" uname_s=$(uname -s) VECTORTESTS_HOME_CP=$VECTORTESTS_HOME -if [ "x${VAR_OS_ENV}" == "xwindows.cygwin" ]; then +if [ "x${VAR_OS_ENV:-}" == "xwindows.cygwin" ]; then VECTORTESTS_HOME_CP=$(cygpath -pw $VECTORTESTS_HOME) fi diff --git a/test/jdk/jdk/incubator/vector/gen-tests.sh b/test/jdk/jdk/incubator/vector/gen-tests.sh index 6890f4e1cddd..6ddb556c4821 100644 --- a/test/jdk/jdk/incubator/vector/gen-tests.sh +++ b/test/jdk/jdk/incubator/vector/gen-tests.sh @@ -22,6 +22,12 @@ # questions. # +# Toggle Bash strict mode +set -euo pipefail + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + # For manual invocation. # You can regenerate the source files, # and you can clean them up. @@ -45,12 +51,6 @@ bash ./gen-template.sh $generate_perf_tests Log false "Generating Vector API tests, $(date)\n" -# Compile SPP -Log true "Compiling SPP... " -compilation=$(${JAVAC} -d . "${JDK_SRC_HOME}/make/jdk/src/classes/build/tools/spp/Spp.java") -Log false "$compilation\n" -Log true "done\n" - # For each type for type in byte short int long float double float16 do @@ -148,10 +148,10 @@ do for bits in 64 128 256 512 Max do - vectortype=${typeprefix}${Type}$Vector{bits} + vectortype=${typeprefix}${Type}Vector${bits} vectorteststype=${typeprefix}${Type}Vector${bits}Tests vectorbenchtype=${typeprefix}${Type}Vector${bits} - masktype=${typeprefix}${Type}$Mask{bits} + masktype=${typeprefix}${Type}Mask${bits} bitsvectortype=${typeprefix}${Bitstype}Vector${bits} fpvectortype=${typeprefix}${Fptype}Vector${bits} shape=S${bits}Bit @@ -168,10 +168,10 @@ do case $vectorteststype in $CLASS_FILTER) Log true " ${bits}_jtreg $vectorteststype.java" - Log false "${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs -i${TEMPLATE_FILE} -o$vectorteststype.java " + Log false "${JAVA} -cp . ${SPP} -nel $bitargs -i${TEMPLATE_FILE} -o${vectorteststype}.java " TEST_DEST_FILE="${vectorteststype}.java" rm -f ${TEST_DEST_FILE} - ${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs \ + ${JAVA} -cp . ${SPP} -nel $bitargs \ -i${TEMPLATE_FILE} \ -o${TEST_DEST_FILE} if [ VAR_OS_ENV==windows.cygwin ]; then @@ -186,10 +186,10 @@ do case $vectorbenchtype in $CLASS_FILTER) Log true " ${bits}_jmh $vectorbenchtype.java" - Log false "${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs -i${PERF_TEMPLATE_FILE} -o${vectorteststype}Perf.java " + Log false "${JAVA} -cp . ${SPP} -nel $bitargs -i${PERF_TEMPLATE_FILE} -o${vectorteststype}Perf.java " PERF_DEST_FILE="${PERF_DEST}/${vectorbenchtype}.java" rm -f ${PERF_DEST_FILE} - ${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs \ + ${JAVA} -cp . ${SPP} -nel $bitargs \ -i${PERF_TEMPLATE_FILE} \ -o${PERF_DEST_FILE} if [ VAR_OS_ENV==windows.cygwin ]; then @@ -208,7 +208,7 @@ do Log true " scalar ${Type}Scalar.java" PERF_DEST_FILE="${PERF_DEST}/${Type}Scalar.java" rm -f ${PERF_DEST_FILE} - ${JAVA} -cp . ${SPP_CLASSNAME} -nel $args \ + ${JAVA} -cp . ${SPP} -nel $args \ -i${PERF_SCALAR_TEMPLATE_FILE} \ -o${PERF_DEST_FILE} if [ VAR_OS_ENV==windows.cygwin ]; then @@ -243,10 +243,10 @@ do case $vectorteststype in $CLASS_FILTER) Log true " ${bits}_ls $vectorteststype.java" - Log false "${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs -itemplates/X-LoadStoreTest.java.template -o$vectorteststype.java " + Log false "${JAVA} -cp . ${SPP} -nel $bitargs -itemplates/X-LoadStoreTest.java.template -o$vectorteststype.java " TEST_DEST_FILE="${vectorteststype}.java" rm -f ${TEST_DEST_FILE} - ${JAVA} -cp . ${SPP_CLASSNAME} -nel $bitargs \ + ${JAVA} -cp . ${SPP} -nel $bitargs \ -itemplates/X-LoadStoreTest.java.template \ -o${TEST_DEST_FILE} if [ VAR_OS_ENV==windows.cygwin ]; then @@ -259,8 +259,7 @@ do # TODO: Generate jmh performance tests for LoadStore variants done - Log true " done\n" - done -rm -fr build +rm -f ${BUILDLOG_FILE} +rm -f ${TEMPLATE_FILE} diff --git a/test/micro/org/openjdk/bench/java/nio/genBuffers.sh b/test/micro/org/openjdk/bench/java/nio/genBuffers.sh index ec515cf887b0..edc53a882155 100644 --- a/test/micro/org/openjdk/bench/java/nio/genBuffers.sh +++ b/test/micro/org/openjdk/bench/java/nio/genBuffers.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#!/bin/bash # -# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,13 @@ # questions. # -javac -d . ../../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java +# Toggle Bash strict mode +set -euo pipefail + +# Switch to the directory this script is located in +cd "$(dirname "$0")" + +SPP="../../../../../../../make/jdk/src/classes/build/tools/spp/Spp.java" genBin() { for MS in "Heap" "Direct" @@ -36,7 +42,7 @@ genBin() { if [ "$RO" == "RO" ] ; then extraArgs="-KRO" fi - java build.tools.spp.Spp -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ + java $SPP -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ $extraArgs \ -Kview \ -DMs=$MS \ @@ -54,10 +60,10 @@ genBin() { gen() { out=$2Buffers.java rm -f $out - java build.tools.spp.Spp -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ + java $SPP -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ -DCarrierBW=$4 -iX-Buffers.java.template -o$out - java build.tools.spp.Spp -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ + java $SPP -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \ -DMs=Heap -Dms=heap -DSWAP="" -DRO="" -iX-Buffers-bin.java.template -o$out if [ "$1" == "byte" ] ; then From d61a2d8b41f504ea5999e5eeb3787aed9c5eb515 Mon Sep 17 00:00:00 2001 From: Volkan Yazici Date: Tue, 10 Nov 2026 08:12:46 +0000 Subject: [PATCH 062/110] 8396660: Documented value for the sun.net.httpserver.maxReqHeaderSize system property is incorrect Reviewed-by: dfuchs, jpai --- .../sun/net/httpserver/ServerConfig.java | 2 +- .../MaxReqHeaderSizePropertyTest.java | 310 ++++++++++++++++++ 2 files changed, 311 insertions(+), 1 deletion(-) create mode 100644 test/jdk/com/sun/net/httpserver/property/MaxReqHeaderSizePropertyTest.java diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java index 3bc836186cda..7a6b3a8685cc 100644 --- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java +++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerConfig.java @@ -46,7 +46,7 @@ class ServerConfig { // timing out request/response if max request/response time is configured private static final long DEFAULT_REQ_RSP_TIMER_TASK_SCHEDULE_MILLIS = 1000; private static final int DEFAULT_MAX_REQ_HEADERS = 200; - private static final int DEFAULT_MAX_REQ_HEADER_SIZE = 380 * 1024; + private static final int DEFAULT_MAX_REQ_HEADER_SIZE = 384 * 1024; private static final long DEFAULT_DRAIN_AMOUNT = 64 * 1024; private static final long idleTimerScheduleMillis; diff --git a/test/jdk/com/sun/net/httpserver/property/MaxReqHeaderSizePropertyTest.java b/test/jdk/com/sun/net/httpserver/property/MaxReqHeaderSizePropertyTest.java new file mode 100644 index 000000000000..0dc3e583ad6d --- /dev/null +++ b/test/jdk/com/sun/net/httpserver/property/MaxReqHeaderSizePropertyTest.java @@ -0,0 +1,310 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import jdk.test.lib.format.Format; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static java.nio.charset.StandardCharsets.US_ASCII; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +/* + * @test id=default + * @bug 8396660 + * @summary Verifies `HttpServer` behavior when + * `sun.net.httpserver.maxReqHeaderSize` is not configured, and left to + * its default, 393216. + * + * @library /test/lib + * + * @run junit/othervm ${test.main.class} + */ + +/* + * @test id=200 + * @bug 8396660 + * @summary Verifies `HttpServer` behavior when + * `sun.net.httpserver.maxReqHeaderSize` is configured to 200. + * + * @library /test/lib + * + * @run junit/othervm -Dsun.net.httpserver.maxReqHeaderSize=200 ${test.main.class} + */ + +class MaxReqHeaderSizePropertyTest { + + /** + * The {@code com.sun.net.httpserver} logger anchor to avoid getting it garbage-collected. + */ + private static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver"); + + /** + * The offset {@code HttpServer} uses for each header entry while checking + * {@code maxReqHeaderSize}. + */ + private static final int OFFSET = 32 + // First letter of the header is inadvertently charged twice + + 1; + + static { + boolean enableLogging = System.getProperty("test.enableLogging") != null; + if (enableLogging) { + LOGGER.setLevel(Level.ALL); // 0. Set `HttpServer`'s logger to `ALL` + Logger.getLogger("") // 1. Get the root logger + .getHandlers()[0] // 2. Get its first handler (by default it's a `ConsoleHandler`) + .setLevel(Level.ALL); // 3. Sets its level to `ALL` (by default it's `INFO`) + } + } + + private static final HttpServer SERVER = createServer(); + + private static HttpServer createServer() { + final HttpServer server; + try { + server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + } catch (IOException ioe) { + throw new UncheckedIOException(ioe); + } + server.createContext("/", new NoContentReturningHandler()); + server.start(); + return server; + } + + @AfterAll + static void stopServer() { + SERVER.stop(0); + } + + private static final int MAX_REQUEST_HEADER_SIZE = effectiveMaxRequestHeaderSize(); + + private static int effectiveMaxRequestHeaderSize() { + var count = Integer.getInteger("sun.net.httpserver.maxReqHeaderSize"); + return count != null && count > 0 ? count : 393216; + } + + private static final String REQUEST_LINE = "GET / HTTP/1.1"; + + private Socket clientSocket; + + @BeforeEach + void openClientSocket() throws IOException { + var serverAddress = SERVER.getAddress(); + this.clientSocket = new Socket(serverAddress.getAddress(), serverAddress.getPort()); + } + + @AfterEach + void closeClientSocket() throws IOException { + clientSocket.close(); + } + + static List args() { + + List args = new ArrayList<>(); + + args.add(Arguments.of( + "at limit", true, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET; + lines.add("k:" + "v".repeat(valueLength)); + }))); + + var S = " "; + args.add(Arguments.of( + "at limit with extra whitespace before the key", true, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET; + lines.add(S + "k:" + "v".repeat(valueLength)); + }))); + + args.add(Arguments.of( + "at limit with extra whitespace after the key", + // No whitespace is allowed between the field name and colon (RFC 9112) + false, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET; + lines.add("k" + S + ":" + "v".repeat(valueLength)); + }))); + + args.add(Arguments.of( + "at limit with extra whitespace before the value", + // Leading whitespace is taken into account while calculating the "size" of the value. + false, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET; + lines.add("k" + ":" + S + "v".repeat(valueLength)); + }))); + + args.add(Arguments.of( + "at limit with extra whitespace after the value", + // Trailing whitespace is taken into account while calculating the "size" of the value. + false, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET; + lines.add("k" + ":" + "v".repeat(valueLength) + S); + }))); + + args.add(Arguments.of( + "off limit due to excessive key", false, + createRequestHeaderLines(lines -> { + int keyLength = 50 + - 2 // ":v" (value) + - OFFSET + + 1; // excess + lines.add("x".repeat(keyLength) + ":v"); + }))); + + args.add(Arguments.of( + "off limit due to excessive value", false, + createRequestHeaderLines(lines -> { + int valueLength = 50 + - 2 // "k:" (key) + - OFFSET + + 1; // excess + lines.add("k:" + "v".repeat(valueLength)); + }))); + + return args; + + } + + /** + * Creates headers that would fill up the configured + * {@code sun.net.httpserver.maxReqHeaderSize} limit, and leaves room for 50 + * characters to be used by the provided {@code consumer}. + * + * @param consumer a function to modify the list of populated headers before + * returning them + * @return the list of populated headers + */ + private static List createRequestHeaderLines( + Consumer> consumer) { + var lines = new ArrayList(); + var hostHeader = "host:localhost"; + lines.add(hostHeader); + int paddingHeaderValueLength = MAX_REQUEST_HEADER_SIZE + // Request line + 32 + - REQUEST_LINE.length() - 32 + // Host header + OFFSET + - hostHeader.length() - OFFSET + // "a:" + OFFSET (for the padding header) + - 2 - OFFSET + // 50 (for `consumer` to inject) + - 50; + var paddingHeader = "a:" + "b".repeat(paddingHeaderValueLength); + lines.add(paddingHeader); + consumer.accept(lines); + return lines; + } + + @ParameterizedTest(name = "{0}") + @MethodSource("args") + void test(String description, boolean shouldSucceed, List requestHeaderLines) throws IOException { + if (shouldSucceed) { + sendRequest(clientSocket, requestHeaderLines); + } else { + assertThrows(SocketException.class, () -> sendRequest(clientSocket, requestHeaderLines)); + } + } + + private static void sendRequest( + Socket clientSocket, List requestHeaderLines) + throws IOException { + LOGGER.info("Sending request"); + var socketOutput = clientSocket.getOutputStream(); + List requestLines = new ArrayList<>(); + requestLines.add(REQUEST_LINE); + requestLines.addAll(requestHeaderLines); + var request = String.join("\r\n", requestLines); + socketOutput.write(request.getBytes(US_ASCII)); + socketOutput.write("\r\n\r\n".getBytes(US_ASCII)); + socketOutput.flush(); + var inputStream = clientSocket.getInputStream(); + assertEquals("HTTP/1.1 204 No Content", readUntilCrLf(inputStream)); + // Consume headers, including the terminating empty line + while (!readUntilCrLf(inputStream).isEmpty()); + } + + private static String readUntilCrLf(InputStream inputStream) throws IOException { + var buffer = new StringBuilder(); + var prevChar = -1; + while (true) { + int nextChar = inputStream.read(); + if (nextChar < 0) { + // `SocketException` is caught to detect the peer disconnect + throw new SocketException("EOF after reading: " + Format.asLiteral(buffer)); + } + buffer.append((char) nextChar); + if (prevChar == '\r' && nextChar == '\n') { + break; + } + prevChar = nextChar; + } + // Drop CRLF + buffer.setLength(buffer.length() - 2); + return buffer.toString(); + } + + private static final class NoContentReturningHandler implements HttpHandler { + + @Override + public void handle(HttpExchange exchange) throws IOException { + LOGGER.info("Received request (target=%s)".formatted(exchange.getRequestURI())); + try (exchange) { + exchange.sendResponseHeaders(204, HttpExchange.RSPBODY_EMPTY); + } + } + + } + +} From 238d39c32ac90d53d0aab84de9324dee36fce0fb Mon Sep 17 00:00:00 2001 From: Volkan Yazici Date: Tue, 10 Nov 2026 08:13:49 +0000 Subject: [PATCH 063/110] 8396512: Remove sun.net.www.http.HttpCapture Reviewed-by: jpai, djelinski, dfuchs --- .../classes/sun/net/www/http/HttpCapture.java | 169 ------------------ .../net/www/http/HttpCaptureInputStream.java | 76 -------- .../net/www/http/HttpCaptureOutputStream.java | 73 -------- .../classes/sun/net/www/http/HttpClient.java | 11 -- 4 files changed, 329 deletions(-) delete mode 100644 src/java.base/share/classes/sun/net/www/http/HttpCapture.java delete mode 100644 src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java delete mode 100644 src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java diff --git a/src/java.base/share/classes/sun/net/www/http/HttpCapture.java b/src/java.base/share/classes/sun/net/www/http/HttpCapture.java deleted file mode 100644 index 7d0254e24f67..000000000000 --- a/src/java.base/share/classes/sun/net/www/http/HttpCapture.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.net.www.http; - -import java.io.*; -import java.util.ArrayList; -import java.util.regex.*; -import sun.net.NetProperties; -import sun.util.logging.PlatformLogger; - -/** - * Main class of the HTTP traffic capture tool. - * Captures are triggered by the sun.net.http.captureRules system property. - * If set, it should point to a file containing the capture rules. - * Format for the file is simple: - * - 1 rule per line - * - Lines starting with a # are considered comments and ignored - * - a rule is a pair of a regular expression and file pattern, separated by a comma - * - The regular expression is applied to URLs, if it matches, the traffic for - * that URL will be captured in the associated file. - * - if the file name contains a '%d', then that sequence will be replaced by a - * unique random number for each URL. This allow for multi-threaded captures - * of URLs matching the same pattern. - * - Rules are checked in sequence, in the same order as in the file, until a - * match is found or the end of the list is reached. - * - * Examples of rules: - * www\.sun\.com , sun%d.log - * yahoo\.com\/.*asf , yahoo.log - * - * @author jccollet - */ -public class HttpCapture { - // HttpCapture does blocking I/O operations while holding monitors. - // This is not a concern because it is rarely used. - private final File file; - private boolean incoming = true; - private BufferedWriter out; - private static boolean initialized; - private static volatile ArrayList patterns; - private static volatile ArrayList capFiles; - - private static synchronized void init() { - initialized = true; - - String rulesFile = NetProperties.get("sun.net.http.captureRules"); - if (rulesFile != null && !rulesFile.isEmpty()) { - BufferedReader in; - try { - in = new BufferedReader(new FileReader(rulesFile)); - } catch (FileNotFoundException ex) { - return; - } - try { - String line = in.readLine(); - while (line != null) { - line = line.trim(); - if (!line.startsWith("#")) { - // skip line if it's a comment - String[] s = line.split(","); - if (s.length == 2) { - if (patterns == null) { - patterns = new ArrayList<>(); - capFiles = new ArrayList<>(); - } - patterns.add(Pattern.compile(s[0].trim())); - capFiles.add(s[1].trim()); - } - } - line = in.readLine(); - } - } catch (IOException ioe) { - - } finally { - try { - in.close(); - } catch (IOException ex) { - } - } - } - } - - private static synchronized boolean isInitialized() { - return initialized; - } - - private HttpCapture(File f, java.net.URL url) { - file = f; - try { - out = new BufferedWriter(new FileWriter(file, true)); - out.write("URL: " + url + "\n"); - } catch (IOException ex) { - PlatformLogger.getLogger(HttpCapture.class.getName()).severe(null, ex); - } - } - - public synchronized void sent(int c) throws IOException { - if (incoming) { - out.write("\n------>\n"); - incoming = false; - out.flush(); - } - out.write(c); - } - - public synchronized void received(int c) throws IOException { - if (!incoming) { - out.write("\n<------\n"); - incoming = true; - out.flush(); - } - out.write(c); - } - - public synchronized void flush() throws IOException { - out.flush(); - } - - public static HttpCapture getCapture(java.net.URL url) { - if (!isInitialized()) { - init(); - } - if (patterns == null || patterns.isEmpty()) { - return null; - } - String s = url.toString(); - for (int i = 0; i < patterns.size(); i++) { - Pattern p = patterns.get(i); - if (p.matcher(s).find()) { - String f = capFiles.get(i); - File fi; - if (f.contains("%d")) { - java.util.Random rand = new java.util.Random(); - do { - String f2 = f.replace("%d", Integer.toString(rand.nextInt())); - fi = new File(f2); - } while (fi.exists()); - } else { - fi = new File(f); - } - return new HttpCapture(fi, url); - } - } - return null; - } -} diff --git a/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java b/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java deleted file mode 100644 index ff0edf54e0ea..000000000000 --- a/src/java.base/share/classes/sun/net/www/http/HttpCaptureInputStream.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.net.www.http; -import java.io.*; - -/** - * A Simple FilterInputStream subclass to capture HTTP traffic. - * Every byte read is also passed to the HttpCapture class. - * - * @author jccollet - */ -public class HttpCaptureInputStream extends FilterInputStream { - private HttpCapture capture = null; - - public HttpCaptureInputStream(InputStream in, HttpCapture cap) { - super(in); - capture = cap; - } - - @Override - public int read() throws IOException { - int i = super.read(); - capture.received(i); - return i; - } - - @Override - public void close() throws IOException { - try { - capture.flush(); - } catch (IOException iOException) { - } - super.close(); - } - - @Override - public int read(byte[] b) throws IOException { - int ret = super.read(b); - for (int i = 0; i < ret; i++) { - capture.received(b[i]); - } - return ret; - } - - @Override - public int read(byte[] b, int off, int len) throws IOException { - int ret = super.read(b, off, len); - for (int i = 0; i < ret; i++) { - capture.received(b[off+i]); - } - return ret; - } -} diff --git a/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java b/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java deleted file mode 100644 index e402c1c258bb..000000000000 --- a/src/java.base/share/classes/sun/net/www/http/HttpCaptureOutputStream.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.net.www.http; -import java.io.*; - -/** - * A Simple FilterOutputStream subclass to capture HTTP traffic. - * Every byte written is also passed to the HttpCapture class. - * - * @author jccollet - */ -public class HttpCaptureOutputStream extends FilterOutputStream { - private HttpCapture capture = null; - - public HttpCaptureOutputStream(OutputStream out, HttpCapture cap) { - super(out); - capture = cap; - } - - @Override - public void write(int b) throws IOException { - capture.sent(b); - out.write(b); - } - - @Override - public void write(byte[] ba) throws IOException { - for (byte b : ba) { - capture.sent(b); - } - out.write(ba); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - for (int i = off; i < len; i++) { - capture.sent(b[i]); - } - out.write(b, off, len); - } - - @Override - public void flush() throws IOException { - try { - capture.flush(); - } catch (IOException iOException) { - } - super.flush(); - } -} diff --git a/src/java.base/share/classes/sun/net/www/http/HttpClient.java b/src/java.base/share/classes/sun/net/www/http/HttpClient.java index 4db6c24ee1ef..7219a02f2643 100644 --- a/src/java.base/share/classes/sun/net/www/http/HttpClient.java +++ b/src/java.base/share/classes/sun/net/www/http/HttpClient.java @@ -146,9 +146,6 @@ private static int getDefaultPort(String proto) { /* if set, the client will be reused and must not be put in cache */ public boolean reuse = false; - // Traffic capture tool, if configured. See HttpCapture class for info - private HttpCapture capture = null; - /* "jdk.https.negotiate.cbt" property can be set to "always" (always sent), "never" (never sent) or * "domain:a,c.d,*.e.f" (sent to host a, or c.d or to the domain e.f and any of its subdomains). This is * a comma separated list of arbitrary length with no white-space allowed. @@ -271,8 +268,6 @@ protected HttpClient(URL url, Proxy p, int to) throws IOException { port = getDefaultPort(); } setConnectTimeout(to); - - capture = HttpCapture.getCapture(url); openServer(); } @@ -525,9 +520,6 @@ public void openServer(String server, int port) throws IOException { serverSocket = doConnect(server, port); try { OutputStream out = serverSocket.getOutputStream(); - if (capture != null) { - out = new HttpCaptureOutputStream(out, capture); - } serverOutput = new PrintStream( new BufferedOutputStream(out), false, encoding); @@ -729,9 +721,6 @@ public boolean parseHTTP(MessageHeader responses, HttpURLConnection httpuc) try { serverInput = serverSocket.getInputStream(); - if (capture != null) { - serverInput = new HttpCaptureInputStream(serverInput, capture); - } serverInput = new BufferedInputStream(serverInput); return (parseHTTPHeader(responses, httpuc)); } catch (SocketTimeoutException stex) { From d9403f8b9311daf846cadfc7e58ba9fefa028f05 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Tue, 10 Nov 2026 09:55:32 +0000 Subject: [PATCH 064/110] 8396916: JVMTI includes are missing in JDK-8396399 Reviewed-by: stefank, dholmes, mdoerr --- src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp | 2 ++ src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp | 2 ++ src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp | 1 + src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp | 2 ++ src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp | 1 + src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp | 2 ++ 6 files changed, 10 insertions(+) diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp index 827535633fd5..207523824657 100644 --- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp @@ -43,10 +43,12 @@ #include "nativeInst_aarch64.hpp" #include "oops/objArrayKlass.hpp" #include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "runtime/threadIdentifier.hpp" +#include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" #include "vmreg_aarch64.inline.hpp" diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp index 9c84faec8caf..f7eea354ac29 100644 --- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp @@ -34,9 +34,11 @@ #include "memory/universe.hpp" #include "nativeInst_arm.hpp" #include "oops/objArrayKlass.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" +#include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" #include "vmreg_arm.inline.hpp" diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp index 2f41d6921885..b5367816b968 100644 --- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp @@ -36,6 +36,7 @@ #include "nativeInst_ppc.hpp" #include "oops/compressedOops.hpp" #include "oops/objArrayKlass.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/os.inline.hpp" #include "runtime/safepointMechanism.inline.hpp" diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp index de330987eeae..c0674051b15d 100644 --- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp @@ -42,9 +42,11 @@ #include "nativeInst_riscv.hpp" #include "oops/objArrayKlass.hpp" #include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/threadIdentifier.hpp" +#include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" #include "vmreg_riscv.inline.hpp" diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp index ad3e7f222c52..be4a320e7f1e 100644 --- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp +++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp @@ -36,6 +36,7 @@ #include "memory/universe.hpp" #include "nativeInst_s390.hpp" #include "oops/objArrayKlass.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/safepointMechanism.inline.hpp" #include "runtime/sharedRuntime.hpp" diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp index 7cf0f934ede3..2e8cc44bb23b 100644 --- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp @@ -41,11 +41,13 @@ #include "nativeInst_x86.hpp" #include "oops/objArrayKlass.hpp" #include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" #include "runtime/frame.inline.hpp" #include "runtime/safepointMechanism.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "runtime/threadIdentifier.hpp" +#include "utilities/macros.hpp" #include "utilities/powerOfTwo.hpp" #include "vmreg_x86.inline.hpp" From 8751fbd3c02ccc9c232352a83c2c12a6422dcb61 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Tue, 10 Nov 2026 10:09:07 +0000 Subject: [PATCH 065/110] 8396930: C2: Relax AndL mask check for ConvI2L Reviewed-by: chagedorn, qamai --- src/hotspot/share/opto/mulnode.cpp | 12 +++--- .../c2/irTests/AndLNodeIdealizationTests.java | 39 ++++++++++++++++++- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp index 28d5b817f7c5..7e13b38624cb 100644 --- a/src/hotspot/share/opto/mulnode.cpp +++ b/src/hotspot/share/opto/mulnode.cpp @@ -838,13 +838,11 @@ Node *AndLNode::Ideal(PhaseGVN *phase, bool can_reshape) { Node* in1 = in(1); int op = in1->Opcode(); - // Are we masking a long that was converted from an int with a mask - // that fits in 32-bits? Commute them and use an AndINode. Don't - // convert masks which would cause a sign extension of the integer - // value. This check includes UI2L masks (0x00000000FFFFFFFF) which - // would be optimized away later in Identity. - if (op == Op_ConvI2L && (mask & UCONST64(0xFFFFFFFF80000000)) == 0) { - Node* andi = new AndINode(in1->in(1), phase->intcon(mask)); + // If the mask is a sign extension of a 32-bit value, commute the AND + // with the conversion: + // ConvI2L(x) & mask => ConvI2L(x & (jint)mask) + if (op == Op_ConvI2L && mask == (jlong)(jint)mask) { + Node* andi = new AndINode(in1->in(1), phase->intcon((jint)mask)); andi = phase->transform(andi); return new ConvI2LNode(andi); } diff --git a/test/hotspot/jtreg/compiler/c2/irTests/AndLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/AndLNodeIdealizationTests.java index a32172b20153..656e6b92dfd2 100644 --- a/test/hotspot/jtreg/compiler/c2/irTests/AndLNodeIdealizationTests.java +++ b/test/hotspot/jtreg/compiler/c2/irTests/AndLNodeIdealizationTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,6 +58,18 @@ public void runMethod() { assertResult(max, max); } + @Run(test = { "test10", "test11" }) + public void runMethodConvI2L() { + int a = RunInfo.getRandom().nextInt(); + + assertResultConvI2L(0); + assertResultConvI2L(10); + assertResultConvI2L(-10); + assertResultConvI2L(Integer.MIN_VALUE); + assertResultConvI2L(Integer.MAX_VALUE); + assertResultConvI2L(a); + } + @DontCompile public void assertResult(long a, long b) { Asserts.assertEQ((~a) & (~b), test1(a, b)); @@ -71,6 +83,12 @@ public void assertResult(long a, long b) { Asserts.assertEQ((((a & 1) - 3) & ((b & 2) - 10)) > -8, test9(a, b)); } + @DontCompile + public void assertResultConvI2L(int a) { + Asserts.assertEQ(a & -8L, test10(a)); + Asserts.assertEQ(a & 0xFFFFFFFFL, test11(a)); + } + @Test @IR(failOn = { IRNode.AND }) @IR(counts = { IRNode.OR, "1", @@ -135,4 +153,23 @@ public boolean test8(long a, long b) { public boolean test9(long a, long b) { return (((a & 1) - 3) & ((b & 2) - 10)) > -8; } + + @Test + @IR(failOn = { IRNode.AND_L }) + @IR(counts = { IRNode.AND_I, "1", + IRNode.CONV_I2L, "1" }) + // Checks ConvI2L(a) & -8 => ConvI2L(a & -8), the mask being a sign + // extension of its 32-bit value + public long test10(int a) { + return a & -8L; + } + + @Test + @IR(counts = { IRNode.AND_L, "1" }) + @IR(failOn = { IRNode.AND_I }) + // Checks that ConvI2L(a) & 0xFFFFFFFF is not commuted: 0xFFFFFFFF is not a + // sign extension of a 32-bit value, so the result must stay zero extended + public long test11(int a) { + return a & 0xFFFFFFFFL; + } } From c780192b8f5c7a9536b81dfe6360595505bcb10b Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Tue, 10 Nov 2026 10:12:35 +0000 Subject: [PATCH 066/110] 8396678: Potential handle leak in getFinalPath canonicalize_md.c Reviewed-by: alanb, iklam --- .../windows/native/libjava/canonicalize_md.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/java.base/windows/native/libjava/canonicalize_md.c b/src/java.base/windows/native/libjava/canonicalize_md.c index bc17531e4a5a..fecf7f9fc1c2 100644 --- a/src/java.base/windows/native/libjava/canonicalize_md.c +++ b/src/java.base/windows/native/libjava/canonicalize_md.c @@ -167,10 +167,19 @@ WCHAR* getFinalPath(WCHAR* path, WCHAR* finalPath, DWORD size) if (h != INVALID_HANDLE_VALUE) { DWORD len = GetFinalPathNameByHandleW(h, finalPath, size, 0); - if (len >= size) { - if ((finalPath = (WCHAR*)malloc(len * sizeof(WCHAR))) == NULL) + if (len != 0 && len >= size) { + DWORD pathBufferSize = len; + finalPath = (WCHAR*)malloc((size_t)pathBufferSize * sizeof(WCHAR)); + if (finalPath == NULL) { + CloseHandle(h); return NULL; - len = GetFinalPathNameByHandleW(h, finalPath, len, 0); + } + len = GetFinalPathNameByHandleW(h, finalPath, pathBufferSize, 0); + if (len == 0 || len >= pathBufferSize) { + CloseHandle(h); + free(finalPath); + return NULL; + } } CloseHandle(h); if (len != 0) { @@ -188,7 +197,6 @@ WCHAR* getFinalPath(WCHAR* path, WCHAR* finalPath, DWORD size) int amountToCopy = len - prefixLen + 1; wmemmove(finalPath + startIdx, finalPath + prefixLen, amountToCopy); } - return finalPath; } } From ce6235f3c9d56596b14e39852658a07e9076025d Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Tue, 10 Nov 2026 11:26:56 +0000 Subject: [PATCH 067/110] 8393262: Re-examine sun.reflect.ReflectionFactory::newConstructorForSerialization methods Reviewed-by: liach --- .../internal/reflect/ReflectionFactory.java | 49 ++-- .../sun/reflect/ReflectionFactory.java | 32 +-- .../NewConstructorForSerialization.java | 219 ++++++++++++++++++ .../ReflectionFactoryPreviewTest.java | 16 +- .../ReflectionFactoryTest.java | 42 ++-- 5 files changed, 310 insertions(+), 48 deletions(-) create mode 100644 test/jdk/sun/reflect/ReflectionFactory/NewConstructorForSerialization.java diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java index 798376cafbd0..a162760909e1 100644 --- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java +++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java @@ -214,12 +214,16 @@ public final Constructor newConstructorForExternalization(Class cl) { public final Constructor newConstructorForSerialization(Class cl, Constructor constructorToCall) { - if (constructorToCall.getDeclaringClass() == cl) { - constructorToCall.setAccessible(true); - return constructorToCall; + if (config().allowNonSerializableConstruction()) { + if (constructorToCall.getDeclaringClass() == cl) { + constructorToCall.setAccessible(true); + return constructorToCall; + } + return generateConstructor(cl, constructorToCall); } - - return generateConstructor(cl, constructorToCall); + throw new UnsupportedOperationException( + "Run with -Djdk.reflect.allowNonSerializableConstruction=true to temporarily re-enable this method" + ); } /** @@ -269,8 +273,8 @@ private boolean superHasAccessibleConstructor(Class cl) { * Returns a constructor that allocates an instance of cl and that then initializes * the instance by calling the no-arg constructor of its first non-serializable * superclass. This is specified in the Serialization Specification, section 3.1, - * in step 11 of the deserialization process. If cl is not serializable, returns - * cl's no-arg constructor. If no accessible constructor is found, or if the + * in step 12 of the deserialization process. If cl is not serializable, + * no accessible constructor is found, or if the * class hierarchy is somehow malformed (e.g., a serializable class has no * superclass), or if this serializable class or a serializable superclass * declares a strictly-initialized non-static field, null is returned. @@ -279,6 +283,11 @@ private boolean superHasAccessibleConstructor(Class cl) { * @return the generated constructor, or null if none is available */ public final Constructor newConstructorForSerialization(Class cl) { + if (!config().allowNonSerializableConstruction() + && !Serializable.class.isAssignableFrom(cl)) { + return null; + } + if (cl.isValue()) { return null; } @@ -304,7 +313,11 @@ public final Constructor newConstructorForSerialization(Class cl) { return null; } - return newConstructorForSerialization(cl, constructorToCall); + if (constructorToCall.getDeclaringClass() == cl) { + constructorToCall.setAccessible(true); + return constructorToCall; + } + return generateConstructor(cl, constructorToCall); } private final Constructor generateConstructor(Class cl, @@ -331,9 +344,9 @@ public final MethodHandle writeObjectForSerialization(Class cl) { return findReadWriteObjectForSerialization(cl, "writeObject", ObjectOutputStream.class); } - private final MethodHandle findReadWriteObjectForSerialization(Class cl, - String methodName, - Class streamClass) { + private MethodHandle findReadWriteObjectForSerialization(Class cl, + String methodName, + Class streamClass) { if (!Serializable.class.isAssignableFrom(cl)) { return null; } @@ -552,7 +565,8 @@ private static boolean disableSerialConstructorChecks() { private static @Stable Config config; private static final Config DEFAULT_CONFIG = new Config(false, // useNativeAccessorOnly - false); // disableSerialConstructorChecks + false, // disableSerialConstructorChecks + false); // allowNonSerializableConstruction /** * The configurations for the reflection factory. Configurable via @@ -566,7 +580,8 @@ private static boolean disableSerialConstructorChecks() { * is to override them. */ private record Config(boolean useNativeAccessorOnly, - boolean disableSerialConstructorChecks) { + boolean disableSerialConstructorChecks, + boolean allowNonSerializableConstruction) { } private static Config config() { @@ -587,11 +602,13 @@ private static Config loadConfig() { assert VM.isModuleSystemInited(); boolean useNativeAccessorOnly = - "true".equals(System.getProperty("jdk.reflect.useNativeAccessorOnly")); + "true".equals(VM.getSavedProperty("jdk.reflect.useNativeAccessorOnly")); boolean disableSerialConstructorChecks = - "true".equals(System.getProperty("jdk.disableSerialConstructorChecks")); + "true".equals(VM.getSavedProperty("jdk.disableSerialConstructorChecks")); + boolean allowNonSerializableConstruction = + "true".equals(VM.getSavedProperty("jdk.reflect.allowNonSerializableConstruction")); - return new Config(useNativeAccessorOnly, disableSerialConstructorChecks); + return new Config(useNativeAccessorOnly, disableSerialConstructorChecks, allowNonSerializableConstruction); } /** diff --git a/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java b/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java index 565901570496..e05bd301959e 100644 --- a/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java +++ b/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java @@ -62,32 +62,36 @@ public static ReflectionFactory getReflectionFactory() { } /** - * Returns an accessible constructor capable of creating instances - * of the given class, initialized by the given constructor. + * Throws {@code UnsupportedOperationException}. * - * @param cl the class to instantiate - * @param constructorToCall the constructor to call - * @return an accessible constructor - * @throws UnsupportedOperationException if the constructor to call is - * not suitable for the class to instantiate, such as if the - * constructor is not of the given class or one of its supertypes, - * or this constructor would skip initialization of - * strictly-initialized fields + *

This method was originally implemented to return an accessible constructor to + * create an instance of the given class and initializes it by invoking the supplied + * constructor. The method is now disabled and throws UnsupportedOperationException + * by default. Legacy behavior can be temporarily re-enabled by running with + * {@code -Djdk.reflect.allowNonSerializableConstruction=true}. The method is + * deprecated for removal in a future release. + * + * @deprecated Use the 1-arg newConstructorForSerialization instead. + * + * @param cl the class to instantiate, ignored by default + * @param constructorToCall the constructor to call, ignored by default + * @return nothing by default + * @throws UnsupportedOperationException by default */ + @Deprecated(since="28", forRemoval=true) public Constructor newConstructorForSerialization(Class cl, Constructor constructorToCall) { - return delegate.newConstructorForSerialization(cl, - constructorToCall); + return delegate.newConstructorForSerialization(cl, constructorToCall); } /** - * Returns an accessible no-arg constructor for a class. + * Returns an accessible no-arg constructor for a serializable class. * The no-arg constructor is found searching the class and its supertypes, * and must ensure that all strictly-initialized fields * declared in the class and its supertypes are properly initialized. * - * @param cl the class to instantiate + * @param cl the serializable class to instantiate * @return a no-arg constructor for the class, or {@code null} if the * class or supertypes do not have a suitable no-arg constructor * or if the class is a value class diff --git a/test/jdk/sun/reflect/ReflectionFactory/NewConstructorForSerialization.java b/test/jdk/sun/reflect/ReflectionFactory/NewConstructorForSerialization.java new file mode 100644 index 000000000000..fa7f2a71f3f2 --- /dev/null +++ b/test/jdk/sun/reflect/ReflectionFactory/NewConstructorForSerialization.java @@ -0,0 +1,219 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8393262 + * @summary Test default behavior of 1-arg and 2-arg newConstructorForSerialization methods + * @modules jdk.unsupported + * @run junit/othervm ${test.main.class} + */ + +import java.io.Externalizable; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.Serializable; +import java.lang.reflect.AccessFlag; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.util.stream.Stream; +import sun.reflect.ReflectionFactory; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.*; + +class NewConstructorForSerialization { + static ReflectionFactory factory; + + @BeforeAll + static void init() { + factory = ReflectionFactory.getReflectionFactory(); + } + + static class C1 { + static final int INITIAL_VALUE = 100; + int x; + C1() { + x = 100; + } + } + + static class C2 implements Serializable { + static final int INITIAL_VALUE = 200; + int x; + C2() { + x = 200; + } + } + + static class C3 implements Serializable { + static final int INITIAL_VALUE = 300; + int x; + C3() { + x = 300; + } + } + + static class C4 extends C1 implements Serializable { + static final int INITIAL_VALUE = 400; + int x; + C4() { + x = 400; + } + } + + static class C5 extends C3 { + static final int INITIAL_VALUE = 500; + int x; + C5() { + x = 500; + } + } + + static class C6 { + static final int INITIAL_VALUE = 600; + int x; + C6(int x) { + assertEquals(INITIAL_VALUE, x); + this.x = x; + } + } + + static class C7 extends C6 implements Serializable { + static final int INITIAL_VALUE = 700; + int x; + C7() { + x = 700; + super(600); + } + } + + static abstract class AC { + static final int INITIAL_VALUE = -1; + int x; + AC() { + x = -1; + } + } + + static class C8 extends AC implements Serializable { + static final int INITIAL_VALUE = 800; + int x; + C8() { + x = 800; + } + } + + static Stream> expectNull() { + return Stream.of( + C1.class, // not serializable + C6.class, // not serializable + C7.class // non-serializable super does not have no-arg constructor + ); + } + + static Stream> expectConstructor() { + return Stream.of( + C2.class, + C3.class, + C4.class, // non-Serializable super is C1 + C5.class, + C8.class // non-Serializable super is abstract class + ); + } + + static Stream> allTestClasses() { + return Stream.concat(expectNull(), expectConstructor()); + } + + @ParameterizedTest + @MethodSource("expectNull") + void testOneArgExpectingNull(Class cl) { + assertNull(factory.newConstructorForSerialization(cl)); + } + + @ParameterizedTest + @MethodSource("expectConstructor") + void testOneArgExpectingConstructor(Class cl) throws Exception { + assertTrue(Serializable.class.isAssignableFrom(cl)); + + // the constructor should be the no-arg constructor of its first non-serializable class + var ctor = factory.newConstructorForSerialization(cl); + Class expectedNonSerSuper = cl; + while (Serializable.class.isAssignableFrom(expectedNonSerSuper)) { + expectedNonSerSuper = expectedNonSerSuper.getSuperclass(); + } + assertSame(expectedNonSerSuper, ctor.getDeclaringClass()); + assertEquals(0, ctor.getParameterCount()); + + // constructor should create an instance of cl + var obj = ctor.newInstance(); + assertSame(cl, obj.getClass()); + + // the fields in the non-serializable super classes should be initialized + // the fields in the serializable sub classes should have their default value + boolean shouldBeInit = false; + Class current = cl; + while (current != null) { + if (!shouldBeInit && !Serializable.class.isAssignableFrom(current)) { + shouldBeInit = true; + } + for (Field f : current.getDeclaredFields()) { + if (!f.accessFlags().contains(AccessFlag.STATIC)) { + // instance fields + if (f.getType() == int.class) { + int x = f.getInt(obj); + if (shouldBeInit) { + int expected = current.getDeclaredField("INITIAL_VALUE").getInt(null); + assertEquals(expected, x); + } else { + assertEquals(0, x); + } + } else { + fail("Not an int field"); + } + } + } + current = current.getSuperclass(); + } + } + + @ParameterizedTest + @MethodSource("allTestClasses") + void testTwoArgMethod(Class cl) throws Exception { + Class klass = cl; + while (klass != null) { + for (Constructor ctor : klass.getDeclaredConstructors()) { + assertThrows(UnsupportedOperationException.class, + () -> factory.newConstructorForSerialization(cl, ctor)); + } + klass = klass.getSuperclass(); + } + } +} + diff --git a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryPreviewTest.java b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryPreviewTest.java index 95aeea91bb2a..b0038de4f290 100644 --- a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryPreviewTest.java +++ b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryPreviewTest.java @@ -23,6 +23,7 @@ import java.io.Serializable; import java.lang.invoke.MethodHandles; +import java.lang.reflect.Constructor; import jdk.internal.value.ValueClass; import jdk.test.lib.helpers.StrictInit; @@ -34,7 +35,7 @@ /* * @test - * @bug 8137058 8164908 8168980 8275137 8333796 + * @bug 8389219 * @summary Basic test for the unsupported ReflectionFactory * @modules jdk.unsupported * @modules java.base/jdk.internal.value @@ -43,17 +44,21 @@ * @build ${test.main.class} * @run driver jdk.test.lib.helpers.StrictProcessor * ReflectionFactoryPreviewTest$StrictSerializableChild - * @run junit ${test.main.class} + * @run junit/othervm -Djdk.reflect.allowNonSerializableConstruction=true ${test.main.class} + * @run junit/othervm -Djdk.reflect.allowNonSerializableConstruction=false ${test.main.class} */ public class ReflectionFactoryPreviewTest { // Initialized by init() static ReflectionFactory factory; + static boolean allowNonSerializableConstruction; @BeforeAll static void init() { factory = ReflectionFactory.getReflectionFactory(); + allowNonSerializableConstruction = Boolean.getBoolean( + "jdk.reflect.allowNonSerializableConstruction"); } abstract static value class AvcSuperType { @@ -107,7 +112,12 @@ void checkNewConstructor() throws Exception { var avcCtor = AvcSuperType.class.getDeclaredConstructor(); assertThrows(UnsupportedOperationException.class, () -> factory.newConstructorForSerialization(StrictSerializableChild.class, avcCtor)); - assertSame(AvcSuperType.class, factory.newConstructorForSerialization(SerializableChild.class, avcCtor).getDeclaringClass()); + + + if (allowNonSerializableConstruction) { + Constructor ctor = factory.newConstructorForSerialization(SerializableChild.class, avcCtor); + assertSame(AvcSuperType.class, ctor.getDeclaringClass()); + } assertThrows(UnsupportedOperationException.class, () -> factory.newConstructorForSerialization(AvcSuperType.class, Object.class.getDeclaredConstructor())); diff --git a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java index b86ee4db0b91..f53d5f99abc9 100644 --- a/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java +++ b/test/jdk/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,7 @@ import sun.reflect.ReflectionFactory; import org.testng.Assert; +import org.testng.SkipException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.annotations.DataProvider; @@ -53,13 +54,22 @@ * @bug 8137058 8164908 8168980 8275137 8333796 * @summary Basic test for the unsupported ReflectionFactory * @modules jdk.unsupported - * @run testng ReflectionFactoryTest + * @run testng/othervm -Djdk.reflect.allowNonSerializableConstruction=true ReflectionFactoryTest + * @run testng/othervm -Djdk.reflect.allowNonSerializableConstruction=false ReflectionFactoryTest */ public class ReflectionFactoryTest { // Initialized by init() static ReflectionFactory factory; + static boolean allowNonSerializableConstruction; + + @BeforeClass + static void init() { + factory = ReflectionFactory.getReflectionFactory(); + allowNonSerializableConstruction = Boolean.getBoolean( + "jdk.reflect.allowNonSerializableConstruction"); + } @DataProvider(name = "ClassConstructors") static Object[][] classConstructors() { @@ -70,11 +80,6 @@ static Object[][] classConstructors() { }; } - @BeforeClass - static void init() { - factory = ReflectionFactory.getReflectionFactory(); - } - /** * Test that the correct Constructor is selected and run. * @param type type of object to create @@ -90,11 +95,15 @@ static void testConstructor(Class type) @SuppressWarnings("unchecked") Constructor c = factory.newConstructorForSerialization(type); - Object o = c.newInstance(); - Assert.assertEquals(o.getClass(), type, "Instance is wrong type"); - if (o instanceof Foo) { - Foo foo = (Foo)o; - foo.check(); + if (allowNonSerializableConstruction || Serializable.class.isAssignableFrom(type)) { + Object o = c.newInstance(); + Assert.assertEquals(o.getClass(), type, "Instance is wrong type"); + if (o instanceof Foo) { + Foo foo = (Foo)o; + foo.check(); + } + } else { + Assert.assertNull(c, "null expected for " + type); } } @@ -113,10 +122,13 @@ static Object[][] constructors() throws NoSuchMethodException { * Tests that the given Constructor, in the hierarchy, is run. */ @Test(dataProvider="NonSerialConstructors") - static void testNonSerializableConstructor(Class cl, - Constructor constructorToCall) + static void testNonSerializableConstructor(Class cl, Constructor constructorToCall) throws ReflectiveOperationException { + if (!allowNonSerializableConstruction) { + throw new SkipException("2-arg newConstructorForSerialization method disabled"); + } + @SuppressWarnings("unchecked") Constructor c = factory.newConstructorForSerialization(cl, constructorToCall); @@ -672,7 +684,7 @@ public Object get(final String name, final Object val) { }; // all the same methods, except for `writeFields` Arrays.fill(called, false); - Constructor ctor = factory.newConstructorForSerialization(Ser2.class, Object.class.getDeclaredConstructor()); + Constructor ctor = factory.newConstructorForSerialization(Ser2.class); ser = (Ser2) ctor.newInstance(); readObject.invokeExact(ser, ois); // excluding "writeFields", so 18 instead of 19 From dc875a4acc1f3721fb1eb2e187e9dbb1f692f4df Mon Sep 17 00:00:00 2001 From: Wei Sun Date: Tue, 10 Nov 2026 13:55:40 +0000 Subject: [PATCH 068/110] 8394180: Use the local execution engine in MultipleDocumentationTest Reviewed-by: ayang, jlahoda --- test/langtools/jdk/jshell/MultipleDocumentationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/langtools/jdk/jshell/MultipleDocumentationTest.java b/test/langtools/jdk/jshell/MultipleDocumentationTest.java index d7894212016d..0ca20a704aae 100644 --- a/test/langtools/jdk/jshell/MultipleDocumentationTest.java +++ b/test/langtools/jdk/jshell/MultipleDocumentationTest.java @@ -50,6 +50,7 @@ public void testMultipleDocumentation() { try (var state1 = JShell.builder() .out(new PrintStream(new ByteArrayOutputStream())) .err(new PrintStream(new ByteArrayOutputStream())) + .executionEngine("local") .build()) { var sca1 = state1.sourceCodeAnalysis(); List javadocs1 = @@ -61,6 +62,7 @@ public void testMultipleDocumentation() { try (var state2 = JShell.builder() .out(new PrintStream(new ByteArrayOutputStream())) .err(new PrintStream(new ByteArrayOutputStream())) + .executionEngine("local") .build()) { var sca2 = state2.sourceCodeAnalysis(); List javadocs2 = sca2.documentation(input, input.length(), true) From b8f244819b2dc0bdb273823b0a1c510e37e2d9d4 Mon Sep 17 00:00:00 2001 From: Shiv Shah Date: Tue, 10 Nov 2026 15:22:26 +0000 Subject: [PATCH 069/110] 8395810: compiler/predicates/assertion/TestAssertionPredicates.java#NoFlags times out with -XX:CompileThresholdScaling=0.01 Reviewed-by: kvn, mhaessig --- .../compiler/predicates/assertion/TestAssertionPredicates.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java index 5ff35ea7df27..040b3345f320 100644 --- a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java +++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -243,6 +243,7 @@ /* * @test id=NoFlags * @bug 8288981 8350579 8350577 + * @requires vm.opt.CompileThresholdScaling == null & vm.opt.CompileThreshold == null * @run main compiler.predicates.assertion.TestAssertionPredicates NoFlags */ From a79c2c94529be043a13dfffa077e52e6b2c9cfa0 Mon Sep 17 00:00:00 2001 From: Shiv Shah Date: Tue, 10 Nov 2026 15:23:04 +0000 Subject: [PATCH 070/110] 8395809: compiler/escapeAnalysis/TestMemoryPhiAlias.java times out with -XX:CompileThresholdScaling=0.01 Reviewed-by: kvn, mhaessig --- .../jtreg/compiler/escapeAnalysis/TestMemoryPhiAlias.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestMemoryPhiAlias.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestMemoryPhiAlias.java index efe9146fa49a..cf5bfe31ead4 100644 --- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestMemoryPhiAlias.java +++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestMemoryPhiAlias.java @@ -25,7 +25,9 @@ * @test * @bug 8350971 * @summary C2 compilation fails with assert(idx == alias_idx) failed: Following Phi nodes should be on the same memory slice + * @requires vm.opt.CompileThreshold == null * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -Xbatch -XX:CompileCommand=compileonly,compiler.escapeAnalysis.TestMemoryPhiAlias::main + * -XX:CompileThresholdScaling=1.0 * compiler.escapeAnalysis.TestMemoryPhiAlias */ From a9ae3c164c4a89ffc37a6a563f930d6be25610f3 Mon Sep 17 00:00:00 2001 From: Shiv Shah Date: Tue, 10 Nov 2026 15:31:19 +0000 Subject: [PATCH 071/110] 8395811: compiler/intrinsics/base64/TestBase64.java times out with -XX:CompileThresholdScaling=0.01 Reviewed-by: kvn, mhaessig --- test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java b/test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java index 0d3c9569c337..7150d4c47292 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java +++ b/test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @author Eric Wang * @summary tests java.util.Base64 + * @requires vm.compiler2.enabled * @library /test/lib / * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox From f3ac53bc84637a03a75be4890f3378a23371bea1 Mon Sep 17 00:00:00 2001 From: Artur Barashev Date: Tue, 10 Nov 2026 16:03:35 +0000 Subject: [PATCH 072/110] 8392416: Null pointer dereference in java.base/share/classes/javax/net/ssl/SNIServerName.java:124 Reviewed-by: vyazici --- .../classes/javax/net/ssl/SNIServerName.java | 4 +- .../ssl/ServerName/SNIServerNameEquals.java | 87 +++++++++++++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 test/jdk/javax/net/ssl/ServerName/SNIServerNameEquals.java diff --git a/src/java.base/share/classes/javax/net/ssl/SNIServerName.java b/src/java.base/share/classes/javax/net/ssl/SNIServerName.java index 85eab316664e..3f90565d7cc8 100644 --- a/src/java.base/share/classes/javax/net/ssl/SNIServerName.java +++ b/src/java.base/share/classes/javax/net/ssl/SNIServerName.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -121,7 +121,7 @@ public boolean equals(Object other) { return true; } - if (this.getClass() != other.getClass()) { + if (other == null || this.getClass() != other.getClass()) { return false; } diff --git a/test/jdk/javax/net/ssl/ServerName/SNIServerNameEquals.java b/test/jdk/javax/net/ssl/ServerName/SNIServerNameEquals.java new file mode 100644 index 000000000000..9101f7edc9ce --- /dev/null +++ b/test/jdk/javax/net/ssl/ServerName/SNIServerNameEquals.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import static jdk.test.lib.Asserts.assertEquals; +import static jdk.test.lib.Asserts.assertFalse; +import static jdk.test.lib.Asserts.assertTrue; + +import java.util.Objects; +import javax.net.ssl.SNIServerName; + +/* + * @test + * @bug 8392416 + * @summary SNIServerName.equals() test + * @library /test/lib + */ + +public class SNIServerNameEquals { + + private static final byte[] SNI = new byte[]{1, 2, 3}; + private static final byte[] DIFF_SNI = new byte[]{1, 2, 4}; + + public static void main(String[] args) { + SNIServerName name = new TestServerName(1, SNI); + + assertFalse(name.equals(null), "equals(null) must return false"); + assertFalse(Objects.equals(name, null), + "Objects.equals(name, null) must return false"); + + SNIServerName equalName = new TestServerName(1, SNI); + + assertTrue(name.equals(name), "A server name must equal itself"); + assertTrue(name.equals(equalName), "Identical names must be equal"); + assertTrue(equalName.equals(name), "Equality must be symmetric"); + assertEquals(name.hashCode(), equalName.hashCode(), + "Equal names must have equal hash codes"); + + SNIServerName differentType = new TestServerName(2, SNI); + SNIServerName differentValue = new TestServerName(1, DIFF_SNI); + + assertFalse(name.equals(differentType), + "Different name types must not be equal"); + assertFalse(name.equals(differentValue), + "Different encoded values must not be equal"); + assertFalse(name.equals(new Object()), + "An unrelated object must not be equal to a server name"); + + SNIServerName derivedName = new DerivedServerName(1, SNI); + + assertFalse(name.equals(derivedName), + "A different class must not compare equal"); + assertFalse(derivedName.equals(name), + "The class check must be symmetric"); + } + + private static class TestServerName extends SNIServerName { + TestServerName(int type, byte[] encoded) { + super(type, encoded); + } + } + + private static final class DerivedServerName extends TestServerName { + DerivedServerName(int type, byte[] encoded) { + super(type, encoded); + } + } +} From eb4e83bddc6961d165b3eeca5fa1d2cf6bfcf622 Mon Sep 17 00:00:00 2001 From: Ashay Rane Date: Tue, 10 Nov 2026 16:35:40 +0000 Subject: [PATCH 073/110] 8394484: C2 stack bang on Windows can lead to non-recoverable crash Reviewed-by: kvn, dlong, macarte --- make/test/JtregNativeHotspot.gmk | 3 +- src/hotspot/os/windows/os_windows.cpp | 33 ++++++++-- .../TestWindowsStackLimit.java | 60 +++++++++++++++++++ .../runtime/StackGuardPages/libStackLimit.cpp | 43 +++++++++++++ 4 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 test/hotspot/jtreg/runtime/StackGuardPages/TestWindowsStackLimit.java create mode 100644 test/hotspot/jtreg/runtime/StackGuardPages/libStackLimit.cpp diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk index a3426ffd2644..7f2a9b68fe86 100644 --- a/make/test/JtregNativeHotspot.gmk +++ b/make/test/JtregNativeHotspot.gmk @@ -91,7 +91,8 @@ ifeq ($(call isTargetOs, windows), true) else HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm - HOTSPOT_JTREG_EXCLUDE += libNativeException.c exeGetProcessorInfo.c + HOTSPOT_JTREG_EXCLUDE += libNativeException.c exeGetProcessorInfo.c \ + libStackLimit.cpp endif ################################################################################ diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index 8b21711eda56..9710d65bfda8 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -2686,6 +2686,29 @@ LONG Handle_IDiv_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) { return EXCEPTION_CONTINUE_EXECUTION; } +static bool grow_windows_stack_to(address target) { + const volatile NT_TIB* tib = (NT_TIB*)NtCurrentTeb(); + + // Touch the page immediately below the current stack limit. Windows handles + // this as ordinary stack growth: it commits more stack, lowers StackLimit, + // and installs a new moving guard. Re-read StackLimit after every touch + // because Windows may grow the stack by more than one page at a time. + while (target < (address)tib->StackLimit) { + address old_limit = (address)tib->StackLimit; + volatile char* probe = reinterpret_cast( + old_limit - os::vm_page_size()); + + // Dummy write to trigger an update to the stack limit. + *probe = 0; + + if ((address)tib->StackLimit >= old_limit) { + return false; + } + } + + return true; +} + //----------------------------------------------------------------------------- JNIEXPORT LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) { @@ -2782,12 +2805,10 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) { return Handle_Exception(exceptionInfo, stub); } } - // If it's a legal stack address map the entire region in - if (thread->is_in_usable_stack(addr)) { - addr = (address)((uintptr_t)addr & - (~((uintptr_t)os::vm_page_size() - (uintptr_t)1))); - os::commit_memory((char *)addr, thread->stack_base() - addr, - !ExecMem); + // If it's a legal stack address, then commit the region of memory from + // the current StackLimit down to `addr`. + if (thread->is_in_usable_stack(addr) && + grow_windows_stack_to(align_down(addr, os::vm_page_size()))) { return EXCEPTION_CONTINUE_EXECUTION; } // Null pointer exception. diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/TestWindowsStackLimit.java b/test/hotspot/jtreg/runtime/StackGuardPages/TestWindowsStackLimit.java new file mode 100644 index 000000000000..b229ff0fea0c --- /dev/null +++ b/test/hotspot/jtreg/runtime/StackGuardPages/TestWindowsStackLimit.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2026, Microsoft and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8394484 + * @summary Verifies that on Windows, HotSpot's access-violation recovery for + * an in-Java stack fault advances TEB.StackLimit to cover the newly + * committed stack memory. + * @requires os.family == "windows" + * @library /test/lib + * @run main/othervm/native --enable-native-access=ALL-UNNAMED -Xss1m TestWindowsStackLimit + */ + +import java.lang.foreign.FunctionDescriptor; +import java.lang.foreign.Linker; +import java.lang.foreign.MemorySegment; +import java.lang.foreign.SymbolLookup; +import java.lang.foreign.ValueLayout; +import java.lang.invoke.MethodHandle; + +public class TestWindowsStackLimit { + public static void main(String[] args) throws Throwable { + System.loadLibrary("StackLimit"); + SymbolLookup lookup = SymbolLookup.loaderLookup(); + MemorySegment segment = lookup.find("checkStackLimit").orElseThrow(); + + // `Linker.Option.critical()` keeps the calling thread's state as + // `_thread_in_Java` for the whole native call, which is a prerequisite + // for the code that commits memory pages in `topLevelExceptionFilter()` + Linker.Option option = Linker.Option.critical(/* heap access */ false); + FunctionDescriptor desc = FunctionDescriptor.of(ValueLayout.JAVA_INT); + + Linker linker = Linker.nativeLinker(); + MethodHandle check = linker.downcallHandle(segment, desc, option); + if ((int) check.invokeExact() != 0) { + throw new RuntimeException("TEB.StackLimit was not advanced"); + } + } +} diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/libStackLimit.cpp b/test/hotspot/jtreg/runtime/StackGuardPages/libStackLimit.cpp new file mode 100644 index 000000000000..a51313eb8956 --- /dev/null +++ b/test/hotspot/jtreg/runtime/StackGuardPages/libStackLimit.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2026, Microsoft and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include + +extern "C" __declspec(dllexport) int __cdecl checkStackLimit() { + PNT_TIB old_tib = (PNT_TIB) NtCurrentTeb(); + ULONG_PTR before = (ULONG_PTR) old_tib->StackLimit; + + // Compute an address that's comfortably below the existing `StackLimit`. + const size_t offset = 256 * 1024; + volatile unsigned char* faultAddr = + reinterpret_cast(before - offset); + + // Trigger HotSpot's access violation handler, which will commit pages. + *faultAddr = 0; + + // Correct recovery must lower StackLimit to or below the touched address. + PNT_TIB new_tib = (PNT_TIB) NtCurrentTeb(); + ULONG_PTR after = (ULONG_PTR) new_tib->StackLimit; + ULONG_PTR faulted = reinterpret_cast(faultAddr); + return after <= faulted ? 0 : 1; +} From c3512b19c4019fe5c50892de103998be0b4ac012 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Tue, 10 Nov 2026 16:37:32 +0000 Subject: [PATCH 074/110] 8392769: G1: G1DirtyRegions named badly Reviewed-by: ayang --- src/hotspot/share/gc/g1/g1RemSet.cpp | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp index ec539dbb1ee5..37c7647e1bb2 100644 --- a/src/hotspot/share/gc/g1/g1RemSet.cpp +++ b/src/hotspot/share/gc/g1/g1RemSet.cpp @@ -88,7 +88,7 @@ // contiguous ranges of dirty cards to be scanned. These blocks are converted to actual // memory ranges and then passed on to actual scanning. class G1RemSetScanState : public CHeapObj { - class G1DirtyRegions; + class G1IndexedRegionSet; G1CardTableClaimTable _card_claim_table; // The complete set of regions which card table needs to be cleared at the end @@ -101,13 +101,13 @@ class G1RemSetScanState : public CHeapObj { // as g1_scanned_card_val. If G1 only did an initial evacuation pass, the // scanning already cleared these cards. In that case they are not in this set // at the end of the collection. - G1DirtyRegions* _all_dirty_regions; + G1IndexedRegionSet* _all_dirty_regions; // The set of regions which card table needs to be scanned for new dirty cards // in the current evacuation pass. - G1DirtyRegions* _next_dirty_regions; + G1IndexedRegionSet* _next_dirty_regions; -// Set of (unique) regions that can be added to concurrently. - class G1DirtyRegions : public CHeapObj { + // Set of (unique) regions that can be added to concurrently. + class G1IndexedRegionSet : public CHeapObj { uint* _buffer; Atomic _cur_idx; size_t _max_num_regions; @@ -115,7 +115,7 @@ class G1RemSetScanState : public CHeapObj { Atomic* _contains; public: - G1DirtyRegions(size_t max_num_regions) : + G1IndexedRegionSet(size_t max_num_regions) : _buffer(NEW_C_HEAP_ARRAY(uint, max_num_regions, mtGC)), _cur_idx(0), _max_num_regions(max_num_regions), @@ -124,7 +124,7 @@ class G1RemSetScanState : public CHeapObj { reset(); } - ~G1DirtyRegions() { + ~G1IndexedRegionSet() { FREE_C_HEAP_ARRAY(_buffer); FREE_C_HEAP_ARRAY(_contains); } @@ -143,20 +143,20 @@ class G1RemSetScanState : public CHeapObj { return _buffer[idx]; } - void add_dirty_region(uint region) { + void add_region(uint region) { if (_contains[region].load_relaxed()) { return; } - bool marked_as_dirty = _contains[region].compare_set(false, true); - if (marked_as_dirty) { + bool added = _contains[region].compare_set(false, true); + if (added) { uint allocated = _cur_idx.fetch_then_add(1u); _buffer[allocated] = region; } } - // Creates the union of this and the other G1DirtyRegions. - void merge(const G1DirtyRegions* other) { + // Creates the union of this and the other G1IndexedRegionSet. + void merge(const G1IndexedRegionSet* other) { for (uint i = 0; i < other->num_regions(); i++) { uint region = other->at(i); if (!_contains[region].load_relaxed()) { @@ -178,7 +178,7 @@ class G1RemSetScanState : public CHeapObj { class G1ClearCardTableTask : public G1AbstractSubTask { G1CollectedHeap* _g1h; - G1DirtyRegions* _regions; + G1IndexedRegionSet* _regions; Atomic _cur_dirty_regions; G1RemSetScanState* _scan_state; @@ -186,7 +186,7 @@ class G1ClearCardTableTask : public G1AbstractSubTask { static constexpr uint num_cards_per_worker = M; public: G1ClearCardTableTask(G1CollectedHeap* g1h, - G1DirtyRegions* regions, + G1IndexedRegionSet* regions, G1RemSetScanState* scan_state) : G1AbstractSubTask(G1GCPhaseTimes::ClearCardTable), _g1h(g1h), @@ -265,8 +265,8 @@ class G1ClearCardTableTask : public G1AbstractSubTask { clear_scan_top((uint)i); } - _all_dirty_regions = new G1DirtyRegions(max_num_regions); - _next_dirty_regions = new G1DirtyRegions(max_num_regions); + _all_dirty_regions = new G1IndexedRegionSet(max_num_regions); + _next_dirty_regions = new G1IndexedRegionSet(max_num_regions); } void prepare_for_merge_heap_roots() { @@ -347,7 +347,7 @@ class G1ClearCardTableTask : public G1AbstractSubTask { "Region %u is not suitable for scanning, is %sin collection set or %s", hr->hrm_index(), hr->in_collection_set() ? "" : "not ", hr->get_short_type_str()); #endif - _next_dirty_regions->add_dirty_region(region); + _next_dirty_regions->add_region(region); } void add_all_dirty_region(uint region) { @@ -357,7 +357,7 @@ class G1ClearCardTableTask : public G1AbstractSubTask { "Only add collection set regions to all dirty regions directly but %u is %s", hr->hrm_index(), hr->get_short_type_str()); #endif - _all_dirty_regions->add_dirty_region(region); + _all_dirty_regions->add_region(region); } void set_scan_top(uint region_idx, HeapWord* value) { From faf633b30902a67817e80225c0b001a7bcdb8baa Mon Sep 17 00:00:00 2001 From: Matias Saavedra Silva Date: Tue, 10 Nov 2026 17:01:40 +0000 Subject: [PATCH 075/110] 8391419: Invokespecial ExceptionFrame Locals should become top Co-authored-by: John R Rose Reviewed-by: jrose, dholmes, heidinga --- src/hotspot/share/classfile/stackMapFrame.cpp | 42 ++++- src/hotspot/share/classfile/stackMapFrame.hpp | 6 +- src/hotspot/share/classfile/verifier.cpp | 153 ++++++++++++++---- src/hotspot/share/classfile/verifier.hpp | 12 +- .../valuetypes/verifier/HasStrictField.jasm | 65 ++++++++ .../verifier/HasStrictFieldSafe.jasm | 70 ++++++++ .../verifier/StrictInstanceFieldsTest.java | 21 ++- .../jtreg/runtime/verifier/UninitThisTop.jasm | 41 +++++ .../runtime/verifier/UninitThisTopTest.java | 55 +++++++ .../runtime/verifier/UninitializedTop.jasm | 50 ++++++ .../verifier/UninitializedTopControl.jasm | 50 ++++++ 11 files changed, 521 insertions(+), 44 deletions(-) create mode 100644 test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictField.jasm create mode 100644 test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictFieldSafe.jasm create mode 100644 test/hotspot/jtreg/runtime/verifier/UninitThisTop.jasm create mode 100644 test/hotspot/jtreg/runtime/verifier/UninitThisTopTest.java create mode 100644 test/hotspot/jtreg/runtime/verifier/UninitializedTop.jasm create mode 100644 test/hotspot/jtreg/runtime/verifier/UninitializedTopControl.jasm diff --git a/src/hotspot/share/classfile/stackMapFrame.cpp b/src/hotspot/share/classfile/stackMapFrame.cpp index f36ab17872f0..0a803d95f305 100644 --- a/src/hotspot/share/classfile/stackMapFrame.cpp +++ b/src/hotspot/share/classfile/stackMapFrame.cpp @@ -79,11 +79,49 @@ void StackMapFrame::print_strict_fields(AssertUnsetFieldTable* table) { } } -StackMapFrame* StackMapFrame::frame_in_exception_handler(u1 flags) { +StackMapFrame* StackMapFrame::frame_in_exception_handler(VerificationType broken_type, u1 flags) { Thread* thr = _verifier->thread(); VerificationType* stack = NEW_RESOURCE_ARRAY_IN_THREAD(thr, VerificationType, 1); + VerificationType* locals = _locals; + bool have_uninitialized = broken_type.is_uninitialized(); + guarantee(have_uninitialized || broken_type.is_bogus(), "must be uninitialized or top"); + + // Return a StackMapFrame with a potentially modified local variable + // array and an empty operand stack with one unused slot. The caller + // will push the exception type for each handler into this slot. + // + // JVMS 4.10.1.9 says, "The rule for invokespecial of an method + // is the sole motivation for passing back a distinct exception stack + // frame." In that case, the so-called "broken object" must be replaced + // by top (in the locals only, since the operand stack gets reset). + // In the JVMS Prolog code, the adjusted locals are called ExceptionLocals. + // If this routine is called for any other bytecode in a handler range, + // not invokespecial , the passed "broken object" must be top. + // The frame flags are unchanged, including possibly flagThisUninit. + // + // If the local array is not changed, the original input array is + // shared as part of the returned frame. + if (have_uninitialized) { + bool found = false; + VerificationType* new_locals = NEW_RESOURCE_ARRAY_IN_THREAD(thr, VerificationType, _max_locals); + for (int32_t i = 0; i < _max_locals; i++) { + if (local_at(i) == broken_type) { + found = true; + new_locals[i] = VerificationType::top_type(); + } else { + new_locals[i] = _locals[i]; + } + } + // Throw away the array if no substitution was needed + if (!found) { + FREE_RESOURCE_ARRAY_IN_THREAD(thr, new_locals, _max_locals); + } else { + locals = new_locals; + } + } + StackMapFrame* frame = new StackMapFrame(_offset, flags, _locals_size, 0, - _max_locals, _max_stack, _locals, stack, + _max_locals, _max_stack, locals, stack, _assert_unset_fields, _verifier); return frame; } diff --git a/src/hotspot/share/classfile/stackMapFrame.hpp b/src/hotspot/share/classfile/stackMapFrame.hpp index 21db0634026a..2b98a1bbf6aa 100644 --- a/src/hotspot/share/classfile/stackMapFrame.hpp +++ b/src/hotspot/share/classfile/stackMapFrame.hpp @@ -247,9 +247,9 @@ class StackMapFrame : public ResourceObj { } } - // Return a StackMapFrame with the same local variable array and empty stack. - // Stack array is allocate with unused one element. - StackMapFrame* frame_in_exception_handler(u1 flags); + // Return a StackMapFrame with a potentially modified local variable array and empty stack. + // See further details about broken_type at the function definition. + StackMapFrame* frame_in_exception_handler(VerificationType broken_type, u1 flags); // Set local variable type array based on m's signature. VerificationType set_locals_from_arg( diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp index 97c50b8db51f..83a5f2520a70 100644 --- a/src/hotspot/share/classfile/verifier.cpp +++ b/src/hotspot/share/classfile/verifier.cpp @@ -716,6 +716,63 @@ void ClassVerifier::create_method_sig_entry(sig_as_verification_types* sig_verif assert(is_unique, "Duplicate entries in method_signature_table"); } +#ifdef ASSERT +// These assertion checking helpers manage a running sample of the exception state +// for each opcode. Each sampled state is a candidate for merging into an exception +// handler. The assertion runs at the bottom of verify_method, where some catch-all +// logic (commented "CATCH-ALL") is responsible for merging exception states into any +// applicable handlers. This logic only runs if the opcode did not already perform +// exception propagation; those specialized opcodes set `verified_exc_handlers`. +// +// The assertion demands that any merged exception state will be identical to the +// state BEFORE the opcode that might raise an exception. (Note that all opcodes are +// assumed to be capable of raising exceptions.) In order to check the assertion, we +// need to look back at the incoming state, before the opcode. But the verifier +// modifies the frame state destructively, so our look-back requires a distinct copy +// of the frame state, updated differently. See the assertion code at the catch-all +// for additional details. +static bool is_same_unset_field_table(const StackMapFrame* exf, const StackMapFrame* src) { + // for this test, treat null table pointer and empty table as "the same" + if (exf->verify_unset_fields_satisfied() && src->verify_unset_fields_satisfied()) { + return true; // usual case, non-, and/or no strict field tracking + } + // run the compatibility test in both directions to derive "sameness" + return (exf->verify_unset_fields_compatibility(src->assert_unset_fields()) && + src->verify_unset_fields_compatibility(exf->assert_unset_fields())); +} + + +static StackMapFrame* copy_exception_frame(StackMapFrame* src) { + StackMapFrame* exf = StackMapFrame::copy(src); + exf->clear_stack(); // exception frame never merges stack states + return exf; +} + +static void refresh_exception_frame(StackMapFrame* exf, const StackMapFrame* src) { + exf->set_offset(src->offset()); // not checked, but useful for debug output + exf->set_locals_size(src->locals_size()); + exf->copy_locals(src); + exf->set_flags(src->flags()); + if (!is_same_unset_field_table(exf, src)) { + // this next operation allocates, so gate it by the faster equality test + exf->set_assert_unset_fields(src->assert_unset_fields()); + } +} + +static bool is_same_exception_frame(const StackMapFrame* exf, const StackMapFrame* src) { + int lsize = src->locals_size(); + if (exf->flags() != src->flags() || + exf->locals_size() != lsize || + !is_same_unset_field_table(exf, src)) { + return false; + } + for (int32_t i = 0; i < lsize; i++) { + if (exf->locals()[i] != src->locals()[i]) return false; + } + return true; +} +#endif //ASSERT + void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { HandleMark hm(THREAD); _method = m; // initialize _method @@ -796,6 +853,10 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { // flow from current instruction to the next // instruction in sequence + // For asserts, keep a running copy of the state incoming to each bytecode. + // It will be treated as an exception state, so it will never have stacked items. + // We build one object outside the loop and update it to track each incoming state. + DEBUG_ONLY(StackMapFrame* exception_frame = copy_exception_frame(¤t_frame)); Bytecodes::Code opcode; while (!bcs.is_last_bytecode()) { // Check for recursive re-verification before each bytecode. @@ -815,9 +876,7 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { stackmap_index, bci, ¤t_frame, &stackmap_table, no_control_flow, CHECK_VERIFY(this)); - - bool this_uninit = false; // Set to true when invokespecial initialized 'this' - bool verified_exc_handlers = false; + bool verified_exc_handlers = false; // set this if we check handlers early // Merge with the next instruction { @@ -832,6 +891,8 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { opcode == Bytecodes::_illegal ? "illegal" : Bytecodes::name(opcode)); } + DEBUG_ONLY(refresh_exception_frame(exception_frame, ¤t_frame)); + // Make sure wide instruction is in correct format if (bcs.is_wide()) { if (opcode != Bytecodes::_iinc && opcode != Bytecodes::_iload && @@ -857,7 +918,7 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { if (Bytecodes::is_store_into_local(opcode) && bci >= ex_min && bci < ex_max) { if (was_recursively_verified()) return; verify_exception_handler_targets( - bci, this_uninit, ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); + bci, VerificationType::top_type(), ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); verified_exc_handlers = true; } @@ -1730,8 +1791,17 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { verify_field_instructions( &bcs, ¤t_frame, cp, true, CHECK_VERIFY(this)); no_control_flow = false; break; - case Bytecodes::_getfield : case Bytecodes::_putfield : + // Putfield on a strict field changes the verification state so the exception handler must be verified + if (current_frame.flag_this_uninit()) { + if (bci >= ex_min && bci < ex_max) { + verify_exception_handler_targets(bci, VerificationType::top_type(), ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); + if (was_recursively_verified()) return; + verified_exc_handlers = true; + } + } + // fall through + case Bytecodes::_getfield : // pass FALSE, operand can't be an array type for getfield/putfield. verify_field_instructions( &bcs, ¤t_frame, cp, false, CHECK_VERIFY(this)); @@ -1743,7 +1813,7 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { case Bytecodes::_invokedynamic : verify_invoke_instructions( &bcs, code_length, ¤t_frame, (bci >= ex_min && bci < ex_max), - &this_uninit, cp, &stackmap_table, CHECK_VERIFY(this)); + &verified_exc_handlers, cp, &stackmap_table, CHECK_VERIFY(this)); no_control_flow = false; break; case Bytecodes::_new : { @@ -1846,16 +1916,29 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { } // end switch } // end Merge with the next instruction + // CATCH-ALL for wiring up exception states, when the opcode did nothing special. // Look for possible jump target in exception handlers and see if it matches - // current_frame. Don't do this check if it has already been done (for - // ([a,d,f,i,l]store* opcodes). This check cannot be done earlier because - // opcodes, such as invokespecial, may set the this_uninit flag. - assert(!(verified_exc_handlers && this_uninit), - "Exception handler targets got verified before this_uninit got set"); + // current_frame. Don't do this check if it has been done earlier, as reported + // by verified_exc_handlers. Early checks happen with [a,d,f,i,l]store* opcodes, + // the putfield opcode (only in early larval , for strict field tracking), + // and the special processing of invokespecial in verify_invoke_init, + // which makes a special distinction between exception states and normal ones. + // For all other bytecodes, the state that must be passed to exception handlers + // is simply the current flags and locals (unchanged) plus a reset operand stack. + // See StackMapFrame::frame_in_exception_handler for more details. if (!verified_exc_handlers && bci >= ex_min && bci < ex_max) { if (was_recursively_verified()) return; +#ifdef ASSERT + if (!is_same_exception_frame(exception_frame, ¤t_frame)) { + tty->print("incoming: "); exception_frame->print_on(tty); + tty->print("current: "); current_frame.print_on(tty); + assert(false, "exception must apply to incoming frame, not post-opcode frame"); + // If you hit this assert, the offending bytecode needs its own logic that + // propagates exceptions and sets verified_exc_handlers. + } +#endif //ASSERT verify_exception_handler_targets( - bci, this_uninit, ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); + bci, VerificationType::top_type(), ¤t_frame, &stackmap_table, CHECK_VERIFY(this)); } } // end while @@ -2007,24 +2090,34 @@ u2 ClassVerifier::verify_stackmap_table(u2 stackmap_index, int bci, return stackmap_index; } +// Find all handlers matching the given bci, and check each one for mergeability. +// The broken_type (if not top) must be replaced by top in that frame's locals, +// because an invokespecial is working on a broken object, per JVM Spec. +// See StackMapFrame::frame_in_exception_handler for details. // Since this method references the constant pool, call was_recursively_verified() // before calling this method to make sure a prior class load did not cause the // current class to get verified. -void ClassVerifier::verify_exception_handler_targets(int bci, bool this_uninit, +void ClassVerifier::verify_exception_handler_targets(int bci, VerificationType broken_type, StackMapFrame* current_frame, StackMapTable* stackmap_table, TRAPS) { constantPoolHandle cp (THREAD, _method->constants()); ExceptionTable exhandlers(_method()); int exlength = exhandlers.length(); + u1 flags = current_frame->flags(); + StackMapFrame* new_frame = nullptr; + for(int i = 0; i < exlength; i++) { u2 start_pc = exhandlers.start_pc(i); u2 end_pc = exhandlers.end_pc(i); u2 handler_pc = exhandlers.handler_pc(i); int catch_type_index = exhandlers.catch_type_index(i); if(bci >= start_pc && bci < end_pc) { - u1 flags = current_frame->flags(); - if (this_uninit) { flags |= FLAG_THIS_UNINIT; } - StackMapFrame* new_frame = current_frame->frame_in_exception_handler(flags); + if (new_frame == nullptr) { + new_frame = current_frame->frame_in_exception_handler(broken_type, flags); + } + // Clear stack for each iteration + new_frame->clear_stack(); + new_frame->set_stack_size(0); if (catch_type_index != 0) { if (was_recursively_verified()) return; // We know that this index refers to a subclass of Throwable @@ -2491,7 +2584,7 @@ void ClassVerifier::verify_field_instructions(RawBytecodeStream* bcs, void ClassVerifier::verify_invoke_init( RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type, StackMapFrame* current_frame, u4 code_length, bool in_try_block, - bool *this_uninit, const constantPoolHandle& cp, StackMapTable* stackmap_table, + bool *verified_exc_handlers, const constantPoolHandle& cp, StackMapTable* stackmap_table, TRAPS) { int bci = bcs->bci(); VerificationType type = current_frame->pop_stack( @@ -2515,16 +2608,23 @@ void ClassVerifier::verify_invoke_init( } } - // If this invokespecial call is done from inside of a TRY block then make - // sure that all catch clause paths end in a throw. Otherwise, this can - // result in returning an incomplete object. + // If this invokespecial call is done from inside of a TRY block then we will + // make an intentionally unsatisfiable exception state, with FLAG_THIS_UNINIT + // set even after the UninitializedThis is replaced by top. This will prevent + // catch handler code (of any kind whatsoever) from covering this call. + // This indirectly prevents a return which would allow the caller to operate + // on a broken object, or any other handler action, including rethrow. + // This is what the JVMS is talking about when it says, "In fact, it's not + // even possible to express a handler with that type state..." + // See frame_in_exception_handler for more details. if (in_try_block) { // Check the exception handler target stackmaps with the locals from the // incoming stackmap (before initialize_object() changes them to outgoing // state). if (was_recursively_verified()) return; - verify_exception_handler_targets(bci, true, current_frame, - stackmap_table, CHECK_VERIFY(this)); + guarantee(current_frame->flag_this_uninit(), "flag must already be present"); + verify_exception_handler_targets(bci, type, current_frame, stackmap_table, CHECK_VERIFY(this)); + *verified_exc_handlers = true; } // in_try_block // At this point, all unset fields were satisfied, a delegated constructor handled @@ -2536,7 +2636,6 @@ void ClassVerifier::verify_invoke_init( current_frame->set_assert_unset_fields(nullptr); current_frame->initialize_object(type, current_type()); - *this_uninit = true; } else if (type.is_uninitialized()) { u2 new_offset = type.bci(); address new_bcp = bcs->bcp() - bci + new_offset; @@ -2594,8 +2693,8 @@ void ClassVerifier::verify_invoke_init( // state). if (in_try_block) { if (was_recursively_verified()) return; - verify_exception_handler_targets(bci, *this_uninit, current_frame, - stackmap_table, CHECK_VERIFY(this)); + verify_exception_handler_targets(bci, type, current_frame, stackmap_table, CHECK_VERIFY(this)); + *verified_exc_handlers = true; } current_frame->initialize_object(type, new_class_type); } else { @@ -2625,7 +2724,7 @@ bool ClassVerifier::is_same_or_direct_interface( void ClassVerifier::verify_invoke_instructions( RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame, - bool in_try_block, bool *this_uninit, + bool in_try_block, bool *verified_exc_handlers, const constantPoolHandle& cp, StackMapTable* stackmap_table, TRAPS) { // Make sure the constant pool item is the right type u2 index = bcs->get_index_u2(); @@ -2784,7 +2883,7 @@ void ClassVerifier::verify_invoke_instructions( opcode != Bytecodes::_invokedynamic) { if (method_name == vmSymbols::object_initializer_name()) { // method verify_invoke_init(bcs, index, ref_class_type, current_frame, - code_length, in_try_block, this_uninit, cp, stackmap_table, + code_length, in_try_block, verified_exc_handlers, cp, stackmap_table, CHECK_VERIFY(this)); if (was_recursively_verified()) return; } else { // other methods diff --git a/src/hotspot/share/classfile/verifier.hpp b/src/hotspot/share/classfile/verifier.hpp index 322d1ed2610f..9b680d2aecd5 100644 --- a/src/hotspot/share/classfile/verifier.hpp +++ b/src/hotspot/share/classfile/verifier.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -352,9 +352,11 @@ class ClassVerifier : public StackObj { u2 stackmap_index, int bci, StackMapFrame* current_frame, StackMapTable* stackmap_table, bool no_control_flow, TRAPS); + // broken_type: the type replaced by top in the exception frame's locals + // (invokespecial on a broken object); else top, if none. void verify_exception_handler_targets( - int bci, bool this_uninit, StackMapFrame* current_frame, - StackMapTable* stackmap_table, TRAPS); + int bci, VerificationType broken_type, + StackMapFrame* current_frame, StackMapTable* stackmap_table, TRAPS); void verify_ldc( int opcode, u2 index, StackMapFrame *current_frame, @@ -371,12 +373,12 @@ class ClassVerifier : public StackObj { void verify_invoke_init( RawBytecodeStream* bcs, u2 ref_index, VerificationType ref_class_type, StackMapFrame* current_frame, u4 code_length, bool in_try_block, - bool* this_uninit, const constantPoolHandle& cp, StackMapTable* stackmap_table, + bool* verified_exc_handlers, const constantPoolHandle& cp, StackMapTable* stackmap_table, TRAPS); void verify_invoke_instructions( RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame, - bool in_try_block, bool* this_uninit, + bool in_try_block, bool* verified_exc_handlers, const constantPoolHandle& cp, StackMapTable* stackmap_table, TRAPS); VerificationType get_newarray_type(u2 index, int bci, TRAPS); diff --git a/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictField.jasm b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictField.jasm new file mode 100644 index 000000000000..3d5d273233d3 --- /dev/null +++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictField.jasm @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* +// Ensure that exception handler preserves the verification state before the putfield +value class HasStrictField { + Integer sf; + HasStrictField(Integer something) { + try { + this.sf = something; + } + catch (Throwable ex) { + //do nothing + } + } +} +*/ + +final class HasStrictField version 72:65535 +{ + final strict Field sf:"Ljava/lang/Integer;"; + + Method "":"(Ljava/lang/Integer;)V" + stack 2 locals 3 + { + aload_0; + aload_1; + try T0; + putfield Field sf:"Ljava/lang/Integer;"; + endtry T0; + goto L12; + catch T0 java/lang/Throwable; + stack_frame_type early_larval; + unset_fields; // Should be sf:"Ljava/lang/Integer;" + frame_type stack1; + stack_map class java/lang/Throwable; + pop; + L12: stack_frame_type same; + aload_0; + invokespecial Method java/lang/Object."":"()V"; + return; + } + + LoadableDescriptors "Ljava/lang/Integer;"; +} diff --git a/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictFieldSafe.jasm b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictFieldSafe.jasm new file mode 100644 index 000000000000..ef8ed7190964 --- /dev/null +++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/HasStrictFieldSafe.jasm @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* +// Ensure that exception handler preserves the verification state before the putfield +value class HasStrictFieldSafe { + Integer sf; + HasStrictFieldSafe(Integer something) { + try { + this.sf = something; + } + catch (Throwable ex) { + this.sf = something; + } + } +} +*/ + +final class HasStrictFieldSafe version 72:65535 +{ + final strict Field sf:"Ljava/lang/Integer;"; + + Method "":"(Ljava/lang/Integer;)V" + stack 2 locals 3 + { + aload_0; + aload_1; + try T0; + putfield Field sf:"Ljava/lang/Integer;"; + endtry T0; + goto L12; + catch T0 java/lang/Throwable; + stack_frame_type early_larval; + unset_fields sf:"Ljava/lang/Integer;"; + frame_type stack1; + stack_map class java/lang/Throwable; + pop; + aload_0; + aload_1; + putfield Field sf:"Ljava/lang/Integer;"; + L12: stack_frame_type early_larval; + unset_fields; + frame_type same; + aload_0; + invokespecial Method java/lang/Object."":"()V"; + return; + } + + LoadableDescriptors "Ljava/lang/Integer;"; +} diff --git a/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/StrictInstanceFieldsTest.java b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/StrictInstanceFieldsTest.java index b154c9e993c7..66414d5f918b 100644 --- a/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/StrictInstanceFieldsTest.java +++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/StrictInstanceFieldsTest.java @@ -43,6 +43,8 @@ * EndsInEarlyLarval.jcod * EarlyLarvalNotSubset.jcod * InvalidIndexInEarlyLarval.jcod + * HasStrictFieldSafe.jasm + * HasStrictField.jasm * @compile StrictInstanceFieldsTest.java * @run driver jdk.test.lib.helpers.StrictProcessor * StrictInstanceFieldsTest @@ -51,23 +53,24 @@ * @run main/othervm -Xlog:verification -Xverify:all StrictInstanceFieldsTest */ -import java.util.Arrays; import java.lang.reflect.Field; import jdk.test.lib.helpers.StrictInit; public class StrictInstanceFieldsTest { - public static void negativeTest(Class clazz, String msg, boolean... args) throws Exception { + public static void negativeTest(Class clazz, String msg, Object... args) throws Exception { try { Class[] parameters = new Class[args.length]; - Object[] ctorArgs = new Object[args.length]; - Arrays.fill(parameters, boolean.class); - for (int i = 0; i < args.length; i++) { - ctorArgs[i] = new Boolean(args[i]); + // Unwrap booleans + if (args[i] instanceof Boolean) { + parameters[i] = boolean.class; + } else { + parameters[i] = args[i].getClass(); + } } - T child = clazz.getDeclaredConstructor(parameters).newInstance(ctorArgs); + T child = clazz.getDeclaredConstructor(parameters).newInstance(args); System.out.println(child); throw new RuntimeException("Should fail verification"); } catch (java.lang.VerifyError e) { @@ -121,6 +124,8 @@ public static void main(String[] args) throws Exception { NoUnsetFieldsSuper c8 = new NoUnsetFieldsSuper(); System.out.println(c8); + HasStrictFieldSafe c9 = new HasStrictFieldSafe(new Integer(0)); + // -------------- // NEGATIVE TESTS // -------------- @@ -162,6 +167,8 @@ public static void main(String[] args) throws Exception { negativeTest(StrictFieldNoEarlyLarval.class, "Constructor must call super() or this() before return"); + negativeTest(HasStrictField.class, "Stack map does not match the one at exception handler 8", new Integer(0)); + System.out.println("Passed"); } } diff --git a/test/hotspot/jtreg/runtime/verifier/UninitThisTop.jasm b/test/hotspot/jtreg/runtime/verifier/UninitThisTop.jasm new file mode 100644 index 000000000000..09dc9bb206cf --- /dev/null +++ b/test/hotspot/jtreg/runtime/verifier/UninitThisTop.jasm @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +identity class UninitThisTop version 72:0 +{ + Method "":"()V" + stack 2 locals 2 + { + try T0; + aload_0; + invokespecial Method java/lang/Object."":"()V"; + endtry T0; + return; + + catch T0 java/lang/Throwable; + stack_frame_type full; + locals_map this; + stack_map class java/lang/Throwable; + athrow; + } +} diff --git a/test/hotspot/jtreg/runtime/verifier/UninitThisTopTest.java b/test/hotspot/jtreg/runtime/verifier/UninitThisTopTest.java new file mode 100644 index 000000000000..23a2a8251da0 --- /dev/null +++ b/test/hotspot/jtreg/runtime/verifier/UninitThisTopTest.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8391419 + * @summary Ensure uninitializedThis and uninitialized(Offset) are substituted with top in the exception handlers + * @compile UninitThisTop.jasm UninitializedTop.jasm UninitializedTopControl.jasm + * @run main UninitThisTopTest + */ + +public class UninitThisTopTest { + + static void negativeTest(String testName, String errmsg) throws Exception { + try { + Class.forName(testName); + throw new RuntimeException("Should fail with VerifyError"); + } catch (VerifyError e) { + if (!e.getMessage().contains(errmsg)) { + throw new RuntimeException("Wrong VerifyError: " + e.getMessage()); + } else { + System.out.println("PASSED"); + } + } + } + + public static void main(String[] args) throws Exception { + // Positive test + UninitializedTopControl c0 = new UninitializedTopControl(); + + // Negative tests + negativeTest("UninitThisTop", "Type top (current frame, locals[0]) is not assignable to uninitializedThis (stack map, locals[0])"); + negativeTest("UninitializedTop", "Type top (current frame, locals[1]) is not assignable to uninitialized 5 (stack map, locals[1])"); + } +} diff --git a/test/hotspot/jtreg/runtime/verifier/UninitializedTop.jasm b/test/hotspot/jtreg/runtime/verifier/UninitializedTop.jasm new file mode 100644 index 000000000000..accb3fd957d8 --- /dev/null +++ b/test/hotspot/jtreg/runtime/verifier/UninitializedTop.jasm @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +identity class UninitializedTop version 72:0 +{ + Field o:"Ljava/lang/Object;"; + + Method "":"()V" + stack 3 locals 2 + { + aload_0; + invokespecial Method java/lang/Object."":"()V"; + aload_0; + L1: new class java/lang/Object; + dup; + astore_1; + try T0; + invokespecial Method java/lang/Object."":"()V"; + aload_1; + putfield Field o:"Ljava/lang/Object;"; + endtry T0; + return; + + catch T0 java/lang/Throwable; + stack_frame_type full; + locals_map class UninitializedTop, at L1; + stack_map class java/lang/Throwable; + athrow; + } +} diff --git a/test/hotspot/jtreg/runtime/verifier/UninitializedTopControl.jasm b/test/hotspot/jtreg/runtime/verifier/UninitializedTopControl.jasm new file mode 100644 index 000000000000..7f829dbdcac0 --- /dev/null +++ b/test/hotspot/jtreg/runtime/verifier/UninitializedTopControl.jasm @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +identity class UninitializedTopControl version 72:0 +{ + Field o:"Ljava/lang/Object;"; + + Method "":"()V" + stack 3 locals 2 + { + aload_0; + invokespecial Method java/lang/Object."":"()V"; + aload_0; + L1: new class java/lang/Object; + dup; + astore_1; + try T0; + invokespecial Method java/lang/Object."":"()V"; + aload_1; + putfield Field o:"Ljava/lang/Object;"; + endtry T0; + return; + + catch T0 java/lang/Throwable; + stack_frame_type full; + locals_map class UninitializedTopControl, bogus; + stack_map class java/lang/Throwable; + athrow; + } +} From b542d2623eec1a9433b233059219e94b1e3cdbfe Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Tue, 10 Nov 2026 17:03:15 +0000 Subject: [PATCH 076/110] 8372208: Update Unicode Data Files to 18.0.0 8372369: Update ICU4J to Version 79.1 Reviewed-by: jlu --- .../GenerateCaseFolding.java | 5 +- .../generatecharacter/SpecialCaseMap.java | 31 +- .../share/classes/java/lang/Character.java | 477 +++-- .../java/lang/CharacterData00.java.template | 8 +- .../java/lang/CharacterData01.java.template | 41 +- .../java/lang/CharacterData02.java.template | 10 +- .../java/lang/CharacterData03.java.template | 10 +- .../java/lang/CharacterData0E.java.template | 10 +- .../share/classes/java/lang/StringLatin1.java | 3 + .../share/classes/java/lang/StringUTF16.java | 3 + .../internal/icu/impl/data/icudata/nfc.nrm | Bin 36336 -> 36432 bytes .../internal/icu/impl/data/icudata/nfkc.nrm | Bin 56128 -> 56912 bytes .../internal/icu/impl/data/icudata/ubidi.icu | Bin 28768 -> 28800 bytes .../internal/icu/impl/data/icudata/uprops.icu | Bin 170864 -> 174592 bytes .../jdk/internal/icu/text/BidiWriter.java | 5 +- .../jdk/internal/icu/util/VersionInfo.java | 8 +- .../jdk/internal/util/regex/Grapheme.java | 29 +- .../share/data/unicodedata/Blocks.txt | 13 +- .../share/data/unicodedata/CaseFolding.txt | 28 +- .../unicodedata/DerivedCoreProperties.txt | 584 ++++-- .../data/unicodedata/NormalizationTest.txt | 143 +- .../share/data/unicodedata/PropList.txt | 101 +- .../data/unicodedata/PropertyValueAliases.txt | 55 +- .../share/data/unicodedata/ReadMe.txt | 31 +- .../share/data/unicodedata/Scripts.txt | 147 +- .../share/data/unicodedata/SpecialCasing.txt | 19 +- .../share/data/unicodedata/UnicodeData.txt | 784 +++++++- .../auxiliary/GraphemeBreakProperty.txt | 24 +- .../auxiliary/GraphemeBreakTest.txt | 1627 +++++++++-------- .../data/unicodedata/emoji/emoji-data.txt | 49 +- src/java.base/share/legal/icu.md | 4 +- src/java.base/share/legal/unicode.md | 4 +- .../java/lang/String/SpecialCasingTest.java | 6 +- .../lang/String/UnicodeCaseFoldingTest.java | 26 +- test/jdk/java/util/regex/CaseFoldingTest.java | 7 +- .../jdk/java/util/regex/GraphemeTestCases.txt | 3 + test/jdk/java/util/regex/RegExTest.java | 2 +- 37 files changed, 2966 insertions(+), 1331 deletions(-) diff --git a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java index 2f6a9add5cbc..1b8e29a06ff4 100644 --- a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java +++ b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCaseFolding.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -88,9 +88,8 @@ public static void main(String[] args) throws Throwable { } private static long foldingToLong(String[] folding) { - int cp = Integer.parseInt(folding[0], 16); long value = (long)Integer.parseInt(folding[1], 16); - if (!Character.isSupplementaryCodePoint(cp) && folding.length != 2) { + if (folding.length != 2) { var shift = 16; for (int j = 2; j < folding.length; j++) { value |= (long)Integer.parseInt(folding[j], 16) << shift; diff --git a/make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java b/make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java index 1d7d57dcd3e7..166f93960d6e 100644 --- a/make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java +++ b/make/jdk/src/classes/build/tools/generatecharacter/SpecialCaseMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ package build.tools.generatecharacter; import java.io.*; +import java.nio.file.Files; import java.util.*; import java.lang.*; @@ -53,34 +54,22 @@ public class SpecialCaseMap implements Comparable { * @return an array of SpecialCaseMap objects, one for each line of the * special case map data file that could be successfully parsed */ - - public static SpecialCaseMap[] readSpecFile(File file, int plane) throws FileNotFoundException { + public static SpecialCaseMap[] readSpecFile(File file, int plane) throws IOException { ArrayList caseMaps = new ArrayList<>(150); - int count = 0; - BufferedReader f = new BufferedReader(new FileReader(file)); - String line = null; - loop: - while(true) { - try { - line = f.readLine(); - } - catch (IOException e) { break loop; } - if (line == null) break loop; - SpecialCaseMap item = parse(line.trim()); - if (item != null) { - if(item.getCharSource() >> 16 < plane) continue; - if(item.getCharSource() >> 16 > plane) break; - caseMaps.add(item); - ++count; + + Files.lines(file.toPath()).forEach(line -> { + SpecialCaseMap item = parse(line.trim()); + if (item != null && + item.getCharSource() >> 16 == plane) { + caseMaps.add(item); } + }); - } caseMaps.trimToSize(); SpecialCaseMap[] result = new SpecialCaseMap[caseMaps.size()]; caseMaps.toArray(result); Arrays.sort(result); return result; - } /** diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java index 44bc0b96f65f..f8744b947207 100644 --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -67,7 +67,7 @@ * from the Unicode Consortium at * http://www.unicode.org. *

- * Character information is based on the Unicode Standard, version 17.0. + * Character information is based on the Unicode Standard, version 18.0. *

* The Java platform has supported different versions of the Unicode * Standard over time. The following tables list the version of Unicode used @@ -83,6 +83,8 @@ *

Unicode version
Java SE 28Unicode 18.0
Java SE 26Unicode 17.0
Java SE 25